@openclaw/matrix 2026.8.1-beta.2 → 2026.8.1

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

@@ -2,7 +2,7 @@ import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 //#region extensions/matrix/src/plugin-entry.runtime.ts
-const loadMatrixVerificationRuntime = createLazyRuntimeModule(() => import("./verification-C7ig-bQE.js").then((n) => n.y));
+const loadMatrixVerificationRuntime = createLazyRuntimeModule(() => import("./verification-4vsW_WSn.js").then((n) => n.y));
 function sendError(respond, err) {
 	respond(false, { error: formatErrorMessage(err) });
 }

package/dist/probe.runtime-Bxpr1FFy.js

@@ -0,0 +1,2 @@
+import { o as createMatrixClient } from "./client-kSi51NKp.js";
+export { createMatrixClient };

package/dist/{profile-update-BkgWYDIp.js → profile-update-zXVCMg7y.js}

@@ -1,7 +1,7 @@
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { n as resolveMatrixConfigPath, r as updateMatrixAccountConfig } from "./config-update-Bor_Pjsv.js";
+import { n as resolveMatrixConfigPath, r as updateMatrixAccountConfig } from "./config-update-DC0fWBxc.js";
 import { r as syncMatrixOwnProfile } from "./profile-D-Wubo0A.js";
-import { n as withResolvedActionClient } from "./client-sJesKQmp.js";
+import { n as withResolvedActionClient } from "./client-CZ_JvrO0.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-nfUbFLdV.js → reaction-events-CjVUiqcY.js}

@@ -1,15 +1,15 @@
-import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
+import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
+import { a as resolveMatrixThreadRootId, o as resolveMatrixThreadRouting, r as resolveMatrixInboundRoute } from "./channel-BkEcVUs_.js";
 import { a as extractMatrixReactionAnnotation } from "./reaction-common-DkrQdBSZ.js";
 import { i as resolveMatrixApprovalReactionTargetWithPersistence, o as unregisterMatrixApprovalReactionTargetsForApproval } from "./approval-reactions-tXh9KYrW.js";
-import { i as resolveMatrixThreadRouting, r as resolveMatrixThreadRootId, t as resolveMatrixInboundRoute } from "./route-DY6at4qJ.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { isApprovalNotFoundError } from "openclaw/plugin-sdk/error-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
 import { getSessionBindingService } from "openclaw/plugin-sdk/session-binding-runtime";
 //#region extensions/matrix/src/matrix/monitor/reaction-events.ts
-const loadApprovalReactionAuth = createLazyRuntimeModule(() => import("./approval-reaction-auth-wBwbEDpZ.js"));
+const loadApprovalReactionAuth = createLazyRuntimeModule(() => import("./approval-reaction-auth-BDONXxnF.js"));
 const loadExecApprovalResolver = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/approval-gateway-runtime"));
-const loadMatrixSend = createLazyRuntimeModule(() => import("./send-ZDLU4JTk.js").then((n) => n.s));
+const loadMatrixSend = createLazyRuntimeModule(() => import("./send-BL_iH5Ox.js").then((n) => n.s));
 function buildMatrixApprovalTerminalText(result) {
 	const approval = result.approval;
 	const terminalLabel = approval.status === "allowed" ? approval.decision === "allow-always" ? "Allowed always" : "Allowed once" : approval.status === "denied" ? "Denied" : approval.status === "expired" ? "Expired" : "Cancelled";
@@ -93,7 +93,7 @@ async function maybeResolveMatrixApprovalReaction(params) {
 			return true;
 		}
 		params.logVerboseMessage(`matrix: approval reaction failed id=${params.target.approvalId} sender=${params.senderId}: ${String(err)}`);
-		return true;
+		throw err;
 	}
 }
 async function handleInboundMatrixReaction(params) {

package/dist/{resolve-targets-BJAPY4Vb.js → resolve-targets-qG6gceps.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-Bvg2wAnR.js";
+import { r as normalizeMatrixMessagingTarget, t as isMatrixQualifiedUserId } from "./target-ids-Nwx7cMVE.js";
+import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-DKr0w35b.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-LWJELYq5.js → resolver.runtime-zX3TR3TN.js}

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

package/dist/{room-info-BXQA7y10.js → room-info-yheP1mod.js}

@@ -1,3 +1,6 @@
+import { b as resolveMatrixRoomId } from "./send-BL_iH5Ox.js";
+import { s as EventType } from "./messages-DaGRt-tu.js";
+import { n as withResolvedActionClient, r as withResolvedRoomAction } from "./client-CZ_JvrO0.js";
 import { n as isMatrixNotFoundError } from "./errors-DKVS3_DO.js";
 //#region extensions/matrix/src/matrix/monitor/bounded-cache.ts
 function setBoundedMap(map, key, value, maxEntries) {
@@ -7,6 +10,57 @@ function setBoundedMap(map, key, value, maxEntries) {
 	if (!oldest.done) map.delete(oldest.value);
 }
 //#endregion
+//#region extensions/matrix/src/matrix/actions/room.ts
+async function getMatrixMemberInfo(userId, opts) {
+	return await withResolvedActionClient(opts, async (client) => {
+		const roomId = await resolveMatrixRoomId(client, opts.roomId);
+		if (!(await client.getJoinedRoomMembers(roomId)).includes(userId)) throw new Error(`User ${userId} is not a member of room ${roomId}`);
+		const profile = await client.getUserProfile(userId);
+		return {
+			userId,
+			profile: {
+				displayName: profile?.displayname ?? null,
+				avatarUrl: profile?.avatar_url ?? null
+			},
+			membership: null,
+			powerLevel: null,
+			displayName: profile?.displayname ?? null,
+			roomId
+		};
+	});
+}
+async function getMatrixRoomInfo(roomId, opts = {}) {
+	return await withResolvedRoomAction(roomId, opts, async (client, resolvedRoom) => {
+		let name = null;
+		let topic = null;
+		let canonicalAlias = null;
+		let memberCount = null;
+		try {
+			const nameState = await client.getRoomStateEvent(resolvedRoom, "m.room.name", "");
+			name = typeof nameState?.name === "string" ? nameState.name : null;
+		} catch {}
+		try {
+			const topicState = await client.getRoomStateEvent(resolvedRoom, EventType.RoomTopic, "");
+			topic = typeof topicState?.topic === "string" ? topicState.topic : null;
+		} catch {}
+		try {
+			const aliasState = await client.getRoomStateEvent(resolvedRoom, "m.room.canonical_alias", "");
+			canonicalAlias = typeof aliasState?.alias === "string" ? aliasState.alias : null;
+		} catch {}
+		try {
+			memberCount = (await client.getJoinedRoomMembers(resolvedRoom)).length;
+		} catch {}
+		return {
+			roomId: resolvedRoom,
+			name,
+			topic,
+			canonicalAlias,
+			altAliases: [],
+			memberCount
+		};
+	});
+}
+//#endregion
 //#region extensions/matrix/src/matrix/monitor/room-info.ts
 const MAX_ROOM_INFO = 1024;
 const MAX_MEMBER_DISPLAY_NAMES = 4096;
@@ -93,4 +147,4 @@ function createMatrixRoomInfoResolver(client) {
 	};
 }
 //#endregion
-export { setBoundedMap as n, createMatrixRoomInfoResolver as t };
+export { setBoundedMap as i, getMatrixMemberInfo as n, getMatrixRoomInfo as r, createMatrixRoomInfoResolver as t };

package/dist/runtime-api.js

@@ -1,8 +1,8 @@
-import { a as resolveMatrixDefaultOrOnlyAccountId, i as resolveMatrixChannelConfig, n as requiresExplicitMatrixDefaultAccount, o as resolveMatrixAccountStringValues, r as resolveConfiguredMatrixAccountIds, t as findMatrixAccountEntry } from "./account-selection-CWuhuFn1.js";
+import { a as resolveMatrixDefaultOrOnlyAccountId, i as resolveMatrixChannelConfig, l as resolveMatrixAccountStringValues, n as requiresExplicitMatrixDefaultAccount, r as resolveConfiguredMatrixAccountIds, t as findMatrixAccountEntry } from "./account-selection-C8nnBTxi.js";
 import { n as listMatrixEnvAccountIds, r as resolveMatrixEnvAccountToken, t as getMatrixScopedEnvVarNames } from "./env-vars-dGqak9dN.js";
 import { r as setMatrixRuntime } from "./runtime-6S3DNFNv.js";
 import { a as resolveMatrixCredentialsPath, i as resolveMatrixCredentialsFilename, n as resolveMatrixAccountStorageRoot, o as resolveMatrixHomeserverKey, r as resolveMatrixCredentialsDir, s as sanitizeMatrixPathSegment, t as hashMatrixAccessToken } from "./storage-paths-gUmSydsW.js";
-import { d as setMatrixThreadBindingIdleTimeoutBySessionKey, p as setMatrixThreadBindingMaxAgeBySessionKey } from "./thread-bindings-shared-CKnY4LSd.js";
+import { f as setMatrixThreadBindingMaxAgeBySessionKey, u as setMatrixThreadBindingIdleTimeoutBySessionKey } from "./thread-bindings-shared-oNPiyMWY.js";
 import { n as ensureMatrixSdkInstalled, r as isMatrixSdkAvailable } from "./deps-CcVJfvRM.js";
 import { chunkTextForOutbound as chunkTextForOutbound$1 } from "openclaw/plugin-sdk/text-chunking";
 import { assertHttpUrlTargetsPrivateNetwork, closeDispatcher, createPinnedDispatcher, resolvePinnedHostnameWithPolicy, ssrfPolicyFromDangerouslyAllowPrivateNetwork } from "openclaw/plugin-sdk/ssrf-runtime";

package/dist/{sdk-DjaQFCHc.js → sdk-TZYyo0XQ.js}

@@ -3,8 +3,9 @@ import { t as SqliteBackedMatrixSyncStore } from "./file-sync-store-DjskBX2o.js"
 import { n as LogService, r as noop, t as ConsoleLogger } from "./logger-B_71hN6W.js";
 import { t as MATRIX_IDB_PERSIST_INTERVAL_MS } from "./idb-persistence-lock-DAJ49nZX.js";
 import { n as isMatrixNotFoundError, t as formatMatrixErrorReason } from "./errors-DKVS3_DO.js";
-import { a as throwIfMatrixStartupAborted, r as createMatrixStartupAbortError } from "./client-CeGw0G5S.js";
-import { a as matrixEventToRaw, n as createMatrixGuardedFetch, o as parseMxc, t as MatrixAuthedHttpClient } from "./http-client-CycYxU9-.js";
+import { a as throwIfMatrixStartupAborted, r as createMatrixStartupAbortError } from "./client-kSi51NKp.js";
+import { n as matrixEventToRaw, r as parseMxc } from "./event-helpers-XRfAbOIh.js";
+import { n as createMatrixGuardedFetch, t as MatrixAuthedHttpClient } from "./http-client-D8o8b9u6.js";
 import { n as resolveMatrixRoomKeyBackupReadinessError } from "./backup-health-Dm_YMVFT.js";
 import { t as createMatrixJsSdkClientLogger } from "./logging-DRjvUOIh.js";
 import { a as isMatrixAccessTokenInvalidatedError, c as resolveMatrixLocalTimeoutMs, f as isMatrixReadySyncState, i as createMatrixExplicitBootstrapOptions, l as unresolvedMatrixDeviceVerificationStatus, n as MATRIX_INITIAL_CRYPTO_BOOTSTRAP_OPTIONS, o as resolveMatrixDiagnostic, p as isMatrixTerminalSyncState, r as MATRIX_STATUS_DIAGNOSTIC_TIMEOUT_MS, s as resolveMatrixDiagnosticResult, t as MATRIX_AUTOMATIC_REPAIR_BOOTSTRAP_OPTIONS, u as unresolvedMatrixRoomKeyBackupStatus } from "./client-support-DLj4vDeu.js";
@@ -17,6 +18,7 @@ import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { ClientEvent, EventType, Filter, MatrixError, MatrixEventEvent, MsgType, Preset, createClient } from "matrix-js-sdk/lib/matrix.js";
 import { EventEmitter } from "node:events";
+import { RoomEvent } from "matrix-js-sdk/lib/models/room.js";
 import { VerificationMethod } from "matrix-js-sdk/lib/types.js";
 import { SyncApi, SyncState } from "matrix-js-sdk/lib/sync.js";
 import { EventStatus } from "matrix-js-sdk/lib/models/event-status.js";
@@ -65,6 +67,13 @@ async function listMatrixOwnDevices(client) {
 //#endregion
 //#region extensions/matrix/src/matrix/sdk/client-event-bridge.ts
 function registerMatrixClientBridge(params) {
+	let initialSyncComplete = false;
+	const joinTransitions = /* @__PURE__ */ new WeakSet();
+	params.client.on(RoomEvent.MyMembership, (room, membership, previousMembership) => {
+		if (!initialSyncComplete || membership !== "join" || previousMembership === "join") return;
+		const event = room.currentState.getStateEvents("m.room.member", params.getSelfUserId());
+		if (event) joinTransitions.add(event);
+	});
 	params.client.on(ClientEvent.Event, (event) => {
 		const roomId = event.getRoomId();
 		if (!roomId) return;
@@ -78,12 +87,16 @@ function registerMatrixClientBridge(params) {
 		const membership = raw.type === "m.room.member" ? raw.content.membership : void 0;
 		if (stateKey && selfUserId && stateKey === selfUserId) {
 			if (membership === "invite") params.emitter.emit("room.invite", roomId, raw);
-			else if (membership === "join") params.emitter.emit("room.join", roomId, raw);
+			else if (membership === "join") params.emitter.emit("room.join", roomId, {
+				...raw,
+				membershipProvenance: joinTransitions.delete(event) ? "transition" : initialSyncComplete ? "update" : "snapshot"
+			});
 		}
 		if (isEncryptedEvent) params.decryptBridge.attachEncryptedEvent(event, roomId);
 	});
 	params.client.on(ClientEvent.Room, params.emitMembershipForRoom);
 	params.client.on(ClientEvent.Sync, (state, prevState, data) => {
+		initialSyncComplete ||= state === "PREPARED" || state === "SYNCING";
 		const error = data && typeof data === "object" && "error" in data ? data.error : void 0;
 		params.setCurrentSyncState(state, error);
 		params.emitter.emit("sync.state", state, prevState, error);
@@ -103,7 +116,8 @@ function emitMatrixMembershipForRoom(params) {
 		state_key: params.selfUserId,
 		content: { membership },
 		origin_server_ts: Date.now(),
-		unsigned: { age: 0 }
+		unsigned: { age: 0 },
+		membershipProvenance: "snapshot"
 	};
 	if (membership === "invite") {
 		params.emitter.emit("room.invite", roomId, raw);
@@ -123,8 +137,11 @@ function refreshMatrixDmRoomIds(direct, dmRoomIds) {
 //#endregion
 //#region extensions/matrix/src/matrix/sdk/client-sync-quiesce.ts
 const MATRIX_SYNC_QUIESCE_TIMEOUT_MS = 5e3;
-const MATRIX_JS_SDK_SYNC_VERSION = "41.9.0";
+const MATRIX_JS_SDK_SYNC_VERSION = "42.2.0";
 const matrixJsSdkPackage = createRequire(import.meta.url)("matrix-js-sdk/package.json");
+function requireMatrixClassicSyncInternals(syncApi) {
+	return syncApi;
+}
 function assertMatrixJsSdkSyncVersion() {
 	const version = matrixJsSdkPackage.version;
 	if (version !== MATRIX_JS_SDK_SYNC_VERSION) throw new Error(`Matrix sync quiesce requires matrix-js-sdk ${MATRIX_JS_SDK_SYNC_VERSION}; found ${String(version)}`);
@@ -143,10 +160,14 @@ async function quiesceMatrixClientSync(params) {
 		params.syncStore?.discardPendingSyncCursorPersistence();
 		throw new Error(syncApi === void 0 ? "Matrix sync quiesce requires the classic matrix-js-sdk SyncApi, but none is active" : "Matrix sync quiesce rejected a sliding or unknown matrix-js-sdk sync implementation");
 	}
-	if (syncApi.getSyncState() === SyncState.Stopped) {
+	const syncState = syncApi.getSyncState();
+	if (syncState === SyncState.Stopped) {
 		params.markStopped();
 		return;
 	}
+	const disconnectedBeforeStop = syncState === SyncState.Error || syncState === SyncState.Reconnecting;
+	const syncInternals = requireMatrixClassicSyncInternals(syncApi);
+	const keepaliveResolvers = disconnectedBeforeStop ? syncInternals.connectionReturnedResolvers : void 0;
 	await new Promise((resolve, reject) => {
 		let settled = false;
 		const settle = (error) => {
@@ -171,6 +192,11 @@ async function quiesceMatrixClientSync(params) {
 		params.emitter.on("sync.state", onSyncState);
 		try {
 			syncApi.stop();
+			if (keepaliveResolvers && syncInternals.connectionReturnedResolvers === keepaliveResolvers) {
+				syncInternals.connectionReturnedResolvers = void 0;
+				keepaliveResolvers.reject("SyncApi.stop() was called");
+				settle();
+			}
 		} catch (error) {
 			params.syncStore?.discardPendingSyncCursorPersistence();
 			settle(error instanceof Error ? error : new Error(String(error)));
@@ -195,7 +221,7 @@ function resolveMessageWireDispatch(resource, init) {
 	};
 }
 let loadedMatrixCryptoRuntime = null;
-const loadMatrixCryptoRuntime = createLazyRuntimeModule(() => import("./crypto-runtime-Bnz3zEcS.js").then((runtime) => {
+const loadMatrixCryptoRuntime = createLazyRuntimeModule(() => import("./crypto-runtime-C4WDYxlP.js").then((runtime) => {
 	loadedMatrixCryptoRuntime = runtime;
 	return runtime;
 }));
@@ -208,6 +234,7 @@ var MatrixClientBase = class {
 		this.dmRoomIds = /* @__PURE__ */ new Set();
 		this.cryptoInitialized = false;
 		this.sendQueue = new KeyedAsyncQueue();
+		this.syncQuiescePromise = null;
 		this.stopPersistPromise = null;
 		this.verificationSummaryListenerBound = false;
 		this.currentSyncState = null;
@@ -216,6 +243,9 @@ var MatrixClientBase = class {
 		this.transactionScopePromise = null;
 		this.messageWireDispatchGuards = /* @__PURE__ */ new Map();
 		this.sdkStopped = false;
+		this.stopDiscardPromise = null;
+		this.idbPersistPromise = null;
+		this.idbPersistAbortController = null;
 		this.dms = {
 			update: async () => {
 				return await this.refreshDmCache();
@@ -420,6 +450,7 @@ var MatrixClientBase = class {
 		throwIfMatrixStartupAborted(opts.abortSignal);
 		this.registerBridge();
 		await this.initializeCryptoIfNeeded(opts.abortSignal);
+		throwIfMatrixStartupAborted(opts.abortSignal);
 		await this.client.startClient({
 			initialSyncLimit: this.initialSyncLimit,
 			...this.syncFilter ? { filter: Filter.fromJson(this.selfUserId, "", this.syncFilter) } : {}
@@ -454,10 +485,6 @@ var MatrixClientBase = class {
 	}
 	stopSdkClient() {
 		if (this.sdkStopped) return;
-		if (this.idbPersistTimer) {
-			clearInterval(this.idbPersistTimer);
-			this.idbPersistTimer = null;
-		}
 		this.currentSyncState = null;
 		this.currentSyncError = void 0;
 		this.client.stopClient();
@@ -465,7 +492,7 @@ var MatrixClientBase = class {
 		this.started = false;
 	}
 	async quiesceSync() {
-		await quiesceMatrixClientSync({
+		this.syncQuiescePromise ??= quiesceMatrixClientSync({
 			client: this.client,
 			emitter: this.emitter,
 			markStopped: () => {
@@ -474,6 +501,7 @@ var MatrixClientBase = class {
 			started: this.started,
 			syncStore: this.syncStore
 		});
+		await this.syncQuiescePromise;
 	}
 	async drainPendingDecryptions(reason = "matrix client shutdown") {
 		await this.decryptBridge?.drainPendingDecryptions(reason);
@@ -481,15 +509,22 @@ var MatrixClientBase = class {
 	stop() {
 		this.stopAndPersist().catch(() => this.stopWithoutPersist()).catch(noop);
 	}
-	async stopAndPersist() {
-		if (this.stopPersistPromise) {
-			await this.stopPersistPromise;
-			return;
+	async stopClientGeneration(persist) {
+		if (persist) await this.quiesceSync();
+		else {
+			await this.quiesceSync().catch(noop);
+			this.syncStore?.discardPendingSyncCursorPersistence();
+		}
+		if (this.idbPersistTimer) {
+			clearInterval(this.idbPersistTimer);
+			this.idbPersistTimer = null;
 		}
-		this.stopPersistPromise = (async () => {
-			await this.quiesceSync();
-			this.stopSdkClient();
-			this.decryptBridge?.stop();
+		this.idbPersistAbortController?.abort();
+		const activePeriodicPersist = this.idbPersistPromise;
+		this.stopSdkClient();
+		this.decryptBridge?.stop();
+		await activePeriodicPersist;
+		if (persist) {
 			await (loadedMatrixCryptoRuntime ?? await loadMatrixCryptoRuntime()).persistIdbToDisk({
 				snapshotPath: this.idbSnapshotPath,
 				databasePrefix: this.cryptoDatabasePrefix,
@@ -497,14 +532,15 @@ var MatrixClientBase = class {
 			});
 			this.syncStore?.markCleanShutdown();
 			await this.syncStore?.flush();
-		})();
+		}
+	}
+	async stopAndPersist() {
+		this.stopPersistPromise ??= this.stopClientGeneration(true);
 		await this.stopPersistPromise;
 	}
 	stopWithoutPersist() {
-		this.syncStore?.discardPendingSyncCursorPersistence();
-		this.stopSdkClient();
-		this.decryptBridge?.stop();
-		this.stopPersistPromise = Promise.resolve();
+		if (!this.stopPersistPromise) this.stopPersistPromise = this.stopDiscardPromise = this.stopClientGeneration(false);
+		return this.stopDiscardPromise ??= this.stopPersistPromise.catch(() => this.stopClientGeneration(false));
 	}
 	async bootstrapCryptoIfNeeded(abortSignal) {
 		if (!this.encryptionEnabled || !this.cryptoInitialized || this.cryptoBootstrapped) return;
@@ -538,17 +574,26 @@ var MatrixClientBase = class {
 			throwIfMatrixStartupAborted(abortSignal);
 			await persistIdbToDisk({
 				snapshotPath: this.idbSnapshotPath,
-				databasePrefix: this.cryptoDatabasePrefix
+				databasePrefix: this.cryptoDatabasePrefix,
+				abortSignal
 			});
 			throwIfMatrixStartupAborted(abortSignal);
 			this.idbPersistTimer = setInterval(() => {
-				persistIdbToDisk({
+				if (this.idbPersistPromise) return;
+				const abortController = new AbortController();
+				this.idbPersistAbortController = abortController;
+				this.idbPersistPromise = persistIdbToDisk({
 					snapshotPath: this.idbSnapshotPath,
-					databasePrefix: this.cryptoDatabasePrefix
-				}).catch(noop);
+					databasePrefix: this.cryptoDatabasePrefix,
+					abortSignal: abortController.signal
+				}).catch(noop).finally(() => {
+					this.idbPersistPromise = null;
+					this.idbPersistAbortController = null;
+				});
 			}, MATRIX_IDB_PERSIST_INTERVAL_MS);
 			this.idbPersistTimer.unref?.();
 		} catch (err) {
+			throwIfMatrixStartupAborted(abortSignal);
 			LogService.warn("MatrixClientLite", "Failed to initialize rust crypto:", err);
 		}
 	}