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

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

@@ -1,36 +1,38 @@
 import { a as resolveMatrixAccountConfig, i as resolveMatrixAccountAllowlistConfig } from "./account-config-BZWN9tGS.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { h as resolveConfiguredMatrixBotUserIds } from "./setup-core-a542Ernq.js";
-import { a as buildAllowlistResolutionSummary, c as createTypingCallbacks, d as logInboundDrop, f as logTypingFailure, h as toLocationContext, i as addAllowlistUserEntriesFromConfigEntry, l as formatLocationText, m as summarizeMapping, n as resolveMatrixStoredSessionMeta, o as canonicalizeAllowlistWithResolvedIds, p as patchAllowlistUsersInConfigEntries, r as resolveMatrixRoomConfig, s as createReplyPrefixOptions, u as getAgentScopedMediaLocalRoots } from "./channel-Cmi248PA.js";
-import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-BShrVROw.js";
+import { n as resolveConfiguredMatrixBotUserIds } from "./accounts-DfngqebB.js";
+import { a as buildAllowlistResolutionSummary, c as createTypingCallbacks, d as logInboundDrop, f as logTypingFailure, h as toLocationContext, i as addAllowlistUserEntriesFromConfigEntry, l as formatLocationText, m as summarizeMapping, n as resolveMatrixStoredSessionMeta, o as canonicalizeAllowlistWithResolvedIds, p as patchAllowlistUsersInConfigEntries, r as resolveMatrixRoomConfig, s as createReplyPrefixOptions, u as getAgentScopedMediaLocalRoots } from "./channel-vj788dNZ.js";
+import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-Djxw3C6b.js";
 import { t as isMatrixQualifiedUserId } from "./target-ids-B-5aQxwn.js";
 import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { D as parsePollStartContent, S as formatPollAsText, T as isPollStartType, g as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, h as readJoinedMatrixMembers, m as isStrictDirectMembership, p as hasDirectMatrixMemberFlag, r as sendMessageMatrix, u as promoteMatrixDirectRoomCandidate, v as chunkMatrixText, w as isPollEventType } from "./send-C9Ssx-iV.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-D3RfVgAF.js";
+import { D as parsePollStartContent, S as formatPollAsText, T as isPollStartType, g as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, h as readJoinedMatrixMembers, m as isStrictDirectMembership, p as hasDirectMatrixMemberFlag, r as sendMessageMatrix, u as promoteMatrixDirectRoomCandidate, v as chunkMatrixText, w as isPollEventType } from "./send-BldGYG8g.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-DGbl3vDW.js";
 import { i as createMatrixInboundEventDeduper } from "./inbound-dedupe-CaBLblef.js";
-import { a as resolveMatrixMessageAttachment, c as fetchMatrixPollSnapshot, i as isLikelyBareFilename, n as formatMatrixMediaUnavailableText, o as resolveMatrixMessageBody, r as formatMatrixMessageText, t as formatMatrixMediaTooLargeText } from "./media-text-DlQC_k_K.js";
+import { a as resolveMatrixMessageAttachment, c as fetchMatrixPollSnapshot, i as isLikelyBareFilename, n as formatMatrixMediaUnavailableText, o as resolveMatrixMessageBody, r as formatMatrixMessageText, t as formatMatrixMediaTooLargeText } from "./media-text-BTwzADS_.js";
 import { n as setActiveMatrixClient } from "./active-client-DXvz2gCo.js";
 import { t as isBunRuntime } from "./runtime-BefyhPWv.js";
-import { d as backfillMatrixAuthDeviceIdAfterStartup, f as resolveMatrixAuth, i as resolveSharedMatrixClient, l as isMatrixStartupAbortError, n as releaseSharedClientInstance, p as resolveMatrixAuthContext, u as throwIfMatrixStartupAborted } from "./shared-CUH5otj8.js";
-import "./client-BFRg0kd4.js";
+import { d as backfillMatrixAuthDeviceIdAfterStartup, f as resolveMatrixAuth, i as resolveSharedMatrixClient, l as isMatrixStartupAbortError, n as releaseSharedClientInstance, p as resolveMatrixAuthContext, u as throwIfMatrixStartupAborted } from "./shared-CUMWxcMz.js";
+import "./client-Dbso3-0V.js";
 import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-CycYxU9-.js";
 import { d as resolveAllowlistProviderRuntimeGroupPolicy, f as resolveDefaultGroupPolicy, g as warnMissingProviderGroupPolicyFallbackOnce, h as resolveThreadBindingMaxAgeMsForChannel, m as resolveThreadBindingIdleTimeoutMsForChannel, t as GROUP_POLICY_BLOCKED_LABEL } from "./runtime-api-D1xI_cvh.js";
-import { t as resolveMatrixTargets } from "./resolve-targets-nNMcrV3W.js";
+import { t as resolveMatrixTargets } from "./resolve-targets-nm2L48sh.js";
 import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-CbEFe38F.js";
 import { n as isMatrixReadySyncState, r as isMatrixTerminalSyncState, t as isMatrixDisconnectedSyncState } from "./sync-state-CWbp0QSY.js";
 import { n as setBoundedMap, t as createMatrixRoomInfoResolver } from "./room-info-CAFZ3Z9J.js";
 import { a as EventType, i as resolveMatrixThreadRouting, n as resolveMatrixReplyToEventId, o as RelationType, r as resolveMatrixThreadRootId, t as resolveMatrixInboundRoute } from "./route-DY6at4qJ.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
-import { buildChannelProgressDraftLineForEntry, createChannelProgressDraftGate, createPreviewMessageReceipt, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, formatChannelProgressDraftLine, formatChannelProgressDraftText, isChannelProgressDraftWorkToolName, mergeChannelProgressDraftLine, normalizeChannelProgressDraftLineIdentity, resolveChannelProgressDraftMaxLines, resolveChannelStreamingBlockEnabled, waitUntilAbort } from "openclaw/plugin-sdk/channel-outbound";
+import { buildChannelProgressDraftLineForEntry, createChannelProgressDraftGate, createMessageReceiptFromOutboundResults, createPreviewMessageReceipt, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, formatChannelProgressDraftLine, formatChannelProgressDraftText, isChannelProgressDraftWorkToolName, listMessageReceiptPlatformIds, mergeChannelProgressDraftLine, normalizeChannelProgressDraftLineIdentity, resolveChannelProgressDraftMaxLines, resolveChannelStreamingBlockEnabled, waitUntilAbort } from "openclaw/plugin-sdk/channel-outbound";
 import { normalizeLowercaseStringOrEmpty, normalizeNullableString, normalizeOptionalString, normalizeStringifiedEntries, 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 { resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
-import { buildChannelInboundEventContext, createChannelInboundEnvelopeBuilder, hasFinalInboundReplyDispatch, resolveInboundMentionDecision, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
+import { buildChannelInboundEventContext, createChannelInboundEnvelopeBuilder, createChannelPartialDeliveryError, hasFinalInboundReplyDispatch, isChannelPartialDeliveryError, resolveInboundMentionDecision, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
 import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { isFutureDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs, resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
 import { resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { format } from "node:util";
+import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { escapeRegExp, sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { buildTtsSupplementMediaPayload, getReplyPayloadTtsSupplement } from "openclaw/plugin-sdk/reply-payload";
 import { resolveAckReaction } from "openclaw/plugin-sdk/channel-feedback";
@@ -38,8 +40,8 @@ import { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runti
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { createChannelIngressResolver, defineStableChannelIngressIdentity } from "openclaw/plugin-sdk/channel-ingress-runtime";
 import { evaluateSupplementalContextVisibility, resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
+import { getGlobalHookRunner } from "openclaw/plugin-sdk/plugin-runtime";
 import { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
-import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { mergePairLoopGuardConfig } from "openclaw/plugin-sdk/pair-loop-guard-runtime";
 import { buildInboundHistoryFromEntries } from "openclaw/plugin-sdk/reply-history";
 import { decodeHtmlEntities } from "openclaw/plugin-sdk/html-entity-runtime";
@@ -811,7 +813,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-C9Ssx-iV.js").then((n) => n.l), import("./send-C9Ssx-iV.js").then((n) => n.f)]).then(([directManagementModule, directRoomModule]) => ({
+const loadMatrixDirectRoomDeps = createLazyRuntimeModule(() => Promise.all([import("./send-BldGYG8g.js").then((n) => n.l), import("./send-BldGYG8g.js").then((n) => n.f)]).then(([directManagementModule, directRoomModule]) => ({
 	inspectMatrixDirectRooms: directManagementModule.inspectMatrixDirectRooms,
 	isStrictDirectRoom: directRoomModule.isStrictDirectRoom
 })));
@@ -1590,16 +1592,16 @@ function formatMatrixToolProgressMarkdownCode(text) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler-runtime.ts
 async function redactMatrixDraftEvent(client, roomId, draftEventId) {
-	await client.redactEvent(roomId, draftEventId).catch(() => {});
+	return await client.redactEvent(roomId, draftEventId).then(() => true, () => false);
 }
 function buildMatrixFinalizedPreviewContent() {
 	return { [MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY]: true };
 }
-const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-C9Ssx-iV.js").then((n) => n.s));
+const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-BldGYG8g.js").then((n) => n.s));
 const loadAcpBindingRuntime = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/acp-binding-runtime"));
 const loadSessionBindingRuntime = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/session-binding-runtime"));
-const loadMatrixReactionEvents = createLazyRuntimeModule(() => import("./reaction-events-DrK9Zua7.js"));
-const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-CIjafRr0.js"));
+const loadMatrixReactionEvents = createLazyRuntimeModule(() => import("./reaction-events-B00WSi98.js"));
+const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-CtvOXq0Z.js"));
 async function matrixTextWouldActivateMentions(client, text) {
 	const { resolveMatrixMentionsForBody } = await loadMatrixSendModule();
 	const mentions = await resolveMatrixMentionsForBody({
@@ -1837,7 +1839,7 @@ async function resolveMatrixInboundContext(config) {
 			},
 			groupSystemPrompt: isRoom ? groupSystemPrompt : void 0
 		},
-		media: toInboundMediaFacts(media ? [{
+		media: await toInboundMediaFactsWithMetadata(media ? [{
 			path: media.path,
 			url: media.path,
 			contentType: media.contentType,
@@ -1912,7 +1914,6 @@ async function resolveMatrixInboundContext(config) {
 		isDirect: isDirectMessage,
 		isGroup: isRoom,
 		isMentionableGroup: isRoom,
-		requireMention: shouldRequireMention,
 		canDetectMention,
 		effectiveWasMentioned,
 		shouldBypassMention
@@ -3247,19 +3248,61 @@ async function readMatrixIngressPrefix(config) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/replies.ts
-const THINKING_TAG_RE = /<\s*\/?\s*(?:think(?:ing)?|thought|antthinking)\b[^<>]*>/gi;
-const THINKING_BLOCK_RE = /<\s*(?:think(?:ing)?|thought|antthinking)\b[^<>]*>[\s\S]*?<\s*\/\s*(?:think(?:ing)?|thought|antthinking)\s*>/gi;
-function shouldSuppressReasoningReplyText(text) {
-	if (typeof text !== "string") return false;
+function joinMatrixVisibleContent(contents) {
+	return contents.filter((content) => Boolean(content)).join("\n");
+}
+function mergeMatrixReplyDeliveryResults(results) {
+	const visibleResults = results.filter((result) => result.visibleReplySent);
+	if (visibleResults.length === 0) return {
+		visibleReplySent: false,
+		suppression: { reason: "no_visible_result" }
+	};
+	const receiptInputs = [];
+	for (const result of visibleResults) {
+		if (result.receipt) {
+			receiptInputs.push({ receipt: result.receipt });
+			continue;
+		}
+		for (const messageId of result.messageIds ?? []) receiptInputs.push({ messageId });
+	}
+	const receipt = receiptInputs.length > 0 ? createMessageReceiptFromOutboundResults({ results: receiptInputs }) : void 0;
+	return {
+		...receipt ? {
+			messageIds: listMessageReceiptPlatformIds(receipt),
+			receipt
+		} : {},
+		visibleReplySent: true,
+		content: joinMatrixVisibleContent(visibleResults.map((result) => result.content))
+	};
+}
+function toMatrixPartialDeliveryError(error, settled) {
+	const failedPartial = isChannelPartialDeliveryError(error) ? error.deliveryResult : void 0;
+	const merged = mergeMatrixReplyDeliveryResults([...settled, ...failedPartial ? [failedPartial] : []]);
+	return merged.visibleReplySent ? createChannelPartialDeliveryError(error, {
+		...merged,
+		visibleReplySent: true
+	}) : error;
+}
+function createMatrixReplyDeliveryResult(results) {
+	if (results.length === 0) return mergeMatrixReplyDeliveryResults([]);
+	const receipt = createMessageReceiptFromOutboundResults({ results: results.map((result) => ({ receipt: result.receipt })) });
+	return {
+		messageIds: listMessageReceiptPlatformIds(receipt),
+		receipt,
+		visibleReplySent: true,
+		content: joinMatrixVisibleContent(results.map((result) => result.content))
+	};
+}
+function resolveVisibleMatrixReplyText(text) {
+	if (typeof text !== "string") return;
 	const trimmedStart = text.trimStart();
-	if (!trimmedStart) return false;
-	if (normalizeLowercaseStringOrEmpty(trimmedStart).startsWith("reasoning:")) return true;
-	THINKING_TAG_RE.lastIndex = 0;
-	if (!THINKING_TAG_RE.test(text)) return false;
-	THINKING_BLOCK_RE.lastIndex = 0;
-	const withoutThinkingBlocks = text.replace(THINKING_BLOCK_RE, "");
-	THINKING_TAG_RE.lastIndex = 0;
-	return !withoutThinkingBlocks.replace(THINKING_TAG_RE, "").trim();
+	if (!trimmedStart) return text;
+	if (normalizeLowercaseStringOrEmpty(trimmedStart).startsWith("reasoning:")) return;
+	const visibleText = stripReasoningTagsFromText(text, {
+		mode: "strict",
+		trim: "none"
+	});
+	return visibleText.trim() ? visibleText : void 0;
 }
 async function deliverMatrixReplies(params) {
 	const core = getMatrixRuntime();
@@ -3271,82 +3314,118 @@ async function deliverMatrixReplies(params) {
 	const logVerbose = (message) => {
 		if (core.logging.shouldLogVerbose()) params.runtime.log?.(message);
 	};
-	let hasReplied = false;
-	let deliveredAny = false;
-	for (const reply of params.replies) {
-		if (reply.isReasoning === true || shouldSuppressReasoningReplyText(reply.text)) {
-			logVerbose("matrix reply suppressed as reasoning-only");
-			continue;
-		}
-		const hasMedia = Boolean(reply?.mediaUrl) || (reply?.mediaUrls?.length ?? 0) > 0;
-		if (!reply?.text && !hasMedia) {
-			if (reply?.audioAsVoice) {
-				logVerbose("matrix reply has audioAsVoice without media/text; skipping");
+	const hasRepliedRef = params.hasRepliedRef ?? { value: false };
+	const acceptedResults = [];
+	try {
+		for (const reply of params.replies) {
+			const visibleText = resolveVisibleMatrixReplyText(reply.text);
+			const hasMedia = Boolean(reply?.mediaUrl) || (reply?.mediaUrls?.length ?? 0) > 0;
+			if (reply.isReasoning === true || !hasMedia && reply.text && visibleText === void 0) {
+				logVerbose("matrix reply suppressed as reasoning-only");
 				continue;
 			}
-			params.runtime.error?.("matrix reply missing text/media");
-			continue;
-		}
-		const replyToIdRaw = (reply.replyToId ?? params.replyToId)?.trim();
-		const replyToId = params.threadId ? replyToIdRaw : params.replyToMode === "off" ? void 0 : replyToIdRaw;
-		const rawText = reply.text ?? "";
-		const mediaList = reply.mediaUrls?.length ? reply.mediaUrls : reply.mediaUrl ? [reply.mediaUrl] : [];
-		const shouldIncludeReply = (id) => Boolean(id) && (params.threadId || params.replyToMode === "all" || !hasReplied);
-		const replyToIdForReply = shouldIncludeReply(replyToId) ? replyToId : void 0;
-		if (mediaList.length === 0) {
-			let sentTextChunk = false;
-			const { chunks } = chunkMatrixText(rawText, {
-				cfg: params.cfg,
-				accountId: params.accountId,
-				tableMode
-			});
-			for (const chunk of chunks) {
-				const trimmed = chunk.trim();
-				if (!trimmed) continue;
-				await sendMessageMatrix(params.roomId, trimmed, {
+			if (!reply?.text && !hasMedia) {
+				if (reply?.audioAsVoice) {
+					logVerbose("matrix reply has audioAsVoice without media/text; skipping");
+					continue;
+				}
+				params.runtime.error?.("matrix reply missing text/media");
+				continue;
+			}
+			const replyToIdRaw = (reply.replyToId ?? params.replyToId)?.trim();
+			const replyToId = params.threadId ? replyToIdRaw : params.replyToMode === "off" ? void 0 : replyToIdRaw;
+			const rawText = visibleText ?? "";
+			const mediaList = reply.mediaUrls?.length ? reply.mediaUrls : reply.mediaUrl ? [reply.mediaUrl] : [];
+			const shouldIncludeReply = (id) => Boolean(id) && (params.threadId || params.replyToMode === "all" || !hasRepliedRef.value);
+			const replyToIdForReply = shouldIncludeReply(replyToId) ? replyToId : void 0;
+			const onDeliveryResult = (result) => {
+				acceptedResults.push(result);
+				if (replyToIdForReply) hasRepliedRef.value = true;
+			};
+			if (mediaList.length === 0) {
+				const { chunks } = chunkMatrixText(rawText, {
+					cfg: params.cfg,
+					accountId: params.accountId,
+					tableMode
+				});
+				for (const chunk of chunks) {
+					const trimmed = chunk.trim();
+					if (!trimmed) continue;
+					await sendMessageMatrix(params.roomId, trimmed, {
+						client: params.client,
+						cfg: params.cfg,
+						replyToId: replyToIdForReply,
+						threadId: params.threadId,
+						accountId: params.accountId,
+						onDeliveryResult
+					});
+				}
+				continue;
+			}
+			let first = true;
+			for (const mediaUrl of mediaList) {
+				const caption = first ? rawText : "";
+				await sendMessageMatrix(params.roomId, caption, {
 					client: params.client,
 					cfg: params.cfg,
+					mediaUrl,
+					mediaLocalRoots: params.mediaLocalRoots,
 					replyToId: replyToIdForReply,
 					threadId: params.threadId,
-					accountId: params.accountId
+					audioAsVoice: reply.audioAsVoice,
+					accountId: params.accountId,
+					onDeliveryResult
 				});
-				deliveredAny = true;
-				sentTextChunk = true;
+				first = false;
 			}
-			if (replyToIdForReply && !hasReplied && sentTextChunk) hasReplied = true;
-			continue;
 		}
-		let first = true;
-		for (const mediaUrl of mediaList) {
-			const caption = first ? rawText : "";
-			await sendMessageMatrix(params.roomId, caption, {
-				client: params.client,
-				cfg: params.cfg,
-				mediaUrl,
-				mediaLocalRoots: params.mediaLocalRoots,
-				replyToId: replyToIdForReply,
-				threadId: params.threadId,
-				audioAsVoice: reply.audioAsVoice,
-				accountId: params.accountId
-			});
-			deliveredAny = true;
-			first = false;
-		}
-		if (replyToIdForReply && !hasReplied) hasReplied = true;
+	} catch (error) {
+		throw toMatrixPartialDeliveryError(error, [createMatrixReplyDeliveryResult(acceptedResults)]);
 	}
-	return deliveredAny;
+	return createMatrixReplyDeliveryResult(acceptedResults);
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler-reply-dispatcher.ts
 function createMatrixReplyDispatcher(config) {
 	const { cfg, prefixOptions, humanDelay, typingCallbacks, streaming, draftStream, draftController, client, roomId, runtime, textLimit, replyToMode, threadTarget, replyToEventId, accountId, mediaLocalRoots, tableMode, logVerboseMessage } = config;
 	const quietDraftStreaming = streaming === "quiet" || streaming === "progress";
+	const hasRepliedRef = { value: false };
 	let finalReplyDeliveryFailed = false;
 	let nonFinalReplyDeliveryFailed = false;
 	const { deliver: deliverReply, onError: onReplyError, ...turnDispatcherOptions } = {
 		...prefixOptions,
 		humanDelay,
 		deliver: async (payload, info) => {
+			const completeDelivery = async (result) => {
+				if (info.kind === "block") {
+					draftController.clearDraftConsumed();
+					draftController.advanceDraftBlockBoundary({ fallbackToLatestEnd: true });
+					draftStream?.reset();
+					draftController.resetReplyToIdForNextBlock();
+					draftController.updateDraftFromLatestFullText();
+					const { sendTypingMatrix } = await loadMatrixSendModule();
+					await sendTypingMatrix(roomId, true, void 0, client).catch(() => {});
+				}
+				return result;
+			};
+			const createDraftReceipt = (id) => createPreviewMessageReceipt({
+				id,
+				...threadTarget ? { threadId: threadTarget } : {},
+				...draftController.currentReplyToId() ? { replyToId: draftController.currentReplyToId() } : {}
+			});
+			const createDraftDeliveryResult = (id, content) => {
+				const receipt = createDraftReceipt(id);
+				return {
+					messageIds: receipt.platformMessageIds,
+					receipt,
+					visibleReplySent: true,
+					content
+				};
+			};
+			const createSurvivingDraftDelivery = (id, redacted) => {
+				const content = redacted ? void 0 : draftStream?.content();
+				return content ? createDraftDeliveryResult(id, content) : mergeMatrixReplyDeliveryResults([]);
+			};
 			if (draftStream && info.kind !== "tool" && !payload.isCompactionNotice) {
 				const hasMedia = Boolean(payload.mediaUrl) || (payload.mediaUrls?.length ?? 0) > 0;
 				const ttsSupplement = getReplyPayloadTtsSupplement(payload);
@@ -3356,7 +3435,7 @@ function createMatrixReplyDispatcher(config) {
 				} : payload;
 				if (draftController.isDraftConsumed()) {
 					await draftStream.discardPending();
-					await deliverMatrixReplies({
+					return await completeDelivery(await deliverMatrixReplies({
 						cfg,
 						replies: [fallbackPayload],
 						roomId,
@@ -3364,13 +3443,13 @@ function createMatrixReplyDispatcher(config) {
 						runtime,
 						textLimit,
 						replyToMode,
+						hasRepliedRef,
 						threadId: threadTarget,
 						replyToId: threadTarget ?? replyToEventId ?? void 0,
 						accountId,
 						mediaLocalRoots,
 						tableMode
-					});
-					return;
+					}));
 				}
 				const payloadReplyToId = normalizeOptionalString(payload.replyToId);
 				const payloadReplyMismatch = replyToMode !== "off" && !threadTarget && payloadReplyToId !== draftController.currentReplyToId();
@@ -3383,7 +3462,15 @@ function createMatrixReplyDispatcher(config) {
 				const draftFinalTextNeedsNormalMentionDelivery = Boolean(draftEventId) && typeof payload.text === "string" && Boolean(payload.text.trim()) && !payload.isError && !payloadReplyMismatch && !mustDeliverFinalNormally && await matrixTextWouldActivateMentions(client, payload.text);
 				if (draftEventId && payload.text && !payload.isError && !hasMedia && !payloadReplyMismatch && !mustDeliverFinalNormally && !draftFinalTextNeedsNormalMentionDelivery) {
 					const finalPreviewText = payload.text;
-					await deliverWithFinalizableLivePreviewAdapter({
+					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({
@@ -3401,6 +3488,7 @@ function createMatrixReplyDispatcher(config) {
 							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();
@@ -3411,78 +3499,118 @@ function createMatrixReplyDispatcher(config) {
 									accountId,
 									extraContent: edit.extraContent
 								});
+								finalizedDraftContent = prepareMatrixSingleText(edit.text, {
+									cfg,
+									accountId,
+									preserveWhitespace: true
+								}).convertedText;
 							},
-							createPreviewReceipt: (id) => createPreviewMessageReceipt({
-								id,
-								...threadTarget ? { threadId: threadTarget } : {},
-								...draftController.currentReplyToId() ? { replyToId: draftController.currentReplyToId() } : {}
-							}),
+							createPreviewReceipt: createDraftReceipt,
 							logPreviewEditFailure: (err) => {
 								logVerboseMessage(`matrix: preview final edit failed: ${String(err)}`);
 							}
 						}),
 						deliverNormally: async () => {
-							await redactMatrixDraftEvent(client, roomId, draftEventId);
-							await deliverMatrixReplies({
-								cfg,
-								replies: [fallbackPayload],
-								roomId,
-								client,
-								runtime,
-								textLimit,
-								replyToMode,
-								threadId: threadTarget,
-								replyToId: threadTarget ?? replyToEventId ?? void 0,
-								accountId,
-								mediaLocalRoots,
-								tableMode
-							});
+							const draftRedacted = await redactMatrixDraftEvent(client, roomId, draftEventId);
+							const survivingDraft = createSurvivingDraftDelivery(draftEventId, draftRedacted);
+							let deliveredFallback;
+							try {
+								deliveredFallback = await deliverMatrixReplies({
+									cfg,
+									replies: [fallbackPayload],
+									roomId,
+									client,
+									runtime,
+									textLimit,
+									replyToMode,
+									hasRepliedRef,
+									threadId: threadTarget,
+									replyToId: threadTarget ?? replyToEventId ?? void 0,
+									accountId,
+									mediaLocalRoots,
+									tableMode
+								});
+							} catch (error) {
+								throw toMatrixPartialDeliveryError(error, [survivingDraft]);
+							}
+							fallbackResult = mergeMatrixReplyDeliveryResults([survivingDraft, deliveredFallback]);
+							return fallbackResult.visibleReplySent;
 						}
 					});
 					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 } = await loadMatrixSendModule();
+						const { editMessageMatrix, prepareMatrixSingleText } = await loadMatrixSendModule();
 						textEditOk = await editMessageMatrix(roomId, draftEventId, payloadText, {
 							client,
 							cfg,
 							threadId: threadTarget,
 							accountId,
 							extraContent: quietDraftStreaming ? buildMatrixFinalizedPreviewContent() : void 0
-						}).then(() => true, () => false);
-					} else if (textEditOk && reusesDraftTextUnchanged) textEditOk = await draftStream.finalizeLive();
+						}).then(() => {
+							finalizedDraftContent = prepareMatrixSingleText(payloadText, {
+								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;
-					if (!reusesDraftAsFinalText) await redactMatrixDraftEvent(client, roomId, draftEventId);
+					const draftContent = draftStream.content();
+					const draftRedacted = reusesDraftAsFinalText ? false : await redactMatrixDraftEvent(client, roomId, draftEventId);
 					const mediaPayload = ttsSupplement && reusesDraftAsFinalText ? buildTtsSupplementMediaPayload(payload) : {
 						...payload,
 						text: reusesDraftAsFinalText ? void 0 : payload.text ?? (ttsSupplement?.visibleTextAlreadyDelivered === true ? void 0 : ttsSupplement?.spokenText)
 					};
-					await deliverMatrixReplies({
-						cfg,
-						replies: [mediaPayload],
-						roomId,
-						client,
-						runtime,
-						textLimit,
-						replyToMode,
-						threadId: threadTarget,
-						replyToId: threadTarget ?? replyToEventId ?? void 0,
-						accountId,
-						mediaLocalRoots,
-						tableMode
-					});
+					const providerDraftContent = finalizedDraftContent ?? preparedPayloadContent;
+					const previewDelivery = reusesDraftAsFinalText && providerDraftContent ? createDraftDeliveryResult(draftEventId, providerDraftContent) : !draftRedacted && draftContent ? createDraftDeliveryResult(draftEventId, draftContent) : mergeMatrixReplyDeliveryResults([]);
+					let mediaDelivery;
+					try {
+						mediaDelivery = await deliverMatrixReplies({
+							cfg,
+							replies: [mediaPayload],
+							roomId,
+							client,
+							runtime,
+							textLimit,
+							replyToMode,
+							hasRepliedRef,
+							threadId: threadTarget,
+							replyToId: threadTarget ?? replyToEventId ?? void 0,
+							accountId,
+							mediaLocalRoots,
+							tableMode
+						});
+					} catch (error) {
+						throw toMatrixPartialDeliveryError(error, [previewDelivery]);
+					}
 					draftController.markDraftConsumed();
-				} else {
-					const draftRedacted = Boolean(draftEventId) && (payload.isError || payloadReplyMismatch || mustDeliverFinalNormally || draftFinalTextNeedsNormalMentionDelivery);
-					if (draftRedacted && draftEventId) await redactMatrixDraftEvent(client, roomId, draftEventId);
-					const deliveredFallback = await deliverMatrixReplies({
+					return await completeDelivery(mergeMatrixReplyDeliveryResults([previewDelivery, mediaDelivery]));
+				}
+				const shouldRedactDraft = Boolean(draftEventId) && (payload.isError || payloadReplyMismatch || mustDeliverFinalNormally || draftFinalTextNeedsNormalMentionDelivery);
+				const draftRedacted = shouldRedactDraft && draftEventId ? await redactMatrixDraftEvent(client, roomId, draftEventId) : false;
+				const survivingDraft = shouldRedactDraft && draftEventId ? createSurvivingDraftDelivery(draftEventId, draftRedacted) : mergeMatrixReplyDeliveryResults([]);
+				let deliveredFallback;
+				try {
+					deliveredFallback = await deliverMatrixReplies({
 						cfg,
 						replies: [fallbackPayload],
 						roomId,
@@ -3490,24 +3618,20 @@ function createMatrixReplyDispatcher(config) {
 						runtime,
 						textLimit,
 						replyToMode,
+						hasRepliedRef,
 						threadId: threadTarget,
 						replyToId: threadTarget ?? replyToEventId ?? void 0,
 						accountId,
 						mediaLocalRoots,
 						tableMode
 					});
-					if (draftRedacted || deliveredFallback) draftController.markDraftConsumed();
+				} catch (error) {
+					throw toMatrixPartialDeliveryError(error, [survivingDraft]);
 				}
-				if (info.kind === "block") {
-					draftController.clearDraftConsumed();
-					draftController.advanceDraftBlockBoundary({ fallbackToLatestEnd: true });
-					draftStream.reset();
-					draftController.resetReplyToIdForNextBlock();
-					draftController.updateDraftFromLatestFullText();
-					const { sendTypingMatrix } = await loadMatrixSendModule();
-					await sendTypingMatrix(roomId, true, void 0, client).catch(() => {});
-				}
-			} else await deliverMatrixReplies({
+				if (shouldRedactDraft || deliveredFallback.visibleReplySent) draftController.markDraftConsumed();
+				return await completeDelivery(mergeMatrixReplyDeliveryResults([survivingDraft, deliveredFallback]));
+			}
+			return await completeDelivery(await deliverMatrixReplies({
 				cfg,
 				replies: [payload],
 				roomId,
@@ -3515,12 +3639,13 @@ function createMatrixReplyDispatcher(config) {
 				runtime,
 				textLimit,
 				replyToMode,
+				hasRepliedRef,
 				threadId: threadTarget,
 				replyToId: threadTarget ?? replyToEventId ?? void 0,
 				accountId,
 				mediaLocalRoots,
 				tableMode
-			});
+			}));
 		},
 		onError: (err, info) => {
 			if (info.kind === "final") finalReplyDeliveryFailed = true;
@@ -3866,9 +3991,11 @@ function createMatrixRoomMessageHandler(params) {
 					});
 				}
 			});
+			const hookRunner = getGlobalHookRunner();
+			const allowProviderPreview = !((hookRunner?.hasHooks("reply_payload_sending") ?? false) || (hookRunner?.hasHooks("message_sending") ?? false));
 			const draftController = await createMatrixDraftController({
-				streaming,
-				previewToolProgressEnabled,
+				streaming: allowProviderPreview ? streaming : "off",
+				previewToolProgressEnabled: allowProviderPreview && previewToolProgressEnabled,
 				replyToMode,
 				messageId,
 				threadTarget,
@@ -3969,6 +4096,7 @@ function createMatrixRoomMessageHandler(params) {
 							}
 						},
 						delivery: {
+							observeMessageSent: true,
 							deliver: deliverReply,
 							onError: (err, info) => onReplyError(err, info)
 						},
@@ -4049,9 +4177,9 @@ function shouldPromoteRecentInviteRoom(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/startup.ts
 const loadMatrixStartupMaintenanceDeps = createLazyRuntimeModule(() => Promise.all([
-	import("./setup-core-a542Ernq.js").then((n) => n.c),
+	import("./setup-core-BVfBv2ai.js").then((n) => n.c),
 	import("./device-health-B4-YXtJR.js").then((n) => n.t),
-	import("./setup-core-a542Ernq.js").then((n) => n.o),
+	import("./setup-core-BVfBv2ai.js").then((n) => n.o),
 	import("./startup-verification-wm3_i88s.js")
 ]).then(([configUpdateModule, deviceHealthModule, profileModule, startupVerificationModule]) => ({
 	updateMatrixAccountConfig: configUpdateModule.updateMatrixAccountConfig,