@openclaw/mattermost 2026.7.1 → 2026.7.2-beta.1

package/dist/{channel.runtime-D0SJSEei.js → channel.runtime-Cbs451W2.js}

@@ -1,7 +1,7 @@
 import { C as resolveChannelMediaMaxBytes, E as warnMissingProviderGroupPolicyFallbackOnce, S as resolveAllowlistProviderRuntimeGroupPolicy, T as resolveDefaultGroupPolicy, _ as logInboundDrop, c as buildAgentMediaPayload, d as createChannelMessageReplyPipeline, f as createChannelPairingController, h as listSkillCommandsForAgents, i as normalizeMattermostAllowEntry, l as buildModelsProviderData, n as formatMattermostDirectMessageDropLog, o as resolveMattermostMonitorInboundAccess, s as DEFAULT_GROUP_HISTORY_LIMIT, t as authorizeMattermostCommandInvocation, u as createChannelHistoryWindow, v as logTypingFailure, x as registerPluginHttpRoute, y as parseTcpPort } from "./monitor-auth-BiDuyvOc.js";
-import { _ as readMattermostError, a as MattermostPostSchema, b as updateMattermostPost, c as createMattermostPost, f as fetchMattermostMe, g as normalizeMattermostBaseUrl, h as fetchMattermostUserTeams, i as resolveMattermostReplyToMode, l as deleteMattermostPost, o as createMattermostClient, p as fetchMattermostUser, r as resolveMattermostAccount, t as listMattermostAccountIds, u as fetchMattermostChannel, y as sendMattermostTyping } from "./accounts-ITTlduDO.js";
+import { _ as readMattermostError, a as MattermostPostSchema, b as updateMattermostPost, c as createMattermostPost, f as fetchMattermostMe, g as normalizeMattermostBaseUrl, h as fetchMattermostUserTeams, i as resolveMattermostReplyToMode, l as deleteMattermostPost, o as createMattermostClient, p as fetchMattermostUser, r as resolveMattermostAccount, t as listMattermostAccountIds, u as fetchMattermostChannel, y as sendMattermostTyping } from "./accounts-B2NRPlqr.js";
 import { n as getOptionalMattermostRuntime, t as getMattermostRuntime } from "./runtime-CNB4YGqJ.js";
-import { C as registerSlashCommands, S as isSlashCommandsEnabled, T as resolveSlashCommandConfig, _ as renderMattermostModelsPickerView, a as sendMessageMattermost, b as DEFAULT_COMMAND_SPECS, c as computeInteractionCallbackUrl, d as setInteractionCallbackUrl, f as setInteractionSecret, g as parseMattermostModelPickerContext, h as buildMattermostAllowedModelRefs, l as createMattermostInteractionHandler, m as deliverMattermostReplyPayload, n as deactivateSlashCommands, o as resolveMattermostOpaqueTarget, p as createMattermostReplyDeliveryBarrier, r as getSlashCommandState, s as buildButtonProps, t as activateSlashCommands, u as resolveInteractionCallbackPath, v as renderMattermostProviderPickerView, w as resolveCallbackUrl, x as cleanupSlashCommands, y as resolveMattermostModelPickerCurrentModel } from "./slash-state-BfOSlkmn.js";
+import { C as registerSlashCommands, S as isSlashCommandsEnabled, T as resolveSlashCommandConfig, _ as renderMattermostModelsPickerView, a as sendMessageMattermost, b as DEFAULT_COMMAND_SPECS, c as computeInteractionCallbackUrl, d as setInteractionCallbackUrl, f as setInteractionSecret, g as parseMattermostModelPickerContext, h as buildMattermostAllowedModelRefs, l as createMattermostInteractionHandler, m as deliverMattermostReplyPayload, n as deactivateSlashCommands, o as resolveMattermostOpaqueTarget, p as createMattermostReplyDeliveryBarrier, r as getSlashCommandState, s as buildButtonProps, t as activateSlashCommands, u as resolveInteractionCallbackPath, v as renderMattermostProviderPickerView, w as resolveCallbackUrl, x as cleanupSlashCommands, y as resolveMattermostModelPickerCurrentModel } from "./slash-state-Cr58Xd12.js";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringEntries, normalizeTrimmedStringList, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { formatInboundFromLabel, formatInboundMediaUnavailableText } from "openclaw/plugin-sdk/channel-inbound";
 import { buildChannelProgressDraftLineForEntry, createChannelProgressDraftCompositor, createFinalizableDraftLifecycle, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, resolveChannelStreamingPreviewToolProgress } from "openclaw/plugin-sdk/channel-outbound";
@@ -14,10 +14,12 @@ import { readProviderJsonResponse } from "openclaw/plugin-sdk/provider-http";
 import { z } from "zod";
 import { resolveInboundLastRouteSessionKey, resolveThreadSessionKeys } from "openclaw/plugin-sdk/routing";
 import { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
+import { sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { randomUUID } from "node:crypto";
+import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
 import { isLoopbackHost } from "openclaw/plugin-sdk/gateway-runtime";
+import { chunkMarkdownTextWithMode } from "openclaw/plugin-sdk/reply-chunking";
 import { createClaimableDedupe } from "openclaw/plugin-sdk/persistent-dedupe";
-import { sliceUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { captureWsEvent, createDebugProxyWebSocketAgent, resolveDebugProxySettings } from "openclaw/plugin-sdk/proxy-capture";
 import WebSocket from "ws";
 import { createPersistentDedupeCache } from "openclaw/plugin-sdk/dedupe-runtime";
@@ -111,11 +113,14 @@ async function listMattermostDirectoryPeers(params) {
 	const clients = buildClients(params);
 	if (!clients.length) return [];
 	const client = clients[0];
+	if (!client) return [];
 	try {
 		const me = await fetchMattermostMe(client);
 		const teams = await client.request("/users/me/teams");
 		if (!teams.length) return [];
-		const teamId = teams[0].id;
+		const team = teams[0];
+		if (!team) return [];
+		const teamId = team.id;
 		const q = normalizeLowercaseStringOrEmpty(params.query);
 		let users;
 		if (q) users = await client.request("/users/search", {
@@ -165,6 +170,20 @@ function normalizeMattermostDraftText(text, maxChars) {
 	if (trimmed.length <= maxChars) return trimmed;
 	return `${sliceUtf16Safe(trimmed, 0, Math.max(0, maxChars - 3)).trimEnd()}...`;
 }
+function createMattermostDraftPreviewBoundaryController(params) {
+	let hasStreamedContent = false;
+	return {
+		noteUpdate() {
+			hasStreamedContent = true;
+		},
+		async noteBoundary() {
+			if (!params.enabled) return;
+			if (!hasStreamedContent) return;
+			hasStreamedContent = false;
+			await params.forceNewMessage();
+		}
+	};
+}
 function createMattermostDraftStream(params) {
 	const maxChars = Math.min(params.maxChars ?? MATTERMOST_STREAM_MAX_CHARS, MATTERMOST_STREAM_MAX_CHARS);
 	const throttleMs = Math.max(250, params.throttleMs ?? DEFAULT_THROTTLE_MS);
@@ -172,15 +191,22 @@ function createMattermostDraftStream(params) {
 		stopped: false,
 		final: false
 	};
-	let streamPostId;
-	let lastSentText = "";
+	let currentGeneration = {
+		lastSentText: "",
+		latestSourceText: "",
+		ready: Promise.resolve()
+	};
+	const sealedAssistantTexts = [];
 	const sendOrEditStreamMessage = async (text) => {
 		if (streamState.stopped && !streamState.final) return false;
+		const target = currentGeneration;
 		const normalized = normalizeMattermostDraftText(params.renderText?.(text) ?? text, maxChars);
 		if (!normalized) return false;
-		if (normalized === lastSentText) return true;
+		await target.ready;
+		if (streamState.stopped && !streamState.final) return false;
+		if (normalized === target.lastSentText) return true;
 		try {
-			if (streamPostId) await updateMattermostPost(params.client, streamPostId, { message: normalized });
+			if (target.postId) await updateMattermostPost(params.client, target.postId, { message: normalized });
 			else {
 				const postId = (await createMattermostPost(params.client, {
 					channelId: params.channelId,
@@ -192,9 +218,9 @@ function createMattermostDraftStream(params) {
 					params.warn?.("mattermost stream preview stopped (missing post id from create)");
 					return false;
 				}
-				streamPostId = postId;
+				target.postId = postId;
 			}
-			lastSentText = normalized;
+			target.lastSentText = normalized;
 			return true;
 		} catch (err) {
 			streamState.stopped = true;
@@ -202,40 +228,333 @@ function createMattermostDraftStream(params) {
 			return false;
 		}
 	};
-	const { loop, update, stop, clear, discardPending, seal } = createFinalizableDraftLifecycle({
+	const clearMessageId = () => {
+		currentGeneration.postId = void 0;
+	};
+	const isValidMessageId = (value) => typeof value === "string" && value.length > 0;
+	const deleteMessage = async (postId) => {
+		await deleteMattermostPost(params.client, postId);
+	};
+	const { loop, update: updateLifecycle, stop: stopLifecycle, stopForClear, clearWithStop, seal: sealLifecycle } = createFinalizableDraftLifecycle({
 		throttleMs,
 		state: streamState,
 		sendOrEditStreamMessage,
-		readMessageId: () => streamPostId,
-		clearMessageId: () => {
-			streamPostId = void 0;
-		},
-		isValidMessageId: (value) => typeof value === "string" && value.length > 0,
-		deleteMessage: async (postId) => {
-			await deleteMattermostPost(params.client, postId);
-		},
+		readMessageId: () => currentGeneration.postId,
+		clearMessageId,
+		isValidMessageId,
+		deleteMessage,
 		warn: params.warn,
 		warnPrefix: "mattermost stream preview cleanup failed"
 	});
 	const forceNewMessage = () => {
-		streamPostId = void 0;
-		lastSentText = "";
-		loop.resetPending();
+		if (streamState.stopped || streamState.final) return Promise.resolve();
+		const pendingText = loop.takePending();
+		const inFlightAtBoundary = loop.waitForInFlight();
+		const sealed = currentGeneration;
+		const boundary = (async () => {
+			try {
+				await sealed.ready;
+				await inFlightAtBoundary;
+				if (streamState.stopped && !streamState.final) return;
+				const sourceText = pendingText.trim() ? pendingText : sealed.latestSourceText;
+				const finalizedText = (params.renderText?.(sourceText) ?? sourceText).trim();
+				const chunks = params.chunkText?.(finalizedText) ?? chunkMarkdownTextWithMode(finalizedText, maxChars, "length");
+				const firstChunk = chunks[0];
+				if (!firstChunk) return;
+				if (sealed.postId) {
+					if (firstChunk !== sealed.lastSentText) await updateMattermostPost(params.client, sealed.postId, { message: firstChunk });
+				} else await createMattermostPost(params.client, {
+					channelId: params.channelId,
+					message: firstChunk,
+					rootId: params.rootId
+				});
+				for (const chunk of chunks.slice(1)) await createMattermostPost(params.client, {
+					channelId: params.channelId,
+					message: chunk,
+					rootId: params.rootId
+				});
+				const assistantText = sealed.latestAssistantText?.trim();
+				if (assistantText) sealedAssistantTexts.push(assistantText);
+			} catch (err) {
+				params.warn?.(`mattermost stream preview boundary flush failed: ${err instanceof Error ? err.message : String(err)}`);
+			}
+		})();
+		currentGeneration = {
+			lastSentText: "",
+			latestSourceText: "",
+			ready: boundary
+		};
 		loop.resetThrottleWindow();
+		return boundary;
+	};
+	const flush = async () => {
+		await loop.flush();
+		await currentGeneration.ready;
+	};
+	const discardPending = async () => {
+		await stopForClear();
+		await currentGeneration.ready;
+	};
+	const clear = async () => {
+		await clearWithStop(discardPending);
+	};
+	const seal = async () => {
+		await sealLifecycle();
+		await currentGeneration.ready;
+	};
+	const stop = async () => {
+		await stopLifecycle();
+		await currentGeneration.ready;
+	};
+	const update = (text) => {
+		currentGeneration.latestSourceText = text;
+		currentGeneration.latestAssistantText = void 0;
+		updateLifecycle(text);
+	};
+	const updateAssistantText = (text) => {
+		currentGeneration.latestSourceText = text;
+		currentGeneration.latestAssistantText = text;
+		updateLifecycle(text);
+	};
+	const settleBoundaries = async () => {
+		await currentGeneration.ready;
+	};
+	const resolveFinalText = (text) => {
+		if (sealedAssistantTexts.length === 0) return {
+			kind: "full",
+			text
+		};
+		let remainingText = text.trim();
+		for (const sealedText of sealedAssistantTexts) {
+			const completed = sealedText.trim();
+			if (!completed || !remainingText.startsWith(completed)) return {
+				kind: "full",
+				text
+			};
+			const suffix = remainingText.slice(completed.length);
+			if (suffix && !/^\r?\n/.test(suffix)) return {
+				kind: "full",
+				text
+			};
+			remainingText = suffix.replace(/^(?:\r?\n)+/, "");
+		}
+		const currentText = currentGeneration.latestAssistantText?.trim() ?? "";
+		const remaining = remainingText.trim();
+		if (currentText && !remaining.startsWith(currentText)) return {
+			kind: "full",
+			text
+		};
+		return remaining ? {
+			kind: "remaining",
+			text: remaining
+		} : { kind: "already-delivered" };
 	};
 	params.log?.(`mattermost stream preview ready (maxChars=${maxChars}, throttleMs=${throttleMs})`);
 	return {
 		update,
-		flush: loop.flush,
-		postId: () => streamPostId,
+		updateAssistantText,
+		flush,
+		postId: () => currentGeneration.postId,
 		clear,
 		discardPending,
 		seal,
 		stop,
-		forceNewMessage
+		forceNewMessage,
+		settleBoundaries,
+		resolveFinalText
 	};
 }
 //#endregion
+//#region extensions/mattermost/src/mattermost/monitor-helpers.ts
+const formatInboundFromLabel$1 = formatInboundFromLabel;
+function resolveThreadSessionKeys$1(params) {
+	return resolveThreadSessionKeys({
+		...params,
+		normalizeThreadId: (threadId) => threadId
+	});
+}
+/**
+* Strip bot mention from message text while preserving newlines and
+* block-level Markdown formatting (headings, lists, blockquotes).
+*/
+function normalizeMention(text, mention) {
+	if (!mention) return text.trim();
+	const escaped = mention.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	const hasMentionRe = new RegExp(`@${escaped}\\b`, "i");
+	const leadingMentionRe = new RegExp(`^([\\t ]*)@${escaped}\\b[\\t ]*`, "i");
+	const trailingMentionRe = new RegExp(`[\\t ]*@${escaped}\\b[\\t ]*$`, "i");
+	const normalizedLines = text.split("\n").map((line) => {
+		const hadMention = hasMentionRe.test(line);
+		const normalizedLine = line.replace(leadingMentionRe, "$1").replace(trailingMentionRe, "").replace(new RegExp(`@${escaped}\\b`, "gi"), "").replace(/(\S)[ \t]{2,}/g, "$1 ");
+		return {
+			text: normalizedLine,
+			mentionOnlyBlank: hadMention && normalizedLine.trim() === ""
+		};
+	});
+	while (normalizedLines[0]?.mentionOnlyBlank) normalizedLines.shift();
+	while (normalizedLines.at(-1)?.text.trim() === "") normalizedLines.pop();
+	return normalizedLines.map((line) => line.text).join("\n");
+}
+function shouldDropEmptyMattermostBody(params) {
+	if (/[^\p{White_Space}\p{Cc}\p{Cf}\p{M}]/u.test(params.bodyText)) return false;
+	const botUsername = normalizeLowercaseStringOrEmpty(params.botUsername ?? "");
+	const bareMention = params.rawText.match(/^[ \t]*(@\S+)[ \t]*$/u)?.[1];
+	return !botUsername || normalizeLowercaseStringOrEmpty(bareMention ?? "") !== `@${botUsername}`;
+}
+//#endregion
+//#region extensions/mattermost/src/mattermost/no-visible-reply-diagnostic.ts
+/**
+* Detects the #80501 symptom: `deliverMattermostReplyPayload` accepted a
+* substantive (non-reasoning) payload, called the underlying
+* `deliverTextOrMediaReply`, and the outcome was `"empty"` — meaning the
+* payload had no text and no media to send, so no Mattermost API call
+* happened. The agent's run completes successfully, but no visible
+* channel/thread reply ever surfaces to the user.
+*
+* Returns a structured violation when the outcome is `"empty"` for a payload
+* that nominally carried user-facing content (text or media bytes that ended
+* up dropped by `resolveSendableOutboundReplyParts`/`sendMediaWithLeadingCaption`).
+* Returns `null` for `"reasoning_skipped"` (intentional suppression),
+* `"text"`, or `"media"` (successful visible sends).
+*/
+function evaluateMattermostNoVisibleReply(params) {
+	if (params.outcome !== "empty") return null;
+	const finalText = typeof params.payload.text === "string" ? params.payload.text.trim() : "";
+	const mediaUrlCount = countOutboundMedia(params.payload);
+	if (finalText.length === 0 && mediaUrlCount === 0) return null;
+	return {
+		reason: "no-visible-reply-after-final-delivery",
+		outcome: params.outcome,
+		finalTextLength: finalText.length,
+		mediaUrlCount
+	};
+}
+function formatMattermostNoVisibleReplyLog(params) {
+	return `mattermost no-visible-reply: ${params.violation.reason} to=${params.to} accountId=${params.accountId} agentId=${params.agentId ?? "unknown"} outcome=${params.violation.outcome} finalTextLength=${params.violation.finalTextLength} mediaUrlCount=${params.violation.mediaUrlCount}`;
+}
+//#endregion
+//#region extensions/mattermost/src/mattermost/monitor-context.ts
+function shouldUpdateMattermostDraftToolProgress(account) {
+	return account.streamingMode !== "off" && resolveChannelStreamingPreviewToolProgress(account.config);
+}
+function shouldSuppressMattermostDefaultToolProgressMessages(account) {
+	return account.streamingMode !== "off";
+}
+function buildMattermostModelPickerSelectMessageSid(params) {
+	const provider = normalizeLowercaseStringOrEmpty(params.provider);
+	const model = normalizeLowercaseStringOrEmpty(params.model);
+	return `interaction:${params.postId}:select:${provider}/${model}`;
+}
+function resolveMattermostReplyRootId(params) {
+	const threadRootId = normalizeOptionalString(params.threadRootId);
+	if (params.kind === "direct" && !threadRootId) return;
+	if (threadRootId) return threadRootId;
+	return normalizeOptionalString(params.replyToId);
+}
+function canFinalizeMattermostPreviewInPlace(params) {
+	return resolveMattermostReplyRootId({
+		kind: params.kind,
+		threadRootId: params.threadRootId,
+		replyToId: params.replyToId
+	}) === params.previewRootId?.trim();
+}
+function formatMattermostFinalDeliveryOutcomeLog(params) {
+	const violation = evaluateMattermostNoVisibleReply({
+		outcome: params.outcome,
+		payload: params.payload
+	});
+	if (violation) return formatMattermostNoVisibleReplyLog({
+		violation,
+		to: params.to,
+		accountId: params.accountId,
+		agentId: params.agentId
+	});
+	if (params.outcome === "text" || params.outcome === "media") return `delivered reply to ${params.to}`;
+}
+function resolveMattermostEffectiveReplyToId(params) {
+	if (params.kind === "direct" && params.replyToMode === "off") return;
+	const threadRootId = normalizeOptionalString(params.threadRootId);
+	if (threadRootId) return threadRootId;
+	const postId = normalizeOptionalString(params.postId);
+	if (!postId) return;
+	return params.replyToMode === "all" || params.replyToMode === "first" || params.replyToMode === "batched" ? postId : void 0;
+}
+function resolveMattermostThreadSessionContext(params) {
+	const effectiveReplyToId = resolveMattermostEffectiveReplyToId({
+		kind: params.kind,
+		postId: params.postId,
+		replyToMode: params.replyToMode,
+		threadRootId: params.threadRootId
+	});
+	const threadKeys = resolveThreadSessionKeys$1({
+		baseSessionKey: params.baseSessionKey,
+		threadId: effectiveReplyToId,
+		parentSessionKey: effectiveReplyToId && params.kind !== "direct" ? params.baseSessionKey : void 0
+	});
+	return {
+		effectiveReplyToId,
+		sessionKey: threadKeys.sessionKey,
+		parentSessionKey: threadKeys.parentSessionKey
+	};
+}
+function resolveMattermostPendingHistoryKey(params) {
+	return params.kind === "direct" ? null : params.sessionKey;
+}
+function resolveMattermostReactionChannelId(payload) {
+	return normalizeOptionalString(payload.broadcast?.channel_id) ?? normalizeOptionalString(payload.data?.channel_id);
+}
+//#endregion
+//#region extensions/mattermost/src/mattermost/monitor-draft-delivery.ts
+async function deliverMattermostReplyWithDraftPreview(params) {
+	if (isReasoningReplyPayload(params.payload)) return;
+	await deliverWithFinalizableLivePreviewAdapter({
+		kind: params.info.kind,
+		payload: params.payload,
+		adapter: defineFinalizableLivePreviewAdapter({
+			draft: {
+				flush: params.draftStream.flush,
+				clear: params.draftStream.clear,
+				discardPending: params.draftStream.discardPending,
+				seal: params.draftStream.seal,
+				id: params.draftStream.postId
+			},
+			buildFinalEdit: (payload) => {
+				const hasMedia = Boolean(payload.mediaUrl) || (payload.mediaUrls?.length ?? 0) > 0;
+				const ttsSupplement = getReplyPayloadTtsSupplement(payload);
+				const previewFinalText = params.resolvePreviewFinalText(payload.text ?? ttsSupplement?.spokenText);
+				if (hasMedia && !ttsSupplement || typeof previewFinalText !== "string" || payload.isError || !canFinalizeMattermostPreviewInPlace({
+					kind: params.kind,
+					previewRootId: params.effectiveReplyToId,
+					threadRootId: params.effectiveReplyToId,
+					replyToId: payload.replyToId
+				})) return;
+				return { message: previewFinalText };
+			},
+			editFinal: async (previewPostId, edit) => {
+				await updateMattermostPost(params.client, previewPostId, edit);
+			},
+			onPreviewFinalized: () => {
+				params.previewState.finalizedViaPreviewPost = true;
+				params.recordThreadParticipation?.();
+			},
+			buildSupplementalPayload: (payload) => getReplyPayloadTtsSupplement(payload) ? buildTtsSupplementMediaPayload(payload) : void 0,
+			deliverSupplemental: async (payload) => {
+				await params.deliverPayload(payload);
+			},
+			logPreviewEditFailure: (err) => {
+				params.logVerboseMessage(`mattermost preview final edit failed; falling back to normal send (${String(err)})`);
+			}
+		}),
+		deliverNormally: async (payload) => {
+			const supplement = getReplyPayloadTtsSupplement(payload);
+			await params.deliverPayload(supplement && !payload.text?.trim() && supplement.visibleTextAlreadyDelivered !== true ? {
+				...payload,
+				text: supplement.spokenText
+			} : payload);
+		}
+	});
+}
+//#endregion
 //#region extensions/mattermost/src/mattermost/monitor-gating.ts
 function mapMattermostChannelTypeToChatType(channelType) {
 	const normalized = channelType?.trim().toUpperCase();
@@ -279,43 +598,6 @@ function evaluateMattermostMentionGate(params) {
 	};
 }
 //#endregion
-//#region extensions/mattermost/src/mattermost/monitor-helpers.ts
-const formatInboundFromLabel$1 = formatInboundFromLabel;
-function resolveThreadSessionKeys$1(params) {
-	return resolveThreadSessionKeys({
-		...params,
-		normalizeThreadId: (threadId) => threadId
-	});
-}
-/**
-* Strip bot mention from message text while preserving newlines and
-* block-level Markdown formatting (headings, lists, blockquotes).
-*/
-function normalizeMention(text, mention) {
-	if (!mention) return text.trim();
-	const escaped = mention.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-	const hasMentionRe = new RegExp(`@${escaped}\\b`, "i");
-	const leadingMentionRe = new RegExp(`^([\\t ]*)@${escaped}\\b[\\t ]*`, "i");
-	const trailingMentionRe = new RegExp(`[\\t ]*@${escaped}\\b[\\t ]*$`, "i");
-	const normalizedLines = text.split("\n").map((line) => {
-		const hadMention = hasMentionRe.test(line);
-		const normalizedLine = line.replace(leadingMentionRe, "$1").replace(trailingMentionRe, "").replace(new RegExp(`@${escaped}\\b`, "gi"), "").replace(/(\S)[ \t]{2,}/g, "$1 ");
-		return {
-			text: normalizedLine,
-			mentionOnlyBlank: hadMention && normalizedLine.trim() === ""
-		};
-	});
-	while (normalizedLines[0]?.mentionOnlyBlank) normalizedLines.shift();
-	while (normalizedLines.at(-1)?.text.trim() === "") normalizedLines.pop();
-	return normalizedLines.map((line) => line.text).join("\n");
-}
-function shouldDropEmptyMattermostBody(params) {
-	if (/[^\p{White_Space}\p{Cc}\p{Cf}\p{M}]/u.test(params.bodyText)) return false;
-	const botUsername = normalizeLowercaseStringOrEmpty(params.botUsername ?? "");
-	const bareMention = params.rawText.match(/^[ \t]*(@\S+)[ \t]*$/u)?.[1];
-	return !botUsername || normalizeLowercaseStringOrEmpty(bareMention ?? "") !== `@${botUsername}`;
-}
-//#endregion
 //#region extensions/mattermost/src/mattermost/monitor-onchar.ts
 const DEFAULT_ONCHAR_PREFIXES = [">", "!"];
 function resolveOncharPrefixes(prefixes) {
@@ -337,6 +619,37 @@ function stripOncharPrefix(text, prefixes) {
 	};
 }
 //#endregion
+//#region extensions/mattermost/src/mattermost/monitor-replay.ts
+const recentInboundMessages = createClaimableDedupe({
+	ttlMs: 5 * 6e4,
+	memoryMaxSize: 2e3
+});
+function buildMattermostInboundReplayKeys(params) {
+	return uniqueStrings(params.messageIds.map((id) => `${params.accountId}:${id.trim()}`)).filter((key) => !key.endsWith(":"));
+}
+async function processMattermostReplayGuardedPost(params) {
+	const replayGuard = params.replayGuard ?? recentInboundMessages;
+	const replayKeys = buildMattermostInboundReplayKeys({
+		accountId: params.accountId,
+		messageIds: params.messageIds
+	});
+	if (replayKeys.length === 0) {
+		await params.handlePost();
+		return "processed";
+	}
+	const claimedKeys = [];
+	for (const replayKey of replayKeys) if ((await replayGuard.claim(replayKey)).kind === "claimed") claimedKeys.push(replayKey);
+	if (claimedKeys.length === 0) return "duplicate";
+	try {
+		await params.handlePost();
+		await Promise.all(claimedKeys.map((replayKey) => replayGuard.commit(replayKey)));
+		return "processed";
+	} catch (error) {
+		await Promise.all(claimedKeys.map((replayKey) => replayGuard.commit(replayKey)));
+		throw error;
+	}
+}
+//#endregion
 //#region extensions/mattermost/src/mattermost/monitor-resources.ts
 function formatMattermostInboundMediaText(params) {
 	const unavailableCount = Math.max(0, params.expectedCount - params.mediaCount);
@@ -349,6 +662,9 @@ function formatMattermostInboundMediaText(params) {
 }
 const CHANNEL_CACHE_TTL_MS = 5 * 6e4;
 const USER_CACHE_TTL_MS = 10 * 6e4;
+const MONITOR_RESOURCE_CACHE_MAX_ENTRIES = 1e3;
+const MATTERMOST_MEDIA_RESPONSE_HEADER_TIMEOUT_MS = 12e4;
+const MATTERMOST_MEDIA_READ_IDLE_TIMEOUT_MS = 3e4;
 function createMattermostMonitorResources(params) {
 	const { accountId, callbackUrl, client, logger, mediaMaxBytes, saveRemoteMedia, mediaKindFromMime } = params;
 	const channelCache = /* @__PURE__ */ new Map();
@@ -361,10 +677,14 @@ function createMattermostMonitorResources(params) {
 	};
 	const setCachedValue = (cache, key, value, ttlMs, rawNowMs) => {
 		const expiresAt = resolveExpiresAtMsFromDurationMs(ttlMs, { nowMs: rawNowMs });
-		if (expiresAt !== void 0) cache.set(key, {
-			value,
-			expiresAt
-		});
+		if (expiresAt !== void 0) {
+			cache.delete(key);
+			cache.set(key, {
+				value,
+				expiresAt
+			});
+			pruneMapToMaxSize(cache, MONITOR_RESOURCE_CACHE_MAX_ENTRIES);
+		}
 	};
 	const resolveMattermostMedia = async (fileIds) => {
 		const ids = normalizeStringEntries(fileIds ?? []);
@@ -376,7 +696,9 @@ function createMattermostMonitorResources(params) {
 				requestInit: { headers: { Authorization: `Bearer ${client.token}` } },
 				filePathHint: fileId,
 				maxBytes: mediaMaxBytes,
-				ssrfPolicy: { allowedHostnames: [new URL(client.baseUrl).hostname] }
+				ssrfPolicy: { allowedHostnames: [new URL(client.baseUrl).hostname] },
+				responseHeaderTimeoutMs: MATTERMOST_MEDIA_RESPONSE_HEADER_TIMEOUT_MS,
+				readIdleTimeoutMs: MATTERMOST_MEDIA_READ_IDLE_TIMEOUT_MS
 			});
 			const contentType = saved.contentType ?? void 0;
 			out.push({
@@ -849,37 +1171,6 @@ function reasonToString(reason) {
 	return reason.length > 0 ? reason.toString("utf8") : "";
 }
 //#endregion
-//#region extensions/mattermost/src/mattermost/no-visible-reply-diagnostic.ts
-/**
-* Detects the #80501 symptom: `deliverMattermostReplyPayload` accepted a
-* substantive (non-reasoning) payload, called the underlying
-* `deliverTextOrMediaReply`, and the outcome was `"empty"` — meaning the
-* payload had no text and no media to send, so no Mattermost API call
-* happened. The agent's run completes successfully, but no visible
-* channel/thread reply ever surfaces to the user.
-*
-* Returns a structured violation when the outcome is `"empty"` for a payload
-* that nominally carried user-facing content (text or media bytes that ended
-* up dropped by `resolveSendableOutboundReplyParts`/`sendMediaWithLeadingCaption`).
-* Returns `null` for `"reasoning_skipped"` (intentional suppression),
-* `"text"`, or `"media"` (successful visible sends).
-*/
-function evaluateMattermostNoVisibleReply(params) {
-	if (params.outcome !== "empty") return null;
-	const finalText = typeof params.payload.text === "string" ? params.payload.text.trim() : "";
-	const mediaUrlCount = countOutboundMedia(params.payload);
-	if (finalText.length === 0 && mediaUrlCount === 0) return null;
-	return {
-		reason: "no-visible-reply-after-final-delivery",
-		outcome: params.outcome,
-		finalTextLength: finalText.length,
-		mediaUrlCount
-	};
-}
-function formatMattermostNoVisibleReplyLog(params) {
-	return `mattermost no-visible-reply: ${params.violation.reason} to=${params.to} accountId=${params.accountId} agentId=${params.agentId ?? "unknown"} outcome=${params.violation.outcome} finalTextLength=${params.violation.finalTextLength} mediaUrlCount=${params.violation.mediaUrlCount}`;
-}
-//#endregion
 //#region extensions/mattermost/src/mattermost/reconnect.ts
 /**
 * Reconnection loop with exponential backoff.
@@ -992,58 +1283,9 @@ async function hasMattermostThreadParticipationWithPersistence(params) {
 }
 //#endregion
 //#region extensions/mattermost/src/mattermost/monitor.ts
-function shouldUpdateMattermostDraftToolProgress(account) {
-	return account.streamingMode !== "off" && resolveChannelStreamingPreviewToolProgress(account.config);
-}
-function shouldSuppressMattermostDefaultToolProgressMessages(account) {
-	return account.streamingMode !== "off";
-}
-const RECENT_MATTERMOST_MESSAGE_TTL_MS = 5 * 6e4;
-const RECENT_MATTERMOST_MESSAGE_MAX = 2e3;
 function normalizeInteractionSourceIps(values) {
 	return normalizeTrimmedStringList(values);
 }
-const recentInboundMessages = createClaimableDedupe({
-	ttlMs: RECENT_MATTERMOST_MESSAGE_TTL_MS,
-	memoryMaxSize: RECENT_MATTERMOST_MESSAGE_MAX
-});
-var MattermostRetryableInboundError = class extends Error {
-	constructor(message, options) {
-		super(message, options);
-		this.name = "MattermostRetryableInboundError";
-	}
-};
-function buildMattermostModelPickerSelectMessageSid(params) {
-	const provider = normalizeLowercaseStringOrEmpty(params.provider);
-	const model = normalizeLowercaseStringOrEmpty(params.model);
-	return `interaction:${params.postId}:select:${provider}/${model}`;
-}
-function buildMattermostInboundReplayKeys(params) {
-	return uniqueStrings(params.messageIds.map((id) => `${params.accountId}:${id.trim()}`)).filter((key) => !key.endsWith(":"));
-}
-async function processMattermostReplayGuardedPost(params) {
-	const replayGuard = params.replayGuard ?? recentInboundMessages;
-	const replayKeys = buildMattermostInboundReplayKeys({
-		accountId: params.accountId,
-		messageIds: params.messageIds
-	});
-	if (replayKeys.length === 0) {
-		await params.handlePost();
-		return "processed";
-	}
-	const claimedKeys = [];
-	for (const replayKey of replayKeys) if ((await replayGuard.claim(replayKey)).kind === "claimed") claimedKeys.push(replayKey);
-	if (claimedKeys.length === 0) return "duplicate";
-	try {
-		await params.handlePost();
-		await Promise.all(claimedKeys.map((replayKey) => replayGuard.commit(replayKey)));
-		return "processed";
-	} catch (error) {
-		if (error instanceof MattermostRetryableInboundError) claimedKeys.forEach((replayKey) => replayGuard.release(replayKey, { error }));
-		else await Promise.all(claimedKeys.map((replayKey) => replayGuard.commit(replayKey)));
-		throw error;
-	}
-}
 function resolveRuntime(opts) {
 	return opts.runtime ?? {
 		log: console.log,
@@ -1061,126 +1303,32 @@ function channelChatType(kind) {
 	if (kind === "group") return "group";
 	return "channel";
 }
-function resolveMattermostReplyRootId(params) {
-	if (params.kind === "direct") return;
-	const threadRootId = normalizeOptionalString(params.threadRootId);
-	if (threadRootId) return threadRootId;
-	return normalizeOptionalString(params.replyToId);
-}
-function canFinalizeMattermostPreviewInPlace(params) {
-	return resolveMattermostReplyRootId({
-		kind: params.kind,
-		threadRootId: params.threadRootId,
-		replyToId: params.replyToId
-	}) === params.previewRootId?.trim();
-}
 function createDisabledMattermostDraftStream() {
 	const noopAsync = async () => {};
 	return {
 		update: () => {},
+		updateAssistantText: () => {},
 		flush: noopAsync,
 		postId: () => void 0,
 		clear: noopAsync,
 		discardPending: noopAsync,
 		seal: noopAsync,
 		stop: noopAsync,
-		forceNewMessage: () => {}
-	};
-}
-async function deliverMattermostReplyWithDraftPreview(params) {
-	if (isReasoningReplyPayload(params.payload)) return;
-	await deliverWithFinalizableLivePreviewAdapter({
-		kind: params.info.kind,
-		payload: params.payload,
-		adapter: defineFinalizableLivePreviewAdapter({
-			draft: {
-				flush: params.draftStream.flush,
-				clear: params.draftStream.clear,
-				discardPending: params.draftStream.discardPending,
-				seal: params.draftStream.seal,
-				id: params.draftStream.postId
-			},
-			buildFinalEdit: (payload) => {
-				const hasMedia = Boolean(payload.mediaUrl) || (payload.mediaUrls?.length ?? 0) > 0;
-				const ttsSupplement = getReplyPayloadTtsSupplement(payload);
-				const previewFinalText = params.resolvePreviewFinalText(payload.text ?? ttsSupplement?.spokenText);
-				if (hasMedia && !ttsSupplement || typeof previewFinalText !== "string" || payload.isError || !canFinalizeMattermostPreviewInPlace({
-					kind: params.kind,
-					previewRootId: params.effectiveReplyToId,
-					threadRootId: params.effectiveReplyToId,
-					replyToId: payload.replyToId
-				})) return;
-				return { message: previewFinalText };
-			},
-			editFinal: async (previewPostId, edit) => {
-				await updateMattermostPost(params.client, previewPostId, edit);
-			},
-			onPreviewFinalized: () => {
-				params.previewState.finalizedViaPreviewPost = true;
-				params.recordThreadParticipation?.();
-			},
-			buildSupplementalPayload: (payload) => getReplyPayloadTtsSupplement(payload) ? buildTtsSupplementMediaPayload(payload) : void 0,
-			deliverSupplemental: async (payload) => {
-				await params.deliverPayload(payload);
-			},
-			logPreviewEditFailure: (err) => {
-				params.logVerboseMessage(`mattermost preview final edit failed; falling back to normal send (${String(err)})`);
-			}
-		}),
-		deliverNormally: async (payload) => {
-			const supplement = getReplyPayloadTtsSupplement(payload);
-			await params.deliverPayload(supplement && !payload.text?.trim() && supplement.visibleTextAlreadyDelivered !== true ? {
-				...payload,
-				text: supplement.spokenText
-			} : payload);
-		}
-	});
-}
-function formatMattermostFinalDeliveryOutcomeLog(params) {
-	const violation = evaluateMattermostNoVisibleReply({
-		outcome: params.outcome,
-		payload: params.payload
-	});
-	if (violation) return formatMattermostNoVisibleReplyLog({
-		violation,
-		to: params.to,
-		accountId: params.accountId,
-		agentId: params.agentId
-	});
-	if (params.outcome === "text" || params.outcome === "media") return `delivered reply to ${params.to}`;
-}
-function resolveMattermostEffectiveReplyToId(params) {
-	if (params.kind === "direct") return;
-	const threadRootId = normalizeOptionalString(params.threadRootId);
-	if (threadRootId) return threadRootId;
-	const postId = normalizeOptionalString(params.postId);
-	if (!postId) return;
-	return params.replyToMode === "all" || params.replyToMode === "first" || params.replyToMode === "batched" ? postId : void 0;
-}
-function resolveMattermostThreadSessionContext(params) {
-	const effectiveReplyToId = resolveMattermostEffectiveReplyToId({
-		kind: params.kind,
-		postId: params.postId,
-		replyToMode: params.replyToMode,
-		threadRootId: params.threadRootId
-	});
-	const threadKeys = resolveThreadSessionKeys$1({
-		baseSessionKey: params.baseSessionKey,
-		threadId: effectiveReplyToId,
-		parentSessionKey: effectiveReplyToId ? params.baseSessionKey : void 0
-	});
-	return {
-		effectiveReplyToId,
-		sessionKey: threadKeys.sessionKey,
-		parentSessionKey: threadKeys.parentSessionKey
+		forceNewMessage: noopAsync,
+		settleBoundaries: noopAsync,
+		resolveFinalText: (text) => ({
+			kind: "full",
+			text
+		})
 	};
 }
-function resolveMattermostReactionChannelId(payload) {
-	return normalizeOptionalString(payload.broadcast?.channel_id) ?? normalizeOptionalString(payload.data?.channel_id);
-}
 function buildMattermostAttachmentPlaceholder(mediaList) {
 	if (mediaList.length === 0) return "";
-	if (mediaList.length === 1) return `<media:${mediaList[0].kind === "unknown" ? "document" : mediaList[0].kind}>`;
+	if (mediaList.length === 1) {
+		const media = mediaList[0];
+		if (!media) return "";
+		return `<media:${media.kind === "unknown" ? "document" : media.kind}>`;
+	}
 	const allImages = mediaList.every((media) => media.kind === "image");
 	const label = allImages ? "image" : "file";
 	const suffix = mediaList.length === 1 ? label : `${label}s`;
@@ -1442,17 +1590,22 @@ async function monitorMattermostProvider(opts = {}) {
 					},
 					onReplyStart: typingCallbacks?.onReplyStart
 				});
-				await core.channel.reply.dispatchReplyFromConfig({
-					ctx: ctxPayload,
-					cfg,
+				await core.channel.reply.withReplyDispatcher({
 					dispatcher,
-					replyOptions: {
-						...replyOptions,
-						disableBlockStreaming: typeof account.blockStreaming === "boolean" ? !account.blockStreaming : void 0,
-						onModelSelected
-					}
+					onSettled: () => {
+						markDispatchIdle();
+					},
+					run: () => core.channel.reply.dispatchReplyFromConfig({
+						ctx: ctxPayload,
+						cfg,
+						dispatcher,
+						replyOptions: {
+							...replyOptions,
+							disableBlockStreaming: typeof account.blockStreaming === "boolean" ? !account.blockStreaming : void 0,
+							onModelSelected
+						}
+					})
 				});
-				markDispatchIdle();
 			},
 			log: (msg) => runtime.log?.(msg)
 		}),
@@ -1912,7 +2065,10 @@ async function monitorMattermostProvider(opts = {}) {
 					replyToMode,
 					threadRootId
 				});
-				const historyKey = kind === "direct" ? null : sessionKey;
+				const historyKey = resolveMattermostPendingHistoryKey({
+					kind,
+					sessionKey
+				});
 				const mentionRegexes = core.channel.mentions.buildMentionRegexes(cfg, route.agentId);
 				const wasMentioned = kind !== "direct" && ((botUsername ? normalizeLowercaseStringOrEmpty(rawText).includes(`@${normalizeLowercaseStringOrEmpty(botUsername)}`) : false) || core.channel.mentions.matchesMentionPatterns(rawText, mentionRegexes));
 				const pendingBody = rawText || (post.file_ids?.length ? `[Mattermost ${post.file_ids.length === 1 ? "file" : "files"}]` : "");
@@ -2074,7 +2230,7 @@ async function monitorMattermostProvider(opts = {}) {
 					normalizeEntry: normalizeMattermostAllowEntry
 				}) : null;
 				const storePath = core.channel.session.resolveStorePath(cfg.session?.store, { agentId: route.agentId });
-				const previewLine = bodyText.slice(0, 200).replace(/\n/g, "\\n");
+				const previewLine = truncateUtf16Safe(bodyText, 200).replace(/\n/g, "\\n");
 				logVerboseMessage(`mattermost inbound: from=${ctxPayload.From} len=${bodyText.length} preview="${previewLine}"`);
 				const textLimit = core.channel.text.resolveTextChunkLimit(cfg, "mattermost", account.accountId, { fallbackLimit: account.textChunkLimit ?? 4e3 });
 				const tableMode = core.channel.text.resolveMarkdownTableMode({
@@ -2082,7 +2238,8 @@ async function monitorMattermostProvider(opts = {}) {
 					channel: "mattermost",
 					accountId: account.accountId
 				});
-				const { onModelSelected, typingCallbacks, ...replyPipeline } = createChannelMessageReplyPipeline({
+				const chunkMode = core.channel.text.resolveChunkMode(cfg, "mattermost", account.accountId);
+				const { onModelSelected, typingCallbacks, resolveResponsePrefix, ...replyPipeline } = createChannelMessageReplyPipeline({
 					cfg,
 					agentId: route.agentId,
 					channel: "mattermost",
@@ -2107,10 +2264,22 @@ async function monitorMattermostProvider(opts = {}) {
 					channelId,
 					rootId: effectiveReplyToId,
 					throttleMs: 1200,
+					chunkText: (value) => core.channel.text.chunkMarkdownTextWithMode(core.channel.text.convertMarkdownTables(value, tableMode), textLimit, chunkMode),
 					log: logVerboseMessage,
 					warn: logVerboseMessage
 				}) : createDisabledMattermostDraftStream();
+				const previewBoundaryController = createMattermostDraftPreviewBoundaryController({
+					enabled: draftPreviewEnabled && account.streamingMode === "block",
+					forceNewMessage: async () => {
+						await draftStream.forceNewMessage();
+					}
+				});
 				let lastPartialText = "";
+				let firstAssistantPreviewPrefix;
+				let firstAssistantPreviewPrefixPending = true;
+				let currentAssistantPreviewUsesPrefix = false;
+				let blockPreviewActivity = "none";
+				let blockPreviewAssistantMessagePending = false;
 				const progressDraft = createChannelProgressDraftCompositor({
 					entry: account.config,
 					mode: account.streamingMode,
@@ -2121,11 +2290,28 @@ async function monitorMattermostProvider(opts = {}) {
 						if (options?.flush) await draftStream.flush();
 					}
 				});
+				const enterBlockPreviewActivity = (activity) => {
+					if (account.streamingMode !== "block") return;
+					const continuesCurrentActivity = activity === "tool" && blockPreviewActivity === "tool" || activity === "text" && blockPreviewActivity === "text" && !blockPreviewAssistantMessagePending || activity === "reasoning" && blockPreviewActivity === "reasoning";
+					const startsNewGeneration = !continuesCurrentActivity && !(blockPreviewActivity === "reasoning");
+					if (startsNewGeneration) currentAssistantPreviewUsesPrefix = false;
+					const boundarySettled = startsNewGeneration ? previewBoundaryController.noteBoundary() : void 0;
+					if (!continuesCurrentActivity) progressDraft.reset();
+					blockPreviewActivity = activity;
+					blockPreviewAssistantMessagePending = false;
+					if (activity === "tool") lastPartialText = "";
+					return boundarySettled;
+				};
 				const previewState = { finalizedViaPreviewPost: false };
-				const resolvePreviewFinalText = (text) => {
+				const resolveFinalDeliveryText = (text) => {
 					if (typeof text !== "string") return;
-					const formatted = core.channel.text.convertMarkdownTables(text, tableMode);
-					const chunkMode = core.channel.text.resolveChunkMode(cfg, "mattermost", account.accountId);
+					const resolution = draftStream.resolveFinalText(text);
+					return resolution.kind === "already-delivered" ? "" : resolution.text;
+				};
+				const resolvePreviewFinalText = (text) => {
+					const deliveryText = resolveFinalDeliveryText(text);
+					if (typeof deliveryText !== "string") return;
+					const formatted = core.channel.text.convertMarkdownTables(deliveryText, tableMode);
 					const chunks = core.channel.text.chunkMarkdownTextWithMode(formatted, textLimit, chunkMode);
 					if (!chunks.length && formatted) chunks.push(formatted);
 					if (chunks.length != 1) return;
@@ -2139,8 +2325,17 @@ async function monitorMattermostProvider(opts = {}) {
 					if (!cleaned) return;
 					if (cleaned === lastPartialText) return;
 					if (lastPartialText && lastPartialText.startsWith(cleaned) && cleaned.length < lastPartialText.length) return;
+					const boundarySettled = enterBlockPreviewActivity("text");
 					lastPartialText = cleaned;
-					draftStream.update(cleaned);
+					if (firstAssistantPreviewPrefixPending) {
+						firstAssistantPreviewPrefix = resolveResponsePrefix?.();
+						firstAssistantPreviewPrefixPending = false;
+						currentAssistantPreviewUsesPrefix = Boolean(firstAssistantPreviewPrefix);
+					}
+					const previewText = currentAssistantPreviewUsesPrefix && firstAssistantPreviewPrefix ? cleaned.startsWith(firstAssistantPreviewPrefix) ? cleaned : `${firstAssistantPreviewPrefix} ${cleaned}` : cleaned;
+					draftStream.updateAssistantText(previewText);
+					previewBoundaryController.noteUpdate();
+					return boundarySettled;
 				};
 				const deliveryBarrier = createMattermostReplyDeliveryBarrier({
 					isDirect: kind === "direct",
@@ -2153,7 +2348,11 @@ async function monitorMattermostProvider(opts = {}) {
 					humanDelay: core.channel.reply.resolveHumanDelayConfig(cfg, route.agentId),
 					typingCallbacks,
 					deliver: async (payloadEntry, info) => {
-						if (info.kind === "final") progressDraft.markFinalReplyStarted();
+						if (info.kind === "final") {
+							await enterBlockPreviewActivity("text");
+							await draftStream.settleBoundaries();
+							progressDraft.markFinalReplyStarted();
+						}
 						const markThreadParticipation = () => {
 							if (kind !== "direct" && effectiveReplyToId) recordMattermostThreadParticipation(account.accountId, channelId, effectiveReplyToId, { agentId: route.agentId });
 						};
@@ -2169,10 +2368,15 @@ async function monitorMattermostProvider(opts = {}) {
 							logVerboseMessage,
 							recordThreadParticipation: markThreadParticipation,
 							deliverPayload: async (payloadToDeliver) => {
+								const finalTextResolution = info.kind === "final" && !payloadToDeliver.isError && typeof payloadToDeliver.text === "string" ? draftStream.resolveFinalText(payloadToDeliver.text) : void 0;
+								const resolvedPayload = finalTextResolution ? {
+									...payloadToDeliver,
+									text: finalTextResolution.kind === "already-delivered" ? "" : finalTextResolution.text
+								} : payloadToDeliver;
 								const outcome = await deliverMattermostReplyPayload({
 									core,
 									cfg,
-									payload: payloadToDeliver,
+									payload: resolvedPayload,
 									to,
 									accountId: account.accountId,
 									agentId: route.agentId,
@@ -2187,9 +2391,10 @@ async function monitorMattermostProvider(opts = {}) {
 									onDmChannelResolution: deliveryBarrier.trackDmChannelResolution
 								});
 								if (outcome === "text" || outcome === "media") markThreadParticipation();
+								else if (outcome === "empty" && finalTextResolution?.kind === "already-delivered") markThreadParticipation();
 								const deliveryLog = formatMattermostFinalDeliveryOutcomeLog({
 									outcome,
-									payload: payloadToDeliver,
+									payload: resolvedPayload,
 									to,
 									accountId: account.accountId,
 									agentId: route.agentId
@@ -2275,33 +2480,44 @@ async function monitorMattermostProvider(opts = {}) {
 										replyOptions: {
 											...replyOptions,
 											allowProgressCallbacksWhenSourceDeliverySuppressed: draftToolProgressEnabled ? true : void 0,
+											preserveProgressCallbackStartOrder: draftPreviewEnabled ? true : void 0,
 											onObservedReplyDelivery: draftToolProgressEnabled ? () => draftStream.clear() : void 0,
-											disableBlockStreaming: true,
+											disableBlockStreaming: draftPreviewEnabled ? true : typeof account.blockStreaming === "boolean" ? !account.blockStreaming : void 0,
 											...suppressDefaultToolProgressMessages ? { suppressDefaultToolProgressMessages: true } : {},
 											onModelSelected,
 											onPartialReply: (payloadResult) => {
-												if (account.streamingMode !== "progress") updateDraftFromPartial(payloadResult.text);
+												if (account.streamingMode !== "progress") return updateDraftFromPartial(payloadResult.text);
 											},
 											onAssistantMessageStart: () => {
 												lastPartialText = "";
 												progressDraft.resetReasoningProgress();
+												if (account.streamingMode === "block") {
+													blockPreviewAssistantMessagePending = true;
+													return;
+												}
 												if (account.streamingMode !== "progress") progressDraft.reset();
 											},
 											onReasoningEnd: () => {
 												lastPartialText = "";
 												progressDraft.resetReasoningProgress();
-												if (account.streamingMode !== "progress") progressDraft.reset();
+												if (account.streamingMode !== "block" && account.streamingMode !== "progress") progressDraft.reset();
 											},
 											onReasoningStream: async (payloadResult) => {
 												if (account.streamingMode === "progress") {
 													await progressDraft.pushReasoningProgress(payloadResult.text || "Thinking…", { snapshot: payloadResult.isReasoningSnapshot === true });
 													return;
 												}
-												if (!lastPartialText) draftStream.update("Thinking…");
+												if (!lastPartialText) {
+													const boundarySettled = enterBlockPreviewActivity("reasoning");
+													draftStream.update("Thinking…");
+													previewBoundaryController.noteUpdate();
+													await boundarySettled;
+												}
 											},
 											onToolStart: async (payloadValue) => {
 												if (!draftToolProgressEnabled) return;
-												await progressDraft.pushToolProgress(buildChannelProgressDraftLineForEntry(account.config, {
+												const boundarySettled = enterBlockPreviewActivity("tool");
+												const progressSettled = progressDraft.pushToolProgress(buildChannelProgressDraftLineForEntry(account.config, {
 													event: "tool",
 													itemId: payloadValue.itemId,
 													toolCallId: payloadValue.toolCallId,
@@ -2309,10 +2525,13 @@ async function monitorMattermostProvider(opts = {}) {
 													phase: payloadValue.phase,
 													args: payloadValue.args
 												}, payloadValue.detailMode ? { detailMode: payloadValue.detailMode } : void 0), { startImmediately: true });
+												previewBoundaryController.noteUpdate();
+												await Promise.all([boundarySettled, progressSettled]);
 											},
 											onItemEvent: async (payloadLocal) => {
 												if (!draftToolProgressEnabled) return;
-												await progressDraft.pushToolProgress(buildChannelProgressDraftLineForEntry(account.config, {
+												const boundarySettled = enterBlockPreviewActivity("tool");
+												const progressSettled = progressDraft.pushToolProgress(buildChannelProgressDraftLineForEntry(account.config, {
 													event: "item",
 													itemId: payloadLocal.itemId,
 													itemKind: payloadLocal.kind,
@@ -2324,6 +2543,8 @@ async function monitorMattermostProvider(opts = {}) {
 													progressText: payloadLocal.progressText,
 													meta: payloadLocal.meta
 												}), { startImmediately: true });
+												previewBoundaryController.noteUpdate();
+												await Promise.all([boundarySettled, progressSettled]);
 											}
 										}
 									})