@openclaw/matrix 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{channel.setup-DC2t7_PK.mjs → channel.setup-CwuYD_CT.mjs}

@@ -1,6 +1,5 @@
 import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
-import { a as resolveMatrixAccountAsync, i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-C_r0UlEm.mjs";
-import { r as matrixSetupContract, t as createMatrixSetupWizardProxy } from "./setup-core-6DppLENo.mjs";
+import { _ as resolveMatrixAccount, g as resolveDefaultMatrixAccountId, i as matrixSetupContract, m as listMatrixAccountIds, t as createMatrixSetupWizardProxy, v as resolveMatrixAccountAsync } from "./setup-core-CKnNTfgD.mjs";
 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";
@@ -315,7 +314,7 @@ const matrixPluginBase = {
 		order: 70,
 		quickstartAllowFrom: true
 	},
-	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./onboarding-Cm_tOJxs.mjs").then((n) => n.n)).matrixOnboardingAdapter })),
+	setupWizard: createMatrixSetupWizardProxy(async () => ({ matrixSetupWizard: (await import("./onboarding-CrSexor_.mjs").then((n) => n.n)).matrixOnboardingAdapter })),
 	setupContract: matrixSetupContract,
 	capabilities: {
 		chatTypes: [

package/dist/.setup/{cli-Be8tdNw8.mjs → cli-mbL9jCro.mjs}

@@ -1,18 +1,15 @@
 import { t as getMatrixRuntime } from "./runtime-1kn1P6io.mjs";
 import { a as resolveMatrixAccountConfig, n as hasExplicitMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
-import { a as resolveMatrixAccountAsync } from "./accounts-C_r0UlEm.mjs";
+import { p as updateMatrixAccountConfig, r as matrixSetupAdapter, v as resolveMatrixAccountAsync } from "./setup-core-CKnNTfgD.mjs";
 import { n as resolveMatrixConfigPath } from "./config-paths-CnREYb1Y.mjs";
-import { n as updateMatrixAccountConfig } from "./config-update-CZndPxNd.mjs";
-import { n as matrixSetupAdapter } from "./setup-core-6DppLENo.mjs";
-import { n as withResolvedActionClient } from "./client-DY3HExqI.mjs";
-import { d as resolveMatrixAuthContext } from "./client-kmih04ng.mjs";
+import { n as withResolvedActionClient } from "./client-BlTvpEWC.mjs";
+import { d as resolveMatrixAuthContext } from "./client-vPPbaxNp.mjs";
 import { t as resolveMatrixRoomKeyBackupIssue } from "./backup-health-Dm_YMVFT.mjs";
 import { i as setMatrixConsoleLogging } from "./logger-CXQnpXCt.mjs";
 import { r as setMatrixSdkLogMode } from "./logging-BKV8TYQq.mjs";
 import { n as isOpenClawManagedMatrixDevice, r as summarizeMatrixDeviceHealth } from "./device-health-Be60VF1w.mjs";
-import { n as updateMatrixOwnProfile, t as applyMatrixProfileUpdate } from "./profile-update-C1n8SRqH.mjs";
-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-kMlFYUn0.mjs";
-import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
+import { n as updateMatrixOwnProfile, t as applyMatrixProfileUpdate } from "./profile-update-C7bjaGR6.mjs";
+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-B3VswneT.mjs";
 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";
@@ -136,6 +133,17 @@ function parseOptionalInt(value, fieldName, opts = {}) {
 	if (opts.min !== void 0 && parsed < opts.min) throw new Error(opts.min === 1 ? `${fieldName} must be a positive integer` : `${fieldName} must be a non-negative integer`);
 	return parsed;
 }
+async function runMatrixCliAccountCommand(options, config) {
+	const context = resolveMatrixCliAccountContext(options.account);
+	await runMatrixCliCommand(options, {
+		...config,
+		run: () => config.run(context),
+		onText: (result, verbose) => {
+			printAccountLabel(context.accountId);
+			config.onText(result, verbose, context.accountId);
+		}
+	});
+}
 async function runMatrixCliCommand(options, config) {
 	const verbose = options.verbose === true;
 	const json = options.json === true;
@@ -190,17 +198,6 @@ function sanitizeMatrixCliText(value) {
 function isAnsiFinalByte(code) {
 	return code >= 64 && code <= 126;
 }
-function resolveBackupStatus(status) {
-	return {
-		serverVersion: status.backup?.serverVersion ?? status.backupVersion ?? null,
-		activeVersion: status.backup?.activeVersion ?? null,
-		trusted: status.backup?.trusted ?? null,
-		matchesDecryptionKey: status.backup?.matchesDecryptionKey ?? null,
-		decryptionKeyCached: status.backup?.decryptionKeyCached ?? null,
-		keyLoadAttempted: status.backup?.keyLoadAttempted ?? false,
-		keyLoadError: status.backup?.keyLoadError ?? null
-	};
-}
 function yesNoUnknown(value) {
 	return value === true ? "yes" : value === false ? "no" : "unknown";
 }
@@ -217,12 +214,6 @@ function printVerificationIdentity(status) {
 	console.log(`User: ${formatMatrixCliText(status.userId)}`);
 	console.log(`Device: ${formatMatrixCliText(status.deviceId)}`);
 }
-function printVerificationBackupSummary(status) {
-	printBackupSummary(resolveBackupStatus(status));
-}
-function printVerificationBackupStatus(status) {
-	printBackupStatus(resolveBackupStatus(status));
-}
 function printVerificationTrustDiagnostics(status) {
 	console.log(`Locally trusted: ${status.localVerified ? "yes" : "no"}`);
 	console.log(`Cross-signing verified: ${status.crossSigningVerified ? "yes" : "no"}`);
@@ -274,7 +265,7 @@ function printBackupSummary(backup) {
 	if (backup.serverVersion) console.log(`Backup version: ${formatMatrixCliText(backup.serverVersion)}`);
 }
 function buildVerificationGuidance(status, accountId) {
-	const backup = resolveBackupStatus(status);
+	const backup = status.backup;
 	const nextSteps = /* @__PURE__ */ new Set();
 	if (!status.verified) {
 		if (status.recoveryKeyAccepted === true && status.backupUsable === true) {
@@ -312,7 +303,7 @@ 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 backup = resolveBackupStatus(status);
+	const backup = status.backup;
 	const backupIssue = resolveMatrixRoomKeyBackupIssue(backup);
 	printBackupSummary(backup);
 	if (backupIssue.message) console.log(`Backup issue: ${backupIssue.message}`);
@@ -405,7 +396,7 @@ async function addMatrixAccount(params) {
 			backupVersion: null
 		};
 		if (accountConfig.encryption === true) {
-			const { maybeBootstrapNewEncryptedMatrixAccount } = await import("./setup-bootstrap-UNIGyKnk.mjs");
+			const { maybeBootstrapNewEncryptedMatrixAccount } = await import("./setup-bootstrap-CV-hHBXu.mjs");
 			verificationBootstrap = await maybeBootstrapNewEncryptedMatrixAccount({
 				previousCfg: cfg,
 				cfg: updated,
@@ -545,28 +536,22 @@ function printMatrixOwnDevices(devices) {
 function registerMatrixDeviceCommands(root) {
 	const devices = root.command("devices").description("Inspect and clean up Matrix devices");
 	devices.command("list").description("List server-side Matrix devices for this account").option("--account <id>", "Account ID (for multi-account setups)").option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON").action(async (options) => {
-		const { accountId, cfg } = resolveMatrixCliAccountContext(options.account);
-		await runMatrixCliCommand(options, {
-			run: async () => await listMatrixOwnDevices({
+		await runMatrixCliAccountCommand(options, {
+			run: async ({ accountId, cfg }) => await listMatrixOwnDevices({
 				accountId,
 				cfg
 			}),
-			onText: (result) => {
-				printAccountLabel(accountId);
-				printMatrixOwnDevices(result);
-			},
+			onText: printMatrixOwnDevices,
 			errorPrefix: "Device listing failed"
 		});
 	});
 	devices.command("prune-stale").description("Delete stale OpenClaw-managed devices for this account").option("--account <id>", "Account ID (for multi-account setups)").option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON").action(async (options) => {
-		const { accountId, cfg } = resolveMatrixCliAccountContext(options.account);
-		await runMatrixCliCommand(options, {
-			run: async () => await pruneMatrixStaleGatewayDevices({
+		await runMatrixCliAccountCommand(options, {
+			run: async ({ accountId, cfg }) => await pruneMatrixStaleGatewayDevices({
 				accountId,
 				cfg
 			}),
 			onText: (result, verbose) => {
-				printAccountLabel(accountId);
 				console.log(`Deleted stale OpenClaw devices: ${result.deletedDeviceIds.length ? result.deletedDeviceIds.map((deviceId) => formatMatrixCliText(deviceId)).join(", ") : "none"}`);
 				console.log(`Current device: ${formatMatrixCliText(result.currentDeviceId)}`);
 				console.log(`Remaining devices: ${result.remainingDevices.length}`);
@@ -583,8 +568,6 @@ function registerMatrixDeviceCommands(root) {
 }
 //#endregion
 //#region extensions/matrix/src/cli-direct.ts
-const loadMatrixActionClientModule = createLazyRuntimeModule(() => import("./client-DY3HExqI.mjs").then((n) => n.t));
-const loadMatrixDirectManagementModule = createLazyRuntimeModule(() => import("./direct-management-DJtQhLKH.mjs").then((n) => n.t));
 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}`);
@@ -603,7 +586,7 @@ function printDirectRoomInspection(result) {
 }
 async function inspectMatrixDirectRoom(params) {
 	const cfg = getMatrixRuntime().config.current();
-	const [{ withResolvedActionClient }, { inspectMatrixDirectRooms }] = await Promise.all([loadMatrixActionClientModule(), loadMatrixDirectManagementModule()]);
+	const [{ withResolvedActionClient }, { inspectMatrixDirectRooms }] = await Promise.all([import("./client-BlTvpEWC.mjs").then((n) => n.t), import("./direct-management-B3wYhx_M.mjs").then((n) => n.t)]);
 	return await withResolvedActionClient({
 		accountId: params.accountId,
 		cfg
@@ -621,7 +604,7 @@ async function repairMatrixDirectRoom(params) {
 		cfg,
 		accountId: params.accountId
 	});
-	const [{ withStartedActionClient }, { repairMatrixDirectRooms }] = await Promise.all([loadMatrixActionClientModule(), loadMatrixDirectManagementModule()]);
+	const [{ withStartedActionClient }, { repairMatrixDirectRooms }] = await Promise.all([import("./client-BlTvpEWC.mjs").then((n) => n.t), import("./direct-management-B3wYhx_M.mjs").then((n) => n.t)]);
 	return await withStartedActionClient({
 		accountId: params.accountId,
 		cfg
@@ -659,7 +642,8 @@ function toCliDirectRoomInspection(accountId, inspection) {
 }
 function registerMatrixDirectCommands(root) {
 	const direct = root.command("direct").description("Inspect and repair Matrix direct-room state");
-	direct.command("inspect").description("Inspect direct-room mappings for a Matrix user").requiredOption("--user-id <id>", "Peer Matrix user ID").option("--account <id>", "Account ID (for multi-account setups)").option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON").action(async (options) => {
+	const command = (name, description) => direct.command(name).description(description).requiredOption("--user-id <id>", "Peer Matrix user ID").option("--account <id>", "Account ID (for multi-account setups)").option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON");
+	command("inspect", "Inspect direct-room mappings for a Matrix user").action(async (options) => {
 		const accountId = resolveMatrixCliAccountContext(options.account).accountId;
 		await runMatrixCliCommand(options, {
 			run: async () => await inspectMatrixDirectRoom({
@@ -670,7 +654,7 @@ function registerMatrixDirectCommands(root) {
 			errorPrefix: "Direct room inspection failed"
 		});
 	});
-	direct.command("repair").description("Repair Matrix direct-room mappings for a Matrix user").requiredOption("--user-id <id>", "Peer Matrix user ID").option("--account <id>", "Account ID (for multi-account setups)").option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON").action(async (options) => {
+	command("repair", "Repair Matrix direct-room mappings for a Matrix user").action(async (options) => {
 		const accountId = resolveMatrixCliAccountContext(options.account).accountId;
 		await runMatrixCliCommand(options, {
 			run: async () => await repairMatrixDirectRoom({
@@ -694,16 +678,12 @@ function registerMatrixDirectCommands(root) {
 //#endregion
 //#region extensions/matrix/src/cli-encryption.ts
 function isMatrixVerificationSetupComplete(status) {
-	return status.encryptionEnabled && status.verified && status.crossSigningVerified && status.signedByOwner && status.serverDeviceKnown === true && resolveMatrixRoomKeyBackupIssue(resolveBackupStatus(status)).code === "ok";
+	return status.encryptionEnabled && status.verified && status.crossSigningVerified && status.signedByOwner && status.serverDeviceKnown === true && resolveMatrixRoomKeyBackupIssue(status.backup).code === "ok";
 }
 function buildNoopMatrixVerificationBootstrap(status) {
 	return {
 		success: true,
-		verification: {
-			...status,
-			backup: resolveBackupStatus(status),
-			serverDeviceKnown: status.serverDeviceKnown ?? null
-		},
+		verification: status,
 		crossSigning: {
 			userId: status.userId,
 			masterKeyPublished: status.crossSigningVerified,
@@ -770,11 +750,11 @@ function printMatrixEncryptionSetupResult(result, verbose = false) {
 	console.log(`Bootstrap success: ${result.bootstrap.success ? "yes" : "no"}`);
 	if (result.bootstrap.error) console.log(`Bootstrap error: ${formatMatrixCliText(result.bootstrap.error)}`);
 	console.log(`Verified by owner: ${result.status.verified ? "yes" : "no"}`);
-	printVerificationBackupSummary(result.status);
+	printBackupSummary(result.status.backup);
 	if (verbose) {
 		printVerificationIdentity(result.status);
 		printVerificationTrustDiagnostics(result.status);
-		printVerificationBackupStatus(result.status);
+		printBackupStatus(result.status.backup);
 		console.log(`Recovery key stored: ${result.status.recoveryKeyStored ? "yes" : "no"}`);
 		printTimestamp("Recovery key created at", result.status.recoveryKeyCreatedAt);
 		console.log(`Pending verifications: ${result.status.pendingVerifications}`);
@@ -828,14 +808,12 @@ function registerMatrixProfileCommands(root) {
 function registerMatrixVerificationBackupCommands(verify) {
 	const backup = verify.command("backup").description("Matrix room-key backup health and restore");
 	backup.command("status").description("Show Matrix room-key backup status for this device").option("--account <id>", "Account ID (for multi-account setups)").option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON").action(async (options) => {
-		const { accountId, cfg } = resolveMatrixCliAccountContext(options.account);
-		await runMatrixCliCommand(options, {
-			run: async () => await getMatrixRoomKeyBackupStatus({
+		await runMatrixCliAccountCommand(options, {
+			run: async ({ accountId, cfg }) => await getMatrixRoomKeyBackupStatus({
 				accountId,
 				cfg
 			}),
-			onText: (status, verbose) => {
-				printAccountLabel(accountId);
+			onText: (status, verbose, accountId) => {
 				printBackupSummary(status);
 				if (verbose) printBackupStatus(status);
 				printBackupGuidance(status, accountId);
@@ -844,9 +822,8 @@ function registerMatrixVerificationBackupCommands(verify) {
 		});
 	});
 	backup.command("reset").description("Delete the current server backup and create a fresh room-key backup baseline, repairing secret storage if needed for a durable reset").option("--account <id>", "Account ID (for multi-account setups)").option("--yes", "Confirm destructive backup reset", false).option("--rotate-recovery-key", "Create a new Matrix recovery key for the fresh backup").option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON").action(async (options) => {
-		const { accountId, cfg } = resolveMatrixCliAccountContext(options.account);
-		await runMatrixCliCommand(options, {
-			run: async () => {
+		await runMatrixCliAccountCommand(options, {
+			run: async ({ accountId, cfg }) => {
 				if (options.yes !== true) throw new Error(`Refusing to reset Matrix room-key backup without --yes. If you accept losing unrecoverable history, re-run ${formatMatrixCliCommand("verify backup reset --yes", accountId)}.`);
 				return await resetMatrixRoomKeyBackup({
 					accountId,
@@ -854,8 +831,7 @@ function registerMatrixVerificationBackupCommands(verify) {
 					rotateRecoveryKey: options.rotateRecoveryKey === true
 				});
 			},
-			onText: (result, verbose) => {
-				printAccountLabel(accountId);
+			onText: (result, verbose, accountId) => {
 				console.log(`Reset success: ${result.success ? "yes" : "no"}`);
 				if (result.error) console.log(`Error: ${formatMatrixCliText(result.error)}`);
 				console.log(`Previous backup version: ${formatMatrixCliText(result.previousVersion, "none")}`);
@@ -877,15 +853,13 @@ function registerMatrixVerificationBackupCommands(verify) {
 		});
 	});
 	backup.command("restore").description("Restore encrypted room keys from server backup").option("--account <id>", "Account ID (for multi-account setups)").option("--recovery-key <key>", "Optional recovery key to load before restoring (prefer --recovery-key-stdin)").option("--recovery-key-stdin", "Read the Matrix recovery key from stdin").option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON").action(async (options) => {
-		const { accountId, cfg } = resolveMatrixCliAccountContext(options.account);
-		await runMatrixCliCommand(options, {
-			run: async () => await restoreMatrixRoomKeyBackup({
+		await runMatrixCliAccountCommand(options, {
+			run: async ({ accountId, cfg }) => await restoreMatrixRoomKeyBackup({
 				accountId,
 				cfg,
 				recoveryKey: await resolveMatrixCliRecoveryKeyInput(options)
 			}),
-			onText: (result, verbose) => {
-				printAccountLabel(accountId);
+			onText: (result, verbose, accountId) => {
 				console.log(`Restore success: ${result.success ? "yes" : "no"}`);
 				if (result.error) console.log(`Error: ${formatMatrixCliText(result.error)}`);
 				console.log(`Backup version: ${formatMatrixCliText(result.backupVersion, "none")}`);
@@ -907,16 +881,14 @@ function registerMatrixVerificationBackupCommands(verify) {
 		});
 	});
 	verify.command("bootstrap").description("Bootstrap Matrix cross-signing and device verification state").option("--account <id>", "Account ID (for multi-account setups)").option("--recovery-key <key>", "Recovery key to apply before bootstrap (prefer --recovery-key-stdin)").option("--recovery-key-stdin", "Read the Matrix recovery key from stdin").option("--force-reset-cross-signing", "Force reset cross-signing identity before bootstrap (requires active recovery key)").option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON").action(async (options) => {
-		const { accountId, cfg } = resolveMatrixCliAccountContext(options.account);
-		await runMatrixCliCommand(options, {
-			run: async () => await bootstrapMatrixVerification({
+		await runMatrixCliAccountCommand(options, {
+			run: async ({ accountId, cfg }) => await bootstrapMatrixVerification({
 				accountId,
 				cfg,
 				recoveryKey: await resolveMatrixCliRecoveryKeyInput(options),
 				forceResetCrossSigning: options.forceResetCrossSigning === true
 			}),
-			onText: (result, verbose) => {
-				printAccountLabel(accountId);
+			onText: (result, verbose, accountId) => {
 				console.log(`Bootstrap success: ${result.success ? "yes" : "no"}`);
 				if (result.error) console.log(`Error: ${formatMatrixCliText(result.error)}`);
 				console.log(`Verified by owner: ${result.verification.verified ? "yes" : "no"}`);
@@ -924,12 +896,12 @@ function registerMatrixVerificationBackupCommands(verify) {
 				if (verbose) {
 					printVerificationTrustDiagnostics(result.verification);
 					console.log(`Cross-signing published: ${result.crossSigning.published ? "yes" : "no"} (master=${result.crossSigning.masterKeyPublished ? "yes" : "no"}, self=${result.crossSigning.selfSigningKeyPublished ? "yes" : "no"}, user=${result.crossSigning.userSigningKeyPublished ? "yes" : "no"})`);
-					printVerificationBackupStatus(result.verification);
+					printBackupStatus(result.verification.backup);
 					printTimestamp("Recovery key created at", result.verification.recoveryKeyCreatedAt);
 					console.log(`Pending verifications: ${result.pendingVerifications}`);
 				} else {
 					console.log(`Cross-signing published: ${result.crossSigning.published ? "yes" : "no"}`);
-					printVerificationBackupSummary(result.verification);
+					printBackupSummary(result.verification.backup);
 				}
 				printVerificationGuidance({
 					...result.verification,
@@ -945,27 +917,25 @@ function registerMatrixVerificationBackupCommands(verify) {
 		});
 	});
 	verify.command("device [key]").description("Verify device using a Matrix recovery key").option("--account <id>", "Account ID (for multi-account setups)").option("--recovery-key-stdin", "Read the Matrix recovery key from stdin").option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON").action(async (key, options) => {
-		const { accountId, cfg } = resolveMatrixCliAccountContext(options.account);
-		await runMatrixCliCommand(options, {
-			run: async () => await verifyMatrixRecoveryKey(await requireMatrixCliRecoveryKeyInput({
+		await runMatrixCliAccountCommand(options, {
+			run: async ({ accountId, cfg }) => await verifyMatrixRecoveryKey(await requireMatrixCliRecoveryKeyInput({
 				recoveryKey: key,
 				recoveryKeyStdin: options.recoveryKeyStdin
 			}), {
 				accountId,
 				cfg
 			}),
-			onText: (result, verbose) => {
-				printAccountLabel(accountId);
+			onText: (result, verbose, accountId) => {
 				if (!result.success) console.error(`Verification failed: ${formatMatrixCliText(result.error)}`);
 				else console.log("Device verification completed successfully.");
 				printVerificationIdentity(result);
 				console.log(`Recovery key accepted: ${result.recoveryKeyAccepted ? "yes" : "no"}`);
 				console.log(`Backup usable: ${result.backupUsable ? "yes" : "no"}`);
 				console.log(`Device verified by owner: ${result.deviceOwnerVerified ? "yes" : "no"}`);
-				printVerificationBackupSummary(result);
+				printBackupSummary(result.backup);
 				if (verbose) {
 					printVerificationTrustDiagnostics(result);
-					printVerificationBackupStatus(result);
+					printBackupStatus(result.backup);
 					printTimestamp("Recovery key created at", result.recoveryKeyCreatedAt);
 					if (result.success) printTimestamp("Verified at", result.verifiedAt);
 				}
@@ -986,10 +956,10 @@ function registerMatrixVerificationBackupCommands(verify) {
 //#endregion
 //#region extensions/matrix/src/cli-verification.ts
 function matrixCliVerificationDmLookupOptions(options) {
-	const lookup = {};
-	if (options.roomId !== void 0) lookup.verificationDmRoomId = options.roomId;
-	if (options.userId !== void 0) lookup.verificationDmUserId = options.userId;
-	return lookup;
+	return {
+		...options.roomId !== void 0 ? { verificationDmRoomId: options.roomId } : {},
+		...options.userId !== void 0 ? { verificationDmUserId: options.userId } : {}
+	};
 }
 function formatMatrixVerificationDmFollowupParts(params) {
 	if (!params.roomId || !params.userId) return [];
@@ -1000,14 +970,11 @@ function formatMatrixVerificationDmFollowupParts(params) {
 		sanitizeMatrixCliText(params.roomId)
 	];
 }
-function formatMatrixVerificationSummaryDmFollowupParts(summary) {
-	return formatMatrixVerificationDmFollowupParts({
+function formatMatrixVerificationPreferredDmFollowupParts(summary, options) {
+	const summaryParts = formatMatrixVerificationDmFollowupParts({
 		roomId: summary.roomId,
 		userId: summary.otherUserId
 	});
-}
-function formatMatrixVerificationPreferredDmFollowupParts(summary, options) {
-	const summaryParts = formatMatrixVerificationSummaryDmFollowupParts(summary);
 	return summaryParts.length ? summaryParts : formatMatrixVerificationDmFollowupParts(options);
 }
 function formatMatrixVerificationFollowupCommand(params) {
@@ -1054,7 +1021,10 @@ async function promptMatrixVerificationSasMatch() {
 }
 function printMatrixVerificationRequestGuidance(summary, accountId) {
 	const requestId = formatMatrixVerificationCommandId(summary);
-	const dmParts = formatMatrixVerificationSummaryDmFollowupParts(summary);
+	const dmParts = formatMatrixVerificationDmFollowupParts({
+		roomId: summary.roomId,
+		userId: summary.otherUserId
+	});
 	printGuidance([
 		`Accept the verification request in another Matrix client for this account.`,
 		`Then run ${formatMatrixVerificationFollowupCommand({
@@ -1081,15 +1051,13 @@ function registerMatrixVerificationSummaryCommand(verify, params) {
 	const command = verify.command(`${params.name} <id>`).description(params.description).option("--account <id>", "Account ID (for multi-account setups)").option("--user-id <id>", "Matrix user ID for DM verification follow-up").option("--room-id <id>", "Matrix direct-message room ID for verification follow-up");
 	params.configure?.(command);
 	command.option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON").action(async (id, options) => {
-		const { accountId, cfg } = resolveMatrixCliAccountContext(options.account);
-		await runMatrixCliCommand(options, {
-			run: () => params.run(id, {
+		await runMatrixCliAccountCommand(options, {
+			run: ({ accountId, cfg }) => params.run(id, {
 				accountId,
 				cfg,
 				...matrixCliVerificationDmLookupOptions(options)
 			}, options),
-			onText: (summary) => {
-				printAccountLabel(accountId);
+			onText: (summary, _verbose, accountId) => {
 				printMatrixVerificationSummary(summary);
 				params.afterText?.(summary, accountId, options);
 			},
@@ -1100,11 +1068,11 @@ function registerMatrixVerificationSummaryCommand(verify, params) {
 async function runMatrixCliSelfVerificationCommand(options) {
 	let resolvedAccountId;
 	await runMatrixCliCommand(options, {
-		run: async () => {
+		run: () => {
 			const timeoutMs = parseOptionalInt(options.timeoutMs, "--timeout-ms", { min: 1 });
 			const { accountId, cfg } = resolveMatrixCliAccountContext(options.account);
 			resolvedAccountId = accountId;
-			return await runMatrixSelfVerification({
+			return runMatrixSelfVerification({
 				accountId,
 				cfg,
 				timeoutMs,
@@ -1128,8 +1096,8 @@ async function runMatrixCliSelfVerificationCommand(options) {
 			printMatrixVerificationSummary(summary);
 			console.log(`Device verified by owner: ${summary.deviceOwnerVerified ? "yes" : "no"}`);
 			printVerificationTrustDiagnostics(summary.ownerVerification);
-			printVerificationBackupSummary(summary.ownerVerification);
-			if (verbose) printVerificationBackupStatus(summary.ownerVerification);
+			printBackupSummary(summary.ownerVerification.backup);
+			if (verbose) printBackupStatus(summary.ownerVerification.backup);
 			console.log("Self-verification complete.");
 		},
 		onTextError: () => {
@@ -1142,26 +1110,21 @@ async function runMatrixCliSelfVerificationCommand(options) {
 function registerMatrixVerificationCommands(root) {
 	const verify = root.command("verify").description("Device verification for Matrix E2EE");
 	verify.command("list").description("List pending Matrix verification requests").option("--account <id>", "Account ID (for multi-account setups)").option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON").action(async (options) => {
-		const { accountId, cfg } = resolveMatrixCliAccountContext(options.account);
-		await runMatrixCliCommand(options, {
-			run: async () => await listMatrixVerifications({
+		await runMatrixCliAccountCommand(options, {
+			run: ({ accountId, cfg }) => listMatrixVerifications({
 				accountId,
 				cfg
 			}),
-			onText: (summaries) => {
-				printAccountLabel(accountId);
-				printMatrixVerificationSummaries(summaries);
-			},
+			onText: printMatrixVerificationSummaries,
 			errorPrefix: "Verification listing failed"
 		});
 	});
 	verify.command("self").description("Interactively self-verify this Matrix device").option("--account <id>", "Account ID (for multi-account setups)").option("--timeout-ms <ms>", "How long to wait for the other Matrix client").option("--verbose", "Show detailed diagnostics").action(runMatrixCliSelfVerificationCommand);
 	verify.command("request").description("Request Matrix device verification from another Matrix client").option("--account <id>", "Account ID (for multi-account setups)").option("--own-user", "Request self-verification for this Matrix account").option("--user-id <id>", "Matrix user ID to verify").option("--device-id <id>", "Matrix device ID to verify").option("--room-id <id>", "Matrix direct-message room ID for verification").option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON").action(async (options) => {
-		const { accountId, cfg } = resolveMatrixCliAccountContext(options.account);
-		await runMatrixCliCommand(options, {
-			run: async () => {
+		await runMatrixCliAccountCommand(options, {
+			run: ({ accountId, cfg }) => {
 				if (options.ownUser === true && (options.userId || options.deviceId || options.roomId)) throw new Error("--own-user cannot be combined with --user-id, --device-id, or --room-id");
-				return await requestMatrixVerification({
+				return requestMatrixVerification({
 					accountId,
 					cfg,
 					ownUser: options.ownUser === true ? true : void 0,
@@ -1170,8 +1133,7 @@ function registerMatrixVerificationCommands(root) {
 					roomId: options.roomId
 				});
 			},
-			onText: (summary) => {
-				printAccountLabel(accountId);
+			onText: (summary, _verbose, accountId) => {
 				printMatrixVerificationSummary(summary);
 				printMatrixVerificationRequestGuidance(summary, accountId);
 			},
@@ -1205,7 +1167,7 @@ function registerMatrixVerificationCommands(root) {
 	verify.command("sas <id>").description("Show SAS emoji or decimals for a Matrix verification request").option("--account <id>", "Account ID (for multi-account setups)").option("--user-id <id>", "Matrix user ID for DM verification follow-up").option("--room-id <id>", "Matrix direct-message room ID for verification follow-up").option("--verbose", "Show detailed diagnostics").option("--json", "Output as JSON").action(async (id, options) => {
 		const { accountId, cfg } = resolveMatrixCliAccountContext(options.account);
 		await runMatrixCliCommand(options, {
-			run: async () => await getMatrixVerificationSas(id, {
+			run: () => getMatrixVerificationSas(id, {
 				accountId,
 				cfg,
 				...matrixCliVerificationDmLookupOptions(options)
@@ -1246,16 +1208,14 @@ function registerMatrixVerificationCommands(root) {
 		errorPrefix: "Verification cancel failed"
 	});
 	verify.command("status").description("Check Matrix device verification status").option("--account <id>", "Account ID (for multi-account setups)").option("--verbose", "Show detailed diagnostics").option("--include-recovery-key", "Include stored recovery key in output").option("--allow-degraded-local-state", "Return best-effort diagnostics without preparing the Matrix account").option("--json", "Output as JSON").action(async (options) => {
-		const { accountId, cfg } = resolveMatrixCliAccountContext(options.account);
-		await runMatrixCliCommand(options, {
-			run: async () => await getMatrixVerificationStatus({
+		await runMatrixCliAccountCommand(options, {
+			run: ({ accountId, cfg }) => getMatrixVerificationStatus({
 				accountId,
 				cfg,
 				includeRecoveryKey: options.includeRecoveryKey === true,
 				...options.allowDegradedLocalState === true ? { readiness: "none" } : {}
 			}),
-			onText: (status, verbose) => {
-				printAccountLabel(accountId);
+			onText: (status, verbose, accountId) => {
 				printVerificationStatus(status, verbose, accountId);
 			},
 			shouldFail: (status) => status.serverDeviceKnown === false,

package/dist/.setup/{cli-metadata-CtcjBFhc.mjs → cli-metadata-6MOGuyHq.mjs}

@@ -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-Be8tdNw8.mjs");
+		const { registerMatrixCli } = await import("./cli-mbL9jCro.mjs");
 		registerMatrixCli({ program });
 	}, { descriptors: [{
 		name: "matrix",

package/dist/.setup/{client-DY3HExqI.mjs → client-BlTvpEWC.mjs}

@@ -1,5 +1,5 @@
 import { i as __exportAll } from "./doctor-contract-CsTNmbMa.mjs";
-import { C as resolveMatrixRoomId } from "./send-B1Y2L4wj.mjs";
+import { C as resolveMatrixRoomId } from "./send-LCOuTVc1.mjs";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 //#region extensions/matrix/src/matrix/actions/client.ts
 var client_exports = /* @__PURE__ */ __exportAll({
@@ -7,7 +7,7 @@ var client_exports = /* @__PURE__ */ __exportAll({
 	withResolvedRoomAction: () => withResolvedRoomAction,
 	withStartedActionClient: () => withStartedActionClient
 });
-const loadMatrixActionClientRuntime = createLazyRuntimeModule(() => import("./client-bootstrap-CZvJjr29.mjs"));
+const loadMatrixActionClientRuntime = createLazyRuntimeModule(() => import("./client-bootstrap-D05xy1HB.mjs"));
 async function withResolvedActionClient(opts, run, mode = "stop") {
 	const { withResolvedRuntimeMatrixClient } = await loadMatrixActionClientRuntime();
 	return await withResolvedRuntimeMatrixClient(opts, run, mode);

package/dist/.setup/{client-bootstrap-CZvJjr29.mjs → client-bootstrap-D05xy1HB.mjs}

@@ -1,8 +1,7 @@
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
-import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { captureChannelReadAuthority } from "openclaw/plugin-sdk/fetch-runtime";
 //#region extensions/matrix/src/matrix/client-bootstrap.ts
-const loadMatrixSharedClientRuntimeDeps = createLazyRuntimeModule(() => import("./client-kmih04ng.mjs").then((n) => n.t));
+const loadMatrixSharedClientRuntimeDeps = createLazyRuntimeModule(() => import("./client-vPPbaxNp.mjs").then((n) => n.t));
 async function ensureResolvedClientReadiness(params) {
 	if (params.readiness === "started") {
 		if (params.lease) await params.lease.start();
@@ -24,7 +23,7 @@ async function resolveRuntimeMatrixClientWithReadiness(opts) {
 		return { client: opts.client };
 	}
 	if (!opts.cfg) throw new Error("Matrix runtime client requires a resolved runtime config. Load and resolve config at the command or gateway boundary, then pass cfg through the runtime path.");
-	const cfg = requireRuntimeConfig(opts.cfg, "Matrix runtime client");
+	const cfg = opts.cfg;
 	const { acquireSharedMatrixClient, resolveMatrixAuthContext } = await loadMatrixSharedClientRuntimeDeps();
 	assertCurrent?.();
 	const authContext = resolveMatrixAuthContext({

package/dist/.setup/{client-support-D7BlioUb.mjs → client-support-D-xHScuo.mjs}

@@ -1,4 +1,4 @@
-import { t as formatMatrixErrorReason } from "./errors-DKVS3_DO.mjs";
+import { t as formatMatrixErrorReason } from "./errors-Bw4EHwKX.mjs";
 import { raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
 //#region extensions/matrix/src/matrix/sync-state.ts
 function isMatrixReadySyncState(state) {