@openclaw/matrix 2026.7.2-beta.3 → 2026.7.2-beta.5

package/dist/{monitor-BtUIds8T.js → monitor-s--XqoxF.js}

@@ -1,33 +1,34 @@
 import { a as resolveMatrixAccountConfig, i as resolveMatrixAccountAllowlistConfig } from "./account-config-BZWN9tGS.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { m as resolveConfiguredMatrixBotUserIds } from "./setup-core-XCdAx1nY.js";
-import { a as buildAllowlistResolutionSummary, c as createTypingCallbacks, d as logInboundDrop, f as logTypingFailure, h as toLocationContext, i as addAllowlistUserEntriesFromConfigEntry, l as formatLocationText, m as summarizeMapping, n as resolveMatrixStoredSessionMeta, o as canonicalizeAllowlistWithResolvedIds, p as patchAllowlistUsersInConfigEntries, r as resolveMatrixRoomConfig, s as createReplyPrefixOptions, u as getAgentScopedMediaLocalRoots } from "./channel-j331Xd7b.js";
-import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-B5GRV8wL.js";
+import { h as resolveConfiguredMatrixBotUserIds } from "./setup-core-a542Ernq.js";
+import { a as buildAllowlistResolutionSummary, c as createTypingCallbacks, d as logInboundDrop, f as logTypingFailure, h as toLocationContext, i as addAllowlistUserEntriesFromConfigEntry, l as formatLocationText, m as summarizeMapping, n as resolveMatrixStoredSessionMeta, o as canonicalizeAllowlistWithResolvedIds, p as patchAllowlistUsersInConfigEntries, r as resolveMatrixRoomConfig, s as createReplyPrefixOptions, u as getAgentScopedMediaLocalRoots } from "./channel-Cmi248PA.js";
+import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-BShrVROw.js";
 import { t as isMatrixQualifiedUserId } from "./target-ids-B-5aQxwn.js";
 import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { D as parsePollStartContent, S as formatPollAsText, T as isPollStartType, _ as readJoinedMatrixMembers, a as sendMessageMatrix, f as promoteMatrixDirectRoomCandidate, g as isStrictDirectMembership, h as hasDirectMatrixMemberFlag, t as chunkMatrixText, v as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, w as isPollEventType } from "./send-BJbrdmNm.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-Cw194yEn.js";
+import { D as parsePollStartContent, S as formatPollAsText, T as isPollStartType, g as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, h as readJoinedMatrixMembers, m as isStrictDirectMembership, p as hasDirectMatrixMemberFlag, r as sendMessageMatrix, u as promoteMatrixDirectRoomCandidate, v as chunkMatrixText, w as isPollEventType } from "./send-C9Ssx-iV.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-D3RfVgAF.js";
 import { i as createMatrixInboundEventDeduper } from "./inbound-dedupe-CaBLblef.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-BMXEXb1j.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-DlQC_k_K.js";
 import { n as setActiveMatrixClient } from "./active-client-DXvz2gCo.js";
 import { t as isBunRuntime } from "./runtime-BefyhPWv.js";
-import { d as backfillMatrixAuthDeviceIdAfterStartup, f as resolveMatrixAuth, i as resolveSharedMatrixClient, l as isMatrixStartupAbortError, n as releaseSharedClientInstance, p as resolveMatrixAuthContext, u as throwIfMatrixStartupAborted } from "./shared-DquM1oz6.js";
-import "./client-CA0PULls.js";
-import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-BmrgOZTL.js";
+import { d as backfillMatrixAuthDeviceIdAfterStartup, f as resolveMatrixAuth, i as resolveSharedMatrixClient, l as isMatrixStartupAbortError, n as releaseSharedClientInstance, p as resolveMatrixAuthContext, u as throwIfMatrixStartupAborted } from "./shared-CUH5otj8.js";
+import "./client-BFRg0kd4.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-D1xI_cvh.js";
-import { t as resolveMatrixTargets } from "./resolve-targets-DVoj-YxB.js";
+import { t as resolveMatrixTargets } from "./resolve-targets-nNMcrV3W.js";
 import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-CbEFe38F.js";
 import { n as isMatrixReadySyncState, r as isMatrixTerminalSyncState, t as isMatrixDisconnectedSyncState } from "./sync-state-CWbp0QSY.js";
+import { n as setBoundedMap, t as createMatrixRoomInfoResolver } from "./room-info-CAFZ3Z9J.js";
 import { a as EventType, i as resolveMatrixThreadRouting, n as resolveMatrixReplyToEventId, o as RelationType, r as resolveMatrixThreadRootId, t as resolveMatrixInboundRoute } from "./route-DY6at4qJ.js";
-import { t as createMatrixRoomInfoResolver } from "./room-info-B6vKD5DF.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { buildChannelProgressDraftLineForEntry, createChannelProgressDraftGate, createPreviewMessageReceipt, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, formatChannelProgressDraftLine, formatChannelProgressDraftText, isChannelProgressDraftWorkToolName, mergeChannelProgressDraftLine, normalizeChannelProgressDraftLineIdentity, resolveChannelProgressDraftMaxLines, resolveChannelStreamingBlockEnabled, waitUntilAbort } from "openclaw/plugin-sdk/channel-outbound";
-import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringifiedEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { normalizeLowercaseStringOrEmpty, normalizeNullableString, normalizeOptionalString, normalizeStringifiedEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
 import { resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
 import { buildChannelInboundEventContext, createChannelInboundEnvelopeBuilder, hasFinalInboundReplyDispatch, resolveInboundMentionDecision, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
 import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { isFutureDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs, resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
+import { resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { format } from "node:util";
 import { escapeRegExp, sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
@@ -36,13 +37,12 @@ import { resolveAckReaction } from "openclaw/plugin-sdk/channel-feedback";
 import { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runtime-context";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-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 { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
+import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { mergePairLoopGuardConfig } from "openclaw/plugin-sdk/pair-loop-guard-runtime";
 import { buildInboundHistoryFromEntries } from "openclaw/plugin-sdk/reply-history";
-import { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
 import { decodeHtmlEntities } from "openclaw/plugin-sdk/html-entity-runtime";
-import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { createConnectedChannelStatusPatch, createTransportActivityStatusPatch } from "openclaw/plugin-sdk/gateway-runtime";
 //#region extensions/matrix/src/matrix/monitor/auto-join.ts
 function registerMatrixAutoJoin(params) {
@@ -466,15 +466,8 @@ async function resolveMatrixMonitorConfig(params) {
 //#region extensions/matrix/src/matrix/monitor/direct.ts
 const DM_CACHE_TTL_MS = 3e4;
 const RECENT_INVITE_TTL_MS = 3e4;
-const MAX_TRACKED_DM_ROOMS = 1024;
-const MAX_TRACKED_DM_MEMBER_FLAGS = 2048;
-function rememberBounded(map, key, value, maxSize = MAX_TRACKED_DM_ROOMS) {
-	map.set(key, value);
-	if (map.size > maxSize) {
-		const oldest = map.keys().next().value;
-		if (typeof oldest === "string") map.delete(oldest);
-	}
-}
+const MAX_DM_ROOMS = 1024;
+const MAX_DM_MEMBER_FLAGS = 2048;
 function createDirectRoomTracker(client, opts = {}) {
 	const log = opts.log ?? (() => {});
 	let lastDmUpdateMs = 0;
@@ -506,10 +499,10 @@ function createDirectRoomTracker(client, opts = {}) {
 		try {
 			const normalized = await readJoinedMatrixMembers(client, roomId);
 			if (!normalized) throw new Error("membership unavailable");
-			rememberBounded(joinedMembersCache, roomId, {
+			setBoundedMap(joinedMembersCache, roomId, {
 				members: normalized,
 				ts: now
-			});
+			}, MAX_DM_ROOMS);
 			return normalized;
 		} catch (err) {
 			log(`matrix: dm member lookup failed room=${roomId} (${String(err)})`);
@@ -524,10 +517,10 @@ function createDirectRoomTracker(client, opts = {}) {
 		const now = Date.now();
 		if (cached && now - cached.ts < DM_CACHE_TTL_MS) return cached.isDirect;
 		const isDirect = await hasDirectMatrixMemberFlag(client, roomId, normalizedUserId);
-		rememberBounded(directMemberFlagCache, cacheKey, {
+		setBoundedMap(directMemberFlagCache, cacheKey, {
 			isDirect,
 			ts: now
-		}, MAX_TRACKED_DM_MEMBER_FLAGS);
+		}, MAX_DM_MEMBER_FLAGS);
 		return isDirect;
 	};
 	const hasRecentInviteCandidate = (roomId, remoteUserId) => {
@@ -581,7 +574,7 @@ function createDirectRoomTracker(client, opts = {}) {
 	const rememberLocallyPromotedDirectRoom = (roomId, remoteUserId) => {
 		const normalizedRemoteUserId = remoteUserId.trim();
 		if (!normalizedRemoteUserId) return;
-		rememberBounded(locallyPromotedDirectRooms, roomId, { remoteUserId: normalizedRemoteUserId });
+		setBoundedMap(locallyPromotedDirectRooms, roomId, { remoteUserId: normalizedRemoteUserId }, MAX_DM_ROOMS);
 	};
 	return {
 		invalidateRoom: (roomId) => {
@@ -593,10 +586,10 @@ function createDirectRoomTracker(client, opts = {}) {
 		rememberInvite: (roomId, remoteUserId) => {
 			const normalizedRemoteUserId = remoteUserId.trim();
 			if (!normalizedRemoteUserId) return;
-			rememberBounded(recentInviteCandidates, roomId, {
+			setBoundedMap(recentInviteCandidates, roomId, {
 				remoteUserId: normalizedRemoteUserId,
 				ts: Date.now()
-			});
+			}, MAX_DM_ROOMS);
 			log(`matrix: remembered invite candidate room=${roomId} sender=${normalizedRemoteUserId}`);
 		},
 		isDirectMessage: async (params) => {
@@ -793,21 +786,21 @@ const VERIFICATION_NOTICE_PREFIXES = [
 	"Matrix verification cancelled by ",
 	"Matrix verification SAS with "
 ];
-function trimMaybeString$1(input) {
+function trimMaybeString(input) {
 	return normalizeOptionalString(input) ?? "";
 }
 function isMatrixVerificationEventType(type) {
-	return trimMaybeString$1(type).startsWith(VERIFICATION_EVENT_PREFIX);
+	return trimMaybeString(type).startsWith(VERIFICATION_EVENT_PREFIX);
 }
 function isMatrixVerificationRequestMsgType(msgtype) {
-	return trimMaybeString$1(msgtype) === VERIFICATION_REQUEST_MSGTYPE;
+	return trimMaybeString(msgtype) === VERIFICATION_REQUEST_MSGTYPE;
 }
 function isMatrixVerificationNoticeBody(body) {
-	const text = trimMaybeString$1(body);
+	const text = trimMaybeString(body);
 	return VERIFICATION_NOTICE_PREFIXES.some((prefix) => text.startsWith(prefix));
 }
 function isMatrixVerificationRoomMessage(content) {
-	return isMatrixVerificationRequestMsgType(content.msgtype) || trimMaybeString$1(content.msgtype) === "m.notice" && isMatrixVerificationNoticeBody(content.body);
+	return isMatrixVerificationRequestMsgType(content.msgtype) || trimMaybeString(content.msgtype) === "m.notice" && isMatrixVerificationNoticeBody(content.body);
 }
 const matrixVerificationConstants = {
 	eventPrefix: VERIFICATION_EVENT_PREFIX,
@@ -818,27 +811,22 @@ 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-BJbrdmNm.js").then((n) => n.d), import("./send-BJbrdmNm.js").then((n) => n.m)]).then(([directManagementModule, directRoomModule]) => ({
+const loadMatrixDirectRoomDeps = createLazyRuntimeModule(() => Promise.all([import("./send-C9Ssx-iV.js").then((n) => n.l), import("./send-C9Ssx-iV.js").then((n) => n.f)]).then(([directManagementModule, directRoomModule]) => ({
 	inspectMatrixDirectRooms: directManagementModule.inspectMatrixDirectRooms,
 	isStrictDirectRoom: directRoomModule.isStrictDirectRoom
 })));
-function trimMaybeString(input) {
-	if (typeof input !== "string") return null;
-	const trimmed = input.trim();
-	return trimmed.length > 0 ? trimmed : null;
-}
 function readVerificationSignal(event) {
-	const type = trimMaybeString(event?.type) ?? "";
+	const type = normalizeNullableString(event?.type) ?? "";
 	const content = event?.content ?? {};
-	const msgtype = trimMaybeString(content.msgtype) ?? "";
-	const relatedEventId = trimMaybeString(content["m.relates_to"]?.event_id);
-	const transactionId = trimMaybeString(content.transaction_id);
+	const msgtype = normalizeNullableString(content.msgtype) ?? "";
+	const relatedEventId = normalizeNullableString(content["m.relates_to"]?.event_id);
+	const transactionId = normalizeNullableString(content.transaction_id);
 	if (type === EventType.RoomMessage && isMatrixVerificationRequestMsgType(msgtype)) return {
 		stage: "request",
-		flowId: trimMaybeString(event.event_id) ?? transactionId ?? relatedEventId
+		flowId: normalizeNullableString(event.event_id) ?? transactionId ?? relatedEventId
 	};
 	if (!isMatrixVerificationEventType(type)) return null;
-	const flowId = transactionId ?? relatedEventId ?? trimMaybeString(event.event_id);
+	const flowId = transactionId ?? relatedEventId ?? normalizeNullableString(event.event_id);
 	if (type === `${matrixVerificationConstants.eventPrefix}request`) return {
 		stage: "request",
 		flowId
@@ -873,8 +861,8 @@ function formatVerificationStageNotice(params) {
 		case "start": return `Matrix verification started with ${senderId}.`;
 		case "done": return `Matrix verification completed with ${senderId}.`;
 		case "cancel": {
-			const code = trimMaybeString(content.code);
-			const reason = trimMaybeString(content.reason);
+			const code = normalizeNullableString(content.code);
+			const reason = normalizeNullableString(content.reason);
 			if (code && reason) return `Matrix verification cancelled by ${senderId} (${code}: ${reason}).`;
 			if (reason) return `Matrix verification cancelled by ${senderId} (${reason}).`;
 			return `Matrix verification cancelled by ${senderId}.`;
@@ -885,7 +873,7 @@ function formatVerificationStageNotice(params) {
 function formatVerificationSasNotice(summary) {
 	const sas = summary.sas;
 	if (!sas) return null;
-	const emojiLine = Array.isArray(sas.emoji) && sas.emoji.length > 0 ? `SAS emoji: ${sas.emoji.map(([emoji, name]) => `${trimMaybeString(emoji) ?? "?"} ${trimMaybeString(name) ?? "?"}`).join(" | ")}` : null;
+	const emojiLine = Array.isArray(sas.emoji) && sas.emoji.length > 0 ? `SAS emoji: ${sas.emoji.map(([emoji, name]) => `${normalizeNullableString(emoji) ?? "?"} ${normalizeNullableString(name) ?? "?"}`).join(" | ")}` : null;
 	const decimalLine = Array.isArray(sas.decimal) && sas.decimal.length === 3 ? `SAS decimal: ${sas.decimal.join(" ")}` : null;
 	if (!emojiLine && !decimalLine) return null;
 	const lines = [`Matrix verification SAS with ${summary.otherUserId}:`];
@@ -899,7 +887,7 @@ function resolveVerificationFlowCandidates(params) {
 	const content = event.content;
 	const candidates = /* @__PURE__ */ new Set();
 	const add = (value) => {
-		const normalized = trimMaybeString(value);
+		const normalized = normalizeNullableString(value);
 		if (normalized) candidates.add(normalized);
 	};
 	add(flowId);
@@ -933,7 +921,7 @@ 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 = trimMaybeString((await inspectMatrixDirectRooms({
+	const activeRoomId = normalizeNullableString((await inspectMatrixDirectRooms({
 		client,
 		remoteUserId: params.senderId
 	}).catch(() => null))?.activeRoomId);
@@ -946,7 +934,7 @@ async function resolveVerificationSummaryForSignal(client, params) {
 	})) return null;
 	const activeByUser = list.filter((entry) => entry.otherUserId === params.senderId && isActiveVerificationSummary(entry)).toSorted((a, b) => resolveSummaryRecency(b) - resolveSummaryRecency(a));
 	const activeInRoom = activeByUser.filter((entry) => {
-		return trimMaybeString(entry.roomId) === params.roomId;
+		return normalizeNullableString(entry.roomId) === params.roomId;
 	});
 	if (activeInRoom.length > 0) return activeInRoom[0] ?? null;
 	return activeByUser[0] ?? null;
@@ -977,7 +965,7 @@ function trackBounded(set, value) {
 	return true;
 }
 async function sendVerificationNotice(params) {
-	const roomId = trimMaybeString(params.roomId);
+	const roomId = normalizeNullableString(params.roomId);
 	if (!roomId) return;
 	try {
 		await params.client.sendMessage(roomId, {
@@ -1016,7 +1004,7 @@ function createMatrixVerificationEventRouter(params) {
 	const verificationUserRooms = /* @__PURE__ */ new Map();
 	async function resolveActiveDirectRoomId(remoteUserId) {
 		const { inspectMatrixDirectRooms } = await loadMatrixDirectRoomDeps();
-		return trimMaybeString((await inspectMatrixDirectRooms({
+		return normalizeNullableString((await inspectMatrixDirectRooms({
 			client: params.client,
 			remoteUserId
 		}).catch(() => null))?.activeRoomId);
@@ -1039,8 +1027,8 @@ function createMatrixVerificationEventRouter(params) {
 		}
 	}
 	function rememberVerificationUserRoom(remoteUserId, roomId) {
-		const normalizedUserId = trimMaybeString(remoteUserId);
-		const normalizedRoomId = trimMaybeString(roomId);
+		const normalizedUserId = normalizeNullableString(remoteUserId);
+		const normalizedRoomId = normalizeNullableString(roomId);
 		if (!normalizedUserId || !normalizedRoomId) return;
 		verificationUserRooms.delete(normalizedUserId);
 		verificationUserRooms.set(normalizedUserId, normalizedRoomId);
@@ -1050,11 +1038,11 @@ function createMatrixVerificationEventRouter(params) {
 		}
 	}
 	async function resolveSummaryRoomId(summary) {
-		const mappedRoomId = trimMaybeString(summary.roomId) ?? trimMaybeString(summary.transactionId ? verificationFlowRooms.get(summary.transactionId) : null) ?? trimMaybeString(verificationFlowRooms.get(summary.id));
+		const mappedRoomId = normalizeNullableString(summary.roomId) ?? normalizeNullableString(summary.transactionId ? verificationFlowRooms.get(summary.transactionId) : null) ?? normalizeNullableString(verificationFlowRooms.get(summary.id));
 		if (mappedRoomId) return mappedRoomId;
-		const remoteUserId = trimMaybeString(summary.otherUserId);
+		const remoteUserId = normalizeNullableString(summary.otherUserId);
 		if (!remoteUserId) return null;
-		const recentRoomId = trimMaybeString(verificationUserRooms.get(remoteUserId));
+		const recentRoomId = normalizeNullableString(verificationUserRooms.get(remoteUserId));
 		const activeRoomId = await resolveActiveDirectRoomId(remoteUserId);
 		if (recentRoomId && activeRoomId && recentRoomId === activeRoomId) return recentRoomId;
 		if (activeRoomId) return activeRoomId;
@@ -1096,7 +1084,7 @@ function createMatrixVerificationEventRouter(params) {
 		});
 	}
 	function routeVerificationEvent(roomId, event) {
-		const senderId = trimMaybeString(event?.sender);
+		const senderId = normalizeNullableString(event?.sender);
 		if (!senderId) return false;
 		const signal = readVerificationSignal(event);
 		if (!signal) return false;
@@ -1107,7 +1095,7 @@ function createMatrixVerificationEventRouter(params) {
 				return;
 			}
 			const flowId = signal.flowId;
-			const sourceFingerprint = trimMaybeString(event?.event_id) ?? `${senderId}:${event.type}:${flowId ?? "none"}`;
+			const sourceFingerprint = normalizeNullableString(event?.event_id) ?? `${senderId}:${event.type}:${flowId ?? "none"}`;
 			if (!await (await loadMatrixDirectRoomDeps()).isStrictDirectRoom({
 				client: params.client,
 				roomId,
@@ -1413,246 +1401,6 @@ function resolveMatrixAckReactionConfig(params) {
 	};
 }
 //#endregion
-//#region extensions/matrix/src/matrix/monitor/location.ts
-function decodeGeoUriParamValue(value) {
-	try {
-		return decodeURIComponent(value);
-	} catch {
-		return value;
-	}
-}
-function parseGeoUri(value) {
-	const trimmed = value.trim();
-	if (!trimmed) return null;
-	if (!normalizeLowercaseStringOrEmpty(trimmed).startsWith("geo:")) return null;
-	const [coordsPart, ...paramParts] = trimmed.slice(4).split(";");
-	if (!coordsPart) return null;
-	const coords = coordsPart.split(",");
-	if (coords.length < 2) return null;
-	const latitude = parseStrictFiniteNumber(coords[0] ?? "");
-	const longitude = parseStrictFiniteNumber(coords[1] ?? "");
-	if (latitude === void 0 || longitude === void 0) return null;
-	const params = /* @__PURE__ */ new Map();
-	for (const part of paramParts) {
-		const segment = part.trim();
-		if (!segment) continue;
-		const eqIndex = segment.indexOf("=");
-		const rawKey = eqIndex === -1 ? segment : segment.slice(0, eqIndex);
-		const rawValue = eqIndex === -1 ? "" : segment.slice(eqIndex + 1);
-		const key = normalizeLowercaseStringOrEmpty(rawKey);
-		if (!key) continue;
-		const valuePart = rawValue.trim();
-		params.set(key, valuePart ? decodeGeoUriParamValue(valuePart) : "");
-	}
-	const accuracyRaw = params.get("u");
-	return {
-		latitude,
-		longitude,
-		accuracy: accuracyRaw ? parseStrictFiniteNumber(accuracyRaw) : void 0
-	};
-}
-function resolveMatrixLocation(params) {
-	const { eventType, content } = params;
-	if (!(eventType === EventType.Location || eventType === EventType.RoomMessage && content.msgtype === EventType.Location)) return null;
-	const geoUri = normalizeOptionalString(content.geo_uri) ?? "";
-	if (!geoUri) return null;
-	const parsed = parseGeoUri(geoUri);
-	if (!parsed) return null;
-	const caption = normalizeOptionalString(content.body) ?? "";
-	const location = {
-		latitude: parsed.latitude,
-		longitude: parsed.longitude,
-		accuracy: parsed.accuracy,
-		caption: caption || void 0,
-		source: "pin",
-		isLive: false
-	};
-	return {
-		text: formatLocationText(location),
-		context: toLocationContext(location)
-	};
-}
-//#endregion
-//#region extensions/matrix/src/matrix/monitor/media.ts
-const MATRIX_MEDIA_DOWNLOAD_IDLE_TIMEOUT_MS = 3e4;
-async function fetchMatrixMediaBuffer(params) {
-	try {
-		return { buffer: await params.client.downloadContent(params.mxcUrl, {
-			maxBytes: params.maxBytes,
-			readIdleTimeoutMs: MATRIX_MEDIA_DOWNLOAD_IDLE_TIMEOUT_MS
-		}) };
-	} catch (err) {
-		if (isMatrixMediaSizeLimitError(err)) throw err;
-		throw new Error(`Matrix media download failed: ${String(err)}`, { cause: err });
-	}
-}
-/**
-* Download and decrypt encrypted media from a Matrix room.
-* Uses the Matrix crypto adapter's decryptMedia helper.
-*/
-async function fetchEncryptedMediaBuffer(params) {
-	if (!params.client.crypto) throw new Error("Cannot decrypt media: crypto not enabled");
-	const decrypted = await params.client.crypto.decryptMedia(params.file, {
-		maxBytes: params.maxBytes,
-		readIdleTimeoutMs: MATRIX_MEDIA_DOWNLOAD_IDLE_TIMEOUT_MS
-	});
-	if (decrypted.byteLength > params.maxBytes) throw new MatrixMediaSizeLimitError();
-	return { buffer: decrypted };
-}
-async function downloadMatrixMedia(params) {
-	let fetched;
-	if (typeof params.sizeBytes === "number" && params.sizeBytes > params.maxBytes) throw new MatrixMediaSizeLimitError();
-	if (params.file) fetched = await fetchEncryptedMediaBuffer({
-		client: params.client,
-		file: params.file,
-		maxBytes: params.maxBytes
-	});
-	else fetched = await fetchMatrixMediaBuffer({
-		client: params.client,
-		mxcUrl: params.mxcUrl,
-		maxBytes: params.maxBytes
-	});
-	if (!fetched) return null;
-	const headerType = params.contentType ?? void 0;
-	const saved = await getMatrixRuntime().channel.media.saveMediaBuffer(fetched.buffer, headerType, "inbound", params.maxBytes, params.originalFilename);
-	return {
-		path: saved.path,
-		contentType: saved.contentType,
-		placeholder: "[matrix media]"
-	};
-}
-//#endregion
-//#region extensions/matrix/src/matrix/monitor/mentions.ts
-const MATRIX_HTML_ENTITY_RE = /&(?:#x?[0-9a-f]+|amp|apos|gt|lt|nbsp|quot);/gi;
-function decodeVisibleHtmlEntities(value) {
-	return value.replace(MATRIX_HTML_ENTITY_RE, (entity) => {
-		const decoded = decodeHtmlEntities(entity.startsWith("&#") ? entity : entity.toLowerCase());
-		return decoded === "\xA0" ? " " : decoded;
-	});
-}
-function normalizeVisibleMentionText(value) {
-	return normalizeLowercaseStringOrEmpty(decodeVisibleHtmlEntities(value.replace(/<[^>]+>/g, " ").replace(/[\u200b-\u200f\u202a-\u202e\u2060-\u206f]/g, "")).replace(/\s+/g, " "));
-}
-function extractVisibleMentionText(value) {
-	return normalizeVisibleMentionText(value ?? "");
-}
-function resolveMatrixUserLocalpart(userId) {
-	const trimmed = userId.trim();
-	if (!trimmed.startsWith("@")) return null;
-	const colonIndex = trimmed.indexOf(":");
-	if (colonIndex <= 1) return null;
-	return trimmed.slice(1, colonIndex).trim() || null;
-}
-function resolveMatrixMentionPrefixCandidates(params) {
-	const candidates = [];
-	const seen = /* @__PURE__ */ new Set();
-	const append = (candidate) => {
-		const trimmed = candidate?.trim();
-		if (!trimmed) return;
-		const normalized = normalizeLowercaseStringOrEmpty(trimmed);
-		if (seen.has(normalized)) return;
-		seen.add(normalized);
-		candidates.push(trimmed);
-	};
-	append(params.userId);
-	const localpart = params.userId ? resolveMatrixUserLocalpart(params.userId) : null;
-	append(localpart ? `@${localpart}` : null);
-	append(params.displayName);
-	append(params.displayName ? `@${params.displayName}` : null);
-	append(params.displayName ? `@[${params.displayName}]` : null);
-	return candidates;
-}
-function stripMatchedMatrixMentionPrefix(text, pattern) {
-	const match = text.match(pattern);
-	if (!match) return null;
-	return text.slice(match[0].length).trimStart();
-}
-function stripNativeMatrixMentionPrefix(text, candidate) {
-	return stripMatchedMatrixMentionPrefix(text, new RegExp(`^\\s*${escapeRegExp(candidate)}(?:\\s*[:,])?(?:\\s+|$)`, "i"));
-}
-function stripRegexMatrixMentionPrefix(text, pattern) {
-	const flags = pattern.flags.replace(/[gy]/g, "");
-	return stripMatchedMatrixMentionPrefix(text, new RegExp(`^\\s*(?:${pattern.source})(?:\\s*[:,])?(?:\\s+|$)`, flags));
-}
-function stripMatrixMentionPrefix(params) {
-	const text = params.text;
-	if (!text) return text;
-	for (const candidate of resolveMatrixMentionPrefixCandidates(params)) {
-		const stripped = stripNativeMatrixMentionPrefix(text, candidate);
-		if (stripped !== null) return stripped;
-	}
-	for (const pattern of params.mentionRegexes ?? []) {
-		const stripped = stripRegexMatrixMentionPrefix(text, pattern);
-		if (stripped !== null) return stripped;
-	}
-	return text;
-}
-function isVisibleMentionLabel(params) {
-	const cleaned = extractVisibleMentionText(params.text);
-	if (!cleaned) return false;
-	if (params.mentionRegexes.some((pattern) => pattern.test(cleaned))) return true;
-	const localpart = resolveMatrixUserLocalpart(params.userId);
-	return [
-		extractVisibleMentionText(params.userId),
-		localpart ? extractVisibleMentionText(localpart) : null,
-		localpart ? extractVisibleMentionText(`@${localpart}`) : null,
-		params.displayName ? extractVisibleMentionText(params.displayName) : null,
-		params.displayName ? extractVisibleMentionText(`@${params.displayName}`) : null,
-		params.displayName ? extractVisibleMentionText(`@[${params.displayName}]`) : null
-	].filter((value) => Boolean(value)).includes(cleaned);
-}
-function hasVisibleRoomMention(value) {
-	const cleaned = extractVisibleMentionText(value);
-	return /(^|[^a-z0-9_])@room\b/i.test(cleaned);
-}
-/**
-* Check if formatted_body contains a matrix.to link whose visible label still
-* looks like a real mention for the given user. Do not trust href alone, since
-* senders can hide arbitrary matrix.to links behind unrelated link text.
-* Many Matrix clients (including Element) use HTML links in formatted_body instead of
-* or in addition to the m.mentions field.
-*/
-function checkFormattedBodyMention(params) {
-	if (!params.formattedBody || !params.userId) return false;
-	for (const match of params.formattedBody.matchAll(/<a\b[^>]*href=(["'])(https:\/\/matrix\.to\/#[^"']+)\1[^>]*>(.*?)<\/a>/gis)) {
-		const href = match[2];
-		const visibleLabel = match[3] ?? "";
-		if (!href) continue;
-		try {
-			const parsed = new URL(href);
-			if (decodeURIComponent(parsed.hash.replace(/^#\/?/, "").trim()) !== params.userId.trim()) continue;
-			if (isVisibleMentionLabel({
-				text: visibleLabel,
-				userId: params.userId,
-				mentionRegexes: params.mentionRegexes,
-				displayName: params.displayName
-			})) return true;
-		} catch {
-			continue;
-		}
-	}
-	return false;
-}
-function resolveMentions(params) {
-	const mentions = params.content["m.mentions"];
-	const mentionedUsers = Array.isArray(mentions?.user_ids) ? new Set(mentions.user_ids) : /* @__PURE__ */ new Set();
-	const textMentioned = getMatrixRuntime().channel.mentions.matchesMentionPatterns(params.text ?? "", params.mentionRegexes);
-	const visibleRoomMention = hasVisibleRoomMention(params.text) || hasVisibleRoomMention(params.content.formatted_body);
-	const mentionedInFormattedBody = params.userId ? checkFormattedBodyMention({
-		formattedBody: params.content.formatted_body,
-		userId: params.userId,
-		displayName: params.displayName,
-		mentionRegexes: params.mentionRegexes
-	}) : false;
-	const metadataBackedUserMention = Boolean(params.userId && mentionedUsers.has(params.userId) && (mentionedInFormattedBody || textMentioned));
-	const metadataBackedRoomMention = Boolean(mentions?.room) && visibleRoomMention;
-	const explicitMention = mentionedInFormattedBody || metadataBackedUserMention || metadataBackedRoomMention;
-	return {
-		wasMentioned: explicitMention || textMentioned || visibleRoomMention,
-		hasExplicitMention: explicitMention
-	};
-}
-//#endregion
 //#region extensions/matrix/src/matrix/monitor/preflight-audio.ts
 const MATRIX_DEFAULT_ECHO_TRANSCRIPT_FORMAT = "📝 \"{transcript}\"";
 const loadMatrixPreflightAudioRuntime = createLazyRuntimeModule(() => import("./preflight-audio.runtime-BZxxQsxY.js"));
@@ -1691,8 +1439,10 @@ async function resolveMatrixPreflightAudioTranscript(params) {
 		if (params.abortSignal?.aborted) return;
 		const transcript = await transcribeFirstAudio({
 			ctx: {
-				MediaPaths: [params.mediaPath],
-				MediaTypes: params.mediaContentType ? [params.mediaContentType] : void 0,
+				media: [{
+					path: params.mediaPath,
+					contentType: params.mediaContentType
+				}],
 				Provider: "matrix",
 				Surface: "matrix",
 				OriginatingChannel: "matrix",
@@ -1732,102 +1482,134 @@ async function sendMatrixPreflightAudioTranscriptEcho(params) {
 	}
 }
 //#endregion
-//#region extensions/matrix/src/matrix/monitor/replies.ts
-const THINKING_TAG_RE = /<\s*\/?\s*(?:think(?:ing)?|thought|antthinking)\b[^<>]*>/gi;
-const THINKING_BLOCK_RE = /<\s*(?:think(?:ing)?|thought|antthinking)\b[^<>]*>[\s\S]*?<\s*\/\s*(?:think(?:ing)?|thought|antthinking)\s*>/gi;
-function shouldSuppressReasoningReplyText(text) {
-	if (typeof text !== "string") return false;
-	const trimmedStart = text.trimStart();
-	if (!trimmedStart) return false;
-	if (normalizeLowercaseStringOrEmpty(trimmedStart).startsWith("reasoning:")) return true;
-	THINKING_TAG_RE.lastIndex = 0;
-	if (!THINKING_TAG_RE.test(text)) return false;
-	THINKING_BLOCK_RE.lastIndex = 0;
-	const withoutThinkingBlocks = text.replace(THINKING_BLOCK_RE, "");
-	THINKING_TAG_RE.lastIndex = 0;
-	return !withoutThinkingBlocks.replace(THINKING_TAG_RE, "").trim();
+//#region extensions/matrix/src/matrix/monitor/handler-helpers.ts
+const MATRIX_TOOL_PROGRESS_MAX_CHARS = 300;
+const MAX_TRACKED_SHARED_DM_CONTEXT_NOTICES = 512;
+function resolveMatrixMentionPrecheckText(params) {
+	if (params.locationText?.trim()) return params.locationText.trim();
+	if (typeof params.content.body === "string" && params.content.body.trim()) return params.content.body.trim();
+	if (isPollStartType(params.eventType)) {
+		const parsed = parsePollStartContent(params.content);
+		if (parsed) return formatPollAsText(parsed);
+	}
+	return "";
 }
-async function deliverMatrixReplies(params) {
-	const core = getMatrixRuntime();
-	const tableMode = params.tableMode ?? core.channel.text.resolveMarkdownTableMode({
-		cfg: params.cfg,
-		channel: "matrix",
-		accountId: params.accountId
+function hasBundledMatrixReplacementRelation(event) {
+	const relations = event.unsigned?.["m.relations"];
+	if (!relations || typeof relations !== "object") return false;
+	return relations[RelationType.Replace] !== void 0;
+}
+function resolveMatrixInboundBodyText(params) {
+	if (params.mediaPlaceholder) return params.rawBody || params.mediaPlaceholder;
+	if (!params.mediaDownloadFailed || !params.hadMediaUrl) return params.rawBody;
+	if (params.mediaSizeLimitExceeded) return formatMatrixMediaTooLargeText({
+		body: params.rawBody,
+		filename: params.filename,
+		msgtype: params.msgtype
 	});
-	const logVerbose = (message) => {
-		if (core.logging.shouldLogVerbose()) params.runtime.log?.(message);
-	};
-	let hasReplied = false;
-	let deliveredAny = false;
-	for (const reply of params.replies) {
-		if (reply.isReasoning === true || shouldSuppressReasoningReplyText(reply.text)) {
-			logVerbose("matrix reply suppressed as reasoning-only");
-			continue;
-		}
-		const hasMedia = Boolean(reply?.mediaUrl) || (reply?.mediaUrls?.length ?? 0) > 0;
-		if (!reply?.text && !hasMedia) {
-			if (reply?.audioAsVoice) {
-				logVerbose("matrix reply has audioAsVoice without media/text; skipping");
-				continue;
-			}
-			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 rawText = reply.text ?? "";
-		const mediaList = reply.mediaUrls?.length ? reply.mediaUrls : reply.mediaUrl ? [reply.mediaUrl] : [];
-		const shouldIncludeReply = (id) => Boolean(id) && (params.threadId || params.replyToMode === "all" || !hasReplied);
-		const replyToIdForReply = shouldIncludeReply(replyToId) ? replyToId : void 0;
-		if (mediaList.length === 0) {
-			let sentTextChunk = false;
-			const { chunks } = chunkMatrixText(rawText, {
-				cfg: params.cfg,
-				accountId: params.accountId,
-				tableMode
-			});
-			for (const chunk of chunks) {
-				const trimmed = chunk.trim();
-				if (!trimmed) continue;
-				await sendMessageMatrix(params.roomId, trimmed, {
-					client: params.client,
-					cfg: params.cfg,
-					replyToId: replyToIdForReply,
-					threadId: params.threadId,
-					accountId: params.accountId
-				});
-				deliveredAny = true;
-				sentTextChunk = true;
-			}
-			if (replyToIdForReply && !hasReplied && sentTextChunk) hasReplied = true;
-			continue;
-		}
-		let first = true;
-		for (const mediaUrl of mediaList) {
-			const caption = first ? rawText : "";
-			await sendMessageMatrix(params.roomId, caption, {
-				client: params.client,
-				cfg: params.cfg,
-				mediaUrl,
-				mediaLocalRoots: params.mediaLocalRoots,
-				replyToId: replyToIdForReply,
-				threadId: params.threadId,
-				audioAsVoice: reply.audioAsVoice,
-				accountId: params.accountId
-			});
-			deliveredAny = true;
-			first = false;
-		}
-		if (replyToIdForReply && !hasReplied) hasReplied = true;
+	return formatMatrixMediaUnavailableText({
+		body: params.rawBody,
+		filename: params.filename,
+		msgtype: params.msgtype
+	});
+}
+function markTrackedRoomIfFirst(set, roomId) {
+	if (set.has(roomId)) return false;
+	set.add(roomId);
+	if (set.size > MAX_TRACKED_SHARED_DM_CONTEXT_NOTICES) {
+		const oldest = set.keys().next().value;
+		if (typeof oldest === "string") set.delete(oldest);
 	}
-	return deliveredAny;
+	return true;
+}
+function resolveMatrixSharedDmContextNotice(params) {
+	if ((params.dmSessionScope ?? "per-user") === "per-room") return null;
+	if (params.sentRooms.has(params.roomId)) return null;
+	try {
+		const currentSession = resolveMatrixStoredSessionMeta(getSessionEntry({
+			storePath: params.storePath,
+			sessionKey: params.sessionKey
+		}));
+		if (!currentSession) return null;
+		if (currentSession.channel && currentSession.channel !== "matrix") return null;
+		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(" ");
+	} catch (err) {
+		params.logVerboseMessage(`matrix: failed checking shared DM session notice room=${params.roomId} (${String(err)})`);
+		return null;
+	}
+}
+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;
+	return formatMatrixMessageText({
+		body: resolveMatrixMessageBody({
+			body,
+			filename,
+			msgtype
+		}),
+		attachment: resolveMatrixMessageAttachment({
+			body,
+			filename,
+			msgtype
+		})
+	}) ?? "";
+}
+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
+	});
+}
+function resolveMatrixAllowBotsMode(value) {
+	if (value === true) return "all";
+	if (value === "mentions") return "mentions";
+	return "off";
+}
+function formatMatrixToolProgressMarkdownCode(text) {
+	return `\`${(text.length <= MATRIX_TOOL_PROGRESS_MAX_CHARS ? text : `${truncateUtf16Safe(text, MATRIX_TOOL_PROGRESS_MAX_CHARS - 1).trimEnd()}...`).replaceAll("`", "'")}\``;
 }
 //#endregion
-//#region extensions/matrix/src/matrix/monitor/context-summary.ts
-function trimMatrixMaybeString(value) {
-	if (typeof value !== "string") return;
-	return value.trim() || void 0;
+//#region extensions/matrix/src/matrix/monitor/handler-runtime.ts
+async function redactMatrixDraftEvent(client, roomId, draftEventId) {
+	await client.redactEvent(roomId, draftEventId).catch(() => {});
+}
+function buildMatrixFinalizedPreviewContent() {
+	return { [MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY]: true };
+}
+const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-C9Ssx-iV.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-DrK9Zua7.js"));
+const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-CIjafRr0.js"));
+async function matrixTextWouldActivateMentions(client, text) {
+	const { resolveMatrixMentionsForBody } = await loadMatrixSendModule();
+	const mentions = await resolveMatrixMentionsForBody({
+		client,
+		body: text
+	});
+	return mentions.room === true || (mentions.user_ids?.length ?? 0) > 0;
 }
+//#endregion
+//#region extensions/matrix/src/matrix/monitor/context-summary.ts
 function summarizeMatrixMessageContextEvent(event) {
 	if (isPollStartType(event.type)) {
 		const pollSummary = parsePollStartContent(event.content);
@@ -1836,14 +1618,14 @@ function summarizeMatrixMessageContextEvent(event) {
 	const content = event.content;
 	return formatMatrixMessageText({
 		body: resolveMatrixMessageBody({
-			body: trimMatrixMaybeString(content.body),
-			filename: trimMatrixMaybeString(content.filename),
-			msgtype: trimMatrixMaybeString(content.msgtype)
+			body: normalizeOptionalString(content.body),
+			filename: normalizeOptionalString(content.filename),
+			msgtype: normalizeOptionalString(content.msgtype)
 		}),
 		attachment: resolveMatrixMessageAttachment({
-			body: trimMatrixMaybeString(content.body),
-			filename: trimMatrixMaybeString(content.filename),
-			msgtype: trimMatrixMaybeString(content.msgtype)
+			body: normalizeOptionalString(content.body),
+			filename: normalizeOptionalString(content.filename),
+			msgtype: normalizeOptionalString(content.msgtype)
 		})
 	});
 }
@@ -1891,7 +1673,7 @@ function createMatrixReplyContextResolver(params) {
 		if (rawEvent.unsigned?.redacted_because) return remember(cacheKey, {});
 		const replyToBody = summarizeMatrixReplyEvent(rawEvent);
 		if (!replyToBody) return remember(cacheKey, {});
-		const senderId = trimMatrixMaybeString(rawEvent.sender);
+		const senderId = normalizeOptionalString(rawEvent.sender);
 		const senderName = senderId && await params.getMemberDisplayName(input.roomId, senderId).catch(() => void 0);
 		return remember(cacheKey, {
 			replyToBody,
@@ -1901,35 +1683,540 @@ function createMatrixReplyContextResolver(params) {
 	};
 }
 //#endregion
-//#region extensions/matrix/src/matrix/monitor/room-history.ts
-/** Maximum entries retained per room (hard cap to bound memory). */
-const DEFAULT_MAX_QUEUE_SIZE = 200;
-/** Maximum number of rooms to retain queues for (FIFO eviction beyond this). */
-const DEFAULT_MAX_ROOM_QUEUES = 1e3;
-/** Maximum number of (agentId, roomId) watermark entries to retain. */
-const MAX_WATERMARK_ENTRIES = 5e3;
-/** Maximum prepared trigger snapshots retained per room for retry reuse. */
-const MAX_PREPARED_TRIGGER_ENTRIES = 500;
-/** Maximum thread queues retained per room (FIFO eviction beyond this). */
-const MAX_THREAD_QUEUES_PER_ROOM = 200;
-function createRoomHistoryTrackerInternal(maxQueueSize = DEFAULT_MAX_QUEUE_SIZE, maxRoomQueues = DEFAULT_MAX_ROOM_QUEUES, maxWatermarkEntries = MAX_WATERMARK_ENTRIES, maxPreparedTriggerEntries = MAX_PREPARED_TRIGGER_ENTRIES) {
-	const roomQueues = /* @__PURE__ */ new Map();
-	/** Maps `{agentId, roomId, scope}` → absolute consumed-up-to index */
-	const agentWatermarks = /* @__PURE__ */ new Map();
-	let nextQueueGeneration = 1;
-	function clearRoomWatermarks(roomId) {
-		for (const key of agentWatermarks.keys()) if (JSON.parse(key)?.roomId === roomId) agentWatermarks.delete(key);
-	}
-	function clearThreadWatermarks(roomId, threadRootId) {
-		for (const key of agentWatermarks.keys()) {
-			const parsed = JSON.parse(key);
-			if (parsed?.roomId === roomId && parsed.scope === threadRootId) agentWatermarks.delete(key);
+//#region extensions/matrix/src/matrix/monitor/thread-context.ts
+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)}...`;
+}
+function summarizeMatrixThreadStarterEvent(event) {
+	const body = summarizeMatrixMessageContextEvent(event);
+	if (body) return truncateThreadStarterBody(body);
+	const content = event.content;
+	const msgtype = normalizeOptionalString(content.msgtype);
+	if (msgtype) return `Matrix ${msgtype} message`;
+	const eventType = normalizeOptionalString(event.type);
+	return eventType ? `Matrix ${eventType} event` : void 0;
+}
+function formatMatrixThreadStarterBody(params) {
+	const senderLabel = params.senderName ?? params.senderId ?? "unknown sender";
+	const lines = [`Matrix thread root ${params.threadRootId} from ${senderLabel}:`];
+	if (params.summary) lines.push(params.summary);
+	return lines.join("\n");
+}
+function createMatrixThreadContextResolver(params) {
+	const cache = /* @__PURE__ */ new Map();
+	const remember = (key, value) => {
+		cache.set(key, value);
+		if (cache.size > MAX_TRACKED_THREAD_STARTERS) {
+			const oldest = cache.keys().next().value;
+			if (typeof oldest === "string") cache.delete(oldest);
 		}
-	}
-	function createHistoryQueue() {
-		return {
-			entries: [],
-			baseIndex: 0,
+		return value;
+	};
+	return async (input) => {
+		const cacheKey = `${input.roomId}:${input.threadRootId}`;
+		const cached = cache.get(cacheKey);
+		if (cached) return cached;
+		const rootEvent = await params.client.getEvent(input.roomId, input.threadRootId).catch((err) => {
+			params.logVerboseMessage(`matrix: failed resolving thread root room=${input.roomId} id=${input.threadRootId}: ${String(err)}`);
+			return null;
+		});
+		if (!rootEvent) return { threadStarterBody: `Matrix thread root ${input.threadRootId}` };
+		const rawEvent = rootEvent;
+		const senderId = normalizeOptionalString(rawEvent.sender);
+		const senderName = senderId && await params.getMemberDisplayName(input.roomId, senderId).catch(() => void 0);
+		const senderLabel = senderName ?? senderId;
+		const summary = summarizeMatrixThreadStarterEvent(rawEvent);
+		return remember(cacheKey, {
+			threadStarterBody: formatMatrixThreadStarterBody({
+				threadRootId: input.threadRootId,
+				senderId,
+				senderName,
+				summary
+			}),
+			senderId,
+			senderLabel,
+			summary
+		});
+	};
+}
+//#endregion
+//#region extensions/matrix/src/matrix/monitor/handler-context.ts
+async function resolveMatrixInboundContext(config) {
+	const { client, core, cfg, accountId, runtime, logVerboseMessage, roomId, event, eventTs, route: _route, isDirectMessage, isRoom, effectiveRoomUsers, groupPolicy, effectiveGroupAllowFrom, contextVisibilityMode, resolveThreadContext, resolveReplyContext, threadRootId, thread, getRoomInfo, senderId, senderName, bodyText, commandBodyText, roomConfig, messageId, inboundHistory, wasMentioned, effectiveWasMentioned, shouldBypassMention, canDetectMention, shouldRequireMention, commandAuthorized, locationPayload, media, preflightAudioTranscript, historyLimit, hasExplicitSessionBinding, dmSessionScope, sharedDmContextNoticeRooms, resolveStorePath: resolveStorePathImpl, createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl, finalizeInboundContext } = config;
+	const replyToEventId = resolveMatrixReplyToEventId(event.content);
+	const threadTarget = thread.threadId;
+	const isRoomContextSenderAllowed = (contextSenderId) => {
+		if (!isRoom || !contextSenderId) return true;
+		if (effectiveRoomUsers.length > 0) return resolveMatrixAllowListMatch({
+			allowList: effectiveRoomUsers,
+			userId: contextSenderId
+		}).allowed;
+		if (groupPolicy === "allowlist" && effectiveGroupAllowFrom.length > 0) return resolveMatrixAllowListMatch({
+			allowList: effectiveGroupAllowFrom,
+			userId: contextSenderId
+		}).allowed;
+		return true;
+	};
+	const shouldIncludeRoomContextSender = (kind, contextSenderId) => evaluateSupplementalContextVisibility({
+		mode: contextVisibilityMode,
+		kind,
+		senderAllowed: isRoomContextSenderAllowed(contextSenderId)
+	}).include;
+	let threadContext = threadRootId ? await resolveThreadContext({
+		roomId,
+		threadRootId
+	}) : void 0;
+	let threadContextBlockedByPolicy = false;
+	if (threadContext?.senderId && !shouldIncludeRoomContextSender("thread", threadContext.senderId)) {
+		logVerboseMessage(`matrix: drop thread root context (mode=${contextVisibilityMode})`);
+		threadContextBlockedByPolicy = true;
+		threadContext = void 0;
+	}
+	let replyContext;
+	if (replyToEventId && replyToEventId === threadRootId && threadContext?.summary) replyContext = {
+		replyToBody: threadContext.summary,
+		replyToSender: threadContext.senderLabel,
+		replyToSenderId: threadContext.senderId
+	};
+	else if (replyToEventId && replyToEventId === threadRootId && threadContextBlockedByPolicy) replyContext = await resolveReplyContext({
+		roomId,
+		eventId: replyToEventId
+	});
+	else replyContext = replyToEventId ? await resolveReplyContext({
+		roomId,
+		eventId: replyToEventId
+	}) : void 0;
+	const replySenderAllowed = !replyContext?.replyToSenderId || isRoomContextSenderAllowed(replyContext.replyToSenderId);
+	const roomName = (isRoom ? await getRoomInfo(roomId) : void 0)?.name;
+	const envelopeFrom = isDirectMessage ? senderName : roomName ?? roomId;
+	const textWithId = `${bodyText}\n[matrix event id: ${messageId} room: ${roomId}]`;
+	const storePath = resolveStorePathImpl(cfg.session?.store, { agentId: _route.agentId });
+	const buildEnvelope = createChannelInboundEnvelopeBuilderImpl({
+		cfg,
+		route: _route
+	});
+	const sharedDmNoticeSessionKey = threadTarget ? _route.mainSessionKey || _route.sessionKey : _route.sessionKey;
+	const sharedDmContextNotice = isDirectMessage ? hasExplicitSessionBinding ? null : resolveMatrixSharedDmContextNotice({
+		storePath,
+		sessionKey: sharedDmNoticeSessionKey,
+		roomId,
+		accountId: _route.accountId,
+		dmSessionScope,
+		sentRooms: sharedDmContextNoticeRooms,
+		logVerboseMessage
+	}) : null;
+	const body = buildEnvelope({
+		channel: "Matrix",
+		from: envelopeFrom,
+		timestamp: eventTs ?? void 0,
+		body: textWithId
+	});
+	const groupSystemPrompt = normalizeOptionalString(roomConfig?.systemPrompt);
+	const quoteHidden = Boolean(replyContext && !evaluateSupplementalContextVisibility({
+		mode: contextVisibilityMode,
+		kind: "quote",
+		senderAllowed: replySenderAllowed
+	}).include);
+	const ctxPayload = buildChannelInboundEventContext({
+		channel: "matrix",
+		contextVisibility: contextVisibilityMode,
+		finalize: finalizeInboundContext,
+		supplemental: {
+			quote: replyContext ? {
+				id: threadTarget ? void 0 : replyToEventId ?? void 0,
+				body: replyContext.replyToBody,
+				sender: replyContext.replyToSender,
+				senderAllowed: replySenderAllowed
+			} : void 0,
+			thread: {
+				starterBody: threadContext?.threadStarterBody,
+				senderAllowed: threadContext ? true : void 0
+			},
+			groupSystemPrompt: isRoom ? groupSystemPrompt : void 0
+		},
+		media: toInboundMediaFacts(media ? [{
+			path: media.path,
+			url: media.path,
+			contentType: media.contentType,
+			transcribed: preflightAudioTranscript !== void 0
+		}] : void 0),
+		messageId,
+		timestamp: eventTs ?? void 0,
+		from: isDirectMessage ? `matrix:${senderId}` : `matrix:channel:${roomId}`,
+		sender: {
+			id: senderId,
+			name: senderName,
+			username: senderId.split(":")[0]?.replace(/^@/, "")
+		},
+		conversation: {
+			kind: isDirectMessage ? "direct" : "channel",
+			id: roomId,
+			label: envelopeFrom,
+			nativeChannelId: roomId,
+			threadId: threadTarget
+		},
+		route: {
+			agentId: _route.agentId,
+			dmScope: _route.dmScope,
+			accountId: _route.accountId,
+			routeSessionKey: _route.sessionKey
+		},
+		reply: {
+			to: `room:${roomId}`,
+			replyToId: threadTarget ? void 0 : replyToEventId ?? void 0,
+			messageThreadId: threadTarget,
+			nativeChannelId: roomId
+		},
+		message: {
+			body,
+			rawBody: bodyText,
+			commandBody: commandBodyText,
+			bodyForAgent: bodyText,
+			inboundHistory: inboundHistory && inboundHistory.length > 0 ? inboundHistory : void 0
+		},
+		sessionTranscript: { historyLimit: isRoom ? historyLimit : 0 },
+		access: {
+			...isRoom ? { mentions: {
+				canDetectMention: true,
+				wasMentioned,
+				requireMention: shouldRequireMention
+			} } : {},
+			commands: { authorized: commandAuthorized }
+		},
+		extra: {
+			GroupSubject: isRoom ? roomName ?? roomId : void 0,
+			GroupId: isRoom ? roomId : void 0,
+			GroupChannel: isRoom ? roomId : void 0,
+			...locationPayload?.context,
+			CommandSource: "text",
+			NativeDirectUserId: isDirectMessage ? senderId : void 0
+		}
+	});
+	if (quoteHidden) logVerboseMessage(`matrix: drop reply context (mode=${contextVisibilityMode})`);
+	logVerboseMessage(`matrix inbound: room=${roomId} from=${senderId} preview="${truncateUtf16Safe(bodyText, 200).replace(/\n/g, "\\n")}"`);
+	const replyTarget = ctxPayload.To;
+	if (!replyTarget) {
+		runtime.error?.("matrix: missing reply target");
+		return null;
+	}
+	const { ackReaction, ackReactionScope: ackScope } = resolveMatrixAckReactionConfig({
+		cfg,
+		agentId: _route.agentId,
+		accountId
+	});
+	const shouldAckReaction = () => Boolean(ackReaction && core.channel.reactions.shouldAckReaction({
+		scope: ackScope,
+		isDirect: isDirectMessage,
+		isGroup: isRoom,
+		isMentionableGroup: isRoom,
+		requireMention: shouldRequireMention,
+		canDetectMention,
+		effectiveWasMentioned,
+		shouldBypassMention
+	}));
+	if (shouldAckReaction() && messageId) loadMatrixSendModule().then(({ reactMatrixMessage }) => reactMatrixMessage(roomId, messageId, ackReaction, client)).catch((err) => {
+		logVerboseMessage(`matrix react failed for room ${roomId}: ${String(err)}`);
+	});
+	if (messageId) loadMatrixSendModule().then(({ sendReadReceiptMatrix }) => sendReadReceiptMatrix(roomId, messageId, client)).catch((err) => {
+		logVerboseMessage(`matrix: read receipt failed room=${roomId} id=${messageId}: ${String(err)}`);
+	});
+	return {
+		replyToEventId,
+		threadTarget,
+		storePath,
+		ctxPayload,
+		replyTarget,
+		sharedDmContextNotice
+	};
+}
+//#endregion
+//#region extensions/matrix/src/matrix/monitor/handler-draft-controller.ts
+async function createMatrixDraftController(params) {
+	const { streaming, previewToolProgressEnabled, replyToMode, messageId, threadTarget, accountConfig, cfg, accountId, roomId, client, logVerboseMessage } = params;
+	let draftConsumed = false;
+	const draftStreamingEnabled = streaming !== "off";
+	const quietDraftStreaming = streaming === "quiet" || streaming === "progress";
+	const progressDraftStreaming = streaming === "progress";
+	const draftReplyToId = replyToMode !== "off" && !threadTarget ? messageId : void 0;
+	const draftStream = draftStreamingEnabled ? await loadMatrixDraftStream().then(({ createMatrixDraftStream }) => createMatrixDraftStream({
+		roomId,
+		client,
+		cfg,
+		mode: quietDraftStreaming ? "quiet" : "partial",
+		threadId: threadTarget,
+		replyToId: draftReplyToId,
+		preserveReplyId: replyToMode === "all",
+		accountId,
+		log: logVerboseMessage
+	})) : void 0;
+	const shouldStreamPreviewToolProgress = Boolean(draftStream) && previewToolProgressEnabled;
+	const shouldSuppressDefaultToolProgressMessages = Boolean(draftStream) && (shouldStreamPreviewToolProgress || params.streaming === "progress");
+	let currentDraftMessageGeneration = 0;
+	let currentDraftBlockOffset = 0;
+	let latestDraftFullText = "";
+	const pendingDraftBoundaries = [];
+	const latestQueuedDraftBoundaryOffsets = /* @__PURE__ */ new Map();
+	let currentDraftReplyToId = draftReplyToId;
+	let previewToolProgressSuppressed = false;
+	let previewToolProgressLines = [];
+	let latestPlan;
+	let latestPlanExplanation;
+	const progressConfigEntry = accountConfig ?? cfg.channels?.matrix;
+	const progressSeed = `${accountId}:${roomId}`;
+	const renderProgressDraft = () => {
+		if (!draftStream) return;
+		const previewText = formatChannelProgressDraftText({
+			entry: progressConfigEntry,
+			lines: previewToolProgressLines,
+			seed: progressSeed,
+			formatLine: formatMatrixToolProgressMarkdownCode,
+			bullet: "-",
+			narration: latestPlanExplanation,
+			plan: latestPlan
+		});
+		if (!previewText) return;
+		draftStream.update(previewText);
+	};
+	const progressDraftGate = createChannelProgressDraftGate({ onStart: renderProgressDraft });
+	const pushPreviewToolProgress = async (line, options) => {
+		if (!draftStream) return;
+		if (options?.toolName !== void 0 && !isChannelProgressDraftWorkToolName(options.toolName)) return;
+		const normalized = normalizeChannelProgressDraftLineIdentity(line);
+		const progressLine = typeof line === "object" && line !== void 0 ? line : normalized;
+		if (!progressDraftStreaming) {
+			if (!shouldStreamPreviewToolProgress || previewToolProgressSuppressed || !normalized) return;
+			const nextLines = mergeChannelProgressDraftLine(previewToolProgressLines, progressLine, { maxLines: resolveChannelProgressDraftMaxLines(progressConfigEntry) });
+			if (nextLines === previewToolProgressLines) return;
+			previewToolProgressLines = nextLines;
+			draftStream.update(formatChannelProgressDraftText({
+				entry: progressConfigEntry,
+				lines: previewToolProgressLines,
+				seed: progressSeed,
+				formatLine: formatMatrixToolProgressMarkdownCode,
+				bullet: "-",
+				narration: latestPlanExplanation,
+				plan: latestPlan
+			}));
+			return;
+		}
+		if (shouldStreamPreviewToolProgress && !previewToolProgressSuppressed && normalized) previewToolProgressLines = mergeChannelProgressDraftLine(previewToolProgressLines, progressLine, { maxLines: resolveChannelProgressDraftMaxLines(progressConfigEntry) });
+		const alreadyStarted = progressDraftGate.hasStarted;
+		const progressActive = await progressDraftGate.noteWork();
+		if ((alreadyStarted || progressActive) && progressDraftGate.hasStarted) renderProgressDraft();
+	};
+	const pushPlanProgress = async (steps, explanation) => {
+		latestPlan = steps?.length ? steps.map((entry) => ({ ...entry })) : void 0;
+		latestPlanExplanation = explanation?.replace(/\s+/g, " ").trim() || void 0;
+		if (!draftStream || previewToolProgressSuppressed) return;
+		if (!progressDraftStreaming) {
+			renderProgressDraft();
+			return;
+		}
+		const alreadyStarted = progressDraftGate.hasStarted;
+		await progressDraftGate.startNow();
+		if (alreadyStarted && progressDraftGate.hasStarted) renderProgressDraft();
+	};
+	const suppressPreviewToolProgressForAnswerText = (text) => {
+		if (!text?.trim()) return;
+		previewToolProgressSuppressed = true;
+		previewToolProgressLines = [];
+		latestPlan = void 0;
+		latestPlanExplanation = void 0;
+	};
+	const resetPreviewToolProgress = () => {
+		previewToolProgressSuppressed = false;
+		previewToolProgressLines = [];
+		latestPlan = void 0;
+		latestPlanExplanation = void 0;
+	};
+	const buildPreviewToolProgressReplyOptions = () => {
+		if (!shouldSuppressDefaultToolProgressMessages) return {};
+		const options = { suppressDefaultToolProgressMessages: true };
+		if (!shouldStreamPreviewToolProgress) return options;
+		return {
+			...options,
+			onToolStart: async (payload) => {
+				const toolName = payload.name?.trim();
+				await pushPreviewToolProgress(buildChannelProgressDraftLineForEntry(progressConfigEntry, {
+					event: "tool",
+					itemId: payload.itemId,
+					toolCallId: payload.toolCallId,
+					name: toolName,
+					phase: payload.phase,
+					args: payload.args
+				}, payload.detailMode ? { detailMode: payload.detailMode } : void 0), { toolName });
+			},
+			onItemEvent: async (payload) => {
+				await pushPreviewToolProgress(buildChannelProgressDraftLineForEntry(progressConfigEntry, {
+					event: "item",
+					itemId: payload.itemId,
+					toolCallId: payload.toolCallId,
+					itemKind: payload.kind,
+					title: payload.title,
+					name: payload.name,
+					phase: payload.phase,
+					status: payload.status,
+					summary: payload.summary,
+					progressText: payload.progressText,
+					meta: payload.meta
+				}));
+			},
+			onPlanUpdate: async (payload) => {
+				if (payload.phase !== "update") return;
+				await pushPlanProgress(payload.steps, payload.explanation);
+			},
+			onApprovalEvent: async (payload) => {
+				if (payload.phase !== "requested") return;
+				await pushPreviewToolProgress(formatChannelProgressDraftLine({
+					event: "approval",
+					phase: payload.phase,
+					title: payload.title,
+					command: payload.command,
+					reason: payload.reason,
+					message: payload.message
+				}));
+			},
+			onCommandOutput: async (payload) => {
+				if (payload.phase !== "end") return;
+				await pushPreviewToolProgress(buildChannelProgressDraftLineForEntry(progressConfigEntry, {
+					event: "command-output",
+					itemId: payload.itemId,
+					toolCallId: payload.toolCallId,
+					phase: payload.phase,
+					title: payload.title,
+					name: payload.name,
+					status: payload.status,
+					exitCode: payload.exitCode
+				}));
+			},
+			onPatchSummary: async (payload) => {
+				if (payload.phase !== "end") return;
+				await pushPreviewToolProgress(buildChannelProgressDraftLineForEntry(progressConfigEntry, {
+					event: "patch",
+					itemId: payload.itemId,
+					toolCallId: payload.toolCallId,
+					phase: payload.phase,
+					title: payload.title,
+					name: payload.name,
+					added: payload.added,
+					modified: payload.modified,
+					deleted: payload.deleted,
+					summary: payload.summary
+				}));
+			}
+		};
+	};
+	const getDisplayableDraftText = () => {
+		const nextDraftBoundaryOffset = pendingDraftBoundaries.find((boundary) => boundary.messageGeneration === currentDraftMessageGeneration)?.endOffset;
+		if (nextDraftBoundaryOffset === void 0) return latestDraftFullText.slice(currentDraftBlockOffset);
+		return latestDraftFullText.slice(currentDraftBlockOffset, nextDraftBoundaryOffset);
+	};
+	const updateDraftFromLatestFullText = () => {
+		const blockText = getDisplayableDraftText();
+		if (blockText) draftStream?.update(blockText);
+	};
+	const queueDraftBlockBoundary = (payload, context) => {
+		const payloadTextLength = payload.text?.length ?? 0;
+		const messageGeneration = context?.assistantMessageIndex ?? currentDraftMessageGeneration;
+		const nextDraftBoundaryOffset = (latestQueuedDraftBoundaryOffsets.get(messageGeneration) ?? 0) + payloadTextLength;
+		latestQueuedDraftBoundaryOffsets.set(messageGeneration, nextDraftBoundaryOffset);
+		pendingDraftBoundaries.push({
+			messageGeneration,
+			endOffset: nextDraftBoundaryOffset
+		});
+	};
+	const advanceDraftBlockBoundary = (options) => {
+		const completedBoundary = pendingDraftBoundaries.shift();
+		if (completedBoundary) {
+			if (!pendingDraftBoundaries.some((entry) => entry.messageGeneration === completedBoundary.messageGeneration)) latestQueuedDraftBoundaryOffsets.delete(completedBoundary.messageGeneration);
+			if (completedBoundary.messageGeneration === currentDraftMessageGeneration) currentDraftBlockOffset = completedBoundary.endOffset;
+			return;
+		}
+		if (options?.fallbackToLatestEnd) currentDraftBlockOffset = latestDraftFullText.length;
+	};
+	const resetDraftBlockOffsets = () => {
+		currentDraftMessageGeneration += 1;
+		currentDraftBlockOffset = 0;
+		latestDraftFullText = "";
+	};
+	const resetDraftDeliveryState = async () => {
+		await draftStream?.discardPending();
+		draftStream?.reset();
+		draftConsumed = false;
+		currentDraftMessageGeneration = 0;
+		currentDraftBlockOffset = 0;
+		latestDraftFullText = "";
+		pendingDraftBoundaries.length = 0;
+		latestQueuedDraftBoundaryOffsets.clear();
+		currentDraftReplyToId = draftReplyToId;
+		progressDraftGate.reset();
+		resetPreviewToolProgress();
+	};
+	return {
+		draftStream,
+		progressDraftGate,
+		buildPreviewToolProgressReplyOptions,
+		queueDraftBlockBoundary,
+		advanceDraftBlockBoundary,
+		resetDraftBlockOffsets,
+		resetPreviewToolProgress,
+		resetDraftDeliveryState,
+		updateDraftFromLatestFullText,
+		isDraftConsumed: () => draftConsumed,
+		markDraftConsumed: () => {
+			draftConsumed = true;
+		},
+		clearDraftConsumed: () => {
+			draftConsumed = false;
+		},
+		currentReplyToId: () => currentDraftReplyToId,
+		setCurrentReplyToId: (replyToId) => {
+			currentDraftReplyToId = replyToId;
+		},
+		resetReplyToIdForNextBlock: () => {
+			currentDraftReplyToId = replyToMode === "all" ? draftReplyToId : void 0;
+		},
+		onPartialReply: (text) => {
+			if (progressDraftStreaming) return;
+			latestDraftFullText = text;
+			suppressPreviewToolProgressForAnswerText(text);
+			updateDraftFromLatestFullText();
+		}
+	};
+}
+//#endregion
+//#region extensions/matrix/src/matrix/monitor/room-history.ts
+/** Maximum entries retained per room (hard cap to bound memory). */
+const DEFAULT_MAX_QUEUE_SIZE = 200;
+/** Maximum number of rooms to retain queues for (FIFO eviction beyond this). */
+const DEFAULT_MAX_ROOM_QUEUES = 1e3;
+/** Maximum number of (agentId, roomId) watermark entries to retain. */
+const MAX_WATERMARK_ENTRIES = 5e3;
+/** Maximum prepared trigger snapshots retained per room for retry reuse. */
+const MAX_PREPARED_TRIGGER_ENTRIES = 500;
+/** Maximum thread queues retained per room (FIFO eviction beyond this). */
+const MAX_THREAD_QUEUES_PER_ROOM = 200;
+function createRoomHistoryTrackerInternal(maxQueueSize = DEFAULT_MAX_QUEUE_SIZE, maxRoomQueues = DEFAULT_MAX_ROOM_QUEUES, maxWatermarkEntries = MAX_WATERMARK_ENTRIES, maxPreparedTriggerEntries = MAX_PREPARED_TRIGGER_ENTRIES) {
+	const roomQueues = /* @__PURE__ */ new Map();
+	/** Maps `{agentId, roomId, scope}` → absolute consumed-up-to index */
+	const agentWatermarks = /* @__PURE__ */ new Map();
+	let nextQueueGeneration = 1;
+	function clearRoomWatermarks(roomId) {
+		for (const key of agentWatermarks.keys()) if (JSON.parse(key)?.roomId === roomId) agentWatermarks.delete(key);
+	}
+	function clearThreadWatermarks(roomId, threadRootId) {
+		for (const key of agentWatermarks.keys()) {
+			const parsed = JSON.parse(key);
+			if (parsed?.roomId === roomId && parsed.scope === threadRootId) agentWatermarks.delete(key);
+		}
+	}
+	function createHistoryQueue() {
+		return {
+			entries: [],
+			baseIndex: 0,
 			generation: nextQueueGeneration++,
 			preparedTriggers: /* @__PURE__ */ new Map()
 		};
@@ -2141,200 +2428,1124 @@ function createRoomHistoryTracker(maxQueueSize = DEFAULT_MAX_QUEUE_SIZE, maxRoom
 	};
 }
 //#endregion
-//#region extensions/matrix/src/matrix/monitor/thread-context.ts
-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)}...`;
+//#region extensions/matrix/src/matrix/monitor/handler-ingress-access.ts
+async function resolveMatrixIngressAccess(config) {
+	const { handler, params: paramsLocal, roomId, event, eventTs, senderId, isReactionEvent, readStoreAllowFrom, shouldSendPairingReply, resolveLiveAccountAllowlists, roomHistoryTracker, commitInboundEventIfClaimed } = config;
+	const { core, cfg, accountId, accountConfig, client, logVerboseMessage, groupPolicy, dmEnabled, dmPolicy, dmThreadReplies, threadReplies, roomsConfig, accountAllowBots, configuredBotUserIds, needsRoomAliasesForConfig, getRoomInfo, getMemberDisplayName } = handler;
+	const content = paramsLocal.content;
+	const isDirectMessage = paramsLocal.isDirectMessage;
+	const isRoom = !isDirectMessage;
+	const { audioPreflightMode, locationPayload, reservedHistorySlot, selfUserId } = paramsLocal;
+	const messageId = event.event_id ?? "";
+	const threadRootId = resolveMatrixThreadRootId({
+		event,
+		content
+	});
+	const thread = resolveMatrixThreadRouting({
+		isDirectMessage,
+		threadReplies,
+		dmThreadReplies,
+		messageId,
+		threadRootId
+	});
+	const historyThreadId = threadRootId ? thread.threadId : void 0;
+	let reservedHistorySlotConsumed = false;
+	const discardReservedHistorySlot = () => {
+		if (reservedHistorySlot && !reservedHistorySlotConsumed) {
+			roomHistoryTracker.discardPending(roomId, reservedHistorySlot, historyThreadId);
+			reservedHistorySlotConsumed = true;
+		}
+	};
+	const markReservedHistorySlotConsumed = () => {
+		reservedHistorySlotConsumed = true;
+	};
+	const commitInboundEventIfClaimedAndDiscardReserved = async () => {
+		discardReservedHistorySlot();
+		await commitInboundEventIfClaimed();
+	};
+	if (isRoom && groupPolicy === "disabled") {
+		await commitInboundEventIfClaimedAndDiscardReserved();
+		return;
+	}
+	const roomInfoForConfig = isRoom && needsRoomAliasesForConfig ? await getRoomInfo(roomId, { includeAliases: true }) : void 0;
+	const roomAliasesForConfig = roomInfoForConfig ? [roomInfoForConfig.canonicalAlias ?? "", ...roomInfoForConfig.altAliases].filter(Boolean) : [];
+	const roomConfigInfo = isRoom ? resolveMatrixRoomConfig({
+		rooms: roomsConfig,
+		roomId,
+		aliases: roomAliasesForConfig
+	}) : void 0;
+	const roomConfig = roomConfigInfo?.config;
+	const allowBotsMode = resolveMatrixAllowBotsMode(roomConfig?.allowBots ?? accountAllowBots);
+	const isConfiguredBotSender = configuredBotUserIds.has(senderId);
+	const roomMatchMeta = roomConfigInfo ? `matchKey=${roomConfigInfo.matchKey ?? "none"} matchSource=${roomConfigInfo.matchSource ?? "none"}` : "matchKey=none matchSource=none";
+	if (isConfiguredBotSender && allowBotsMode === "off") {
+		logVerboseMessage(`matrix: drop configured bot sender=${senderId} (allowBots=false${isDirectMessage ? "" : `, ${roomMatchMeta}`})`);
+		await commitInboundEventIfClaimedAndDiscardReserved();
+		return;
+	}
+	const botLoopProtection = isConfiguredBotSender && senderId !== selfUserId ? {
+		scopeId: accountId,
+		conversationId: roomId,
+		senderId,
+		receiverId: selfUserId,
+		config: mergePairLoopGuardConfig(accountConfig?.botLoopProtection, roomConfig?.botLoopProtection),
+		defaultsConfig: cfg.channels?.defaults?.botLoopProtection,
+		defaultEnabled: true,
+		nowMs: eventTs ?? void 0
+	} : void 0;
+	if (isRoom && roomConfig && !roomConfigInfo?.allowed) {
+		logVerboseMessage(`matrix: room disabled room=${roomId} (${roomMatchMeta})`);
+		await commitInboundEventIfClaimedAndDiscardReserved();
+		return;
+	}
+	if (isRoom && groupPolicy === "allowlist") {
+		if (!roomConfigInfo?.allowlistConfigured) {
+			logVerboseMessage(`matrix: drop room message (no allowlist, ${roomMatchMeta})`);
+			await commitInboundEventIfClaimedAndDiscardReserved();
+			return;
+		}
+		if (!roomConfig) {
+			logVerboseMessage(`matrix: drop room message (not in allowlist, ${roomMatchMeta})`);
+			await commitInboundEventIfClaimedAndDiscardReserved();
+			return;
+		}
+	}
+	let senderNamePromise = null;
+	const getSenderName = async () => {
+		senderNamePromise ??= getMemberDisplayName(roomId, senderId).catch(() => senderId);
+		return await senderNamePromise;
+	};
+	const storeAllowFrom = isDirectMessage && dmPolicy !== "allowlist" && dmPolicy !== "open" ? await readStoreAllowFrom() : [];
+	const roomUsers = roomConfig?.users ?? [];
+	const { liveDmAllowFrom, liveGroupAllowFrom } = await resolveLiveAccountAllowlists();
+	const accessState = await resolveMatrixMonitorAccessState({
+		allowFrom: liveDmAllowFrom,
+		storeAllowFrom,
+		dmPolicy,
+		groupPolicy,
+		groupAllowFrom: liveGroupAllowFrom,
+		roomUsers,
+		senderId,
+		isRoom,
+		accountId,
+		eventKind: isReactionEvent ? "reaction" : "message"
+	});
+	const { effectiveGroupAllowFrom, effectiveRoomUsers, messageIngress } = accessState;
+	const ingressDecision = messageIngress.ingress;
+	if (isDirectMessage) {
+		if (!dmEnabled || dmPolicy === "disabled") {
+			await commitInboundEventIfClaimedAndDiscardReserved();
+			return;
+		}
+		const senderReason = messageIngress.senderAccess.reasonCode;
+		if (ingressDecision.decision !== "allow") {
+			if (ingressDecision.admission === "pairing-required") {
+				const senderName = await getSenderName();
+				const { code, created } = await core.channel.pairing.upsertPairingRequest({
+					channel: "matrix",
+					id: senderId,
+					accountId,
+					meta: { name: senderName }
+				});
+				if (shouldSendPairingReply(senderId, created)) {
+					const pairingReply = core.channel.pairing.buildPairingReply({
+						channel: "matrix",
+						idLine: `Your Matrix user id: ${senderId}`,
+						code
+					});
+					logVerboseMessage(created ? `matrix pairing request sender=${senderId} name=${senderName ?? "unknown"} (reason=${senderReason})` : `matrix pairing reminder sender=${senderId} name=${senderName ?? "unknown"} (reason=${senderReason})`);
+					try {
+						const { sendMessageMatrix } = await loadMatrixSendModule();
+						await sendMessageMatrix(`room:${roomId}`, created ? pairingReply : `${pairingReply}\n\nPairing request is still pending approval. Reusing existing code.`, {
+							client,
+							cfg,
+							accountId
+						});
+						await commitInboundEventIfClaimed();
+					} catch (err) {
+						logVerboseMessage(`matrix pairing reply failed for ${senderId}: ${String(err)}`);
+						discardReservedHistorySlot();
+						return;
+					}
+				} else {
+					logVerboseMessage(`matrix pairing reminder suppressed sender=${senderId} (cooldown)`);
+					await commitInboundEventIfClaimedAndDiscardReserved();
+				}
+			}
+			if (isReactionEvent || dmPolicy !== "pairing") {
+				logVerboseMessage(`matrix: blocked ${isReactionEvent ? "reaction" : "dm"} sender ${senderId} (dmPolicy=${dmPolicy}, reason=${senderReason})`);
+				await commitInboundEventIfClaimedAndDiscardReserved();
+			}
+			return;
+		}
+	}
+	if (isRoom && ingressDecision.decision !== "allow") {
+		logVerboseMessage(`matrix: blocked sender ${senderId} (ingress=${ingressDecision.reasonCode}, ${roomMatchMeta})`);
+		await commitInboundEventIfClaimedAndDiscardReserved();
+		return;
+	}
+	if (isRoom) logVerboseMessage(`matrix: allow room ${roomId} (${roomMatchMeta})`);
+	if (isReactionEvent) {
+		const senderName = await getSenderName();
+		const { handleInboundMatrixReaction } = await loadMatrixReactionEvents();
+		await handleInboundMatrixReaction({
+			client,
+			core,
+			cfg,
+			accountId,
+			roomId,
+			event,
+			senderId,
+			senderLabel: senderName,
+			selfUserId,
+			isDirectMessage,
+			logVerboseMessage
+		});
+		await commitInboundEventIfClaimedAndDiscardReserved();
+		return;
+	}
+	return {
+		content,
+		messageId,
+		audioPreflightMode,
+		isDirectMessage,
+		isRoom,
+		locationPayload,
+		reservedHistorySlot,
+		threadRootId,
+		thread,
+		historyThreadId,
+		discardReservedHistorySlot,
+		markReservedHistorySlotConsumed,
+		commitInboundEventIfClaimedAndDiscardReserved,
+		roomConfig,
+		allowBotsMode,
+		isConfiguredBotSender,
+		selfUserId,
+		botLoopProtection,
+		roomMatchMeta,
+		getSenderName,
+		accessState,
+		effectiveGroupAllowFrom,
+		effectiveRoomUsers
+	};
 }
-function summarizeMatrixThreadStarterEvent(event) {
-	const body = summarizeMatrixMessageContextEvent(event);
-	if (body) return truncateThreadStarterBody(body);
-	const content = event.content;
-	const msgtype = trimMatrixMaybeString(content.msgtype);
-	if (msgtype) return `Matrix ${msgtype} message`;
-	const eventType = trimMatrixMaybeString(event.type);
-	return eventType ? `Matrix ${eventType} event` : void 0;
+//#endregion
+//#region extensions/matrix/src/matrix/monitor/media.ts
+const MATRIX_MEDIA_DOWNLOAD_IDLE_TIMEOUT_MS = 3e4;
+async function fetchMatrixMediaBuffer(params) {
+	try {
+		return { buffer: await params.client.downloadContent(params.mxcUrl, {
+			maxBytes: params.maxBytes,
+			readIdleTimeoutMs: MATRIX_MEDIA_DOWNLOAD_IDLE_TIMEOUT_MS
+		}) };
+	} catch (err) {
+		if (isMatrixMediaSizeLimitError(err)) throw err;
+		throw new Error(`Matrix media download failed: ${String(err)}`, { cause: err });
+	}
 }
-function formatMatrixThreadStarterBody(params) {
-	const senderLabel = params.senderName ?? params.senderId ?? "unknown sender";
-	const lines = [`Matrix thread root ${params.threadRootId} from ${senderLabel}:`];
-	if (params.summary) lines.push(params.summary);
-	return lines.join("\n");
+/**
+* Download and decrypt encrypted media from a Matrix room.
+* Uses the Matrix crypto adapter's decryptMedia helper.
+*/
+async function fetchEncryptedMediaBuffer(params) {
+	if (!params.client.crypto) throw new Error("Cannot decrypt media: crypto not enabled");
+	const decrypted = await params.client.crypto.decryptMedia(params.file, {
+		maxBytes: params.maxBytes,
+		readIdleTimeoutMs: MATRIX_MEDIA_DOWNLOAD_IDLE_TIMEOUT_MS
+	});
+	if (decrypted.byteLength > params.maxBytes) throw new MatrixMediaSizeLimitError();
+	return { buffer: decrypted };
 }
-function createMatrixThreadContextResolver(params) {
-	const cache = /* @__PURE__ */ new Map();
-	const remember = (key, value) => {
-		cache.set(key, value);
-		if (cache.size > MAX_TRACKED_THREAD_STARTERS) {
-			const oldest = cache.keys().next().value;
-			if (typeof oldest === "string") cache.delete(oldest);
-		}
-		return value;
+async function downloadMatrixMedia(params) {
+	let fetched;
+	if (typeof params.sizeBytes === "number" && params.sizeBytes > params.maxBytes) throw new MatrixMediaSizeLimitError();
+	if (params.file) fetched = await fetchEncryptedMediaBuffer({
+		client: params.client,
+		file: params.file,
+		maxBytes: params.maxBytes
+	});
+	else fetched = await fetchMatrixMediaBuffer({
+		client: params.client,
+		mxcUrl: params.mxcUrl,
+		maxBytes: params.maxBytes
+	});
+	if (!fetched) return null;
+	const headerType = params.contentType ?? void 0;
+	const saved = await getMatrixRuntime().channel.media.saveMediaBuffer(fetched.buffer, headerType, "inbound", params.maxBytes, params.originalFilename);
+	return {
+		path: saved.path,
+		contentType: saved.contentType,
+		placeholder: "[matrix media]"
+	};
+}
+//#endregion
+//#region extensions/matrix/src/matrix/monitor/mentions.ts
+const MATRIX_HTML_ENTITY_RE = /&(?:#x?[0-9a-f]+|amp|apos|gt|lt|nbsp|quot);/gi;
+function decodeVisibleHtmlEntities(value) {
+	return value.replace(MATRIX_HTML_ENTITY_RE, (entity) => {
+		const decoded = decodeHtmlEntities(entity.startsWith("&#") ? entity : entity.toLowerCase());
+		return decoded === "\xA0" ? " " : decoded;
+	});
+}
+function normalizeVisibleMentionText(value) {
+	return normalizeLowercaseStringOrEmpty(decodeVisibleHtmlEntities(value.replace(/<[^>]+>/g, " ").replace(/[\u200b-\u200f\u202a-\u202e\u2060-\u206f]/g, "")).replace(/\s+/g, " "));
+}
+function extractVisibleMentionText(value) {
+	return normalizeVisibleMentionText(value ?? "");
+}
+function resolveMatrixUserLocalpart(userId) {
+	const trimmed = userId.trim();
+	if (!trimmed.startsWith("@")) return null;
+	const colonIndex = trimmed.indexOf(":");
+	if (colonIndex <= 1) return null;
+	return trimmed.slice(1, colonIndex).trim() || null;
+}
+function resolveMatrixMentionPrefixCandidates(params) {
+	const candidates = [];
+	const seen = /* @__PURE__ */ new Set();
+	const append = (candidate) => {
+		const trimmed = candidate?.trim();
+		if (!trimmed) return;
+		const normalized = normalizeLowercaseStringOrEmpty(trimmed);
+		if (seen.has(normalized)) return;
+		seen.add(normalized);
+		candidates.push(trimmed);
+	};
+	append(params.userId);
+	const localpart = params.userId ? resolveMatrixUserLocalpart(params.userId) : null;
+	append(localpart ? `@${localpart}` : null);
+	append(params.displayName);
+	append(params.displayName ? `@${params.displayName}` : null);
+	append(params.displayName ? `@[${params.displayName}]` : null);
+	return candidates;
+}
+function stripMatchedMatrixMentionPrefix(text, pattern) {
+	const match = text.match(pattern);
+	if (!match) return null;
+	return text.slice(match[0].length).trimStart();
+}
+function stripNativeMatrixMentionPrefix(text, candidate) {
+	return stripMatchedMatrixMentionPrefix(text, new RegExp(`^\\s*${escapeRegExp(candidate)}(?:\\s*[:,])?(?:\\s+|$)`, "i"));
+}
+function stripRegexMatrixMentionPrefix(text, pattern) {
+	const flags = pattern.flags.replace(/[gy]/g, "");
+	return stripMatchedMatrixMentionPrefix(text, new RegExp(`^\\s*(?:${pattern.source})(?:\\s*[:,])?(?:\\s+|$)`, flags));
+}
+function stripMatrixMentionPrefix(params) {
+	const text = params.text;
+	if (!text) return text;
+	for (const candidate of resolveMatrixMentionPrefixCandidates(params)) {
+		const stripped = stripNativeMatrixMentionPrefix(text, candidate);
+		if (stripped !== null) return stripped;
+	}
+	for (const pattern of params.mentionRegexes ?? []) {
+		const stripped = stripRegexMatrixMentionPrefix(text, pattern);
+		if (stripped !== null) return stripped;
+	}
+	return text;
+}
+function isVisibleMentionLabel(params) {
+	const cleaned = extractVisibleMentionText(params.text);
+	if (!cleaned) return false;
+	if (params.mentionRegexes.some((pattern) => pattern.test(cleaned))) return true;
+	const localpart = resolveMatrixUserLocalpart(params.userId);
+	return [
+		extractVisibleMentionText(params.userId),
+		localpart ? extractVisibleMentionText(localpart) : null,
+		localpart ? extractVisibleMentionText(`@${localpart}`) : null,
+		params.displayName ? extractVisibleMentionText(params.displayName) : null,
+		params.displayName ? extractVisibleMentionText(`@${params.displayName}`) : null,
+		params.displayName ? extractVisibleMentionText(`@[${params.displayName}]`) : null
+	].filter((value) => Boolean(value)).includes(cleaned);
+}
+function hasVisibleRoomMention(value) {
+	const cleaned = extractVisibleMentionText(value);
+	return /(^|[^a-z0-9_])@room\b/i.test(cleaned);
+}
+/**
+* Check if formatted_body contains a matrix.to link whose visible label still
+* looks like a real mention for the given user. Do not trust href alone, since
+* senders can hide arbitrary matrix.to links behind unrelated link text.
+* Many Matrix clients (including Element) use HTML links in formatted_body instead of
+* or in addition to the m.mentions field.
+*/
+function checkFormattedBodyMention(params) {
+	if (!params.formattedBody || !params.userId) return false;
+	for (const match of params.formattedBody.matchAll(/<a\b[^>]*href=(["'])(https:\/\/matrix\.to\/#[^"']+)\1[^>]*>(.*?)<\/a>/gis)) {
+		const href = match[2];
+		const visibleLabel = match[3] ?? "";
+		if (!href) continue;
+		try {
+			const parsed = new URL(href);
+			if (decodeURIComponent(parsed.hash.replace(/^#\/?/, "").trim()) !== params.userId.trim()) continue;
+			if (isVisibleMentionLabel({
+				text: visibleLabel,
+				userId: params.userId,
+				mentionRegexes: params.mentionRegexes,
+				displayName: params.displayName
+			})) return true;
+		} catch {
+			continue;
+		}
+	}
+	return false;
+}
+function resolveMentions(params) {
+	const mentions = params.content["m.mentions"];
+	const mentionedUsers = Array.isArray(mentions?.user_ids) ? new Set(mentions.user_ids) : /* @__PURE__ */ new Set();
+	const textMentioned = getMatrixRuntime().channel.mentions.matchesMentionPatterns(params.text ?? "", params.mentionRegexes);
+	const visibleRoomMention = hasVisibleRoomMention(params.text) || hasVisibleRoomMention(params.content.formatted_body);
+	const mentionedInFormattedBody = params.userId ? checkFormattedBodyMention({
+		formattedBody: params.content.formatted_body,
+		userId: params.userId,
+		displayName: params.displayName,
+		mentionRegexes: params.mentionRegexes
+	}) : false;
+	const metadataBackedUserMention = Boolean(params.userId && mentionedUsers.has(params.userId) && (mentionedInFormattedBody || textMentioned));
+	const metadataBackedRoomMention = Boolean(mentions?.room) && visibleRoomMention;
+	const explicitMention = mentionedInFormattedBody || metadataBackedUserMention || metadataBackedRoomMention;
+	return {
+		wasMentioned: explicitMention || textMentioned || visibleRoomMention,
+		hasExplicitMention: explicitMention
+	};
+}
+//#endregion
+//#region extensions/matrix/src/matrix/monitor/handler-ingress-content.ts
+async function resolveMatrixIngressContent(config) {
+	const { handler, params: paramsLocal, access, roomId, event, eventType, isPollEvent, eventTs, senderId, roomHistoryTracker, commitInboundEventIfClaimed } = config;
+	const { client, core, cfg, accountId, accountConfig, logger, logVerboseMessage, historyLimit, mediaMaxBytes, dmSessionScope, getMemberDisplayName } = handler;
+	const { content: accessContent, messageId, audioPreflightMode, isDirectMessage, isRoom, locationPayload, reservedHistorySlot, threadRootId, thread, historyThreadId, discardReservedHistorySlot, markReservedHistorySlotConsumed, commitInboundEventIfClaimedAndDiscardReserved, roomConfig, allowBotsMode, isConfiguredBotSender, selfUserId, botLoopProtection, roomMatchMeta, getSenderName, accessState, effectiveGroupAllowFrom, effectiveRoomUsers } = access;
+	let content = accessContent;
+	let pollSnapshotPromise = null;
+	const getPollSnapshot = async () => {
+		if (!isPollEvent) return null;
+		pollSnapshotPromise ??= fetchMatrixPollSnapshot(client, roomId, event).catch((err) => {
+			logVerboseMessage(`matrix: failed resolving poll snapshot room=${roomId} id=${event.event_id ?? "unknown"}: ${String(err)}`);
+			return null;
+		});
+		return await pollSnapshotPromise;
+	};
+	const mentionPrecheckText = resolveMatrixMentionPrecheckText({
+		eventType,
+		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;
+	const pendingHistoryText = resolveMatrixPendingHistoryText({
+		mentionPrecheckText,
+		content,
+		mediaUrl
+	});
+	const pendingHistoryPollText = !pendingHistoryText && isPollEvent && historyLimit > 0 ? (await getPollSnapshot())?.text : "";
+	if (!mentionPrecheckText && !mediaUrl && !isPollEvent) {
+		await commitInboundEventIfClaimedAndDiscardReserved();
+		return;
+	}
+	let preflightMedia = null;
+	let preflightMediaDownloadFailed = false;
+	let preflightMediaSizeLimitExceeded = false;
+	let preflightAudioTranscript;
+	const { route: _route, configuredBinding: _configuredBinding, runtimeBindingId: _runtimeBindingId } = resolveMatrixInboundRoute({
+		cfg,
+		accountId,
+		roomId,
+		senderId,
+		isDirectMessage,
+		dmSessionScope,
+		threadId: thread.threadId,
+		eventTs: eventTs ?? void 0,
+		resolveAgentRoute: core.channel.routing.resolveAgentRoute
+	});
+	const hasExplicitSessionBinding = _configuredBinding !== null || _runtimeBindingId !== null;
+	const preflightAudioMediaUrl = mediaUrl?.startsWith("mxc://") ? mediaUrl : void 0;
+	const shouldRunMatrixAudioPreflight = isMatrixAudioContent({
+		msgtype: typeof content.msgtype === "string" ? content.msgtype : void 0,
+		mimetype: earlyContentType
+	}) && isMatrixAudioMediaEnabled(cfg) && preflightAudioMediaUrl !== void 0;
+	if (shouldRunMatrixAudioPreflight && audioPreflightMode === "defer" && isRoom && historyLimit > 0 && !reservedHistorySlot) {
+		const reserved = roomHistoryTracker.reservePending(_route.agentId, roomId, {
+			sender: senderId,
+			body: pendingHistoryText,
+			timestamp: eventTs ?? void 0,
+			messageId
+		}, historyThreadId);
+		return { deferredPrefix: {
+			...paramsLocal,
+			audioPreflightMode: "run",
+			reservedHistorySlot: reserved
+		} };
+	}
+	if (shouldRunMatrixAudioPreflight) {
+		try {
+			preflightMedia = await downloadMatrixMedia({
+				client,
+				mxcUrl: preflightAudioMediaUrl,
+				contentType: earlyContentType,
+				sizeBytes: earlyContentSize,
+				maxBytes: mediaMaxBytes,
+				file: contentFile,
+				originalFilename: earlyOriginalFilename
+			});
+		} catch (err) {
+			preflightMediaDownloadFailed = true;
+			if (isMatrixMediaSizeLimitError(err)) preflightMediaSizeLimitExceeded = true;
+			const errorText = formatMatrixErrorMessage(err);
+			logVerboseMessage(`matrix: media download failed room=${roomId} id=${event.event_id ?? "unknown"} type=${content.msgtype} error=${errorText}`);
+			logger.warn("matrix media download failed", {
+				roomId,
+				eventId: event.event_id,
+				msgtype: content.msgtype,
+				encrypted: Boolean(contentFile),
+				error: errorText
+			});
+		}
+		if (preflightMedia) preflightAudioTranscript = await resolveMatrixPreflightAudioTranscript({
+			mediaPath: preflightMedia.path,
+			mediaContentType: preflightMedia.contentType,
+			cfg,
+			accountId,
+			chatType: isDirectMessage ? "direct" : "channel",
+			originatingTo: `room:${roomId}`,
+			messageThreadId: thread.threadId,
+			sessionKey: _route.sessionKey
+		});
+	}
+	const agentMentionRegexes = core.channel.mentions.buildMentionRegexes(cfg, _route.agentId, {
+		provider: "matrix",
+		conversationId: roomId,
+		providerPolicy: accountConfig?.mentionPatterns
+	});
+	const selfDisplayName = content.formatted_body ? await getMemberDisplayName(roomId, selfUserId).catch(() => void 0) : void 0;
+	const mentionPrecheckTextWithTranscript = preflightAudioTranscript ? [mentionPrecheckText, preflightAudioTranscript].filter(Boolean).join("\n").trim() : mentionPrecheckText;
+	const { wasMentioned, hasExplicitMention } = resolveMentions({
+		content,
+		userId: selfUserId,
+		displayName: selfDisplayName,
+		text: mentionPrecheckTextWithTranscript,
+		mentionRegexes: agentMentionRegexes
+	});
+	if (isConfiguredBotSender && allowBotsMode === "mentions" && !isDirectMessage && !wasMentioned) {
+		logVerboseMessage(`matrix: drop configured bot sender=${senderId} (allowBots=mentions, missing mention, ${roomMatchMeta})`);
+		await commitInboundEventIfClaimedAndDiscardReserved();
+		return;
+	}
+	const allowTextCommands = core.channel.commands.shouldHandleTextCommands({
+		cfg,
+		surface: "matrix"
+	});
+	const useAccessGroups = true;
+	const commandCheckText = stripMatrixMentionPrefix({
+		text: mentionPrecheckText,
+		userId: selfUserId,
+		displayName: selfDisplayName,
+		mentionRegexes: agentMentionRegexes
+	});
+	const hasControlCommandInMessage = core.channel.text.hasControlCommand(commandCheckText, cfg);
+	const commandAccess = await resolveMatrixMonitorCommandAccess(accessState, {
+		useAccessGroups,
+		allowTextCommands,
+		hasControlCommand: hasControlCommandInMessage
+	});
+	const commandAuthorized = commandAccess.authorized;
+	if (isRoom && commandAccess.shouldBlockControlCommand) {
+		logInboundDrop({
+			log: logVerboseMessage,
+			channel: "matrix",
+			reason: "control command (unauthorized)",
+			target: senderId
+		});
+		await commitInboundEventIfClaimedAndDiscardReserved();
+		return;
+	}
+	const shouldRequireMention = isRoom ? roomConfig?.autoReply === true ? false : roomConfig?.autoReply === false ? true : typeof roomConfig?.requireMention === "boolean" ? roomConfig?.requireMention : true : false;
+	const mentionDecision = resolveInboundMentionDecision({
+		facts: {
+			canDetectMention: true,
+			wasMentioned,
+			hasAnyMention: hasExplicitMention
+		},
+		policy: {
+			isGroup: isRoom,
+			requireMention: shouldRequireMention,
+			allowTextCommands,
+			hasControlCommand: hasControlCommandInMessage,
+			commandAuthorized
+		}
+	});
+	const { effectiveWasMentioned, shouldBypassMention } = mentionDecision;
+	const canDetectMention = agentMentionRegexes.length > 0 || hasExplicitMention;
+	if (mentionDecision.shouldSkip) {
+		const pendingHistoryBody = preflightAudioTranscript ? formatMatrixAudioTranscript(preflightAudioTranscript) : pendingHistoryText || pendingHistoryPollText;
+		if (historyLimit > 0 && pendingHistoryBody) {
+			const pendingEntry = {
+				sender: senderId,
+				body: pendingHistoryBody,
+				timestamp: eventTs ?? void 0,
+				messageId
+			};
+			if (reservedHistorySlot) {
+				roomHistoryTracker.finalizePending(roomId, reservedHistorySlot, pendingEntry, historyThreadId);
+				markReservedHistorySlotConsumed();
+			} else roomHistoryTracker.recordPending(roomId, pendingEntry, historyThreadId);
+		}
+		logger.info("skipping room message", {
+			roomId,
+			reason: "no-mention"
+		});
+		await commitInboundEventIfClaimed();
+		return;
+	}
+	if (preflightAudioTranscript) await sendMatrixPreflightAudioTranscriptEcho({
+		transcript: preflightAudioTranscript,
+		cfg,
+		accountId,
+		originatingTo: `room:${roomId}`,
+		messageThreadId: thread.threadId
+	});
+	if (isPollEvent) {
+		const pollSnapshot = await getPollSnapshot();
+		if (!pollSnapshot) {
+			discardReservedHistorySlot();
+			return;
+		}
+		content = {
+			msgtype: "m.text",
+			body: pollSnapshot.text
+		};
+	}
+	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;
+	if (!media && !mediaDownloadFailed && finalMediaUrl?.startsWith("mxc://")) try {
+		media = await downloadMatrixMedia({
+			client,
+			mxcUrl: finalMediaUrl,
+			contentType,
+			sizeBytes: contentSize,
+			maxBytes: mediaMaxBytes,
+			file: finalContentFile,
+			originalFilename
+		});
+	} catch (err) {
+		mediaDownloadFailed = true;
+		if (isMatrixMediaSizeLimitError(err)) mediaSizeLimitExceeded = true;
+		const errorText = formatMatrixErrorMessage(err);
+		logVerboseMessage(`matrix: media download failed room=${roomId} id=${event.event_id ?? "unknown"} type=${content.msgtype} error=${errorText}`);
+		logger.warn("matrix media download failed", {
+			roomId,
+			eventId: event.event_id,
+			msgtype: content.msgtype,
+			encrypted: Boolean(finalContentFile),
+			error: errorText
+		});
+	}
+	let bodyText = resolveMatrixInboundBodyText({
+		rawBody: locationPayload?.text ?? contentBody,
+		filename: typeof content.filename === "string" ? content.filename : void 0,
+		mediaPlaceholder: media?.placeholder,
+		msgtype: content.msgtype,
+		hadMediaUrl: Boolean(finalMediaUrl),
+		mediaDownloadFailed,
+		mediaSizeLimitExceeded
+	});
+	if (preflightMedia && bodyText && bodyText !== preflightMedia.placeholder && isLikelyBareFilename(bodyText)) bodyText = preflightMedia.placeholder;
+	if (preflightAudioTranscript) {
+		const transcriptBody = formatMatrixAudioTranscript(preflightAudioTranscript);
+		bodyText = !bodyText || bodyText === media?.placeholder ? transcriptBody : `${bodyText}\n${transcriptBody}`;
+	}
+	if (!bodyText) {
+		await commitInboundEventIfClaimedAndDiscardReserved();
+		return;
+	}
+	const commandBodyText = hasControlCommandInMessage ? commandCheckText : bodyText;
+	const senderName = await getSenderName();
+	if (_configuredBinding) {
+		const { ensureConfiguredAcpBindingReady } = await loadAcpBindingRuntime();
+		if (!(await ensureConfiguredAcpBindingReady({
+			cfg,
+			configuredBinding: _configuredBinding
+		})).ok) {
+			logInboundDrop({
+				log: logVerboseMessage,
+				channel: "matrix",
+				reason: "configured ACP binding unavailable",
+				target: _configuredBinding.spec.conversationId
+			});
+			discardReservedHistorySlot();
+			return;
+		}
+	}
+	if (_runtimeBindingId) {
+		const { getSessionBindingService } = await loadSessionBindingRuntime();
+		getSessionBindingService().touch(_runtimeBindingId, eventTs ?? void 0);
+	}
+	const preparedTrigger = isRoom && historyLimit > 0 ? reservedHistorySlot ? roomHistoryTracker.prepareReservedTrigger(_route.agentId, roomId, historyLimit, reservedHistorySlot, {
+		sender: senderName,
+		body: bodyText,
+		timestamp: eventTs ?? void 0,
+		messageId
+	}, historyThreadId) : roomHistoryTracker.prepareTrigger(_route.agentId, roomId, historyLimit, {
+		sender: senderName,
+		body: bodyText,
+		timestamp: eventTs ?? void 0,
+		messageId
+	}, historyThreadId) : void 0;
+	if (reservedHistorySlot && preparedTrigger) markReservedHistorySlotConsumed();
+	return {
+		route: _route,
+		hasExplicitSessionBinding,
+		roomConfig,
+		isDirectMessage,
+		isRoom,
+		shouldRequireMention,
+		wasMentioned,
+		effectiveWasMentioned,
+		shouldBypassMention,
+		canDetectMention,
+		commandAuthorized,
+		inboundHistory: preparedTrigger ? buildInboundHistoryFromEntries({
+			entries: preparedTrigger.history,
+			limit: historyLimit
+		}) : void 0,
+		senderName,
+		bodyText,
+		commandBodyText,
+		media,
+		preflightAudioTranscript,
+		locationPayload,
+		messageId,
+		triggerSnapshot: preparedTrigger,
+		threadRootId,
+		thread,
+		botLoopProtection,
+		effectiveGroupAllowFrom,
+		effectiveRoomUsers
+	};
+}
+//#endregion
+//#region extensions/matrix/src/matrix/monitor/location.ts
+function decodeGeoUriParamValue(value) {
+	try {
+		return decodeURIComponent(value);
+	} catch {
+		return value;
+	}
+}
+function parseGeoUri(value) {
+	const trimmed = value.trim();
+	if (!trimmed) return null;
+	if (!normalizeLowercaseStringOrEmpty(trimmed).startsWith("geo:")) return null;
+	const [coordsPart, ...paramParts] = trimmed.slice(4).split(";");
+	if (!coordsPart) return null;
+	const coords = coordsPart.split(",");
+	if (coords.length < 2) return null;
+	const latitude = parseStrictFiniteNumber(coords[0] ?? "");
+	const longitude = parseStrictFiniteNumber(coords[1] ?? "");
+	if (latitude === void 0 || longitude === void 0) return null;
+	const params = /* @__PURE__ */ new Map();
+	for (const part of paramParts) {
+		const segment = part.trim();
+		if (!segment) continue;
+		const eqIndex = segment.indexOf("=");
+		const rawKey = eqIndex === -1 ? segment : segment.slice(0, eqIndex);
+		const rawValue = eqIndex === -1 ? "" : segment.slice(eqIndex + 1);
+		const key = normalizeLowercaseStringOrEmpty(rawKey);
+		if (!key) continue;
+		const valuePart = rawValue.trim();
+		params.set(key, valuePart ? decodeGeoUriParamValue(valuePart) : "");
+	}
+	const accuracyRaw = params.get("u");
+	return {
+		latitude,
+		longitude,
+		accuracy: accuracyRaw ? parseStrictFiniteNumber(accuracyRaw) : void 0
+	};
+}
+function resolveMatrixLocation(params) {
+	const { eventType, content } = params;
+	if (!(eventType === EventType.Location || eventType === EventType.RoomMessage && content.msgtype === EventType.Location)) return null;
+	const geoUri = normalizeOptionalString(content.geo_uri) ?? "";
+	if (!geoUri) return null;
+	const parsed = parseGeoUri(geoUri);
+	if (!parsed) return null;
+	const caption = normalizeOptionalString(content.body) ?? "";
+	const location = {
+		latitude: parsed.latitude,
+		longitude: parsed.longitude,
+		accuracy: parsed.accuracy,
+		caption: caption || void 0,
+		source: "pin",
+		isLive: false
+	};
+	return {
+		text: formatLocationText(location),
+		context: toLocationContext(location)
+	};
+}
+//#endregion
+//#region extensions/matrix/src/matrix/monitor/handler-ingress-prefix.ts
+async function readMatrixIngressPrefix(config) {
+	const { client, senderId, dropPreStartupMessages, eventTs, eventAge, startupMs, startupGraceMs, event, eventType, eventId, inboundDeduper, roomId, logVerboseMessage, directTracker, claimInboundReplay } = config;
+	const selfUserId = await client.getUserId();
+	if (senderId === selfUserId) return;
+	if (dropPreStartupMessages) {
+		if (typeof eventTs === "number" && eventTs < startupMs - startupGraceMs) return;
+		if (typeof eventTs !== "number" && typeof eventAge === "number" && eventAge > startupGraceMs) return;
+	}
+	const content = event.content;
+	if (eventType === EventType.RoomMessage && isMatrixVerificationRoomMessage({
+		msgtype: content.msgtype,
+		body: content.body
+	})) {
+		logVerboseMessage(`matrix: skip verification/system room message room=${roomId}`);
+		return;
+	}
+	const locationPayload = resolveMatrixLocation({
+		eventType,
+		content
+	});
+	const relates = content["m.relates_to"];
+	if (relates && "rel_type" in relates && relates.rel_type === RelationType.Replace) return;
+	if (hasBundledMatrixReplacementRelation(event)) return;
+	if (eventId && inboundDeduper) {
+		const claim = await inboundDeduper.claim({
+			roomId,
+			eventId
+		});
+		if (claim.kind === "claimed") claimInboundReplay(claim.handle);
+		else if (claim.kind !== "invalid") {
+			logVerboseMessage(`matrix: skip duplicate inbound event room=${roomId} id=${eventId}`);
+			return;
+		}
+	}
+	return {
+		content,
+		isDirectMessage: await directTracker.isDirectMessage({
+			roomId,
+			senderId,
+			selfUserId
+		}),
+		locationPayload,
+		selfUserId
+	};
+}
+//#endregion
+//#region extensions/matrix/src/matrix/monitor/replies.ts
+const THINKING_TAG_RE = /<\s*\/?\s*(?:think(?:ing)?|thought|antthinking)\b[^<>]*>/gi;
+const THINKING_BLOCK_RE = /<\s*(?:think(?:ing)?|thought|antthinking)\b[^<>]*>[\s\S]*?<\s*\/\s*(?:think(?:ing)?|thought|antthinking)\s*>/gi;
+function shouldSuppressReasoningReplyText(text) {
+	if (typeof text !== "string") return false;
+	const trimmedStart = text.trimStart();
+	if (!trimmedStart) return false;
+	if (normalizeLowercaseStringOrEmpty(trimmedStart).startsWith("reasoning:")) return true;
+	THINKING_TAG_RE.lastIndex = 0;
+	if (!THINKING_TAG_RE.test(text)) return false;
+	THINKING_BLOCK_RE.lastIndex = 0;
+	const withoutThinkingBlocks = text.replace(THINKING_BLOCK_RE, "");
+	THINKING_TAG_RE.lastIndex = 0;
+	return !withoutThinkingBlocks.replace(THINKING_TAG_RE, "").trim();
+}
+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);
+	};
+	let hasReplied = false;
+	let deliveredAny = false;
+	for (const reply of params.replies) {
+		if (reply.isReasoning === true || shouldSuppressReasoningReplyText(reply.text)) {
+			logVerbose("matrix reply suppressed as reasoning-only");
+			continue;
+		}
+		const hasMedia = Boolean(reply?.mediaUrl) || (reply?.mediaUrls?.length ?? 0) > 0;
+		if (!reply?.text && !hasMedia) {
+			if (reply?.audioAsVoice) {
+				logVerbose("matrix reply has audioAsVoice without media/text; skipping");
+				continue;
+			}
+			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 rawText = reply.text ?? "";
+		const mediaList = reply.mediaUrls?.length ? reply.mediaUrls : reply.mediaUrl ? [reply.mediaUrl] : [];
+		const shouldIncludeReply = (id) => Boolean(id) && (params.threadId || params.replyToMode === "all" || !hasReplied);
+		const replyToIdForReply = shouldIncludeReply(replyToId) ? replyToId : void 0;
+		if (mediaList.length === 0) {
+			let sentTextChunk = false;
+			const { chunks } = chunkMatrixText(rawText, {
+				cfg: params.cfg,
+				accountId: params.accountId,
+				tableMode
+			});
+			for (const chunk of chunks) {
+				const trimmed = chunk.trim();
+				if (!trimmed) continue;
+				await sendMessageMatrix(params.roomId, trimmed, {
+					client: params.client,
+					cfg: params.cfg,
+					replyToId: replyToIdForReply,
+					threadId: params.threadId,
+					accountId: params.accountId
+				});
+				deliveredAny = true;
+				sentTextChunk = true;
+			}
+			if (replyToIdForReply && !hasReplied && sentTextChunk) hasReplied = true;
+			continue;
+		}
+		let first = true;
+		for (const mediaUrl of mediaList) {
+			const caption = first ? rawText : "";
+			await sendMessageMatrix(params.roomId, caption, {
+				client: params.client,
+				cfg: params.cfg,
+				mediaUrl,
+				mediaLocalRoots: params.mediaLocalRoots,
+				replyToId: replyToIdForReply,
+				threadId: params.threadId,
+				audioAsVoice: reply.audioAsVoice,
+				accountId: params.accountId
+			});
+			deliveredAny = true;
+			first = false;
+		}
+		if (replyToIdForReply && !hasReplied) hasReplied = true;
+	}
+	return deliveredAny;
+}
+//#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 quietDraftStreaming = streaming === "quiet" || streaming === "progress";
+	let finalReplyDeliveryFailed = false;
+	let nonFinalReplyDeliveryFailed = false;
+	const { deliver: deliverReply, onError: onReplyError, ...turnDispatcherOptions } = {
+		...prefixOptions,
+		humanDelay,
+		deliver: async (payload, info) => {
+			if (draftStream && info.kind !== "tool" && !payload.isCompactionNotice) {
+				const hasMedia = Boolean(payload.mediaUrl) || (payload.mediaUrls?.length ?? 0) > 0;
+				const ttsSupplement = getReplyPayloadTtsSupplement(payload);
+				const fallbackPayload = ttsSupplement && ttsSupplement.visibleTextAlreadyDelivered !== true && !payload.text?.trim() ? {
+					...payload,
+					text: ttsSupplement.spokenText
+				} : payload;
+				if (draftController.isDraftConsumed()) {
+					await draftStream.discardPending();
+					await deliverMatrixReplies({
+						cfg,
+						replies: [fallbackPayload],
+						roomId,
+						client,
+						runtime,
+						textLimit,
+						replyToMode,
+						threadId: threadTarget,
+						replyToId: threadTarget ?? replyToEventId ?? void 0,
+						accountId,
+						mediaLocalRoots,
+						tableMode
+					});
+					return;
+				}
+				const payloadReplyToId = normalizeOptionalString(payload.replyToId);
+				const payloadReplyMismatch = replyToMode !== "off" && !threadTarget && payloadReplyToId !== draftController.currentReplyToId();
+				let mustDeliverFinalNormally = draftStream.mustDeliverFinalNormally();
+				if (Boolean(payload.text?.trim()) && !payload.isError && !payloadReplyMismatch && !mustDeliverFinalNormally) {
+					await draftStream.stop();
+					mustDeliverFinalNormally = draftStream.mustDeliverFinalNormally();
+				} else await draftStream.discardPending();
+				const draftEventId = draftStream.eventId();
+				const draftFinalTextNeedsNormalMentionDelivery = Boolean(draftEventId) && typeof payload.text === "string" && Boolean(payload.text.trim()) && !payload.isError && !payloadReplyMismatch && !mustDeliverFinalNormally && await matrixTextWouldActivateMentions(client, payload.text);
+				if (draftEventId && payload.text && !payload.isError && !hasMedia && !payloadReplyMismatch && !mustDeliverFinalNormally && !draftFinalTextNeedsNormalMentionDelivery) {
+					const finalPreviewText = payload.text;
+					await deliverWithFinalizableLivePreviewAdapter({
+						kind: "final",
+						payload,
+						adapter: defineFinalizableLivePreviewAdapter({
+							draft: {
+								flush: async () => {},
+								clear: async () => {},
+								discardPending: async () => {},
+								id: () => draftEventId
+							},
+							buildFinalEdit: () => ({
+								text: finalPreviewText,
+								finalizeLive: !(quietDraftStreaming || !draftStream.matchesPreparedText(finalPreviewText)),
+								...quietDraftStreaming ? { extraContent: buildMatrixFinalizedPreviewContent() } : {}
+							}),
+							editFinal: async (_draftEventId, edit) => {
+								if (edit.finalizeLive) {
+									if (!await draftStream.finalizeLive()) throw new Error("Matrix draft live finalize failed");
+									return;
+								}
+								const { editMessageMatrix } = await loadMatrixSendModule();
+								await editMessageMatrix(roomId, _draftEventId, edit.text, {
+									client,
+									cfg,
+									threadId: threadTarget,
+									accountId,
+									extraContent: edit.extraContent
+								});
+							},
+							createPreviewReceipt: (id) => createPreviewMessageReceipt({
+								id,
+								...threadTarget ? { threadId: threadTarget } : {},
+								...draftController.currentReplyToId() ? { replyToId: draftController.currentReplyToId() } : {}
+							}),
+							logPreviewEditFailure: (err) => {
+								logVerboseMessage(`matrix: preview final edit failed: ${String(err)}`);
+							}
+						}),
+						deliverNormally: async () => {
+							await redactMatrixDraftEvent(client, roomId, draftEventId);
+							await deliverMatrixReplies({
+								cfg,
+								replies: [fallbackPayload],
+								roomId,
+								client,
+								runtime,
+								textLimit,
+								replyToMode,
+								threadId: threadTarget,
+								replyToId: threadTarget ?? replyToEventId ?? void 0,
+								accountId,
+								mediaLocalRoots,
+								tableMode
+							});
+						}
+					});
+					draftController.markDraftConsumed();
+				} else if (draftEventId && hasMedia && !payloadReplyMismatch) {
+					let textEditOk = !mustDeliverFinalNormally;
+					const payloadText = payload.text ?? ttsSupplement?.spokenText;
+					const payloadTextMatchesDraft = typeof payloadText === "string" && draftStream.matchesPreparedText(payloadText);
+					const reusesDraftTextUnchanged = typeof payloadText === "string" && Boolean(payloadText.trim()) && payloadTextMatchesDraft;
+					const mediaTextNeedsNormalMentionDelivery = typeof payloadText === "string" && Boolean(payloadText.trim()) && await matrixTextWouldActivateMentions(client, payloadText);
+					const requiresFinalTextEdit = quietDraftStreaming || typeof payloadText === "string" && !payloadTextMatchesDraft;
+					if (textEditOk && mediaTextNeedsNormalMentionDelivery) textEditOk = false;
+					else if (textEditOk && payloadText && requiresFinalTextEdit) {
+						const { editMessageMatrix } = await loadMatrixSendModule();
+						textEditOk = await editMessageMatrix(roomId, draftEventId, payloadText, {
+							client,
+							cfg,
+							threadId: threadTarget,
+							accountId,
+							extraContent: quietDraftStreaming ? buildMatrixFinalizedPreviewContent() : void 0
+						}).then(() => true, () => false);
+					} else if (textEditOk && reusesDraftTextUnchanged) textEditOk = await draftStream.finalizeLive();
+					const reusesDraftAsFinalText = Boolean(payloadText?.trim()) && textEditOk;
+					if (!reusesDraftAsFinalText) await redactMatrixDraftEvent(client, roomId, draftEventId);
+					const mediaPayload = ttsSupplement && reusesDraftAsFinalText ? buildTtsSupplementMediaPayload(payload) : {
+						...payload,
+						text: reusesDraftAsFinalText ? void 0 : payload.text ?? (ttsSupplement?.visibleTextAlreadyDelivered === true ? void 0 : ttsSupplement?.spokenText)
+					};
+					await deliverMatrixReplies({
+						cfg,
+						replies: [mediaPayload],
+						roomId,
+						client,
+						runtime,
+						textLimit,
+						replyToMode,
+						threadId: threadTarget,
+						replyToId: threadTarget ?? replyToEventId ?? void 0,
+						accountId,
+						mediaLocalRoots,
+						tableMode
+					});
+					draftController.markDraftConsumed();
+				} else {
+					const draftRedacted = Boolean(draftEventId) && (payload.isError || payloadReplyMismatch || mustDeliverFinalNormally || draftFinalTextNeedsNormalMentionDelivery);
+					if (draftRedacted && draftEventId) await redactMatrixDraftEvent(client, roomId, draftEventId);
+					const deliveredFallback = await deliverMatrixReplies({
+						cfg,
+						replies: [fallbackPayload],
+						roomId,
+						client,
+						runtime,
+						textLimit,
+						replyToMode,
+						threadId: threadTarget,
+						replyToId: threadTarget ?? replyToEventId ?? void 0,
+						accountId,
+						mediaLocalRoots,
+						tableMode
+					});
+					if (draftRedacted || deliveredFallback) draftController.markDraftConsumed();
+				}
+				if (info.kind === "block") {
+					draftController.clearDraftConsumed();
+					draftController.advanceDraftBlockBoundary({ fallbackToLatestEnd: true });
+					draftStream.reset();
+					draftController.resetReplyToIdForNextBlock();
+					draftController.updateDraftFromLatestFullText();
+					const { sendTypingMatrix } = await loadMatrixSendModule();
+					await sendTypingMatrix(roomId, true, void 0, client).catch(() => {});
+				}
+			} else await deliverMatrixReplies({
+				cfg,
+				replies: [payload],
+				roomId,
+				client,
+				runtime,
+				textLimit,
+				replyToMode,
+				threadId: threadTarget,
+				replyToId: threadTarget ?? replyToEventId ?? void 0,
+				accountId,
+				mediaLocalRoots,
+				tableMode
+			});
+		},
+		onError: (err, info) => {
+			if (info.kind === "final") finalReplyDeliveryFailed = true;
+			else nonFinalReplyDeliveryFailed = true;
+			if (info.kind === "block") draftController.advanceDraftBlockBoundary({ fallbackToLatestEnd: true });
+			runtime.error?.(`matrix ${info.kind} reply failed: ${String(err)}`);
+		},
+		onReplyStart: typingCallbacks.onReplyStart,
+		onIdle: typingCallbacks.onIdle
 	};
-	return async (input) => {
-		const cacheKey = `${input.roomId}:${input.threadRootId}`;
-		const cached = cache.get(cacheKey);
-		if (cached) return cached;
-		const rootEvent = await params.client.getEvent(input.roomId, input.threadRootId).catch((err) => {
-			params.logVerboseMessage(`matrix: failed resolving thread root room=${input.roomId} id=${input.threadRootId}: ${String(err)}`);
-			return null;
-		});
-		if (!rootEvent) return { threadStarterBody: `Matrix thread root ${input.threadRootId}` };
-		const rawEvent = rootEvent;
-		const senderId = trimMatrixMaybeString(rawEvent.sender);
-		const senderName = senderId && await params.getMemberDisplayName(input.roomId, senderId).catch(() => void 0);
-		const senderLabel = senderName ?? senderId;
-		const summary = summarizeMatrixThreadStarterEvent(rawEvent);
-		return remember(cacheKey, {
-			threadStarterBody: formatMatrixThreadStarterBody({
-				threadRootId: input.threadRootId,
-				senderId,
-				senderName,
-				summary
-			}),
-			senderId,
-			senderLabel,
-			summary
-		});
+	return {
+		deliverReply,
+		onReplyError,
+		turnDispatcherOptions,
+		finalReplyDeliveryFailed: () => finalReplyDeliveryFailed,
+		nonFinalReplyDeliveryFailed: () => nonFinalReplyDeliveryFailed
 	};
 }
 //#endregion
-//#region extensions/matrix/src/matrix/monitor/handler.ts
+//#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 MATRIX_TOOL_PROGRESS_MAX_CHARS = 300;
-const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-BJbrdmNm.js").then((n) => n.l));
-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-BwAKtUyQ.js"));
-const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-CTLKtJJ0.js"));
-async function matrixTextWouldActivateMentions(client, text) {
-	const { resolveMatrixMentionsForBody } = await loadMatrixSendModule();
-	const mentions = await resolveMatrixMentionsForBody({
-		client,
-		body: text
-	});
-	return mentions.room === true || (mentions.user_ids?.length ?? 0) > 0;
-}
 const MAX_TRACKED_PAIRING_REPLY_SENDERS = 512;
-const MAX_TRACKED_SHARED_DM_CONTEXT_NOTICES = 512;
-async function redactMatrixDraftEvent(client, roomId, draftEventId) {
-	await client.redactEvent(roomId, draftEventId).catch(() => {});
-}
-function buildMatrixFinalizedPreviewContent() {
-	return { [MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY]: true };
-}
-function resolveMatrixMentionPrecheckText(params) {
-	if (params.locationText?.trim()) return params.locationText.trim();
-	if (typeof params.content.body === "string" && params.content.body.trim()) return params.content.body.trim();
-	if (isPollStartType(params.eventType)) {
-		const parsed = parsePollStartContent(params.content);
-		if (parsed) return formatPollAsText(parsed);
-	}
-	return "";
-}
-function hasBundledMatrixReplacementRelation(event) {
-	const relations = event.unsigned?.["m.relations"];
-	if (!relations || typeof relations !== "object") return false;
-	return relations[RelationType.Replace] !== void 0;
-}
-function resolveMatrixInboundBodyText(params) {
-	if (params.mediaPlaceholder) return params.rawBody || params.mediaPlaceholder;
-	if (!params.mediaDownloadFailed || !params.hadMediaUrl) return params.rawBody;
-	if (params.mediaSizeLimitExceeded) return formatMatrixMediaTooLargeText({
-		body: params.rawBody,
-		filename: params.filename,
-		msgtype: params.msgtype
-	});
-	return formatMatrixMediaUnavailableText({
-		body: params.rawBody,
-		filename: params.filename,
-		msgtype: params.msgtype
-	});
-}
-function markTrackedRoomIfFirst(set, roomId) {
-	if (set.has(roomId)) return false;
-	set.add(roomId);
-	if (set.size > MAX_TRACKED_SHARED_DM_CONTEXT_NOTICES) {
-		const oldest = set.keys().next().value;
-		if (typeof oldest === "string") set.delete(oldest);
-	}
-	return true;
-}
-function resolveMatrixSharedDmContextNotice(params) {
-	if ((params.dmSessionScope ?? "per-user") === "per-room") return null;
-	if (params.sentRooms.has(params.roomId)) return null;
-	try {
-		const currentSession = resolveMatrixStoredSessionMeta(getSessionEntry({
-			storePath: params.storePath,
-			sessionKey: params.sessionKey
-		}));
-		if (!currentSession) return null;
-		if (currentSession.channel && currentSession.channel !== "matrix") return null;
-		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(" ");
-	} catch (err) {
-		params.logVerboseMessage(`matrix: failed checking shared DM session notice room=${params.roomId} (${String(err)})`);
-		return null;
-	}
-}
-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;
-	return formatMatrixMessageText({
-		body: resolveMatrixMessageBody({
-			body,
-			filename,
-			msgtype
-		}),
-		attachment: resolveMatrixMessageAttachment({
-			body,
-			filename,
-			msgtype
-		})
-	}) ?? "";
-}
-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
-	});
-}
-function resolveMatrixAllowBotsMode(value) {
-	if (value === true) return "all";
-	if (value === "mentions") return "mentions";
-	return "off";
-}
-function formatMatrixToolProgressMarkdownCode(text) {
-	return `\`${(text.length <= MATRIX_TOOL_PROGRESS_MAX_CHARS ? text : `${truncateUtf16Safe(text, MATRIX_TOOL_PROGRESS_MAX_CHARS - 1).trimEnd()}...`).replaceAll("`", "'")}\``;
-}
-function createMatrixRoomMessageHandler(params) {
-	const { client, core, cfg, accountId, accountConfig, runtime, logger, logVerboseMessage, allowFromResolvedEntries = [], groupAllowFromResolvedEntries = [], roomsConfig, accountAllowBots, configuredBotUserIds = /* @__PURE__ */ new Set(), groupPolicy, replyToMode, threadReplies, dmThreadReplies, dmSessionScope, streaming, previewToolProgressEnabled, blockStreamingEnabled, dmEnabled, dmPolicy, textLimit, mediaMaxBytes, historyLimit, startupMs, startupGraceMs, dropPreStartupMessages, inboundDeduper, directTracker, getRoomInfo, getMemberDisplayName, needsRoomAliasesForConfig, resolveLiveUserAllowlist = resolveMatrixMonitorLiveUserAllowlist, resolveStorePath: resolveStorePathImpl = resolveStorePath, createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl = createChannelInboundEnvelopeBuilder, finalizeInboundContext, resolveHumanDelayConfig: resolveHumanDelayConfigImpl = resolveHumanDelayConfig } = params;
-	const contextVisibilityMode = resolveChannelContextVisibilityMode({
-		cfg,
-		channel: "matrix",
-		accountId
-	});
+function createMatrixHandlerState(config) {
+	const { core, accountId, runtime, allowFromResolvedEntries, groupAllowFromResolvedEntries, resolveLiveUserAllowlist } = config;
 	let cachedStoreAllowFrom = null;
 	let liveDmAllowlistCache = null;
 	let liveGroupAllowlistCache = null;
@@ -2365,19 +3576,35 @@ function createMatrixRoomMessageHandler(params) {
 		return entries;
 	};
 	const pairingReplySentAtMsBySender = /* @__PURE__ */ new Map();
-	const resolveThreadContext = createMatrixThreadContextResolver({
-		client,
-		getMemberDisplayName,
-		logVerboseMessage
-	});
-	const resolveReplyContext = createMatrixReplyContextResolver({
-		client,
-		getMemberDisplayName,
-		logVerboseMessage
-	});
-	const roomHistoryTracker = createRoomHistoryTracker();
-	const roomIngressQueue = new KeyedAsyncQueue();
-	const sharedDmContextNoticeRooms = /* @__PURE__ */ new Set();
+	const resolveLiveAccountAllowlists = async () => {
+		const liveCfg = core.config.current();
+		const liveAccountAllowlists = resolveMatrixAccountAllowlistConfig({
+			cfg: liveCfg,
+			accountId
+		});
+		return {
+			liveCfg,
+			liveDmAllowFrom: await resolveCachedLiveAllowlist({
+				cfg: liveCfg,
+				entries: liveAccountAllowlists.dmAllowFrom,
+				startupResolvedEntries: allowFromResolvedEntries,
+				cache: liveDmAllowlistCache,
+				updateCache: (next) => {
+					liveDmAllowlistCache = next;
+				}
+			}),
+			liveGroupAllowFrom: await resolveCachedLiveAllowlist({
+				cfg: liveCfg,
+				entries: liveAccountAllowlists.groupAllowFrom,
+				failClosedOnUnresolved: true,
+				startupResolvedEntries: groupAllowFromResolvedEntries,
+				cache: liveGroupAllowlistCache,
+				updateCache: (next) => {
+					liveGroupAllowlistCache = next;
+				}
+			})
+		};
+	};
 	const readStoreAllowFrom = async () => {
 		const now = Date.now();
 		if (cachedStoreAllowFrom && isFutureDateTimestampMs(cachedStoreAllowFrom.expiresAtMs, { nowMs: now })) return cachedStoreAllowFrom.value;
@@ -2409,14 +3636,59 @@ function createMatrixRoomMessageHandler(params) {
 		}
 		return true;
 	};
+	return {
+		resolveLiveAccountAllowlists,
+		readStoreAllowFrom,
+		shouldSendPairingReply
+	};
+}
+//#endregion
+//#region extensions/matrix/src/matrix/monitor/handler.ts
+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 handlerConfig = {
+		...params,
+		allowFromResolvedEntries,
+		groupAllowFromResolvedEntries,
+		configuredBotUserIds,
+		resolveLiveUserAllowlist,
+		resolveStorePath: resolveStorePathImpl,
+		createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl,
+		resolveHumanDelayConfig: resolveHumanDelayConfigImpl
+	};
+	const contextVisibilityMode = resolveChannelContextVisibilityMode({
+		cfg,
+		channel: "matrix",
+		accountId
+	});
+	const handlerState = createMatrixHandlerState({
+		core,
+		accountId,
+		runtime,
+		allowFromResolvedEntries,
+		groupAllowFromResolvedEntries,
+		resolveLiveUserAllowlist
+	});
+	const resolveThreadContext = createMatrixThreadContextResolver({
+		client,
+		getMemberDisplayName,
+		logVerboseMessage
+	});
+	const resolveReplyContext = createMatrixReplyContextResolver({
+		client,
+		getMemberDisplayName,
+		logVerboseMessage
+	});
+	const roomHistoryTracker = createRoomHistoryTracker();
+	const roomIngressQueue = new KeyedAsyncQueue();
+	const sharedDmContextNoticeRooms = /* @__PURE__ */ new Set();
 	const runRoomIngress = async (roomId, task) => {
 		return await roomIngressQueue.enqueue(roomId, task);
 	};
 	return async (roomId, event) => {
 		const eventId = typeof event.event_id === "string" ? event.event_id.trim() : "";
 		let inboundReplayClaim;
-		let draftStreamRef;
-		let draftConsumed = false;
+		let draftControllerRef;
 		try {
 			const eventType = event.type;
 			if (eventType === EventType.RoomMessageEncrypted) return;
@@ -2436,563 +3708,54 @@ function createMatrixRoomMessageHandler(params) {
 				await inboundReplayClaim.commit();
 				inboundReplayClaim = void 0;
 			};
-			const readIngressPrefix = async () => {
-				const selfUserId = await client.getUserId();
-				if (senderId === selfUserId) return;
-				if (dropPreStartupMessages) {
-					if (typeof eventTs === "number" && eventTs < startupMs - startupGraceMs) return;
-					if (typeof eventTs !== "number" && typeof eventAge === "number" && eventAge > startupGraceMs) return;
-				}
-				const content = event.content;
-				if (eventType === EventType.RoomMessage && isMatrixVerificationRoomMessage({
-					msgtype: content.msgtype,
-					body: content.body
-				})) {
-					logVerboseMessage(`matrix: skip verification/system room message room=${roomId}`);
-					return;
-				}
-				const locationPayload = resolveMatrixLocation({
-					eventType,
-					content
-				});
-				const relates = content["m.relates_to"];
-				if (relates && "rel_type" in relates && relates.rel_type === RelationType.Replace) return;
-				if (hasBundledMatrixReplacementRelation(event)) return;
-				if (eventId && inboundDeduper) {
-					const claim = await inboundDeduper.claim({
-						roomId,
-						eventId
-					});
-					if (claim.kind === "claimed") inboundReplayClaim = claim.handle;
-					else if (claim.kind !== "invalid") {
-						logVerboseMessage(`matrix: skip duplicate inbound event room=${roomId} id=${eventId}`);
-						return;
-					}
-				}
-				return {
-					content,
-					isDirectMessage: await directTracker.isDirectMessage({
-						roomId,
-						senderId,
-						selfUserId
-					}),
-					locationPayload,
-					selfUserId
-				};
-			};
-			const continueIngress = async (paramsLocal) => {
-				let content = paramsLocal.content;
-				const isDirectMessage = paramsLocal.isDirectMessage;
-				const isRoom = !isDirectMessage;
-				const { audioPreflightMode, locationPayload, reservedHistorySlot, selfUserId } = paramsLocal;
-				const messageId = event.event_id ?? "";
-				const threadRootId = resolveMatrixThreadRootId({
-					event,
-					content
-				});
-				const thread = resolveMatrixThreadRouting({
-					isDirectMessage,
-					threadReplies,
-					dmThreadReplies,
-					messageId,
-					threadRootId
-				});
-				const historyThreadId = threadRootId ? thread.threadId : void 0;
-				let reservedHistorySlotConsumed = false;
-				const discardReservedHistorySlot = () => {
-					if (reservedHistorySlot && !reservedHistorySlotConsumed) {
-						roomHistoryTracker.discardPending(roomId, reservedHistorySlot, historyThreadId);
-						reservedHistorySlotConsumed = true;
-					}
-				};
-				const commitInboundEventIfClaimedAndDiscardReserved = async () => {
-					discardReservedHistorySlot();
-					await commitInboundEventIfClaimed();
-				};
-				if (isRoom && groupPolicy === "disabled") {
-					await commitInboundEventIfClaimedAndDiscardReserved();
-					return;
-				}
-				const roomInfoForConfig = isRoom && needsRoomAliasesForConfig ? await getRoomInfo(roomId, { includeAliases: true }) : void 0;
-				const roomAliasesForConfig = roomInfoForConfig ? [roomInfoForConfig.canonicalAlias ?? "", ...roomInfoForConfig.altAliases].filter(Boolean) : [];
-				const roomConfigInfo = isRoom ? resolveMatrixRoomConfig({
-					rooms: roomsConfig,
-					roomId,
-					aliases: roomAliasesForConfig
-				}) : void 0;
-				const roomConfig = roomConfigInfo?.config;
-				const allowBotsMode = resolveMatrixAllowBotsMode(roomConfig?.allowBots ?? accountAllowBots);
-				const isConfiguredBotSender = configuredBotUserIds.has(senderId);
-				const roomMatchMeta = roomConfigInfo ? `matchKey=${roomConfigInfo.matchKey ?? "none"} matchSource=${roomConfigInfo.matchSource ?? "none"}` : "matchKey=none matchSource=none";
-				if (isConfiguredBotSender && allowBotsMode === "off") {
-					logVerboseMessage(`matrix: drop configured bot sender=${senderId} (allowBots=false${isDirectMessage ? "" : `, ${roomMatchMeta}`})`);
-					await commitInboundEventIfClaimedAndDiscardReserved();
-					return;
-				}
-				const botLoopProtection = isConfiguredBotSender && senderId !== selfUserId ? {
-					scopeId: accountId,
-					conversationId: roomId,
-					senderId,
-					receiverId: selfUserId,
-					config: mergePairLoopGuardConfig(accountConfig?.botLoopProtection, roomConfig?.botLoopProtection),
-					defaultsConfig: cfg.channels?.defaults?.botLoopProtection,
-					defaultEnabled: true,
-					nowMs: eventTs ?? void 0
-				} : void 0;
-				if (isRoom && roomConfig && !roomConfigInfo?.allowed) {
-					logVerboseMessage(`matrix: room disabled room=${roomId} (${roomMatchMeta})`);
-					await commitInboundEventIfClaimedAndDiscardReserved();
-					return;
-				}
-				if (isRoom && groupPolicy === "allowlist") {
-					if (!roomConfigInfo?.allowlistConfigured) {
-						logVerboseMessage(`matrix: drop room message (no allowlist, ${roomMatchMeta})`);
-						await commitInboundEventIfClaimedAndDiscardReserved();
-						return;
-					}
-					if (!roomConfig) {
-						logVerboseMessage(`matrix: drop room message (not in allowlist, ${roomMatchMeta})`);
-						await commitInboundEventIfClaimedAndDiscardReserved();
-						return;
-					}
+			const readIngressPrefix = () => readMatrixIngressPrefix({
+				client,
+				senderId,
+				dropPreStartupMessages,
+				eventTs: eventTs ?? void 0,
+				eventAge: eventAge ?? void 0,
+				startupMs,
+				startupGraceMs,
+				event,
+				eventType,
+				eventId,
+				inboundDeduper,
+				roomId,
+				logVerboseMessage,
+				directTracker,
+				claimInboundReplay: (handle) => {
+					inboundReplayClaim = handle;
 				}
-				let senderNamePromise = null;
-				const getSenderName = async () => {
-					senderNamePromise ??= getMemberDisplayName(roomId, senderId).catch(() => senderId);
-					return await senderNamePromise;
-				};
-				const storeAllowFrom = isDirectMessage && dmPolicy !== "allowlist" && dmPolicy !== "open" ? await readStoreAllowFrom() : [];
-				const roomUsers = roomConfig?.users ?? [];
-				const liveCfg = core.config.current();
-				const liveAccountAllowlists = resolveMatrixAccountAllowlistConfig({
-					cfg: liveCfg,
-					accountId
-				});
-				const liveDmAllowFrom = await resolveCachedLiveAllowlist({
-					cfg: liveCfg,
-					entries: liveAccountAllowlists.dmAllowFrom,
-					startupResolvedEntries: allowFromResolvedEntries,
-					cache: liveDmAllowlistCache,
-					updateCache: (next) => {
-						liveDmAllowlistCache = next;
-					}
-				});
-				const liveGroupAllowFrom = await resolveCachedLiveAllowlist({
-					cfg: liveCfg,
-					entries: liveAccountAllowlists.groupAllowFrom,
-					failClosedOnUnresolved: true,
-					startupResolvedEntries: groupAllowFromResolvedEntries,
-					cache: liveGroupAllowlistCache,
-					updateCache: (next) => {
-						liveGroupAllowlistCache = next;
-					}
-				});
-				const accessState = await resolveMatrixMonitorAccessState({
-					allowFrom: liveDmAllowFrom,
-					storeAllowFrom,
-					dmPolicy,
-					groupPolicy,
-					groupAllowFrom: liveGroupAllowFrom,
-					roomUsers,
+			});
+			const continueIngress = async (paramsLocal) => {
+				const access = await resolveMatrixIngressAccess({
+					handler: handlerConfig,
+					params: paramsLocal,
+					roomId,
+					event,
+					eventTs: eventTs ?? void 0,
 					senderId,
-					isRoom,
-					accountId,
-					eventKind: isReactionEvent ? "reaction" : "message"
-				});
-				const { effectiveGroupAllowFrom, effectiveRoomUsers, messageIngress } = accessState;
-				const ingressDecision = messageIngress.ingress;
-				if (isDirectMessage) {
-					if (!dmEnabled || dmPolicy === "disabled") {
-						await commitInboundEventIfClaimedAndDiscardReserved();
-						return;
-					}
-					const senderReason = messageIngress.senderAccess.reasonCode;
-					if (ingressDecision.decision !== "allow") {
-						if (ingressDecision.admission === "pairing-required") {
-							const senderName = await getSenderName();
-							const { code, created } = await core.channel.pairing.upsertPairingRequest({
-								channel: "matrix",
-								id: senderId,
-								accountId,
-								meta: { name: senderName }
-							});
-							if (shouldSendPairingReply(senderId, created)) {
-								const pairingReply = core.channel.pairing.buildPairingReply({
-									channel: "matrix",
-									idLine: `Your Matrix user id: ${senderId}`,
-									code
-								});
-								logVerboseMessage(created ? `matrix pairing request sender=${senderId} name=${senderName ?? "unknown"} (reason=${senderReason})` : `matrix pairing reminder sender=${senderId} name=${senderName ?? "unknown"} (reason=${senderReason})`);
-								try {
-									const { sendMessageMatrix } = await loadMatrixSendModule();
-									await sendMessageMatrix(`room:${roomId}`, created ? pairingReply : `${pairingReply}\n\nPairing request is still pending approval. Reusing existing code.`, {
-										client,
-										cfg,
-										accountId
-									});
-									await commitInboundEventIfClaimed();
-								} catch (err) {
-									logVerboseMessage(`matrix pairing reply failed for ${senderId}: ${String(err)}`);
-									discardReservedHistorySlot();
-									return;
-								}
-							} else {
-								logVerboseMessage(`matrix pairing reminder suppressed sender=${senderId} (cooldown)`);
-								await commitInboundEventIfClaimedAndDiscardReserved();
-							}
-						}
-						if (isReactionEvent || dmPolicy !== "pairing") {
-							logVerboseMessage(`matrix: blocked ${isReactionEvent ? "reaction" : "dm"} sender ${senderId} (dmPolicy=${dmPolicy}, reason=${senderReason})`);
-							await commitInboundEventIfClaimedAndDiscardReserved();
-						}
-						return;
-					}
-				}
-				if (isRoom && ingressDecision.decision !== "allow") {
-					logVerboseMessage(`matrix: blocked sender ${senderId} (ingress=${ingressDecision.reasonCode}, ${roomMatchMeta})`);
-					await commitInboundEventIfClaimedAndDiscardReserved();
-					return;
-				}
-				if (isRoom) logVerboseMessage(`matrix: allow room ${roomId} (${roomMatchMeta})`);
-				if (isReactionEvent) {
-					const senderName = await getSenderName();
-					const { handleInboundMatrixReaction } = await loadMatrixReactionEvents();
-					await handleInboundMatrixReaction({
-						client,
-						core,
-						cfg,
-						accountId,
-						roomId,
-						event,
-						senderId,
-						senderLabel: senderName,
-						selfUserId,
-						isDirectMessage,
-						logVerboseMessage
-					});
-					await commitInboundEventIfClaimedAndDiscardReserved();
-					return;
-				}
-				let pollSnapshotPromise = null;
-				const getPollSnapshot = async () => {
-					if (!isPollEvent) return null;
-					pollSnapshotPromise ??= fetchMatrixPollSnapshot(client, roomId, event).catch((err) => {
-						logVerboseMessage(`matrix: failed resolving poll snapshot room=${roomId} id=${event.event_id ?? "unknown"}: ${String(err)}`);
-						return null;
-					});
-					return await pollSnapshotPromise;
-				};
-				const mentionPrecheckText = resolveMatrixMentionPrecheckText({
-					eventType,
-					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;
-				const pendingHistoryText = resolveMatrixPendingHistoryText({
-					mentionPrecheckText,
-					content,
-					mediaUrl
+					isReactionEvent,
+					readStoreAllowFrom: handlerState.readStoreAllowFrom,
+					shouldSendPairingReply: handlerState.shouldSendPairingReply,
+					resolveLiveAccountAllowlists: handlerState.resolveLiveAccountAllowlists,
+					roomHistoryTracker,
+					commitInboundEventIfClaimed
 				});
-				const pendingHistoryPollText = !pendingHistoryText && isPollEvent && historyLimit > 0 ? (await getPollSnapshot())?.text : "";
-				if (!mentionPrecheckText && !mediaUrl && !isPollEvent) {
-					await commitInboundEventIfClaimedAndDiscardReserved();
-					return;
-				}
-				let preflightMedia = null;
-				let preflightMediaDownloadFailed = false;
-				let preflightMediaSizeLimitExceeded = false;
-				let preflightAudioTranscript;
-				const { route: _route, configuredBinding: _configuredBinding, runtimeBindingId: _runtimeBindingId } = resolveMatrixInboundRoute({
-					cfg,
-					accountId,
+				if (!access) return;
+				return await resolveMatrixIngressContent({
+					handler: handlerConfig,
+					params: paramsLocal,
+					access,
 					roomId,
-					senderId,
-					isDirectMessage,
-					dmSessionScope,
-					threadId: thread.threadId,
+					event,
+					eventType,
+					isPollEvent,
 					eventTs: eventTs ?? void 0,
-					resolveAgentRoute: core.channel.routing.resolveAgentRoute
-				});
-				const hasExplicitSessionBinding = _configuredBinding !== null || _runtimeBindingId !== null;
-				const preflightAudioMediaUrl = mediaUrl?.startsWith("mxc://") ? mediaUrl : void 0;
-				const shouldRunMatrixAudioPreflight = isMatrixAudioContent({
-					msgtype: typeof content.msgtype === "string" ? content.msgtype : void 0,
-					mimetype: earlyContentType
-				}) && isMatrixAudioMediaEnabled(cfg) && preflightAudioMediaUrl !== void 0;
-				if (shouldRunMatrixAudioPreflight && audioPreflightMode === "defer" && isRoom && historyLimit > 0 && !reservedHistorySlot) {
-					const reserved = roomHistoryTracker.reservePending(_route.agentId, roomId, {
-						sender: senderId,
-						body: pendingHistoryText,
-						timestamp: eventTs ?? void 0,
-						messageId
-					}, historyThreadId);
-					return { deferredPrefix: {
-						...paramsLocal,
-						audioPreflightMode: "run",
-						reservedHistorySlot: reserved
-					} };
-				}
-				if (shouldRunMatrixAudioPreflight) {
-					try {
-						preflightMedia = await downloadMatrixMedia({
-							client,
-							mxcUrl: preflightAudioMediaUrl,
-							contentType: earlyContentType,
-							sizeBytes: earlyContentSize,
-							maxBytes: mediaMaxBytes,
-							file: contentFile,
-							originalFilename: earlyOriginalFilename
-						});
-					} catch (err) {
-						preflightMediaDownloadFailed = true;
-						if (isMatrixMediaSizeLimitError(err)) preflightMediaSizeLimitExceeded = true;
-						const errorText = formatMatrixErrorMessage(err);
-						logVerboseMessage(`matrix: media download failed room=${roomId} id=${event.event_id ?? "unknown"} type=${content.msgtype} error=${errorText}`);
-						logger.warn("matrix media download failed", {
-							roomId,
-							eventId: event.event_id,
-							msgtype: content.msgtype,
-							encrypted: Boolean(contentFile),
-							error: errorText
-						});
-					}
-					if (preflightMedia) preflightAudioTranscript = await resolveMatrixPreflightAudioTranscript({
-						mediaPath: preflightMedia.path,
-						mediaContentType: preflightMedia.contentType,
-						cfg,
-						accountId,
-						chatType: isDirectMessage ? "direct" : "channel",
-						originatingTo: `room:${roomId}`,
-						messageThreadId: thread.threadId,
-						sessionKey: _route.sessionKey
-					});
-				}
-				const agentMentionRegexes = core.channel.mentions.buildMentionRegexes(cfg, _route.agentId, {
-					provider: "matrix",
-					conversationId: roomId,
-					providerPolicy: accountConfig?.mentionPatterns
-				});
-				const selfDisplayName = content.formatted_body ? await getMemberDisplayName(roomId, selfUserId).catch(() => void 0) : void 0;
-				const mentionPrecheckTextWithTranscript = preflightAudioTranscript ? [mentionPrecheckText, preflightAudioTranscript].filter(Boolean).join("\n").trim() : mentionPrecheckText;
-				const { wasMentioned, hasExplicitMention } = resolveMentions({
-					content,
-					userId: selfUserId,
-					displayName: selfDisplayName,
-					text: mentionPrecheckTextWithTranscript,
-					mentionRegexes: agentMentionRegexes
-				});
-				if (isConfiguredBotSender && allowBotsMode === "mentions" && !isDirectMessage && !wasMentioned) {
-					logVerboseMessage(`matrix: drop configured bot sender=${senderId} (allowBots=mentions, missing mention, ${roomMatchMeta})`);
-					await commitInboundEventIfClaimedAndDiscardReserved();
-					return;
-				}
-				const allowTextCommands = core.channel.commands.shouldHandleTextCommands({
-					cfg,
-					surface: "matrix"
-				});
-				const useAccessGroups = cfg.commands?.useAccessGroups !== false;
-				const commandCheckText = stripMatrixMentionPrefix({
-					text: mentionPrecheckText,
-					userId: selfUserId,
-					displayName: selfDisplayName,
-					mentionRegexes: agentMentionRegexes
-				});
-				const hasControlCommandInMessage = core.channel.text.hasControlCommand(commandCheckText, cfg);
-				const commandAccess = await resolveMatrixMonitorCommandAccess(accessState, {
-					useAccessGroups,
-					allowTextCommands,
-					hasControlCommand: hasControlCommandInMessage
-				});
-				const commandAuthorized = commandAccess.authorized;
-				if (isRoom && commandAccess.shouldBlockControlCommand) {
-					logInboundDrop({
-						log: logVerboseMessage,
-						channel: "matrix",
-						reason: "control command (unauthorized)",
-						target: senderId
-					});
-					await commitInboundEventIfClaimedAndDiscardReserved();
-					return;
-				}
-				const shouldRequireMention = isRoom ? roomConfig?.autoReply === true ? false : roomConfig?.autoReply === false ? true : typeof roomConfig?.requireMention === "boolean" ? roomConfig?.requireMention : true : false;
-				const mentionDecision = resolveInboundMentionDecision({
-					facts: {
-						canDetectMention: true,
-						wasMentioned,
-						hasAnyMention: hasExplicitMention
-					},
-					policy: {
-						isGroup: isRoom,
-						requireMention: shouldRequireMention,
-						allowTextCommands,
-						hasControlCommand: hasControlCommandInMessage,
-						commandAuthorized
-					}
-				});
-				const { effectiveWasMentioned, shouldBypassMention } = mentionDecision;
-				const canDetectMention = agentMentionRegexes.length > 0 || hasExplicitMention;
-				if (mentionDecision.shouldSkip) {
-					const pendingHistoryBody = preflightAudioTranscript ? formatMatrixAudioTranscript(preflightAudioTranscript) : pendingHistoryText || pendingHistoryPollText;
-					if (historyLimit > 0 && pendingHistoryBody) {
-						const pendingEntry = {
-							sender: senderId,
-							body: pendingHistoryBody,
-							timestamp: eventTs ?? void 0,
-							messageId
-						};
-						if (reservedHistorySlot) {
-							roomHistoryTracker.finalizePending(roomId, reservedHistorySlot, pendingEntry, historyThreadId);
-							reservedHistorySlotConsumed = true;
-						} else roomHistoryTracker.recordPending(roomId, pendingEntry, historyThreadId);
-					}
-					logger.info("skipping room message", {
-						roomId,
-						reason: "no-mention"
-					});
-					await commitInboundEventIfClaimed();
-					return;
-				}
-				if (preflightAudioTranscript) await sendMatrixPreflightAudioTranscriptEcho({
-					transcript: preflightAudioTranscript,
-					cfg,
-					accountId,
-					originatingTo: `room:${roomId}`,
-					messageThreadId: thread.threadId
-				});
-				if (isPollEvent) {
-					const pollSnapshot = await getPollSnapshot();
-					if (!pollSnapshot) {
-						discardReservedHistorySlot();
-						return;
-					}
-					content = {
-						msgtype: "m.text",
-						body: pollSnapshot.text
-					};
-				}
-				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;
-				if (!media && !mediaDownloadFailed && finalMediaUrl?.startsWith("mxc://")) try {
-					media = await downloadMatrixMedia({
-						client,
-						mxcUrl: finalMediaUrl,
-						contentType,
-						sizeBytes: contentSize,
-						maxBytes: mediaMaxBytes,
-						file: finalContentFile,
-						originalFilename
-					});
-				} catch (err) {
-					mediaDownloadFailed = true;
-					if (isMatrixMediaSizeLimitError(err)) mediaSizeLimitExceeded = true;
-					const errorText = formatMatrixErrorMessage(err);
-					logVerboseMessage(`matrix: media download failed room=${roomId} id=${event.event_id ?? "unknown"} type=${content.msgtype} error=${errorText}`);
-					logger.warn("matrix media download failed", {
-						roomId,
-						eventId: event.event_id,
-						msgtype: content.msgtype,
-						encrypted: Boolean(finalContentFile),
-						error: errorText
-					});
-				}
-				let bodyText = resolveMatrixInboundBodyText({
-					rawBody: locationPayload?.text ?? contentBody,
-					filename: typeof content.filename === "string" ? content.filename : void 0,
-					mediaPlaceholder: media?.placeholder,
-					msgtype: content.msgtype,
-					hadMediaUrl: Boolean(finalMediaUrl),
-					mediaDownloadFailed,
-					mediaSizeLimitExceeded
+					senderId,
+					roomHistoryTracker,
+					commitInboundEventIfClaimed
 				});
-				if (preflightMedia && bodyText && bodyText !== preflightMedia.placeholder && isLikelyBareFilename(bodyText)) bodyText = preflightMedia.placeholder;
-				if (preflightAudioTranscript) {
-					const transcriptBody = formatMatrixAudioTranscript(preflightAudioTranscript);
-					bodyText = !bodyText || bodyText === media?.placeholder ? transcriptBody : `${bodyText}\n${transcriptBody}`;
-				}
-				if (!bodyText) {
-					await commitInboundEventIfClaimedAndDiscardReserved();
-					return;
-				}
-				const commandBodyText = hasControlCommandInMessage ? commandCheckText : bodyText;
-				const senderName = await getSenderName();
-				if (_configuredBinding) {
-					const { ensureConfiguredAcpBindingReady } = await loadAcpBindingRuntime();
-					if (!(await ensureConfiguredAcpBindingReady({
-						cfg,
-						configuredBinding: _configuredBinding
-					})).ok) {
-						logInboundDrop({
-							log: logVerboseMessage,
-							channel: "matrix",
-							reason: "configured ACP binding unavailable",
-							target: _configuredBinding.spec.conversationId
-						});
-						discardReservedHistorySlot();
-						return;
-					}
-				}
-				if (_runtimeBindingId) {
-					const { getSessionBindingService } = await loadSessionBindingRuntime();
-					getSessionBindingService().touch(_runtimeBindingId, eventTs ?? void 0);
-				}
-				const preparedTrigger = isRoom && historyLimit > 0 ? reservedHistorySlot ? roomHistoryTracker.prepareReservedTrigger(_route.agentId, roomId, historyLimit, reservedHistorySlot, {
-					sender: senderName,
-					body: bodyText,
-					timestamp: eventTs ?? void 0,
-					messageId
-				}, historyThreadId) : roomHistoryTracker.prepareTrigger(_route.agentId, roomId, historyLimit, {
-					sender: senderName,
-					body: bodyText,
-					timestamp: eventTs ?? void 0,
-					messageId
-				}, historyThreadId) : void 0;
-				if (reservedHistorySlot && preparedTrigger) reservedHistorySlotConsumed = true;
-				return {
-					route: _route,
-					hasExplicitSessionBinding,
-					roomConfig,
-					isDirectMessage,
-					isRoom,
-					shouldRequireMention,
-					wasMentioned,
-					effectiveWasMentioned,
-					shouldBypassMention,
-					canDetectMention,
-					commandAuthorized,
-					inboundHistory: preparedTrigger ? buildInboundHistoryFromEntries({
-						entries: preparedTrigger.history,
-						limit: historyLimit
-					}) : void 0,
-					senderName,
-					bodyText,
-					commandBodyText,
-					media,
-					preflightAudioTranscript,
-					locationPayload,
-					messageId,
-					triggerSnapshot: preparedTrigger,
-					threadRootId,
-					thread,
-					botLoopProtection,
-					effectiveGroupAllowFrom,
-					effectiveRoomUsers
-				};
 			};
 			const ingressResult = historyLimit > 0 ? await runRoomIngress(roomId, async () => {
 				const prefix = await readIngressPrefix();
@@ -3015,191 +3778,60 @@ function createMatrixRoomMessageHandler(params) {
 			if (!resolvedIngressResult) return;
 			if ("deferredPrefix" in resolvedIngressResult) return;
 			const { route: _route, hasExplicitSessionBinding, roomConfig, isDirectMessage, isRoom, shouldRequireMention, wasMentioned, effectiveWasMentioned, shouldBypassMention, canDetectMention, commandAuthorized, inboundHistory, senderName, bodyText, commandBodyText, media, preflightAudioTranscript, locationPayload, messageId, triggerSnapshot, threadRootId, thread, botLoopProtection, effectiveGroupAllowFrom, effectiveRoomUsers } = resolvedIngressResult;
-			const replyToEventId = resolveMatrixReplyToEventId(event.content);
-			const threadTarget = thread.threadId;
-			const isRoomContextSenderAllowed = (contextSenderId) => {
-				if (!isRoom || !contextSenderId) return true;
-				if (effectiveRoomUsers.length > 0) return resolveMatrixAllowListMatch({
-					allowList: effectiveRoomUsers,
-					userId: contextSenderId
-				}).allowed;
-				if (groupPolicy === "allowlist" && effectiveGroupAllowFrom.length > 0) return resolveMatrixAllowListMatch({
-					allowList: effectiveGroupAllowFrom,
-					userId: contextSenderId
-				}).allowed;
-				return true;
-			};
-			const shouldIncludeRoomContextSender = (kind, contextSenderId) => evaluateSupplementalContextVisibility({
-				mode: contextVisibilityMode,
-				kind,
-				senderAllowed: isRoomContextSenderAllowed(contextSenderId)
-			}).include;
-			let threadContext = threadRootId ? await resolveThreadContext({
-				roomId,
-				threadRootId
-			}) : void 0;
-			let threadContextBlockedByPolicy = false;
-			if (threadContext?.senderId && !shouldIncludeRoomContextSender("thread", threadContext.senderId)) {
-				logVerboseMessage(`matrix: drop thread root context (mode=${contextVisibilityMode})`);
-				threadContextBlockedByPolicy = true;
-				threadContext = void 0;
-			}
-			let replyContext;
-			if (replyToEventId && replyToEventId === threadRootId && threadContext?.summary) replyContext = {
-				replyToBody: threadContext.summary,
-				replyToSender: threadContext.senderLabel,
-				replyToSenderId: threadContext.senderId
-			};
-			else if (replyToEventId && replyToEventId === threadRootId && threadContextBlockedByPolicy) replyContext = await resolveReplyContext({
-				roomId,
-				eventId: replyToEventId
-			});
-			else replyContext = replyToEventId ? await resolveReplyContext({
-				roomId,
-				eventId: replyToEventId
-			}) : void 0;
-			const replySenderAllowed = !replyContext?.replyToSenderId || isRoomContextSenderAllowed(replyContext.replyToSenderId);
-			const roomName = (isRoom ? await getRoomInfo(roomId) : void 0)?.name;
-			const envelopeFrom = isDirectMessage ? senderName : roomName ?? roomId;
-			const textWithId = `${bodyText}\n[matrix event id: ${messageId} room: ${roomId}]`;
-			const storePath = resolveStorePathImpl(cfg.session?.store, { agentId: _route.agentId });
-			const buildEnvelope = createChannelInboundEnvelopeBuilderImpl({
+			const inboundContext = await resolveMatrixInboundContext({
+				client,
+				core,
 				cfg,
-				route: _route
-			});
-			const sharedDmNoticeSessionKey = threadTarget ? _route.mainSessionKey || _route.sessionKey : _route.sessionKey;
-			const sharedDmContextNotice = isDirectMessage ? hasExplicitSessionBinding ? null : resolveMatrixSharedDmContextNotice({
-				storePath,
-				sessionKey: sharedDmNoticeSessionKey,
+				accountId,
+				runtime,
+				logVerboseMessage,
 				roomId,
-				accountId: _route.accountId,
-				dmSessionScope,
-				sentRooms: sharedDmContextNoticeRooms,
-				logVerboseMessage
-			}) : null;
-			const body = buildEnvelope({
-				channel: "Matrix",
-				from: envelopeFrom,
-				timestamp: eventTs ?? void 0,
-				body: textWithId
-			});
-			const groupSystemPrompt = normalizeOptionalString(roomConfig?.systemPrompt);
-			const quoteHidden = Boolean(replyContext && !evaluateSupplementalContextVisibility({
-				mode: contextVisibilityMode,
-				kind: "quote",
-				senderAllowed: replySenderAllowed
-			}).include);
-			const ctxPayload = buildChannelInboundEventContext({
-				channel: "matrix",
-				contextVisibility: contextVisibilityMode,
-				finalize: finalizeInboundContext,
-				supplemental: {
-					quote: replyContext ? {
-						id: threadTarget ? void 0 : replyToEventId ?? void 0,
-						body: replyContext.replyToBody,
-						sender: replyContext.replyToSender,
-						senderAllowed: replySenderAllowed
-					} : void 0,
-					thread: {
-						starterBody: threadContext?.threadStarterBody,
-						senderAllowed: threadContext ? true : void 0
-					},
-					groupSystemPrompt: isRoom ? groupSystemPrompt : void 0
-				},
-				media: toInboundMediaFacts(media ? [{
-					path: media.path,
-					url: media.path,
-					contentType: media.contentType,
-					transcribed: preflightAudioTranscript !== void 0
-				}] : void 0),
+				event,
+				eventTs: eventTs ?? void 0,
+				route: _route,
+				isDirectMessage,
+				isRoom,
+				effectiveRoomUsers,
+				groupPolicy,
+				effectiveGroupAllowFrom,
+				contextVisibilityMode,
+				resolveThreadContext,
+				resolveReplyContext,
+				threadRootId,
+				thread,
+				getRoomInfo,
+				senderId,
+				senderName,
+				bodyText,
+				commandBodyText,
+				roomConfig,
 				messageId,
-				timestamp: eventTs ?? void 0,
-				from: isDirectMessage ? `matrix:${senderId}` : `matrix:channel:${roomId}`,
-				sender: {
-					id: senderId,
-					name: senderName,
-					username: senderId.split(":")[0]?.replace(/^@/, "")
-				},
-				conversation: {
-					kind: isDirectMessage ? "direct" : "channel",
-					id: roomId,
-					label: envelopeFrom,
-					nativeChannelId: roomId,
-					threadId: threadTarget
-				},
-				route: {
-					agentId: _route.agentId,
-					dmScope: _route.dmScope,
-					accountId: _route.accountId,
-					routeSessionKey: _route.sessionKey
-				},
-				reply: {
-					to: `room:${roomId}`,
-					replyToId: threadTarget ? void 0 : replyToEventId ?? void 0,
-					messageThreadId: threadTarget,
-					nativeChannelId: roomId
-				},
-				message: {
-					body,
-					rawBody: bodyText,
-					commandBody: commandBodyText,
-					bodyForAgent: bodyText,
-					inboundHistory: inboundHistory && inboundHistory.length > 0 ? inboundHistory : void 0
-				},
-				access: {
-					...isRoom ? { mentions: {
-						canDetectMention: true,
-						wasMentioned,
-						requireMention: shouldRequireMention
-					} } : {},
-					commands: { authorized: commandAuthorized }
-				},
-				extra: {
-					GroupSubject: isRoom ? roomName ?? roomId : void 0,
-					GroupId: isRoom ? roomId : void 0,
-					GroupChannel: isRoom ? roomId : void 0,
-					...locationPayload?.context,
-					CommandSource: "text",
-					NativeDirectUserId: isDirectMessage ? senderId : void 0
-				}
-			});
-			if (quoteHidden) logVerboseMessage(`matrix: drop reply context (mode=${contextVisibilityMode})`);
-			const preview = truncateUtf16Safe(bodyText, 200).replace(/\n/g, "\\n");
-			logVerboseMessage(`matrix inbound: room=${roomId} from=${senderId} preview="${preview}"`);
-			const replyTarget = ctxPayload.To;
-			if (!replyTarget) {
-				runtime.error?.("matrix: missing reply target");
-				return;
-			}
-			const { ackReaction, ackReactionScope: ackScope } = resolveMatrixAckReactionConfig({
-				cfg,
-				agentId: _route.agentId,
-				accountId
-			});
-			const shouldAckReaction = () => Boolean(ackReaction && core.channel.reactions.shouldAckReaction({
-				scope: ackScope,
-				isDirect: isDirectMessage,
-				isGroup: isRoom,
-				isMentionableGroup: isRoom,
-				requireMention: shouldRequireMention,
-				canDetectMention,
+				inboundHistory,
+				wasMentioned,
 				effectiveWasMentioned,
-				shouldBypassMention
-			}));
-			if (shouldAckReaction() && messageId) loadMatrixSendModule().then(({ reactMatrixMessage }) => reactMatrixMessage(roomId, messageId, ackReaction, client)).catch((err) => {
-				logVerboseMessage(`matrix react failed for room ${roomId}: ${String(err)}`);
-			});
-			if (messageId) loadMatrixSendModule().then(({ sendReadReceiptMatrix }) => sendReadReceiptMatrix(roomId, messageId, client)).catch((err) => {
-				logVerboseMessage(`matrix: read receipt failed room=${roomId} id=${messageId}: ${String(err)}`);
+				shouldBypassMention,
+				canDetectMention,
+				shouldRequireMention,
+				commandAuthorized,
+				locationPayload,
+				media,
+				preflightAudioTranscript,
+				historyLimit,
+				hasExplicitSessionBinding,
+				dmSessionScope,
+				sharedDmContextNoticeRooms,
+				resolveStorePath: resolveStorePathImpl,
+				createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl,
+				finalizeInboundContext
 			});
+			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);
-			let finalReplyDeliveryFailed = false;
-			let nonFinalReplyDeliveryFailed = false;
 			const { onModelSelected, ...prefixOptions } = createReplyPrefixOptions({
 				cfg,
 				agentId: _route.agentId,
@@ -3234,431 +3866,47 @@ function createMatrixRoomMessageHandler(params) {
 					});
 				}
 			});
-			const draftStreamingEnabled = streaming !== "off";
-			const quietDraftStreaming = streaming === "quiet" || streaming === "progress";
-			const progressDraftStreaming = streaming === "progress";
-			const draftReplyToId = replyToMode !== "off" && !threadTarget ? messageId : void 0;
-			const draftStream = draftStreamingEnabled ? await loadMatrixDraftStream().then(({ createMatrixDraftStream }) => createMatrixDraftStream({
+			const draftController = await createMatrixDraftController({
+				streaming,
+				previewToolProgressEnabled,
+				replyToMode,
+				messageId,
+				threadTarget,
+				accountConfig: params.accountConfig,
+				cfg,
+				accountId: _route.accountId,
 				roomId,
 				client,
+				logVerboseMessage
+			});
+			const { draftStream } = draftController;
+			draftControllerRef = draftController;
+			const replyDispatcher = createMatrixReplyDispatcher({
 				cfg,
-				mode: quietDraftStreaming ? "quiet" : "partial",
-				threadId: threadTarget,
-				replyToId: draftReplyToId,
-				preserveReplyId: replyToMode === "all",
-				accountId: _route.accountId,
-				log: logVerboseMessage
-			})) : void 0;
-			draftStreamRef = draftStream;
-			const shouldStreamPreviewToolProgress = Boolean(draftStream) && previewToolProgressEnabled;
-			const shouldSuppressDefaultToolProgressMessages = Boolean(draftStream) && (shouldStreamPreviewToolProgress || params.streaming === "progress");
-			let currentDraftMessageGeneration = 0;
-			let currentDraftBlockOffset = 0;
-			let latestDraftFullText = "";
-			const pendingDraftBoundaries = [];
-			const latestQueuedDraftBoundaryOffsets = /* @__PURE__ */ new Map();
-			let currentDraftReplyToId = draftReplyToId;
-			let previewToolProgressSuppressed = false;
-			let previewToolProgressLines = [];
-			let latestPlan;
-			let latestPlanExplanation;
-			const progressConfigEntry = params.accountConfig ?? cfg.channels?.matrix;
-			const progressSeed = `${_route.accountId}:${roomId}`;
-			const renderProgressDraft = () => {
-				if (!draftStream) return;
-				const previewText = formatChannelProgressDraftText({
-					entry: progressConfigEntry,
-					lines: previewToolProgressLines,
-					seed: progressSeed,
-					formatLine: formatMatrixToolProgressMarkdownCode,
-					bullet: "-",
-					narration: latestPlanExplanation,
-					plan: latestPlan
-				});
-				if (!previewText) return;
-				draftStream.update(previewText);
-			};
-			const progressDraftGate = createChannelProgressDraftGate({ onStart: renderProgressDraft });
-			const pushPreviewToolProgress = async (line, options) => {
-				if (!draftStream) return;
-				if (options?.toolName !== void 0 && !isChannelProgressDraftWorkToolName(options.toolName)) return;
-				const normalized = normalizeChannelProgressDraftLineIdentity(line);
-				const progressLine = typeof line === "object" && line !== void 0 ? line : normalized;
-				if (!progressDraftStreaming) {
-					if (!shouldStreamPreviewToolProgress || previewToolProgressSuppressed || !normalized) return;
-					const nextLines = mergeChannelProgressDraftLine(previewToolProgressLines, progressLine, { maxLines: resolveChannelProgressDraftMaxLines(progressConfigEntry) });
-					if (nextLines === previewToolProgressLines) return;
-					previewToolProgressLines = nextLines;
-					draftStream.update(formatChannelProgressDraftText({
-						entry: progressConfigEntry,
-						lines: previewToolProgressLines,
-						seed: progressSeed,
-						formatLine: formatMatrixToolProgressMarkdownCode,
-						bullet: "-",
-						narration: latestPlanExplanation,
-						plan: latestPlan
-					}));
-					return;
-				}
-				if (shouldStreamPreviewToolProgress && !previewToolProgressSuppressed && normalized) previewToolProgressLines = mergeChannelProgressDraftLine(previewToolProgressLines, progressLine, { maxLines: resolveChannelProgressDraftMaxLines(progressConfigEntry) });
-				const alreadyStarted = progressDraftGate.hasStarted;
-				const progressActive = await progressDraftGate.noteWork();
-				if ((alreadyStarted || progressActive) && progressDraftGate.hasStarted) renderProgressDraft();
-			};
-			const pushPlanProgress = async (steps, explanation) => {
-				latestPlan = steps?.length ? steps.map((entry) => ({ ...entry })) : void 0;
-				latestPlanExplanation = explanation?.replace(/\s+/g, " ").trim() || void 0;
-				if (!draftStream || previewToolProgressSuppressed) return;
-				if (!progressDraftStreaming) {
-					renderProgressDraft();
-					return;
-				}
-				const alreadyStarted = progressDraftGate.hasStarted;
-				await progressDraftGate.startNow();
-				if (alreadyStarted && progressDraftGate.hasStarted) renderProgressDraft();
-			};
-			const suppressPreviewToolProgressForAnswerText = (text) => {
-				if (!text?.trim()) return;
-				previewToolProgressSuppressed = true;
-				previewToolProgressLines = [];
-				latestPlan = void 0;
-				latestPlanExplanation = void 0;
-			};
-			const resetPreviewToolProgress = () => {
-				previewToolProgressSuppressed = false;
-				previewToolProgressLines = [];
-				latestPlan = void 0;
-				latestPlanExplanation = void 0;
-			};
-			const buildPreviewToolProgressReplyOptions = () => {
-				if (!shouldSuppressDefaultToolProgressMessages) return {};
-				const options = { suppressDefaultToolProgressMessages: true };
-				if (!shouldStreamPreviewToolProgress) return options;
-				return {
-					...options,
-					onToolStart: async (payload) => {
-						const toolName = payload.name?.trim();
-						await pushPreviewToolProgress(buildChannelProgressDraftLineForEntry(progressConfigEntry, {
-							event: "tool",
-							itemId: payload.itemId,
-							toolCallId: payload.toolCallId,
-							name: toolName,
-							phase: payload.phase,
-							args: payload.args
-						}, payload.detailMode ? { detailMode: payload.detailMode } : void 0), { toolName });
-					},
-					onItemEvent: async (payload) => {
-						await pushPreviewToolProgress(buildChannelProgressDraftLineForEntry(progressConfigEntry, {
-							event: "item",
-							itemId: payload.itemId,
-							toolCallId: payload.toolCallId,
-							itemKind: payload.kind,
-							title: payload.title,
-							name: payload.name,
-							phase: payload.phase,
-							status: payload.status,
-							summary: payload.summary,
-							progressText: payload.progressText,
-							meta: payload.meta
-						}));
-					},
-					onPlanUpdate: async (payload) => {
-						if (payload.phase !== "update") return;
-						await pushPlanProgress(payload.steps, payload.explanation);
-					},
-					onApprovalEvent: async (payload) => {
-						if (payload.phase !== "requested") return;
-						await pushPreviewToolProgress(formatChannelProgressDraftLine({
-							event: "approval",
-							phase: payload.phase,
-							title: payload.title,
-							command: payload.command,
-							reason: payload.reason,
-							message: payload.message
-						}));
-					},
-					onCommandOutput: async (payload) => {
-						if (payload.phase !== "end") return;
-						await pushPreviewToolProgress(buildChannelProgressDraftLineForEntry(progressConfigEntry, {
-							event: "command-output",
-							itemId: payload.itemId,
-							toolCallId: payload.toolCallId,
-							phase: payload.phase,
-							title: payload.title,
-							name: payload.name,
-							status: payload.status,
-							exitCode: payload.exitCode
-						}));
-					},
-					onPatchSummary: async (payload) => {
-						if (payload.phase !== "end") return;
-						await pushPreviewToolProgress(buildChannelProgressDraftLineForEntry(progressConfigEntry, {
-							event: "patch",
-							itemId: payload.itemId,
-							toolCallId: payload.toolCallId,
-							phase: payload.phase,
-							title: payload.title,
-							name: payload.name,
-							added: payload.added,
-							modified: payload.modified,
-							deleted: payload.deleted,
-							summary: payload.summary
-						}));
-					}
-				};
-			};
-			const getDisplayableDraftText = () => {
-				const nextDraftBoundaryOffset = pendingDraftBoundaries.find((boundary) => boundary.messageGeneration === currentDraftMessageGeneration)?.endOffset;
-				if (nextDraftBoundaryOffset === void 0) return latestDraftFullText.slice(currentDraftBlockOffset);
-				return latestDraftFullText.slice(currentDraftBlockOffset, nextDraftBoundaryOffset);
-			};
-			const updateDraftFromLatestFullText = () => {
-				const blockText = getDisplayableDraftText();
-				if (blockText) draftStream?.update(blockText);
-			};
-			const queueDraftBlockBoundary = (payload, context) => {
-				const payloadTextLength = payload.text?.length ?? 0;
-				const messageGeneration = context?.assistantMessageIndex ?? currentDraftMessageGeneration;
-				const nextDraftBoundaryOffset = (latestQueuedDraftBoundaryOffsets.get(messageGeneration) ?? 0) + payloadTextLength;
-				latestQueuedDraftBoundaryOffsets.set(messageGeneration, nextDraftBoundaryOffset);
-				pendingDraftBoundaries.push({
-					messageGeneration,
-					endOffset: nextDraftBoundaryOffset
-				});
-			};
-			const advanceDraftBlockBoundary = (options) => {
-				const completedBoundary = pendingDraftBoundaries.shift();
-				if (completedBoundary) {
-					if (!pendingDraftBoundaries.some((entry) => entry.messageGeneration === completedBoundary.messageGeneration)) latestQueuedDraftBoundaryOffsets.delete(completedBoundary.messageGeneration);
-					if (completedBoundary.messageGeneration === currentDraftMessageGeneration) currentDraftBlockOffset = completedBoundary.endOffset;
-					return;
-				}
-				if (options?.fallbackToLatestEnd) currentDraftBlockOffset = latestDraftFullText.length;
-			};
-			const resetDraftBlockOffsets = () => {
-				currentDraftMessageGeneration += 1;
-				currentDraftBlockOffset = 0;
-				latestDraftFullText = "";
-			};
-			const resetDraftDeliveryState = async () => {
-				await draftStream?.discardPending();
-				draftStream?.reset();
-				draftConsumed = false;
-				currentDraftMessageGeneration = 0;
-				currentDraftBlockOffset = 0;
-				latestDraftFullText = "";
-				pendingDraftBoundaries.length = 0;
-				latestQueuedDraftBoundaryOffsets.clear();
-				currentDraftReplyToId = draftReplyToId;
-				progressDraftGate.reset();
-				resetPreviewToolProgress();
-			};
-			const { deliver: deliverReply, onError: onReplyError, ...turnDispatcherOptions } = {
-				...prefixOptions,
+				prefixOptions,
 				humanDelay: resolveHumanDelayConfigImpl(cfg, _route.agentId),
-				deliver: async (payload, info) => {
-					if (draftStream && info.kind !== "tool" && !payload.isCompactionNotice) {
-						const hasMedia = Boolean(payload.mediaUrl) || (payload.mediaUrls?.length ?? 0) > 0;
-						const ttsSupplement = getReplyPayloadTtsSupplement(payload);
-						const fallbackPayload = ttsSupplement && ttsSupplement.visibleTextAlreadyDelivered !== true && !payload.text?.trim() ? {
-							...payload,
-							text: ttsSupplement.spokenText
-						} : payload;
-						if (draftConsumed) {
-							await draftStream.discardPending();
-							await deliverMatrixReplies({
-								cfg,
-								replies: [fallbackPayload],
-								roomId,
-								client,
-								runtime,
-								textLimit,
-								replyToMode,
-								threadId: threadTarget,
-								replyToId: threadTarget ?? replyToEventId ?? void 0,
-								accountId: _route.accountId,
-								mediaLocalRoots,
-								tableMode
-							});
-							return;
-						}
-						const payloadReplyToId = normalizeOptionalString(payload.replyToId);
-						const payloadReplyMismatch = replyToMode !== "off" && !threadTarget && payloadReplyToId !== currentDraftReplyToId;
-						let mustDeliverFinalNormally = draftStream.mustDeliverFinalNormally();
-						if (Boolean(payload.text?.trim()) && !payload.isError && !payloadReplyMismatch && !mustDeliverFinalNormally) {
-							await draftStream.stop();
-							mustDeliverFinalNormally = draftStream.mustDeliverFinalNormally();
-						} else await draftStream.discardPending();
-						const draftEventId = draftStream.eventId();
-						const draftFinalTextNeedsNormalMentionDelivery = Boolean(draftEventId) && typeof payload.text === "string" && Boolean(payload.text.trim()) && !payload.isError && !payloadReplyMismatch && !mustDeliverFinalNormally && await matrixTextWouldActivateMentions(client, payload.text);
-						if (draftEventId && payload.text && !payload.isError && !hasMedia && !payloadReplyMismatch && !mustDeliverFinalNormally && !draftFinalTextNeedsNormalMentionDelivery) {
-							const finalPreviewText = payload.text;
-							await deliverWithFinalizableLivePreviewAdapter({
-								kind: "final",
-								payload,
-								adapter: defineFinalizableLivePreviewAdapter({
-									draft: {
-										flush: async () => {},
-										clear: async () => {},
-										discardPending: async () => {},
-										id: () => draftEventId
-									},
-									buildFinalEdit: () => ({
-										text: finalPreviewText,
-										finalizeLive: !(quietDraftStreaming || !draftStream.matchesPreparedText(finalPreviewText)),
-										...quietDraftStreaming ? { extraContent: buildMatrixFinalizedPreviewContent() } : {}
-									}),
-									editFinal: async (_draftEventId, edit) => {
-										if (edit.finalizeLive) {
-											if (!await draftStream.finalizeLive()) throw new Error("Matrix draft live finalize failed");
-											return;
-										}
-										const { editMessageMatrix } = await loadMatrixSendModule();
-										await editMessageMatrix(roomId, _draftEventId, edit.text, {
-											client,
-											cfg,
-											threadId: threadTarget,
-											accountId: _route.accountId,
-											extraContent: edit.extraContent
-										});
-									},
-									createPreviewReceipt: (id) => createPreviewMessageReceipt({
-										id,
-										...threadTarget ? { threadId: threadTarget } : {},
-										...currentDraftReplyToId ? { replyToId: currentDraftReplyToId } : {}
-									}),
-									logPreviewEditFailure: (err) => {
-										logVerboseMessage(`matrix: preview final edit failed: ${String(err)}`);
-									}
-								}),
-								deliverNormally: async () => {
-									await redactMatrixDraftEvent(client, roomId, draftEventId);
-									await deliverMatrixReplies({
-										cfg,
-										replies: [fallbackPayload],
-										roomId,
-										client,
-										runtime,
-										textLimit,
-										replyToMode,
-										threadId: threadTarget,
-										replyToId: threadTarget ?? replyToEventId ?? void 0,
-										accountId: _route.accountId,
-										mediaLocalRoots,
-										tableMode
-									});
-								}
-							});
-							draftConsumed = true;
-						} else if (draftEventId && hasMedia && !payloadReplyMismatch) {
-							let textEditOk = !mustDeliverFinalNormally;
-							const payloadText = payload.text ?? ttsSupplement?.spokenText;
-							const payloadTextMatchesDraft = typeof payloadText === "string" && draftStream.matchesPreparedText(payloadText);
-							const reusesDraftTextUnchanged = typeof payloadText === "string" && Boolean(payloadText.trim()) && payloadTextMatchesDraft;
-							const mediaTextNeedsNormalMentionDelivery = typeof payloadText === "string" && Boolean(payloadText.trim()) && await matrixTextWouldActivateMentions(client, payloadText);
-							const requiresFinalTextEdit = quietDraftStreaming || typeof payloadText === "string" && !payloadTextMatchesDraft;
-							if (textEditOk && mediaTextNeedsNormalMentionDelivery) textEditOk = false;
-							else if (textEditOk && payloadText && requiresFinalTextEdit) {
-								const { editMessageMatrix } = await loadMatrixSendModule();
-								textEditOk = await editMessageMatrix(roomId, draftEventId, payloadText, {
-									client,
-									cfg,
-									threadId: threadTarget,
-									accountId: _route.accountId,
-									extraContent: quietDraftStreaming ? buildMatrixFinalizedPreviewContent() : void 0
-								}).then(() => true, () => false);
-							} else if (textEditOk && reusesDraftTextUnchanged) textEditOk = await draftStream.finalizeLive();
-							const reusesDraftAsFinalText = Boolean(payloadText?.trim()) && textEditOk;
-							if (!reusesDraftAsFinalText) await redactMatrixDraftEvent(client, roomId, draftEventId);
-							const mediaPayload = ttsSupplement && reusesDraftAsFinalText ? buildTtsSupplementMediaPayload(payload) : {
-								...payload,
-								text: reusesDraftAsFinalText ? void 0 : payload.text ?? (ttsSupplement?.visibleTextAlreadyDelivered === true ? void 0 : ttsSupplement?.spokenText)
-							};
-							await deliverMatrixReplies({
-								cfg,
-								replies: [mediaPayload],
-								roomId,
-								client,
-								runtime,
-								textLimit,
-								replyToMode,
-								threadId: threadTarget,
-								replyToId: threadTarget ?? replyToEventId ?? void 0,
-								accountId: _route.accountId,
-								mediaLocalRoots,
-								tableMode
-							});
-							draftConsumed = true;
-						} else {
-							const draftRedacted = Boolean(draftEventId) && (payload.isError || payloadReplyMismatch || mustDeliverFinalNormally || draftFinalTextNeedsNormalMentionDelivery);
-							if (draftRedacted && draftEventId) await redactMatrixDraftEvent(client, roomId, draftEventId);
-							const deliveredFallback = await deliverMatrixReplies({
-								cfg,
-								replies: [fallbackPayload],
-								roomId,
-								client,
-								runtime,
-								textLimit,
-								replyToMode,
-								threadId: threadTarget,
-								replyToId: threadTarget ?? replyToEventId ?? void 0,
-								accountId: _route.accountId,
-								mediaLocalRoots,
-								tableMode
-							});
-							if (draftRedacted || deliveredFallback) draftConsumed = true;
-						}
-						if (info.kind === "block") {
-							draftConsumed = false;
-							advanceDraftBlockBoundary({ fallbackToLatestEnd: true });
-							draftStream.reset();
-							currentDraftReplyToId = replyToMode === "all" ? draftReplyToId : void 0;
-							updateDraftFromLatestFullText();
-							const { sendTypingMatrix } = await loadMatrixSendModule();
-							await sendTypingMatrix(roomId, true, void 0, client).catch(() => {});
-						}
-					} else await deliverMatrixReplies({
-						cfg,
-						replies: [payload],
-						roomId,
-						client,
-						runtime,
-						textLimit,
-						replyToMode,
-						threadId: threadTarget,
-						replyToId: threadTarget ?? replyToEventId ?? void 0,
-						accountId: _route.accountId,
-						mediaLocalRoots,
-						tableMode
-					});
-				},
-				onError: (err, info) => {
-					if (info.kind === "final") finalReplyDeliveryFailed = true;
-					else nonFinalReplyDeliveryFailed = true;
-					if (info.kind === "block") advanceDraftBlockBoundary({ fallbackToLatestEnd: true });
-					runtime.error?.(`matrix ${info.kind} reply failed: ${String(err)}`);
-				},
-				onReplyStart: typingCallbacks.onReplyStart,
-				onIdle: typingCallbacks.onIdle
-			};
+				typingCallbacks,
+				streaming,
+				draftStream,
+				draftController,
+				client,
+				roomId,
+				runtime,
+				textLimit,
+				replyToMode,
+				threadTarget,
+				replyToEventId: replyToEventId ?? void 0,
+				accountId: _route.accountId,
+				mediaLocalRoots,
+				tableMode,
+				logVerboseMessage
+			});
+			const { deliverReply, onReplyError, turnDispatcherOptions } = replyDispatcher;
 			const pinnedMainDmOwner = isDirectMessage ? await (async () => {
-				const livePinnedCfg = core.config.current();
-				const livePinnedAllowlists = resolveMatrixAccountAllowlistConfig({
-					cfg: livePinnedCfg,
-					accountId
-				});
-				const livePinnedDmAllowFrom = await resolveCachedLiveAllowlist({
-					cfg: livePinnedCfg,
-					entries: livePinnedAllowlists.dmAllowFrom,
-					startupResolvedEntries: allowFromResolvedEntries,
-					cache: liveDmAllowlistCache,
-					updateCache: (next) => {
-						liveDmAllowlistCache = next;
-					}
-				});
+				const { liveCfg, liveDmAllowFrom } = await handlerState.resolveLiveAccountAllowlists();
 				return resolvePinnedMainDmOwnerFromAllowlist({
-					dmScope: livePinnedCfg.session?.dmScope,
-					allowFrom: livePinnedDmAllowFrom,
+					dmScope: liveCfg.session?.dmScope,
+					allowFrom: liveDmAllowFrom,
 					normalizeEntry: normalizeMatrixUserId
 				});
 			})() : null;
@@ -3726,27 +3974,22 @@ function createMatrixRoomMessageHandler(params) {
 						},
 						dispatcherOptions: {
 							...turnDispatcherOptions,
-							onSettled: () => progressDraftGate.cancel()
+							onSettled: () => draftController.progressDraftGate.cancel()
 						},
 						replyOptions: {
 							skillFilter: roomConfig?.skills,
 							disableBlockStreaming: !blockStreamingEnabled,
-							onPartialReply: draftStream ? (payload) => {
-								if (progressDraftStreaming) return;
-								latestDraftFullText = payload.text ?? "";
-								suppressPreviewToolProgressForAnswerText(latestDraftFullText);
-								updateDraftFromLatestFullText();
-							} : void 0,
+							onPartialReply: draftStream ? (payload) => draftController.onPartialReply(payload.text ?? "") : void 0,
 							onBlockReplyQueued: draftStream ? (payload, context) => {
 								if (payload.isCompactionNotice === true) return;
-								queueDraftBlockBoundary(payload, context);
+								draftController.queueDraftBlockBoundary(payload, context);
 							} : void 0,
 							onAssistantMessageStart: draftStream ? () => {
-								resetDraftBlockOffsets();
-								resetPreviewToolProgress();
+								draftController.resetDraftBlockOffsets();
+								draftController.resetPreviewToolProgress();
 							} : void 0,
-							onQueuedFollowupAdmitted: draftStream ? resetDraftDeliveryState : void 0,
-							...buildPreviewToolProgressReplyOptions(),
+							onQueuedFollowupAdmitted: draftStream ? draftController.resetDraftDeliveryState : void 0,
+							...draftController.buildPreviewToolProgressReplyOptions(),
 							onModelSelected
 						}
 					})
@@ -3758,12 +4001,12 @@ function createMatrixRoomMessageHandler(params) {
 			}
 			const { dispatchResult } = turnResult;
 			const { queuedFinal, counts } = dispatchResult;
-			if (finalReplyDeliveryFailed) {
+			if (replyDispatcher.finalReplyDeliveryFailed()) {
 				logVerboseMessage(`matrix: final reply delivery failed room=${roomId} id=${messageId}; keeping replay committed`);
 				await commitInboundEventIfClaimed();
 				return;
 			}
-			if (!queuedFinal && nonFinalReplyDeliveryFailed) {
+			if (!queuedFinal && replyDispatcher.nonFinalReplyDeliveryFailed()) {
 				logVerboseMessage(`matrix: non-final reply delivery failed room=${roomId} id=${messageId}; keeping replay committed`);
 				await commitInboundEventIfClaimed();
 				return;
@@ -3782,9 +4025,10 @@ function createMatrixRoomMessageHandler(params) {
 		} catch (err) {
 			runtime.error?.(`matrix handler failed: ${String(err)}`);
 		} finally {
-			if (draftStreamRef) {
-				const draftEventId = await draftStreamRef.stop().catch(() => void 0);
-				if (draftEventId && !draftConsumed) await redactMatrixDraftEvent(client, roomId, draftEventId);
+			const draftStream = draftControllerRef?.draftStream;
+			if (draftStream) {
+				const draftEventId = await draftStream.stop().catch(() => void 0);
+				if (draftEventId && draftControllerRef?.isDraftConsumed() !== true) await redactMatrixDraftEvent(client, roomId, draftEventId);
 			}
 			inboundReplayClaim?.release();
 		}
@@ -3805,10 +4049,10 @@ function shouldPromoteRecentInviteRoom(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/startup.ts
 const loadMatrixStartupMaintenanceDeps = createLazyRuntimeModule(() => Promise.all([
-	import("./setup-core-XCdAx1nY.js").then((n) => n.s),
-	import("./device-health-D4LBxuPq.js"),
-	import("./setup-core-XCdAx1nY.js").then((n) => n.a),
-	import("./startup-verification-CA00kebL.js")
+	import("./setup-core-a542Ernq.js").then((n) => n.c),
+	import("./device-health-B4-YXtJR.js").then((n) => n.t),
+	import("./setup-core-a542Ernq.js").then((n) => n.o),
+	import("./startup-verification-wm3_i88s.js")
 ]).then(([configUpdateModule, deviceHealthModule, profileModule, startupVerificationModule]) => ({
 	updateMatrixAccountConfig: configUpdateModule.updateMatrixAccountConfig,
 	summarizeMatrixDeviceHealth: deviceHealthModule.summarizeMatrixDeviceHealth,
@@ -4037,20 +4281,13 @@ function createMatrixMonitorTaskRunner(params) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/index.ts
-function isMatrixStreamingConfig(streaming) {
-	return Boolean(streaming && typeof streaming === "object" && !Array.isArray(streaming));
-}
 function resolveMatrixStreamingMode(streaming) {
-	if (streaming === true || streaming === "partial") return "partial";
-	if (streaming === "quiet") return "quiet";
-	if (streaming === "progress") return "progress";
-	if (isMatrixStreamingConfig(streaming)) {
-		if (streaming.mode === "partial" || streaming.mode === "quiet" || streaming.mode === "progress") return streaming.mode;
-	}
+	const mode = streaming?.mode;
+	if (mode === "partial" || mode === "quiet" || mode === "progress") return mode;
 	return "off";
 }
 function resolveMatrixPreviewToolProgress(streaming) {
-	if (!isMatrixStreamingConfig(streaming)) return true;
+	if (!streaming) return true;
 	if (resolveMatrixStreamingMode(streaming) === "progress") return streaming.progress?.toolProgress ?? streaming.preview?.toolProgress ?? true;
 	return streaming.preview?.toolProgress ?? true;
 }