@openclaw/matrix 2026.9.1-beta.1 → 2026.9.1

package/dist/{monitor-DBB47wTy.js → monitor-SNnu-0bp.js}

@@ -1,29 +1,30 @@
-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-CBEvelTE.js";
-import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./channel.setup-sWPOGyQG.js";
+import { n as resolveConfiguredMatrixBotUserIds } from "./accounts-DR1c4xF_.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-b-jES-oi.js";
+import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./channel.setup-BY42QaL7.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-BKu9Ghi4.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-DG7Bnj7_.js";
 import { i as isStrictDirectMembership, n as hasDirectMatrixMemberFlag, o as readJoinedMatrixMembers } from "./direct-room-RinHjtqX.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-BvyU66kE.js";
-import { a as resolveBundledMatrixReplacementContent, c as fetchMatrixPollSnapshot, i as isLikelyBareFilename, n as formatMatrixMediaUnavailableText, r as formatMatrixMessageText, t as formatMatrixMediaTooLargeText } from "./media-text-OR9uoC4W.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-DgxQEB99.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-C1U3b1oN.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-hs1ePy2O.js";
-import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-D8o8b9u6.js";
-import { t as resolveMatrixTargets } from "./resolve-targets-DXzZwsIY.js";
-import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-DmLY8NiO.js";
-import { createMatrixInboundEventDeduper } from "./inbound-dedupe-RvSLqdsz.js";
+import { a as throwIfMatrixStartupAborted, c as backfillMatrixAuthDeviceIdAfterStartup, i as isMatrixStartupAbortError, l as resolveMatrixAuth, n as acquireSharedMatrixClient, o as createMatrixMonitorTaskRunner, u as resolveMatrixAuthContext } from "./client-Dj4mcf-s.js";
+import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-DOmFvKvB.js";
+import { n as prepareMatrixReplyPayload, r as resolveMatrixExtraContent } from "./outbound-CeCEtF_q.js";
+import { t as resolveMatrixTargets } from "./resolve-targets-B64O69Nd.js";
+import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-BNcZNQZI.js";
+import { createMatrixInboundEventDeduper } from "./inbound-dedupe-Ch33GU06.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-DVkKDscD.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, 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";
@@ -35,6 +36,7 @@ import { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runti
 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";
@@ -326,15 +328,16 @@ async function resolveMatrixMonitorLiveUserAllowlist(params) {
 		});
 	}
 	if (pending.length === 0) return effective;
+	const resolution = await resolveMatrixMonitorUserEntries({
+		cfg: params.cfg,
+		accountId: params.accountId,
+		entries: pending,
+		runtime: params.runtime,
+		resolveTargets: params.resolveTargets ?? resolveMatrixTargets
+	});
 	const canonicalized = canonicalizeAllowlistWithResolvedIds({
 		existing: pending,
-		resolvedMap: (await resolveMatrixMonitorUserEntries({
-			cfg: params.cfg,
-			accountId: params.accountId,
-			entries: pending,
-			runtime: params.runtime,
-			resolveTargets: params.resolveTargets ?? resolveMatrixTargets
-		})).resolvedMap,
+		resolvedMap: resolution.resolvedMap,
 		entryKey: normalizeMatrixUserId
 	});
 	const resolvedEntries = params.failClosedOnUnresolved ? filterFailClosedMatrixAllowlistEntries(canonicalized) : filterResolvedMatrixAllowlistEntries(canonicalized);
@@ -604,7 +607,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,
@@ -820,7 +823,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-BKu9Ghi4.js").then((n) => n.S), import("./direct-room-RinHjtqX.js").then((n) => n.t)]).then(([directManagementModule, directRoomModule]) => ({
+const loadMatrixDirectRoomDeps = createLazyRuntimeModule(() => Promise.all([import("./send-DG7Bnj7_.js").then((n) => n.x), import("./direct-room-RinHjtqX.js").then((n) => n.t)]).then(([directManagementModule, directRoomModule]) => ({
 	inspectMatrixDirectRooms: directManagementModule.inspectMatrixDirectRooms,
 	isStrictDirectRoom: directRoomModule.isStrictDirectRoom
 })));
@@ -930,10 +933,11 @@ async function resolveVerificationSummaryForSignal(client, params) {
 	const byTransactionId = list.find((entry) => candidates.some((candidate) => entry.transactionId === candidate));
 	if (byTransactionId) return byTransactionId;
 	const { inspectMatrixDirectRooms, isStrictDirectRoom } = await loadMatrixDirectRoomDeps();
-	const activeRoomId = normalizeNullableString((await inspectMatrixDirectRooms({
+	const inspection = await inspectMatrixDirectRooms({
 		client,
 		remoteUserId: params.senderId
-	}).catch(() => null))?.activeRoomId);
+	}).catch(() => null);
+	const activeRoomId = normalizeNullableString(inspection?.activeRoomId);
 	if (activeRoomId) {
 		if (activeRoomId !== params.roomId) return null;
 	} else if (!await isStrictDirectRoom({
@@ -1013,10 +1017,11 @@ function createMatrixVerificationEventRouter(params) {
 	const verificationUserRooms = /* @__PURE__ */ new Map();
 	async function resolveActiveDirectRoomId(remoteUserId) {
 		const { inspectMatrixDirectRooms } = await loadMatrixDirectRoomDeps();
-		return normalizeNullableString((await inspectMatrixDirectRooms({
+		const inspection = await inspectMatrixDirectRooms({
 			client: params.client,
 			remoteUserId
-		}).catch(() => null))?.activeRoomId);
+		}).catch(() => null);
+		return normalizeNullableString(inspection?.activeRoomId);
 	}
 	function shouldEmitVerificationEventNotice(event) {
 		const eventTs = typeof event.origin_server_ts === "number" && Number.isFinite(event.origin_server_ts) ? event.origin_server_ts : null;
@@ -1169,7 +1174,7 @@ function createMatrixVerificationEventRouter(params) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/events.ts
-const MATRIX_POST_HEALTHY_SYNC_DECRYPT_FAILURE_WINDOW_MS = 2 * 6e4;
+const MATRIX_POST_HEALTHY_SYNC_DECRYPT_FAILURE_WINDOW_MS = 12e4;
 const MATRIX_POST_HEALTHY_SYNC_DECRYPT_FAILURE_THRESHOLD = 3;
 const MATRIX_POST_HEALTHY_SYNC_DECRYPT_FAILURE_SAMPLE_LIMIT = 3;
 function formatMatrixPostHealthySyncDecryptionHint(accountId) {
@@ -1357,6 +1362,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";
@@ -1518,11 +1584,7 @@ function resolveMatrixSharedDmContextNotice(params) {
 		if (currentSession.accountId && currentSession.accountId !== params.accountId) return null;
 		if (!currentSession.directUserId) return null;
 		if (!currentSession.roomId || currentSession.roomId === params.roomId) return null;
-		return [
-			"This Matrix DM is sharing a session with another Matrix DM room.",
-			"Use /focus here for a one-off isolated thread session when thread bindings are enabled, or set",
-			"channels.matrix.dm.sessionScope to per-room to isolate each Matrix DM room."
-		].join(" ");
+		return ["This Matrix DM is sharing a session with another Matrix DM room.", "Set channels.matrix.dm.sessionScope to per-room to isolate each Matrix DM room."].join(" ");
 	} catch (err) {
 		params.logVerboseMessage(`matrix: failed checking shared DM session notice room=${params.roomId} (${String(err)})`);
 		return null;
@@ -1530,10 +1592,13 @@ function resolveMatrixSharedDmContextNotice(params) {
 }
 function resolveMatrixPendingHistoryText(params) {
 	if (!params.mediaUrl) return params.mentionPrecheckText;
+	const body = typeof params.content.body === "string" ? params.content.body : void 0;
+	const filename = typeof params.content.filename === "string" ? params.content.filename : void 0;
+	const msgtype = typeof params.content.msgtype === "string" ? params.content.msgtype : void 0;
 	return formatMatrixMessageText({
-		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
+		body,
+		filename,
+		msgtype
 	}) ?? params.mentionPrecheckText;
 }
 function resolveMatrixInboundMediaContent(content) {
@@ -1566,7 +1631,7 @@ function resolveMatrixAllowBotsMode(value) {
 	return "off";
 }
 function formatMatrixToolProgressMarkdownCode(text) {
-	return `\`${(text.length <= MATRIX_TOOL_PROGRESS_MAX_CHARS ? text : `${truncateUtf16Safe(text, MATRIX_TOOL_PROGRESS_MAX_CHARS - 1).trimEnd()}...`).replaceAll("`", "'")}\``;
+	return `\`${(text.length <= MATRIX_TOOL_PROGRESS_MAX_CHARS ? text : `${truncateUtf16Safe(text, 299).trimEnd()}...`).replaceAll("`", "'")}\``;
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler-runtime.ts
@@ -1576,11 +1641,11 @@ async function redactMatrixDraftEvent(client, roomId, draftEventId) {
 function buildMatrixFinalizedPreviewContent() {
 	return { [MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY]: true };
 }
-const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-BKu9Ghi4.js").then((n) => n.s));
+const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-DG7Bnj7_.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-BZUgLIZI.js"));
-const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-B_m79Ynb.js"));
+const loadMatrixReactionEvents = createLazyRuntimeModule(() => import("./reaction-events-DveJRUaX.js"));
+const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-DPYdv4fE.js"));
 async function matrixTextWouldActivateMentions(client, text) {
 	const { resolveMatrixMentionsForBody } = await loadMatrixSendModule();
 	const mentions = await resolveMatrixMentionsForBody({
@@ -1609,7 +1674,7 @@ const MAX_CACHED_REPLY_CONTEXTS = 256;
 const MAX_REPLY_BODY_LENGTH = 500;
 function truncateReplyBody(value) {
 	if (value.length <= MAX_REPLY_BODY_LENGTH) return value;
-	return `${sliceUtf16Safe(value, 0, MAX_REPLY_BODY_LENGTH - 3)}...`;
+	return `${sliceUtf16Safe(value, 0, 497)}...`;
 }
 function summarizeMatrixReplyEvent(event) {
 	const body = summarizeMatrixMessageContextEvent(event);
@@ -1662,7 +1727,7 @@ const MAX_TRACKED_THREAD_STARTERS = 256;
 const MAX_THREAD_STARTER_BODY_LENGTH = 500;
 function truncateThreadStarterBody(value) {
 	if (value.length <= MAX_THREAD_STARTER_BODY_LENGTH) return value;
-	return `${sliceUtf16Safe(value, 0, MAX_THREAD_STARTER_BODY_LENGTH - 3)}...`;
+	return `${sliceUtf16Safe(value, 0, 497)}...`;
 }
 function summarizeMatrixThreadStarterEvent(event) {
 	const body = summarizeMatrixMessageContextEvent(event);
@@ -1847,7 +1912,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}`,
@@ -2773,7 +2839,6 @@ async function resolveMatrixIngressContent(config) {
 		isDirectMessage,
 		dmSessionScope,
 		threadId: thread.threadId,
-		eventTs: eventTs ?? void 0,
 		resolveAgentRoute: core.channel.routing.resolveAgentRoute
 	});
 	const hasExplicitSessionBinding = _configuredBinding !== null || _runtimeBindingId !== null;
@@ -2999,7 +3064,10 @@ async function resolveMatrixIngressContent(config) {
 	}
 	if (_runtimeBindingId) {
 		const { getSessionBindingService } = await loadSessionBindingRuntime();
-		getSessionBindingService().touch(_runtimeBindingId, eventTs ?? void 0);
+		getSessionBindingService().touch(_runtimeBindingId, eventTs ?? void 0, {
+			channel: "matrix",
+			accountId
+		});
 	}
 	const preparedTrigger = isRoom && historyLimit > 0 ? reservedHistorySlot ? roomHistoryTracker.prepareReservedTrigger(_route.agentId, roomId, historyLimit, reservedHistorySlot, {
 		sender: senderName,
@@ -3213,11 +3281,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,24 +3309,17 @@ async function deliverMatrixReplies(params) {
 				acceptedResults.push(result);
 				if (replyToIdForReply) hasRepliedRef.value = true;
 			};
+			const extraContent = resolveMatrixExtraContent(reply);
 			if (mediaUrls.length === 0) {
-				const { chunks } = chunkMatrixText(rawText, {
+				await sendMessageMatrix(params.roomId, rawText, {
+					client: params.client,
 					cfg: params.cfg,
+					replyToId: replyToIdForReply,
+					threadId: params.threadId,
 					accountId: params.accountId,
-					tableMode,
-					preserveWhitespace: true
+					extraContent,
+					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;
@@ -3278,6 +3334,7 @@ async function deliverMatrixReplies(params) {
 					threadId: params.threadId,
 					audioAsVoice: reply.audioAsVoice,
 					accountId: params.accountId,
+					extraContent: first ? extraContent : void 0,
 					onDeliveryResult
 				});
 				first = false;
@@ -3291,7 +3348,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;
@@ -3363,14 +3420,12 @@ function createMatrixReplyDispatcher(config) {
 						roomId,
 						client,
 						runtime,
-						textLimit,
 						replyToMode,
 						hasRepliedRef,
 						threadId: threadTarget,
 						replyToId: threadTarget ?? replyToEventId ?? void 0,
 						accountId,
-						mediaLocalRoots,
-						tableMode
+						mediaLocalRoots
 					}));
 				}
 				const payloadReplyMismatch = !threadTarget && (replyToMode !== "off" || payload.replyToTag || payload.replyToCurrent) && normalizeOptionalString(payload.replyToId) !== draftController.currentReplyToId();
@@ -3401,11 +3456,18 @@ function createMatrixReplyDispatcher(config) {
 								discardPending: async () => {},
 								id: () => draftEventId
 							},
-							buildFinalEdit: () => ({
-								text: finalPreviewText,
-								finalizeLive: !(quietDraftStreaming || !draftStream.matchesPreparedText(finalPreviewText)),
-								...quietDraftStreaming ? { extraContent: buildMatrixFinalizedPreviewContent() } : {}
-							}),
+							buildFinalEdit: () => {
+								const presentationContent = resolveMatrixExtraContent(payload);
+								const extraContent = {
+									...quietDraftStreaming ? buildMatrixFinalizedPreviewContent() : {},
+									...presentationContent
+								};
+								return {
+									text: finalPreviewText,
+									finalizeLive: !(quietDraftStreaming || Boolean(presentationContent) || !draftStream.matchesPreparedText(finalPreviewText)),
+									...Object.keys(extraContent).length > 0 ? { extraContent } : {}
+								};
+							},
 							editFinal: async (_draftEventId, edit) => {
 								if (edit.finalizeLive) {
 									if (!await draftStream.finalizeLive()) throw new Error("Matrix draft live finalize failed");
@@ -3441,14 +3503,12 @@ function createMatrixReplyDispatcher(config) {
 									roomId,
 									client,
 									runtime,
-									textLimit,
 									replyToMode,
 									hasRepliedRef,
 									threadId: threadTarget,
 									replyToId: threadTarget ?? replyToEventId ?? void 0,
 									accountId,
-									mediaLocalRoots,
-									tableMode
+									mediaLocalRoots
 								})
 							});
 							return fallbackResult.visibleReplySent;
@@ -3504,14 +3564,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();
@@ -3537,14 +3595,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({
@@ -3560,14 +3616,12 @@ function createMatrixReplyDispatcher(config) {
 				roomId,
 				client,
 				runtime,
-				textLimit,
 				replyToMode,
 				hasRepliedRef,
 				threadId: threadTarget,
 				replyToId: threadTarget ?? replyToEventId ?? void 0,
 				accountId,
-				mediaLocalRoots,
-				tableMode
+				mediaLocalRoots
 			}));
 		},
 		onError: (err, info) => {
@@ -3590,7 +3644,7 @@ function createMatrixReplyDispatcher(config) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler-state.ts
 const ALLOW_FROM_STORE_CACHE_TTL_MS = 3e4;
-const PAIRING_REPLY_COOLDOWN_MS = 5 * 6e4;
+const PAIRING_REPLY_COOLDOWN_MS = 3e5;
 const MAX_TRACKED_PAIRING_REPLY_SENDERS = 512;
 function createMatrixHandlerState(config) {
 	const { core, accountId, runtime, allowFromResolvedEntries, groupAllowFromResolvedEntries, resolveLiveUserAllowlist } = config;
@@ -3692,8 +3746,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,
@@ -3876,11 +3932,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,
@@ -3944,13 +3995,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;
@@ -3982,7 +4031,7 @@ function createMatrixRoomMessageHandler(params) {
 					replayClaimAtDispatch.release();
 				}
 			} : void 0;
-			const turnResult = await core.channel.inbound.run({
+			const turnResultPromise = core.channel.inbound.run({
 				channel: "matrix",
 				accountId: _route.accountId,
 				raw: event,
@@ -4039,6 +4088,7 @@ function createMatrixRoomMessageHandler(params) {
 						},
 						delivery: {
 							observeMessageSent: true,
+							preparePayload: prepareMatrixReplyPayload,
 							deliver: deliverReply,
 							onError: (err, info) => onReplyError(err, info)
 						},
@@ -4067,6 +4117,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;
@@ -4120,10 +4194,10 @@ 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-BnX26jCO.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")
+	import("./profile-vmjsmhh4.js").then((n) => n.n),
+	import("./startup-verification-1Ney1mmI.js")
 ]).then(([configUpdateModule, deviceHealthModule, profileModule, startupVerificationModule]) => ({
 	updateMatrixAccountConfig: configUpdateModule.updateMatrixAccountConfig,
 	summarizeMatrixDeviceHealth: deviceHealthModule.summarizeMatrixDeviceHealth,
@@ -4345,35 +4419,6 @@ function createMatrixMonitorSyncLifecycle(params) {
 	};
 }
 //#endregion
-//#region extensions/matrix/src/matrix/monitor/task-runner.ts
-function createMatrixMonitorTaskRunner(params) {
-	const inFlight = /* @__PURE__ */ new Set();
-	let closed = false;
-	const runDetachedTask = (label, task) => {
-		if (closed) return Promise.resolve();
-		const trackedTask = Promise.resolve().then(task).catch((error) => {
-			const message = String(error);
-			params.logVerboseMessage(`matrix: ${label} failed (${message})`);
-			params.logger.warn("matrix background task failed", {
-				task: label,
-				error: message
-			});
-		}).finally(() => {
-			inFlight.delete(trackedTask);
-		});
-		inFlight.add(trackedTask);
-		return trackedTask;
-	};
-	const waitForIdle = async () => {
-		while (inFlight.size > 0) await Promise.allSettled(Array.from(inFlight));
-	};
-	return {
-		close: () => closed = true,
-		runDetachedTask,
-		waitForIdle
-	};
-}
-//#endregion
 //#region extensions/matrix/src/matrix/monitor/index.ts
 function resolveMatrixStreamingMode(streaming) {
 	const mode = streaming?.mode;
@@ -4527,7 +4572,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;
@@ -4657,7 +4701,6 @@ async function monitorMatrixProvider(opts = {}) {
 			blockStreamingEnabled,
 			dmEnabled,
 			dmPolicy,
-			textLimit,
 			mediaMaxBytes,
 			historyLimit,
 			startupMs,
@@ -4699,6 +4742,10 @@ async function monitorMatrixProvider(opts = {}) {
 				accountId: effectiveAccountId
 			}).catch(() => []),
 			directTracker,
+			groupPolicy,
+			roomsConfig,
+			needsRoomAliasesForConfig,
+			getRoomInfo,
 			invalidateMemberDisplayName,
 			logVerboseMessage,
 			warnedEncryptedRooms,