@openclaw/matrix 2026.8.1-beta.2 → 2026.9.1-beta.1

package/dist/{reaction-events-nfUbFLdV.js → reaction-events-BZUgLIZI.js}

@@ -1,15 +1,15 @@
 import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
+import { a as resolveMatrixThreadRootId, o as resolveMatrixThreadRouting, r as resolveMatrixInboundRoute } from "./channel-CBEvelTE.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-60xHiDtQ.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-BKu9Ghi4.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-DXzZwsIY.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-D0KfJlby.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-p5qJ3Kst.js}

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

package/dist/runtime-api.js

@@ -2,7 +2,7 @@ import { a as resolveMatrixDefaultOrOnlyAccountId, i as resolveMatrixChannelConf
 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-CljOKEvc.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-hs1ePy2O.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";
@@ -123,8 +124,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 +147,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 +179,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 +208,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 +221,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 +230,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 +437,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 +472,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 +479,7 @@ var MatrixClientBase = class {
 		this.started = false;
 	}
 	async quiesceSync() {
-		await quiesceMatrixClientSync({
+		this.syncQuiescePromise ??= quiesceMatrixClientSync({
 			client: this.client,
 			emitter: this.emitter,
 			markStopped: () => {
@@ -474,6 +488,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 +496,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 +519,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 +561,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);
 		}
 	}

package/dist/{send-ZDLU4JTk.js → send-BKu9Ghi4.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-BxdxjCwA.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;
@@ -889,6 +890,7 @@ const spoilerParser = new MarkdownIt({
 	linkify: true,
 	typographer: false
 });
+spoilerParser.linkify.set({ fuzzyLink: true });
 function findInlineMetadataRanges(markdown, references) {
 	const ranges = [];
 	const labelStack = [];
@@ -1065,9 +1067,9 @@ const md = new MarkdownIt({
 	breaks: true,
 	typographer: false
 });
+md.linkify.set({ fuzzyLink: true });
 md.enable("strikethrough");
 const { escapeHtml } = md.utils;
-const ESCAPED_MENTION_SENTINEL = "";
 const MENTION_PATTERN = /@[A-Za-z0-9._=+\-/:[\]]+/g;
 const MATRIX_MENTION_USER_ID_PATTERN = new RegExp(`^@[A-Za-z0-9._=+\\-/]+:(?:${/(?:[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?)(?:\.(?:[A-Za-z0-9](?:[A-Za-z0-9-]*[A-Za-z0-9])?))*(?::\d+)?/.source}|\\[[0-9A-Fa-f:.]+\\](?::\\d+)?)$`);
 const TRIMMABLE_MENTION_SUFFIX = /[),.!?:;\]]/;
@@ -1095,7 +1097,7 @@ md.core.ruler.after("inline", "matrix_spoilers", (state) => {
 function shouldSuppressAutoLink(tokens, idx) {
 	const token = tokens[idx];
 	if (token?.type !== "link_open" || token.info !== "auto") return false;
-	const href = token.attrGet("href") ?? "";
+	const href = String(token.attrGet("href") ?? "");
 	const label = tokens[idx + 1]?.type === "text" ? tokens[idx + 1]?.content ?? "" : "";
 	return Boolean(href && label && isAutoLinkedFileRef(href, label));
 }
@@ -1105,6 +1107,7 @@ md.renderer.rules.image = (tokens, idx, options, env, self) => {
 };
 md.renderer.rules.html_block = (tokens, idx) => escapeHtml(tokens[idx]?.content ?? "");
 md.renderer.rules.html_inline = (tokens, idx) => escapeHtml(tokens[idx]?.content ?? "");
+md.renderer.rules.text_special = (tokens, idx) => escapeHtml(tokens[idx]?.content ?? "");
 md.renderer.rules.link_open = (tokens, idx, _options, _env, self) => shouldSuppressAutoLink(tokens, idx) ? "" : self.renderToken(tokens, idx, _options);
 md.renderer.rules.link_close = (tokens, idx, _options, _env, self) => {
 	const openIdx = idx - 2;
@@ -1115,6 +1118,8 @@ function maskEscapedMentions(markdown) {
 	let masked = "";
 	let idx = 0;
 	let codeFenceLength = 0;
+	let marker;
+	const metadataRanges = markdown.includes("\\@") ? findMatrixMarkdownMetadataRanges(markdown) : [];
 	while (idx < markdown.length) {
 		if (markdown[idx] === "`" && !isMarkdownEscaped(markdown, idx)) {
 			let runLength = 1;
@@ -1125,24 +1130,26 @@ function maskEscapedMentions(markdown) {
 			idx += runLength;
 			continue;
 		}
-		if (codeFenceLength === 0 && markdown[idx] === "\\" && markdown[idx + 1] === "@") {
-			masked += ESCAPED_MENTION_SENTINEL;
+		if (codeFenceLength === 0 && markdown[idx] === "\\" && markdown[idx + 1] === "@" && !metadataRanges.some((range) => idx >= range.start && idx < range.end)) {
+			marker ??= createMatrixPrivateMarkers(markdown, "Matrix mention formatting exhausted its private marker pool").open;
+			masked += marker;
 			idx += 2;
 			continue;
 		}
 		masked += markdown[idx] ?? "";
 		idx += 1;
 	}
-	return masked;
-}
-function restoreEscapedMentions(text) {
-	return text.replaceAll(ESCAPED_MENTION_SENTINEL, "@");
+	return {
+		markdown: masked,
+		...marker ? { marker } : {}
+	};
 }
-function restoreEscapedMentionsInCode(text) {
-	return text.replaceAll(ESCAPED_MENTION_SENTINEL, "\\@");
+function restoreEscapedMentions(text, marker, inCode = false) {
+	return marker ? text.replaceAll(marker, inCode ? "\\@" : "@") : text;
 }
-function restoreEscapedMentionsInBlockTokens(tokens) {
-	for (const token of tokens) if ((token.type === "fence" || token.type === "code_block") && token.content) token.content = restoreEscapedMentionsInCode(token.content);
+function restoreEscapedMentionsInBlockTokens(tokens, marker) {
+	if (!marker) return;
+	for (const token of tokens) if ((token.type === "fence" || token.type === "code_block") && token.content) token.content = restoreEscapedMentions(token.content, marker, true);
 }
 function isMentionStartBoundary(charBefore) {
 	return !charBefore || !/[A-Za-z0-9_]/.test(charBefore);
@@ -1285,6 +1292,7 @@ async function resolveMatrixSelfUserId(client) {
 }
 function mutateInlineTokensWithMentions(params) {
 	const nextChildren = [];
+	const restoreMention = (text) => restoreEscapedMentions(text, params.escapedMentionMarker);
 	let roomMentioned = false;
 	let insideLinkDepth = 0;
 	for (const child of params.children) {
@@ -1299,10 +1307,11 @@ function mutateInlineTokensWithMentions(params) {
 			continue;
 		}
 		if (child.type !== "text" || !child.content) {
+			for (const nested of child.children ?? []) nested.content = restoreMention(nested.content);
 			nextChildren.push(child);
 			continue;
 		}
-		const visibleContent = restoreEscapedMentions(child.content);
+		const visibleContent = restoreMention(child.content);
 		if (insideLinkDepth > 0) {
 			nextChildren.push(createTextToken(child, visibleContent));
 			continue;
@@ -1314,7 +1323,7 @@ function mutateInlineTokensWithMentions(params) {
 		}
 		let cursor = 0;
 		for (const match of matches) {
-			if (match.start > cursor) nextChildren.push(createTextToken(child, restoreEscapedMentions(child.content.slice(cursor, match.start))));
+			if (match.start > cursor) nextChildren.push(createTextToken(child, restoreMention(child.content.slice(cursor, match.start))));
 			cursor = match.end;
 			if (match.kind === "room") {
 				roomMentioned = true;
@@ -1336,7 +1345,7 @@ function mutateInlineTokensWithMentions(params) {
 				label: match.raw
 			}));
 		}
-		if (cursor < child.content.length) nextChildren.push(createTextToken(child, restoreEscapedMentions(child.content.slice(cursor))));
+		if (cursor < child.content.length) nextChildren.push(createTextToken(child, restoreMention(child.content.slice(cursor))));
 	}
 	return {
 		children: nextChildren,
@@ -1431,8 +1440,9 @@ function renderMatrixFallbackHtml(markdown) {
 	return `<p>${escapeHtml(markdownToMatrixBody(markdown)).replaceAll("\n", "<br>\n")}</p>`;
 }
 async function resolveMarkdownMentionState(params) {
-	const tokens = parseMatrixMarkdown(maskEscapedMentions(projectMatrixMarkdown(params.markdown)), params.tableMode);
-	restoreEscapedMentionsInBlockTokens(tokens);
+	const { markdown, marker } = maskEscapedMentions(projectMatrixMarkdown(params.markdown));
+	const tokens = parseMatrixMarkdown(markdown, params.tableMode);
+	restoreEscapedMentionsInBlockTokens(tokens, marker);
 	const selfUserId = await resolveMatrixSelfUserId(params.client);
 	const userIds = [];
 	const seenUserIds = /* @__PURE__ */ new Set();
@@ -1443,7 +1453,8 @@ async function resolveMarkdownMentionState(params) {
 			children: token.children,
 			userIds,
 			seenUserIds,
-			selfUserId
+			selfUserId,
+			escapedMentionMarker: marker
 		});
 		token.children = mutated.children;
 		roomMentioned ||= mutated.roomMentioned;
@@ -1593,10 +1604,12 @@ function prepareMatrixSingleText(text, opts) {
 	});
 	const convertedText = renderMatrixMarkdownTables(trimmedText, tableMode);
 	const singleEventLimit = normalizeMatrixEventLimit(Math.min(getCore$2().channel.text.resolveTextChunkLimit(cfg, "matrix", opts.accountId), MATRIX_FORMAT_PROFILE.chunk.limit));
-	const eventTextLength = Math.max(convertedText.length, markdownToMatrixBody(convertedText).length);
+	const preparedBody = markdownToMatrixBody(convertedText);
+	const eventTextLength = Math.max(convertedText.length, preparedBody.length);
 	return {
 		trimmedText,
 		convertedText,
+		preparedBody,
 		singleEventLimit,
 		eventTextLength,
 		fitsInSingleEvent: eventTextLength <= singleEventLimit,
@@ -1647,7 +1660,7 @@ function chunkMatrixText(text, opts) {
 const getCore$1 = () => getMatrixRuntime();
 async function renderMatrixFormattedContent(params) {
 	const markdown = params.markdown ?? "";
-	const body = markdownToMatrixBody(markdown);
+	const body = params.preparedBody ?? markdownToMatrixBody(markdown);
 	if (params.includeMentions === false) return {
 		body,
 		html: markdownToMatrixHtml(markdown, { tableMode: params.tableMode }).trimEnd() || void 0
@@ -1678,6 +1691,7 @@ async function enrichMatrixFormattedContent(params) {
 	const { body, html, mentions } = await renderMatrixFormattedContent({
 		client: params.client,
 		markdown: params.markdown,
+		preparedBody: params.preparedBody,
 		includeMentions: params.includeMentions,
 		tableMode: params.tableMode
 	});
@@ -2013,11 +2027,12 @@ async function sendMessageMatrix(to, message, opts) {
 			wireEventType
 		}) : null)?.events;
 		if (!plannedEvents) {
-			const { chunks, tableMode } = chunkMatrixText(messageText, {
+			const { chunks, convertedText, preparedBody, fitsInSingleEvent, tableMode } = chunkMatrixText(messageText, {
 				cfg,
 				accountId: opts.accountId,
 				preserveWhitespace: true
 			});
+			const singleEventBody = fitsInSingleEvent ? preparedBody : void 0;
 			const relation = threadId ? buildThreadRelation(threadId, opts.replyToId) : buildReplyRelation(opts.replyToId);
 			let pendingExtraContent = opts.extraContent;
 			const events = [];
@@ -2078,6 +2093,7 @@ async function sendMessageMatrix(to, message, opts) {
 					client,
 					content,
 					markdown: captionMarkdown,
+					preparedBody: captionMarkdown === convertedText ? singleEventBody : void 0,
 					tableMode
 				});
 				prepareContent(content, receiptKind);
@@ -2090,6 +2106,7 @@ async function sendMessageMatrix(to, message, opts) {
 						client,
 						content: followup,
 						markdown: chunk,
+						preparedBody: chunk === convertedText ? singleEventBody : void 0,
 						tableMode
 					});
 					prepareContent(followup, "text");
@@ -2101,6 +2118,7 @@ async function sendMessageMatrix(to, message, opts) {
 					client,
 					content,
 					markdown: chunk,
+					preparedBody: chunk === convertedText ? singleEventBody : void 0,
 					tableMode
 				});
 				prepareContent(content, "text");
@@ -2229,7 +2247,7 @@ async function sendReadReceiptMatrix(roomId, eventId, client) {
 	});
 }
 async function sendSingleTextMessageMatrix(roomId, text, opts) {
-	const { trimmedText, convertedText, singleEventLimit, eventTextLength, fitsInSingleEvent, tableMode } = prepareMatrixSingleText(text.trimEnd(), {
+	const { trimmedText, convertedText, preparedBody, singleEventLimit, eventTextLength, fitsInSingleEvent, tableMode } = prepareMatrixSingleText(text.trimEnd(), {
 		cfg: opts.cfg,
 		accountId: opts.accountId,
 		preserveWhitespace: true
@@ -2249,6 +2267,7 @@ async function sendSingleTextMessageMatrix(roomId, text, opts) {
 			client,
 			content,
 			markdown: convertedText,
+			preparedBody,
 			includeMentions: opts.includeMentions,
 			tableMode
 		});
@@ -2285,7 +2304,7 @@ async function editMessageMatrix(roomId, originalEventId, newText, opts) {
 		timeoutMs: opts.timeoutMs
 	}, async (client) => {
 		const resolvedRoom = await resolveMatrixRoomId(client, roomId);
-		const { convertedText, tableMode } = prepareMatrixSingleText(newText, {
+		const { convertedText, preparedBody, tableMode } = prepareMatrixSingleText(newText, {
 			cfg: requireRuntimeConfig(opts.cfg, "Matrix message edit"),
 			accountId: opts.accountId,
 			preserveWhitespace: true
@@ -2295,6 +2314,7 @@ async function editMessageMatrix(roomId, originalEventId, newText, opts) {
 			client,
 			content: newContent,
 			markdown: convertedText,
+			preparedBody,
 			includeMentions: opts.includeMentions,
 			tableMode
 		});

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-BvyU66kE.js";
+export { createMatrixThreadBindingManager, setMatrixRuntime };

package/dist/{setup-bootstrap-BaXkhgJg.js → setup-bootstrap-CpE6C3qV.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-BP-3-XYn.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-CyvaCOOr.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-CpE6C3qV.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-sWPOGyQG.js";
 export { matrixSetupPlugin };