@openclaw/matrix 2026.8.1-beta.2 → 2026.8.1

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

@@ -1,12 +1,12 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
+import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.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-D8irSL2i.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
 		});
@@ -2340,4 +2360,4 @@ async function reactMatrixMessage(roomId, messageId, emoji, opts) {
 	});
 }
 //#endregion
-export { promoteMatrixDirectRoomCandidate as C, MsgType as E, direct_management_exports as S, MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY as T, parsePollStartContent as _, sendSingleTextMessageMatrix as a, reconcileMatrixUnknownSend as b, chunkMatrixText as c, buildPollResultsSummary as d, formatPollAsText as f, parsePollStart as g, isPollStartType as h, sendPollMatrix as i, prepareMatrixSingleText as l, isPollEventType as m, reactMatrixMessage as n, sendTypingMatrix as o, formatPollResultsAsText as p, sendMessageMatrix as r, send_exports as s, editMessageMatrix as t, buildPollResponseContent as u, resolvePollReferenceEventId as v, repairMatrixDirectRooms as w, resolveMatrixRoomId as x, cleanupMatrixDeliveryPlans as y };
+export { repairMatrixDirectRooms as C, promoteMatrixDirectRoomCandidate as S, MsgType as T, resolvePollReferenceEventId as _, sendSingleTextMessageMatrix as a, resolveMatrixRoomId as b, prepareMatrixSingleText as c, formatPollAsText as d, formatPollResultsAsText as f, parsePollStartContent as g, parsePollStart as h, sendPollMatrix as i, buildPollResponseContent as l, isPollStartType as m, reactMatrixMessage as n, sendTypingMatrix as o, isPollEventType as p, sendMessageMatrix as r, send_exports as s, editMessageMatrix as t, buildPollResultsSummary as u, cleanupMatrixDeliveryPlans as v, MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY as w, direct_management_exports as x, reconcileMatrixUnknownSend as y };

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

package/dist/{setup-bootstrap-BaXkhgJg.js → setup-bootstrap-D8M7FmcO.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 { a as resolveMatrixAccountConfig, n as hasExplicitMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
+import "./accounts-fC57n-Jo.js";
+import { n as bootstrapMatrixVerification } from "./verification-4vsW_WSn.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-r6L0nno-.js}

@@ -1,8 +1,8 @@
-import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
-import { n as resolveMatrixEnvAuthReadiness } from "./env-auth-MVS-Vv41.js";
-import { r as resolveDefaultMatrixAccountId } from "./accounts-BCzyubQt.js";
+import { s as resolveMatrixEnvAuthReadiness } from "./account-selection-C8nnBTxi.js";
+import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
+import { r as resolveDefaultMatrixAccountId } from "./accounts-fC57n-Jo.js";
 import { t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.js";
-import { r as updateMatrixAccountConfig } from "./config-update-Bor_Pjsv.js";
+import { r as updateMatrixAccountConfig } from "./config-update-DC0fWBxc.js";
 import { t as isSupportedMatrixAvatarSource } from "./profile-D-Wubo0A.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
@@ -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-D8M7FmcO.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-CSacbORr.js";
 export { matrixSetupPlugin };

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

@@ -1,10 +1,10 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { n as requiresExplicitMatrixDefaultAccount } from "./account-selection-CWuhuFn1.js";
-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 { r as updateMatrixAccountConfig } from "./config-update-Bor_Pjsv.js";
-import { a as moveSingleMatrixAccountConfigToNamedAccount, i as createMatrixSetupDmPolicy } from "./setup-core-DQn6b5vi.js";
+import { n as requiresExplicitMatrixDefaultAccount, s as resolveMatrixEnvAuthReadiness } from "./account-selection-C8nnBTxi.js";
+import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
+import { i as resolveMatrixAccount, r as resolveDefaultMatrixAccountId, t as listMatrixAccountIds } from "./accounts-fC57n-Jo.js";
+import { n as isMatrixRoomId } from "./target-ids-Nwx7cMVE.js";
+import { r as updateMatrixAccountConfig } from "./config-update-DC0fWBxc.js";
+import { a as moveSingleMatrixAccountConfigToNamedAccount, i as createMatrixSetupDmPolicy } from "./setup-core-r6L0nno-.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 +31,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 +90,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-qG6gceps.js").then((n) => n.n);
 			const results = await resolveMatrixTargets({
 				cfg,
 				accountId,
@@ -160,7 +160,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 +168,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 +191,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 +204,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-DKr0w35b.js").then((n) => n.t);
 				const matches = await listMatrixDirectoryGroupsLive({
 					cfg: next,
 					accountId: params.accountId,
@@ -458,7 +458,7 @@ const matrixOnboardingAdapter = {
 		});
 	},
 	afterConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-BaXkhgJg.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-D8M7FmcO.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-ERWNousC.js}

@@ -1,13 +1,13 @@
 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-BL_iH5Ox.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import path from "node:path";
 import { registerSessionBindingAdapter, resolveThreadBindingFarewellText, unregisterSessionBindingAdapter } from "openclaw/plugin-sdk/thread-bindings-session-runtime";
 import fs from "node:fs/promises";
-import { resolveSessionAgentId } from "openclaw/plugin-sdk/agent-scope-runtime";
+import { resolveSessionAgentIdStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { readJsonFileWithFallback } from "openclaw/plugin-sdk/json-store";
 import { resolveAgentIdFromSessionKey } from "openclaw/plugin-sdk/session-key-runtime";
 //#region extensions/matrix/src/matrix/thread-bindings.ts
@@ -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;
@@ -354,7 +358,7 @@ async function createMatrixThreadBindingManager(params) {
 				...boundParentConversationId ? { parentConversationId: boundParentConversationId } : {},
 				targetKind: toMatrixBindingTargetKind(input.targetKind),
 				targetSessionKey,
-				agentId: normalizeOptionalString(input.metadata?.agentId) ?? resolveSessionAgentId({
+				agentId: normalizeOptionalString(input.metadata?.agentId) ?? resolveSessionAgentIdStrict({
 					config: params.cfg,
 					sessionKey: targetSessionKey
 				}),

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 };