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

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

@@ -3,7 +3,7 @@ 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 throwIfMatrixStartupAborted, r as createMatrixStartupAbortError } from "./client-BBQdBG7t.js";
 import { a as matrixEventToRaw, n as createMatrixGuardedFetch, o as parseMxc, t as MatrixAuthedHttpClient } from "./http-client-CycYxU9-.js";
 import { n as resolveMatrixRoomKeyBackupReadinessError } from "./backup-health-Dm_YMVFT.js";
 import { t as createMatrixJsSdkClientLogger } from "./logging-DRjvUOIh.js";
@@ -125,6 +125,9 @@ function refreshMatrixDmRoomIds(direct, dmRoomIds) {
 const MATRIX_SYNC_QUIESCE_TIMEOUT_MS = 5e3;
 const MATRIX_JS_SDK_SYNC_VERSION = "41.9.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 +146,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 +178,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)));
@@ -208,6 +220,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;
@@ -465,7 +478,7 @@ var MatrixClientBase = class {
 		this.started = false;
 	}
 	async quiesceSync() {
-		await quiesceMatrixClientSync({
+		this.syncQuiescePromise ??= quiesceMatrixClientSync({
 			client: this.client,
 			emitter: this.emitter,
 			markStopped: () => {
@@ -474,6 +487,7 @@ var MatrixClientBase = class {
 			started: this.started,
 			syncStore: this.syncStore
 		});
+		await this.syncQuiescePromise;
 	}
 	async drainPendingDecryptions(reason = "matrix client shutdown") {
 		await this.decryptBridge?.drainPendingDecryptions(reason);

package/dist/{send-ZDLU4JTk.js → send-ClHgDZLT.js}

@@ -1,12 +1,12 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
 import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { r as normalizeMatrixResolvableTarget, t as isMatrixQualifiedUserId } from "./target-ids-B-5aQxwn.js";
-import { a as isStrictDirectRoom, r as inspectMatrixDirectRoomEvidence } from "./direct-room-RinHjtqX.js";
+import { i as normalizeMatrixResolvableTarget, t as isMatrixQualifiedUserId } from "./target-ids-Nwx7cMVE.js";
 import { n as MATRIX_REACTION_EVENT_TYPE, r as buildMatrixReactionContent, t as MATRIX_ANNOTATION_RELATION_TYPE } from "./reaction-common-DkrQdBSZ.js";
+import { a as isStrictDirectRoom, r as inspectMatrixDirectRoomEvidence } from "./direct-room-RinHjtqX.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { createMessageReceiptFromOutboundResults } from "openclaw/plugin-sdk/channel-outbound";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { isRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { FormatCapabilityProfile, convertMarkdownTables, findCodeRegions, isInsideCode, markdownToIR, renderMarkdownWithMarkers, tokenizeHtmlTags } from "openclaw/plugin-sdk/text-chunking";
 import { createHash } from "node:crypto";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
@@ -19,7 +19,7 @@ import { isAutoLinkedFileRef } from "openclaw/plugin-sdk/text-autolink-runtime";
 import { isVoiceMessageCompatibleAudio } from "openclaw/plugin-sdk/media-runtime";
 import { parseBuffer } from "music-metadata";
 //#region extensions/matrix/src/matrix/send/client.ts
-const loadMatrixSendClientRuntime = createLazyRuntimeModule(() => import("./client-bootstrap-BFwT_2VT.js").then((n) => n.t));
+const loadMatrixSendClientRuntime = createLazyRuntimeModule(() => import("./client-bootstrap-Co3RlItb.js").then((n) => n.t));
 function resolveMediaMaxBytes(accountId, cfg) {
 	if (!cfg) throw new Error("Matrix media limits requires a resolved runtime config. Load and resolve config at the command or gateway boundary, then pass cfg through the runtime path.");
 	const mediaMaxMb = resolveMatrixAccountConfig({
@@ -638,17 +638,18 @@ function isPollEventType(eventType) {
 	return POLL_EVENT_TYPES.includes(eventType);
 }
 function getTextContent(text) {
-	if (!text) return "";
-	return text["m.text"] ?? text["org.matrix.msc1767.text"] ?? text.body ?? "";
+	if (!isRecord(text)) return "";
+	return normalizeOptionalString(text["m.text"] ?? text["org.matrix.msc1767.text"] ?? text.body) ?? "";
 }
 function parsePollStart(content) {
 	const poll = content["m.poll.start"] ?? content[ORG_POLL_START] ?? content["m.poll"];
 	if (!poll) return null;
-	const question = getTextContent(poll.question).trim();
+	const question = getTextContent(poll.question);
 	if (!question) return null;
-	const answers = poll.answers.map((answer) => ({
-		id: answer.id,
-		text: getTextContent(answer).trim()
+	const rawAnswers = poll.answers;
+	const answers = (Array.isArray(rawAnswers) ? rawAnswers : []).map((answer) => ({
+		id: isRecord(answer) && typeof answer.id === "string" ? answer.id : "",
+		text: getTextContent(answer)
 	})).filter((answer) => answer.id.trim().length > 0 && answer.text.length > 0);
 	if (answers.length === 0) return null;
 	const maxSelectionsRaw = poll.max_selections;

package/dist/session-binding-contract-api.js

@@ -1,4 +1,3 @@
 import { r as setMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { s as resetMatrixThreadBindingsForTests } from "./thread-bindings-shared-CKnY4LSd.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-CcHZP3w2.js";
-export { createMatrixThreadBindingManager, resetMatrixThreadBindingsForTests, setMatrixRuntime };
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-BYEGfw3h.js";
+export { createMatrixThreadBindingManager, setMatrixRuntime };

package/dist/{setup-bootstrap-BaXkhgJg.js → setup-bootstrap-BGPjbA5N.js}

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

package/dist/{setup-core-DQn6b5vi.js → setup-core-DigrLebY.js}

@@ -310,7 +310,7 @@ const matrixSetupAdapter = {
 		input
 	}),
 	afterAccountConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BaXkhgJg.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BGPjbA5N.js");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,

package/dist/setup-plugin-api.js

@@ -1,2 +1,2 @@
-import { n as matrixSetupPlugin } from "./channel.setup-PpxRP9Du.js";
+import { n as matrixSetupPlugin } from "./channel.setup-aNaa3Uyn.js";
 export { matrixSetupPlugin };

package/dist/{setup-surface-DlhJdrNI.js → setup-surface-Dtn8sAWs.js}

@@ -3,8 +3,9 @@ import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-C
 import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
 import { n as resolveMatrixEnvAuthReadiness } from "./env-auth-MVS-Vv41.js";
 import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-BCzyubQt.js";
+import { n as isMatrixRoomId } from "./target-ids-Nwx7cMVE.js";
 import { r as updateMatrixAccountConfig } from "./config-update-Bor_Pjsv.js";
-import { a as moveSingleMatrixAccountConfigToNamedAccount, i as createMatrixSetupDmPolicy } from "./setup-core-DQn6b5vi.js";
+import { a as moveSingleMatrixAccountConfigToNamedAccount, i as createMatrixSetupDmPolicy } from "./setup-core-DigrLebY.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-CcVJfvRM.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringifiedOptionalString, normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -31,7 +32,7 @@ function isMatrixInviteAutoJoinPolicy(value) {
 	return value === "allowlist" || value === "always" || value === "off";
 }
 function isMatrixInviteAutoJoinTarget(entry) {
-	return entry === "*" || entry.startsWith("!") && entry.includes(":") || entry.startsWith("#") && entry.includes(":");
+	return entry === "*" || isMatrixRoomId(entry) || entry.startsWith("#") && entry.includes(":");
 }
 function resolveMatrixOnboardingAccountId(cfg, accountId) {
 	return normalizeAccountId$1(normalizeOptionalString(accountId) || resolveDefaultMatrixAccountId(cfg) || DEFAULT_ACCOUNT_ID);
@@ -90,7 +91,7 @@ async function promptMatrixAllowFrom(params) {
 			pending.push(part);
 		}
 		if (pending.length > 0) {
-			const { resolveMatrixTargets } = await import("./resolve-targets-BJAPY4Vb.js").then((n) => n.n);
+			const { resolveMatrixTargets } = await import("./resolve-targets-e7AI0P75.js").then((n) => n.n);
 			const results = await resolveMatrixTargets({
 				cfg,
 				accountId,
@@ -160,7 +161,7 @@ async function configureMatrixInviteAutoJoin(params) {
 	while (true) {
 		const allowlist = normalizeUniqueStringEntries(splitSetupEntries(await params.prompter.text({
 			message: "Matrix invite auto-join allowlist (comma-separated)",
-			placeholder: "!roomId:server, #alias:server, *",
+			placeholder: "!roomId:server, !roomId, #alias:server, *",
 			initialValue: currentAllowlist[0] ? currentAllowlist.join(", ") : void 0,
 			validate: (value) => {
 				return splitSetupEntries(value).length > 0 ? void 0 : "Required";
@@ -168,7 +169,7 @@ async function configureMatrixInviteAutoJoin(params) {
 		})));
 		const invalidEntries = allowlist.filter((entry) => !isMatrixInviteAutoJoinTarget(entry));
 		if (allowlist.length === 0 || invalidEntries.length > 0) {
-			await params.prompter.note(["Use only stable Matrix invite targets for auto-join: !roomId:server, #alias:server, or *.", invalidEntries.length > 0 ? `Invalid: ${invalidEntries.join(", ")}` : void 0].filter(Boolean).join("\n"), "Matrix invite auto-join");
+			await params.prompter.note(["Use only stable Matrix invite targets for auto-join: !roomId:server (or the suffixless !roomId form on room version 12+), #alias:server, or *.", invalidEntries.length > 0 ? `Invalid: ${invalidEntries.join(", ")}` : void 0].filter(Boolean).join("\n"), "Matrix invite auto-join");
 			continue;
 		}
 		return setMatrixAutoJoin(params.cfg, "allowlist", allowlist, accountId);
@@ -191,7 +192,7 @@ async function configureMatrixAccessPrompts(params) {
 		label: "Matrix rooms",
 		currentPolicy: existingAccountConfig.groupPolicy ?? "allowlist",
 		currentEntries: Object.keys(existingGroups ?? {}),
-		placeholder: "!roomId:server, #alias:server, Project Room",
+		placeholder: "!roomId:server, !roomId, #alias:server, Project Room",
 		updatePrompt: Boolean(existingGroups)
 	});
 	if (accessConfig) if (accessConfig.policy !== "allowlist") next = updateMatrixAccountConfig(next, params.accountId, { groupPolicy: accessConfig.policy });
@@ -204,11 +205,11 @@ async function configureMatrixAccessPrompts(params) {
 				const trimmed = normalizeOptionalString(entry) ?? "";
 				if (!trimmed) continue;
 				const cleaned = trimmed.replace(/^(room|channel):/i, "").trim();
-				if (cleaned.startsWith("!") && cleaned.includes(":")) {
+				if (isMatrixRoomId(cleaned)) {
 					resolvedIds.push(cleaned);
 					continue;
 				}
-				const { listMatrixDirectoryGroupsLive } = await import("./directory-live-Bvg2wAnR.js").then((n) => n.t);
+				const { listMatrixDirectoryGroupsLive } = await import("./directory-live-DLQzel12.js").then((n) => n.t);
 				const matches = await listMatrixDirectoryGroupsLive({
 					cfg: next,
 					accountId: params.accountId,
@@ -458,7 +459,7 @@ const matrixOnboardingAdapter = {
 		});
 	},
 	afterConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BaXkhgJg.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BGPjbA5N.js");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,

package/dist/subagent-hooks-CMoZaARG.js

@@ -0,0 +1,48 @@
+import { a as listBindingsForAccount, i as listAllBindings, n as getMatrixThreadBindingManager, o as removeBindingRecord, s as resolveBindingKey } from "./thread-bindings-shared-oNPiyMWY.js";
+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
+async function handleMatrixSubagentEnded(event) {
+	const accountId = normalizeOptionalString(event.accountId) || void 0;
+	const matching = (accountId ? listBindingsForAccount(accountId) : listAllBindings()).filter((entry) => entry.targetSessionKey === event.targetSessionKey && entry.targetKind === "subagent");
+	const removedBindingKeys = /* @__PURE__ */ new Set();
+	if (event.sendFarewell) {
+		const bindingService = getSessionBindingService();
+		const reason = normalizeOptionalString(event.reason) || "subagent-ended";
+		for (const binding of matching) {
+			const bindingId = resolveBindingKey(binding);
+			if ((await bindingService.unbind({
+				bindingId,
+				reason
+			})).some((entry) => entry.bindingId === bindingId)) removedBindingKeys.add(bindingId);
+		}
+	}
+	const affectedAccountIds = /* @__PURE__ */ new Set();
+	for (const binding of matching) {
+		if (removedBindingKeys.has(resolveBindingKey(binding))) continue;
+		if (removeBindingRecord(binding)) affectedAccountIds.add(binding.accountId);
+	}
+	for (const acctId of affectedAccountIds) await getMatrixThreadBindingManager(acctId)?.persist();
+}
+function handleMatrixSubagentDeliveryTarget(event) {
+	if (!event.expectsCompletionMessage) return;
+	if (event.requesterOrigin?.channel?.trim().toLowerCase() !== "matrix") return;
+	const requesterAccountId = normalizeOptionalString(event.requesterOrigin?.accountId);
+	const requesterThreadId = event.requesterOrigin?.threadId != null && event.requesterOrigin.threadId !== "" ? String(event.requesterOrigin.threadId).trim() : "";
+	const bindings = (requesterAccountId ? listBindingsForAccount(requesterAccountId) : listAllBindings()).filter((entry) => entry.targetSessionKey === event.childSessionKey && entry.targetKind === "subagent");
+	if (bindings.length === 0) return;
+	let binding;
+	if (requesterThreadId) binding = bindings.find((entry) => entry.conversationId === requesterThreadId && (!requesterAccountId || entry.accountId === requesterAccountId));
+	if (!binding && bindings.length === 1) binding = bindings[0];
+	if (!binding) return;
+	const roomId = binding.parentConversationId ?? binding.conversationId;
+	const threadId = binding.parentConversationId && binding.parentConversationId !== binding.conversationId ? binding.conversationId : void 0;
+	return { origin: {
+		channel: "matrix",
+		accountId: binding.accountId,
+		to: `room:${roomId}`,
+		...threadId ? { threadId } : {}
+	} };
+}
+//#endregion
+export { handleMatrixSubagentDeliveryTarget, handleMatrixSubagentEnded };

package/dist/subagent-hooks-api.js

@@ -1,6 +1,6 @@
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 //#region extensions/matrix/subagent-hooks-api.ts
-const loadMatrixSubagentHooksModule = createLazyRuntimeModule(() => import("./subagent-hooks-dkPAF6Et.js"));
+const loadMatrixSubagentHooksModule = createLazyRuntimeModule(() => import("./subagent-hooks-CMoZaARG.js"));
 function registerMatrixSubagentHooks(api) {
 	api.on("subagent_ended", async (event) => {
 		const { handleMatrixSubagentEnded } = await loadMatrixSubagentHooksModule();

package/dist/{target-ids-B-5aQxwn.js → target-ids-Nwx7cMVE.js}

@@ -52,6 +52,16 @@ function isMatrixQualifiedUserId(raw) {
 	const trimmed = raw.trim();
 	return trimmed.startsWith("@") && trimmed.includes(":");
 }
+/**
+* Whether `raw` is already a literal room ID rather than a name/query to resolve.
+* Room version 12 (MSC4291) dropped the trailing ":server" from room IDs — they're
+* now a hash of the create event — so this must not require a colon the way user
+* IDs and aliases still do.
+*/
+function isMatrixRoomId(raw) {
+	const trimmed = raw.trim();
+	return trimmed.startsWith("!") && trimmed.length > 1;
+}
 function normalizeMatrixResolvableTarget(raw) {
 	return stripKnownPrefixes(raw, [
 		MATRIX_PREFIX,
@@ -74,4 +84,4 @@ function resolveMatrixDirectUserId(params) {
 	return isMatrixQualifiedUserId(userId) ? userId : void 0;
 }
 //#endregion
-export { resolveMatrixTargetIdentity as a, resolveMatrixDirectUserId as i, normalizeMatrixMessagingTarget as n, normalizeMatrixResolvableTarget as r, isMatrixQualifiedUserId as t };
+export { resolveMatrixDirectUserId as a, normalizeMatrixResolvableTarget as i, isMatrixRoomId as n, resolveMatrixTargetIdentity as o, normalizeMatrixMessagingTarget as r, isMatrixQualifiedUserId as t };

package/dist/{thread-binding-api-DRbBZlhS.js → thread-binding-api-CzkeLZCU.js}

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

package/dist/thread-binding-api.js

@@ -1,2 +1,2 @@
-import { n as resolveMatrixInboundConversation, t as defaultTopLevelPlacement } from "./thread-binding-api-DRbBZlhS.js";
+import { n as resolveMatrixInboundConversation, t as defaultTopLevelPlacement } from "./thread-binding-api-CzkeLZCU.js";
 export { defaultTopLevelPlacement, resolveMatrixInboundConversation as resolveInboundConversation };

package/dist/{thread-bindings-CcHZP3w2.js → thread-bindings-BYEGfw3h.js}

@@ -1,7 +1,7 @@
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { a as listBindingsForAccount, c as resolveBindingKey, f as setMatrixThreadBindingManagerEntry, h as toSessionBindingRecord, l as resolveEffectiveBindingExpiry, m as toMatrixBindingTargetKind, o as removeBindingRecord, r as getMatrixThreadBindingManagerEntry, t as deleteMatrixThreadBindingManagerEntry, u as setBindingRecord } from "./thread-bindings-shared-CKnY4LSd.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 { M as resolveMatrixSqliteStateEnv, N as resolveMatrixSqliteStateKey, c as resolveMatrixStateFilePath, t as claimCurrentTokenStorageState } from "./storage-BsGuHngK.js";
-import { r as sendMessageMatrix } from "./send-ZDLU4JTk.js";
+import { r as sendMessageMatrix } from "./send-ClHgDZLT.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import path from "node:path";
@@ -153,7 +153,7 @@ async function createMatrixThreadBindingManager(params) {
 	const existingEntry = getMatrixThreadBindingManagerEntry(params.accountId);
 	if (existingEntry) {
 		if (existingEntry.storageKey === storageKey) return existingEntry.manager;
-		existingEntry.manager.stop();
+		await existingEntry.manager.stop();
 	}
 	const pluginLoaded = await loadBindingsFromPluginState({
 		accountId: params.accountId,
@@ -274,20 +274,24 @@ async function createMatrixThreadBindingManager(params) {
 				})
 			});
 		},
-		stop: () => {
+		stop: async () => {
 			if (sweepTimer) clearInterval(sweepTimer);
+			let finalPersist = persistQueue;
 			if (persistTimer) {
 				clearTimeout(persistTimer);
 				persistTimer = null;
-				persistSafely("shutdown-flush");
+				finalPersist = enqueuePersist();
 			}
 			unregisterSessionBindingAdapter({
 				channel: "matrix",
 				accountId: params.accountId,
 				adapter: sessionBindingAdapter
 			});
-			if (getMatrixThreadBindingManagerEntry(params.accountId)?.manager === manager) deleteMatrixThreadBindingManagerEntry(params.accountId);
-			for (const record of listBindingsForAccount(params.accountId)) removeBindingRecord(record);
+			if (getMatrixThreadBindingManagerEntry(params.accountId)?.manager === manager) {
+				deleteMatrixThreadBindingManagerEntry(params.accountId);
+				for (const record of listBindingsForAccount(params.accountId)) removeBindingRecord(record);
+			}
+			await finalPersist;
 		}
 	};
 	let sweepTimer = null;

package/dist/thread-bindings-runtime.js

@@ -1,2 +1,2 @@
-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";
 export { setMatrixThreadBindingIdleTimeoutBySessionKey, setMatrixThreadBindingMaxAgeBySessionKey };

package/dist/{thread-bindings-shared-CKnY4LSd.js → thread-bindings-shared-oNPiyMWY.js}

@@ -88,10 +88,5 @@ function setMatrixThreadBindingMaxAgeBySessionKey(params) {
 		maxAgeMs: manager.getMaxAgeMs()
 	}));
 }
-function resetMatrixThreadBindingsForTests() {
-	for (const { manager } of MANAGERS_BY_ACCOUNT_ID.values()) manager.stop();
-	MANAGERS_BY_ACCOUNT_ID.clear();
-	BINDINGS_BY_ACCOUNT_CONVERSATION.clear();
-}
 //#endregion
-export { listBindingsForAccount as a, resolveBindingKey as c, setMatrixThreadBindingIdleTimeoutBySessionKey as d, setMatrixThreadBindingManagerEntry as f, toSessionBindingRecord as h, listAllBindings as i, resolveEffectiveBindingExpiry as l, toMatrixBindingTargetKind as m, getMatrixThreadBindingManager as n, removeBindingRecord as o, setMatrixThreadBindingMaxAgeBySessionKey as p, getMatrixThreadBindingManagerEntry as r, resetMatrixThreadBindingsForTests as s, deleteMatrixThreadBindingManagerEntry as t, setBindingRecord as u };
+export { listBindingsForAccount as a, resolveEffectiveBindingExpiry as c, setMatrixThreadBindingManagerEntry as d, setMatrixThreadBindingMaxAgeBySessionKey as f, listAllBindings as i, setBindingRecord as l, toSessionBindingRecord as m, getMatrixThreadBindingManager as n, removeBindingRecord as o, toMatrixBindingTargetKind as p, getMatrixThreadBindingManagerEntry as r, resolveBindingKey as s, deleteMatrixThreadBindingManagerEntry as t, setMatrixThreadBindingIdleTimeoutBySessionKey as u };

package/dist/{tool-actions.runtime-DmdRL0bN.js → tool-actions.runtime-ck6IJyP0.js}

@@ -1,15 +1,15 @@
 import { a as resolveMatrixAccountConfig, o as resolveMatrixBaseConfig } from "./account-config-BZWN9tGS.js";
 import { i as resolveMatrixAccount } from "./accounts-BCzyubQt.js";
-import { r as resolveMatrixRoomConfig } from "./channel-VSrHgTON.js";
-import { r as normalizeMatrixResolvableTarget } from "./target-ids-B-5aQxwn.js";
-import { g as parsePollStart, h as isPollStartType, n as reactMatrixMessage, u as buildPollResponseContent, x as resolveMatrixRoomId } from "./send-ZDLU4JTk.js";
-import { i as isStrictDirectMembership, n as hasDirectMatrixMemberFlag, o as readJoinedMatrixMembers } from "./direct-room-RinHjtqX.js";
+import { l as resolveMatrixRoomConfig } from "./channel-CzQw5OZN.js";
+import { i as normalizeMatrixResolvableTarget } from "./target-ids-Nwx7cMVE.js";
 import { i as buildMatrixReactionRelationsPath, o as selectOwnMatrixReactionEventIds, s as summarizeMatrixReactionEvents } from "./reaction-common-DkrQdBSZ.js";
-import { n as withResolvedActionClient, r as withResolvedRoomAction } from "./client-sJesKQmp.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-BW0s-6Y9.js";
+import { g as parsePollStart, h as isPollStartType, n as reactMatrixMessage, u as buildPollResponseContent, x as resolveMatrixRoomId } from "./send-ClHgDZLT.js";
+import { i as isStrictDirectMembership, n as hasDirectMatrixMemberFlag, o as readJoinedMatrixMembers } from "./direct-room-RinHjtqX.js";
+import { n as withResolvedActionClient, r as withResolvedRoomAction } from "./client-D8XghqmX.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-DEqg7HVy.js";
 import { c as readReactionParams, d as resolveAllowlistProviderRuntimeGroupPolicy, f as resolveDefaultGroupPolicy, i as createActionGate, l as readStringArrayParam, n as ToolAuthorizationError, o as jsonResult, s as readPositiveIntegerParam, u as readStringParam } from "./runtime-api-BGO16Fu8.js";
-import { t as applyMatrixProfileUpdate } from "./profile-update-BkgWYDIp.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-C7ig-bQE.js";
+import { t as applyMatrixProfileUpdate } from "./profile-update-BQlE5s2J.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-CabtBTtB.js";
 import { t as createMatrixRoomInfoResolver } from "./room-info-BXQA7y10.js";
 import { normalizeOptionalLowercaseString, uniqueStrings, uniqueValues } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";

package/dist/{verification-C7ig-bQE.js → verification-CabtBTtB.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { i as withStartedActionClient, n as withResolvedActionClient } from "./client-sJesKQmp.js";
+import { i as withStartedActionClient, n as withResolvedActionClient } from "./client-D8XghqmX.js";
 import { n as formatMatrixEncryptionUnavailableError } from "./encryption-guidance-DmLY8NiO.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";

package/openclaw.plugin.json

@@ -6,6 +6,13 @@
   },
   "name": "Matrix",
   "description": "OpenClaw Matrix channel plugin for rooms and direct messages.",
+  "cliCommands": [
+    {
+      "name": "matrix",
+      "description": "Manage Matrix accounts, verification, devices, and profile state",
+      "hasSubcommands": true
+    }
+  ],
   "icon": "https://cdn.simpleicons.org/matrix",
   "commandAliases": [
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/matrix",
-  "version": "2026.8.1-beta.2",
+  "version": "2026.8.1-beta.3",
   "description": "OpenClaw Matrix channel plugin for rooms and direct messages.",
   "repository": {
     "type": "git",
@@ -18,7 +18,7 @@
     "zod": "4.4.3"
   },
   "peerDependencies": {
-    "openclaw": ">=2026.8.1-beta.2"
+    "openclaw": ">=2026.8.1-beta.3"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -167,10 +167,10 @@
       "allowInvalidConfigRecovery": true
     },
     "compat": {
-      "pluginApi": ">=2026.8.1-beta.2"
+      "pluginApi": ">=2026.8.1-beta.3"
     },
     "build": {
-      "openclawVersion": "2026.8.1-beta.2"
+      "openclawVersion": "2026.8.1-beta.3"
     },
     "release": {
       "publishToClawHub": true,

package/dist/probe.runtime-Dr91B_X3.js

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