@openclaw/matrix 2026.9.2 → 2026.9.4

package/dist/{send-B5XChnvB.js → send-UWLIQ0bG.js}

@@ -2,24 +2,28 @@ import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
 import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.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 { r as buildMatrixReactionContent } from "./reaction-common-DkrQdBSZ.js";
+import { a as RelationType, i as MsgType, r as MSC4357_LIVE_KEY, t as EventType } from "./types-DzSc7Sqm.js";
+import { n as getMatrixEventProjection } from "./event-helpers-CspuhE9k.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { createMessageReceiptFromOutboundResults } from "openclaw/plugin-sdk/channel-outbound";
-import { isRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeOptionalStringifiedId } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { asNullableObjectRecord, asNullableRecord, asOptionalRecord, 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 path from "node:path";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { loadOutboundMediaFromUrl } from "openclaw/plugin-sdk/outbound-media";
+import { M_POLL_KIND_DISCLOSED } from "matrix-js-sdk/lib/@types/polls.js";
 import { normalizePollInput } from "openclaw/plugin-sdk/poll-runtime";
 import MarkdownIt from "markdown-it";
 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-n1Rqc8Go.js").then((n) => n.t));
+const loadMatrixSendClientRuntime = createLazyRuntimeModule(() => import("./client-bootstrap-DLN-K8Xb.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 resolvedCfg = requireRuntimeConfig(cfg, "Matrix media limits");
@@ -47,36 +51,6 @@ async function withResolvedMatrixClient(opts, run, shutdownBehavior) {
 	return await withResolvedRuntimeMatrixClient(opts, run, shutdownBehavior);
 }
 //#endregion
-//#region extensions/matrix/src/matrix/send/types.ts
-const MsgType = {
-	Text: "m.text",
-	Image: "m.image",
-	Audio: "m.audio",
-	Video: "m.video",
-	File: "m.file",
-	Notice: "m.notice"
-};
-const RelationType = {
-	Annotation: MATRIX_ANNOTATION_RELATION_TYPE,
-	Replace: "m.replace",
-	Thread: "m.thread"
-};
-const EventType = {
-	Direct: "m.direct",
-	Reaction: MATRIX_REACTION_EVENT_TYPE,
-	RoomMessage: "m.room.message"
-};
-const MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY = "com.openclaw.finalized_preview";
-/**
-* MSC4357 live marker key.
-* When present on event content, signals that the message is still being
-* streamed (e.g. an LLM generating a response). Supporting clients render
-* the message with a streaming animation until an edit without this marker
-* arrives, indicating the stream is complete.
-* @see https://github.com/matrix-org/matrix-spec-proposals/pull/4357
-*/
-const MSC4357_LIVE_KEY = "org.matrix.msc4357.live";
-//#endregion
 //#region extensions/matrix/src/matrix/direct-management.ts
 var direct_management_exports = /* @__PURE__ */ __exportAll({
 	inspectMatrixDirectRooms: () => inspectMatrixDirectRooms,
@@ -659,7 +633,7 @@ function parsePollStart(content) {
 	return {
 		question,
 		answers,
-		kind: poll.kind ?? "m.poll.disclosed",
+		kind: M_POLL_KIND_DISCLOSED.matches(poll.kind ?? "m.poll.disclosed") ? "m.poll.disclosed" : "m.poll.undisclosed",
 		maxSelections: Math.min(Math.max(maxSelections, 1), answers.length)
 	};
 }
@@ -816,6 +790,34 @@ function buildPollResponseContent(pollEventId, answerIds) {
 	};
 }
 //#endregion
+//#region extensions/matrix/src/matrix/relations.ts
+function relatedReplyEventId(relation) {
+	const reply = asOptionalRecord(relation?.["m.in_reply_to"]);
+	return typeof reply?.event_id === "string" ? reply.event_id : void 0;
+}
+function buildMatrixMessageRelation(params) {
+	const threadId = params.threadId?.trim();
+	const replyToId = params.replyToId?.trim();
+	const relatedId = replyToId || (threadId ? params.fallbackReplyToId?.trim() : void 0);
+	const reply = relatedId ? { "m.in_reply_to": { event_id: relatedId } } : void 0;
+	if (!threadId) return reply;
+	return {
+		rel_type: RelationType.Thread,
+		event_id: threadId,
+		...reply,
+		...relatedId && !replyToId ? { is_falling_back: true } : {}
+	};
+}
+function resolveMatrixReplyToEventId(content) {
+	const relation = asOptionalRecord(content["m.relates_to"]);
+	return relation?.rel_type === RelationType.Thread && relation.is_falling_back === true ? void 0 : relatedReplyEventId(relation);
+}
+function resolveMatrixThreadRootId(content) {
+	const relation = asOptionalRecord(content["m.relates_to"]);
+	if (relation?.rel_type !== RelationType.Thread) return;
+	return typeof relation.event_id === "string" ? relation.event_id : relatedReplyEventId(relation);
+}
+//#endregion
 //#region extensions/matrix/src/matrix/format-profile.ts
 function createMatrixPrivateMarkers(markdown, exhaustedMessage) {
 	const used = new Set(Array.from(markdown, (character) => character.charCodeAt(0)));
@@ -854,15 +856,7 @@ function isMarkdownEscaped(markdown, index) {
 	return slashCount % 2 === 1;
 }
 function projectMatrixMarkdown(markdown) {
-	const normalized = (markdown ?? "").replace(/\r\n?/gu, "\n");
-	return renderMarkdownWithMarkers({
-		text: normalized,
-		styles: [],
-		links: []
-	}, {
-		styleMarkers: {},
-		escapeText: (text) => text
-	}, MATRIX_FORMAT_PROFILE);
+	return (markdown ?? "").replace(/\r\n?/gu, "\n");
 }
 function renderMatrixMarkdownTables(markdown, mode) {
 	return MATRIX_FORMAT_PROFILE.constructs.table === "native" && (mode === "off" || mode === "block") ? markdown : convertMarkdownTables(markdown, mode);
@@ -1010,6 +1004,7 @@ function findMatrixMarkdownMetadataRanges(markdown) {
 }
 function findMatrixSpoilerDelimiterOffsets(markdown) {
 	const projected = projectMatrixMarkdown(markdown);
+	if (!projected.includes("||")) return [];
 	const tokens = spoilerParser.parse(projected, {});
 	const lineStarts = [0];
 	for (let index = 0; index < projected.length; index += 1) if (projected[index] === "\n") lineStarts.push(index + 1);
@@ -1042,6 +1037,7 @@ function findMatrixSpoilerDelimiterOffsets(markdown) {
 }
 function hasMatrixSpoilerMetadataCollision(markdown) {
 	const projected = projectMatrixMarkdown(markdown);
+	if (!projected.includes("||")) return false;
 	const ordinary = new Set(findMatrixSpoilerDelimiterOffsets(projected));
 	const underlineTags = [...tokenizeHtmlTags(projected)].filter((tag) => (tag.name === "u" || tag.name === "ins") && !isMarkdownEscaped(projected, tag.start));
 	const literalRanges = [...findMatrixTableSourceRanges(projected), ...findCodeRegions(projected).filter((code) => !underlineTags.some((tag) => code.start > tag.start && code.start < tag.end))];
@@ -1112,48 +1108,21 @@ 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.matrix_escaped_mention = () => "@";
+md.core.ruler.before("text_join", "matrix_escaped_mentions", (state) => {
+	preserveEscapedMentionTokens(state.tokens);
+});
 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;
 	if (openIdx >= 0 && shouldSuppressAutoLink(tokens, openIdx)) return "";
 	return self.renderToken(tokens, idx, _options);
 };
-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;
-			while (markdown[idx + runLength] === "`") runLength += 1;
-			if (codeFenceLength === 0) codeFenceLength = runLength;
-			else if (runLength === codeFenceLength) codeFenceLength = 0;
-			masked += markdown.slice(idx, idx + runLength);
-			idx += runLength;
-			continue;
-		}
-		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;
+function preserveEscapedMentionTokens(tokens) {
+	for (const token of tokens) {
+		if (token.type === "text_special" && token.info === "escape" && token.content === "@") token.type = "matrix_escaped_mention";
+		if (token.children) preserveEscapedMentionTokens(token.children);
 	}
-	return {
-		markdown: masked,
-		...marker ? { marker } : {}
-	};
-}
-function restoreEscapedMentions(text, marker, inCode = false) {
-	return marker ? text.replaceAll(marker, inCode ? "\\@" : "@") : text;
-}
-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);
@@ -1296,7 +1265,6 @@ 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) {
@@ -1311,23 +1279,21 @@ 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 = restoreMention(child.content);
 		if (insideLinkDepth > 0) {
-			nextChildren.push(createTextToken(child, visibleContent));
+			nextChildren.push(child);
 			continue;
 		}
 		const matches = collectMentionCandidates(child.content);
 		if (matches.length === 0) {
-			nextChildren.push(createTextToken(child, visibleContent));
+			nextChildren.push(child);
 			continue;
 		}
 		let cursor = 0;
 		for (const match of matches) {
-			if (match.start > cursor) nextChildren.push(createTextToken(child, restoreMention(child.content.slice(cursor, match.start))));
+			if (match.start > cursor) nextChildren.push(createTextToken(child, child.content.slice(cursor, match.start)));
 			cursor = match.end;
 			if (match.kind === "room") {
 				roomMentioned = true;
@@ -1349,7 +1315,7 @@ function mutateInlineTokensWithMentions(params) {
 				label: match.raw
 			}));
 		}
-		if (cursor < child.content.length) nextChildren.push(createTextToken(child, restoreMention(child.content.slice(cursor))));
+		if (cursor < child.content.length) nextChildren.push(createTextToken(child, child.content.slice(cursor)));
 	}
 	return {
 		children: nextChildren,
@@ -1441,9 +1407,7 @@ function renderMatrixFallbackHtml(markdown) {
 	return `<p>${escapeHtml(markdownToMatrixBody(markdown)).replaceAll("\n", "<br>\n")}</p>`;
 }
 async function resolveMarkdownMentionState(params) {
-	const { markdown, marker } = maskEscapedMentions(projectMatrixMarkdown(params.markdown));
-	const tokens = parseMatrixMarkdown(markdown, params.tableMode);
-	restoreEscapedMentionsInBlockTokens(tokens, marker);
+	const tokens = parseMatrixMarkdown(projectMatrixMarkdown(params.markdown), params.tableMode);
 	const selfUserId = await resolveMatrixSelfUserId(params.client);
 	const userIds = [];
 	const seenUserIds = /* @__PURE__ */ new Set();
@@ -1454,8 +1418,7 @@ async function resolveMarkdownMentionState(params) {
 			children: token.children,
 			userIds,
 			seenUserIds,
-			selfUserId,
-			escapedMentionMarker: marker
+			selfUserId
 		});
 		token.children = mutated.children;
 		roomMentioned ||= mutated.roomMentioned;
@@ -1656,6 +1619,145 @@ function chunkMatrixText(text, opts) {
 	};
 }
 //#endregion
+//#region extensions/matrix/src/matrix/media-text.ts
+const MATRIX_MEDIA_KINDS = {
+	"m.audio": "audio",
+	"m.file": "file",
+	"m.image": "image",
+	"m.sticker": "sticker",
+	"m.video": "video"
+};
+function resolveMatrixMediaKind(msgtype) {
+	const key = msgtype ?? "";
+	return Object.hasOwn(MATRIX_MEDIA_KINDS, key) ? MATRIX_MEDIA_KINDS[key] : void 0;
+}
+function resolveMatrixMediaLabel(kind, fallback = "media") {
+	return `${kind ?? fallback} attachment`;
+}
+function formatMatrixAttachmentMarker(params) {
+	const label = resolveMatrixMediaLabel(params.kind);
+	if (params.tooLarge) return `[matrix ${label} too large]`;
+	return params.unavailable ? `[matrix ${label} unavailable]` : `[matrix ${label}]`;
+}
+function isLikelyBareFilename(text) {
+	const trimmed = text.trim();
+	if (!trimmed || trimmed.includes("\n") || /\s/.test(trimmed)) return false;
+	if (path.basename(trimmed) !== trimmed) return false;
+	return path.extname(trimmed).length > 1;
+}
+function resolveCaptionOrFilename(params) {
+	const body = params.body?.trim() ?? "";
+	const filename = params.filename?.trim() ?? "";
+	if (filename) {
+		if (!body || body === filename) return { filename };
+		return {
+			caption: body,
+			filename
+		};
+	}
+	if (!body) return {};
+	if (isLikelyBareFilename(body)) return { filename: body };
+	return { caption: body };
+}
+function resolveMatrixReplacementContent(event, replacementEvent = event.unsigned?.["m.relations"]?.["m.replace"]) {
+	return resolveMatrixReplacement(event, replacementEvent)?.content;
+}
+function resolveMatrixReplacement(event, replacementEvent = event.unsigned?.["m.relations"]?.["m.replace"]) {
+	const replacement = asNullableObjectRecord(replacementEvent);
+	if (!replacement || event.state_key !== void 0 || event.unsigned?.redacted_because) return;
+	const content = asNullableObjectRecord(replacement.content);
+	const relation = asNullableObjectRecord(content?.["m.relates_to"]);
+	const unreadable = getMatrixEventProjection(replacement)?.decryptionFailure === true || replacement.type === "m.room.encrypted";
+	if (replacement.sender !== event.sender || !unreadable && replacement.type !== event.type || replacement.state_key !== void 0 || asNullableObjectRecord(replacement.unsigned)?.redacted_because || !relation || relation.rel_type !== "m.replace" || relation.event_id !== event.event_id) return;
+	if (unreadable) return { kind: "unreadable" };
+	const newContent = asNullableRecord(content?.["m.new_content"]);
+	return newContent ? {
+		kind: "content",
+		content: newContent
+	} : void 0;
+}
+function resolveMatrixMessageAttachment(params) {
+	const kind = resolveMatrixMediaKind(params.msgtype);
+	if (!kind) return;
+	const resolved = resolveCaptionOrFilename(params);
+	return {
+		kind,
+		caption: resolved.caption,
+		filename: resolved.filename
+	};
+}
+function formatMatrixAttachmentText(params) {
+	if (!params.attachment) return;
+	return formatMatrixAttachmentMarker({
+		kind: params.attachment.kind,
+		tooLarge: params.tooLarge,
+		unavailable: params.unavailable
+	});
+}
+function formatMatrixMessageText(params) {
+	const attachment = resolveMatrixMessageAttachment(params);
+	const body = attachment ? attachment.caption ?? "" : params.body?.trim() ?? "";
+	const marker = formatMatrixAttachmentText({
+		attachment,
+		tooLarge: params.tooLarge,
+		unavailable: params.unavailable
+	});
+	if (!marker) return body || void 0;
+	if (!body) return marker;
+	return `${body}\n\n${marker}`;
+}
+function formatMatrixMediaUnavailableText(params) {
+	return formatMatrixMessageText({
+		...params,
+		unavailable: true
+	}) ?? "";
+}
+function formatMatrixMediaTooLargeText(params) {
+	return formatMatrixMessageText({
+		...params,
+		tooLarge: true
+	}) ?? "";
+}
+//#endregion
+//#region extensions/matrix/src/matrix/send/edit-content.ts
+const MAX_EDIT_RELATION_PAGES = 100;
+const EDIT_RELATION_PAGE_SIZE = 100;
+const EDIT_DECRYPTION_ERROR = "Matrix edit history is not fully decrypted; restore encryption keys before editing.";
+async function resolveMatrixEditContent(params) {
+	const { client, roomId, event } = params;
+	if (!event || event.unsigned?.redacted_because || event.state_key !== void 0) return event?.content;
+	const projection = getMatrixEventProjection(event);
+	if (projection?.decryptionFailure || event.type === "m.room.encrypted") throw new Error(EDIT_DECRYPTION_ERROR);
+	const originalContent = projection?.originalContent ?? event.content;
+	const embedded = resolveMatrixReplacementContent(event) ?? asNullableObjectRecord(originalContent?.["m.new_content"]);
+	if (embedded) return embedded;
+	let latest;
+	let latestReplacement;
+	let from;
+	const seenCursors = /* @__PURE__ */ new Set();
+	for (let pageIndex = 0; pageIndex < MAX_EDIT_RELATION_PAGES; pageIndex++) {
+		const page = await client.getRelations(roomId, event.event_id, "m.replace", void 0, {
+			from,
+			limit: EDIT_RELATION_PAGE_SIZE
+		});
+		for (const replacement of page.events) {
+			const replacementContent = resolveMatrixReplacement(event, replacement);
+			if (replacementContent && (!latest || replacement.origin_server_ts > latest.origin_server_ts || replacement.origin_server_ts === latest.origin_server_ts && replacement.event_id > latest.event_id)) {
+				latest = replacement;
+				latestReplacement = replacementContent;
+			}
+		}
+		from = page.nextBatch ?? void 0;
+		if (!from) {
+			if (latestReplacement?.kind === "unreadable") throw new Error(EDIT_DECRYPTION_ERROR);
+			return latestReplacement?.content ?? originalContent;
+		}
+		if (seenCursors.has(from)) break;
+		seenCursors.add(from);
+	}
+	throw new Error("Matrix edit history could not be fully read; send a new message instead.");
+}
+//#endregion
 //#region extensions/matrix/src/matrix/send/formatting.ts
 async function renderMatrixFormattedContent(params) {
 	const markdown = params.markdown ?? "";
@@ -1732,24 +1834,6 @@ function diffMatrixMentions(current, previous) {
 	if (current.room && !previous.room) delta.room = true;
 	return delta;
 }
-function buildReplyRelation(replyToId) {
-	const trimmed = replyToId?.trim();
-	if (!trimmed) return;
-	return { "m.in_reply_to": { event_id: trimmed } };
-}
-function buildThreadRelation(threadId, replyToId) {
-	const trimmed = threadId.trim();
-	const relation = {
-		rel_type: RelationType.Thread,
-		event_id: trimmed
-	};
-	const fallbackReplyToId = replyToId?.trim();
-	if (fallbackReplyToId) {
-		relation.is_falling_back = true;
-		relation["m.in_reply_to"] = { event_id: fallbackReplyToId };
-	}
-	return relation;
-}
 function resolveMatrixMsgType(contentType, _fileName) {
 	switch (getMatrixRuntime().media.mediaKindFromMime(contentType ?? "")) {
 		case "image": return MsgType.Image;
@@ -1961,14 +2045,6 @@ function normalizeMatrixClientResolveOpts(opts) {
 		accountId: opts.accountId
 	};
 }
-function resolvePreviousEditContent(previousEvent) {
-	if (!previousEvent || typeof previousEvent !== "object") return;
-	const eventRecord = previousEvent;
-	if (!eventRecord.content || typeof eventRecord.content !== "object") return;
-	const content = eventRecord.content;
-	const newContent = content["m.new_content"];
-	return newContent && typeof newContent === "object" ? newContent : content;
-}
 function resolvePreviousThreadId(previousEvent) {
 	if (!previousEvent || typeof previousEvent !== "object") return;
 	const content = previousEvent.content;
@@ -1979,9 +2055,6 @@ function resolvePreviousThreadId(previousEvent) {
 	if (relationRecord.rel_type !== RelationType.Thread || typeof relationRecord.event_id !== "string") return;
 	return normalizeThreadId(relationRecord.event_id) ?? void 0;
 }
-function hasMatrixMentionsMetadata(content) {
-	return Boolean(content && Object.hasOwn(content, "m.mentions"));
-}
 function withMatrixExtraContentFields(content, extraContent) {
 	if (!extraContent) return content;
 	return {
@@ -1990,8 +2063,9 @@ function withMatrixExtraContentFields(content, extraContent) {
 	};
 }
 async function resolvePreviousEditMentions(params) {
-	if (hasMatrixMentionsMetadata(params.content)) return extractMatrixMentions(params.content);
-	const body = typeof params.content?.body === "string" ? params.content.body : "";
+	const content = await resolveMatrixEditContent(params);
+	if (content && Object.hasOwn(content, "m.mentions")) return extractMatrixMentions(content);
+	const body = typeof content?.body === "string" ? content.body : "";
 	if (!body) return {};
 	return await resolveMatrixMentionsForBody({
 		client: params.client,
@@ -2031,7 +2105,10 @@ async function sendMessageMatrix(to, message, opts) {
 				preserveWhitespace: true
 			});
 			const singleEventBody = fitsInSingleEvent ? preparedBody : void 0;
-			const relation = threadId ? buildThreadRelation(threadId, opts.replyToId) : buildReplyRelation(opts.replyToId);
+			const relation = buildMatrixMessageRelation({
+				...opts,
+				threadId
+			});
 			let pendingExtraContent = opts.extraContent;
 			const events = [];
 			const prepareContent = (content, receiptKind) => {
@@ -2157,7 +2234,7 @@ async function sendMessageMatrix(to, message, opts) {
 			} : void 0);
 			lastMessageId = eventId || lastMessageId;
 			if (!eventId) continue;
-			const eventReplyToId = planned.content["m.relates_to"]?.["m.in_reply_to"]?.event_id;
+			const eventReplyToId = resolveMatrixReplyToEventId(planned.content);
 			const acceptedEvent = {
 				messageId: eventId,
 				kind: planned.receiptKind,
@@ -2209,7 +2286,7 @@ async function sendPollMatrix(to, poll, opts) {
 		const threadId = normalizeThreadId(opts.threadId);
 		const pollPayload = threadId ? {
 			...pollContent,
-			"m.relates_to": buildThreadRelation(threadId)
+			"m.relates_to": buildMatrixMessageRelation({ threadId })
 		} : { ...pollContent };
 		pollPayload["m.mentions"] = mentions;
 		return {
@@ -2259,7 +2336,10 @@ async function sendSingleTextMessageMatrix(roomId, text, opts) {
 	}, async (client) => {
 		const resolvedRoom = await resolveMatrixRoomId(client, roomId);
 		const normalizedThreadId = normalizeThreadId(opts.threadId);
-		const relation = normalizedThreadId ? buildThreadRelation(normalizedThreadId, opts.replyToId) : buildReplyRelation(opts.replyToId);
+		const relation = buildMatrixMessageRelation({
+			...opts,
+			threadId: normalizedThreadId
+		});
 		const content = withMatrixExtraContentFields(buildTextContent(convertedText, relation, { msgtype: opts.msgtype }), opts.extraContent);
 		await enrichMatrixFormattedContent({
 			client,
@@ -2271,7 +2351,7 @@ async function sendSingleTextMessageMatrix(roomId, text, opts) {
 		});
 		if (opts.live) content[MSC4357_LIVE_KEY] = {};
 		const eventId = await client.sendMessage(resolvedRoom, content);
-		const replyToId = content["m.relates_to"]?.["m.in_reply_to"]?.event_id;
+		const replyToId = resolveMatrixReplyToEventId(content);
 		return {
 			messageId: eventId ?? "unknown",
 			roomId: resolvedRoom,
@@ -2289,11 +2369,6 @@ async function sendSingleTextMessageMatrix(roomId, text, opts) {
 		};
 	});
 }
-async function getPreviousMatrixEvent(client, roomId, eventId) {
-	const getEvent = client.getEvent;
-	if (typeof getEvent !== "function") return null;
-	return await Promise.resolve(getEvent.call(client, roomId, eventId)).catch(() => null);
-}
 async function editMessageMatrix(roomId, originalEventId, newText, opts) {
 	return await withResolvedMatrixSendClient({
 		client: opts.client,
@@ -2316,16 +2391,17 @@ async function editMessageMatrix(roomId, originalEventId, newText, opts) {
 			includeMentions: opts.includeMentions,
 			tableMode
 		});
-		const previousEvent = await getPreviousMatrixEvent(client, resolvedRoom, originalEventId);
+		const threadId = normalizeThreadId(opts.threadId);
+		const previousEvent = opts.includeMentions !== false || threadId ? await client.getEvent(resolvedRoom, originalEventId) : null;
 		const replaceMentions = opts.includeMentions === false ? void 0 : diffMatrixMentions(extractMatrixMentions(newContent), await resolvePreviousEditMentions({
 			client,
-			content: resolvePreviousEditContent(previousEvent)
+			roomId: resolvedRoom,
+			event: previousEvent
 		}));
 		const replaceRelation = {
 			rel_type: RelationType.Replace,
 			event_id: originalEventId
 		};
-		const threadId = normalizeThreadId(opts.threadId);
 		if (threadId) {
 			if (resolvePreviousThreadId(previousEvent) !== threadId) throw new Error("Matrix edit cannot add or change the original event thread relation.");
 		}
@@ -2358,4 +2434,4 @@ async function reactMatrixMessage(roomId, messageId, emoji, opts) {
 	});
 }
 //#endregion
-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 };
+export { promoteMatrixDirectRoomCandidate as A, parsePollStart as C, reconcileMatrixUnknownSend as D, cleanupMatrixDeliveryPlans as E, resolveMatrixRoomId as O, isPollStartType as S, resolvePollReferenceEventId as T, buildPollResponseContent as _, sendSingleTextMessageMatrix as a, formatPollResultsAsText as b, formatMatrixMediaTooLargeText as c, isLikelyBareFilename as d, resolveMatrixMessageAttachment as f, resolveMatrixThreadRootId as g, resolveMatrixReplyToEventId as h, sendPollMatrix as i, repairMatrixDirectRooms as j, direct_management_exports as k, formatMatrixMediaUnavailableText as l, prepareMatrixSingleText as m, reactMatrixMessage as n, sendTypingMatrix as o, resolveMatrixReplacementContent as p, sendMessageMatrix as r, send_exports as s, editMessageMatrix as t, formatMatrixMessageText as u, buildPollResultsSummary as v, parsePollStartContent as w, isPollEventType as x, formatPollAsText as y };

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

@@ -1,3 +1,3 @@
 import { r as setMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-BkBnn4te.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-Bwv87Gve.js";
 export { createMatrixThreadBindingManager, setMatrixRuntime };

package/dist/{setup-bootstrap-S_loyUyM.js → setup-bootstrap-sVqkwtSY.js}

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

package/dist/{setup-core-XkIfQ65J.js → setup-core-8keb-Yre.js}

@@ -1,12 +1,12 @@
-import { s as resolveMatrixEnvAuthReadiness } from "./account-selection-DA-jfx22.js";
+import { c as resolveMatrixEnvAuthReadiness } from "./account-selection-Bbtc483D.js";
 import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.js";
-import { r as resolveDefaultMatrixAccountId } from "./accounts-DR1c4xF_.js";
+import { r as resolveDefaultMatrixAccountId } from "./accounts-GwSAk9vY.js";
 import { t as resolveMatrixConfigFieldPath } from "./config-paths-CnREYb1Y.js";
 import { r as updateMatrixAccountConfig } from "./config-update-BnX26jCO.js";
 import { t as isSupportedMatrixAvatarSource } from "./profile-vmjsmhh4.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { defineChannelSetupContract } from "openclaw/plugin-sdk/channel-setup";
-import { DEFAULT_ACCOUNT_ID, addWildcardAllowFrom, applyAccountNameToChannelSection, normalizeAccountId, normalizeAllowFromEntries, normalizeSecretInputString, prepareScopedSetupConfig } from "openclaw/plugin-sdk/setup";
+import { DEFAULT_ACCOUNT_ID, addWildcardAllowFrom, applyAccountNameToChannelSection, normalizeAccountId, normalizeAllowFromEntries, normalizeSecretInputString, patchTopLevelChannelConfigSection, prepareScopedSetupConfig, setSetupChannelEnabled } from "openclaw/plugin-sdk/setup";
 import { DEFAULT_ACCOUNT_ID as DEFAULT_ACCOUNT_ID$1, normalizeAccountId as normalizeAccountId$1 } from "openclaw/plugin-sdk/routing";
 import { createChannelDmPolicy } from "openclaw/plugin-sdk/channel-dm-policy";
 //#region extensions/matrix/src/setup-contract.ts
@@ -126,21 +126,15 @@ function moveSingleMatrixAccountConfigToNamedAccount(cfg) {
 	const resolvedTargetAccountId = resolveExistingMatrixAccountKey(accounts, resolveSingleAccountPromotionTarget({ channel: base }));
 	const nextAccount = { ...accounts[resolvedTargetAccountId] };
 	for (const key of keysToMove) nextAccount[key] = cloneIfObject(base[key]);
-	const nextChannel = { ...base };
-	for (const key of keysToMove) delete nextChannel[key];
-	return {
-		...cfg,
-		channels: {
-			...cfg.channels,
-			[channel$1]: {
-				...nextChannel,
-				accounts: {
-					...accounts,
-					[resolvedTargetAccountId]: nextAccount
-				}
-			}
-		}
-	};
+	return patchTopLevelChannelConfigSection({
+		cfg,
+		channel: channel$1,
+		clearFields: keysToMove,
+		patch: { accounts: {
+			...accounts,
+			[resolvedTargetAccountId]: nextAccount
+		} }
+	});
 }
 function validateMatrixSetupInput(params) {
 	const input = params.input;
@@ -271,16 +265,7 @@ function createMatrixSetupWizardProxy(loadWizardModule) {
 			const promptAllowFrom = (await loadWizard()).dmPolicy?.promptAllowFrom;
 			return promptAllowFrom ? await promptAllowFrom(params) : params.cfg;
 		}),
-		disable: (cfg) => ({
-			...cfg,
-			channels: {
-				...cfg.channels,
-				matrix: {
-					...cfg.channels?.matrix,
-					enabled: false
-				}
-			}
-		})
+		disable: (cfg) => setSetupChannelEnabled(cfg, channel, false)
 	};
 }
 const matrixSetupAdapter = {
@@ -311,7 +296,7 @@ const matrixSetupAdapter = {
 		input
 	}),
 	afterAccountConfigWritten: async ({ previousCfg, cfg, accountId, runtime }) => {
-		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-S_loyUyM.js");
+		const { runMatrixSetupBootstrapAfterConfigWrite } = await import("./setup-bootstrap-sVqkwtSY.js");
 		await runMatrixSetupBootstrapAfterConfigWrite({
 			previousCfg,
 			cfg,

package/dist/setup-plugin-api.js

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