@openclaw/matrix 2026.9.5 → 2026.9.6

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

@@ -1,29 +1,29 @@
 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-BF5hyc-1.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-q6TBKEiG.mjs";
-import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./channel.setup-DZQ5rf9k.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-h0gZ_-qk.mjs";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-Hy96ujd3.mjs";
-import { l as fetchMatrixPollSnapshot, r as readMatrixMessages } from "./messages-SW0NPYnR.mjs";
-import { c as createMatrixMonitorTaskRunner, d as resolveMatrixAuthContext, l as backfillMatrixAuthDeviceIdAfterStartup, o as isMatrixStartupAbortError, r as acquireSharedMatrixClient, s as throwIfMatrixStartupAborted, u as resolveMatrixAuth } from "./client-DsJUnWlV.mjs";
-import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-BJjo-iw5.mjs";
-import { n as prepareMatrixReplyPayload, r as resolveMatrixExtraContent } from "./outbound-DRWtSUe-.mjs";
-import { t as resolveMatrixTargets } from "./resolve-targets-drjgAdIe.mjs";
-import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-DYEbeYj-.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-DHd1j3qM.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";
@@ -37,7 +37,7 @@ import { GROUP_POLICY_BLOCKED_LABEL, resolveAllowlistProviderRuntimeGroupPolicy,
 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 { getGlobalHookRunner } from "openclaw/plugin-sdk/plugin-runtime";
 import { evaluateSupplementalContextVisibility, resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
@@ -738,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,
@@ -775,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
@@ -1648,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-h0gZ_-qk.mjs").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-CdAk_rh_.mjs"));
-const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-DIFZDNrb.mjs"));
+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({
@@ -1863,6 +1860,7 @@ async function resolveMatrixInboundContext(config) {
 	const channelIngress = await resolveMessageIngress({
 		agentId: _route.agentId,
 		sessionKey: _route.sessionKey,
+		nativeChannelId: roomId,
 		messageId,
 		inboundEventKind: "user_request"
 	}, {
@@ -1910,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
 		},
@@ -1986,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";
@@ -2012,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),
@@ -2026,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,12 +2056,6 @@ async function createMatrixDraftController(params) {
 			},
 			onApprovalEvent: async (payload) => {
 				return await progressDraft.pushApprovalEvent(payload);
-			},
-			onCommandOutput: async (payload) => {
-				return await progressDraft.pushCommandOutputEvent(payload);
-			},
-			onPatchSummary: async (payload) => {
-				return await progressDraft.pushPatchEvent(payload);
 			}
 		};
 	};
@@ -2090,7 +2095,7 @@ async function createMatrixDraftController(params) {
 	const resetDraftDeliveryState = async () => {
 		await draftStream?.discardPending();
 		draftStream?.reset();
-		draftDisposition = "active";
+		previewLifecycle.reset();
 		currentDraftMessageGeneration = 0;
 		currentDraftBlockOffset = 0;
 		latestDraftFullText = "";
@@ -2101,6 +2106,7 @@ async function createMatrixDraftController(params) {
 	};
 	return {
 		draftStream,
+		previewLifecycle,
 		cancelProgressDraft: () => progressDraft.cancel(),
 		buildPreviewToolProgressReplyOptions,
 		queueDraftBlockBoundary,
@@ -2109,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) => {
@@ -3146,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,
@@ -3275,7 +3276,7 @@ function createMatrixReplyDispatcher(config) {
 		accountId,
 		mediaLocalRoots
 	});
-	let finalReplyDeliveryFailed = false;
+	const { previewLifecycle } = draftController;
 	let nonFinalReplyDeliveryFailed = false;
 	const beginNextBlockDraft = () => {
 		draftController.beginDraftGeneration();
@@ -3309,187 +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 deliverPayload(fallbackPayload));
-				}
-				const deliverFallback = async () => await deliverPayload(fallbackPayload);
-				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: deliverFallback
+			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 deliverPayload(mediaPayload);
-					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)}`);
 						}
-						return await completeDelivery(mergeMatrixReplyDeliveryResults([previewDelivery, mediaDelivery]));
+					} : 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 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 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 deliverPayload(payload));
+			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)}`);
@@ -3501,7 +3390,6 @@ function createMatrixReplyDispatcher(config) {
 		deliverReply,
 		onReplyError,
 		turnDispatcherOptions,
-		finalReplyDeliveryFailed: () => finalReplyDeliveryFailed,
 		nonFinalReplyDeliveryFailed: () => nonFinalReplyDeliveryFailed
 	};
 }
@@ -3932,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
 						}
 					})
@@ -3968,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;
@@ -3988,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();
 		}
@@ -4018,7 +3908,7 @@ const loadMatrixStartupMaintenanceDeps = createLazyRuntimeModule(() => Promise.a
 	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-Bq5qeEGn.mjs")
+	import("./startup-verification-Cp1Gf7pM.mjs")
 ]).then(([configUpdateModule, deviceHealthModule, profileModule, startupVerificationModule]) => ({
 	updateMatrixAccountConfig: configUpdateModule.updateMatrixAccountConfig,
 	summarizeMatrixDeviceHealth: deviceHealthModule.summarizeMatrixDeviceHealth,
@@ -4291,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,
@@ -4324,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,
@@ -4393,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);
@@ -4585,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,

package/dist/.setup/{outbound-DRWtSUe-.mjs → outbound-B508VPBM.mjs}

@@ -1,4 +1,4 @@
-import { i as sendPollMatrix, r as sendMessageMatrix } from "./send-h0gZ_-qk.mjs";
+import { i as sendPollMatrix, r as sendMessageMatrix } from "./send-aVdC5NJO.mjs";
 import { createMessageReceiptFromOutboundResults, createReplyToFanout, resolveOutboundSendDep } from "openclaw/plugin-sdk/channel-outbound";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { chunkTextForOutbound } from "openclaw/plugin-sdk/text-chunking";

package/dist/.setup/probe.runtime-C-NMeYk2.mjs

@@ -0,0 +1,2 @@
+import { n as createMatrixClient } from "./client-ChrXpxos.mjs";
+export { createMatrixClient };

package/dist/.setup/{profile-update-DPttQz3-.mjs → profile-update-DrblJttE.mjs}

@@ -1,7 +1,7 @@
 import { t as getMatrixRuntime } from "./runtime-1kn1P6io.mjs";
 import { n as resolveMatrixConfigPath, r as updateMatrixAccountConfig } from "./config-update-B_4qZ5bV.mjs";
 import { r as syncMatrixOwnProfile } from "./profile-ClrB3IgR.mjs";
-import { n as withResolvedActionClient } from "./client-By2B3Wz4.mjs";
+import { n as withResolvedActionClient } from "./client-C2yVkVdw.mjs";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 //#region extensions/matrix/src/matrix/actions/profile.ts
 async function updateMatrixOwnProfile(opts = {}) {

package/dist/.setup/{reaction-events-CdAk_rh_.mjs → reaction-events-BvZmhjLC.mjs}

@@ -1,5 +1,5 @@
 import { a as resolveMatrixAccountConfig } from "./account-config-CRsKoMqJ.mjs";
-import { i as resolveMatrixThreadRouting, r as resolveMatrixInboundRoute } from "./channel-q6TBKEiG.mjs";
+import { i as resolveMatrixThreadRouting, r as resolveMatrixInboundRoute } from "./channel-ConuJfxT.mjs";
 import { c as extractMatrixReactionAnnotation } from "./send-currentness-BrGXL7b8.mjs";
 import { p as resolveMatrixThreadRootId } from "./direct-management-B2Bno2xL.mjs";
 import { i as resolveMatrixApprovalReactionTargetWithPersistence, o as unregisterMatrixApprovalReactionTargetsForApproval } from "./approval-reactions-B0hfA6qz.mjs";
@@ -8,9 +8,9 @@ import { isApprovalNotFoundError } from "openclaw/plugin-sdk/error-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
 import { getSessionBindingService } from "openclaw/plugin-sdk/session-binding-runtime";
 //#region extensions/matrix/src/matrix/monitor/reaction-events.ts
-const loadApprovalReactionAuth = createLazyRuntimeModule(() => import("./approval-reaction-auth-B51E4ZDa.mjs"));
+const loadApprovalReactionAuth = createLazyRuntimeModule(() => import("./approval-reaction-auth-DMVE7VSp.mjs"));
 const loadExecApprovalResolver = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/approval-gateway-runtime"));
-const loadMatrixSend = createLazyRuntimeModule(() => import("./send-h0gZ_-qk.mjs").then((n) => n.s));
+const loadMatrixSend = createLazyRuntimeModule(() => import("./send-aVdC5NJO.mjs").then((n) => n.s));
 function buildMatrixApprovalTerminalText(result) {
 	const approval = result.approval;
 	const terminalLabel = approval.status === "allowed" ? approval.decision === "allow-always" ? "Allowed always" : "Allowed once" : approval.status === "denied" ? "Denied" : approval.status === "expired" ? "Expired" : "Cancelled";
@@ -159,6 +159,7 @@ async function handleInboundMatrixReaction(params) {
 	const text = `Matrix reaction added: ${reaction.key} by ${params.senderLabel} on msg ${reaction.eventId}`;
 	params.core.system.enqueueSystemEvent(text, {
 		sessionKey: route.sessionKey,
+		agentId: route.agentId,
 		contextKey: `matrix:reaction:add:${params.roomId}:${reaction.eventId}:${params.senderId}:${reaction.key}`
 	});
 	params.logVerboseMessage(`matrix: reaction event enqueued room=${params.roomId} target=${reaction.eventId} sender=${params.senderId} emoji=${reaction.key}`);

package/dist/.setup/{resolve-targets-drjgAdIe.mjs → resolve-targets-BLz748lX.mjs}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
 import { r as normalizeMatrixMessagingTarget, t as isMatrixQualifiedUserId } from "./target-ids-Nwx7cMVE.mjs";
-import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-CatwztQc.mjs";
+import { n as listMatrixDirectoryGroupsLive, r as listMatrixDirectoryPeersLive } from "./directory-live-CxqkcYbT.mjs";
 import { normalizeOptionalLowercaseString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/matrix/src/resolve-targets.ts
 var resolve_targets_exports = /* @__PURE__ */ __exportAll({ resolveMatrixTargets: () => resolveMatrixTargets });

package/dist/.setup/{resolver.runtime-Ci6ddcPh.mjs → resolver.runtime-CuLQ2uHe.mjs}

@@ -1,4 +1,4 @@
-import { t as resolveMatrixTargets } from "./resolve-targets-drjgAdIe.mjs";
+import { t as resolveMatrixTargets } from "./resolve-targets-BLz748lX.mjs";
 //#region extensions/matrix/src/resolver.runtime.ts
 const matrixResolverRuntime = { resolveMatrixTargets };
 //#endregion