@openclaw/matrix 2026.9.4 → 2026.9.6

package/dist/{monitor-BUek91SW.js → .setup/monitor-CzE3myC_.mjs}

@@ -1,47 +1,46 @@
-import { a as resolveMatrixAccountConfig, i as resolveMatrixAccountAllowlistConfig } from "./account-config-CRsKoMqJ.js";
-import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { n as resolveConfiguredMatrixBotUserIds } from "./accounts-GwSAk9vY.js";
-import { _ as toLocationContext, a as resolveMatrixRoomConfig, c as canonicalizeAllowlistWithResolvedIds, d as formatLocationText, f as getAgentScopedMediaLocalRoots, g as summarizeMapping, h as patchAllowlistUsersInConfigEntries, i as resolveMatrixThreadRouting, l as createReplyPrefixOptions, m as logTypingFailure, n as resolveMatrixStoredSessionMeta, o as addAllowlistUserEntriesFromConfigEntry, p as logInboundDrop, r as resolveMatrixInboundRoute, s as buildAllowlistResolutionSummary, u as createTypingCallbacks } from "./channel-Cg97H4c1.js";
-import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./channel.setup-DmS7m7aT.js";
-import { n as isMatrixRoomId, t as isMatrixQualifiedUserId } from "./target-ids-Nwx7cMVE.js";
-import { A as promoteMatrixDirectRoomCandidate, S as isPollStartType, c as formatMatrixMediaTooLargeText, d as isLikelyBareFilename, g as resolveMatrixThreadRootId, h as resolveMatrixReplyToEventId, l as formatMatrixMediaUnavailableText, p as resolveMatrixReplacementContent, r as sendMessageMatrix, u as formatMatrixMessageText, w as parsePollStartContent, x as isPollEventType, y as formatPollAsText } from "./send-UWLIQ0bG.js";
-import { i as isStrictDirectMembership, n as hasDirectMatrixMemberFlag, o as readJoinedMatrixMembers } from "./direct-room-RinHjtqX.js";
-import { n as MATRIX_REACTION_EVENT_TYPE } from "./reaction-common-DkrQdBSZ.js";
-import { n as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY } from "./types-DzSc7Sqm.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-Bwv87Gve.js";
-import { l as fetchMatrixPollSnapshot, r as readMatrixMessages } from "./messages-CpZfiQO0.js";
-import { a as throwIfMatrixStartupAborted, c as backfillMatrixAuthDeviceIdAfterStartup, i as isMatrixStartupAbortError, l as resolveMatrixAuth, n as acquireSharedMatrixClient, o as createMatrixMonitorTaskRunner, u as resolveMatrixAuthContext } from "./client-CPcRv6ab.js";
-import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-BfPeF4CE.js";
-import { n as prepareMatrixReplyPayload, r as resolveMatrixExtraContent } from "./outbound-D91JinYa.js";
-import { t as resolveMatrixTargets } from "./resolve-targets-K8D0HWPX.js";
-import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-mDyxJV9U.js";
-import { createMatrixInboundEventDeduper } from "./inbound-dedupe-Ch33GU06.js";
-import { a as isMatrixAccessTokenInvalidatedError, d as isMatrixDisconnectedSyncState, f as isMatrixReadySyncState, p as isMatrixTerminalSyncState } from "./client-support-DLj4vDeu.js";
-import { i as setBoundedMap, r as getMatrixRoomInfo, t as createMatrixRoomInfoResolver } from "./room-info-BPVJkXnp.js";
+import { t as getMatrixRuntime } from "./runtime-1kn1P6io.mjs";
+import { a as resolveMatrixAccountConfig, i as resolveMatrixAccountAllowlistConfig } from "./account-config-CRsKoMqJ.mjs";
+import { n as resolveConfiguredMatrixBotUserIds } from "./accounts-iThMol10.mjs";
+import { _ as toLocationContext, a as resolveMatrixRoomConfig, c as canonicalizeAllowlistWithResolvedIds, d as formatLocationText, f as getAgentScopedMediaLocalRoots, g as summarizeMapping, h as patchAllowlistUsersInConfigEntries, i as resolveMatrixThreadRouting, l as createReplyPrefixOptions, m as logTypingFailure, n as resolveMatrixStoredSessionMeta, o as addAllowlistUserEntriesFromConfigEntry, p as logInboundDrop, r as resolveMatrixInboundRoute, s as buildAllowlistResolutionSummary, u as createTypingCallbacks } from "./channel-ConuJfxT.mjs";
+import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./channel.setup-C6KvBV8l.mjs";
+import { n as isMatrixRoomId, t as isMatrixQualifiedUserId } from "./target-ids-Nwx7cMVE.mjs";
+import { a as MATRIX_REACTION_EVENT_TYPE } from "./send-currentness-BrGXL7b8.mjs";
+import { c as isStrictDirectMembership, f as resolveMatrixReplyToEventId, h as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, i as promoteMatrixDirectRoomCandidate, p as resolveMatrixThreadRootId, s as hasDirectMatrixMemberFlag, u as readJoinedMatrixMembers } from "./direct-management-B2Bno2xL.mjs";
+import { S as parsePollStartContent, _ as formatPollAsText, b as isPollStartType, c as formatMatrixMediaTooLargeText, d as isLikelyBareFilename, l as formatMatrixMediaUnavailableText, p as resolveMatrixReplacementContent, r as sendMessageMatrix, u as formatMatrixMessageText, y as isPollEventType } from "./send-aVdC5NJO.mjs";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-JlnLDfPM.mjs";
+import { i as readMatrixMessages, u as fetchMatrixPollSnapshot } from "./messages-COuAcrz-.mjs";
+import { c as createMatrixMonitorTaskRunner, d as resolveMatrixAuth, f as resolveMatrixAuthContext, l as getMatrixMonitorTaskSignal, o as isMatrixStartupAbortError, r as acquireSharedMatrixClient, s as throwIfMatrixStartupAborted, u as backfillMatrixAuthDeviceIdAfterStartup } from "./client-ChrXpxos.mjs";
+import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-Bi6uKmzh.mjs";
+import { n as prepareMatrixReplyPayload, r as resolveMatrixExtraContent } from "./outbound-B508VPBM.mjs";
+import { t as resolveMatrixTargets } from "./resolve-targets-BLz748lX.mjs";
+import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-CMWXiBzJ.mjs";
+import { createMatrixInboundEventDeduper } from "./inbound-dedupe-BSlv35xl.mjs";
+import { a as isMatrixAccessTokenInvalidatedError, d as isMatrixDisconnectedSyncState, f as isMatrixReadySyncState, p as isMatrixTerminalSyncState } from "./client-support-Bn9Bk0-H.mjs";
+import { i as setBoundedMap, r as getMatrixRoomInfo, t as createMatrixRoomInfoResolver } from "./room-info-DTyP1k5g.mjs";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
-import { createChannelProgressDraftCompositor, createPreviewMessageReceipt, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, resolveChannelStreamingBlockEnabled, waitUntilAbort } from "openclaw/plugin-sdk/channel-outbound";
+import { createChannelProgressDraftCompositor, createLivePreviewLifecycle, createPreviewMessageReceipt, resolveChannelStreamingBlockEnabled, waitUntilAbort } from "openclaw/plugin-sdk/channel-outbound";
 import { normalizeLowercaseStringOrEmpty, normalizeNullableString, normalizeOptionalString, normalizeStringifiedEntries, readStringValue, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { stripReasoningTagsFromText } from "openclaw/plugin-sdk/text-chunking";
 import { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
 import { extractErrorCode, formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
-import { isFutureDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs, resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
+import { isFutureDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs, resolveOptionalIntegerOption, resolvePromptHistoryLimit } from "openclaw/plugin-sdk/number-runtime";
 import { resolveAgentRoute, resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
 import { createAcceptedChannelDeliveryResult, createChannelInboundEnvelopeBuilder, createChannelPartialDeliveryError, hasFinalInboundReplyDispatch, isChannelPartialDeliveryError, resolveInboundMentionDecision, resolveInboundReplyDispatchCounts, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
 import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { escapeRegExp, sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
+import { buildTtsSupplementMediaPayload, getReplyPayloadTtsSupplement, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { format } from "node:util";
 import { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
-import { buildTtsSupplementMediaPayload, getReplyPayloadTtsSupplement, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runtime-context";
 import { GROUP_POLICY_BLOCKED_LABEL, resolveAllowlistProviderRuntimeGroupPolicy, resolveDefaultGroupPolicy, warnMissingProviderGroupPolicyFallbackOnce } from "openclaw/plugin-sdk/runtime-group-policy";
 import { resolveThreadBindingIdleTimeoutMsForChannel, resolveThreadBindingMaxAgeMsForChannel } from "openclaw/plugin-sdk/thread-bindings-runtime";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { reportChannelRoomJoin } from "openclaw/plugin-sdk/channel-join-intro-runtime";
-import { createChannelIngressResolver, defineStableChannelIngressIdentity } from "openclaw/plugin-sdk/channel-ingress-runtime";
+import { defineStableChannelIngressIdentity } from "openclaw/plugin-sdk/channel-ingress-runtime";
 import { resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
-import { evaluateSupplementalContextVisibility, resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
 import { getGlobalHookRunner } from "openclaw/plugin-sdk/plugin-runtime";
+import { evaluateSupplementalContextVisibility, resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
 import { resolveAckReaction } from "openclaw/plugin-sdk/channel-feedback";
 import { createChannelPreflightAudio, formatAudioTranscriptForAgent } from "openclaw/plugin-sdk/media-understanding-runtime";
 import { mergePairLoopGuardConfig } from "openclaw/plugin-sdk/pair-loop-guard-runtime";
@@ -739,7 +738,7 @@ async function resolveMatrixMonitorAccessState(params) {
 	});
 	const accountId = params.accountId ?? "default";
 	const eventKind = params.eventKind ?? "message";
-	const ingress = createChannelIngressResolver({
+	const ingress = getMatrixRuntime().channel.inbound.ingress.createResolver({
 		channelId: "matrix",
 		accountId,
 		identity: matrixIngressIdentity,
@@ -776,7 +775,7 @@ async function resolveMatrixMonitorAccessState(params) {
 async function resolveMatrixMonitorCommandAccess(state, params) {
 	const commandAllowFrom = state.isRoom ? [] : state.messageIngress.senderAccess.effectiveAllowFrom;
 	const commandGroupAllowFrom = state.effectiveRoomUsers.length > 0 ? state.effectiveRoomUsers : state.effectiveGroupAllowFrom;
-	return (await createChannelIngressResolver({
+	return (await getMatrixRuntime().channel.inbound.ingress.createResolver({
 		channelId: "matrix",
 		accountId: state.accountId,
 		identity: matrixIngressIdentity
@@ -837,7 +836,7 @@ const matrixVerificationConstants = {
 const MAX_TRACKED_VERIFICATION_EVENTS = 1024;
 const SAS_NOTICE_RETRY_DELAY_MS = 750;
 const VERIFICATION_EVENT_STARTUP_GRACE_MS = 3e4;
-const loadMatrixDirectRoomDeps = createLazyRuntimeModule(() => Promise.all([import("./send-UWLIQ0bG.js").then((n) => n.k), import("./direct-room-RinHjtqX.js").then((n) => n.t)]).then(([directManagementModule, directRoomModule]) => ({
+const loadMatrixDirectRoomDeps = createLazyRuntimeModule(() => Promise.all([import("./direct-management-B2Bno2xL.mjs").then((n) => n.t), import("./direct-management-B2Bno2xL.mjs").then((n) => n.o)]).then(([directManagementModule, directRoomModule]) => ({
 	inspectMatrixDirectRooms: directManagementModule.inspectMatrixDirectRooms,
 	isStrictDirectRoom: directRoomModule.isStrictDirectRoom
 })));
@@ -1649,17 +1648,14 @@ function formatMatrixToolProgressMarkdownCode(text) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler-runtime.ts
-async function redactMatrixDraftEvent(client, roomId, draftEventId) {
-	return await client.redactEvent(roomId, draftEventId).then(() => true, () => false);
-}
 function buildMatrixFinalizedPreviewContent() {
 	return { [MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY]: true };
 }
-const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-UWLIQ0bG.js").then((n) => n.s));
+const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-aVdC5NJO.mjs").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-2WM2nJe_.js"));
-const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream--NdEtnZ8.js"));
+const loadMatrixReactionEvents = createLazyRuntimeModule(() => import("./reaction-events-BvZmhjLC.mjs"));
+const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-y0Vq5f38.mjs"));
 async function matrixTextWouldActivateMentions(client, text) {
 	const { resolveMatrixMentionsForBody } = await loadMatrixSendModule();
 	const mentions = await resolveMatrixMentionsForBody({
@@ -1670,6 +1666,11 @@ async function matrixTextWouldActivateMentions(client, text) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/context-summary.ts
+const MAX_CONTEXT_BODY_LENGTH = 500;
+function truncateMatrixContextBody(value) {
+	if (value.length <= MAX_CONTEXT_BODY_LENGTH) return value;
+	return `${sliceUtf16Safe(value, 0, 497)}...`;
+}
 function summarizeMatrixMessageContextEvent(event) {
 	if (isPollStartType(event.type)) {
 		const pollSummary = parsePollStartContent(event.content);
@@ -1685,14 +1686,9 @@ function summarizeMatrixMessageContextEvent(event) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/reply-context.ts
 const MAX_CACHED_REPLY_CONTEXTS = 256;
-const MAX_REPLY_BODY_LENGTH = 500;
-function truncateReplyBody(value) {
-	if (value.length <= MAX_REPLY_BODY_LENGTH) return value;
-	return `${sliceUtf16Safe(value, 0, 497)}...`;
-}
 function summarizeMatrixReplyEvent(event) {
 	const body = summarizeMatrixMessageContextEvent(event);
-	return body ? truncateReplyBody(body) : void 0;
+	return body ? truncateMatrixContextBody(body) : void 0;
 }
 /**
 * Creates a cached resolver that fetches the body and sender of a replied-to
@@ -1702,11 +1698,7 @@ function summarizeMatrixReplyEvent(event) {
 function createMatrixReplyContextResolver(params) {
 	const cache = /* @__PURE__ */ new Map();
 	const remember = (key, value) => {
-		cache.set(key, value);
-		if (cache.size > MAX_CACHED_REPLY_CONTEXTS) {
-			const oldest = cache.keys().next().value;
-			if (typeof oldest === "string") cache.delete(oldest);
-		}
+		setBoundedMap(cache, key, value, MAX_CACHED_REPLY_CONTEXTS);
 		return value;
 	};
 	return async (input) => {
@@ -1738,14 +1730,9 @@ function createMatrixReplyContextResolver(params) {
 //#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, 497)}...`;
-}
 function summarizeMatrixThreadStarterEvent(event) {
 	const body = summarizeMatrixMessageContextEvent(event);
-	if (body) return truncateThreadStarterBody(body);
+	if (body) return truncateMatrixContextBody(body);
 	const content = event.content;
 	const msgtype = normalizeOptionalString(content.msgtype);
 	if (msgtype) return `Matrix ${msgtype} message`;
@@ -1761,11 +1748,7 @@ function formatMatrixThreadStarterBody(params) {
 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);
-		}
+		setBoundedMap(cache, key, value, MAX_TRACKED_THREAD_STARTERS);
 		return value;
 	};
 	return async (input) => {
@@ -1798,7 +1781,14 @@ function createMatrixThreadContextResolver(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler-context.ts
 async function resolveMatrixInboundContext(config) {
-	const { client, core, cfg, accountId, resolveMessageIngress, 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 { handler, ingress, roomId, event, eventTs, resolveThreadContext, resolveReplyContext, senderId, sharedDmContextNoticeRooms } = config;
+	const { client, core, accountId, runtime, logVerboseMessage, groupPolicy, getRoomInfo, historyLimit, dmSessionScope, resolveStorePath: resolveStorePathImpl, createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl, finalizeInboundContext } = handler;
+	const { cfg, resolveMessageIngress, route: _route, isDirectMessage, isRoom, effectiveRoomUsers, effectiveGroupAllowFrom, threadRootId, thread, senderName, bodyText, commandBodyText, roomConfig, messageId, inboundHistory, wasMentioned, effectiveWasMentioned, shouldBypassMention, canDetectMention, shouldRequireMention, commandAuthorized, locationPayload, media, preflightAudioTranscript, hasExplicitSessionBinding } = ingress;
+	const contextVisibilityMode = resolveChannelContextVisibilityMode({
+		cfg,
+		channel: "matrix",
+		accountId
+	});
 	const replyToEventId = resolveMatrixReplyToEventId(event.content);
 	const threadTarget = thread.threadId;
 	const isRoomContextSenderAllowed = (contextSenderId) => {
@@ -1870,6 +1860,7 @@ async function resolveMatrixInboundContext(config) {
 	const channelIngress = await resolveMessageIngress({
 		agentId: _route.agentId,
 		sessionKey: _route.sessionKey,
+		nativeChannelId: roomId,
 		messageId,
 		inboundEventKind: "user_request"
 	}, {
@@ -1917,9 +1908,7 @@ async function resolveMatrixInboundContext(config) {
 			threadId: threadTarget
 		},
 		route: {
-			agentId: _route.agentId,
-			dmScope: _route.dmScope,
-			accountId: _route.accountId,
+			..._route,
 			routeSessionKey: _route.sessionKey,
 			parentSessionKey: threadTarget && _route.matchedBy !== "binding.channel" ? _route.mainSessionKey : void 0
 		},
@@ -1993,7 +1982,6 @@ async function resolveMatrixInboundContext(config) {
 //#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 draftDisposition = "active";
 	const draftStreamingEnabled = streaming !== "off";
 	const quietDraftStreaming = streaming === "quiet" || streaming === "progress";
 	const progressDraftStreaming = streaming === "progress";
@@ -2019,6 +2007,7 @@ async function createMatrixDraftController(params) {
 	const progressConfigEntry = accountConfig ?? cfg.channels?.matrix;
 	const progressSeed = `${accountId}:${roomId}`;
 	const progressDraft = createChannelProgressDraftCompositor({
+		preparedItems: true,
 		entry: progressConfigEntry,
 		mode: streaming === "quiet" ? "partial" : streaming,
 		active: Boolean(draftStream),
@@ -2033,10 +2022,25 @@ async function createMatrixDraftController(params) {
 		},
 		deleteCurrent: () => draftStream?.deleteCurrentMessage()
 	});
+	const previewLifecycle = createLivePreviewLifecycle({
+		draft: draftStream ? {
+			flush: draftStream.flush,
+			id: draftStream.eventId,
+			seal: draftStream.seal,
+			discardPending: draftStream.discardPending,
+			clear: draftStream.clear
+		} : void 0,
+		cleanupUndelivered: true,
+		onFinalStarted: () => progressDraft.markFinalReplyStarted(),
+		onFinalDelivered: () => progressDraft.markFinalReplyDelivered(),
+		onCleanupFailure: (err) => logVerboseMessage(`matrix draft preview cleanup failed: ${String(err)}`)
+	});
 	const buildPreviewToolProgressReplyOptions = () => {
 		if (!shouldSuppressDefaultToolProgressMessages) return {};
 		return {
 			suppressDefaultToolProgressMessages: true,
+			progressPreambleEnabled: true,
+			commentaryProgressEnabled: progressDraft.commentaryProgressEnabled,
 			onToolStart: async (payload) => {
 				return await progressDraft.pushToolEvent(payload);
 			},
@@ -2045,16 +2049,13 @@ async function createMatrixDraftController(params) {
 			},
 			onPlanUpdate: async (payload) => {
 				if (payload.phase !== "update") return false;
-				return await progressDraft.pushPlanProgress(payload.steps, { explanation: payload.explanation });
+				return await progressDraft.pushPlanProgress(payload.steps, {
+					explanation: payload.explanation,
+					explanationFormat: payload.explanationFormat
+				});
 			},
 			onApprovalEvent: async (payload) => {
 				return await progressDraft.pushApprovalEvent(payload);
-			},
-			onCommandOutput: async (payload) => {
-				return await progressDraft.pushCommandOutputEvent(payload);
-			},
-			onPatchSummary: async (payload) => {
-				return await progressDraft.pushPatchEvent(payload);
 			}
 		};
 	};
@@ -2094,7 +2095,7 @@ async function createMatrixDraftController(params) {
 	const resetDraftDeliveryState = async () => {
 		await draftStream?.discardPending();
 		draftStream?.reset();
-		draftDisposition = "active";
+		previewLifecycle.reset();
 		currentDraftMessageGeneration = 0;
 		currentDraftBlockOffset = 0;
 		latestDraftFullText = "";
@@ -2105,6 +2106,7 @@ async function createMatrixDraftController(params) {
 	};
 	return {
 		draftStream,
+		previewLifecycle,
 		cancelProgressDraft: () => progressDraft.cancel(),
 		buildPreviewToolProgressReplyOptions,
 		queueDraftBlockBoundary,
@@ -2113,16 +2115,9 @@ async function createMatrixDraftController(params) {
 		beginAssistantMessage: () => progressDraft.beginAssistantMessage(),
 		resetDraftDeliveryState,
 		updateDraftFromLatestFullText,
-		draftDisposition: () => draftDisposition,
 		beginDraftGeneration: () => {
-			draftDisposition = "active";
-			progressDraft.resetActivity();
-		},
-		markDraftConsumed: () => {
-			draftDisposition = "consumed";
-		},
-		markDraftRetained: () => {
-			draftDisposition = "retained";
+			previewLifecycle.reset();
+			progressDraft.beginNewTurn({ force: true });
 		},
 		currentReplyToId: () => currentDraftReplyToId,
 		setCurrentReplyToId: (replyToId) => {
@@ -2152,7 +2147,7 @@ const MAX_WATERMARK_ENTRIES = 5e3;
 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) {
+function createRoomHistoryTracker(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();
@@ -2368,18 +2363,6 @@ function createRoomHistoryTrackerInternal(maxQueueSize = DEFAULT_MAX_QUEUE_SIZE,
 		}
 	};
 }
-function createRoomHistoryTracker(maxQueueSize = DEFAULT_MAX_QUEUE_SIZE, maxRoomQueues = DEFAULT_MAX_ROOM_QUEUES, maxWatermarkEntries = MAX_WATERMARK_ENTRIES, maxPreparedTriggerEntries = MAX_PREPARED_TRIGGER_ENTRIES) {
-	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
-	};
-}
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler-ingress-access.ts
 async function resolveMatrixIngressAccess(config) {
@@ -2586,46 +2569,24 @@ async function resolveMatrixIngressAccess(config) {
 //#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
-		}) };
+async function downloadMatrixMedia(params) {
+	if (typeof params.sizeBytes === "number" && params.sizeBytes > params.maxBytes) throw new MatrixMediaSizeLimitError();
+	const options = {
+		maxBytes: params.maxBytes,
+		readIdleTimeoutMs: MATRIX_MEDIA_DOWNLOAD_IDLE_TIMEOUT_MS
+	};
+	let buffer;
+	if (params.file) {
+		if (!params.client.crypto) throw new Error("Cannot decrypt media: crypto not enabled");
+		buffer = await params.client.crypto.decryptMedia(params.file, options);
+		if (buffer.byteLength > params.maxBytes) throw new MatrixMediaSizeLimitError();
+	} else try {
+		buffer = await params.client.downloadContent(params.mxcUrl, options);
 	} 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);
+	const saved = await getMatrixRuntime().channel.media.saveMediaBuffer(buffer, params.contentType, "inbound", params.maxBytes, params.originalFilename);
 	return {
 		path: saved.path,
 		contentType: saved.contentType,
@@ -2803,9 +2764,35 @@ async function resolveMatrixIngressContent(config) {
 		return;
 	}
 	let preflightMedia = null;
-	let preflightMediaDownloadFailed = false;
-	let preflightMediaSizeLimitExceeded = false;
+	let mediaDownloadFailed = false;
+	let mediaSizeLimitExceeded = false;
 	let preflightAudioTranscript;
+	const downloadMedia = async (mxcUrl) => {
+		try {
+			return await downloadMatrixMedia({
+				client,
+				mxcUrl,
+				contentType: mediaContent.contentType,
+				sizeBytes: mediaContent.sizeBytes,
+				maxBytes: mediaMaxBytes,
+				file: mediaContent.file,
+				originalFilename: mediaContent.originalFilename
+			});
+		} catch (err) {
+			mediaDownloadFailed = true;
+			mediaSizeLimitExceeded = isMatrixMediaSizeLimitError(err);
+			const errorText = formatErrorMessage(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(mediaContent.file),
+				error: errorText
+			});
+			return null;
+		}
+	};
 	const { route: _route, configuredBinding: _configuredBinding, runtimeBindingId: _runtimeBindingId } = resolveMatrixInboundRoute({
 		cfg,
 		accountId,
@@ -2836,29 +2823,7 @@ async function resolveMatrixIngressContent(config) {
 		} };
 	}
 	if (shouldRunMatrixAudioPreflight) {
-		try {
-			preflightMedia = await downloadMatrixMedia({
-				client,
-				mxcUrl: preflightAudioMediaUrl,
-				contentType: mediaContent.contentType,
-				sizeBytes: mediaContent.sizeBytes,
-				maxBytes: mediaMaxBytes,
-				file: mediaContent.file,
-				originalFilename: mediaContent.originalFilename
-			});
-		} catch (err) {
-			preflightMediaDownloadFailed = true;
-			if (isMatrixMediaSizeLimitError(err)) preflightMediaSizeLimitExceeded = true;
-			const errorText = formatErrorMessage(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(mediaContent.file),
-				error: errorText
-			});
-		}
+		preflightMedia = await downloadMedia(preflightAudioMediaUrl);
 		if (preflightMedia) preflightAudioTranscript = await resolveMatrixPreflightAudioTranscript({
 			mediaPath: preflightMedia.path,
 			mediaContentType: preflightMedia.contentType,
@@ -2975,32 +2940,8 @@ async function resolveMatrixIngressContent(config) {
 		mediaContent = resolveMatrixInboundMediaContent(content);
 	}
 	let media = preflightMedia;
-	let mediaDownloadFailed = preflightMediaDownloadFailed;
-	let mediaSizeLimitExceeded = preflightMediaSizeLimitExceeded;
 	const finalMediaUrl = mediaContent.url;
-	if (!media && !mediaDownloadFailed && finalMediaUrl?.startsWith("mxc://")) try {
-		media = await downloadMatrixMedia({
-			client,
-			mxcUrl: finalMediaUrl,
-			contentType: mediaContent.contentType,
-			sizeBytes: mediaContent.sizeBytes,
-			maxBytes: mediaMaxBytes,
-			file: mediaContent.file,
-			originalFilename: mediaContent.originalFilename
-		});
-	} catch (err) {
-		mediaDownloadFailed = true;
-		if (isMatrixMediaSizeLimitError(err)) mediaSizeLimitExceeded = true;
-		const errorText = formatErrorMessage(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(mediaContent.file),
-			error: errorText
-		});
-	}
+	if (!media && !mediaDownloadFailed && finalMediaUrl?.startsWith("mxc://")) media = await downloadMedia(finalMediaUrl);
 	let bodyText = resolveMatrixInboundBodyText({
 		rawBody: locationPayload?.text ?? mediaContent.body,
 		filename: typeof content.filename === "string" ? content.filename : void 0,
@@ -3204,6 +3145,8 @@ function joinMatrixVisibleContent(contents) {
 	return contents.filter((content) => Boolean(content)).join("\n");
 }
 function mergeMatrixReplyDeliveryResults(results) {
+	const single = results.length === 1 ? results[0] : void 0;
+	if (single?.visibleReplySent) return single;
 	const visibleResults = results.filter((result) => result.visibleReplySent);
 	if (visibleResults.length === 0) return {
 		visibleReplySent: false,
@@ -3320,7 +3263,20 @@ function createMatrixReplyDispatcher(config) {
 	const { cfg, prefixOptions, humanDelay, typingCallbacks, streaming, draftStream, draftController, client, roomId, runtime, replyToMode, threadTarget, replyToEventId, accountId, mediaLocalRoots, logVerboseMessage } = config;
 	const quietDraftStreaming = streaming === "quiet" || streaming === "progress";
 	const hasRepliedRef = { value: false };
-	let finalReplyDeliveryFailed = false;
+	const deliverPayload = (reply) => deliverMatrixReplies({
+		cfg,
+		replies: [reply],
+		roomId,
+		client,
+		runtime,
+		replyToMode,
+		hasRepliedRef,
+		threadId: threadTarget,
+		replyToId: threadTarget ?? replyToEventId ?? void 0,
+		accountId,
+		mediaLocalRoots
+	});
+	const { previewLifecycle } = draftController;
 	let nonFinalReplyDeliveryFailed = false;
 	const beginNextBlockDraft = () => {
 		draftController.beginDraftGeneration();
@@ -3354,247 +3310,75 @@ function createMatrixReplyDispatcher(config) {
 					content
 				};
 			};
-			const settleDraftReplacement = async (params) => {
-				const draftDelivery = createDraftDeliveryResult(params.draftEventId, params.draftContent);
-				let replacement;
-				try {
-					replacement = await params.deliver();
-				} catch (error) {
-					draftController.markDraftRetained();
-					throw toMatrixPartialDeliveryError(error, [draftDelivery]);
-				}
-				if (!replacement.visibleReplySent) {
-					draftController.markDraftRetained();
-					return draftDelivery;
-				}
-				if (!await redactMatrixDraftEvent(client, roomId, params.draftEventId)) {
-					draftController.markDraftRetained();
-					return mergeMatrixReplyDeliveryResults([draftDelivery, replacement]);
-				}
-				draftController.markDraftConsumed();
-				return replacement;
-			};
-			if (draftStream && info.kind !== "tool" && !payload.isCompactionNotice) {
-				const { hasMedia } = resolveSendableOutboundReplyParts(payload);
-				const ttsSupplement = getReplyPayloadTtsSupplement(payload);
-				const fallbackPayload = ttsSupplement && ttsSupplement.visibleTextAlreadyDelivered !== true && !payload.text?.trim() ? {
-					...payload,
-					text: ttsSupplement.spokenText
-				} : payload;
-				if (draftController.draftDisposition() !== "active") {
-					await draftStream.discardPending();
-					return await completeDelivery(await deliverMatrixReplies({
-						cfg,
-						replies: [fallbackPayload],
-						roomId,
-						client,
-						runtime,
-						replyToMode,
-						hasRepliedRef,
-						threadId: threadTarget,
-						replyToId: threadTarget ?? replyToEventId ?? void 0,
-						accountId,
-						mediaLocalRoots
-					}));
-				}
-				const payloadReplyMismatch = (!threadTarget && replyToMode !== "off" || payload.replyToTag || payload.replyToCurrent) && normalizeOptionalString(payload.replyToId) !== draftController.currentReplyToId();
-				let mustDeliverFinalNormally = draftStream.mustDeliverFinalNormally();
-				if (Boolean(payload.text?.trim()) && !payload.isError && !payloadReplyMismatch && !mustDeliverFinalNormally) {
-					await draftStream.stop();
-					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;
-					const { prepareMatrixSingleText } = await loadMatrixSendModule();
-					const preparedFinalPreviewContent = prepareMatrixSingleText(finalPreviewText, {
-						cfg,
-						accountId,
-						preserveWhitespace: true
-					}).convertedText;
-					let finalizedDraftContent = draftStream.content() ?? preparedFinalPreviewContent;
-					let fallbackResult;
-					const previewResult = await deliverWithFinalizableLivePreviewAdapter({
-						kind: "final",
-						payload,
-						adapter: defineFinalizableLivePreviewAdapter({
-							draft: {
-								flush: async () => {},
-								clear: async () => {},
-								discardPending: async () => {},
-								id: () => draftEventId
-							},
-							buildFinalEdit: () => {
-								const presentationContent = resolveMatrixExtraContent(payload);
-								const extraContent = {
-									...quietDraftStreaming ? buildMatrixFinalizedPreviewContent() : {},
-									...presentationContent
-								};
-								return {
-									text: finalPreviewText,
-									finalizeLive: !(quietDraftStreaming || Boolean(presentationContent) || !draftStream.matchesPreparedText(finalPreviewText)),
-									...Object.keys(extraContent).length > 0 ? { extraContent } : {}
-								};
-							},
-							editFinal: async (_draftEventId, edit) => {
-								if (edit.finalizeLive) {
-									if (!await draftStream.finalizeLive()) throw new Error("Matrix draft live finalize failed");
-									finalizedDraftContent = draftStream.content() ?? preparedFinalPreviewContent;
-									return;
-								}
-								const { editMessageMatrix } = await loadMatrixSendModule();
-								await editMessageMatrix(roomId, _draftEventId, edit.text, {
-									client,
-									cfg,
-									threadId: threadTarget,
-									accountId,
-									extraContent: edit.extraContent
-								});
-								finalizedDraftContent = prepareMatrixSingleText(edit.text, {
-									cfg,
-									accountId,
-									preserveWhitespace: true
-								}).convertedText;
-							},
-							createPreviewReceipt: createDraftReceipt,
-							logPreviewEditFailure: (err) => {
-								logVerboseMessage(`matrix: preview final edit failed: ${String(err)}`);
-							}
-						}),
-						deliverNormally: async () => {
-							fallbackResult = await settleDraftReplacement({
-								draftEventId,
-								draftContent: draftStream.content() ?? preparedFinalPreviewContent,
-								deliver: async () => await deliverMatrixReplies({
-									cfg,
-									replies: [fallbackPayload],
-									roomId,
-									client,
-									runtime,
-									replyToMode,
-									hasRepliedRef,
-									threadId: threadTarget,
-									replyToId: threadTarget ?? replyToEventId ?? void 0,
-									accountId,
-									mediaLocalRoots
-								})
+			const settlesPreview = Boolean(draftStream) && info.kind !== "tool" && !payload.isCompactionNotice;
+			const ttsSupplement = getReplyPayloadTtsSupplement(payload);
+			const fallbackPayload = settlesPreview && ttsSupplement && ttsSupplement.visibleTextAlreadyDelivered !== true && !payload.text?.trim() ? {
+				...payload,
+				text: ttsSupplement.spokenText
+			} : payload;
+			const { hasMedia } = resolveSendableOutboundReplyParts(payload);
+			const payloadText = payload.text ?? ttsSupplement?.spokenText;
+			const payloadReplyMismatch = (!threadTarget && replyToMode !== "off" || payload.replyToTag || payload.replyToCurrent) && normalizeOptionalString(payload.replyToId) !== draftController.currentReplyToId();
+			let retainedDraftDelivery;
+			let deliveryResult;
+			try {
+				deliveryResult = (await previewLifecycle.deliver({
+					kind: payload.isCompactionNotice ? "tool" : info.kind === "block" ? "final" : info.kind,
+					payload,
+					isError: payload.isError,
+					adapter: draftStream ? {
+						buildFinalEdit: () => payloadText?.trim() && !payload.isError && !payloadReplyMismatch && !draftStream.mustDeliverFinalNormally() ? { text: payloadText } : void 0,
+						editFinal: async (draftEventId, edit) => {
+							if (draftStream.mustDeliverFinalNormally() || await matrixTextWouldActivateMentions(client, edit.text)) return { visibleReplySent: false };
+							const { editMessageMatrix, prepareMatrixSingleText } = await loadMatrixSendModule();
+							const presentationContent = hasMedia ? void 0 : resolveMatrixExtraContent(payload);
+							const extraContent = {
+								...quietDraftStreaming ? buildMatrixFinalizedPreviewContent() : {},
+								...presentationContent
+							};
+							if (!quietDraftStreaming && !presentationContent && draftStream.matchesPreparedText(edit.text)) {
+								if (!await draftStream.finalizeLive()) return { visibleReplySent: false };
+							} else await editMessageMatrix(roomId, draftEventId, edit.text, {
+								client,
+								cfg,
+								threadId: threadTarget,
+								accountId,
+								...Object.keys(extraContent).length > 0 ? { extraContent } : {}
 							});
-							return fallbackResult.visibleReplySent;
-						}
-					});
-					if (previewResult.kind === "preview-finalized") draftController.markDraftConsumed();
-					return await completeDelivery(previewResult.kind === "preview-finalized" && previewResult.liveState?.receipt ? createDraftDeliveryResult(draftEventId, finalizedDraftContent ?? preparedFinalPreviewContent) : fallbackResult ?? mergeMatrixReplyDeliveryResults([]));
-				} else if (draftEventId && hasMedia && !payloadReplyMismatch) {
-					let textEditOk = !mustDeliverFinalNormally;
-					const payloadText = payload.text ?? ttsSupplement?.spokenText;
-					const preparedPayloadContent = typeof payloadText === "string" ? (await loadMatrixSendModule()).prepareMatrixSingleText(payloadText, {
-						cfg,
-						accountId,
-						preserveWhitespace: true
-					}).convertedText : void 0;
-					let finalizedDraftContent = draftStream.content() ?? preparedPayloadContent;
-					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, prepareMatrixSingleText } = await loadMatrixSendModule();
-						textEditOk = await editMessageMatrix(roomId, draftEventId, payloadText, {
-							client,
-							cfg,
-							threadId: threadTarget,
-							accountId,
-							extraContent: quietDraftStreaming ? buildMatrixFinalizedPreviewContent() : void 0
-						}).then(() => {
-							finalizedDraftContent = prepareMatrixSingleText(payloadText, {
+							return createDraftDeliveryResult(draftEventId, prepareMatrixSingleText(edit.text, {
 								cfg,
 								accountId,
 								preserveWhitespace: true
-							}).convertedText;
-							return true;
-						}, () => false);
-					} else if (textEditOk && reusesDraftTextUnchanged) {
-						textEditOk = await draftStream.finalizeLive();
-						finalizedDraftContent = draftStream.content();
-					}
-					const reusesDraftAsFinalText = Boolean(payloadText?.trim()) && textEditOk;
-					const draftContent = draftStream.content();
-					const mediaPayload = ttsSupplement && reusesDraftAsFinalText ? buildTtsSupplementMediaPayload(payload) : {
-						...payload,
-						text: reusesDraftAsFinalText ? void 0 : payload.text ?? (ttsSupplement?.visibleTextAlreadyDelivered === true ? void 0 : ttsSupplement?.spokenText)
-					};
-					const providerDraftContent = finalizedDraftContent ?? preparedPayloadContent;
-					const previewDelivery = reusesDraftAsFinalText && providerDraftContent ? createDraftDeliveryResult(draftEventId, providerDraftContent) : draftContent ? createDraftDeliveryResult(draftEventId, draftContent) : mergeMatrixReplyDeliveryResults([]);
-					const deliverMedia = async () => await deliverMatrixReplies({
-						cfg,
-						replies: [mediaPayload],
-						roomId,
-						client,
-						runtime,
-						replyToMode,
-						hasRepliedRef,
-						threadId: threadTarget,
-						replyToId: threadTarget ?? replyToEventId ?? void 0,
-						accountId,
-						mediaLocalRoots
-					});
-					if (reusesDraftAsFinalText) {
-						draftController.markDraftConsumed();
-						let mediaDelivery;
-						try {
-							mediaDelivery = await deliverMedia();
-						} catch (error) {
-							throw toMatrixPartialDeliveryError(error, [previewDelivery]);
+							}).convertedText);
+						},
+						createPreviewReceipt: createDraftReceipt,
+						buildSupplementalPayload: () => hasMedia ? ttsSupplement ? buildTtsSupplementMediaPayload(payload) : {
+							...payload,
+							text: void 0
+						} : void 0,
+						deliverSupplemental: deliverPayload,
+						logPreviewEditFailure: (err) => {
+							logVerboseMessage(`matrix: preview final edit failed: ${String(err)}`);
+						}
+					} : void 0,
+					deliverNormally: async (normalPayload) => {
+						if (settlesPreview && !previewLifecycle.previewFinalized && (hasMedia || payloadText?.trim() || payload.isError || payloadReplyMismatch || draftStream?.mustDeliverFinalNormally())) {
+							const id = draftStream?.eventId();
+							const content = draftStream?.content();
+							if (id && content) retainedDraftDelivery = createDraftDeliveryResult(id, content);
 						}
-						return await completeDelivery(mergeMatrixReplyDeliveryResults([previewDelivery, mediaDelivery]));
+						return await deliverPayload(normalPayload === payload ? fallbackPayload : normalPayload);
 					}
-					if (draftContent) return await completeDelivery(await settleDraftReplacement({
-						draftEventId,
-						draftContent,
-						deliver: deliverMedia
-					}));
-					return await completeDelivery(await deliverMedia());
-				}
-				const shouldRedactDraft = Boolean(draftEventId) && (payload.isError || payloadReplyMismatch || mustDeliverFinalNormally || draftFinalTextNeedsNormalMentionDelivery);
-				const deliverFallback = async () => await deliverMatrixReplies({
-					cfg,
-					replies: [fallbackPayload],
-					roomId,
-					client,
-					runtime,
-					replyToMode,
-					hasRepliedRef,
-					threadId: threadTarget,
-					replyToId: threadTarget ?? replyToEventId ?? void 0,
-					accountId,
-					mediaLocalRoots
-				});
-				const draftContent = draftStream.content();
-				if (shouldRedactDraft && draftEventId && draftContent) return await completeDelivery(await settleDraftReplacement({
-					draftEventId,
-					draftContent,
-					deliver: deliverFallback
-				}));
-				return await completeDelivery(await deliverFallback());
+				})).deliveryResult;
+			} catch (error) {
+				if (retainedDraftDelivery) previewLifecycle.retainPreview();
+				throw toMatrixPartialDeliveryError(error, retainedDraftDelivery ? [retainedDraftDelivery] : []);
 			}
-			return await completeDelivery(await deliverMatrixReplies({
-				cfg,
-				replies: [payload],
-				roomId,
-				client,
-				runtime,
-				replyToMode,
-				hasRepliedRef,
-				threadId: threadTarget,
-				replyToId: threadTarget ?? replyToEventId ?? void 0,
-				accountId,
-				mediaLocalRoots
-			}));
+			if (retainedDraftDelivery && !deliveryResult?.visibleReplySent) previewLifecycle.retainPreview();
+			return await completeDelivery(mergeMatrixReplyDeliveryResults([retainedDraftDelivery?.messageIds?.includes(draftStream?.eventId() ?? "") ? retainedDraftDelivery : void 0, deliveryResult].filter((result) => result !== void 0)));
 		},
 		onError: (err, info) => {
-			if (info.kind === "final") finalReplyDeliveryFailed = true;
+			if (info.kind === "final") previewLifecycle.observeFailure();
 			else nonFinalReplyDeliveryFailed = true;
 			if (info.kind === "block") beginNextBlockDraft();
 			runtime.error?.(`matrix ${info.kind} reply failed: ${String(err)}`);
@@ -3606,7 +3390,6 @@ function createMatrixReplyDispatcher(config) {
 		deliverReply,
 		onReplyError,
 		turnDispatcherOptions,
-		finalReplyDeliveryFailed: () => finalReplyDeliveryFailed,
 		nonFinalReplyDeliveryFailed: () => nonFinalReplyDeliveryFailed
 	};
 }
@@ -3718,7 +3501,7 @@ function createMatrixHandlerState(config) {
 const SESSION_RESTART_RECOVERY_TOMBSTONE_ERROR_CODE = "SESSION_RESTART_RECOVERY_TOMBSTONE";
 const RESTART_RECOVERY_TOMBSTONE_NOTICE = "This session ended during gateway restart recovery and cannot accept more messages. Send /new or /reset to start a replacement session.";
 function createMatrixRoomMessageHandler(params) {
-	const { client, core, cfg: startupConfig, accountId, runtime, logger, logVerboseMessage, allowFromResolvedEntries = [], groupAllowFromResolvedEntries = [], configuredBotUserIds = /* @__PURE__ */ new Set(), groupPolicy, replyToMode, dmSessionScope, streaming, previewToolProgressEnabled, blockStreamingEnabled, historyLimit, startupMs, startupGraceMs, dropPreStartupMessages, inboundDeduper, directTracker, getRoomInfo, getMemberDisplayName, resolveLiveUserAllowlist = resolveMatrixMonitorLiveUserAllowlist, resolveStorePath: resolveStorePathImpl = resolveStorePath, createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl = createChannelInboundEnvelopeBuilder, finalizeInboundContext, resolveHumanDelayConfig: resolveHumanDelayConfigImpl = resolveHumanDelayConfig } = params;
+	const { client, core, cfg: startupConfig, accountId, runtime, logger, logVerboseMessage, allowFromResolvedEntries = [], groupAllowFromResolvedEntries = [], configuredBotUserIds = /* @__PURE__ */ new Set(), replyToMode, streaming, previewToolProgressEnabled, blockStreamingEnabled, historyLimit, startupMs, startupGraceMs, dropPreStartupMessages, inboundDeduper, directTracker, getMemberDisplayName, resolveLiveUserAllowlist = resolveMatrixMonitorLiveUserAllowlist, resolveStorePath: resolveStorePathImpl = resolveStorePath, createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl = createChannelInboundEnvelopeBuilder, resolveHumanDelayConfig: resolveHumanDelayConfigImpl = resolveHumanDelayConfig } = params;
 	const handlerConfig = {
 		...params,
 		allowFromResolvedEntries,
@@ -3846,58 +3629,17 @@ function createMatrixRoomMessageHandler(params) {
 			})();
 			if (!resolvedIngressResult) return;
 			if ("deferredPrefix" in resolvedIngressResult) return;
-			const { cfg, liveDmAllowFrom, 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, resolveMessageIngress } = resolvedIngressResult;
-			const contextVisibilityMode = resolveChannelContextVisibilityMode({
-				cfg,
-				channel: "matrix",
-				accountId
-			});
+			const { cfg, liveDmAllowFrom, route: _route, roomConfig, isDirectMessage, isRoom, bodyText, messageId, triggerSnapshot, threadRootId, thread, botLoopProtection } = resolvedIngressResult;
 			const inboundContext = await resolveMatrixInboundContext({
-				resolveMessageIngress,
-				client,
-				core,
-				cfg,
-				accountId,
-				runtime,
-				logVerboseMessage,
+				handler: handlerConfig,
+				ingress: resolvedIngressResult,
 				roomId,
 				event,
 				eventTs: eventTs ?? void 0,
-				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
+				sharedDmContextNoticeRooms
 			});
 			if (!inboundContext) return;
 			const { replyToEventId, threadTarget, storePath, ctxPayload, replyTarget, sharedDmContextNotice } = inboundContext;
@@ -4078,6 +3820,7 @@ function createMatrixRoomMessageHandler(params) {
 							} : void 0,
 							onQueuedFollowupAdmitted: draftStream ? draftController.resetDraftDeliveryState : void 0,
 							...draftController.buildPreviewToolProgressReplyOptions(),
+							onObservedReplyDelivery: draftStream ? () => draftController.previewLifecycle.observeDelivery({ visibleReplySent: true }) : void 0,
 							onModelSelected
 						}
 					})
@@ -4114,7 +3857,7 @@ function createMatrixRoomMessageHandler(params) {
 			}
 			const { dispatchResult } = turnResult;
 			const { queuedFinal } = dispatchResult;
-			if (replyDispatcher.finalReplyDeliveryFailed()) {
+			if (draftController.previewLifecycle.finalFailed) {
 				logVerboseMessage(`matrix: final reply delivery failed room=${roomId} id=${messageId}; keeping replay committed`);
 				await commitInboundEventIfClaimed();
 				return;
@@ -4134,13 +3877,14 @@ function createMatrixRoomMessageHandler(params) {
 			await commitInboundEventIfClaimed();
 		} catch (err) {
 			const draftController = draftControllerRef;
-			if (draftController?.draftStream?.eventId() && draftController.draftDisposition() === "active") draftController.markDraftRetained();
+			if (draftController?.draftStream?.eventId()) draftController.previewLifecycle.retainPreview();
 			runtime.error?.(`matrix handler failed: ${String(err)}`);
 		} finally {
 			const draftStream = draftControllerRef?.draftStream;
 			if (draftStream) {
-				const draftEventId = await draftStream.stop().catch(() => void 0);
-				if (draftEventId && draftControllerRef?.draftDisposition() === "active") await redactMatrixDraftEvent(client, roomId, draftEventId);
+				await draftStream.stop().catch(() => void 0);
+				await draftControllerRef?.previewLifecycle.cleanup();
+				await draftStream.cleanupPending();
 			}
 			inboundReplayClaim?.release();
 		}
@@ -4161,10 +3905,10 @@ function shouldPromoteRecentInviteRoom(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/startup.ts
 const loadMatrixStartupMaintenanceDeps = createLazyRuntimeModule(() => Promise.all([
-	import("./config-update-BnX26jCO.js").then((n) => n.t),
-	import("./device-health-B4-YXtJR.js").then((n) => n.t),
-	import("./profile-vmjsmhh4.js").then((n) => n.n),
-	import("./startup-verification-BTSf31hS.js")
+	import("./config-update-B_4qZ5bV.mjs").then((n) => n.t),
+	import("./device-health-CWOuIirq.mjs").then((n) => n.t),
+	import("./profile-ClrB3IgR.mjs").then((n) => n.n),
+	import("./startup-verification-Cp1Gf7pM.mjs")
 ]).then(([configUpdateModule, deviceHealthModule, profileModule, startupVerificationModule]) => ({
 	updateMatrixAccountConfig: configUpdateModule.updateMatrixAccountConfig,
 	summarizeMatrixDeviceHealth: deviceHealthModule.summarizeMatrixDeviceHealth,
@@ -4437,10 +4181,6 @@ async function monitorMatrixProvider(opts = {}) {
 	let needsRoomAliasesForConfig = false;
 	const initialAllowFrom = (accountConfig.dm?.allowFrom ?? []).map(String);
 	const initialGroupAllowFrom = (accountConfig.groupAllowFrom ?? []).map(String);
-	const configuredBotUserIds = resolveConfiguredMatrixBotUserIds({
-		cfg,
-		accountId: effectiveAccountId
-	});
 	const { allowFrom, allowFromResolvedEntries, groupAllowFrom, groupAllowFromResolvedEntries, roomsConfig: resolvedRoomsConfig } = await resolveMatrixMonitorConfig({
 		cfg,
 		accountId: effectiveAccountId,
@@ -4470,6 +4210,13 @@ async function monitorMatrixProvider(opts = {}) {
 		cfg,
 		accountId: effectiveAccountId
 	});
+	if (opts.abortSignal?.aborted) return;
+	const configuredBotUserIds = await resolveConfiguredMatrixBotUserIds({
+		cfg,
+		accountId: effectiveAccountId,
+		abortSignal: opts.abortSignal
+	});
+	if (opts.abortSignal?.aborted) return;
 	const resolvedInitialSyncLimit = resolveOptionalIntegerOption(opts.initialSyncLimit, { min: 0 }) ?? auth.initialSyncLimit;
 	const authWithLimit = resolvedInitialSyncLimit === auth.initialSyncLimit ? auth : {
 		...auth,
@@ -4539,7 +4286,7 @@ async function monitorMatrixProvider(opts = {}) {
 	const dmPolicy = allowlistOnly && dmPolicyRaw !== "disabled" ? "allowlist" : dmPolicyRaw;
 	const dmSessionScope = dmConfig?.sessionScope ?? "per-user";
 	const globalGroupChatHistoryLimit = cfg.messages?.groupChat?.historyLimit;
-	const historyLimit = Math.max(0, accountConfig.historyLimit ?? globalGroupChatHistoryLimit ?? 0);
+	const historyLimit = resolvePromptHistoryLimit(accountConfig.historyLimit ?? globalGroupChatHistoryLimit, 0);
 	const mediaMaxMb = opts.mediaMaxMb ?? accountConfig.mediaMaxMb ?? DEFAULT_MEDIA_MAX_MB;
 	const mediaMaxBytes = Math.max(1, mediaMaxMb) * 1024 * 1024;
 	const streaming = resolveMatrixStreamingMode(accountConfig.streaming);
@@ -4731,12 +4478,13 @@ async function monitorMatrixProvider(opts = {}) {
 		}
 		logVerboseMessage("matrix: client started");
 		logger.info(`matrix: logged in as ${auth.userId}`);
-		backfillMatrixAuthDeviceIdAfterStartup({
-			auth,
-			env: process.env,
-			abortSignal: monitorLifecycleSignal
-		}).catch((err) => {
-			logVerboseMessage(`matrix: failed to backfill deviceId after startup (${String(err)})`);
+		monitorTaskRunner.runDetachedTask("deviceId backfill", async () => {
+			const taskSignal = getMatrixMonitorTaskSignal();
+			await backfillMatrixAuthDeviceIdAfterStartup({
+				auth,
+				env: process.env,
+				abortSignal: taskSignal && monitorLifecycleSignal ? AbortSignal.any([taskSignal, monitorLifecycleSignal]) : taskSignal ?? monitorLifecycleSignal
+			});
 		});
 		registerChannelRuntimeContext({
 			channelRuntime: opts.channelRuntime,