@openclaw/matrix 2026.6.5-beta.2 → 2026.6.5-beta.3

package/dist/{legacy-crypto-restore-CbVSppMd.js → legacy-crypto-restore-Bm6HmeN5.js}

@@ -1,14 +1,11 @@
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { o as resolveMatrixStoragePaths } from "./storage-DSVcH_zM.js";
+import { C as writeMatrixLegacyCryptoMigrationState, _ as readMatrixLegacyCryptoMigrationState, s as migrateLegacyMatrixLegacyCryptoMigrationFileToStore } from "./crypto-state-store-DK2tcEyP.js";
+import { o as resolveMatrixStoragePaths } from "./storage-C10h2piS.js";
 import os from "node:os";
 import path from "node:path";
-import { readJsonFileWithFallback, writeJsonFileAtomically } from "openclaw/plugin-sdk/json-store";
 import fs from "node:fs/promises";
 //#region extensions/matrix/src/matrix/monitor/legacy-crypto-restore.ts
-function isMigrationState(value) {
-	return Boolean(value) && typeof value === "object" && value.version === 1;
-}
-async function resolvePendingMigrationStatePath(params) {
+async function resolvePendingMigrationStateRoot(params) {
 	const { rootDir } = resolveMatrixStoragePaths({
 		homeserver: params.auth.homeserver,
 		userId: params.auth.userId,
@@ -17,10 +14,12 @@ async function resolvePendingMigrationStatePath(params) {
 		deviceId: params.auth.deviceId,
 		stateDir: params.stateDir
 	});
-	const directStatePath = path.join(rootDir, "legacy-crypto-migration.json");
-	const { value: directValue } = await readJsonFileWithFallback(directStatePath, null);
-	if (isMigrationState(directValue) && directValue.restoreStatus === "pending") return {
-		statePath: directStatePath,
+	try {
+		migrateLegacyMatrixLegacyCryptoMigrationFileToStore(rootDir);
+	} catch {}
+	const directValue = readMatrixLegacyCryptoMigrationState(rootDir);
+	if (directValue?.restoreStatus === "pending") return {
+		storageRootDir: rootDir,
 		value: directValue
 	};
 	const accountStorageDir = path.dirname(rootDir);
@@ -29,40 +28,46 @@ async function resolvePendingMigrationStatePath(params) {
 		siblingEntries = (await fs.readdir(accountStorageDir, { withFileTypes: true })).filter((entry) => entry.isDirectory()).map((entry) => entry.name).filter((entry) => path.join(accountStorageDir, entry) !== rootDir).toSorted((left, right) => left.localeCompare(right));
 	} catch {
 		return {
-			statePath: directStatePath,
+			storageRootDir: rootDir,
 			value: directValue
 		};
 	}
 	for (const sibling of siblingEntries) {
-		const siblingStatePath = path.join(accountStorageDir, sibling, "legacy-crypto-migration.json");
-		const { value } = await readJsonFileWithFallback(siblingStatePath, null);
-		if (isMigrationState(value) && value.restoreStatus === "pending") return {
-			statePath: siblingStatePath,
+		const siblingRootDir = path.join(accountStorageDir, sibling);
+		try {
+			migrateLegacyMatrixLegacyCryptoMigrationFileToStore(siblingRootDir);
+		} catch {}
+		const value = readMatrixLegacyCryptoMigrationState(siblingRootDir);
+		if (value?.restoreStatus === "pending") return {
+			storageRootDir: siblingRootDir,
 			value
 		};
 	}
 	return {
-		statePath: directStatePath,
+		storageRootDir: rootDir,
 		value: directValue
 	};
 }
 async function maybeRestoreLegacyMatrixBackup(params) {
 	const env = params.env ?? process.env;
-	const { statePath, value } = await resolvePendingMigrationStatePath({
+	const { storageRootDir, value } = await resolvePendingMigrationStateRoot({
 		stateDir: params.stateDir ?? getMatrixRuntime().state.resolveStateDir(env, os.homedir),
 		auth: params.auth
 	});
-	if (!isMigrationState(value) || value.restoreStatus !== "pending") return { kind: "skipped" };
+	if (value?.restoreStatus !== "pending") return { kind: "skipped" };
 	const restore = await params.client.restoreRoomKeyBackup();
 	const localOnlyKeys = value.roomKeyCounts && value.roomKeyCounts.total > value.roomKeyCounts.backedUp ? value.roomKeyCounts.total - value.roomKeyCounts.backedUp : 0;
 	if (restore.success) {
-		await writeJsonFileAtomically(statePath, {
-			...value,
-			restoreStatus: "completed",
-			restoredAt: restore.restoredAt ?? (/* @__PURE__ */ new Date()).toISOString(),
-			importedCount: restore.imported,
-			totalCount: restore.total,
-			lastError: null
+		writeMatrixLegacyCryptoMigrationState({
+			storageRootDir,
+			state: {
+				...value,
+				restoreStatus: "completed",
+				restoredAt: restore.restoredAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+				importedCount: restore.imported,
+				totalCount: restore.total,
+				lastError: null
+			}
 		});
 		return {
 			kind: "restored",
@@ -71,9 +76,12 @@ async function maybeRestoreLegacyMatrixBackup(params) {
 			localOnlyKeys
 		};
 	}
-	await writeJsonFileAtomically(statePath, {
-		...value,
-		lastError: restore.error ?? "unknown"
+	writeMatrixLegacyCryptoMigrationState({
+		storageRootDir,
+		state: {
+			...value,
+			lastError: restore.error ?? "unknown"
+		}
 	});
 	return {
 		kind: "failed",

package/dist/logger-D0GCSDQq.js

@@ -0,0 +1,78 @@
+import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
+import { format } from "node:util";
+import { redactSensitiveText } from "openclaw/plugin-sdk/logging-core";
+//#region extensions/matrix/src/matrix/sdk/logger.ts
+function noop() {}
+let forceConsoleLogging = false;
+function setMatrixConsoleLogging(enabled) {
+	forceConsoleLogging = enabled;
+}
+function resolveRuntimeLogger(module) {
+	if (forceConsoleLogging) return null;
+	try {
+		return getMatrixRuntime().logging.getChildLogger({ module: `matrix:${module}` });
+	} catch {
+		return null;
+	}
+}
+function formatMessage(module, messageOrObject) {
+	if (messageOrObject.length === 0) return `[${module}]`;
+	return redactSensitiveText(`[${module}] ${format(...messageOrObject)}`);
+}
+var ConsoleLogger = class {
+	emit(level, module, ...messageOrObject) {
+		const runtimeLogger = resolveRuntimeLogger(module);
+		const message = formatMessage(module, messageOrObject);
+		if (runtimeLogger) {
+			if (level === "debug") {
+				runtimeLogger.debug?.(message);
+				return;
+			}
+			runtimeLogger[level](message);
+			return;
+		}
+		if (level === "debug") {
+			console.debug(message);
+			return;
+		}
+		console[level](message);
+	}
+	trace(module, ...messageOrObject) {
+		this.emit("debug", module, ...messageOrObject);
+	}
+	debug(module, ...messageOrObject) {
+		this.emit("debug", module, ...messageOrObject);
+	}
+	info(module, ...messageOrObject) {
+		this.emit("info", module, ...messageOrObject);
+	}
+	warn(module, ...messageOrObject) {
+		this.emit("warn", module, ...messageOrObject);
+	}
+	error(module, ...messageOrObject) {
+		this.emit("error", module, ...messageOrObject);
+	}
+};
+let activeLogger = new ConsoleLogger();
+const LogService = {
+	setLogger(logger) {
+		activeLogger = logger;
+	},
+	trace(module, ...messageOrObject) {
+		activeLogger.trace(module, ...messageOrObject);
+	},
+	debug(module, ...messageOrObject) {
+		activeLogger.debug(module, ...messageOrObject);
+	},
+	info(module, ...messageOrObject) {
+		activeLogger.info(module, ...messageOrObject);
+	},
+	warn(module, ...messageOrObject) {
+		activeLogger.warn(module, ...messageOrObject);
+	},
+	error(module, ...messageOrObject) {
+		activeLogger.error(module, ...messageOrObject);
+	}
+};
+//#endregion
+export { setMatrixConsoleLogging as i, LogService as n, noop as r, ConsoleLogger as t };

package/dist/{logging-Cm8vxO3E.js → logging-QH-48Gr6.js}

@@ -1,4 +1,4 @@
-import { d as ConsoleLogger, f as LogService, m as setMatrixConsoleLogging } from "./shared-BbT5LdPp.js";
+import { i as setMatrixConsoleLogging, n as LogService, t as ConsoleLogger } from "./logger-D0GCSDQq.js";
 import { logger } from "matrix-js-sdk/lib/logger.js";
 //#region extensions/matrix/src/matrix/client/logging.ts
 let matrixSdkLoggingConfigured = false;

package/dist/{matrix-migration.runtime-RzIEp7RP.js → matrix-migration.runtime-dvxE3e5l.js}

@@ -1,7 +1,8 @@
-import { a as resolveMatrixDefaultOrOnlyAccountId, i as resolveMatrixChannelConfig, n as requiresExplicitMatrixDefaultAccount, o as resolveMatrixAccountStringValues, r as resolveConfiguredMatrixAccountIds, t as findMatrixAccountEntry } from "./account-selection-DEMtY2cn.js";
+import { a as resolveMatrixDefaultOrOnlyAccountId, i as resolveMatrixChannelConfig, n as requiresExplicitMatrixDefaultAccount, r as resolveConfiguredMatrixAccountIds, s as resolveMatrixAccountStringValues, t as findMatrixAccountEntry } from "./account-selection-Bv_ZuOu4.js";
 import { i as resolveScopedMatrixEnvConfig, n as resolveGlobalMatrixEnvConfig } from "./env-auth-DIzOApj0.js";
 import { a as resolveMatrixCredentialsPath, n as resolveMatrixAccountStorageRoot, s as resolveMatrixLegacyFlatStoragePaths } from "./storage-paths-BWo_ZEMC.js";
 import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
+import { C as writeMatrixLegacyCryptoMigrationState, T as writeMatrixRecoveryKeyState, _ as readMatrixLegacyCryptoMigrationState, l as migrateLegacyMatrixRecoveryKeyFileToStore, s as migrateLegacyMatrixLegacyCryptoMigrationFileToStore, v as readMatrixRecoveryKeyState } from "./crypto-state-store-DK2tcEyP.js";
 import "./migration-snapshot-backup-YcCrSjbE.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
@@ -9,7 +10,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { resolveStateDir } from "openclaw/plugin-sdk/state-paths";
-import { loadJsonFile, writeJsonFileAtomically } from "openclaw/plugin-sdk/json-store";
+import { loadJsonFile } from "openclaw/plugin-sdk/json-store";
 import { fileURLToPath } from "node:url";
 //#region extensions/matrix/src/migration-config.ts
 function clean(value) {
@@ -347,15 +348,6 @@ function resolveMatrixLegacyCryptoPlans(params) {
 		warnings
 	};
 }
-function loadStoredRecoveryKey(filePath) {
-	return loadJsonFile(filePath) ?? null;
-}
-function loadLegacyCryptoMigrationState(filePath) {
-	return loadJsonFile(filePath) ?? null;
-}
-async function persistLegacyMigrationState(params) {
-	await params.writeJsonFileAtomically(params.filePath, params.state);
-}
 function detectLegacyMatrixCrypto(params) {
 	const detection = resolveMatrixLegacyCryptoPlans({
 		cfg: params.cfg,
@@ -385,7 +377,6 @@ async function autoPrepareLegacyMatrixCrypto(params) {
 	const inspectorAvailable = "inspectorAvailable" in detection ? detection.inspectorAvailable : true;
 	const warnings = [...detection.warnings];
 	const changes = [];
-	const writeJsonFileAtomically$1 = params.deps?.writeJsonFileAtomically ?? writeJsonFileAtomically;
 	if (detection.plans.length === 0) {
 		if (warnings.length > 0) params.log?.warn?.(`matrix: legacy encrypted-state warnings:\n${warnings.map((entry) => `- ${entry}`).join("\n")}`);
 		return {
@@ -421,7 +412,13 @@ async function autoPrepareLegacyMatrixCrypto(params) {
 		warnings
 	};
 	for (const plan of detection.plans) {
-		if (loadLegacyCryptoMigrationState(plan.statePath)?.version === 1) continue;
+		try {
+			migrateLegacyMatrixLegacyCryptoMigrationFileToStore(plan.rootDir);
+			migrateLegacyMatrixRecoveryKeyFileToStore(plan.rootDir);
+		} catch (err) {
+			warnings.push(`Failed migrating Matrix crypto sidecar state for account "${plan.accountId}" (${plan.rootDir}): ${String(err)}`);
+		}
+		if (readMatrixLegacyCryptoMigrationState(plan.rootDir)?.version === 1) continue;
 		if (!plan.deviceId) {
 			warnings.push(`Legacy Matrix encrypted state detected at ${plan.legacyCryptoPath}, but no device ID was found for account "${plan.accountId}". OpenClaw will continue, but old encrypted history cannot be recovered automatically.`);
 			continue;
@@ -440,8 +437,8 @@ async function autoPrepareLegacyMatrixCrypto(params) {
 		}
 		let decryptionKeyImported = false;
 		if (summary.decryptionKeyBase64) {
-			const existingRecoveryKey = loadStoredRecoveryKey(plan.recoveryKeyPath);
-			if (existingRecoveryKey?.privateKeyBase64 && existingRecoveryKey.privateKeyBase64 !== summary.decryptionKeyBase64) warnings.push(`Legacy Matrix backup key was found for account "${plan.accountId}", but ${plan.recoveryKeyPath} already contains a different recovery key. Leaving the existing file unchanged.`);
+			const existingRecoveryKey = readMatrixRecoveryKeyState(plan.rootDir);
+			if (existingRecoveryKey?.privateKeyBase64 && existingRecoveryKey.privateKeyBase64 !== summary.decryptionKeyBase64) warnings.push(`Legacy Matrix backup key was found for account "${plan.accountId}", but Matrix SQLite state already contains a different recovery key. Leaving the existing state unchanged.`);
 			else if (!existingRecoveryKey?.privateKeyBase64) {
 				const payload = {
 					version: 1,
@@ -450,11 +447,14 @@ async function autoPrepareLegacyMatrixCrypto(params) {
 					privateKeyBase64: summary.decryptionKeyBase64
 				};
 				try {
-					await writeJsonFileAtomically$1(plan.recoveryKeyPath, payload);
-					changes.push(`Imported Matrix legacy backup key for account "${plan.accountId}": ${plan.recoveryKeyPath}`);
+					writeMatrixRecoveryKeyState({
+						storageRootDir: plan.rootDir,
+						payload
+					});
+					changes.push(`Imported Matrix legacy backup key for account "${plan.accountId}" into SQLite`);
 					decryptionKeyImported = true;
 				} catch (err) {
-					warnings.push(`Failed writing Matrix recovery key for account "${plan.accountId}" (${plan.recoveryKeyPath}): ${String(err)}`);
+					warnings.push(`Failed writing Matrix recovery key for account "${plan.accountId}" to SQLite: ${String(err)}`);
 				}
 			} else decryptionKeyImported = true;
 		}
@@ -462,7 +462,7 @@ async function autoPrepareLegacyMatrixCrypto(params) {
 		if (localOnlyKeys > 0) warnings.push(`Legacy Matrix encrypted state for account "${plan.accountId}" contains ${localOnlyKeys} room key(s) that were never backed up. Backed-up keys can be restored automatically, but local-only encrypted history may remain unavailable after upgrade.`);
 		if (!summary.decryptionKeyBase64 && (summary.roomKeyCounts?.backedUp ?? 0) > 0) warnings.push(`Legacy Matrix encrypted state for account "${plan.accountId}" has backed-up room keys, but no local backup decryption key was found. Ask the operator to run "openclaw matrix verify backup restore --recovery-key <key>" after upgrade if they have the recovery key.`);
 		if (!summary.decryptionKeyBase64 && (summary.roomKeyCounts?.total ?? 0) > 0) warnings.push(`Legacy Matrix encrypted state for account "${plan.accountId}" cannot be fully converted automatically because the old rust crypto store does not expose all local room keys for export.`);
-		if (summary.decryptionKeyBase64 && !decryptionKeyImported && !loadStoredRecoveryKey(plan.recoveryKeyPath)) continue;
+		if (summary.decryptionKeyBase64 && !decryptionKeyImported && !readMatrixRecoveryKeyState(plan.rootDir)) continue;
 		const state = {
 			version: 1,
 			source: "matrix-bot-sdk-rust",
@@ -476,14 +476,13 @@ async function autoPrepareLegacyMatrixCrypto(params) {
 			lastError: null
 		};
 		try {
-			await persistLegacyMigrationState({
-				filePath: plan.statePath,
-				state,
-				writeJsonFileAtomically: writeJsonFileAtomically$1
+			writeMatrixLegacyCryptoMigrationState({
+				storageRootDir: plan.rootDir,
+				state
 			});
-			changes.push(`Prepared Matrix legacy encrypted-state migration for account "${plan.accountId}": ${plan.statePath}`);
+			changes.push(`Prepared Matrix legacy encrypted-state migration for account "${plan.accountId}" in SQLite`);
 		} catch (err) {
-			warnings.push(`Failed writing Matrix legacy encrypted-state migration record for account "${plan.accountId}" (${plan.statePath}): ${String(err)}`);
+			warnings.push(`Failed writing Matrix legacy encrypted-state migration record for account "${plan.accountId}" to SQLite: ${String(err)}`);
 		}
 	}
 	if (changes.length > 0) params.log?.info?.(`matrix: prepared encrypted-state upgrade.\n${changes.map((entry) => `- ${entry}`).join("\n")}`);

package/dist/{media-text-DVhXN81h.js → media-text-D0uvrHo1.js}

@@ -1,4 +1,4 @@
-import { C as formatPollResultsAsText, D as parsePollStartContent, O as resolvePollReferenceEventId, S as formatPollAsText, T as isPollStartType, w as isPollEventType, x as buildPollResultsSummary } from "./send-DEgWxp1p.js";
+import { C as formatPollResultsAsText, D as parsePollStartContent, O as resolvePollReferenceEventId, S as formatPollAsText, T as isPollStartType, w as isPollEventType, x as buildPollResultsSummary } from "./send-Bus9xhUh.js";
 import path from "node:path";
 //#region extensions/matrix/src/matrix/poll-summary.ts
 function resolveMatrixPollRootEventId(event) {

package/dist/{messages-sk1eTx7H.js → messages-C00n-MG_.js}

@@ -1,8 +1,8 @@
 import { r as isMatrixNotFoundError } from "./errors-C47hvAF8.js";
-import { T as isPollStartType, a as sendMessageMatrix, n as editMessageMatrix, w as isPollEventType } from "./send-DEgWxp1p.js";
+import { T as isPollStartType, a as sendMessageMatrix, n as editMessageMatrix, w as isPollEventType } from "./send-Bus9xhUh.js";
 import { n as MATRIX_REACTION_EVENT_TYPE } from "./reaction-common-DkrQdBSZ.js";
-import { a as resolveMatrixMessageAttachment, l as resolveMatrixPollRootEventId, o as resolveMatrixMessageBody, s as fetchMatrixPollMessageSummary } from "./media-text-DVhXN81h.js";
-import { r as withResolvedRoomAction } from "./client-CdP9vWOu.js";
+import { a as resolveMatrixMessageAttachment, l as resolveMatrixPollRootEventId, o as resolveMatrixMessageBody, s as fetchMatrixPollMessageSummary } from "./media-text-D0uvrHo1.js";
+import { r as withResolvedRoomAction } from "./client-CPfb6TMG.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { resolveIntegerOption } from "openclaw/plugin-sdk/number-runtime";
 //#region extensions/matrix/src/matrix/actions/limits.ts

package/dist/{monitor-DXW0sFfU.js → monitor-BWHn9jy2.js}

@@ -1,22 +1,24 @@
 import { c as resolveMatrixAccountConfig, s as resolveMatrixAccountAllowlistConfig } from "./config-paths-ZBCMwSos.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { m as resolveConfiguredMatrixBotUserIds } from "./setup-core-DJosJdWt.js";
-import { a as buildAllowlistResolutionSummary, c as createTypingCallbacks, d as logInboundDrop, f as logTypingFailure, h as toLocationContext, i as addAllowlistUserEntriesFromConfigEntry, l as formatLocationText, m as summarizeMapping, n as resolveMatrixStoredSessionMeta, o as canonicalizeAllowlistWithResolvedIds, p as patchAllowlistUsersInConfigEntries, r as resolveMatrixRoomConfig, s as createReplyPrefixOptions, u as getAgentScopedMediaLocalRoots } from "./channel-6UUus7Ba.js";
-import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-CVJYP50t.js";
+import { m as resolveConfiguredMatrixBotUserIds } from "./setup-core-CUyFBi5x.js";
+import { a as buildAllowlistResolutionSummary, c as createTypingCallbacks, d as logInboundDrop, f as logTypingFailure, h as toLocationContext, i as addAllowlistUserEntriesFromConfigEntry, l as formatLocationText, m as summarizeMapping, n as resolveMatrixStoredSessionMeta, o as canonicalizeAllowlistWithResolvedIds, p as patchAllowlistUsersInConfigEntries, r as resolveMatrixRoomConfig, s as createReplyPrefixOptions, u as getAgentScopedMediaLocalRoots } from "./channel-DtT1oc4C.js";
+import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-NrB2XGxM.js";
 import { t as isMatrixQualifiedUserId } from "./target-ids-B-5aQxwn.js";
 import { r as isMatrixNotFoundError, t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { a as resolveMatrixStateFilePath } from "./storage-DSVcH_zM.js";
-import { D as parsePollStartContent, S as formatPollAsText, T as isPollStartType, _ as readJoinedMatrixMembers, a as sendMessageMatrix, f as promoteMatrixDirectRoomCandidate, g as isStrictDirectMembership, h as hasDirectMatrixMemberFlag, t as chunkMatrixText, v as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, w as isPollEventType } from "./send-DEgWxp1p.js";
-import { n as resolveMatrixSqliteStateEnv, t as createMatrixThreadBindingManager } from "./thread-bindings-gLQYbsB9.js";
-import { a as resolveMatrixMessageAttachment, c as fetchMatrixPollSnapshot, i as isLikelyBareFilename, n as formatMatrixMediaUnavailableText, o as resolveMatrixMessageBody, r as formatMatrixMessageText, t as formatMatrixMediaTooLargeText } from "./media-text-DVhXN81h.js";
+import { O as resolveMatrixSqliteStateEnv } from "./crypto-state-store-DK2tcEyP.js";
+import { a as resolveMatrixStateFilePath } from "./storage-C10h2piS.js";
+import { D as parsePollStartContent, S as formatPollAsText, T as isPollStartType, _ as readJoinedMatrixMembers, a as sendMessageMatrix, f as promoteMatrixDirectRoomCandidate, g as isStrictDirectMembership, h as hasDirectMatrixMemberFlag, t as chunkMatrixText, v as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, w as isPollEventType } from "./send-Bus9xhUh.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-CnviJ9Ff.js";
+import { n as LogService } from "./logger-D0GCSDQq.js";
+import { a as resolveMatrixMessageAttachment, c as fetchMatrixPollSnapshot, i as isLikelyBareFilename, n as formatMatrixMediaUnavailableText, o as resolveMatrixMessageBody, r as formatMatrixMessageText, t as formatMatrixMediaTooLargeText } from "./media-text-D0uvrHo1.js";
 import { n as setActiveMatrixClient } from "./active-client-DXvz2gCo.js";
 import { t as isBunRuntime } from "./runtime-BefyhPWv.js";
-import { _ as resolveMatrixAuthContext, f as LogService, g as resolveMatrixAuth, h as backfillMatrixAuthDeviceIdAfterStartup, i as resolveSharedMatrixClient, l as isMatrixStartupAbortError, n as releaseSharedClientInstance, u as throwIfMatrixStartupAborted } from "./shared-BbT5LdPp.js";
-import "./client-DRRL7Zv5.js";
+import { d as backfillMatrixAuthDeviceIdAfterStartup, f as resolveMatrixAuth, i as resolveSharedMatrixClient, l as isMatrixStartupAbortError, n as releaseSharedClientInstance, p as resolveMatrixAuthContext, u as throwIfMatrixStartupAborted } from "./shared-Bk7pOHMb.js";
+import "./client-dLfa0qNk.js";
 import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-nipb5tk1.js";
 import { d as resolveDefaultGroupPolicy, h as warnMissingProviderGroupPolicyFallbackOnce, m as resolveThreadBindingMaxAgeMsForChannel, p as resolveThreadBindingIdleTimeoutMsForChannel, t as GROUP_POLICY_BLOCKED_LABEL, u as resolveAllowlistProviderRuntimeGroupPolicy } from "./runtime-api-CsBoesCU.js";
-import { t as resolveMatrixTargets } from "./resolve-targets-CAwsoBQK.js";
-import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-aEUzD940.js";
+import { t as resolveMatrixTargets } from "./resolve-targets-0dT0vJZJ.js";
+import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-D_KhjprO.js";
 import { n as isMatrixReadySyncState, r as isMatrixTerminalSyncState, t as isMatrixDisconnectedSyncState } from "./sync-state-CWbp0QSY.js";
 import { a as EventType, i as resolveMatrixThreadRouting, n as resolveMatrixReplyToEventId, o as RelationType, r as resolveMatrixThreadRootId, t as resolveMatrixInboundRoute } from "./route-DY6at4qJ.js";
 import { buildChannelProgressDraftLineForEntry, createChannelProgressDraftGate, createPreviewMessageReceipt, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, formatChannelProgressDraftLine, formatChannelProgressDraftLineForEntry, formatChannelProgressDraftText, isChannelProgressDraftWorkToolName, mergeChannelProgressDraftLine, normalizeChannelProgressDraftLineIdentity, resolveChannelProgressDraftMaxLines, waitUntilAbort } from "openclaw/plugin-sdk/channel-outbound";
@@ -819,7 +821,7 @@ const SAS_NOTICE_RETRY_DELAY_MS = 750;
 const VERIFICATION_EVENT_STARTUP_GRACE_MS = 3e4;
 let matrixDirectRoomDepsPromise;
 async function loadMatrixDirectRoomDeps() {
-	matrixDirectRoomDepsPromise ??= Promise.all([import("./send-DEgWxp1p.js").then((n) => n.d), import("./send-DEgWxp1p.js").then((n) => n.m)]).then(([directManagementModule, directRoomModule]) => ({
+	matrixDirectRoomDepsPromise ??= Promise.all([import("./send-Bus9xhUh.js").then((n) => n.d), import("./send-Bus9xhUh.js").then((n) => n.m)]).then(([directManagementModule, directRoomModule]) => ({
 		inspectMatrixDirectRooms: directManagementModule.inspectMatrixDirectRooms,
 		isStrictDirectRoom: directRoomModule.isStrictDirectRoom
 	}));
@@ -2231,7 +2233,7 @@ let sessionBindingRuntimePromise;
 let matrixReactionEventsPromise;
 let matrixDraftStreamPromise;
 function loadMatrixSendModule() {
-	matrixSendModulePromise ??= import("./send-DEgWxp1p.js").then((n) => n.l);
+	matrixSendModulePromise ??= import("./send-Bus9xhUh.js").then((n) => n.l);
 	return matrixSendModulePromise;
 }
 function loadAcpBindingRuntime() {
@@ -2243,11 +2245,11 @@ function loadSessionBindingRuntime() {
 	return sessionBindingRuntimePromise;
 }
 function loadMatrixReactionEvents() {
-	matrixReactionEventsPromise ??= import("./reaction-events-DRKzlo8q.js");
+	matrixReactionEventsPromise ??= import("./reaction-events-CdkYjlyo.js");
 	return matrixReactionEventsPromise;
 }
 function loadMatrixDraftStream() {
-	matrixDraftStreamPromise ??= import("./draft-stream-DZ2X1RHP.js");
+	matrixDraftStreamPromise ??= import("./draft-stream-PqFfvyV9.js");
 	return matrixDraftStreamPromise;
 }
 async function matrixTextWouldActivateMentions(client, text) {
@@ -4135,11 +4137,11 @@ function createMatrixRoomInfoResolver(client) {
 let matrixStartupMaintenanceDepsPromise;
 async function loadMatrixStartupMaintenanceDeps() {
 	matrixStartupMaintenanceDepsPromise ??= Promise.all([
-		import("./setup-core-DJosJdWt.js").then((n) => n.s),
+		import("./setup-core-CUyFBi5x.js").then((n) => n.s),
 		import("./device-health-D4LBxuPq.js"),
-		import("./setup-core-DJosJdWt.js").then((n) => n.a),
-		import("./legacy-crypto-restore-CbVSppMd.js"),
-		import("./startup-verification-D1p_LRmg.js")
+		import("./setup-core-CUyFBi5x.js").then((n) => n.a),
+		import("./legacy-crypto-restore-Bm6HmeN5.js"),
+		import("./startup-verification-BoDITB_u.js")
 	]).then(([configUpdateModule, deviceHealthModule, profileModule, legacyCryptoRestoreModule, startupVerificationModule]) => ({
 		updateMatrixAccountConfig: configUpdateModule.updateMatrixAccountConfig,
 		summarizeMatrixDeviceHealth: deviceHealthModule.summarizeMatrixDeviceHealth,

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

@@ -3,7 +3,7 @@ import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runti
 //#region extensions/matrix/src/plugin-entry.runtime.ts
 let matrixVerificationRuntimePromise;
 function loadMatrixVerificationRuntime() {
-	matrixVerificationRuntimePromise ??= import("./verification-BiA5IWPK.js").then((n) => n.y);
+	matrixVerificationRuntimePromise ??= import("./verification-jZ1KWtb5.js").then((n) => n.y);
 	return matrixVerificationRuntimePromise;
 }
 function sendError(respond, err) {

package/dist/probe.runtime-DcSBLSet.js

@@ -0,0 +1,3 @@
+import { t as createMatrixClient } from "./create-client-MnSzqELZ.js";
+import "./client-dLfa0qNk.js";
+export { createMatrixClient };

package/dist/{profile-update-rzynJvpi.js → profile-update-CWvjc5i_.js}

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

package/dist/{reaction-events-DRKzlo8q.js → reaction-events-CdkYjlyo.js}

@@ -7,7 +7,7 @@ import { getSessionBindingService } from "openclaw/plugin-sdk/session-binding-ru
 let approvalReactionAuthPromise;
 let execApprovalResolverPromise;
 function loadApprovalReactionAuth() {
-	approvalReactionAuthPromise ??= import("./approval-reaction-auth-NgDjrK6V.js");
+	approvalReactionAuthPromise ??= import("./approval-reaction-auth-ryklScll.js");
 	return approvalReactionAuthPromise;
 }
 function loadExecApprovalResolver() {

package/dist/{recovery-key-store-D6RbiZMM.js → recovery-key-store-TSlOpcEG.js}

@@ -1,38 +1,8 @@
 import { n as formatMatrixErrorReason, t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { f as LogService } from "./shared-BbT5LdPp.js";
-import { loadJsonFile, saveJsonFile } from "openclaw/plugin-sdk/json-store";
+import { E as writeMatrixRecoveryKeyStateForPath, c as migrateLegacyMatrixRecoveryKeyFilePathToStore, m as readLegacyMatrixRecoveryKeyFile, y as readMatrixRecoveryKeyStateForPath } from "./crypto-state-store-DK2tcEyP.js";
+import { n as LogService } from "./logger-D0GCSDQq.js";
+import path from "node:path";
 import { decodeRecoveryKey } from "matrix-js-sdk/lib/crypto-api/recovery-key.js";
-//#region extensions/matrix/src/matrix/sdk/idb-persistence-lock.ts
-const MATRIX_IDB_PERSIST_INTERVAL_MS = 6e4;
-const IDB_SNAPSHOT_LOCK_STALE_MS = 5 * 6e4;
-const IDB_SNAPSHOT_LOCK_RETRY_BASE = {
-	factor: 2,
-	minTimeout: 50,
-	maxTimeout: 5e3,
-	randomize: true
-};
-function computeRetryDelayMs(retries, attempt) {
-	return Math.min(retries.maxTimeout, Math.max(retries.minTimeout, retries.minTimeout * retries.factor ** attempt));
-}
-function computeMinimumRetryWindowMs(retries) {
-	let total = 0;
-	const attempts = Math.max(1, retries.retries + 1);
-	for (let attempt = 0; attempt < attempts - 1; attempt += 1) total += computeRetryDelayMs(retries, attempt);
-	return total;
-}
-function resolveRetriesForMinimumWindowMs(retries, minimumWindowMs) {
-	const resolved = {
-		...retries,
-		retries: 0
-	};
-	while (computeMinimumRetryWindowMs(resolved) < minimumWindowMs) resolved.retries += 1;
-	return resolved;
-}
-const MATRIX_IDB_SNAPSHOT_LOCK_OPTIONS = {
-	retries: resolveRetriesForMinimumWindowMs(IDB_SNAPSHOT_LOCK_RETRY_BASE, MATRIX_IDB_PERSIST_INTERVAL_MS),
-	stale: IDB_SNAPSHOT_LOCK_STALE_MS
-};
-//#endregion
 //#region extensions/matrix/src/matrix/sdk/recovery-key-store.ts
 function isRepairableSecretStorageAccessError(err) {
 	const message = formatMatrixErrorReason(err);
@@ -43,11 +13,18 @@ function isRepairableSecretStorageAccessError(err) {
 }
 var MatrixRecoveryKeyStore = class {
 	constructor(recoveryKeyPath) {
-		this.recoveryKeyPath = recoveryKeyPath;
 		this.secretStorageKeyCache = /* @__PURE__ */ new Map();
 		this.stagedRecoveryKey = null;
 		this.stagedRecoveryKeyUsed = false;
 		this.stagedCacheKeyIds = /* @__PURE__ */ new Set();
+		this.recoveryKeyPath = recoveryKeyPath;
+		this.storageRootDir = recoveryKeyPath ? path.dirname(recoveryKeyPath) : void 0;
+		if (this.recoveryKeyPath) try {
+			migrateLegacyMatrixRecoveryKeyFilePathToStore(this.recoveryKeyPath);
+		} catch (err) {
+			this.legacyRecoveryKeyPathOnMigrationFailure = this.recoveryKeyPath;
+			LogService.warn("MatrixClientLite", "Failed to migrate Matrix recovery key state:", err);
+		}
 	}
 	buildCryptoCallbacks() {
 		return {
@@ -221,7 +198,7 @@ var MatrixRecoveryKeyStore = class {
 				createSecretStorageKey: ensureRecoveryKey
 			});
 		}
-		if (generatedRecoveryKey && this.recoveryKeyPath) LogService.warn("MatrixClientLite", `Generated Matrix recovery key and saved it to ${this.recoveryKeyPath}. Keep this file secure.`);
+		if (generatedRecoveryKey && this.storageRootDir) LogService.warn("MatrixClientLite", "Generated Matrix recovery key and saved it to Matrix SQLite state. Keep the displayed recovery key secure.");
 	}
 	clearStagedRecoveryKeyTracking() {
 		this.stagedRecoveryKey = null;
@@ -253,22 +230,11 @@ var MatrixRecoveryKeyStore = class {
 	loadStoredRecoveryKey() {
 		if (!this.recoveryKeyPath) return null;
 		try {
-			const parsed = loadJsonFile(this.recoveryKeyPath);
-			if (parsed?.version !== 1 || typeof parsed.createdAt !== "string" || typeof parsed.privateKeyBase64 !== "string" || !parsed.privateKeyBase64.trim()) return null;
-			return {
-				version: 1,
-				createdAt: parsed.createdAt,
-				keyId: typeof parsed.keyId === "string" ? parsed.keyId : null,
-				encodedPrivateKey: typeof parsed.encodedPrivateKey === "string" ? parsed.encodedPrivateKey : void 0,
-				privateKeyBase64: parsed.privateKeyBase64,
-				keyInfo: parsed.keyInfo && typeof parsed.keyInfo === "object" ? {
-					passphrase: parsed.keyInfo.passphrase,
-					name: typeof parsed.keyInfo.name === "string" ? parsed.keyInfo.name : void 0
-				} : void 0
-			};
-		} catch {
-			return null;
-		}
+			const stored = readMatrixRecoveryKeyStateForPath(this.recoveryKeyPath);
+			if (stored) return stored;
+		} catch {}
+		if (this.legacyRecoveryKeyPathOnMigrationFailure) return readLegacyMatrixRecoveryKeyFile(this.legacyRecoveryKeyPathOnMigrationFailure);
+		return null;
 	}
 	saveRecoveryKeyToDisk(params) {
 		if (!this.recoveryKeyPath) return;
@@ -284,11 +250,14 @@ var MatrixRecoveryKeyStore = class {
 					name: params.keyInfo.name
 				} : void 0
 			};
-			saveJsonFile(this.recoveryKeyPath, payload);
+			writeMatrixRecoveryKeyStateForPath({
+				recoveryKeyPath: this.recoveryKeyPath,
+				payload
+			});
 		} catch (err) {
 			LogService.warn("MatrixClientLite", "Failed to persist recovery key:", err);
 		}
 	}
 };
 //#endregion
-export { MATRIX_IDB_SNAPSHOT_LOCK_OPTIONS as i, isRepairableSecretStorageAccessError as n, MATRIX_IDB_PERSIST_INTERVAL_MS as r, MatrixRecoveryKeyStore as t };
+export { isRepairableSecretStorageAccessError as n, MatrixRecoveryKeyStore as t };

package/dist/{resolve-targets-CAwsoBQK.js → resolve-targets-0dT0vJZJ.js}

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

package/dist/{resolver.runtime-phS2hwm9.js → resolver.runtime-BD2ZRhKw.js}

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

package/dist/runtime-api.js

@@ -1,4 +1,4 @@
-import { a as resolveMatrixDefaultOrOnlyAccountId, i as resolveMatrixChannelConfig, n as requiresExplicitMatrixDefaultAccount, o as resolveMatrixAccountStringValues, r as resolveConfiguredMatrixAccountIds, t as findMatrixAccountEntry } from "./account-selection-DEMtY2cn.js";
+import { a as resolveMatrixDefaultOrOnlyAccountId, i as resolveMatrixChannelConfig, n as requiresExplicitMatrixDefaultAccount, r as resolveConfiguredMatrixAccountIds, s as resolveMatrixAccountStringValues, t as findMatrixAccountEntry } from "./account-selection-Bv_ZuOu4.js";
 import { n as listMatrixEnvAccountIds, r as resolveMatrixEnvAccountToken, t as getMatrixScopedEnvVarNames } from "./env-vars-KzaYveuy.js";
 import { r as setMatrixRuntime } from "./runtime-6S3DNFNv.js";
 import { a as resolveMatrixCredentialsPath, c as resolveMatrixLegacyFlatStoreRoot, i as resolveMatrixCredentialsFilename, l as sanitizeMatrixPathSegment, n as resolveMatrixAccountStorageRoot, o as resolveMatrixHomeserverKey, r as resolveMatrixCredentialsDir, s as resolveMatrixLegacyFlatStoragePaths, t as hashMatrixAccessToken } from "./storage-paths-BWo_ZEMC.js";

package/dist/runtime-heavy-api.js

@@ -1,3 +1,3 @@
-import { a as detectLegacyMatrixCrypto, i as autoPrepareLegacyMatrixCrypto, n as hasPendingMatrixMigration, o as autoMigrateLegacyMatrixState, r as resolveMatrixMigrationStatus, s as detectLegacyMatrixState, t as hasActionableMatrixMigration } from "./matrix-migration.runtime-RzIEp7RP.js";
+import { a as detectLegacyMatrixCrypto, i as autoPrepareLegacyMatrixCrypto, n as hasPendingMatrixMigration, o as autoMigrateLegacyMatrixState, r as resolveMatrixMigrationStatus, s as detectLegacyMatrixState, t as hasActionableMatrixMigration } from "./matrix-migration.runtime-dvxE3e5l.js";
 import { t as maybeCreateMatrixMigrationSnapshot } from "./migration-snapshot-backup-YcCrSjbE.js";
 export { autoMigrateLegacyMatrixState, autoPrepareLegacyMatrixCrypto, detectLegacyMatrixCrypto, detectLegacyMatrixState, hasActionableMatrixMigration, hasPendingMatrixMigration, maybeCreateMatrixMigrationSnapshot, resolveMatrixMigrationStatus };