@openclaw/matrix 2026.9.4 → 2026.9.6

package/dist/{storage-metadata-DYArLcq1.js → .setup/storage-metadata-fHN6Df2m.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";
@@ -56,32 +56,43 @@ function openMatrixIdbSnapshotStoreOptions(storageRootDir) {
 		env: resolveMatrixSqliteStateEnv({ stateDir: storageRootDir })
 	};
 }
-function readMatrixRecoveryKeyState(storageRootDir) {
-	return readMatrixRecoveryKeyStateWithKey({
-		storageRootDir,
-		stateKey: STATE_KEY
-	});
-}
-function readMatrixRecoveryKeyStateForPath(recoveryKeyPath) {
-	return readMatrixRecoveryKeyStateWithKey({
-		storageRootDir: path.dirname(recoveryKeyPath),
-		stateKey: resolveRecoveryKeyStateKeyForPath(recoveryKeyPath)
-	});
+async function readMatrixRecoveryKeyStateForPathAsync(recoveryKeyPath, stateRuntime) {
+	return normalizeMatrixStoredRecoveryKey(await stateRuntime.openKeyedStore(openMatrixRecoveryKeyStoreOptions(path.dirname(recoveryKeyPath))).lookup(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
-	});
-}
-function writeMatrixRecoveryKeyStateWithKey(params) {
+async function writeMatrixRecoveryKeyStateForPathAsync(params) {
 	const payload = normalizeMatrixStoredRecoveryKey(params.payload);
 	if (!payload) throw new Error("Invalid Matrix recovery key state");
-	openSyncStore(openMatrixRecoveryKeyStoreOptions(params.storageRootDir)).register(params.stateKey, payload);
+	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;
+	}
 }
 async function hasMatrixRecoveryKeyStateInStore(params) {
 	return normalizeMatrixStoredRecoveryKey(await params.store.lookup(STATE_KEY)) !== null;
@@ -91,13 +102,8 @@ async function writeMatrixRecoveryKeyStateToStore(params) {
 	if (!payload) throw new Error("Invalid Matrix recovery key state");
 	await params.store.register(STATE_KEY, payload);
 }
-function readMatrixLegacyCryptoMigrationState(storageRootDir) {
-	return normalizeMatrixLegacyCryptoMigrationState(openSyncStore(openMatrixLegacyCryptoMigrationStoreOptions(storageRootDir)).lookup(STATE_KEY));
-}
-function writeMatrixLegacyCryptoMigrationState(params) {
-	const state = normalizeMatrixLegacyCryptoMigrationState(params.state);
-	if (!state) throw new Error("Invalid Matrix legacy crypto migration state");
-	openSyncStore(openMatrixLegacyCryptoMigrationStoreOptions(params.storageRootDir)).register(STATE_KEY, state);
+async function readMatrixLegacyCryptoMigrationState(storageRootDir) {
+	return normalizeMatrixLegacyCryptoMigrationState(await getMatrixRuntime().state.openKeyedStore(openMatrixLegacyCryptoMigrationStoreOptions(storageRootDir)).lookup(STATE_KEY));
 }
 async function hasMatrixLegacyCryptoMigrationStateInStore(params) {
 	return normalizeMatrixLegacyCryptoMigrationState(await params.store.lookup(STATE_KEY)) !== null;
@@ -107,17 +113,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()));
+async function hasMatrixIdbSnapshotState(storageRootDir) {
+	return isIdbSnapshotMeta(await getMatrixRuntime().state.openKeyedStore(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) {
@@ -129,25 +135,36 @@ async function writeMatrixIdbSnapshotJsonToStore(params) {
 	await params.store.register(rows.meta.key, rows.meta.value);
 	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);
+async function migrateLegacyMatrixRecoveryKeyFilePathToStoreAsync(recoveryKeyPath, stateRuntime) {
 	const legacy = readLegacyMatrixRecoveryKeyFile(recoveryKeyPath);
-	if (!existing && legacy) writeMatrixRecoveryKeyStateForPath({
+	if (legacy) await updateMatrixRecoveryKeyState({
 		recoveryKeyPath,
-		payload: legacy
-	});
+		stateRuntime
+	}, (current) => normalizeMatrixStoredRecoveryKey(current) ? void 0 : legacy);
+	else await readMatrixRecoveryKeyStateForPathAsync(recoveryKeyPath, stateRuntime);
 	return archiveLegacyStateFileIfPossible(recoveryKeyPath);
 }
-function migrateLegacyMatrixLegacyCryptoMigrationFileToStore(storageRootDir) {
-	const existing = readMatrixLegacyCryptoMigrationState(storageRootDir);
+async function migrateLegacyMatrixLegacyCryptoMigrationFileToStore(storageRootDir) {
+	const options = openMatrixLegacyCryptoMigrationStoreOptions(storageRootDir);
+	const store = getMatrixRuntime().state.openKeyedStore(options);
 	const legacy = readLegacyMatrixLegacyCryptoMigrationState(storageRootDir);
-	if (!existing && legacy) writeMatrixLegacyCryptoMigrationState({
-		storageRootDir,
-		state: legacy
-	});
+	if (!legacy) await store.lookup(STATE_KEY);
+	else if (!store.observe || !store.compareAndApply) {
+		const legacyStore = openSyncStore(options);
+		if (!normalizeMatrixLegacyCryptoMigrationState(legacyStore.lookup(STATE_KEY))) legacyStore.register(STATE_KEY, legacy);
+	} else {
+		let observation = await store.observe(STATE_KEY);
+		for (;;) {
+			if (normalizeMatrixLegacyCryptoMigrationState(observation.value)) break;
+			const result = await store.compareAndApply(STATE_KEY, observation.comparison, {
+				operation: "update",
+				action: "set",
+				value: legacy
+			});
+			if (result.status !== "conflict") break;
+			observation = result.current;
+		}
+	}
 	return archiveLegacyStateFileIfPossible(path.join(storageRootDir, MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME));
 }
 function readLegacyMatrixRecoveryKeyState(storageRootDir) {
@@ -159,17 +176,17 @@ function readLegacyMatrixRecoveryKeyFile(filePath) {
 function readLegacyMatrixLegacyCryptoMigrationState(storageRootDir) {
 	return readJsonFileSync(path.join(storageRootDir, MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME), normalizeMatrixLegacyCryptoMigrationState);
 }
-function scoreMatrixCryptoStateInStore(storageRootDir) {
+async function scoreMatrixCryptoStateInStore(storageRootDir) {
 	if (!matrixCryptoStateDatabaseExists(storageRootDir)) return 0;
 	let score = 0;
 	try {
-		if (readMatrixLegacyCryptoMigrationState(storageRootDir)) score += 3;
+		if (await readMatrixLegacyCryptoMigrationState(storageRootDir)) score += 3;
 	} catch {}
 	try {
-		if (readMatrixRecoveryKeyState(storageRootDir)) score += 2;
+		if (await readMatrixRecoveryKeyStateForPathAsync(path.join(storageRootDir, "recovery-key.json"), getMatrixRuntime().state)) score += 2;
 	} catch {}
 	try {
-		if (hasMatrixIdbSnapshotState(storageRootDir)) score += 2;
+		if (await hasMatrixIdbSnapshotState(storageRootDir)) score += 2;
 	} catch {}
 	return score;
 }
@@ -235,32 +252,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 +272,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 +369,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 { writeMatrixIdbSnapshotJson as C, writeMatrixRecoveryKeyStateToStore as D, writeMatrixRecoveryKeyStateForPathAsync as E, resolveMatrixSqliteStateEnv as O, scoreMatrixCryptoStateInStore as S, writeMatrixLegacyCryptoMigrationStateToStore as T, readLegacyMatrixRecoveryKeyFile as _, writeMatrixStorageMetaStateToStore as a, readMatrixIdbSnapshotJsonFromStore as b, MATRIX_RECOVERY_KEY_FILENAME as c, migrateLegacyMatrixLegacyCryptoMigrationFileToStore as d, migrateLegacyMatrixRecoveryKeyFilePathToStoreAsync as f, readLegacyMatrixLegacyCryptoMigrationState as g, openMatrixRecoveryKeyStoreOptions as h, openMatrixStorageMetaStoreOptions as i, resolveMatrixSqliteStateKey as k, hasMatrixLegacyCryptoMigrationStateInStore as l, openMatrixLegacyCryptoMigrationStoreOptions as m, hasMatrixStorageMetaStateInStore as n, MATRIX_IDB_SNAPSHOT_FILENAME as o, openMatrixIdbSnapshotStoreOptions as p, normalizeMatrixStorageMetadata as r, MATRIX_LEGACY_CRYPTO_MIGRATION_FILENAME as s, STORAGE_META_STATE_KEY as t, hasMatrixRecoveryKeyStateInStore as u, readLegacyMatrixRecoveryKeyState as v, writeMatrixIdbSnapshotJsonToStore as w, readMatrixRecoveryKeyStateForPathAsync as x, readMatrixIdbSnapshotJson 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-BMtGMxU1.mjs}

@@ -1,19 +1,19 @@
-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 { O as resolveMatrixSqliteStateEnv } from "./storage-metadata-fHN6Df2m.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash, randomUUID } from "node:crypto";
 import path from "node:path";
 import fs from "node:fs/promises";
+import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 //#region extensions/matrix/src/matrix/client/sync-cache-state.ts
 var sync_cache_state_exports = /* @__PURE__ */ __exportAll({
 	MATRIX_SYNC_CACHE_VERSION: () => 1,
-	deleteMatrixSyncCacheStateFromSyncStore: () => deleteMatrixSyncCacheStateFromSyncStore,
+	deleteMatrixSyncCacheStateFromStore: () => deleteMatrixSyncCacheStateFromStore,
 	hasMatrixSyncCacheStateInStore: () => hasMatrixSyncCacheStateInStore,
 	openMatrixSyncCacheStoreOptions: () => openMatrixSyncCacheStoreOptions,
 	readLegacyMatrixSyncCacheState: () => readLegacyMatrixSyncCacheState,
-	readPersistedStoreFromSyncStore: () => readPersistedStoreFromSyncStore,
-	writeMatrixSyncCacheStateToStore: () => writeMatrixSyncCacheStateToStore,
-	writeMatrixSyncCacheStateToSyncStore: () => writeMatrixSyncCacheStateToSyncStore
+	readPersistedStoreFromStore: () => readPersistedStoreFromStore,
+	writeMatrixSyncCacheStateToStore: () => writeMatrixSyncCacheStateToStore
 });
 const MATRIX_SYNC_CACHE_VERSION = 1;
 const SYNC_CACHE_NAMESPACE = "sync-cache";
@@ -21,6 +21,7 @@ const SYNC_CACHE_MAX_ENTRIES = 2e4;
 const SYNC_CACHE_MAX_CHUNKS = Math.floor(19999 / 2);
 const SYNC_CACHE_STATE_KEY = "current";
 const SYNC_CACHE_CHUNK_BYTES = 24e3;
+const syncCacheOperations = new KeyedAsyncQueue();
 function normalizeRoomsData(value) {
 	if (!isRecord(value)) return null;
 	return {
@@ -70,16 +71,20 @@ function normalizeLegacyPersistedStore(value) {
 		cleanShutdown: false
 	};
 }
-function readPersistedStoreFromSyncStore(store) {
+async function readPersistedStoreFromStore(params) {
+	const { storageRootDir, store } = params;
+	return syncCacheOperations.enqueue(path.resolve(storageRootDir), () => readPersistedStore(store));
+}
+async function readPersistedStore(store) {
 	const stateKey = SYNC_CACHE_STATE_KEY;
-	const meta = store.lookup(metaKey(stateKey));
+	const meta = await store.lookup(metaKey(stateKey));
 	if (!isSyncCacheMeta(meta)) return null;
-	const records = store.lookupMany?.(Array.from({ length: meta.chunkCount }, (_, index) => chunkKey(stateKey, meta.generation, index)));
+	const records = await store.lookupMany?.(Array.from({ length: meta.chunkCount }, (_, index) => chunkKey(stateKey, 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(chunkKey(stateKey, meta.generation, index));
+		const chunk = records ? result?.value : await store.lookup(chunkKey(stateKey, meta.generation, index));
 		if (!isSyncCacheChunk(chunk) || chunk.index !== index) return normalizePersistedStore({
 			version: 1,
 			savedSync: null,
@@ -191,32 +196,17 @@ async function readLegacyMatrixSyncCacheState(storageRootDir) {
 	}
 }
 async function hasMatrixSyncCacheStateInStore(params) {
-	const stateKey = SYNC_CACHE_STATE_KEY;
-	const meta = await params.store.lookup(metaKey(stateKey));
-	if (!isSyncCacheMeta(meta) || meta.chunkCount <= 0) return false;
-	const records = await params.store.lookupMany?.(Array.from({ length: meta.chunkCount }, (_, index) => chunkKey(stateKey, 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 : await params.store.lookup(chunkKey(stateKey, meta.generation, index));
-		if (!isSyncCacheChunk(chunk) || chunk.index !== index) return false;
-		chunks.push(chunk.data);
-	}
-	const syncJson = chunks.join("");
-	if (meta.syncDigest !== digestText(syncJson)) return false;
-	try {
-		return toPersistedSyncData(JSON.parse(syncJson)) !== null;
-	} catch {
-		return false;
-	}
+	return Boolean((await readPersistedStoreFromStore(params))?.savedSync);
 }
 async function writeMatrixSyncCacheStateToStore(params) {
+	const { storageRootDir, store, payload } = params;
 	const stateKey = SYNC_CACHE_STATE_KEY;
-	const rows = buildSyncCacheRows(stateKey, params.payload);
-	for (const row of rows.chunks) await params.store.register(row.key, row.value);
-	await params.store.register(rows.meta.key, rows.meta.value);
-	for (const row of await params.store.entries()) if (row.key.startsWith(chunkKeyPrefix(stateKey)) && !rows.nextChunkKeys.has(row.key)) await params.store.delete(row.key);
+	const rows = buildSyncCacheRows(stateKey, payload);
+	return syncCacheOperations.enqueue(path.resolve(storageRootDir), async () => {
+		for (const row of rows.chunks) await store.register(row.key, row.value);
+		await store.register(rows.meta.key, rows.meta.value);
+		for (const row of await store.entries()) if (row.key.startsWith(chunkKeyPrefix(stateKey)) && !rows.nextChunkKeys.has(row.key)) await store.delete(row.key);
+	});
 }
 function openMatrixSyncCacheStoreOptions(storageRootDir) {
 	return {
@@ -225,16 +215,13 @@ function openMatrixSyncCacheStoreOptions(storageRootDir) {
 		env: resolveMatrixSqliteStateEnv({ stateDir: storageRootDir })
 	};
 }
-function writeMatrixSyncCacheStateToSyncStore(params) {
-	const rows = buildSyncCacheRows(SYNC_CACHE_STATE_KEY, params.payload);
-	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(chunkKeyPrefix(SYNC_CACHE_STATE_KEY)) && !rows.nextChunkKeys.has(row.key)) params.store.delete(row.key);
-}
-async function deleteMatrixSyncCacheStateFromSyncStore(params) {
-	params.store.delete(metaKey(SYNC_CACHE_STATE_KEY));
-	for (const row of params.store.entries()) if (row.key.startsWith(chunkKeyPrefix(SYNC_CACHE_STATE_KEY))) params.store.delete(row.key);
-	await fs.rm(resolveLegacySyncCachePath(params.storageRootDir), { force: true }).catch(() => void 0);
+async function deleteMatrixSyncCacheStateFromStore(params) {
+	const { storageRootDir, store } = params;
+	return syncCacheOperations.enqueue(path.resolve(storageRootDir), async () => {
+		await store.delete(metaKey(SYNC_CACHE_STATE_KEY));
+		for (const row of await store.entries()) if (row.key.startsWith(chunkKeyPrefix(SYNC_CACHE_STATE_KEY))) await store.delete(row.key);
+		await fs.rm(resolveLegacySyncCachePath(storageRootDir), { force: true }).catch(() => void 0);
+	});
 }
 //#endregion
-export { readLegacyMatrixSyncCacheState as a, writeMatrixSyncCacheStateToStore as c, openMatrixSyncCacheStoreOptions as i, writeMatrixSyncCacheStateToSyncStore as l, deleteMatrixSyncCacheStateFromSyncStore as n, readPersistedStoreFromSyncStore as o, hasMatrixSyncCacheStateInStore as r, sync_cache_state_exports as s, MATRIX_SYNC_CACHE_VERSION as t };
+export { readLegacyMatrixSyncCacheState as a, writeMatrixSyncCacheStateToStore as c, openMatrixSyncCacheStoreOptions as i, deleteMatrixSyncCacheStateFromStore as n, readPersistedStoreFromStore as o, hasMatrixSyncCacheStateInStore as r, sync_cache_state_exports as s, MATRIX_SYNC_CACHE_VERSION as t };

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-Bwv87Gve.js → .setup/thread-bindings-JlnLDfPM.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-UWLIQ0bG.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 { O as resolveMatrixSqliteStateEnv, k as resolveMatrixSqliteStateKey } from "./storage-metadata-fHN6Df2m.mjs";
+import { a as resolveMatrixStateFilePath, t as claimCurrentTokenStorageState } from "./storage-BXaFc0S4.mjs";
+import { r as sendMessageMatrix } from "./send-aVdC5NJO.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import path from "node:path";
@@ -18,7 +18,7 @@ const THREAD_BINDINGS_MIGRATIONS_NAMESPACE = "thread-bindings-migrations";
 const THREAD_BINDINGS_MAX_ENTRIES = 1e4;
 const THREAD_BINDINGS_SWEEP_INTERVAL_MS = 6e4;
 const TOUCH_PERSIST_DELAY_MS = 3e4;
-function resolveBindingsPath(params) {
+async function resolveBindingsPath(params) {
 	return resolveMatrixStateFilePath({
 		auth: params.auth,
 		accountId: params.accountId,
@@ -140,7 +140,7 @@ async function sendFarewellMessage(params) {
 }
 async function createMatrixThreadBindingManager(params) {
 	if (params.auth.accountId !== params.accountId) throw new Error(`Matrix thread binding account mismatch: requested ${params.accountId}, auth resolved ${params.auth.accountId}`);
-	const legacyFilePath = resolveBindingsPath({
+	const legacyFilePath = await resolveBindingsPath({
 		auth: params.auth,
 		accountId: params.accountId,
 		env: params.env,
@@ -189,7 +189,7 @@ async function createMatrixThreadBindingManager(params) {
 				env: params.env,
 				stateDir: sqliteStateDir
 			});
-			claimCurrentTokenStorageState({ rootDir: sqliteStateDir });
+			await claimCurrentTokenStorageState({ rootDir: sqliteStateDir });
 		});
 		persistQueue = next;
 		return next;

package/dist/{tool-actions.runtime-Bf98Juk6.js → .setup/tool-actions.runtime-REzYTNxm.mjs}

@@ -1,19 +1,20 @@
-import { a as resolveMatrixAccountConfig, o as resolveMatrixBaseConfig } from "./account-config-CRsKoMqJ.js";
-import { i as resolveMatrixAccount } from "./accounts-GwSAk9vY.js";
-import { a as resolveMatrixRoomConfig } from "./channel-Cg97H4c1.js";
-import { i as normalizeMatrixResolvableTarget } from "./target-ids-Nwx7cMVE.js";
-import { C as parsePollStart, O as resolveMatrixRoomId, S as isPollStartType, _ as buildPollResponseContent, n as reactMatrixMessage } from "./send-UWLIQ0bG.js";
-import { i as isStrictDirectMembership, n as hasDirectMatrixMemberFlag, o as readJoinedMatrixMembers } from "./direct-room-RinHjtqX.js";
-import { i as buildMatrixReactionRelationsPath, o as selectOwnMatrixReactionEventIds, s as summarizeMatrixReactionEvents } from "./reaction-common-DkrQdBSZ.js";
-import { i as parseMxc } from "./event-helpers-CspuhE9k.js";
-import { a as fetchEventSummary, c as resolveMatrixActionLimit, i as sendMatrixMessage, n as editMatrixMessage, o as readPinnedEvents, r as readMatrixMessages, s as EventType, t as deleteMatrixMessage } from "./messages-CpZfiQO0.js";
-import { n as withResolvedActionClient, r as withResolvedRoomAction } from "./client-C0nZFCTj.js";
-import { t as applyMatrixProfileUpdate } from "./profile-update-vnhxwjEt.js";
-import { _ as scanMatrixVerificationQr, a as confirmMatrixVerificationSas, b as verifyMatrixRecoveryKey, c as getMatrixRoomKeyBackupStatus, d as listMatrixVerifications, f as mismatchMatrixVerificationSas, h as restoreMatrixRoomKeyBackup, i as confirmMatrixVerificationReciprocateQr, l as getMatrixVerificationSas, n as bootstrapMatrixVerification, o as generateMatrixVerificationQr, p as requestMatrixVerification, r as cancelMatrixVerification, s as getMatrixEncryptionStatus, t as acceptMatrixVerification, u as getMatrixVerificationStatus, v as startMatrixVerification } from "./verification-BbG-VC9S.js";
-import { n as getMatrixMemberInfo, r as getMatrixRoomInfo, t as createMatrixRoomInfoResolver } from "./room-info-BPVJkXnp.js";
+import { a as resolveMatrixAccountConfig, o as resolveMatrixBaseConfig } from "./account-config-CRsKoMqJ.mjs";
+import { i as resolveMatrixAccount } from "./accounts-iThMol10.mjs";
+import { a as resolveMatrixRoomConfig } from "./channel-ConuJfxT.mjs";
+import { i as normalizeMatrixResolvableTarget } from "./target-ids-Nwx7cMVE.mjs";
+import { l as selectOwnMatrixReactionEventIds, s as buildMatrixReactionRelationsPath, u as summarizeMatrixReactionEvents } from "./send-currentness-BrGXL7b8.mjs";
+import { c as isStrictDirectMembership, s as hasDirectMatrixMemberFlag, u as readJoinedMatrixMembers } from "./direct-management-B2Bno2xL.mjs";
+import { E as resolveMatrixRoomId, b as isPollStartType, h as buildPollResponseContent, n as reactMatrixMessage, x as parsePollStart } from "./send-aVdC5NJO.mjs";
+import { i as parseMxc } from "./event-helpers-CspuhE9k.mjs";
+import { a as sendMatrixMessage, c as EventType, i as readMatrixMessages, l as resolveMatrixActionLimit, n as editMatrixMessage, o as fetchEventSummary, r as readMatrixMessage, s as readPinnedEvents, t as deleteMatrixMessage } from "./messages-COuAcrz-.mjs";
+import { n as withResolvedActionClient, r as withResolvedRoomAction } from "./client-C2yVkVdw.mjs";
+import { t as applyMatrixProfileUpdate } from "./profile-update-DrblJttE.mjs";
+import { _ as scanMatrixVerificationQr, a as confirmMatrixVerificationSas, b as verifyMatrixRecoveryKey, c as getMatrixRoomKeyBackupStatus, d as listMatrixVerifications, f as mismatchMatrixVerificationSas, h as restoreMatrixRoomKeyBackup, i as confirmMatrixVerificationReciprocateQr, l as getMatrixVerificationSas, n as bootstrapMatrixVerification, o as generateMatrixVerificationQr, p as requestMatrixVerification, r as cancelMatrixVerification, s as getMatrixEncryptionStatus, t as acceptMatrixVerification, u as getMatrixVerificationStatus, v as startMatrixVerification } from "./verification-0o8MOW9T.mjs";
+import { n as getMatrixMemberInfo, r as getMatrixRoomInfo, t as createMatrixRoomInfoResolver } from "./room-info-DTyP1k5g.mjs";
 import { isRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalLowercaseString, uniqueStrings, uniqueValues } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { ToolAuthorizationError, createActionGate, jsonResult, readPositiveIntegerParam, readReactionParams, readStringArrayParam, readStringParam } from "openclaw/plugin-sdk/channel-actions";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
+import { captureChannelReadAuthority } from "openclaw/plugin-sdk/fetch-runtime";
 import { resolveAllowlistProviderRuntimeGroupPolicy, resolveDefaultGroupPolicy } from "openclaw/plugin-sdk/runtime-group-policy";
 //#region extensions/matrix/src/matrix/actions/polls.ts
 function normalizeOptionIndexes(indexes) {
@@ -223,6 +224,8 @@ async function classifyMatrixReadRoom(params) {
 	return memberStateFlag === false ? { kind: "group" } : { kind: "unknown" };
 }
 async function withAuthorizedMatrixReadTarget(params) {
+	const assertCurrent = captureChannelReadAuthority();
+	assertCurrent?.();
 	const account = resolveMatrixAccount({
 		cfg: params.cfg,
 		accountId: params.accountId
@@ -235,10 +238,13 @@ async function withAuthorizedMatrixReadTarget(params) {
 		aliases: []
 	}).blockedBeforeProviderAccess) throw new ToolAuthorizationError("Matrix read target is not allowed.");
 	return await withResolvedActionClient(params.opts, async (client) => {
-		const roomId = await resolveMatrixRoomId(client, params.roomId);
+		assertCurrent?.();
+		const roomId = await resolveMatrixRoomId(client, params.roomId, { persistDirectMapping: false });
+		assertCurrent?.();
 		const inputAlias = params.roomId.trim().startsWith("#") ? params.roomId.trim() : void 0;
 		const { getRoomInfo } = createMatrixRoomInfoResolver(client);
 		const roomInfo = await getRoomInfo(roomId, { includeAliases: true });
+		assertCurrent?.();
 		const mutableRoomName = account.config.dangerouslyAllowNameMatching === true ? roomInfo.name : void 0;
 		const aliases = [
 			inputAlias,
@@ -267,6 +273,7 @@ async function withAuthorizedMatrixReadTarget(params) {
 			client,
 			roomId
 		});
+		assertCurrent?.();
 		const resolvedGroupPolicy = resolveAllowlistProviderRuntimeGroupPolicy({
 			providerConfigPresent: params.cfg.channels?.matrix !== void 0,
 			groupPolicy: account.config.groupPolicy,
@@ -472,11 +479,19 @@ async function handleMatrixAction(ctx) {
 		const before = readStringParam(params, "before");
 		const after = readStringParam(params, "after");
 		const threadId = readStringParam(params, "threadId");
+		const messageId = readStringParam(params, "messageId");
 		const { clientOpts, withReadTarget } = prepareAction({
 			name: "messages",
 			disabledMessage: "Matrix messages are disabled."
 		});
 		const result = await withReadTarget(roomId, async (target) => {
+			if (messageId) return {
+				messages: projectMatrixMessagesForDisplay([await readMatrixMessage(target.roomId, messageId, {
+					...clientOpts,
+					client: target.client
+				})]),
+				roomId: target.roomId
+			};
 			const messages = await readMatrixMessages(target.roomId, {
 				limit: limit ?? void 0,
 				before: before ?? void 0,

package/dist/{verification-BbG-VC9S.js → .setup/verification-0o8MOW9T.mjs}

@@ -1,6 +1,6 @@
-import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { i as withStartedActionClient, n as withResolvedActionClient } from "./client-C0nZFCTj.js";
-import { n as formatMatrixEncryptionUnavailableError } from "./encryption-guidance-mDyxJV9U.js";
+import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
+import { i as withStartedActionClient, n as withResolvedActionClient } from "./client-C2yVkVdw.mjs";
+import { n as formatMatrixEncryptionUnavailableError } from "./encryption-guidance-CMWXiBzJ.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { setTimeout } from "node:timers/promises";
@@ -308,6 +308,7 @@ async function getMatrixVerificationStatus(opts = {}) {
 		if (readiness === "none" || preflight.serverDeviceKnown === false) return preflight;
 		if (readiness === "started") await client.start();
 		else await client.prepareForOneOff();
+		await client.refreshOwnDeviceKeys();
 		return await readMatrixVerificationStatus(client, opts);
 	}, "discard");
 }

package/dist/api.js

@@ -1,9 +1,9 @@
-import { a as resolveMatrixChannelConfig, i as resolveConfiguredMatrixAccountIds, n as findMatrixAccountEntry, o as resolveMatrixDefaultOrOnlyAccountId, r as requiresExplicitMatrixDefaultAccount } from "./account-selection-Bbtc483D.js";
-import { n as listMatrixEnvAccountIds, r as resolveMatrixEnvAccountToken, t as getMatrixScopedEnvVarNames } from "./env-vars-dGqak9dN.js";
-import { a as resolveMatrixCredentialsFilename, i as resolveMatrixCredentialsDir, l as sanitizeMatrixPathSegment, o as resolveMatrixCredentialsPath, r as resolveMatrixAccountStorageRoot, s as resolveMatrixHomeserverKey, t as hashMatrixAccessToken } from "./storage-paths-DVCANXTc.js";
-import { t as matrixPlugin } from "./channel-Cg97H4c1.js";
-import { n as matrixSetupAdapter, t as createMatrixSetupWizardProxy } from "./setup-core-8keb-Yre.js";
-import { f as setMatrixThreadBindingMaxAgeBySessionKey, n as getMatrixThreadBindingManager, u as setMatrixThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings-shared-oNPiyMWY.js";
-import { n as matrixOnboardingAdapter } from "./setup-surface-bcluelBI.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-Bwv87Gve.js";
+import { a as resolveConfiguredMatrixAccountIds, i as requiresExplicitMatrixDefaultAccount, n as findMatrixAccountEntry, o as resolveMatrixChannelConfig, s as resolveMatrixDefaultOrOnlyAccountId } from "./.setup/account-selection-BHkfU1eC.mjs";
+import { n as listMatrixEnvAccountIds, r as resolveMatrixEnvAccountToken, t as getMatrixScopedEnvVarNames } from "./.setup/env-vars-dGqak9dN.mjs";
+import { a as resolveMatrixCredentialsFilename, i as resolveMatrixCredentialsDir, l as sanitizeMatrixPathSegment, o as resolveMatrixCredentialsPath, r as resolveMatrixAccountStorageRoot, s as resolveMatrixHomeserverKey, t as hashMatrixAccessToken } from "./.setup/storage-paths-DVCANXTc.mjs";
+import { t as matrixPlugin } from "./.setup/channel-ConuJfxT.mjs";
+import { n as matrixSetupAdapter, t as createMatrixSetupWizardProxy } from "./.setup/setup-core-D2hMbIi3.mjs";
+import { f as setMatrixThreadBindingMaxAgeBySessionKey, n as getMatrixThreadBindingManager, u as setMatrixThreadBindingIdleTimeoutBySessionKey } from "./.setup/thread-bindings-shared-oNPiyMWY.mjs";
+import { n as matrixOnboardingAdapter } from "./.setup/setup-surface-BL3ha1l-.mjs";
+import { t as createMatrixThreadBindingManager } from "./.setup/thread-bindings-JlnLDfPM.mjs";
 export { createMatrixSetupWizardProxy, createMatrixThreadBindingManager, findMatrixAccountEntry, getMatrixScopedEnvVarNames, getMatrixThreadBindingManager, hashMatrixAccessToken, listMatrixEnvAccountIds, matrixOnboardingAdapter, matrixOnboardingAdapter as matrixSetupWizard, matrixPlugin, matrixSetupAdapter, requiresExplicitMatrixDefaultAccount, resolveConfiguredMatrixAccountIds, resolveMatrixAccountStorageRoot, resolveMatrixChannelConfig, resolveMatrixCredentialsDir, resolveMatrixCredentialsFilename, resolveMatrixCredentialsPath, resolveMatrixDefaultOrOnlyAccountId, resolveMatrixEnvAccountToken, resolveMatrixHomeserverKey, sanitizeMatrixPathSegment, setMatrixThreadBindingIdleTimeoutBySessionKey, setMatrixThreadBindingMaxAgeBySessionKey };

package/dist/auth-presence.js

@@ -1,4 +1,4 @@
-import { i as normalizeMatrixStoredCredentials, t as MATRIX_CREDENTIALS_NAMESPACE } from "./credentials-state-B3cuUFwZ.js";
+import { i as normalizeMatrixStoredCredentials, t as MATRIX_CREDENTIALS_NAMESPACE } from "./.setup/credentials-state-B3cuUFwZ.mjs";
 import { createPluginStateSyncKeyedStore } from "openclaw/plugin-sdk/plugin-state-store-runtime";
 //#region extensions/matrix/auth-presence.ts
 function hasAnyMatrixAuth(params, env = process.env) {

package/dist/channel-plugin-api.js

@@ -1,2 +1,2 @@
-import { t as matrixPlugin } from "./channel-Cg97H4c1.js";
+import { t as matrixPlugin } from "./.setup/channel-ConuJfxT.mjs";
 export { matrixPlugin };

package/dist/cli-metadata.js

@@ -1,2 +1,2 @@
-import { n as registerMatrixCliMetadata, t as cli_metadata_default } from "./cli-metadata-zRyVmUOL.js";
+import { n as registerMatrixCliMetadata, t as cli_metadata_default } from "./.setup/cli-metadata-DFHQj5XR.mjs";
 export { cli_metadata_default as default, registerMatrixCliMetadata };

package/dist/contract-api.js

@@ -1,3 +1,3 @@
-import { c as singleAccountKeysToMove, n as matrixSetupAdapter, o as namedAccountPromotionKeys, s as resolveSingleAccountPromotionTarget } from "./setup-core-8keb-Yre.js";
-import { n as matrixOnboardingAdapter } from "./setup-surface-bcluelBI.js";
+import { c as singleAccountKeysToMove, n as matrixSetupAdapter, o as namedAccountPromotionKeys, s as resolveSingleAccountPromotionTarget } from "./.setup/setup-core-D2hMbIi3.mjs";
+import { n as matrixOnboardingAdapter } from "./.setup/setup-surface-BL3ha1l-.mjs";
 export { matrixSetupAdapter, matrixOnboardingAdapter as matrixSetupWizard, namedAccountPromotionKeys, resolveSingleAccountPromotionTarget, singleAccountKeysToMove };