@openclaw/matrix 2026.9.1 → 2026.9.2

package/dist/api.js

@@ -1,9 +1,9 @@
 import { a as resolveMatrixDefaultOrOnlyAccountId, i as resolveMatrixChannelConfig, n as requiresExplicitMatrixDefaultAccount, r as resolveConfiguredMatrixAccountIds, t as findMatrixAccountEntry } from "./account-selection-DA-jfx22.js";
 import { n as listMatrixEnvAccountIds, r as resolveMatrixEnvAccountToken, t as getMatrixScopedEnvVarNames } from "./env-vars-dGqak9dN.js";
 import { a as resolveMatrixCredentialsPath, i as resolveMatrixCredentialsFilename, n as resolveMatrixAccountStorageRoot, o as resolveMatrixHomeserverKey, r as resolveMatrixCredentialsDir, s as sanitizeMatrixPathSegment, t as hashMatrixAccessToken } from "./storage-paths-gUmSydsW.js";
-import { t as matrixPlugin } from "./channel-b-jES-oi.js";
-import { n as matrixSetupAdapter, t as createMatrixSetupWizardProxy } from "./setup-core-CEF6exLW.js";
+import { t as matrixPlugin } from "./channel-Bs8VLb6q.js";
+import { n as matrixSetupAdapter, t as createMatrixSetupWizardProxy } from "./setup-core-XkIfQ65J.js";
 import { f as setMatrixThreadBindingMaxAgeBySessionKey, n as getMatrixThreadBindingManager, u as setMatrixThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings-shared-oNPiyMWY.js";
-import { n as matrixOnboardingAdapter } from "./setup-surface-BSlj1vnL.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-DgxQEB99.js";
+import { n as matrixOnboardingAdapter } from "./setup-surface-B2yZ8KGc.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-BkBnn4te.js";
 export { createMatrixSetupWizardProxy, createMatrixThreadBindingManager, findMatrixAccountEntry, getMatrixScopedEnvVarNames, getMatrixThreadBindingManager, hashMatrixAccessToken, listMatrixEnvAccountIds, matrixOnboardingAdapter, matrixOnboardingAdapter as matrixSetupWizard, matrixPlugin, matrixSetupAdapter, requiresExplicitMatrixDefaultAccount, resolveConfiguredMatrixAccountIds, resolveMatrixAccountStorageRoot, resolveMatrixChannelConfig, resolveMatrixCredentialsDir, resolveMatrixCredentialsFilename, resolveMatrixCredentialsPath, resolveMatrixDefaultOrOnlyAccountId, resolveMatrixEnvAccountToken, resolveMatrixHomeserverKey, sanitizeMatrixPathSegment, setMatrixThreadBindingIdleTimeoutBySessionKey, setMatrixThreadBindingMaxAgeBySessionKey };

package/dist/{approval-handler.runtime-B_6ytY5I.js → approval-handler.runtime-BJCD4dLf.js}

@@ -1,9 +1,9 @@
 import { i as resolveMatrixAccount } from "./accounts-DR1c4xF_.js";
-import { C as shouldHandleMatrixApprovalRequest, S as isMatrixAnyApprovalClientEnabled } from "./channel-b-jES-oi.js";
+import { C as shouldHandleMatrixApprovalRequest, S as isMatrixAnyApprovalClientEnabled } from "./channel-Bs8VLb6q.js";
 import { o as resolveMatrixTargetIdentity } from "./target-ids-Nwx7cMVE.js";
-import { C as repairMatrixDirectRooms, a as sendSingleTextMessageMatrix, n as reactMatrixMessage, r as sendMessageMatrix } from "./send-DG7Bnj7_.js";
+import { C as repairMatrixDirectRooms, a as sendSingleTextMessageMatrix, n as reactMatrixMessage, r as sendMessageMatrix } from "./send-B5XChnvB.js";
 import { a as unregisterMatrixApprovalReactionTarget, n as listMatrixApprovalReactionBindings, r as registerMatrixApprovalReactionTarget, t as buildMatrixApprovalReactionHint } from "./approval-reactions-1fwEhoK9.js";
-import { n as editMatrixMessage, t as deleteMatrixMessage } from "./messages-C1U3b1oN.js";
+import { n as editMatrixMessage, t as deleteMatrixMessage } from "./messages-Czn8lNEh.js";
 import { listMessageReceiptPlatformIds, resolveMessageReceiptPrimaryId } from "openclaw/plugin-sdk/channel-outbound";
 import { normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { buildChannelApprovalNativeTargetKey } from "openclaw/plugin-sdk/approval-native-runtime";

package/dist/{approval-ids-CfHtZ9d1.js → approval-ids-Bst7HM_o.js}

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

package/dist/{approval-reaction-auth-BpDvJqfy.js → approval-reaction-auth-DhH8QOSe.js}

@@ -1,5 +1,5 @@
 import { i as resolveMatrixAccount } from "./accounts-DR1c4xF_.js";
-import { t as normalizeMatrixApproverId } from "./approval-ids-CfHtZ9d1.js";
+import { t as normalizeMatrixApproverId } from "./approval-ids-Bst7HM_o.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-jES-oi.js → channel-Bs8VLb6q.js}

@@ -1,8 +1,8 @@
 import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-DA-jfx22.js";
 import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
 import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-DR1c4xF_.js";
-import { a as normalizeMatrixUserId, r as DEFAULT_ACCOUNT_ID$2, t as matrixPluginBase } from "./channel.setup-BY42QaL7.js";
-import { t as normalizeMatrixApproverId } from "./approval-ids-CfHtZ9d1.js";
+import { a as normalizeMatrixUserId, r as DEFAULT_ACCOUNT_ID$2, t as matrixPluginBase } from "./channel.setup-DhmDXwPp.js";
+import { t as normalizeMatrixApproverId } from "./approval-ids-Bst7HM_o.js";
 import { a as resolveMatrixDirectUserId, i as normalizeMatrixResolvableTarget, n as isMatrixRoomId, o as resolveMatrixTargetIdentity, r as normalizeMatrixMessagingTarget, t as isMatrixQualifiedUserId } from "./target-ids-Nwx7cMVE.js";
 import { n as normalizeCompatibilityConfig, t as legacyConfigRules } from "./doctor-contract-HyWFZQVG.js";
 import { n as MATRIX_REACTION_EVENT_TYPE } from "./reaction-common-DkrQdBSZ.js";
@@ -149,7 +149,7 @@ const matrixMessageActions = {
 		return account && createActionGate(account.config.actions)("messages") ? payload : null;
 	},
 	handleAction: async (ctx) => {
-		const { handleMatrixAction } = await import("./tool-actions.runtime-vbkQgU7D.js");
+		const { handleMatrixAction } = await import("./tool-actions.runtime-a5L5xGSP.js");
 		const { action, params, cfg, accountId, mediaLocalRoots } = ctx;
 		const dispatch = async (actionParams) => await handleMatrixAction({
 			...actionParams,
@@ -634,7 +634,7 @@ const matrixNativeApprovalCapability = createApproverRestrictedNativeApprovalCap
 			approvalKind,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-B_6ytY5I.js")).matrixApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-BJCD4dLf.js")).matrixApprovalNativeRuntime
 	})
 });
 const splitMatrixApprovalCapability = splitChannelApprovalCapability(matrixNativeApprovalCapability);
@@ -1171,7 +1171,7 @@ function resolveMatrixOutboundSessionRoute(params) {
 //#endregion
 //#region extensions/matrix/src/channel.ts
 let matrixStartupLock = Promise.resolve();
-const loadMatrixChannelRuntime = createLazyRuntimeNamedExport(() => import("./channel.runtime-BkqjwEDU.js"), "matrixChannelRuntime");
+const loadMatrixChannelRuntime = createLazyRuntimeNamedExport(() => import("./channel.runtime-CCJRhdH5.js"), "matrixChannelRuntime");
 const loadMatrixDoctorModule = createLazyRuntimeModule(() => import("./doctor-CJE8wO6y.js"));
 function buildMatrixTrafficStatusSummary(snapshot) {
 	return {
@@ -1522,7 +1522,7 @@ const matrixPlugin = createChatChannelPlugin({
 			await previousLock;
 			let monitorMatrixProvider;
 			try {
-				monitorMatrixProvider = (await import("./monitor-SNnu-0bp.js")).monitorMatrixProvider;
+				monitorMatrixProvider = (await import("./monitor-DouG43FJ.js")).monitorMatrixProvider;
 			} finally {
 				releaseLock();
 			}

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as matrixPlugin } from "./channel-b-jES-oi.js";
+import { t as matrixPlugin } from "./channel-Bs8VLb6q.js";
 export { matrixPlugin };

package/dist/{channel.runtime-BkqjwEDU.js → channel.runtime-CCJRhdH5.js}

@@ -1,8 +1,8 @@
-import { o as sendTypingMatrix, r as sendMessageMatrix, v as cleanupMatrixDeliveryPlans, y as reconcileMatrixUnknownSend } from "./send-DG7Bnj7_.js";
+import { o as sendTypingMatrix, r as sendMessageMatrix, v as cleanupMatrixDeliveryPlans, y as reconcileMatrixUnknownSend } from "./send-B5XChnvB.js";
 import { t as isBunRuntime } from "./runtime-BefyhPWv.js";
 import { l as resolveMatrixAuth } from "./client-Dj4mcf-s.js";
 import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-DLUgWBhA.js";
-import { t as matrixOutbound } from "./outbound-CeCEtF_q.js";
+import { t as matrixOutbound } from "./outbound-Co_tJyE6.js";
 import { t as resolveMatrixTargets } from "./resolve-targets-B64O69Nd.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";

package/dist/{channel.setup-BY42QaL7.js → channel.setup-DhmDXwPp.js}

@@ -1,6 +1,6 @@
 import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
 import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-DR1c4xF_.js";
-import { r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-CEF6exLW.js";
+import { r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-XkIfQ65J.js";
 import { adaptScopedAccountAccessor, createScopedChannelConfigAdapter } from "openclaw/plugin-sdk/channel-config-helpers";
 import { createChannelConfigUiHints } from "openclaw/plugin-sdk/channel-core";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -314,7 +314,7 @@ const matrixPluginBase = {
 		order: 70,
 		quickstartAllowFrom: true
 	},
-	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-BSlj1vnL.js").then((n) => n.t)).matrixSetupWizard })),
+	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-B2yZ8KGc.js").then((n) => n.t)).matrixSetupWizard })),
 	setupContract: matrixSetupContract,
 	capabilities: {
 		chatTypes: [
@@ -327,7 +327,10 @@ const matrixPluginBase = {
 		threads: true,
 		media: true
 	},
-	reload: { configPrefixes: ["channels.matrix"] },
+	reload: {
+		configPrefixes: ["channels.matrix"],
+		noopPrefixes: ["messages.ackReactionScope"]
+	},
 	configSchema: MatrixChannelConfigSchema,
 	config: {
 		...matrixConfigAdapter,

package/dist/{cli-CtYeU7ol.js → cli-IvDUuiDH.js}

@@ -1,21 +1,23 @@
-import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
+import { a as resolveMatrixAccountConfig, n as hasExplicitMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
 import { i as resolveMatrixAccount } from "./accounts-DR1c4xF_.js";
 import { n as resolveMatrixConfigPath, r as updateMatrixAccountConfig } from "./config-update-BnX26jCO.js";
-import { n as matrixSetupAdapter } from "./setup-core-CEF6exLW.js";
-import { n as withResolvedActionClient } from "./client-D2utPQ1E.js";
+import { n as matrixSetupAdapter } from "./setup-core-XkIfQ65J.js";
+import { n as withResolvedActionClient } from "./client-oNOlldJI.js";
 import { u as resolveMatrixAuthContext } from "./client-Dj4mcf-s.js";
 import { t as resolveMatrixRoomKeyBackupIssue } from "./backup-health-Dm_YMVFT.js";
 import { i as setMatrixSdkLogMode, r as setMatrixSdkConsoleLogging } from "./logging-DRjvUOIh.js";
 import { n as isOpenClawManagedMatrixDevice, r as summarizeMatrixDeviceHealth } from "./device-health-B4-YXtJR.js";
-import { n as updateMatrixOwnProfile, t as applyMatrixProfileUpdate } from "./profile-update-Cd1p8ABr.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-D-iOebn4.js";
+import { n as updateMatrixOwnProfile, t as applyMatrixProfileUpdate } from "./profile-update-CAl8nZNG.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-XJtTc5DI.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { parseStrictInteger, timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
 import { formatZonedTimestamp } from "openclaw/plugin-sdk/time-runtime";
+import { isDeepStrictEqual } from "node:util";
 import { readByteStreamWithLimit } from "openclaw/plugin-sdk/response-limit-runtime";
+import { getRuntimeConfigSnapshot, getRuntimeConfigSourceSnapshot } from "openclaw/plugin-sdk/runtime-config-snapshot";
 //#region extensions/matrix/src/cli-shared.ts
 let matrixCliExitScheduled = false;
 const MATRIX_CLI_RECOVERY_KEY_STDIN_MAX_BYTES = 1048576;
@@ -73,6 +75,31 @@ function resolveMatrixCliAccountContext(accountId) {
 		cfg
 	};
 }
+function createMatrixCliAccountConfigPublisher({ accountId, previousCfg }) {
+	const configApi = getMatrixRuntime().config;
+	const pairedSource = getRuntimeConfigSnapshot() === previousCfg ? getRuntimeConfigSourceSnapshot() : null;
+	const comparisonBase = pairedSource ? "sourceConfig" : "runtimeConfig";
+	const comparisonCfg = pairedSource ?? previousCfg;
+	const expectedChannelEnabled = comparisonCfg.channels?.matrix?.enabled !== false;
+	const expectedExists = hasExplicitMatrixAccountConfig(comparisonCfg, accountId);
+	const expectedAccount = structuredClone(resolveMatrixAccountConfig({
+		cfg: comparisonCfg,
+		accountId
+	}));
+	return async (update) => {
+		await configApi.mutateConfigFile({
+			afterWrite: { mode: "auto" },
+			mutate: (draft, { snapshot }) => {
+				const current = snapshot[comparisonBase];
+				if (current.channels?.matrix?.enabled !== false !== expectedChannelEnabled || hasExplicitMatrixAccountConfig(current, accountId) !== expectedExists || !isDeepStrictEqual(resolveMatrixAccountConfig({
+					cfg: current,
+					accountId
+				}), expectedAccount)) throw new Error(`Matrix account "${accountId}" changed during setup; review its configuration and run the setup command again.`);
+				draft.channels = update(draft).channels;
+			}
+		});
+	};
+}
 function formatMatrixCliCommand(command, accountId) {
 	return formatMatrixCliCommandParts(command.split(" "), accountId);
 }
@@ -369,8 +396,7 @@ async function pruneMatrixStaleGatewayDevices(opts = {}) {
 //#region extensions/matrix/src/cli-account.ts
 async function addMatrixAccount(params) {
 	const initialSyncLimit = parseOptionalInt(params.initialSyncLimit, "--initial-sync-limit", { min: 0 });
-	const runtime = getMatrixRuntime();
-	const cfg = runtime.config.current();
+	const cfg = getMatrixRuntime().config.current();
 	if (!matrixSetupAdapter.applyAccountConfig) throw new Error("Matrix account setup is unavailable.");
 	const input = {
 		name: params.name,
@@ -396,103 +422,108 @@ async function addMatrixAccount(params) {
 		input
 	});
 	if (validationError) throw new Error(validationError);
-	let updated = matrixSetupAdapter.applyAccountConfig({
-		cfg,
+	const publishConfig = createMatrixCliAccountConfigPublisher({
 		accountId,
-		input
-	});
-	if (params.enableEncryption === true) updated = updateMatrixAccountConfig(updated, accountId, { encryption: true });
-	await runtime.config.replaceConfigFile({
-		nextConfig: updated,
-		afterWrite: { mode: "auto" }
+		previousCfg: cfg
 	});
+	const applyAccountConfig = (current) => {
+		const next = matrixSetupAdapter.applyAccountConfig({
+			cfg: current,
+			accountId,
+			input
+		});
+		return params.enableEncryption === true ? updateMatrixAccountConfig(next, accountId, { encryption: true }) : next;
+	};
+	let updated = applyAccountConfig(cfg);
+	let convertedAvatarUrl;
 	const accountConfig = resolveMatrixAccountConfig({
 		cfg: updated,
 		accountId
 	});
-	let verificationBootstrap = {
-		attempted: false,
-		success: false,
-		recoveryKeyCreatedAt: null,
-		backupVersion: null
-	};
-	if (accountConfig.encryption === true) {
-		const { maybeBootstrapNewEncryptedMatrixAccount } = await import("./setup-bootstrap-Co985F63.js");
-		verificationBootstrap = await maybeBootstrapNewEncryptedMatrixAccount({
-			previousCfg: cfg,
-			cfg: updated,
-			accountId
-		});
-	}
-	const desiredDisplayName = input.name?.trim();
-	const desiredAvatarUrl = input.avatarUrl?.trim();
-	let profile = {
-		attempted: false,
-		displayNameUpdated: false,
-		avatarUpdated: false,
-		resolvedAvatarUrl: null,
-		convertedAvatarFromHttp: false
-	};
-	if (desiredDisplayName || desiredAvatarUrl) try {
-		const synced = await updateMatrixOwnProfile({
-			cfg: updated,
-			accountId,
-			displayName: desiredDisplayName,
-			avatarUrl: desiredAvatarUrl
-		});
-		let resolvedAvatarUrl = synced.resolvedAvatarUrl;
-		if (synced.convertedAvatarFromHttp && synced.resolvedAvatarUrl) {
-			const latestCfg = runtime.config.current();
-			const withAvatar = updateMatrixAccountConfig(latestCfg, accountId, { avatarUrl: synced.resolvedAvatarUrl });
-			await runtime.config.replaceConfigFile({
-				nextConfig: withAvatar,
-				afterWrite: { mode: "auto" }
+	try {
+		let verificationBootstrap = {
+			attempted: false,
+			success: false,
+			recoveryKeyCreatedAt: null,
+			backupVersion: null
+		};
+		if (accountConfig.encryption === true) {
+			const { maybeBootstrapNewEncryptedMatrixAccount } = await import("./setup-bootstrap-S_loyUyM.js");
+			verificationBootstrap = await maybeBootstrapNewEncryptedMatrixAccount({
+				previousCfg: cfg,
+				cfg: updated,
+				accountId
 			});
-			resolvedAvatarUrl = synced.resolvedAvatarUrl;
 		}
-		profile = {
-			attempted: true,
-			displayNameUpdated: synced.displayNameUpdated,
-			avatarUpdated: synced.avatarUpdated,
-			resolvedAvatarUrl,
-			convertedAvatarFromHttp: synced.convertedAvatarFromHttp
-		};
-	} catch (err) {
-		profile = {
-			attempted: true,
+		const desiredDisplayName = input.name?.trim();
+		const desiredAvatarUrl = input.avatarUrl?.trim();
+		let profile = {
+			attempted: false,
 			displayNameUpdated: false,
 			avatarUpdated: false,
 			resolvedAvatarUrl: null,
-			convertedAvatarFromHttp: false,
-			error: formatErrorMessage(err)
+			convertedAvatarFromHttp: false
 		};
-	}
-	let deviceHealth;
-	try {
-		const addedDevices = await listMatrixOwnDevices({
+		if (desiredDisplayName || desiredAvatarUrl) try {
+			const synced = await updateMatrixOwnProfile({
+				cfg: updated,
+				accountId,
+				displayName: desiredDisplayName,
+				avatarUrl: desiredAvatarUrl
+			});
+			if (synced.convertedAvatarFromHttp && synced.resolvedAvatarUrl) {
+				convertedAvatarUrl = synced.resolvedAvatarUrl;
+				updated = updateMatrixAccountConfig(updated, accountId, { avatarUrl: synced.resolvedAvatarUrl });
+			}
+			profile = {
+				attempted: true,
+				displayNameUpdated: synced.displayNameUpdated,
+				avatarUpdated: synced.avatarUpdated,
+				resolvedAvatarUrl: synced.resolvedAvatarUrl,
+				convertedAvatarFromHttp: synced.convertedAvatarFromHttp
+			};
+		} catch (err) {
+			profile = {
+				attempted: true,
+				displayNameUpdated: false,
+				avatarUpdated: false,
+				resolvedAvatarUrl: null,
+				convertedAvatarFromHttp: false,
+				error: formatErrorMessage(err)
+			};
+		}
+		let deviceHealth;
+		try {
+			const addedDevices = await listMatrixOwnDevices({
+				accountId,
+				cfg: updated
+			});
+			deviceHealth = {
+				currentDeviceId: addedDevices.find((device) => device.current)?.deviceId ?? null,
+				staleOpenClawDeviceIds: addedDevices.filter((device) => !device.current && isOpenClawManagedMatrixDevice(device.displayName)).map((device) => device.deviceId)
+			};
+		} catch (err) {
+			deviceHealth = {
+				currentDeviceId: null,
+				staleOpenClawDeviceIds: [],
+				error: formatErrorMessage(err)
+			};
+		}
+		return {
 			accountId,
-			cfg: updated
-		});
-		deviceHealth = {
-			currentDeviceId: addedDevices.find((device) => device.current)?.deviceId ?? null,
-			staleOpenClawDeviceIds: addedDevices.filter((device) => !device.current && isOpenClawManagedMatrixDevice(device.displayName)).map((device) => device.deviceId)
-		};
-	} catch (err) {
-		deviceHealth = {
-			currentDeviceId: null,
-			staleOpenClawDeviceIds: [],
-			error: formatErrorMessage(err)
+			configPath: resolveMatrixConfigPath(updated, accountId),
+			useEnv: input.useEnv === true,
+			encryptionEnabled: accountConfig.encryption === true,
+			deviceHealth,
+			verificationBootstrap,
+			profile
 		};
+	} finally {
+		await publishConfig((current) => {
+			const next = applyAccountConfig(current);
+			return convertedAvatarUrl ? updateMatrixAccountConfig(next, accountId, { avatarUrl: convertedAvatarUrl }) : next;
+		});
 	}
-	return {
-		accountId,
-		configPath: resolveMatrixConfigPath(updated, accountId),
-		useEnv: input.useEnv === true,
-		encryptionEnabled: accountConfig.encryption === true,
-		deviceHealth,
-		verificationBootstrap,
-		profile
-	};
 }
 function registerMatrixAccountCommands(root) {
 	root.command("account").description("Manage matrix channel accounts").command("add").description("Add or update a matrix account (wrapper around channel setup)").option("--account <id>", "Account ID (default: normalized --name, else default)").option("--name <name>", "Optional display name for this account").option("--avatar-url <url>", "Optional Matrix avatar URL (mxc:// or http(s) URL)").option("--homeserver <url>", "Matrix homeserver URL").option("--proxy <url>", "Optional HTTP(S) proxy URL for Matrix requests").option("--allow-private-network", "Allow Matrix homeserver traffic to private/internal hosts for this account").option("--user-id <id>", "Matrix user ID").option("--access-token <token>", "Matrix access token").option("--password <password>", "Matrix password").option("--device-name <name>", "Matrix device display name").option("--initial-sync-limit <n>", "Matrix initial sync limit").option("--enable-e2ee", "Enable Matrix end-to-end encryption and bootstrap verification").option("--encryption", "Alias for --enable-e2ee").option("--use-env", "Use MATRIX_* env vars (or MATRIX_<ACCOUNT_ID>_* for non-default accounts)").option("--verbose", "Show setup details").option("--json", "Output as JSON").action(async (options) => {
@@ -605,8 +636,8 @@ function registerMatrixDeviceCommands(root) {
 }
 //#endregion
 //#region extensions/matrix/src/cli-direct.ts
-const loadMatrixActionClientModule = createLazyRuntimeModule(() => import("./client-D2utPQ1E.js").then((n) => n.t));
-const loadMatrixDirectManagementModule = createLazyRuntimeModule(() => import("./send-DG7Bnj7_.js").then((n) => n.x));
+const loadMatrixActionClientModule = createLazyRuntimeModule(() => import("./client-oNOlldJI.js").then((n) => n.t));
+const loadMatrixDirectManagementModule = createLazyRuntimeModule(() => import("./send-B5XChnvB.js").then((n) => n.x));
 function printDirectRoomCandidate(room) {
 	const members = room.joinedMembers === null ? "unavailable" : room.joinedMembers.map((member) => formatMatrixCliText(member)).join(", ") || "none";
 	console.log(`- ${formatMatrixCliText(room.roomId)} [${room.source}] strict=${room.strict ? "yes" : "no"} joined=${members}`);
@@ -750,8 +781,11 @@ function buildNoopMatrixVerificationBootstrap(status) {
 	};
 }
 async function setupMatrixEncryption(params) {
-	const runtime = getMatrixRuntime();
 	const { accountId, cfg } = resolveMatrixCliAccountContext(params.account);
+	const publishConfig = createMatrixCliAccountConfigPublisher({
+		accountId,
+		previousCfg: cfg
+	});
 	if (!resolveMatrixAccount({
 		cfg,
 		accountId
@@ -761,10 +795,6 @@ async function setupMatrixEncryption(params) {
 		accountId
 	}).encryption !== true;
 	const updated = encryptionChanged ? updateMatrixAccountConfig(cfg, accountId, { encryption: true }) : cfg;
-	if (encryptionChanged) await runtime.config.replaceConfigFile({
-		nextConfig: updated,
-		afterWrite: { mode: "auto" }
-	});
 	const existingStatus = !encryptionChanged && !params.recoveryKey && params.forceResetCrossSigning !== true ? await getMatrixVerificationStatus({
 		accountId,
 		cfg: updated,
@@ -777,23 +807,27 @@ async function setupMatrixEncryption(params) {
 		bootstrap: buildNoopMatrixVerificationBootstrap(existingStatus),
 		status: existingStatus
 	};
-	const bootstrap = await bootstrapMatrixVerification({
-		accountId,
-		cfg: updated,
-		recoveryKey: params.recoveryKey,
-		forceResetCrossSigning: params.forceResetCrossSigning === true
-	});
-	const status = await getMatrixVerificationStatus({
-		accountId,
-		cfg: updated
-	});
-	return {
-		accountId,
-		configPath: resolveMatrixConfigPath(updated, accountId),
-		encryptionChanged,
-		bootstrap,
-		status
-	};
+	try {
+		const bootstrap = await bootstrapMatrixVerification({
+			accountId,
+			cfg: updated,
+			recoveryKey: params.recoveryKey,
+			forceResetCrossSigning: params.forceResetCrossSigning === true
+		});
+		const status = await getMatrixVerificationStatus({
+			accountId,
+			cfg: updated
+		});
+		return {
+			accountId,
+			configPath: resolveMatrixConfigPath(updated, accountId),
+			encryptionChanged,
+			bootstrap,
+			status
+		};
+	} finally {
+		if (encryptionChanged) await publishConfig((current) => updateMatrixAccountConfig(current, accountId, { encryption: true }));
+	}
 }
 function printMatrixEncryptionSetupResult(result, verbose = false) {
 	printAccountLabel(result.accountId);

package/dist/{cli-metadata-B7MQjR5S.js → cli-metadata-BGryAl2e.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-CtYeU7ol.js");
+		const { registerMatrixCli } = await import("./cli-IvDUuiDH.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-B7MQjR5S.js";
+import { n as registerMatrixCliMetadata, t as cli_metadata_default } from "./cli-metadata-BGryAl2e.js";
 export { cli_metadata_default as default, registerMatrixCliMetadata };

package/dist/{client-D2utPQ1E.js → client-oNOlldJI.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { b as resolveMatrixRoomId } from "./send-DG7Bnj7_.js";
+import { b as resolveMatrixRoomId } from "./send-B5XChnvB.js";
 import { n as withResolvedRuntimeMatrixClient } from "./client-bootstrap-n1Rqc8Go.js";
 //#region extensions/matrix/src/matrix/actions/client.ts
 var client_exports = /* @__PURE__ */ __exportAll({

package/dist/contract-api.js

@@ -1,3 +1,3 @@
-import { c as singleAccountKeysToMove, n as matrixSetupAdapter, o as namedAccountPromotionKeys, s as resolveSingleAccountPromotionTarget } from "./setup-core-CEF6exLW.js";
-import { n as matrixOnboardingAdapter } from "./setup-surface-BSlj1vnL.js";
+import { c as singleAccountKeysToMove, n as matrixSetupAdapter, o as namedAccountPromotionKeys, s as resolveSingleAccountPromotionTarget } from "./setup-core-XkIfQ65J.js";
+import { n as matrixOnboardingAdapter } from "./setup-surface-B2yZ8KGc.js";
 export { matrixSetupAdapter, matrixOnboardingAdapter as matrixSetupWizard, namedAccountPromotionKeys, resolveSingleAccountPromotionTarget, singleAccountKeysToMove };

package/dist/doctor-contract-api.js

@@ -39,9 +39,9 @@ const matrixAccountStateSchemaMigration = {
 	id: "matrix-account-sqlite-schema",
 	label: "Matrix account SQLite schemas",
 	async detectLegacyState(params) {
-		const { detectOpenClawStateDatabaseSchemaMigrations } = await import("openclaw/plugin-sdk/doctor-repair-runtime");
 		const preview = [];
 		for (const storageRootDir of await collectMatrixAccountStateRoots(params.stateDir)) {
+			const { detectOpenClawStateDatabaseSchemaMigrations } = await import("openclaw/plugin-sdk/doctor-repair-runtime");
 			const env = resolveMatrixSqliteStateEnv({
 				env: params.env,
 				stateDir: storageRootDir
@@ -51,10 +51,10 @@ const matrixAccountStateSchemaMigration = {
 		return preview.length > 0 ? { preview } : null;
 	},
 	async migrateLegacyState(params) {
-		const { detectOpenClawStateDatabaseSchemaMigrations, repairOpenClawStateDatabaseSchema } = await import("openclaw/plugin-sdk/doctor-repair-runtime");
 		const changes = [];
 		const warnings = [];
 		for (const storageRootDir of await collectMatrixAccountStateRoots(params.stateDir)) {
+			const { detectOpenClawStateDatabaseSchemaMigrations, repairOpenClawStateDatabaseSchema } = await import("openclaw/plugin-sdk/doctor-repair-runtime");
 			const env = resolveMatrixSqliteStateEnv({
 				env: params.env,
 				stateDir: storageRootDir

package/dist/{draft-stream-DPYdv4fE.js → draft-stream-DglwxWzJ.js}

@@ -1,4 +1,4 @@
-import { T as MsgType, a as sendSingleTextMessageMatrix, c as prepareMatrixSingleText, t as editMessageMatrix } from "./send-DG7Bnj7_.js";
+import { T as MsgType, a as sendSingleTextMessageMatrix, c as prepareMatrixSingleText, t as editMessageMatrix } from "./send-B5XChnvB.js";
 import { createFinalizableDraftStreamControlsForState } from "openclaw/plugin-sdk/channel-outbound";
 //#region extensions/matrix/src/matrix/draft-stream.ts
 const DEFAULT_THROTTLE_MS = 1e3;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { n as registerMatrixCliMetadata } from "./cli-metadata-B7MQjR5S.js";
+import { n as registerMatrixCliMetadata } from "./cli-metadata-BGryAl2e.js";
 import { registerMatrixSubagentHooks } from "./subagent-hooks-api.js";
 import { defineBundledChannelEntry } from "openclaw/plugin-sdk/channel-entry-contract";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";

package/dist/{messages-C1U3b1oN.js → messages-Czn8lNEh.js}

@@ -1,6 +1,6 @@
 import { n as MATRIX_REACTION_EVENT_TYPE } from "./reaction-common-DkrQdBSZ.js";
-import { _ as resolvePollReferenceEventId, d as formatPollAsText, f as formatPollResultsAsText, g as parsePollStartContent, m as isPollStartType, p as isPollEventType, r as sendMessageMatrix, t as editMessageMatrix, u as buildPollResultsSummary } from "./send-DG7Bnj7_.js";
-import { r as withResolvedRoomAction } from "./client-D2utPQ1E.js";
+import { _ as resolvePollReferenceEventId, d as formatPollAsText, f as formatPollResultsAsText, g as parsePollStartContent, m as isPollStartType, p as isPollEventType, r as sendMessageMatrix, t as editMessageMatrix, u as buildPollResultsSummary } from "./send-B5XChnvB.js";
+import { r as withResolvedRoomAction } from "./client-oNOlldJI.js";
 import { n as isMatrixNotFoundError } from "./errors-DKVS3_DO.js";
 import { asNullableObjectRecord, asNullableRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import path from "node:path";