@openclaw/matrix 2026.6.2-beta.1 → 2026.6.5-beta.2

package/dist/{monitor-Y8rwS-7u.js → monitor-DXW0sFfU.js}

@@ -1,21 +1,21 @@
 import { c as resolveMatrixAccountConfig, s as resolveMatrixAccountAllowlistConfig } from "./config-paths-ZBCMwSos.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { m as resolveConfiguredMatrixBotUserIds } from "./setup-core-CHX8Zcxh.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-8WZPKRKE.js";
-import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-BKGAVlax.js";
+import { m as resolveConfiguredMatrixBotUserIds } from "./setup-core-DJosJdWt.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-6UUus7Ba.js";
+import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-CVJYP50t.js";
 import { t as isMatrixQualifiedUserId } from "./target-ids-B-5aQxwn.js";
 import { r as isMatrixNotFoundError, t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
 import { a as resolveMatrixStateFilePath } from "./storage-DSVcH_zM.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-BAtT4Rtk.js";
-import { n as resolveMatrixSqliteStateEnv, t as createMatrixThreadBindingManager } from "./thread-bindings-xGy-RpZ_.js";
-import { a as resolveMatrixMessageBody, i as resolveMatrixMessageAttachment, n as formatMatrixMediaUnavailableText, r as formatMatrixMessageText, s as fetchMatrixPollSnapshot, t as formatMatrixMediaTooLargeText } from "./media-text-DxT-tkdx.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-DEgWxp1p.js";
+import { n as resolveMatrixSqliteStateEnv, t as createMatrixThreadBindingManager } from "./thread-bindings-gLQYbsB9.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-DVhXN81h.js";
 import { n as setActiveMatrixClient } from "./active-client-DXvz2gCo.js";
 import { t as isBunRuntime } from "./runtime-BefyhPWv.js";
-import { _ as resolveMatrixAuthContext, f as LogService, g as resolveMatrixAuth, h as backfillMatrixAuthDeviceIdAfterStartup, i as resolveSharedMatrixClient, l as isMatrixStartupAbortError, n as releaseSharedClientInstance, u as throwIfMatrixStartupAborted } from "./shared-D5SFm-Dp.js";
-import "./client-D8mT5W6r.js";
-import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-KTzUzlpv.js";
+import { _ as resolveMatrixAuthContext, f as LogService, g as resolveMatrixAuth, h as backfillMatrixAuthDeviceIdAfterStartup, i as resolveSharedMatrixClient, l as isMatrixStartupAbortError, n as releaseSharedClientInstance, u as throwIfMatrixStartupAborted } from "./shared-BbT5LdPp.js";
+import "./client-DRRL7Zv5.js";
+import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-nipb5tk1.js";
 import { d as resolveDefaultGroupPolicy, h as warnMissingProviderGroupPolicyFallbackOnce, m as resolveThreadBindingMaxAgeMsForChannel, p as resolveThreadBindingIdleTimeoutMsForChannel, t as GROUP_POLICY_BLOCKED_LABEL, u as resolveAllowlistProviderRuntimeGroupPolicy } from "./runtime-api-CsBoesCU.js";
-import { t as resolveMatrixTargets } from "./resolve-targets-BjEKWSku.js";
+import { t as resolveMatrixTargets } from "./resolve-targets-CAwsoBQK.js";
 import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-aEUzD940.js";
 import { n as isMatrixReadySyncState, r as isMatrixTerminalSyncState, t as isMatrixDisconnectedSyncState } from "./sync-state-CWbp0QSY.js";
 import { a as EventType, i as resolveMatrixThreadRouting, n as resolveMatrixReplyToEventId, o as RelationType, r as resolveMatrixThreadRootId, t as resolveMatrixInboundRoute } from "./route-DY6at4qJ.js";
@@ -41,6 +41,7 @@ import { mergePairLoopGuardConfig } from "openclaw/plugin-sdk/pair-loop-guard-ru
 import { buildInboundHistoryFromEntries } from "openclaw/plugin-sdk/reply-history";
 import { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
 import { escapeRegExp } from "openclaw/plugin-sdk/text-utility-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) {
@@ -818,7 +819,7 @@ const SAS_NOTICE_RETRY_DELAY_MS = 750;
 const VERIFICATION_EVENT_STARTUP_GRACE_MS = 3e4;
 let matrixDirectRoomDepsPromise;
 async function loadMatrixDirectRoomDeps() {
-	matrixDirectRoomDepsPromise ??= Promise.all([import("./send-BAtT4Rtk.js").then((n) => n.d), import("./send-BAtT4Rtk.js").then((n) => n.m)]).then(([directManagementModule, directRoomModule]) => ({
+	matrixDirectRoomDepsPromise ??= Promise.all([import("./send-DEgWxp1p.js").then((n) => n.d), import("./send-DEgWxp1p.js").then((n) => n.m)]).then(([directManagementModule, directRoomModule]) => ({
 		inspectMatrixDirectRooms: directManagementModule.inspectMatrixDirectRooms,
 		isStrictDirectRoom: directRoomModule.isStrictDirectRoom
 	}));
@@ -1661,6 +1662,89 @@ function resolveMentions(params) {
 	};
 }
 //#endregion
+//#region extensions/matrix/src/matrix/monitor/preflight-audio.ts
+const MATRIX_DEFAULT_ECHO_TRANSCRIPT_FORMAT = "📝 \"{transcript}\"";
+let matrixPreflightAudioRuntimePromise;
+function loadMatrixPreflightAudioRuntime() {
+	matrixPreflightAudioRuntimePromise ??= import("./preflight-audio.runtime-BZxxQsxY.js");
+	return matrixPreflightAudioRuntimePromise;
+}
+function formatMatrixAudioTranscript(transcript) {
+	return `[Audio transcript (machine-generated, untrusted)]: ${JSON.stringify(transcript)}`;
+}
+function formatMatrixAudioTranscriptEcho(transcript, format) {
+	return format.replace("{transcript}", transcript);
+}
+function suppressMatrixPreflightAudioEcho(cfg) {
+	const audio = cfg.tools?.media?.audio;
+	if (!audio?.echoTranscript) return cfg;
+	return {
+		...cfg,
+		tools: {
+			...cfg.tools,
+			media: {
+				...cfg.tools?.media,
+				audio: {
+					...audio,
+					echoTranscript: false
+				}
+			}
+		}
+	};
+}
+function isMatrixAudioContent(params) {
+	if (params.msgtype === "m.audio") return true;
+	if (params.msgtype === "m.file" && typeof params.mimetype === "string") return params.mimetype.toLowerCase().startsWith("audio/");
+	return false;
+}
+async function resolveMatrixPreflightAudioTranscript(params) {
+	if (params.abortSignal?.aborted) return;
+	try {
+		const { transcribeFirstAudio } = await loadMatrixPreflightAudioRuntime();
+		if (params.abortSignal?.aborted) return;
+		const transcript = await transcribeFirstAudio({
+			ctx: {
+				MediaPaths: [params.mediaPath],
+				MediaTypes: params.mediaContentType ? [params.mediaContentType] : void 0,
+				Provider: "matrix",
+				Surface: "matrix",
+				OriginatingChannel: "matrix",
+				OriginatingTo: params.originatingTo,
+				AccountId: params.accountId,
+				MessageThreadId: params.messageThreadId,
+				ChatType: params.chatType,
+				SessionKey: params.sessionKey
+			},
+			cfg: suppressMatrixPreflightAudioEcho(params.cfg)
+		});
+		return params.abortSignal?.aborted ? void 0 : transcript;
+	} catch (err) {
+		logVerbose(`matrix: audio preflight transcription failed: ${String(err)}`);
+		return;
+	}
+}
+async function sendMatrixPreflightAudioTranscriptEcho(params) {
+	const audio = params.cfg.tools?.media?.audio;
+	if (!audio?.echoTranscript) return;
+	const text = formatMatrixAudioTranscriptEcho(params.transcript, audio.echoFormat ?? MATRIX_DEFAULT_ECHO_TRANSCRIPT_FORMAT);
+	try {
+		const { sendDurableMessageBatch } = await loadMatrixPreflightAudioRuntime();
+		const send = await sendDurableMessageBatch({
+			cfg: params.cfg,
+			channel: "matrix",
+			to: params.originatingTo,
+			accountId: params.accountId,
+			threadId: params.messageThreadId,
+			payloads: [{ text }],
+			bestEffort: true,
+			durability: "best_effort"
+		});
+		if (send.status === "failed") throw send.error;
+	} catch (err) {
+		logVerbose(`matrix: audio transcript echo failed: ${String(err)}`);
+	}
+}
+//#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;
@@ -1702,11 +1786,11 @@ async function deliverMatrixReplies(params) {
 			params.runtime.error?.("matrix reply missing text/media");
 			continue;
 		}
-		const replyToIdRaw = reply.replyToId?.trim();
-		const replyToId = params.threadId || params.replyToMode === "off" ? void 0 : replyToIdRaw;
+		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.replyToMode === "all" || !hasReplied);
+		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;
@@ -1838,23 +1922,36 @@ const DEFAULT_MAX_ROOM_QUEUES = 1e3;
 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}` → absolute consumed-up-to index */
+	/** Maps `{agentId, roomId, scope}` → absolute consumed-up-to index */
 	const agentWatermarks = /* @__PURE__ */ new Map();
 	let nextQueueGeneration = 1;
 	function clearRoomWatermarks(roomId) {
-		const roomSuffix = `:${roomId}`;
-		for (const key of agentWatermarks.keys()) if (key.endsWith(roomSuffix)) agentWatermarks.delete(key);
+		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()
+		};
 	}
 	function getOrCreateQueue(roomId) {
 		let queue = roomQueues.get(roomId);
 		if (!queue) {
 			queue = {
-				entries: [],
-				baseIndex: 0,
-				generation: nextQueueGeneration++,
-				preparedTriggers: /* @__PURE__ */ new Map()
+				...createHistoryQueue(),
+				threadQueues: /* @__PURE__ */ new Map()
 			};
 			roomQueues.set(roomId, queue);
 			if (roomQueues.size > maxRoomQueues) {
@@ -1867,6 +1964,30 @@ function createRoomHistoryTrackerInternal(maxQueueSize = DEFAULT_MAX_QUEUE_SIZE,
 		}
 		return queue;
 	}
+	function getOrCreateThreadQueue(roomId, roomQueue, threadRootId) {
+		let queue = roomQueue.threadQueues.get(threadRootId);
+		if (!queue) {
+			queue = createHistoryQueue();
+			roomQueue.threadQueues.set(threadRootId, queue);
+			if (roomQueue.threadQueues.size > MAX_THREAD_QUEUES_PER_ROOM) {
+				const oldest = roomQueue.threadQueues.keys().next().value;
+				if (oldest !== void 0) {
+					roomQueue.threadQueues.delete(oldest);
+					clearThreadWatermarks(roomId, oldest);
+				}
+			}
+		}
+		return queue;
+	}
+	function getScopedQueue(roomId, threadRootId) {
+		const roomQueue = getOrCreateQueue(roomId);
+		return threadRootId ? getOrCreateThreadQueue(roomId, roomQueue, threadRootId) : roomQueue;
+	}
+	function findScopedQueue(roomId, threadRootId) {
+		const roomQueue = roomQueues.get(roomId);
+		if (!roomQueue) return;
+		return threadRootId ? roomQueue.threadQueues.get(threadRootId) : roomQueue;
+	}
 	function appendToQueue(queue, entry) {
 		queue.entries.push(entry);
 		if (queue.entries.length > maxQueueSize) {
@@ -1879,8 +2000,12 @@ function createRoomHistoryTrackerInternal(maxQueueSize = DEFAULT_MAX_QUEUE_SIZE,
 			queueGeneration: queue.generation
 		};
 	}
-	function wmKey(agentId, roomId) {
-		return `${agentId}:${roomId}`;
+	function wmKey(agentId, roomId, threadRootId) {
+		return JSON.stringify({
+			agentId,
+			roomId,
+			scope: threadRootId ?? "main"
+		});
 	}
 	function preparedTriggerKey(agentId, messageId) {
 		if (!messageId?.trim()) return null;
@@ -1895,6 +2020,15 @@ function createRoomHistoryTrackerInternal(maxQueueSize = DEFAULT_MAX_QUEUE_SIZE,
 			if (oldest !== void 0) agentWatermarks.delete(oldest);
 		}
 	}
+	function markConsumedAfterReservedGap(queue, key, firstReservedRel, snapshotIdx) {
+		const endRel = Math.min(snapshotIdx - queue.baseIndex, queue.entries.length);
+		for (let rel = firstReservedRel + 1; rel < endRel; rel += 1) {
+			const entry = queue.entries[rel];
+			if (!entry || entry.reserved || entry.discarded) continue;
+			entry.consumedBy ??= /* @__PURE__ */ new Set();
+			entry.consumedBy.add(key);
+		}
+	}
 	function rememberPreparedTrigger(queue, retryKey, prepared) {
 		if (queue.preparedTriggers.has(retryKey)) queue.preparedTriggers.delete(retryKey);
 		queue.preparedTriggers.set(retryKey, prepared);
@@ -1904,50 +2038,113 @@ function createRoomHistoryTrackerInternal(maxQueueSize = DEFAULT_MAX_QUEUE_SIZE,
 		}
 		return prepared;
 	}
-	function computePendingHistory(queue, agentId, roomId, limit) {
+	function computePendingHistory(queue, agentId, roomId, limit, endAbsExclusive = queue.baseIndex + queue.entries.length, startAbsOverride, threadRootId) {
 		if (limit <= 0 || queue.entries.length === 0) return [];
-		const wm = agentWatermarks.get(wmKey(agentId, roomId)) ?? 0;
+		const wm = startAbsOverride ?? agentWatermarks.get(wmKey(agentId, roomId, threadRootId)) ?? 0;
 		const startRel = Math.max(wm, queue.baseIndex) - queue.baseIndex;
-		const available = queue.entries.slice(startRel);
+		const endRel = Math.max(startRel, Math.min(endAbsExclusive - queue.baseIndex, queue.entries.length));
+		const available = queue.entries.slice(startRel, endRel).filter((entry) => !entry.discarded && !entry.reserved && !entry.consumedBy?.has(wmKey(agentId, roomId, threadRootId)));
 		return available.length > limit ? available.slice(-limit) : available;
 	}
+	function prepareTriggerInternal(agentId, roomId, limit, entry, threadRootId) {
+		const queue = getScopedQueue(roomId, threadRootId);
+		const retryKey = preparedTriggerKey(agentId, entry.messageId);
+		if (retryKey) {
+			const prepared = queue.preparedTriggers.get(retryKey);
+			if (prepared) return rememberPreparedTrigger(queue, retryKey, prepared);
+		}
+		const prepared = {
+			history: computePendingHistory(queue, agentId, roomId, limit, void 0, void 0, threadRootId),
+			...appendToQueue(queue, entry)
+		};
+		if (retryKey) return rememberPreparedTrigger(queue, retryKey, prepared);
+		return prepared;
+	}
 	return {
-		recordPending(roomId, entry) {
-			appendToQueue(getOrCreateQueue(roomId), entry);
+		recordPending(roomId, entry, threadRootId) {
+			appendToQueue(getScopedQueue(roomId, threadRootId), entry);
+		},
+		reservePending(agentId, roomId, entry, threadRootId) {
+			const snapshot = appendToQueue(getScopedQueue(roomId, threadRootId), {
+				...entry,
+				reserved: true
+			});
+			return {
+				...snapshot,
+				slotIdx: snapshot.snapshotIdx - 1,
+				watermarkIdx: agentWatermarks.get(wmKey(agentId, roomId, threadRootId)) ?? 0
+			};
 		},
-		getPendingHistory(agentId, roomId, limit) {
-			const queue = roomQueues.get(roomId);
+		finalizePending(roomId, slot, entry, threadRootId) {
+			const queue = findScopedQueue(roomId, threadRootId);
+			if (!queue || queue.generation !== slot.queueGeneration) return;
+			const rel = slot.slotIdx - queue.baseIndex;
+			if (rel < 0 || rel >= queue.entries.length) return;
+			queue.entries[rel] = entry;
+		},
+		discardPending(roomId, slot, threadRootId) {
+			const queue = findScopedQueue(roomId, threadRootId);
+			if (!queue || queue.generation !== slot.queueGeneration) return;
+			const rel = slot.slotIdx - queue.baseIndex;
+			if (rel < 0 || rel >= queue.entries.length) return;
+			queue.entries[rel] = {
+				sender: "",
+				body: "",
+				messageId: void 0,
+				discarded: true
+			};
+		},
+		getPendingHistory(agentId, roomId, limit, threadRootId) {
+			const queue = findScopedQueue(roomId, threadRootId);
 			if (!queue) return [];
-			return computePendingHistory(queue, agentId, roomId, limit);
+			return computePendingHistory(queue, agentId, roomId, limit, void 0, void 0, threadRootId);
+		},
+		recordTrigger(roomId, entry, threadRootId) {
+			return appendToQueue(getScopedQueue(roomId, threadRootId), entry);
 		},
-		recordTrigger(roomId, entry) {
-			return appendToQueue(getOrCreateQueue(roomId), entry);
+		prepareTrigger(agentId, roomId, limit, entry, threadRootId) {
+			return prepareTriggerInternal(agentId, roomId, limit, entry, threadRootId);
 		},
-		prepareTrigger(agentId, roomId, limit, entry) {
-			const queue = getOrCreateQueue(roomId);
+		prepareReservedTrigger(agentId, roomId, limit, slot, entry, threadRootId) {
+			const queue = findScopedQueue(roomId, threadRootId);
+			if (!queue || queue.generation !== slot.queueGeneration) return prepareTriggerInternal(agentId, roomId, limit, entry, threadRootId);
+			const rel = slot.slotIdx - queue.baseIndex;
+			if (rel < 0 || rel >= queue.entries.length) return prepareTriggerInternal(agentId, roomId, limit, entry, threadRootId);
 			const retryKey = preparedTriggerKey(agentId, entry.messageId);
 			if (retryKey) {
 				const prepared = queue.preparedTriggers.get(retryKey);
-				if (prepared) return rememberPreparedTrigger(queue, retryKey, prepared);
+				if (prepared) {
+					queue.entries[rel] = {
+						sender: "",
+						body: "",
+						messageId: void 0,
+						discarded: true
+					};
+					return rememberPreparedTrigger(queue, retryKey, prepared);
+				}
 			}
+			queue.entries[rel] = entry;
 			const prepared = {
-				history: computePendingHistory(queue, agentId, roomId, limit),
-				...appendToQueue(queue, entry)
+				history: computePendingHistory(queue, agentId, roomId, limit, slot.slotIdx, slot.watermarkIdx, threadRootId),
+				snapshotIdx: slot.slotIdx + 1,
+				queueGeneration: queue.generation
 			};
 			if (retryKey) return rememberPreparedTrigger(queue, retryKey, prepared);
 			return prepared;
 		},
-		consumeHistory(agentId, roomId, snapshot, messageId) {
-			const key = wmKey(agentId, roomId);
-			const queue = roomQueues.get(roomId);
+		consumeHistory(agentId, roomId, snapshot, messageId, threadRootId) {
+			const key = wmKey(agentId, roomId, threadRootId);
+			const queue = findScopedQueue(roomId, threadRootId);
 			if (!queue) {
 				agentWatermarks.delete(key);
 				return;
 			}
 			if (queue.generation !== snapshot.queueGeneration) return;
-			rememberWatermark(key, snapshot.snapshotIdx);
+			const firstReservedRel = queue.entries.findIndex((entry, index) => entry.reserved === true && queue.baseIndex + index < snapshot.snapshotIdx);
+			if (firstReservedRel >= 0) markConsumedAfterReservedGap(queue, key, firstReservedRel, snapshot.snapshotIdx);
+			rememberWatermark(key, firstReservedRel >= 0 ? queue.baseIndex + firstReservedRel : snapshot.snapshotIdx);
 			const retryKey = preparedTriggerKey(agentId, messageId);
-			if (queue && retryKey) queue.preparedTriggers.delete(retryKey);
+			if (retryKey) queue.preparedTriggers.delete(retryKey);
 		}
 	};
 }
@@ -1955,7 +2152,11 @@ function createRoomHistoryTracker(maxQueueSize = DEFAULT_MAX_QUEUE_SIZE, maxRoom
 	const tracker = createRoomHistoryTrackerInternal(maxQueueSize, maxRoomQueues, maxWatermarkEntries, maxPreparedTriggerEntries);
 	return {
 		recordPending: tracker.recordPending,
+		reservePending: tracker.reservePending,
+		finalizePending: tracker.finalizePending,
+		discardPending: tracker.discardPending,
 		prepareTrigger: tracker.prepareTrigger,
+		prepareReservedTrigger: tracker.prepareReservedTrigger,
 		consumeHistory: tracker.consumeHistory
 	};
 }
@@ -2030,7 +2231,7 @@ let sessionBindingRuntimePromise;
 let matrixReactionEventsPromise;
 let matrixDraftStreamPromise;
 function loadMatrixSendModule() {
-	matrixSendModulePromise ??= import("./send-BAtT4Rtk.js").then((n) => n.l);
+	matrixSendModulePromise ??= import("./send-DEgWxp1p.js").then((n) => n.l);
 	return matrixSendModulePromise;
 }
 function loadAcpBindingRuntime() {
@@ -2042,11 +2243,11 @@ function loadSessionBindingRuntime() {
 	return sessionBindingRuntimePromise;
 }
 function loadMatrixReactionEvents() {
-	matrixReactionEventsPromise ??= import("./reaction-events-BWDww7_l.js");
+	matrixReactionEventsPromise ??= import("./reaction-events-DRKzlo8q.js");
 	return matrixReactionEventsPromise;
 }
 function loadMatrixDraftStream() {
-	matrixDraftStreamPromise ??= import("./draft-stream-B7lCkUfU.js");
+	matrixDraftStreamPromise ??= import("./draft-stream-DZ2X1RHP.js");
 	return matrixDraftStreamPromise;
 }
 async function matrixTextWouldActivateMentions(client, text) {
@@ -2150,6 +2351,21 @@ function resolveMatrixPendingHistoryText(params) {
 		})
 	}) ?? "";
 }
+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";
@@ -2329,9 +2545,33 @@ function createMatrixRoomMessageHandler(params) {
 				let content = paramsLocal.content;
 				const isDirectMessage = paramsLocal.isDirectMessage;
 				const isRoom = !isDirectMessage;
-				const { locationPayload, selfUserId } = paramsLocal;
-				if (isRoom && groupPolicy === "disabled") {
+				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;
@@ -2347,7 +2587,7 @@ function createMatrixRoomMessageHandler(params) {
 				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 commitInboundEventIfClaimed();
+					await commitInboundEventIfClaimedAndDiscardReserved();
 					return;
 				}
 				const botLoopProtection = isConfiguredBotSender && senderId !== selfUserId ? {
@@ -2362,18 +2602,18 @@ function createMatrixRoomMessageHandler(params) {
 				} : void 0;
 				if (isRoom && roomConfig && !roomConfigInfo?.allowed) {
 					logVerboseMessage(`matrix: room disabled room=${roomId} (${roomMatchMeta})`);
-					await commitInboundEventIfClaimed();
+					await commitInboundEventIfClaimedAndDiscardReserved();
 					return;
 				}
 				if (isRoom && groupPolicy === "allowlist") {
 					if (!roomConfigInfo?.allowlistConfigured) {
 						logVerboseMessage(`matrix: drop room message (no allowlist, ${roomMatchMeta})`);
-						await commitInboundEventIfClaimed();
+						await commitInboundEventIfClaimedAndDiscardReserved();
 						return;
 					}
 					if (!roomConfig) {
 						logVerboseMessage(`matrix: drop room message (not in allowlist, ${roomMatchMeta})`);
-						await commitInboundEventIfClaimed();
+						await commitInboundEventIfClaimedAndDiscardReserved();
 						return;
 					}
 				}
@@ -2422,7 +2662,7 @@ function createMatrixRoomMessageHandler(params) {
 				const ingressDecision = messageIngress.ingress;
 				if (isDirectMessage) {
 					if (!dmEnabled || dmPolicy === "disabled") {
-						await commitInboundEventIfClaimed();
+						await commitInboundEventIfClaimedAndDiscardReserved();
 						return;
 					}
 					const senderReason = messageIngress.senderAccess.reasonCode;
@@ -2452,23 +2692,24 @@ function createMatrixRoomMessageHandler(params) {
 									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 commitInboundEventIfClaimed();
+								await commitInboundEventIfClaimedAndDiscardReserved();
 							}
 						}
 						if (isReactionEvent || dmPolicy !== "pairing") {
 							logVerboseMessage(`matrix: blocked ${isReactionEvent ? "reaction" : "dm"} sender ${senderId} (dmPolicy=${dmPolicy}, reason=${senderReason})`);
-							await commitInboundEventIfClaimed();
+							await commitInboundEventIfClaimedAndDiscardReserved();
 						}
 						return;
 					}
 				}
 				if (isRoom && ingressDecision.decision !== "allow") {
 					logVerboseMessage(`matrix: blocked sender ${senderId} (ingress=${ingressDecision.reasonCode}, ${roomMatchMeta})`);
-					await commitInboundEventIfClaimed();
+					await commitInboundEventIfClaimedAndDiscardReserved();
 					return;
 				}
 				if (isRoom) logVerboseMessage(`matrix: allow room ${roomId} (${roomMatchMeta})`);
@@ -2488,7 +2729,7 @@ function createMatrixRoomMessageHandler(params) {
 						isDirectMessage,
 						logVerboseMessage
 					});
-					await commitInboundEventIfClaimed();
+					await commitInboundEventIfClaimedAndDiscardReserved();
 					return;
 				}
 				let pollSnapshotPromise = null;
@@ -2508,6 +2749,11 @@ function createMatrixRoomMessageHandler(params) {
 				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,
@@ -2515,21 +2761,13 @@ function createMatrixRoomMessageHandler(params) {
 				});
 				const pendingHistoryPollText = !pendingHistoryText && isPollEvent && historyLimit > 0 ? (await getPollSnapshot())?.text : "";
 				if (!mentionPrecheckText && !mediaUrl && !isPollEvent) {
-					await commitInboundEventIfClaimed();
+					await commitInboundEventIfClaimedAndDiscardReserved();
 					return;
 				}
-				const messageId = event.event_id ?? "";
-				const threadRootId = resolveMatrixThreadRootId({
-					event,
-					content
-				});
-				const thread = resolveMatrixThreadRouting({
-					isDirectMessage,
-					threadReplies,
-					dmThreadReplies,
-					messageId,
-					threadRootId
-				});
+				let preflightMedia = null;
+				let preflightMediaDownloadFailed = false;
+				let preflightMediaSizeLimitExceeded = false;
+				let preflightAudioTranscript;
 				const { route: _route, configuredBinding: _configuredBinding, runtimeBindingId: _runtimeBindingId } = resolveMatrixInboundRoute({
 					cfg,
 					accountId,
@@ -2542,22 +2780,76 @@ function createMatrixRoomMessageHandler(params) {
 					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: mentionPrecheckText,
+					text: mentionPrecheckTextWithTranscript,
 					mentionRegexes: agentMentionRegexes
 				});
 				if (isConfiguredBotSender && allowBotsMode === "mentions" && !isDirectMessage && !wasMentioned) {
 					logVerboseMessage(`matrix: drop configured bot sender=${senderId} (allowBots=mentions, missing mention, ${roomMatchMeta})`);
-					await commitInboundEventIfClaimed();
+					await commitInboundEventIfClaimedAndDiscardReserved();
 					return;
 				}
 				const allowTextCommands = core.channel.commands.shouldHandleTextCommands({
@@ -2585,14 +2877,14 @@ function createMatrixRoomMessageHandler(params) {
 						reason: "control command (unauthorized)",
 						target: senderId
 					});
-					await commitInboundEventIfClaimed();
+					await commitInboundEventIfClaimedAndDiscardReserved();
 					return;
 				}
 				const shouldRequireMention = isRoom ? roomConfig?.autoReply === true ? false : roomConfig?.autoReply === false ? true : typeof roomConfig?.requireMention === "boolean" ? roomConfig?.requireMention : true : false;
 				const shouldBypassMention = allowTextCommands && isRoom && shouldRequireMention && !wasMentioned && !hasExplicitMention && commandAuthorized && hasControlCommandInMessage;
 				const canDetectMention = agentMentionRegexes.length > 0 || hasExplicitMention;
 				if (isRoom && shouldRequireMention && !wasMentioned && !shouldBypassMention) {
-					const pendingHistoryBody = pendingHistoryText || pendingHistoryPollText;
+					const pendingHistoryBody = preflightAudioTranscript ? formatMatrixAudioTranscript(preflightAudioTranscript) : pendingHistoryText || pendingHistoryPollText;
 					if (historyLimit > 0 && pendingHistoryBody) {
 						const pendingEntry = {
 							sender: senderId,
@@ -2600,7 +2892,10 @@ function createMatrixRoomMessageHandler(params) {
 							timestamp: eventTs ?? void 0,
 							messageId
 						};
-						roomHistoryTracker.recordPending(roomId, pendingEntry);
+						if (reservedHistorySlot) {
+							roomHistoryTracker.finalizePending(roomId, reservedHistorySlot, pendingEntry, historyThreadId);
+							reservedHistorySlotConsumed = true;
+						} else roomHistoryTracker.recordPending(roomId, pendingEntry, historyThreadId);
 					}
 					logger.info("skipping room message", {
 						roomId,
@@ -2609,17 +2904,27 @@ function createMatrixRoomMessageHandler(params) {
 					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) return;
+					if (!pollSnapshot) {
+						discardReservedHistorySlot();
+						return;
+					}
 					content = {
 						msgtype: "m.text",
 						body: pollSnapshot.text
 					};
 				}
-				let media = null;
-				let mediaDownloadFailed = false;
-				let mediaSizeLimitExceeded = false;
+				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;
@@ -2628,7 +2933,7 @@ function createMatrixRoomMessageHandler(params) {
 				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 (finalMediaUrl?.startsWith("mxc://")) try {
+				if (!media && !mediaDownloadFailed && finalMediaUrl?.startsWith("mxc://")) try {
 					media = await downloadMatrixMedia({
 						client,
 						mxcUrl: finalMediaUrl,
@@ -2651,7 +2956,7 @@ function createMatrixRoomMessageHandler(params) {
 						error: errorText
 					});
 				}
-				const bodyText = resolveMatrixInboundBodyText({
+				let bodyText = resolveMatrixInboundBodyText({
 					rawBody: locationPayload?.text ?? contentBody,
 					filename: typeof content.filename === "string" ? content.filename : void 0,
 					mediaPlaceholder: media?.placeholder,
@@ -2660,8 +2965,13 @@ function createMatrixRoomMessageHandler(params) {
 					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 commitInboundEventIfClaimed();
+					await commitInboundEventIfClaimedAndDiscardReserved();
 					return;
 				}
 				const commandBodyText = hasControlCommandInMessage ? commandCheckText : bodyText;
@@ -2678,6 +2988,7 @@ function createMatrixRoomMessageHandler(params) {
 							reason: "configured ACP binding unavailable",
 							target: _configuredBinding.spec.conversationId
 						});
+						discardReservedHistorySlot();
 						return;
 					}
 				}
@@ -2685,12 +2996,18 @@ function createMatrixRoomMessageHandler(params) {
 					const { getSessionBindingService } = await loadSessionBindingRuntime();
 					getSessionBindingService().touch(_runtimeBindingId, eventTs ?? void 0);
 				}
-				const preparedTrigger = isRoom && historyLimit > 0 ? roomHistoryTracker.prepareTrigger(_route.agentId, roomId, historyLimit, {
+				const preparedTrigger = isRoom && historyLimit > 0 ? reservedHistorySlot ? roomHistoryTracker.prepareReservedTrigger(_route.agentId, roomId, historyLimit, reservedHistorySlot, {
 					sender: senderName,
 					body: bodyText,
 					timestamp: eventTs ?? void 0,
 					messageId
-				}) : void 0;
+				}, 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,
@@ -2710,6 +3027,7 @@ function createMatrixRoomMessageHandler(params) {
 					bodyText,
 					commandBodyText,
 					media,
+					preflightAudioTranscript,
 					locationPayload,
 					messageId,
 					triggerSnapshot: preparedTrigger,
@@ -2724,7 +3042,14 @@ function createMatrixRoomMessageHandler(params) {
 				const prefix = await readIngressPrefix();
 				if (!prefix) return;
 				if (prefix.isDirectMessage) return { deferredPrefix: prefix };
-				return { ingressResult: await continueIngress(prefix) };
+				const result = await continueIngress({
+					...prefix,
+					audioPreflightMode: shouldDeferMatrixAudioPreflightForRoomIngress({
+						content: prefix.content,
+						cfg
+					}) ? "defer" : "run"
+				});
+				return result && "deferredPrefix" in result ? { deferredPrefix: result.deferredPrefix } : { ingressResult: result };
 			}) : void 0;
 			const resolvedIngressResult = historyLimit > 0 ? ingressResult?.deferredPrefix ? await continueIngress(ingressResult.deferredPrefix) : ingressResult?.ingressResult : await (async () => {
 				const prefix = await readIngressPrefix();
@@ -2732,7 +3057,8 @@ function createMatrixRoomMessageHandler(params) {
 				return await continueIngress(prefix);
 			})();
 			if (!resolvedIngressResult) return;
-			const { route: _route, hasExplicitSessionBinding, roomConfig, isDirectMessage, isRoom, shouldRequireMention, wasMentioned, shouldBypassMention, canDetectMention, commandAuthorized, inboundHistory, senderName, bodyText, commandBodyText, media, locationPayload, messageId, triggerSnapshot, threadRootId, thread, botLoopProtection, effectiveGroupAllowFrom, effectiveRoomUsers } = resolvedIngressResult;
+			if ("deferredPrefix" in resolvedIngressResult) return;
+			const { route: _route, hasExplicitSessionBinding, roomConfig, isDirectMessage, isRoom, shouldRequireMention, wasMentioned, 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) => {
@@ -2830,7 +3156,8 @@ function createMatrixRoomMessageHandler(params) {
 				media: toInboundMediaFacts(media ? [{
 					path: media.path,
 					url: media.path,
-					contentType: media.contentType
+					contentType: media.contentType,
+					transcribed: preflightAudioTranscript !== void 0
 				}] : void 0),
 				messageId,
 				timestamp: eventTs ?? void 0,
@@ -3157,6 +3484,7 @@ function createMatrixRoomMessageHandler(params) {
 								textLimit,
 								replyToMode,
 								threadId: threadTarget,
+								replyToId: threadTarget ?? replyToEventId ?? void 0,
 								accountId: _route.accountId,
 								mediaLocalRoots,
 								tableMode
@@ -3223,6 +3551,7 @@ function createMatrixRoomMessageHandler(params) {
 										textLimit,
 										replyToMode,
 										threadId: threadTarget,
+										replyToId: threadTarget ?? replyToEventId ?? void 0,
 										accountId: _route.accountId,
 										mediaLocalRoots,
 										tableMode
@@ -3262,6 +3591,7 @@ function createMatrixRoomMessageHandler(params) {
 								textLimit,
 								replyToMode,
 								threadId: threadTarget,
+								replyToId: threadTarget ?? replyToEventId ?? void 0,
 								accountId: _route.accountId,
 								mediaLocalRoots,
 								tableMode
@@ -3279,6 +3609,7 @@ function createMatrixRoomMessageHandler(params) {
 								textLimit,
 								replyToMode,
 								threadId: threadTarget,
+								replyToId: threadTarget ?? replyToEventId ?? void 0,
 								accountId: _route.accountId,
 								mediaLocalRoots,
 								tableMode
@@ -3303,6 +3634,7 @@ function createMatrixRoomMessageHandler(params) {
 						textLimit,
 						replyToMode,
 						threadId: threadTarget,
+						replyToId: threadTarget ?? replyToEventId ?? void 0,
 						accountId: _route.accountId,
 						mediaLocalRoots,
 						tableMode
@@ -3467,7 +3799,7 @@ function createMatrixRoomMessageHandler(params) {
 				await commitInboundEventIfClaimed();
 				return;
 			}
-			if (isRoom && triggerSnapshot) roomHistoryTracker.consumeHistory(_route.agentId, roomId, triggerSnapshot, messageId);
+			if (isRoom && triggerSnapshot) roomHistoryTracker.consumeHistory(_route.agentId, roomId, triggerSnapshot, messageId, threadRootId ? thread.threadId : void 0);
 			if (!hasFinalInboundReplyDispatch({
 				queuedFinal,
 				counts
@@ -3803,11 +4135,11 @@ function createMatrixRoomInfoResolver(client) {
 let matrixStartupMaintenanceDepsPromise;
 async function loadMatrixStartupMaintenanceDeps() {
 	matrixStartupMaintenanceDepsPromise ??= Promise.all([
-		import("./setup-core-CHX8Zcxh.js").then((n) => n.s),
+		import("./setup-core-DJosJdWt.js").then((n) => n.s),
 		import("./device-health-D4LBxuPq.js"),
-		import("./setup-core-CHX8Zcxh.js").then((n) => n.a),
+		import("./setup-core-DJosJdWt.js").then((n) => n.a),
 		import("./legacy-crypto-restore-CbVSppMd.js"),
-		import("./startup-verification-MAPgdkTX.js")
+		import("./startup-verification-D1p_LRmg.js")
 	]).then(([configUpdateModule, deviceHealthModule, profileModule, legacyCryptoRestoreModule, startupVerificationModule]) => ({
 		updateMatrixAccountConfig: configUpdateModule.updateMatrixAccountConfig,
 		summarizeMatrixDeviceHealth: deviceHealthModule.summarizeMatrixDeviceHealth,