@openclaw/matrix 2026.9.3 → 2026.9.5

package/dist/{setup-bootstrap-CSI1L1lm.js → .setup/setup-bootstrap-BYgBD504.mjs}

@@ -1,6 +1,6 @@
-import { a as resolveMatrixAccountConfig, n as hasExplicitMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
-import "./accounts-GwSAk9vY.js";
-import { n as bootstrapMatrixVerification } from "./verification-B_aqtbx-.js";
+import { a as resolveMatrixAccountConfig, n as hasExplicitMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
+import "./accounts-BF5hyc-1.mjs";
+import { n as bootstrapMatrixVerification } from "./verification-CKqBZ9mI.mjs";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 //#region extensions/matrix/src/setup-bootstrap.ts
 async function maybeBootstrapNewEncryptedMatrixAccount(params) {

package/dist/{setup-core-DuTlyqRz.js → .setup/setup-core-BUcDAM7q.mjs}

@@ -1,12 +1,12 @@
-import { c as resolveMatrixEnvAuthReadiness } from "./account-selection-Bbtc483D.js";
-import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
-import { r as resolveDefaultMatrixAccountId } from "./accounts-GwSAk9vY.js";
-import { t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.js";
-import { r as updateMatrixAccountConfig } from "./config-update-BnX26jCO.js";
-import { t as isSupportedMatrixAvatarSource } from "./profile-vmjsmhh4.js";
+import { c as resolveMatrixEnvAuthReadiness } from "./account-selection-5koohRSQ.mjs";
+import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
+import { r as resolveDefaultMatrixAccountId } from "./accounts-BF5hyc-1.mjs";
+import { t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.mjs";
+import { r as updateMatrixAccountConfig } from "./config-update-B_4qZ5bV.mjs";
+import { t as isSupportedMatrixAvatarSource } from "./profile-ClrB3IgR.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
-import { DEFAULT_ACCOUNT_ID, addWildcardAllowFrom, applyAccountNameToChannelSection, normalizeAccountId, normalizeAllowFromEntries, normalizeSecretInputString, prepareScopedSetupConfig } from "openclaw/plugin-sdk/setup";
+import { DEFAULT_ACCOUNT_ID, addWildcardAllowFrom, applyAccountNameToChannelSection, normalizeAccountId, normalizeAllowFromEntries, normalizeSecretInputString, patchTopLevelChannelConfigSection, prepareScopedSetupConfig, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, normalizeAccountId as normalizeAccountId$1 } from "openclaw/plugin-sdk/routing";
 import { createChannelDmPolicy } from "openclaw/plugin-sdk/channel-dm-policy";
 //#region extensions/matrix/src/setup-contract.ts
@@ -126,21 +126,15 @@ function moveSingleMatrixAccountConfigToNamedAccount(cfg) {
 	const resolvedTargetAccountId = resolveExistingMatrixAccountKey(accounts, resolveSingleAccountPromotionTarget({ channel: base }));
 	const nextAccount = { ...accounts[resolvedTargetAccountId] };
 	for (const key of keysToMove) nextAccount[key] = cloneIfObject(base[key]);
-	const nextChannel = { ...base };
-	for (const key of keysToMove) delete nextChannel[key];
-	return {
-		...cfg,
-		channels: {
-			...cfg.channels,
-			[channel$1]: {
-				...nextChannel,
-				accounts: {
-					...accounts,
-					[resolvedTargetAccountId]: nextAccount
-				}
-			}
-		}
-	};
+	return patchTopLevelChannelConfigSection({
+		cfg,
+		channel: channel$1,
+		clearFields: keysToMove,
+		patch: { accounts: {
+			...accounts,
+			[resolvedTargetAccountId]: nextAccount
+		} }
+	});
 }
 function validateMatrixSetupInput(params) {
 	const input = params.input;
@@ -271,16 +265,7 @@ function createMatrixSetupWizardProxy(loadWizardModule) {
 			const promptAllowFrom = (await loadWizard()).dmPolicy?.promptAllowFrom;
 			return promptAllowFrom ? await promptAllowFrom(params) : params.cfg;
 		}),
-		disable: (cfg) => ({
-			...cfg,
-			channels: {
-				...cfg.channels,
-				matrix: {
-					...cfg.channels?.matrix,
-					enabled: false
-				}
-			}
-		})
+		disable: (cfg) => setSetupChannelEnabled(cfg, channel, false)
 	};
 }
 const matrixSetupAdapter = {
@@ -311,7 +296,7 @@ const matrixSetupAdapter = {
 		input
 	}),
 	afterAccountConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-CSI1L1lm.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BYgBD504.mjs");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,

package/dist/.setup/setup-plugin-api-DoTm4v2q.mjs

@@ -0,0 +1,3 @@
+import { n as matrixSetupPlugin } from "./channel.setup-DZQ5rf9k.mjs";
+import "../setup-plugin-api.js";
+export { matrixSetupPlugin };

package/dist/{setup-surface-fZing1WZ.js → .setup/setup-surface-V_Q-enq-.mjs}

@@ -1,15 +1,15 @@
-import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { c as resolveMatrixEnvAuthReadiness, r as requiresExplicitMatrixDefaultAccount } from "./account-selection-Bbtc483D.js";
-import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
-import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-GwSAk9vY.js";
-import { n as isMatrixRoomId } from "./target-ids-Nwx7cMVE.js";
-import { r as updateMatrixAccountConfig } from "./config-update-BnX26jCO.js";
-import { a as moveSingleMatrixAccountConfigToNamedAccount, i as createMatrixSetupDmPolicy } from "./setup-core-DuTlyqRz.js";
-import { n as validateMatrixHomeserverUrl, r as isPrivateOrLoopbackHost, t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-GRHde6lq.js";
-import { n as ensureMatrixSdkInstalled, r as isMatrixSdkAvailable } from "./deps-mtxF2mHI.js";
+import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
+import { c as resolveMatrixEnvAuthReadiness, r as requiresExplicitMatrixDefaultAccount } from "./account-selection-5koohRSQ.mjs";
+import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
+import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-BF5hyc-1.mjs";
+import { n as isMatrixRoomId } from "./target-ids-Nwx7cMVE.mjs";
+import { r as updateMatrixAccountConfig } from "./config-update-B_4qZ5bV.mjs";
+import { a as moveSingleMatrixAccountConfigToNamedAccount, i as createMatrixSetupDmPolicy } from "./setup-core-BUcDAM7q.mjs";
+import { n as validateMatrixHomeserverUrl, r as isPrivateOrLoopbackHost, t as resolveValidatedMatrixHomeserverUrl } from "./url-validation-GRHde6lq.mjs";
+import { n as ensureMatrixSdkInstalled, r as isMatrixSdkAvailable } from "./deps-mtxF2mHI.mjs";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringifiedOptionalString, normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
-import { formatDocsLink, hasConfiguredSecretInput, mergeAllowFromEntries, normalizeAccountId as normalizeAccountId$1, promptAccountId, promptChannelAccessConfig, splitSetupEntries } from "openclaw/plugin-sdk/setup";
+import { formatDocsLink, hasConfiguredSecretInput, mergeAllowFromEntries, normalizeAccountId as normalizeAccountId$1, promptAccountId, promptChannelAccessConfig, setSetupChannelEnabled, splitSetupEntries } from "openclaw/plugin-sdk/setup";
 import { isPrivateNetworkOptInEnabled } from "openclaw/plugin-sdk/ssrf-policy";
 //#region extensions/matrix/src/onboarding.ts
 const channel = "matrix";
@@ -91,7 +91,7 @@ async function promptMatrixAllowFrom(params) {
 			pending.push(part);
 		}
 		if (pending.length > 0) {
-			const { resolveMatrixTargets } = await import("./resolve-targets-BpnALDzR.js").then((n) => n.n);
+			const { resolveMatrixTargets } = await import("./resolve-targets-drjgAdIe.mjs").then((n) => n.n);
 			const results = await resolveMatrixTargets({
 				cfg,
 				accountId,
@@ -211,7 +211,7 @@ async function configureMatrixAccessPrompts(params) {
 						resolvedIds.push(cleaned);
 						continue;
 					}
-					const { listMatrixDirectoryGroupsLive } = await import("./directory-live-DABCxf8j.js").then((n) => n.t);
+					const { listMatrixDirectoryGroupsLive } = await import("./directory-live-CatwztQc.mjs").then((n) => n.t);
 					const matches = await listMatrixDirectoryGroupsLive({
 						cfg: next,
 						accountId: params.accountId,
@@ -464,7 +464,7 @@ const matrixOnboardingAdapter = {
 		});
 	},
 	afterConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-CSI1L1lm.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BYgBD504.mjs");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,
@@ -473,16 +473,7 @@ const matrixOnboardingAdapter = {
 		});
 	},
 	dmPolicy,
-	disable: (cfg) => ({
-		...cfg,
-		channels: {
-			...cfg.channels,
-			matrix: {
-				...cfg.channels?.["matrix"],
-				enabled: false
-			}
-		}
-	})
+	disable: (cfg) => setSetupChannelEnabled(cfg, channel, false)
 };
 //#endregion
 //#region extensions/matrix/src/setup-surface.ts

package/dist/{startup-verification-BTSf31hS.js → .setup/startup-verification-Bq5qeEGn.mjs}

@@ -1,6 +1,6 @@
-import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { k as resolveMatrixSqliteStateEnv } from "./storage-metadata-DYArLcq1.js";
-import { o as resolveMatrixStoragePaths, r as recordCurrentStorageMetaDeviceId } from "./storage-CV-pfV_2.js";
+import { t as getMatrixRuntime } from "./runtime-1kn1P6io.mjs";
+import { k as resolveMatrixSqliteStateEnv } from "./storage-metadata-BQJjHC_i.mjs";
+import { o as resolveMatrixStoragePaths, r as recordCurrentStorageMetaDeviceId } from "./storage-DJ-oUgmX.mjs";
 import { createHash } from "node:crypto";
 import path from "node:path";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";

package/dist/{storage-CV-pfV_2.js → .setup/storage-DJ-oUgmX.mjs}

@@ -1,6 +1,6 @@
-import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { n as isMatrixActiveTokenRootDirectory, r as resolveMatrixAccountStorageRoot } from "./storage-paths-DVCANXTc.js";
-import { C as scoreMatrixCryptoStateInStore, c as MATRIX_RECOVERY_KEY_FILENAME, d as migrateLegacyMatrixLegacyCryptoMigrationFileToStore, i as openMatrixStorageMetaStoreOptions, o as MATRIX_IDB_SNAPSHOT_FILENAME, p as migrateLegacyMatrixRecoveryKeyFileToStore, r as normalizeMatrixStorageMetadata, s as MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME, t as STORAGE_META_STATE_KEY } from "./storage-metadata-DYArLcq1.js";
+import { t as getMatrixRuntime } from "./runtime-1kn1P6io.mjs";
+import { n as isMatrixActiveTokenRootDirectory, r as resolveMatrixAccountStorageRoot } from "./storage-paths-DVCANXTc.mjs";
+import { C as scoreMatrixCryptoStateInStore, c as MATRIX_RECOVERY_KEY_FILENAME, d as migrateLegacyMatrixLegacyCryptoMigrationFileToStore, i as openMatrixStorageMetaStoreOptions, o as MATRIX_IDB_SNAPSHOT_FILENAME, p as migrateLegacyMatrixRecoveryKeyFileToStore, r as normalizeMatrixStorageMetadata, s as MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME, t as STORAGE_META_STATE_KEY } from "./storage-metadata-BQJjHC_i.mjs";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import path from "node:path";
 import fs from "node:fs";
@@ -161,14 +161,14 @@ function resolveMatrixStateFilePath(params) {
 }
 async function maybeMigrateLegacyStorage(params) {
 	const hasAccountScopedLegacyStorageFile = fs.existsSync(params.storagePaths.storagePath);
-	const syncCache = hasAccountScopedLegacyStorageFile ? await import("./sync-cache-state-C-mhj3xb.js").then((n) => n.s) : null;
+	const syncCache = hasAccountScopedLegacyStorageFile ? await import("./sync-cache-state-CFiZIPhA.mjs").then((n) => n.s) : null;
 	const hasAccountScopedLegacyStorage = hasAccountScopedLegacyStorageFile && await syncCache?.readLegacyMatrixSyncCacheState(params.storagePaths.rootDir) !== null;
 	const hasAccountScopedRecoveryKey = fs.existsSync(params.storagePaths.recoveryKeyPath);
 	const hasAccountScopedLegacyCryptoMigration = fs.existsSync(path.join(params.storagePaths.rootDir, MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME));
 	if (!hasAccountScopedLegacyStorage && !hasAccountScopedRecoveryKey && !hasAccountScopedLegacyCryptoMigration) return;
 	const logger = getMatrixRuntime().logging.getChildLogger({ module: "matrix-storage" });
 	fs.mkdirSync(params.storagePaths.rootDir, { recursive: true });
-	const moved = [];
+	const migrations = [];
 	const pendingArchives = [];
 	const skippedExistingTargets = [];
 	try {
@@ -177,38 +177,37 @@ async function maybeMigrateLegacyStorage(params) {
 			sourcePath: params.storagePaths.storagePath,
 			targetRootDir: params.storagePaths.rootDir,
 			label: "account sync cache",
-			moved,
+			migrations,
 			pendingArchives
 		});
 		if (hasAccountScopedRecoveryKey) {
 			migrateLegacyMatrixRecoveryKeyFileToStore(params.storagePaths.rootDir);
-			moved.push({
+			migrations.push({
 				sourcePath: params.storagePaths.recoveryKeyPath,
-				targetPath: `${params.storagePaths.rootDir} SQLite recovery key state`,
+				targetDescription: `${params.storagePaths.rootDir} SQLite recovery key state`,
 				label: "recovery key"
 			});
 		}
 		if (hasAccountScopedLegacyCryptoMigration) {
 			migrateLegacyMatrixLegacyCryptoMigrationFileToStore(params.storagePaths.rootDir);
-			moved.push({
+			migrations.push({
 				sourcePath: path.join(params.storagePaths.rootDir, MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME),
-				targetPath: `${params.storagePaths.rootDir} SQLite legacy crypto migration state`,
+				targetDescription: `${params.storagePaths.rootDir} SQLite legacy crypto migration state`,
 				label: "legacy crypto migration"
 			});
 		}
 	} catch (err) {
-		const rollbackError = rollbackLegacyMoves(moved);
-		throw new Error(rollbackError ? `Failed migrating legacy Matrix client storage: ${String(err)}. Rollback also failed: ${rollbackError}` : `Failed migrating legacy Matrix client storage: ${String(err)}`, { cause: err });
+		throw new Error(`Failed migrating legacy Matrix client storage: ${String(err)}`, { cause: err });
 	}
 	for (const archive of pendingArchives) archiveLegacyStoragePath({
 		...archive,
 		skippedExistingTargets
 	});
-	if (moved.length > 0) logger.info(`matrix: migrated legacy client storage into ${params.storagePaths.rootDir}\n${moved.map((entry) => `- ${entry.label}: ${entry.sourcePath} -> ${entry.targetPath}`).join("\n")}`);
+	if (migrations.length > 0) logger.info(`matrix: migrated legacy client storage into ${params.storagePaths.rootDir}\n${migrations.map((entry) => `- ${entry.label}: ${entry.sourcePath} -> ${entry.targetDescription}`).join("\n")}`);
 	if (skippedExistingTargets.length > 0) logger.warn?.(`matrix: legacy client storage files were left in place because their migrated targets already existed.\n${skippedExistingTargets.join("\n")}`);
 }
 async function migrateLegacySyncCacheToSqlite(params) {
-	const syncCache = await import("./sync-cache-state-C-mhj3xb.js").then((n) => n.s);
+	const syncCache = await import("./sync-cache-state-CFiZIPhA.mjs").then((n) => n.s);
 	const persisted = await syncCache.readLegacyMatrixSyncCacheState(params.sourceRootDir);
 	if (!persisted) return;
 	const store = getMatrixRuntime().state.openKeyedStore(syncCache.openMatrixSyncCacheStoreOptions(params.targetRootDir));
@@ -221,10 +220,10 @@ async function migrateLegacySyncCacheToSqlite(params) {
 			payload: persisted,
 			store
 		});
-		claimCurrentTokenStorageState({ rootDir: params.targetRootDir });
-		params.moved.push({
+		await claimCurrentTokenStorageState({ rootDir: params.targetRootDir });
+		params.migrations.push({
 			sourcePath: params.sourcePath,
-			targetPath: `${params.targetRootDir} SQLite sync cache`,
+			targetDescription: `${params.targetRootDir} SQLite sync cache`,
 			label: params.label
 		});
 	}
@@ -241,15 +240,6 @@ function archiveLegacyStoragePath(params) {
 	}
 	fs.renameSync(params.sourcePath, archivedLegacyStoragePath);
 }
-function rollbackLegacyMoves(moved) {
-	for (const entry of moved.toReversed()) try {
-		if (!fs.existsSync(entry.targetPath) || fs.existsSync(entry.sourcePath)) continue;
-		fs.renameSync(entry.targetPath, entry.sourcePath);
-	} catch (err) {
-		return `${entry.label} (${entry.targetPath} -> ${entry.sourcePath}): ${String(err)}`;
-	}
-	return null;
-}
 function writeStoredRootMetadata(rootDir, payload) {
 	try {
 		const normalized = normalizeMatrixStorageMetadata(payload);
@@ -272,7 +262,32 @@ function writeStorageMeta(params) {
 		createdAt: existing.createdAt ?? (/* @__PURE__ */ new Date()).toISOString()
 	});
 }
-function claimCurrentTokenStorageState(params) {
+async function claimCurrentTokenStorageState(params) {
+	try {
+		const store = getMatrixRuntime().state.openKeyedStore(openMatrixStorageMetaStoreOptions(params.rootDir));
+		if (!store.observe || !store.compareAndApply) return claimCurrentTokenStorageStateSync(params);
+		let observation = await store.observe(STORAGE_META_STATE_KEY);
+		for (;;) {
+			const metadata = normalizeMatrixStorageMetadata(observation.value) ?? normalizeMatrixStorageMetadata(loadJsonFile(path.join(params.rootDir, STORAGE_META_FILENAME)));
+			if (!metadata?.accessTokenHash?.trim()) return false;
+			const result = await store.compareAndApply(STORAGE_META_STATE_KEY, observation.comparison, {
+				operation: "update",
+				action: "set",
+				value: {
+					...metadata,
+					accountId: metadata.accountId ?? DEFAULT_ACCOUNT_KEY,
+					currentTokenStateClaimed: true,
+					createdAt: metadata.createdAt ?? (/* @__PURE__ */ new Date()).toISOString()
+				}
+			});
+			if (result.status !== "conflict") return true;
+			observation = result.current;
+		}
+	} catch {
+		return false;
+	}
+}
+function claimCurrentTokenStorageStateSync(params) {
 	const metadata = readStoredRootMetadata(params.rootDir);
 	if (!metadata.accessTokenHash?.trim()) return false;
 	return writeStoredRootMetadata(params.rootDir, {

package/dist/{storage-metadata-DYArLcq1.js → .setup/storage-metadata-BQJjHC_i.mjs}

@@ -1,4 +1,4 @@
-import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
+import { t as getMatrixRuntime } from "./runtime-1kn1P6io.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash, randomUUID } from "node:crypto";
 import path from "node:path";
@@ -62,21 +62,46 @@ function readMatrixRecoveryKeyState(storageRootDir) {
 		stateKey: STATE_KEY
 	});
 }
-function readMatrixRecoveryKeyStateForPath(recoveryKeyPath) {
-	return readMatrixRecoveryKeyStateWithKey({
-		storageRootDir: path.dirname(recoveryKeyPath),
-		stateKey: resolveRecoveryKeyStateKeyForPath(recoveryKeyPath)
-	});
-}
 function readMatrixRecoveryKeyStateWithKey(params) {
 	return normalizeMatrixStoredRecoveryKey(openSyncStore(openMatrixRecoveryKeyStoreOptions(params.storageRootDir)).lookup(params.stateKey));
 }
-function writeMatrixRecoveryKeyStateForPath(params) {
-	writeMatrixRecoveryKeyStateWithKey({
-		storageRootDir: path.dirname(params.recoveryKeyPath),
-		stateKey: resolveRecoveryKeyStateKeyForPath(params.recoveryKeyPath),
-		payload: params.payload
-	});
+async function readMatrixRecoveryKeyStateForPathAsync(recoveryKeyPath, stateRuntime) {
+	return normalizeMatrixStoredRecoveryKey(await stateRuntime.openKeyedStore(openMatrixRecoveryKeyStoreOptions(path.dirname(recoveryKeyPath))).lookup(resolveRecoveryKeyStateKeyForPath(recoveryKeyPath)));
+}
+async function writeMatrixRecoveryKeyStateForPathAsync(params) {
+	const payload = normalizeMatrixStoredRecoveryKey(params.payload);
+	if (!payload) throw new Error("Invalid Matrix recovery key state");
+	if (params.preserveEncodedPrivateKey) {
+		await updateMatrixRecoveryKeyState(params, (current) => normalizeMatrixStoredRecoveryKey({
+			...payload,
+			encodedPrivateKey: normalizeMatrixStoredRecoveryKey(current)?.encodedPrivateKey
+		}) ?? void 0);
+		return;
+	}
+	await params.stateRuntime.openKeyedStore(openMatrixRecoveryKeyStoreOptions(path.dirname(params.recoveryKeyPath))).register(resolveRecoveryKeyStateKeyForPath(params.recoveryKeyPath), payload);
+}
+async function updateMatrixRecoveryKeyState(params, update) {
+	const store = params.stateRuntime.openKeyedStore(openMatrixRecoveryKeyStoreOptions(path.dirname(params.recoveryKeyPath)));
+	const key = resolveRecoveryKeyStateKeyForPath(params.recoveryKeyPath);
+	if (!store.observe || !store.compareAndApply) {
+		if (!store.update) throw new Error("Matrix recovery key store does not support atomic updates");
+		await store.update(key, update);
+		return;
+	}
+	let observation = await store.observe(key);
+	for (;;) {
+		const value = update(observation.value);
+		const result = await store.compareAndApply(key, observation.comparison, value === void 0 ? {
+			operation: "update",
+			action: "keep"
+		} : {
+			operation: "update",
+			action: "set",
+			value
+		});
+		if (result.status !== "conflict") return;
+		observation = result.current;
+	}
 }
 function writeMatrixRecoveryKeyStateWithKey(params) {
 	const payload = normalizeMatrixStoredRecoveryKey(params.payload);
@@ -107,17 +132,17 @@ async function writeMatrixLegacyCryptoMigrationStateToStore(params) {
 	if (!state) throw new Error("Invalid Matrix legacy crypto migration state");
 	await params.store.register(STATE_KEY, state);
 }
-function readMatrixIdbSnapshotJson(storageRootDir) {
-	return readIdbSnapshotJsonFromStore(openSyncStore(openMatrixIdbSnapshotStoreOptions(storageRootDir)));
+async function readMatrixIdbSnapshotJson(storageRootDir, stateRuntime = getMatrixRuntime().state) {
+	return await readMatrixIdbSnapshotJsonFromStore({ store: stateRuntime.openKeyedStore(openMatrixIdbSnapshotStoreOptions(storageRootDir)) });
 }
 function hasMatrixIdbSnapshotState(storageRootDir) {
 	return isIdbSnapshotMeta(openSyncStore(openMatrixIdbSnapshotStoreOptions(storageRootDir)).lookup(idbMetaKey()));
 }
-function writeMatrixIdbSnapshotJson(params) {
-	writeIdbSnapshotJsonToStore({
+async function writeMatrixIdbSnapshotJson(params) {
+	await writeMatrixIdbSnapshotJsonToStore({
 		snapshotJson: params.snapshotJson,
 		databaseCount: params.databaseCount,
-		store: openSyncStore(openMatrixIdbSnapshotStoreOptions(params.storageRootDir))
+		store: (params.stateRuntime ?? getMatrixRuntime().state).openKeyedStore(openMatrixIdbSnapshotStoreOptions(params.storageRootDir))
 	});
 }
 async function readMatrixIdbSnapshotJsonFromStore(params) {
@@ -130,17 +155,25 @@ async function writeMatrixIdbSnapshotJsonToStore(params) {
 	for (const row of await params.store.entries()) if (row.key.startsWith(idbChunkKeyPrefix()) && !rows.nextChunkKeys.has(row.key)) await params.store.delete(row.key);
 }
 function migrateLegacyMatrixRecoveryKeyFileToStore(storageRootDir) {
-	return migrateLegacyMatrixRecoveryKeyFilePathToStore(path.join(storageRootDir, MATRIX_RECOVERY_KEY_FILENAME));
-}
-function migrateLegacyMatrixRecoveryKeyFilePathToStore(recoveryKeyPath) {
-	const existing = readMatrixRecoveryKeyStateForPath(recoveryKeyPath);
+	const recoveryKeyPath = path.join(storageRootDir, MATRIX_RECOVERY_KEY_FILENAME);
+	const existing = readMatrixRecoveryKeyState(storageRootDir);
 	const legacy = readLegacyMatrixRecoveryKeyFile(recoveryKeyPath);
-	if (!existing && legacy) writeMatrixRecoveryKeyStateForPath({
-		recoveryKeyPath,
+	if (!existing && legacy) writeMatrixRecoveryKeyStateWithKey({
+		storageRootDir,
+		stateKey: STATE_KEY,
 		payload: legacy
 	});
 	return archiveLegacyStateFileIfPossible(recoveryKeyPath);
 }
+async function migrateLegacyMatrixRecoveryKeyFilePathToStoreAsync(recoveryKeyPath, stateRuntime) {
+	const legacy = readLegacyMatrixRecoveryKeyFile(recoveryKeyPath);
+	if (legacy) await updateMatrixRecoveryKeyState({
+		recoveryKeyPath,
+		stateRuntime
+	}, (current) => normalizeMatrixStoredRecoveryKey(current) ? void 0 : legacy);
+	else await readMatrixRecoveryKeyStateForPathAsync(recoveryKeyPath, stateRuntime);
+	return archiveLegacyStateFileIfPossible(recoveryKeyPath);
+}
 function migrateLegacyMatrixLegacyCryptoMigrationFileToStore(storageRootDir) {
 	const existing = readMatrixLegacyCryptoMigrationState(storageRootDir);
 	const legacy = readLegacyMatrixLegacyCryptoMigrationState(storageRootDir);
@@ -235,32 +268,12 @@ function archiveLegacyStateFileIfPossible(filePath) {
 	fs.renameSync(filePath, archivedPath);
 	return true;
 }
-function readIdbSnapshotJsonFromStore(store) {
-	const meta = store.lookup(idbMetaKey());
-	if (!isIdbSnapshotMeta(meta)) return null;
-	const chunks = readIdbSnapshotChunks(meta, store);
-	return chunks ? chunks.join("") : null;
-}
 async function readIdbSnapshotJsonFromAsyncStore(store) {
 	const meta = await store.lookup(idbMetaKey());
 	if (!isIdbSnapshotMeta(meta)) return null;
 	const chunks = await readIdbSnapshotChunksAsync(meta, store);
 	return chunks ? chunks.join("") : null;
 }
-function readIdbSnapshotChunks(meta, store) {
-	const records = store.lookupMany?.(Array.from({ length: meta.chunkCount }, (_, index) => idbChunkKey(meta.generation, index)));
-	const chunks = [];
-	for (let index = 0; index < meta.chunkCount; index += 1) {
-		const result = records?.[index];
-		if (result && !result.ok) throw result.error;
-		const chunk = records ? result?.value : store.lookup(idbChunkKey(meta.generation, index));
-		if (!isIdbSnapshotChunk(chunk) || chunk.index !== index) return null;
-		chunks.push(chunk.data);
-	}
-	const snapshotJson = chunks.join("");
-	if (meta.digest !== digestText(snapshotJson)) return null;
-	return chunks;
-}
 async function readIdbSnapshotChunksAsync(meta, store) {
 	const records = await store.lookupMany?.(Array.from({ length: meta.chunkCount }, (_, index) => idbChunkKey(meta.generation, index)));
 	const chunks = [];
@@ -275,12 +288,6 @@ async function readIdbSnapshotChunksAsync(meta, store) {
 	if (meta.digest !== digestText(snapshotJson)) return null;
 	return chunks;
 }
-function writeIdbSnapshotJsonToStore(params) {
-	const rows = buildIdbSnapshotRows(params.snapshotJson, params.databaseCount);
-	for (const row of rows.chunks) params.store.register(row.key, row.value);
-	params.store.register(rows.meta.key, rows.meta.value);
-	for (const row of params.store.entries()) if (row.key.startsWith(idbChunkKeyPrefix()) && !rows.nextChunkKeys.has(row.key)) params.store.delete(row.key);
-}
 function buildIdbSnapshotRows(snapshotJson, databaseCount) {
 	const generation = randomUUID().replaceAll("-", "");
 	const chunks = chunkText(snapshotJson).map((data, index) => ({
@@ -378,4 +385,4 @@ async function writeMatrixStorageMetaStateToStore(params) {
 	await params.store.register(STORAGE_META_STATE_KEY, params.payload);
 }
 //#endregion
-export { resolveMatrixSqliteStateKey as A, scoreMatrixCryptoStateInStore as C, writeMatrixRecoveryKeyStateForPath as D, writeMatrixLegacyCryptoMigrationStateToStore as E, writeMatrixRecoveryKeyStateToStore as O, readMatrixRecoveryKeyStateForPath as S, writeMatrixIdbSnapshotJsonToStore as T, readLegacyMatrixLegacyCryptoMigrationState as _, writeMatrixStorageMetaStateToStore as a, readMatrixIdbSnapshotJson as b, MATRIX_RECOVERY_KEY_FILENAME as c, migrateLegacyMatrixLegacyCryptoMigrationFileToStore as d, migrateLegacyMatrixRecoveryKeyFilePathToStore as f, openMatrixRecoveryKeyStoreOptions as g, openMatrixLegacyCryptoMigrationStoreOptions as h, openMatrixStorageMetaStoreOptions as i, resolveMatrixSqliteStateEnv as k, hasMatrixLegacyCryptoMigrationStateInStore as l, openMatrixIdbSnapshotStoreOptions as m, hasMatrixStorageMetaStateInStore as n, MATRIX_IDB_SNAPSHOT_FILENAME as o, migrateLegacyMatrixRecoveryKeyFileToStore as p, normalizeMatrixStorageMetadata as r, MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME as s, STORAGE_META_STATE_KEY as t, hasMatrixRecoveryKeyStateInStore as u, readLegacyMatrixRecoveryKeyFile as v, writeMatrixIdbSnapshotJson as w, readMatrixIdbSnapshotJsonFromStore as x, readLegacyMatrixRecoveryKeyState as y };
+export { resolveMatrixSqliteStateKey as A, scoreMatrixCryptoStateInStore as C, writeMatrixRecoveryKeyStateForPathAsync as D, writeMatrixLegacyCryptoMigrationStateToStore as E, writeMatrixRecoveryKeyStateToStore as O, readMatrixRecoveryKeyStateForPathAsync as S, writeMatrixIdbSnapshotJsonToStore as T, readLegacyMatrixLegacyCryptoMigrationState as _, writeMatrixStorageMetaStateToStore as a, readMatrixIdbSnapshotJson as b, MATRIX_RECOVERY_KEY_FILENAME as c, migrateLegacyMatrixLegacyCryptoMigrationFileToStore as d, migrateLegacyMatrixRecoveryKeyFilePathToStoreAsync as f, openMatrixRecoveryKeyStoreOptions as g, openMatrixLegacyCryptoMigrationStoreOptions as h, openMatrixStorageMetaStoreOptions as i, resolveMatrixSqliteStateEnv as k, hasMatrixLegacyCryptoMigrationStateInStore as l, openMatrixIdbSnapshotStoreOptions as m, hasMatrixStorageMetaStateInStore as n, MATRIX_IDB_SNAPSHOT_FILENAME as o, migrateLegacyMatrixRecoveryKeyFileToStore as p, normalizeMatrixStorageMetadata as r, MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME as s, STORAGE_META_STATE_KEY as t, hasMatrixRecoveryKeyStateInStore as u, readLegacyMatrixRecoveryKeyFile as v, writeMatrixIdbSnapshotJson as w, readMatrixIdbSnapshotJsonFromStore as x, readLegacyMatrixRecoveryKeyState as y };

package/dist/{subagent-hooks-DeICLbU5.js → .setup/subagent-hooks-jFgft_Mr.mjs}

@@ -1,4 +1,4 @@
-import { a as listBindingsForAccount, i as listAllBindings, n as getMatrixThreadBindingManager, o as removeBindingRecord, s as resolveBindingKey } from "./thread-bindings-shared-oNPiyMWY.js";
+import { a as listBindingsForAccount, i as listAllBindings, n as getMatrixThreadBindingManager, o as removeBindingRecord, s as resolveBindingKey } from "./thread-bindings-shared-oNPiyMWY.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { getSessionBindingService } from "openclaw/plugin-sdk/conversation-binding-runtime";
 //#region extensions/matrix/src/matrix/subagent-hooks.ts

package/dist/{sync-cache-state-C-mhj3xb.js → .setup/sync-cache-state-CFiZIPhA.mjs}

@@ -1,5 +1,5 @@
-import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { k as resolveMatrixSqliteStateEnv } from "./storage-metadata-DYArLcq1.js";
+import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
+import { k as resolveMatrixSqliteStateEnv } from "./storage-metadata-BQJjHC_i.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash, randomUUID } from "node:crypto";
 import path from "node:path";

package/dist/{thread-binding-api-CzkeLZCU.js → .setup/thread-binding-api-DRMC62cs.mjs}

@@ -1,4 +1,4 @@
-import { o as resolveMatrixTargetIdentity } from "./target-ids-Nwx7cMVE.js";
+import { o as resolveMatrixTargetIdentity } from "./target-ids-Nwx7cMVE.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/matrix/src/thread-binding-api.ts
 const defaultTopLevelPlacement = "child";

package/dist/{thread-bindings-CRyf5on_.js → .setup/thread-bindings-Hy96ujd3.mjs}

@@ -1,8 +1,8 @@
-import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { a as listBindingsForAccount, c as resolveEffectiveBindingExpiry, d as setMatrixThreadBindingManagerEntry, l as setBindingRecord, m as toSessionBindingRecord, o as removeBindingRecord, p as toMatrixBindingTargetKind, r as getMatrixThreadBindingManagerEntry, s as resolveBindingKey, t as deleteMatrixThreadBindingManagerEntry } from "./thread-bindings-shared-oNPiyMWY.js";
-import { A as resolveMatrixSqliteStateKey, k as resolveMatrixSqliteStateEnv } from "./storage-metadata-DYArLcq1.js";
-import { a as resolveMatrixStateFilePath, t as claimCurrentTokenStorageState } from "./storage-CV-pfV_2.js";
-import { r as sendMessageMatrix } from "./send-B9l1lKau.js";
+import { t as getMatrixRuntime } from "./runtime-1kn1P6io.mjs";
+import { a as listBindingsForAccount, c as resolveEffectiveBindingExpiry, d as setMatrixThreadBindingManagerEntry, l as setBindingRecord, m as toSessionBindingRecord, o as removeBindingRecord, p as toMatrixBindingTargetKind, r as getMatrixThreadBindingManagerEntry, s as resolveBindingKey, t as deleteMatrixThreadBindingManagerEntry } from "./thread-bindings-shared-oNPiyMWY.mjs";
+import { A as resolveMatrixSqliteStateKey, k as resolveMatrixSqliteStateEnv } from "./storage-metadata-BQJjHC_i.mjs";
+import { a as resolveMatrixStateFilePath, t as claimCurrentTokenStorageState } from "./storage-DJ-oUgmX.mjs";
+import { r as sendMessageMatrix } from "./send-h0gZ_-qk.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import path from "node:path";
@@ -189,7 +189,7 @@ async function createMatrixThreadBindingManager(params) {
 				env: params.env,
 				stateDir: sqliteStateDir
 			});
-			claimCurrentTokenStorageState({ rootDir: sqliteStateDir });
+			await claimCurrentTokenStorageState({ rootDir: sqliteStateDir });
 		});
 		persistQueue = next;
 		return next;