@openclaw/matrix 2026.8.1-beta.3 → 2026.8.1

package/dist/{monitor-FNrfkuWL.js → monitor-CLPbPcR9.js}

@@ -1,44 +1,46 @@
-import { a as resolveMatrixAccountConfig, i as resolveMatrixAccountAllowlistConfig } from "./account-config-BZWN9tGS.js";
+import { a as resolveMatrixAccountConfig, i as resolveMatrixAccountAllowlistConfig } from "./account-config-CRsKoMqJ.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { n as resolveConfiguredMatrixBotUserIds } from "./accounts-BCzyubQt.js";
-import { _ as logInboundDrop, a as resolveMatrixThreadRootId, b as summarizeMapping, c as RelationType, d as buildAllowlistResolutionSummary, f as canonicalizeAllowlistWithResolvedIds, g as getAgentScopedMediaLocalRoots, h as formatLocationText, i as resolveMatrixReplyToEventId, l as resolveMatrixRoomConfig, m as createTypingCallbacks, n as resolveMatrixStoredSessionMeta, o as resolveMatrixThreadRouting, p as createReplyPrefixOptions, r as resolveMatrixInboundRoute, s as EventType, u as addAllowlistUserEntriesFromConfigEntry, v as logTypingFailure, x as toLocationContext, y as patchAllowlistUsersInConfigEntries } from "./channel-CzQw5OZN.js";
-import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./channel.setup-aNaa3Uyn.js";
+import { n as resolveConfiguredMatrixBotUserIds } from "./accounts-fC57n-Jo.js";
+import { _ as logInboundDrop, a as resolveMatrixThreadRootId, b as summarizeMapping, c as RelationType, d as buildAllowlistResolutionSummary, f as canonicalizeAllowlistWithResolvedIds, g as getAgentScopedMediaLocalRoots, h as formatLocationText, i as resolveMatrixReplyToEventId, l as resolveMatrixRoomConfig, m as createTypingCallbacks, n as resolveMatrixStoredSessionMeta, o as resolveMatrixThreadRouting, p as createReplyPrefixOptions, r as resolveMatrixInboundRoute, s as EventType, u as addAllowlistUserEntriesFromConfigEntry, v as logTypingFailure, x as toLocationContext, y as patchAllowlistUsersInConfigEntries } from "./channel-BkEcVUs_.js";
+import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./channel.setup-CSacbORr.js";
 import { n as isMatrixRoomId, t as isMatrixQualifiedUserId } from "./target-ids-Nwx7cMVE.js";
-import { C as promoteMatrixDirectRoomCandidate, T as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, _ as parsePollStartContent, c as chunkMatrixText, f as formatPollAsText, h as isPollStartType, m as isPollEventType, r as sendMessageMatrix } from "./send-ClHgDZLT.js";
+import { S as promoteMatrixDirectRoomCandidate, d as formatPollAsText, g as parsePollStartContent, m as isPollStartType, p as isPollEventType, r as sendMessageMatrix, w as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY } from "./send-BL_iH5Ox.js";
 import { i as isStrictDirectMembership, n as hasDirectMatrixMemberFlag, o as readJoinedMatrixMembers } from "./direct-room-RinHjtqX.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-BYEGfw3h.js";
-import { a as resolveMatrixMessageAttachment, c as fetchMatrixPollSnapshot, i as isLikelyBareFilename, n as formatMatrixMediaUnavailableText, o as resolveMatrixMessageBody, r as formatMatrixMessageText, t as formatMatrixMediaTooLargeText } from "./media-text-Dh-DpTc3.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-ERWNousC.js";
+import { c as formatMatrixMediaTooLargeText, d as isLikelyBareFilename, f as resolveBundledMatrixReplacementContent, l as formatMatrixMediaUnavailableText, m as fetchMatrixPollSnapshot, r as readMatrixMessages, u as formatMatrixMessageText } from "./messages-DaGRt-tu.js";
 import { t as isBunRuntime } from "./runtime-BefyhPWv.js";
-import { a as throwIfMatrixStartupAborted, c as resolveMatrixAuth, i as isMatrixStartupAbortError, l as resolveMatrixAuthContext, n as acquireSharedMatrixClient, s as backfillMatrixAuthDeviceIdAfterStartup } from "./client-BBQdBG7t.js";
-import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-CycYxU9-.js";
-import { d as resolveAllowlistProviderRuntimeGroupPolicy, f as resolveDefaultGroupPolicy, g as warnMissingProviderGroupPolicyFallbackOnce, h as resolveThreadBindingMaxAgeMsForChannel, m as resolveThreadBindingIdleTimeoutMsForChannel, t as GROUP_POLICY_BLOCKED_LABEL } from "./runtime-api-BGO16Fu8.js";
-import { t as resolveMatrixTargets } from "./resolve-targets-e7AI0P75.js";
-import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-DmLY8NiO.js";
+import { a as throwIfMatrixStartupAborted, c as resolveMatrixAuth, i as isMatrixStartupAbortError, l as resolveMatrixAuthContext, n as acquireSharedMatrixClient, s as backfillMatrixAuthDeviceIdAfterStartup } from "./client-kSi51NKp.js";
+import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-D8o8b9u6.js";
+import { t as resolveMatrixTargets } from "./resolve-targets-qG6gceps.js";
+import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-D4ZdAqzM.js";
 import { createMatrixInboundEventDeduper } from "./inbound-dedupe-RvSLqdsz.js";
 import { a as isMatrixAccessTokenInvalidatedError, d as isMatrixDisconnectedSyncState, f as isMatrixReadySyncState, p as isMatrixTerminalSyncState } from "./client-support-DLj4vDeu.js";
-import { n as setBoundedMap, t as createMatrixRoomInfoResolver } from "./room-info-BXQA7y10.js";
+import { i as setBoundedMap, r as getMatrixRoomInfo, t as createMatrixRoomInfoResolver } from "./room-info-yheP1mod.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { buildChannelProgressDraftLineForEntry, createChannelProgressDraftCompositor, createMessageReceiptFromOutboundResults, createPreviewMessageReceipt, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, formatChannelProgressDraftLine, formatChannelProgressDraftText, listMessageReceiptPlatformIds, resolveChannelStreamingBlockEnabled, waitUntilAbort } from "openclaw/plugin-sdk/channel-outbound";
-import { normalizeLowercaseStringOrEmpty, normalizeNullableString, normalizeOptionalString, normalizeStringifiedEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { normalizeLowercaseStringOrEmpty, normalizeNullableString, normalizeOptionalString, normalizeStringifiedEntries, readStringValue, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { stripReasoningTagsFromText } from "openclaw/plugin-sdk/text-chunking";
 import { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
-import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { extractErrorCode, formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { isFutureDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs, resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
-import { resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
+import { resolveAgentRoute, resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
 import { createChannelInboundEnvelopeBuilder, createChannelPartialDeliveryError, hasFinalInboundReplyDispatch, isChannelPartialDeliveryError, resolveInboundMentionDecision, resolveInboundReplyDispatchCounts, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
 import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { format } from "node:util";
 import { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
 import { escapeRegExp, sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
-import { buildTtsSupplementMediaPayload, getReplyPayloadTtsSupplement } from "openclaw/plugin-sdk/reply-payload";
-import { resolveAckReaction } from "openclaw/plugin-sdk/channel-feedback";
+import { buildTtsSupplementMediaPayload, getReplyPayloadTtsSupplement, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runtime-context";
+import { GROUP_POLICY_BLOCKED_LABEL, resolveAllowlistProviderRuntimeGroupPolicy, resolveDefaultGroupPolicy, warnMissingProviderGroupPolicyFallbackOnce } from "openclaw/plugin-sdk/runtime-group-policy";
+import { resolveThreadBindingIdleTimeoutMsForChannel, resolveThreadBindingMaxAgeMsForChannel } from "openclaw/plugin-sdk/thread-bindings-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
+import { reportChannelRoomJoin } from "openclaw/plugin-sdk/channel-join-intro-runtime";
 import { createChannelIngressResolver, defineStableChannelIngressIdentity } from "openclaw/plugin-sdk/channel-ingress-runtime";
 import { resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { evaluateSupplementalContextVisibility, resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
 import { getGlobalHookRunner } from "openclaw/plugin-sdk/plugin-runtime";
+import { resolveAckReaction } from "openclaw/plugin-sdk/channel-feedback";
 import { createChannelPreflightAudio, formatAudioTranscriptForAgent } from "openclaw/plugin-sdk/media-understanding-runtime";
 import { mergePairLoopGuardConfig } from "openclaw/plugin-sdk/pair-loop-guard-runtime";
 import { buildInboundHistoryFromEntries } from "openclaw/plugin-sdk/reply-history";
@@ -603,7 +605,7 @@ function createDirectRoomTracker(client, opts = {}) {
 				return false;
 			}
 			const selfUserId = params.selfUserId ?? await ensureSelfUserId();
-			const joinedMembers = await resolveJoinedMembers(roomId);
+			const joinedMembers = params.joinedMembers ?? await resolveJoinedMembers(roomId);
 			const strictDirectMembership = isStrictDirectMembership({
 				selfUserId,
 				remoteUserId: senderId,
@@ -819,7 +821,7 @@ const matrixVerificationConstants = {
 const MAX_TRACKED_VERIFICATION_EVENTS = 1024;
 const SAS_NOTICE_RETRY_DELAY_MS = 750;
 const VERIFICATION_EVENT_STARTUP_GRACE_MS = 3e4;
-const loadMatrixDirectRoomDeps = createLazyRuntimeModule(() => Promise.all([import("./send-ClHgDZLT.js").then((n) => n.S), import("./direct-room-RinHjtqX.js").then((n) => n.t)]).then(([directManagementModule, directRoomModule]) => ({
+const loadMatrixDirectRoomDeps = createLazyRuntimeModule(() => Promise.all([import("./send-BL_iH5Ox.js").then((n) => n.x), import("./direct-room-RinHjtqX.js").then((n) => n.t)]).then(([directManagementModule, directRoomModule]) => ({
 	inspectMatrixDirectRooms: directManagementModule.inspectMatrixDirectRooms,
 	isStrictDirectRoom: directRoomModule.isStrictDirectRoom
 })));
@@ -1356,6 +1358,67 @@ function registerMatrixMonitorEvents(params) {
 		directTracker?.invalidateRoom(roomId);
 		const eventId = event?.event_id ?? "unknown";
 		logVerboseMessage(`matrix: join room=${roomId} id=${eventId}`);
+		if (event.membershipProvenance !== "transition" || event.state_key !== auth.userId) return;
+		runMonitorTask(`join introduction room=${roomId}`, async () => {
+			const members = await readJoinedMatrixMembers(client, roomId);
+			const remoteUserId = members?.find((member) => member !== auth.userId);
+			if (!members?.includes(auth.userId) || !remoteUserId || await directTracker.isDirectMessage({
+				roomId,
+				senderId: remoteUserId,
+				selfUserId: auth.userId,
+				joinedMembers: members
+			})) return;
+			const roomInfo = await params.getRoomInfo(roomId, { includeAliases: params.needsRoomAliasesForConfig });
+			const roomConfig = resolveMatrixRoomConfig({
+				rooms: params.roomsConfig,
+				roomId,
+				aliases: [roomInfo.canonicalAlias ?? "", ...roomInfo.altAliases].filter(Boolean)
+			});
+			const roomAllowed = (!params.needsRoomAliasesForConfig || roomInfo.aliasesResolved) && params.groupPolicy !== "disabled" && (roomConfig.config ? roomConfig.allowed : params.groupPolicy === "open");
+			const options = {
+				cfg,
+				accountId: auth.accountId,
+				client
+			};
+			await reportChannelRoomJoin({
+				cfg,
+				channel: "matrix",
+				accountId: auth.accountId,
+				conversationId: roomId,
+				deliverTo: `room:${roomId}`,
+				route: resolveMatrixInboundRoute({
+					cfg,
+					accountId: auth.accountId,
+					roomId,
+					senderId: auth.userId,
+					isDirectMessage: false,
+					resolveAgentRoute
+				}).route,
+				roomAllowed,
+				resolveRoomContext: async ({ messageLimit }) => {
+					const info = await getMatrixRoomInfo(roomId, options);
+					const context = {
+						title: info.name ?? void 0,
+						purpose: info.topic ?? void 0
+					};
+					try {
+						const { messages } = await readMatrixMessages(roomId, {
+							...options,
+							limit: messageLimit
+						});
+						return {
+							...context,
+							recentMessages: messages.toReversed().flatMap(({ sender, body }) => body?.trim() ? [{
+								sender,
+								text: body
+							}] : [])
+						};
+					} catch {
+						return context;
+					}
+				}
+			});
+		});
 	};
 	const onRoomEvent = (roomId, event) => {
 		const eventType = event?.type ?? "unknown";
@@ -1528,37 +1591,35 @@ function resolveMatrixSharedDmContextNotice(params) {
 	}
 }
 function resolveMatrixPendingHistoryText(params) {
-	if (params.mentionPrecheckText) return params.mentionPrecheckText;
-	if (!params.mediaUrl) return "";
-	const body = typeof params.content.body === "string" ? params.content.body.trim() : void 0;
-	const filename = typeof params.content.filename === "string" ? params.content.filename.trim() : void 0;
-	const msgtype = typeof params.content.msgtype === "string" ? params.content.msgtype : void 0;
+	if (!params.mediaUrl) return params.mentionPrecheckText;
 	return formatMatrixMessageText({
-		body: resolveMatrixMessageBody({
-			body,
-			filename,
-			msgtype
-		}),
-		attachment: resolveMatrixMessageAttachment({
-			body,
-			filename,
-			msgtype
-		})
-	}) ?? "";
+		body: typeof params.content.body === "string" ? params.content.body : void 0,
+		filename: typeof params.content.filename === "string" ? params.content.filename : void 0,
+		msgtype: typeof params.content.msgtype === "string" ? params.content.msgtype : void 0
+	}) ?? params.mentionPrecheckText;
+}
+function resolveMatrixInboundMediaContent(content) {
+	const file = content.file && typeof content.file === "object" ? content.file : void 0;
+	const info = content.info && typeof content.info === "object" ? content.info : void 0;
+	const body = normalizeOptionalString(content.body);
+	return {
+		url: normalizeOptionalString(content.url) ?? normalizeOptionalString(file?.url),
+		file,
+		body: body ?? "",
+		contentType: info?.mimetype,
+		sizeBytes: typeof info?.size === "number" ? info.size : void 0,
+		originalFilename: normalizeOptionalString(content.filename) ?? body
+	};
 }
 function isMatrixAudioMediaEnabled(cfg) {
 	return cfg.tools?.media?.audio?.enabled !== false;
 }
 function shouldDeferMatrixAudioPreflightForRoomIngress(params) {
 	if (!isMatrixAudioMediaEnabled(params.cfg)) return false;
-	const content = params.content;
-	const contentUrl = "url" in content && typeof content.url === "string" ? content.url : void 0;
-	const contentFile = "file" in content && content.file && typeof content.file === "object" ? content.file : void 0;
-	const mediaUrl = contentUrl ?? contentFile?.url;
-	const contentInfo = "info" in content && content.info && typeof content.info === "object" ? content.info : void 0;
-	return mediaUrl?.startsWith("mxc://") === true && isMatrixAudioContent({
-		msgtype: typeof content.msgtype === "string" ? content.msgtype : void 0,
-		mimetype: contentInfo?.mimetype
+	const mediaContent = resolveMatrixInboundMediaContent(params.content);
+	return mediaContent.url?.startsWith("mxc://") === true && isMatrixAudioContent({
+		msgtype: typeof params.content.msgtype === "string" ? params.content.msgtype : void 0,
+		mimetype: mediaContent.contentType
 	});
 }
 function resolveMatrixAllowBotsMode(value) {
@@ -1577,11 +1638,11 @@ async function redactMatrixDraftEvent(client, roomId, draftEventId) {
 function buildMatrixFinalizedPreviewContent() {
 	return { [MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY]: true };
 }
-const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-ClHgDZLT.js").then((n) => n.s));
+const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-BL_iH5Ox.js").then((n) => n.s));
 const loadAcpBindingRuntime = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/acp-binding-runtime"));
 const loadSessionBindingRuntime = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/session-binding-runtime"));
-const loadMatrixReactionEvents = createLazyRuntimeModule(() => import("./reaction-events-BKOLlnCo.js"));
-const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-DQ7QNC-l.js"));
+const loadMatrixReactionEvents = createLazyRuntimeModule(() => import("./reaction-events-CjVUiqcY.js"));
+const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-0CEpNrBk.js"));
 async function matrixTextWouldActivateMentions(client, text) {
 	const { resolveMatrixMentionsForBody } = await loadMatrixSendModule();
 	const mentions = await resolveMatrixMentionsForBody({
@@ -1597,18 +1658,11 @@ function summarizeMatrixMessageContextEvent(event) {
 		const pollSummary = parsePollStartContent(event.content);
 		if (pollSummary) return formatPollAsText(pollSummary);
 	}
-	const content = event.content;
+	const content = event.unsigned?.redacted_because ? event.content : resolveBundledMatrixReplacementContent(event) ?? event.content;
 	return formatMatrixMessageText({
-		body: resolveMatrixMessageBody({
-			body: normalizeOptionalString(content.body),
-			filename: normalizeOptionalString(content.filename),
-			msgtype: normalizeOptionalString(content.msgtype)
-		}),
-		attachment: resolveMatrixMessageAttachment({
-			body: normalizeOptionalString(content.body),
-			filename: normalizeOptionalString(content.filename),
-			msgtype: normalizeOptionalString(content.msgtype)
-		})
+		body: readStringValue(content.body),
+		filename: readStringValue(content.filename),
+		msgtype: normalizeOptionalString(content.msgtype)
 	});
 }
 //#endregion
@@ -1855,7 +1909,8 @@ async function resolveMatrixInboundContext(config) {
 			agentId: _route.agentId,
 			dmScope: _route.dmScope,
 			accountId: _route.accountId,
-			routeSessionKey: _route.sessionKey
+			routeSessionKey: _route.sessionKey,
+			parentSessionKey: threadTarget && _route.matchedBy !== "binding.channel" ? _route.mainSessionKey : void 0
 		},
 		reply: {
 			to: `room:${roomId}`,
@@ -2757,14 +2812,8 @@ async function resolveMatrixIngressContent(config) {
 		content,
 		locationText: locationPayload?.text
 	});
-	const contentUrl = "url" in content && typeof content.url === "string" ? content.url : void 0;
-	const contentFile = "file" in content && content.file && typeof content.file === "object" ? content.file : void 0;
-	const mediaUrl = contentUrl ?? contentFile?.url;
-	const earlyContentInfo = "info" in content && content.info && typeof content.info === "object" ? content.info : void 0;
-	const earlyContentType = earlyContentInfo?.mimetype;
-	const earlyContentSize = typeof earlyContentInfo?.size === "number" ? earlyContentInfo.size : void 0;
-	const earlyContentBody = typeof content.body === "string" ? content.body.trim() : "";
-	const earlyOriginalFilename = (typeof content.filename === "string" ? content.filename.trim() : "") || earlyContentBody || void 0;
+	let mediaContent = resolveMatrixInboundMediaContent(content);
+	const mediaUrl = mediaContent.url;
 	const pendingHistoryText = resolveMatrixPendingHistoryText({
 		mentionPrecheckText,
 		content,
@@ -2794,7 +2843,7 @@ async function resolveMatrixIngressContent(config) {
 	const preflightAudioMediaUrl = mediaUrl?.startsWith("mxc://") ? mediaUrl : void 0;
 	const shouldRunMatrixAudioPreflight = isMatrixAudioContent({
 		msgtype: typeof content.msgtype === "string" ? content.msgtype : void 0,
-		mimetype: earlyContentType
+		mimetype: mediaContent.contentType
 	}) && isMatrixAudioMediaEnabled(cfg) && preflightAudioMediaUrl !== void 0;
 	if (shouldRunMatrixAudioPreflight && audioPreflightMode === "defer" && isRoom && historyLimit > 0 && !reservedHistorySlot) {
 		const reserved = roomHistoryTracker.reservePending(_route.agentId, roomId, {
@@ -2814,11 +2863,11 @@ async function resolveMatrixIngressContent(config) {
 			preflightMedia = await downloadMatrixMedia({
 				client,
 				mxcUrl: preflightAudioMediaUrl,
-				contentType: earlyContentType,
-				sizeBytes: earlyContentSize,
+				contentType: mediaContent.contentType,
+				sizeBytes: mediaContent.sizeBytes,
 				maxBytes: mediaMaxBytes,
-				file: contentFile,
-				originalFilename: earlyOriginalFilename
+				file: mediaContent.file,
+				originalFilename: mediaContent.originalFilename
 			});
 		} catch (err) {
 			preflightMediaDownloadFailed = true;
@@ -2829,7 +2878,7 @@ async function resolveMatrixIngressContent(config) {
 				roomId,
 				eventId: event.event_id,
 				msgtype: content.msgtype,
-				encrypted: Boolean(contentFile),
+				encrypted: Boolean(mediaContent.file),
 				error: errorText
 			});
 		}
@@ -2946,27 +2995,21 @@ async function resolveMatrixIngressContent(config) {
 			msgtype: "m.text",
 			body: pollSnapshot.text
 		};
+		mediaContent = resolveMatrixInboundMediaContent(content);
 	}
 	let media = preflightMedia;
 	let mediaDownloadFailed = preflightMediaDownloadFailed;
 	let mediaSizeLimitExceeded = preflightMediaSizeLimitExceeded;
-	const finalContentUrl = "url" in content && typeof content.url === "string" ? content.url : void 0;
-	const finalContentFile = "file" in content && content.file && typeof content.file === "object" ? content.file : void 0;
-	const finalMediaUrl = finalContentUrl ?? finalContentFile?.url;
-	const contentBody = typeof content.body === "string" ? content.body.trim() : "";
-	const originalFilename = (typeof content.filename === "string" ? content.filename.trim() : "") || contentBody || void 0;
-	const contentInfo = "info" in content && content.info && typeof content.info === "object" ? content.info : void 0;
-	const contentType = contentInfo?.mimetype;
-	const contentSize = typeof contentInfo?.size === "number" ? contentInfo.size : void 0;
+	const finalMediaUrl = mediaContent.url;
 	if (!media && !mediaDownloadFailed && finalMediaUrl?.startsWith("mxc://")) try {
 		media = await downloadMatrixMedia({
 			client,
 			mxcUrl: finalMediaUrl,
-			contentType,
-			sizeBytes: contentSize,
+			contentType: mediaContent.contentType,
+			sizeBytes: mediaContent.sizeBytes,
 			maxBytes: mediaMaxBytes,
-			file: finalContentFile,
-			originalFilename
+			file: mediaContent.file,
+			originalFilename: mediaContent.originalFilename
 		});
 	} catch (err) {
 		mediaDownloadFailed = true;
@@ -2977,12 +3020,12 @@ async function resolveMatrixIngressContent(config) {
 			roomId,
 			eventId: event.event_id,
 			msgtype: content.msgtype,
-			encrypted: Boolean(finalContentFile),
+			encrypted: Boolean(mediaContent.file),
 			error: errorText
 		});
 	}
 	let bodyText = resolveMatrixInboundBodyText({
-		rawBody: locationPayload?.text ?? contentBody,
+		rawBody: locationPayload?.text ?? mediaContent.body,
 		filename: typeof content.filename === "string" ? content.filename : void 0,
 		mediaPlaceholder: media?.placeholder,
 		msgtype: content.msgtype,
@@ -3233,11 +3276,6 @@ function resolveVisibleMatrixReplyText(text) {
 }
 async function deliverMatrixReplies(params) {
 	const core = getMatrixRuntime();
-	const tableMode = params.tableMode ?? core.channel.text.resolveMarkdownTableMode({
-		cfg: params.cfg,
-		channel: "matrix",
-		accountId: params.accountId
-	});
 	const logVerbose = (message) => {
 		if (core.logging.shouldLogVerbose()) params.runtime.log?.(message);
 	};
@@ -3246,12 +3284,12 @@ async function deliverMatrixReplies(params) {
 	try {
 		for (const reply of params.replies) {
 			const visibleText = resolveVisibleMatrixReplyText(reply.text);
-			const hasMedia = Boolean(reply?.mediaUrl) || (reply?.mediaUrls?.length ?? 0) > 0;
+			const { hasMedia, hasText, mediaUrls } = resolveSendableOutboundReplyParts(reply);
 			if (reply.isReasoning === true || !hasMedia && reply.text && visibleText === void 0) {
 				logVerbose("matrix reply suppressed as reasoning-only");
 				continue;
 			}
-			if (!reply?.text && !hasMedia) {
+			if (!hasText && !hasMedia) {
 				if (reply?.audioAsVoice) {
 					logVerbose("matrix reply has audioAsVoice without media/text; skipping");
 					continue;
@@ -3259,38 +3297,26 @@ async function deliverMatrixReplies(params) {
 				params.runtime.error?.("matrix reply missing text/media");
 				continue;
 			}
-			const replyToIdRaw = (reply.replyToId ?? params.replyToId)?.trim();
-			const replyToId = params.threadId ? replyToIdRaw : params.replyToMode === "off" ? void 0 : replyToIdRaw;
+			const explicitReplyToId = reply.replyToTag || reply.replyToCurrent ? reply.replyToId?.trim() : void 0;
 			const rawText = visibleText ?? "";
-			const mediaList = reply.mediaUrls?.length ? reply.mediaUrls : reply.mediaUrl ? [reply.mediaUrl] : [];
-			const shouldIncludeReply = (id) => Boolean(id) && (params.threadId || params.replyToMode === "all" || !hasRepliedRef.value);
-			const replyToIdForReply = shouldIncludeReply(replyToId) ? replyToId : void 0;
+			const replyToIdForReply = explicitReplyToId || (params.threadId || params.replyToMode !== "off" && (params.replyToMode === "all" || !hasRepliedRef.value) ? (reply.replyToId ?? params.replyToId)?.trim() : void 0);
 			const onDeliveryResult = (result) => {
 				acceptedResults.push(result);
 				if (replyToIdForReply) hasRepliedRef.value = true;
 			};
-			if (mediaList.length === 0) {
-				const { chunks } = chunkMatrixText(rawText, {
+			if (mediaUrls.length === 0) {
+				await sendMessageMatrix(params.roomId, rawText, {
+					client: params.client,
 					cfg: params.cfg,
+					replyToId: replyToIdForReply,
+					threadId: params.threadId,
 					accountId: params.accountId,
-					tableMode,
-					preserveWhitespace: true
+					onDeliveryResult
 				});
-				for (const chunk of chunks) {
-					if (!chunk.trim()) continue;
-					await sendMessageMatrix(params.roomId, chunk, {
-						client: params.client,
-						cfg: params.cfg,
-						replyToId: replyToIdForReply,
-						threadId: params.threadId,
-						accountId: params.accountId,
-						onDeliveryResult
-					});
-				}
 				continue;
 			}
 			let first = true;
-			for (const mediaUrl of mediaList) {
+			for (const mediaUrl of mediaUrls) {
 				const caption = first ? rawText : "";
 				await sendMessageMatrix(params.roomId, caption, {
 					client: params.client,
@@ -3314,7 +3340,7 @@ async function deliverMatrixReplies(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler-reply-dispatcher.ts
 function createMatrixReplyDispatcher(config) {
-	const { cfg, prefixOptions, humanDelay, typingCallbacks, streaming, draftStream, draftController, client, roomId, runtime, textLimit, replyToMode, threadTarget, replyToEventId, accountId, mediaLocalRoots, tableMode, logVerboseMessage } = config;
+	const { cfg, prefixOptions, humanDelay, typingCallbacks, streaming, draftStream, draftController, client, roomId, runtime, replyToMode, threadTarget, replyToEventId, accountId, mediaLocalRoots, logVerboseMessage } = config;
 	const quietDraftStreaming = streaming === "quiet" || streaming === "progress";
 	const hasRepliedRef = { value: false };
 	let finalReplyDeliveryFailed = false;
@@ -3372,7 +3398,7 @@ function createMatrixReplyDispatcher(config) {
 				return replacement;
 			};
 			if (draftStream && info.kind !== "tool" && !payload.isCompactionNotice) {
-				const hasMedia = Boolean(payload.mediaUrl) || (payload.mediaUrls?.length ?? 0) > 0;
+				const { hasMedia } = resolveSendableOutboundReplyParts(payload);
 				const ttsSupplement = getReplyPayloadTtsSupplement(payload);
 				const fallbackPayload = ttsSupplement && ttsSupplement.visibleTextAlreadyDelivered !== true && !payload.text?.trim() ? {
 					...payload,
@@ -3386,18 +3412,15 @@ function createMatrixReplyDispatcher(config) {
 						roomId,
 						client,
 						runtime,
-						textLimit,
 						replyToMode,
 						hasRepliedRef,
 						threadId: threadTarget,
 						replyToId: threadTarget ?? replyToEventId ?? void 0,
 						accountId,
-						mediaLocalRoots,
-						tableMode
+						mediaLocalRoots
 					}));
 				}
-				const payloadReplyToId = normalizeOptionalString(payload.replyToId);
-				const payloadReplyMismatch = replyToMode !== "off" && !threadTarget && payloadReplyToId !== draftController.currentReplyToId();
+				const payloadReplyMismatch = !threadTarget && (replyToMode !== "off" || payload.replyToTag || payload.replyToCurrent) && normalizeOptionalString(payload.replyToId) !== draftController.currentReplyToId();
 				let mustDeliverFinalNormally = draftStream.mustDeliverFinalNormally();
 				if (Boolean(payload.text?.trim()) && !payload.isError && !payloadReplyMismatch && !mustDeliverFinalNormally) {
 					await draftStream.stop();
@@ -3465,14 +3488,12 @@ function createMatrixReplyDispatcher(config) {
 									roomId,
 									client,
 									runtime,
-									textLimit,
 									replyToMode,
 									hasRepliedRef,
 									threadId: threadTarget,
 									replyToId: threadTarget ?? replyToEventId ?? void 0,
 									accountId,
-									mediaLocalRoots,
-									tableMode
+									mediaLocalRoots
 								})
 							});
 							return fallbackResult.visibleReplySent;
@@ -3528,14 +3549,12 @@ function createMatrixReplyDispatcher(config) {
 						roomId,
 						client,
 						runtime,
-						textLimit,
 						replyToMode,
 						hasRepliedRef,
 						threadId: threadTarget,
 						replyToId: threadTarget ?? replyToEventId ?? void 0,
 						accountId,
-						mediaLocalRoots,
-						tableMode
+						mediaLocalRoots
 					});
 					if (reusesDraftAsFinalText) {
 						draftController.markDraftConsumed();
@@ -3561,14 +3580,12 @@ function createMatrixReplyDispatcher(config) {
 					roomId,
 					client,
 					runtime,
-					textLimit,
 					replyToMode,
 					hasRepliedRef,
 					threadId: threadTarget,
 					replyToId: threadTarget ?? replyToEventId ?? void 0,
 					accountId,
-					mediaLocalRoots,
-					tableMode
+					mediaLocalRoots
 				});
 				const draftContent = draftStream.content();
 				if (shouldRedactDraft && draftEventId && draftContent) return await completeDelivery(await settleDraftReplacement({
@@ -3584,14 +3601,12 @@ function createMatrixReplyDispatcher(config) {
 				roomId,
 				client,
 				runtime,
-				textLimit,
 				replyToMode,
 				hasRepliedRef,
 				threadId: threadTarget,
 				replyToId: threadTarget ?? replyToEventId ?? void 0,
 				accountId,
-				mediaLocalRoots,
-				tableMode
+				mediaLocalRoots
 			}));
 		},
 		onError: (err, info) => {
@@ -3716,8 +3731,10 @@ function createMatrixHandlerState(config) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler.ts
+const SESSION_RESTART_RECOVERY_TOMBSTONE_ERROR_CODE = "SESSION_RESTART_RECOVERY_TOMBSTONE";
+const RESTART_RECOVERY_TOMBSTONE_NOTICE = "This session ended during gateway restart recovery and cannot accept more messages. Send /new or /reset to start a replacement session.";
 function createMatrixRoomMessageHandler(params) {
-	const { client, core, cfg, accountId, runtime, logger, logVerboseMessage, allowFromResolvedEntries = [], groupAllowFromResolvedEntries = [], configuredBotUserIds = /* @__PURE__ */ new Set(), groupPolicy, replyToMode, dmSessionScope, streaming, previewToolProgressEnabled, blockStreamingEnabled, textLimit, historyLimit, startupMs, startupGraceMs, dropPreStartupMessages, inboundDeduper, directTracker, getRoomInfo, getMemberDisplayName, resolveLiveUserAllowlist = resolveMatrixMonitorLiveUserAllowlist, resolveStorePath: resolveStorePathImpl = resolveStorePath, createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl = createChannelInboundEnvelopeBuilder, finalizeInboundContext, resolveHumanDelayConfig: resolveHumanDelayConfigImpl = resolveHumanDelayConfig } = params;
+	const { client, core, cfg, accountId, runtime, logger, logVerboseMessage, allowFromResolvedEntries = [], groupAllowFromResolvedEntries = [], configuredBotUserIds = /* @__PURE__ */ new Set(), groupPolicy, replyToMode, dmSessionScope, streaming, previewToolProgressEnabled, blockStreamingEnabled, historyLimit, startupMs, startupGraceMs, dropPreStartupMessages, inboundDeduper, directTracker, getRoomInfo, getMemberDisplayName, resolveLiveUserAllowlist = resolveMatrixMonitorLiveUserAllowlist, resolveStorePath: resolveStorePathImpl = resolveStorePath, createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl = createChannelInboundEnvelopeBuilder, finalizeInboundContext, resolveHumanDelayConfig: resolveHumanDelayConfigImpl = resolveHumanDelayConfig } = params;
 	const handlerConfig = {
 		...params,
 		allowFromResolvedEntries,
@@ -3776,9 +3793,10 @@ function createMatrixRoomMessageHandler(params) {
 			const eventTs = event.origin_server_ts;
 			const eventAge = event.unsigned?.age;
 			const commitInboundEventIfClaimed = async () => {
-				if (!inboundReplayClaim) return;
-				await inboundReplayClaim.commit();
-				inboundReplayClaim = void 0;
+				const claim = inboundReplayClaim;
+				if (!claim) return;
+				await claim.commit();
+				if (inboundReplayClaim === claim) inboundReplayClaim = void 0;
 			};
 			const readIngressPrefix = () => readMatrixIngressPrefix({
 				client,
@@ -3899,11 +3917,6 @@ function createMatrixRoomMessageHandler(params) {
 			});
 			if (!inboundContext) return;
 			const { replyToEventId, threadTarget, storePath, ctxPayload, replyTarget, sharedDmContextNotice } = inboundContext;
-			const tableMode = core.channel.text.resolveMarkdownTableMode({
-				cfg,
-				channel: "matrix",
-				accountId: _route.accountId
-			});
 			const mediaLocalRoots = getAgentScopedMediaLocalRoots(cfg, _route.agentId);
 			const { onModelSelected, ...prefixOptions } = createReplyPrefixOptions({
 				cfg,
@@ -3967,13 +3980,11 @@ function createMatrixRoomMessageHandler(params) {
 				client,
 				roomId,
 				runtime,
-				textLimit,
 				replyToMode,
 				threadTarget,
 				replyToEventId: replyToEventId ?? void 0,
 				accountId: _route.accountId,
 				mediaLocalRoots,
-				tableMode,
 				logVerboseMessage
 			});
 			const { deliverReply, onReplyError, turnDispatcherOptions } = replyDispatcher;
@@ -3989,10 +4000,27 @@ function createMatrixRoomMessageHandler(params) {
 				route: _route,
 				sessionKey: _route.sessionKey
 			});
-			const turnResult = await core.channel.inbound.run({
+			const replayClaimAtDispatch = inboundReplayClaim;
+			const turnAdoptionLifecycle = replayClaimAtDispatch ? {
+				admission: "exclusive",
+				onDeferred: () => {
+					if (inboundReplayClaim !== replayClaimAtDispatch) return false;
+					inboundReplayClaim = void 0;
+				},
+				onAdopted: async () => {
+					if (inboundReplayClaim === replayClaimAtDispatch) inboundReplayClaim = void 0;
+					await replayClaimAtDispatch.commit();
+				},
+				onAbandoned: () => {
+					if (inboundReplayClaim === replayClaimAtDispatch) inboundReplayClaim = void 0;
+					replayClaimAtDispatch.release();
+				}
+			} : void 0;
+			const turnResultPromise = core.channel.inbound.run({
 				channel: "matrix",
 				accountId: _route.accountId,
 				raw: event,
+				...turnAdoptionLifecycle ? { turnAdoptionLifecycle } : {},
 				adapter: {
 					ingest: () => ({
 						id: messageId,
@@ -4073,6 +4101,30 @@ function createMatrixRoomMessageHandler(params) {
 					})
 				}
 			});
+			let turnResult;
+			try {
+				turnResult = await turnResultPromise;
+			} catch (err) {
+				if (extractErrorCode(err) !== SESSION_RESTART_RECOVERY_TOMBSTONE_ERROR_CODE) throw err;
+				try {
+					const { sendMessageMatrix } = await loadMatrixSendModule();
+					await sendMessageMatrix(roomId, RESTART_RECOVERY_TOMBSTONE_NOTICE, {
+						cfg,
+						client,
+						accountId: _route.accountId,
+						replyToId: threadTarget ?? (replyToMode === "off" ? void 0 : messageId),
+						threadId: threadTarget,
+						deliveryQueueId: `matrix:restart-recovery-tombstone:${_route.accountId}:${roomId}:${eventId}`,
+						deliveryPartIndex: 0,
+						deliveryPartCount: 1,
+						extraContent: { msgtype: "m.notice" }
+					});
+					await commitInboundEventIfClaimed();
+				} catch (noticeError) {
+					runtime.error?.(`matrix: failed completing restart-recovery tombstone notice room=${roomId} id=${eventId || "unknown"}: ${String(noticeError)}`);
+				}
+				return;
+			}
 			if (!turnResult.dispatched) {
 				if (turnResult.admission.kind === "drop" && turnResult.admission.reason === "bot-loop-protection") await commitInboundEventIfClaimed();
 				return;
@@ -4126,7 +4178,7 @@ function shouldPromoteRecentInviteRoom(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/startup.ts
 const loadMatrixStartupMaintenanceDeps = createLazyRuntimeModule(() => Promise.all([
-	import("./config-update-Bor_Pjsv.js").then((n) => n.t),
+	import("./config-update-DC0fWBxc.js").then((n) => n.t),
 	import("./device-health-B4-YXtJR.js").then((n) => n.t),
 	import("./profile-D-Wubo0A.js").then((n) => n.n),
 	import("./startup-verification-Cs08ca8u.js")
@@ -4533,7 +4585,6 @@ async function monitorMatrixProvider(opts = {}) {
 	const dmPolicyRaw = dmConfig?.policy ?? "pairing";
 	const dmPolicy = allowlistOnly && dmPolicyRaw !== "disabled" ? "allowlist" : dmPolicyRaw;
 	const dmSessionScope = dmConfig?.sessionScope ?? "per-user";
-	const textLimit = core.channel.text.resolveTextChunkLimit(cfg, "matrix", effectiveAccountId);
 	const globalGroupChatHistoryLimit = cfg.messages?.groupChat?.historyLimit;
 	const historyLimit = Math.max(0, accountConfig.historyLimit ?? globalGroupChatHistoryLimit ?? 0);
 	const mediaMaxMb = opts.mediaMaxMb ?? accountConfig.mediaMaxMb ?? DEFAULT_MEDIA_MAX_MB;
@@ -4663,7 +4714,6 @@ async function monitorMatrixProvider(opts = {}) {
 			blockStreamingEnabled,
 			dmEnabled,
 			dmPolicy,
-			textLimit,
 			mediaMaxBytes,
 			historyLimit,
 			startupMs,
@@ -4705,6 +4755,10 @@ async function monitorMatrixProvider(opts = {}) {
 				accountId: effectiveAccountId
 			}).catch(() => []),
 			directTracker,
+			groupPolicy,
+			roomsConfig,
+			needsRoomAliasesForConfig,
+			getRoomInfo,
 			invalidateMemberDisplayName,
 			logVerboseMessage,
 			warnedEncryptedRooms,