@openclaw/matrix 2026.9.1-beta.1 → 2026.9.2

package/dist/channel.runtime-CCJRhdH5.js

@@ -0,0 +1,76 @@
+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-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";
+import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { runChannelProbe } from "openclaw/plugin-sdk/text-utility-runtime";
+//#region extensions/matrix/src/matrix/probe.ts
+const loadMatrixProbeRuntimeDeps = createLazyRuntimeModule(() => import("./probe.runtime-B1YPxG9x.js").then((runtimeModule) => ({ createMatrixClient: runtimeModule.createMatrixClient })));
+async function probeMatrix(params) {
+	return await runChannelProbe(void 0, async () => {
+		const result = {
+			ok: false,
+			status: null,
+			error: null
+		};
+		if (isBunRuntime()) return {
+			...result,
+			error: "Matrix probe requires Node (bun runtime not supported)"
+		};
+		if (!params.homeserver?.trim()) return {
+			...result,
+			error: "missing homeserver"
+		};
+		if (!params.accessToken?.trim()) return {
+			...result,
+			error: "missing access token"
+		};
+		const { createMatrixClient } = await loadMatrixProbeRuntimeDeps();
+		const inputUserId = normalizeOptionalString(params.userId);
+		const userId = await (await createMatrixClient({
+			homeserver: params.homeserver,
+			userId: void 0,
+			accessToken: params.accessToken,
+			deviceId: params.deviceId,
+			persistStorage: false,
+			localTimeoutMs: params.timeoutMs,
+			accountId: params.accountId,
+			allowPrivateNetwork: params.allowPrivateNetwork,
+			ssrfPolicy: params.ssrfPolicy,
+			dispatcherPolicy: params.dispatcherPolicy
+		})).getUserId();
+		if (inputUserId && inputUserId !== userId) return {
+			...result,
+			error: "Matrix access token user does not match configured userId"
+		};
+		return {
+			...result,
+			ok: true,
+			userId
+		};
+	}, (error) => ({
+		ok: false,
+		status: typeof error === "object" && error && "statusCode" in error ? Number(error.statusCode) : null,
+		error: formatErrorMessage(error)
+	}));
+}
+//#endregion
+//#region extensions/matrix/src/channel.runtime.ts
+const matrixChannelRuntime = {
+	cleanupMatrixDeliveryPlans,
+	listMatrixDirectoryGroupsLive,
+	listMatrixDirectoryPeersLive,
+	matrixOutbound,
+	probeMatrix,
+	resolveMatrixAuth,
+	resolveMatrixTargets,
+	reconcileMatrixUnknownSend,
+	sendMessageMatrix,
+	sendTypingMatrix
+};
+//#endregion
+export { matrixChannelRuntime };

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

@@ -1,6 +1,6 @@
-import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-BCzyubQt.js";
-import { r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-CyvaCOOr.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 { 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";
@@ -50,22 +50,23 @@ function resolveMatrixAllowListMatch(params) {
 		matchSource: "wildcard"
 	};
 	const userId = normalizeMatrixUser(params.userId);
+	const candidates = [
+		{
+			value: userId,
+			source: "id"
+		},
+		{
+			value: userId ? `matrix:${userId}` : "",
+			source: "prefixed-id"
+		},
+		{
+			value: userId ? `user:${userId}` : "",
+			source: "prefixed-user"
+		}
+	];
 	return resolveAllowlistMatchByCandidates({
 		allowList,
-		candidates: [
-			{
-				value: userId,
-				source: "id"
-			},
-			{
-				value: userId ? `matrix:${userId}` : "",
-				source: "prefixed-id"
-			},
-			{
-				value: userId ? `user:${userId}` : "",
-				source: "prefixed-user"
-			}
-		]
+		candidates
 	});
 }
 //#endregion
@@ -98,6 +99,10 @@ const matrixConfigAdapter = createScopedChannelConfigAdapter({
 //#endregion
 //#region extensions/matrix/src/config-ui-hints.ts
 const matrixChannelConfigUiHints = {
+	joinIntro: {
+		label: "Matrix Group Join Introduction",
+		help: "Post one brief introduction when the bot joins an allowed group room (default: true). Account settings override the channel-wide setting."
+	},
 	...createChannelConfigUiHints({
 		channelLabel: "Matrix",
 		mentionPatterns: {
@@ -221,12 +226,13 @@ function hasCanonicalMatrixAccountStreaming(account) {
 	const streaming = account.streaming;
 	return typeof streaming === "object" && streaming !== null && !Array.isArray(streaming);
 }
-const MatrixChannelConfigSchema = buildChannelConfigSchema(z.object({
+const MatrixConfigSchema = z.object({
 	name: z.string().optional(),
 	enabled: z.boolean().optional(),
 	configWrites: z.boolean().optional(),
+	joinIntro: z.boolean().optional(),
 	defaultAccount: z.string().optional(),
-	accounts: z.record(z.string(), z.unknown().refine(hasCanonicalMatrixAccountStreaming, { message: "flat or scalar streaming values are no longer supported; use streaming.* and run \"openclaw doctor --fix\"" })).optional(),
+	accounts: z.record(z.string(), z.object({ joinIntro: z.boolean().optional() }).passthrough().refine(hasCanonicalMatrixAccountStreaming, { message: "flat or scalar streaming values are no longer supported; use streaming.* and run \"openclaw doctor --fix\"" })).optional(),
 	markdown: MarkdownConfigSchema,
 	homeserver: z.string().optional(),
 	network: matrixNetworkSchema,
@@ -294,7 +300,8 @@ const MatrixChannelConfigSchema = buildChannelConfigSchema(z.object({
 	groups: z.object({}).catchall(matrixRoomSchema).optional(),
 	rooms: z.object({}).catchall(matrixRoomSchema).optional(),
 	actions: matrixActionSchema
-}), { uiHints: matrixChannelConfigUiHints });
+});
+const MatrixChannelConfigSchema = buildChannelConfigSchema(MatrixConfigSchema, { uiHints: matrixChannelConfigUiHints });
 const matrixPluginBase = {
 	id: "matrix",
 	meta: {
@@ -307,7 +314,7 @@ const matrixPluginBase = {
 		order: 70,
 		quickstartAllowFrom: true
 	},
-	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./setup-surface-DtRvRcCT.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: [
@@ -320,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-DrTD2a_q.js → cli-IvDUuiDH.js}

@@ -1,24 +1,26 @@
-import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.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-BCzyubQt.js";
-import { n as resolveMatrixConfigPath, r as updateMatrixAccountConfig } from "./config-update-Bor_Pjsv.js";
-import { n as matrixSetupAdapter } from "./setup-core-CyvaCOOr.js";
-import { n as withResolvedActionClient } from "./client-BUtHbzib.js";
-import { l as resolveMatrixAuthContext } from "./client-hs1ePy2O.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-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-C61NR24_.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-BP-3-XYn.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 = 1024 * 1024;
+const MATRIX_CLI_RECOVERY_KEY_STDIN_MAX_BYTES = 1048576;
 function scheduleMatrixCliExit() {
 	if (matrixCliExitScheduled || process.env.VITEST) return;
 	matrixCliExitScheduled = true;
@@ -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);
 }
@@ -292,10 +319,12 @@ function printBackupSummary(backup) {
 function buildVerificationGuidance(status, accountId) {
 	const backup = resolveBackupStatus(status);
 	const nextSteps = /* @__PURE__ */ new Set();
-	if (!status.verified) if (status.recoveryKeyAccepted === true && status.backupUsable === true) {
-		nextSteps.add(`Recovery key can unlock the room-key backup, but full Matrix identity trust is still incomplete. Run ${formatMatrixCliCommand("verify self", accountId)}, accept the request in another verified Matrix client, and confirm the SAS only if it matches.`);
-		nextSteps.add(`If you intend to replace the current cross-signing identity, run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify bootstrap --recovery-key-stdin --force-reset-cross-signing", accountId)}.`);
-	} else nextSteps.add(`Run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify device --recovery-key-stdin", accountId)}. If you do not have the recovery key but still have another verified Matrix client, run ${formatMatrixCliCommand("verify self", accountId)} instead.`);
+	if (!status.verified) {
+		if (status.recoveryKeyAccepted === true && status.backupUsable === true) {
+			nextSteps.add(`Recovery key can unlock the room-key backup, but full Matrix identity trust is still incomplete. Run ${formatMatrixCliCommand("verify self", accountId)}, accept the request in another verified Matrix client, and confirm the SAS only if it matches.`);
+			nextSteps.add(`If you intend to replace the current cross-signing identity, run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify bootstrap --recovery-key-stdin --force-reset-cross-signing", accountId)}.`);
+		} else nextSteps.add(`Run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify device --recovery-key-stdin", accountId)}. If you do not have the recovery key but still have another verified Matrix client, run ${formatMatrixCliCommand("verify self", accountId)} instead.`);
+	}
 	if (status.serverDeviceKnown === false) nextSteps.add(`This Matrix device is no longer listed on the homeserver. Create a new OpenClaw Matrix device with ${formatMatrixCliCommand("account add --homeserver <url> --user-id <@user:server> --password <password> --device-name OpenClaw-Gateway", accountId)}. If you use token auth, create a fresh Matrix access token in your Matrix client or admin UI, then run ${formatMatrixCliCommand("account add --homeserver <url> --access-token <token>", accountId)}.`);
 	for (const step of buildBackupGuidance(backup, accountId, { recoveryKeyStored: status.recoveryKeyStored })) nextSteps.add(step);
 	if (status.pendingVerifications > 0) nextSteps.add(`Review pending verification requests with ${formatMatrixCliCommand("verify list", accountId)}. Complete each active request with ${formatMatrixCliCommand("verify sas <id>", accountId)} and ${formatMatrixCliCommand("verify confirm-sas <id>", accountId)}, or cancel stale requests with ${formatMatrixCliCommand("verify cancel <id>", accountId)}.`);
@@ -305,9 +334,10 @@ function buildBackupGuidance(backup, accountId, options = {}) {
 	const backupIssue = resolveMatrixRoomKeyBackupIssue(backup);
 	const nextSteps = /* @__PURE__ */ new Set();
 	if (backupIssue.code === "missing-server-backup") nextSteps.add(`Run ${formatMatrixCliCommand("verify bootstrap", accountId)} to create a room key backup.`);
-	else if (backupIssue.code === "key-load-failed" || backupIssue.code === "key-not-loaded" || backupIssue.code === "inactive") if (options.recoveryKeyStored) nextSteps.add(`Backup key is not loaded on this device. Run ${formatMatrixCliCommand("verify backup restore", accountId)} to load it and restore old room keys. If restore still cannot load the key, run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify backup restore --recovery-key-stdin", accountId)}.`);
-	else nextSteps.add(`Run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify backup restore --recovery-key-stdin", accountId)} to load the server backup and store the key for future restores.`);
-	else if (backupIssue.code === "key-mismatch") {
+	else if (backupIssue.code === "key-load-failed" || backupIssue.code === "key-not-loaded" || backupIssue.code === "inactive") {
+		if (options.recoveryKeyStored) nextSteps.add(`Backup key is not loaded on this device. Run ${formatMatrixCliCommand("verify backup restore", accountId)} to load it and restore old room keys. If restore still cannot load the key, run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify backup restore --recovery-key-stdin", accountId)}.`);
+		else nextSteps.add(`Run the shown printf pipeline with the Matrix recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify backup restore --recovery-key-stdin", accountId)} to load the server backup and store the key for future restores.`);
+	} else if (backupIssue.code === "key-mismatch") {
 		nextSteps.add(`Backup key mismatch on this device. Run the shown printf pipeline with the active server backup recovery key env var for this account: ${formatMatrixCliRecoveryKeyStdinCommand("verify backup restore --recovery-key-stdin", accountId)}.`);
 		nextSteps.add(`If you want a fresh backup baseline and accept losing unrecoverable history, run ${formatMatrixCliCommand("verify backup reset --yes", accountId)}. Add --rotate-recovery-key only when the old recovery key should stop unlocking the fresh backup.`);
 	} else if (backupIssue.code === "untrusted-signature") {
@@ -325,19 +355,21 @@ function printGuidance(lines) {
 function printVerificationStatus(status, verbose = false, accountId) {
 	console.log(`Verified by owner: ${status.verified ? "yes" : "no"}`);
 	if (status.serverDeviceKnown === false) console.log("Device issue: current Matrix device is missing from the homeserver device list");
-	const backupIssue = resolveMatrixRoomKeyBackupIssue(resolveBackupStatus(status));
+	const backup = resolveBackupStatus(status);
+	const backupIssue = resolveMatrixRoomKeyBackupIssue(backup);
 	printVerificationBackupSummary(status);
 	if (backupIssue.message) console.log(`Backup issue: ${backupIssue.message}`);
+	console.log(`Recovery key stored: ${status.recoveryKeyStored ? "yes" : "no"}`);
+	if (status.recoveryKey) console.log("Recovery key: available (re-run with --json to include the raw key value in output)");
 	if (verbose) {
 		console.log("Diagnostics:");
 		printVerificationIdentity(status);
 		if (status.serverDeviceKnown !== void 0) console.log(`Device present on server: ${yesNoUnknown(status.serverDeviceKnown ?? null)}`);
 		printVerificationTrustDiagnostics(status);
 		printVerificationBackupStatus(status);
-		console.log(`Recovery key stored: ${status.recoveryKeyStored ? "yes" : "no"}`);
 		printTimestamp("Recovery key created at", status.recoveryKeyCreatedAt);
 		console.log(`Pending verifications: ${status.pendingVerifications}`);
-	} else console.log(`Recovery key stored: ${status.recoveryKeyStored ? "yes" : "no"}`);
+	}
 	printVerificationGuidance(status, accountId);
 }
 //#endregion
@@ -364,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,
@@ -391,102 +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-CpE6C3qV.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 withAvatar = updateMatrixAccountConfig(runtime.config.current(), 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) => {
@@ -513,20 +550,24 @@ function registerMatrixAccountCommands(root) {
 				console.log(`Config path: ${formatMatrixCliText(result.configPath)}`);
 				console.log(`Credentials source: ${result.useEnv ? "MATRIX_* / MATRIX_<ACCOUNT_ID>_* env vars" : "inline config"}`);
 				console.log(`Encryption: ${result.encryptionEnabled ? "enabled" : "disabled"}`);
-				if (result.verificationBootstrap.attempted) if (result.verificationBootstrap.success) {
-					console.log("Matrix verification bootstrap: complete");
-					printTimestamp("Recovery key created at", result.verificationBootstrap.recoveryKeyCreatedAt);
-					if (result.verificationBootstrap.backupVersion) console.log(`Backup version: ${formatMatrixCliText(result.verificationBootstrap.backupVersion)}`);
-				} else console.error(`Matrix verification bootstrap warning: ${formatMatrixCliText(result.verificationBootstrap.error)}`);
+				if (result.verificationBootstrap.attempted) {
+					if (result.verificationBootstrap.success) {
+						console.log("Matrix verification bootstrap: complete");
+						printTimestamp("Recovery key created at", result.verificationBootstrap.recoveryKeyCreatedAt);
+						if (result.verificationBootstrap.backupVersion) console.log(`Backup version: ${formatMatrixCliText(result.verificationBootstrap.backupVersion)}`);
+					} else console.error(`Matrix verification bootstrap warning: ${formatMatrixCliText(result.verificationBootstrap.error)}`);
+				}
 				if (result.deviceHealth.error) console.error(`Matrix device health warning: ${formatMatrixCliText(result.deviceHealth.error)}`);
 				else if (result.deviceHealth.staleOpenClawDeviceIds.length > 0) {
 					const staleDeviceIds = result.deviceHealth.staleOpenClawDeviceIds.map((deviceId) => formatMatrixCliText(deviceId)).join(", ");
 					console.log(`Matrix device hygiene warning: stale OpenClaw devices detected (${staleDeviceIds}). Run ${formatMatrixCliCommand("devices prune-stale", result.accountId)}.`);
 				}
-				if (result.profile.attempted) if (result.profile.error) console.error(`Profile sync warning: ${formatMatrixCliText(result.profile.error)}`);
-				else {
-					console.log(`Profile sync: name ${result.profile.displayNameUpdated ? "updated" : "unchanged"}, avatar ${result.profile.avatarUpdated ? "updated" : "unchanged"}`);
-					if (result.profile.convertedAvatarFromHttp && result.profile.resolvedAvatarUrl) console.log(`Avatar converted and saved as: ${formatMatrixCliText(result.profile.resolvedAvatarUrl)}`);
+				if (result.profile.attempted) {
+					if (result.profile.error) console.error(`Profile sync warning: ${formatMatrixCliText(result.profile.error)}`);
+					else {
+						console.log(`Profile sync: name ${result.profile.displayNameUpdated ? "updated" : "unchanged"}, avatar ${result.profile.avatarUpdated ? "updated" : "unchanged"}`);
+						if (result.profile.convertedAvatarFromHttp && result.profile.resolvedAvatarUrl) console.log(`Avatar converted and saved as: ${formatMatrixCliText(result.profile.resolvedAvatarUrl)}`);
+					}
 				}
 				const bindHint = `openclaw agents bind --agent <id> --bind matrix:${result.accountId}`;
 				console.log(`Bind this account to an agent: ${bindHint}`);
@@ -595,8 +636,8 @@ function registerMatrixDeviceCommands(root) {
 }
 //#endregion
 //#region extensions/matrix/src/cli-direct.ts
-const loadMatrixActionClientModule = createLazyRuntimeModule(() => import("./client-BUtHbzib.js").then((n) => n.t));
-const loadMatrixDirectManagementModule = createLazyRuntimeModule(() => import("./send-BKu9Ghi4.js").then((n) => n.S));
+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}`);
@@ -740,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
@@ -751,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,
@@ -767,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-DrYVwQ_r.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-DrTD2a_q.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-DrYVwQ_r.js";
+import { n as registerMatrixCliMetadata, t as cli_metadata_default } from "./cli-metadata-BGryAl2e.js";
 export { cli_metadata_default as default, registerMatrixCliMetadata };