@openclaw/matrix 2026.7.1 → 2026.7.2-beta.2

package/dist/{monitor-CsGOGdwu.js → monitor-C5EOF9et.js}

@@ -1,40 +1,36 @@
 import { a as resolveMatrixAccountConfig, i as resolveMatrixAccountAllowlistConfig } from "./account-config-BZWN9tGS.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { m as resolveConfiguredMatrixBotUserIds } from "./setup-core-BGgbrdaJ.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-jUTBsjHU.js";
-import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-DtnhNYd-.js";
+import { m as resolveConfiguredMatrixBotUserIds } from "./setup-core-CYQRY2oG.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-B1woOUgk.js";
+import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-BTSatSY3.js";
 import { t as isMatrixQualifiedUserId } from "./target-ids-B-5aQxwn.js";
-import { r as isMatrixNotFoundError, t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { O as resolveMatrixSqliteStateEnv } from "./crypto-state-store-Jy3qwhdy.js";
-import { c as resolveMatrixStateFilePath } from "./storage-CQdyKcGg.js";
-import { D as parsePollStartContent, S as formatPollAsText, T as isPollStartType, _ as readJoinedMatrixMembers, a as sendMessageMatrix, f as promoteMatrixDirectRoomCandidate, g as isStrictDirectMembership, h as hasDirectMatrixMemberFlag, t as chunkMatrixText, v as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, w as isPollEventType } from "./send-D92v6Yy0.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-BX5nmWpw.js";
-import { n as LogService } from "./logger-D0GCSDQq.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-p-LP21qs.js";
+import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
+import { D as parsePollStartContent, S as formatPollAsText, T as isPollStartType, _ as readJoinedMatrixMembers, a as sendMessageMatrix, f as promoteMatrixDirectRoomCandidate, g as isStrictDirectMembership, h as hasDirectMatrixMemberFlag, t as chunkMatrixText, v as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, w as isPollEventType } from "./send-yre1krm8.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-U5ZroBeZ.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-DPCtdFjk.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-DkFfq7mH.js";
-import "./client-tgnlQJk4.js";
-import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-nSmFiVgk.js";
-import { d as resolveDefaultGroupPolicy, h as warnMissingProviderGroupPolicyFallbackOnce, m as resolveThreadBindingMaxAgeMsForChannel, p as resolveThreadBindingIdleTimeoutMsForChannel, t as GROUP_POLICY_BLOCKED_LABEL, u as resolveAllowlistProviderRuntimeGroupPolicy } from "./runtime-api-CsBoesCU.js";
-import { t as resolveMatrixTargets } from "./resolve-targets-DcV_KfgX.js";
-import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-D8walY04.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-BfW4lxGu.js";
+import "./client-CPuYbNL8.js";
+import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-Jw5_bwQo.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-Cx1VVArA.js";
+import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-BFfgq7c7.js";
 import { n as isMatrixReadySyncState, r as isMatrixTerminalSyncState, t as isMatrixDisconnectedSyncState } from "./sync-state-CWbp0QSY.js";
 import { a as EventType, i as resolveMatrixThreadRouting, n as resolveMatrixReplyToEventId, o as RelationType, r as resolveMatrixThreadRootId, t as resolveMatrixInboundRoute } from "./route-DY6at4qJ.js";
+import { t as createMatrixRoomInfoResolver } from "./room-info-B6vKD5DF.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
-import { buildChannelProgressDraftLineForEntry, createChannelProgressDraftGate, createPreviewMessageReceipt, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, formatChannelProgressDraftLine, formatChannelProgressDraftText, isChannelProgressDraftWorkToolName, mergeChannelProgressDraftLine, normalizeChannelProgressDraftLineIdentity, resolveChannelProgressDraftMaxLines, waitUntilAbort } from "openclaw/plugin-sdk/channel-outbound";
+import { buildChannelProgressDraftLineForEntry, createChannelProgressDraftGate, createPreviewMessageReceipt, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, formatChannelProgressDraftLine, formatChannelProgressDraftText, isChannelProgressDraftWorkToolName, mergeChannelProgressDraftLine, normalizeChannelProgressDraftLineIdentity, resolveChannelProgressDraftMaxLines, resolveChannelStreamingBlockEnabled, waitUntilAbort } from "openclaw/plugin-sdk/channel-outbound";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringifiedEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
-import path from "node:path";
-import { createHash } from "node:crypto";
 import { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
 import { resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
 import { buildChannelInboundEventContext, hasFinalInboundReplyDispatch, toInboundMediaFacts } from "openclaw/plugin-sdk/channel-inbound";
 import { getSessionEntry } from "openclaw/plugin-sdk/session-store-runtime";
 import { isFutureDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs, resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
-import { readJsonFileWithFallback } from "openclaw/plugin-sdk/json-store";
-import fs from "node:fs/promises";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { format } from "node:util";
+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";
 import { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runtime-context";
@@ -44,7 +40,7 @@ import { evaluateSupplementalContextVisibility, resolveChannelContextVisibilityM
 import { mergePairLoopGuardConfig } from "openclaw/plugin-sdk/pair-loop-guard-runtime";
 import { buildInboundHistoryFromEntries } from "openclaw/plugin-sdk/reply-history";
 import { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
-import { escapeRegExp, sliceUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
+import { decodeHtmlEntities } from "openclaw/plugin-sdk/html-entity-runtime";
 import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { createConnectedChannelStatusPatch, createTransportActivityStatusPatch } from "openclaw/plugin-sdk/gateway-runtime";
 //#region extensions/matrix/src/matrix/monitor/auto-join.ts
@@ -471,7 +467,7 @@ const DM_CACHE_TTL_MS = 3e4;
 const RECENT_INVITE_TTL_MS = 3e4;
 const MAX_TRACKED_DM_ROOMS = 1024;
 const MAX_TRACKED_DM_MEMBER_FLAGS = 2048;
-function rememberBounded$1(map, key, value, maxSize = MAX_TRACKED_DM_ROOMS) {
+function rememberBounded(map, key, value, maxSize = MAX_TRACKED_DM_ROOMS) {
 	map.set(key, value);
 	if (map.size > maxSize) {
 		const oldest = map.keys().next().value;
@@ -509,7 +505,7 @@ function createDirectRoomTracker(client, opts = {}) {
 		try {
 			const normalized = await readJoinedMatrixMembers(client, roomId);
 			if (!normalized) throw new Error("membership unavailable");
-			rememberBounded$1(joinedMembersCache, roomId, {
+			rememberBounded(joinedMembersCache, roomId, {
 				members: normalized,
 				ts: now
 			});
@@ -527,7 +523,7 @@ function createDirectRoomTracker(client, opts = {}) {
 		const now = Date.now();
 		if (cached && now - cached.ts < DM_CACHE_TTL_MS) return cached.isDirect;
 		const isDirect = await hasDirectMatrixMemberFlag(client, roomId, normalizedUserId);
-		rememberBounded$1(directMemberFlagCache, cacheKey, {
+		rememberBounded(directMemberFlagCache, cacheKey, {
 			isDirect,
 			ts: now
 		}, MAX_TRACKED_DM_MEMBER_FLAGS);
@@ -584,7 +580,7 @@ function createDirectRoomTracker(client, opts = {}) {
 	const rememberLocallyPromotedDirectRoom = (roomId, remoteUserId) => {
 		const normalizedRemoteUserId = remoteUserId.trim();
 		if (!normalizedRemoteUserId) return;
-		rememberBounded$1(locallyPromotedDirectRooms, roomId, { remoteUserId: normalizedRemoteUserId });
+		rememberBounded(locallyPromotedDirectRooms, roomId, { remoteUserId: normalizedRemoteUserId });
 	};
 	return {
 		invalidateRoom: (roomId) => {
@@ -596,7 +592,7 @@ function createDirectRoomTracker(client, opts = {}) {
 		rememberInvite: (roomId, remoteUserId) => {
 			const normalizedRemoteUserId = remoteUserId.trim();
 			if (!normalizedRemoteUserId) return;
-			rememberBounded$1(recentInviteCandidates, roomId, {
+			rememberBounded(recentInviteCandidates, roomId, {
 				remoteUserId: normalizedRemoteUserId,
 				ts: Date.now()
 			});
@@ -821,7 +817,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-D92v6Yy0.js").then((n) => n.d), import("./send-D92v6Yy0.js").then((n) => n.m)]).then(([directManagementModule, directRoomModule]) => ({
+const loadMatrixDirectRoomDeps = createLazyRuntimeModule(() => Promise.all([import("./send-yre1krm8.js").then((n) => n.d), import("./send-yre1krm8.js").then((n) => n.m)]).then(([directManagementModule, directRoomModule]) => ({
 	inspectMatrixDirectRooms: directManagementModule.inspectMatrixDirectRooms,
 	isStrictDirectRoom: directRoomModule.isStrictDirectRoom
 })));
@@ -1429,6 +1425,7 @@ function parseGeoUri(value) {
 	if (!trimmed) return null;
 	if (!normalizeLowercaseStringOrEmpty(trimmed).startsWith("geo:")) return null;
 	const [coordsPart, ...paramParts] = trimmed.slice(4).split(";");
+	if (!coordsPart) return null;
 	const coords = coordsPart.split(",");
 	if (coords.length < 2) return null;
 	const latitude = parseStrictFiniteNumber(coords[0] ?? "");
@@ -1525,30 +1522,15 @@ async function downloadMatrixMedia(params) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/mentions.ts
-const HTML_ENTITY_REPLACEMENTS = {
-	amp: "&",
-	apos: "'",
-	gt: ">",
-	lt: "<",
-	nbsp: " ",
-	quot: "\""
-};
-const MAX_UNICODE_SCALAR_VALUE = 1114111;
-function decodeNumericHtmlEntity(match, rawValue, radix) {
-	const codePoint = Number.parseInt(rawValue, radix);
-	if (!Number.isSafeInteger(codePoint) || codePoint < 0 || codePoint > MAX_UNICODE_SCALAR_VALUE || codePoint >= 55296 && codePoint <= 57343) return match;
-	return String.fromCodePoint(codePoint);
-}
-function decodeHtmlEntities(value) {
-	return value.replace(/&(#x?[0-9a-f]+|\w+);/gi, (match, entity) => {
-		const normalized = normalizeLowercaseStringOrEmpty(entity);
-		if (normalized.startsWith("#x")) return decodeNumericHtmlEntity(match, normalized.slice(2), 16);
-		if (normalized.startsWith("#")) return decodeNumericHtmlEntity(match, normalized.slice(1), 10);
-		return HTML_ENTITY_REPLACEMENTS[normalized] ?? match;
+const MATRIX_HTML_ENTITY_RE = /&(?:#x?[0-9a-f]+|amp|apos|gt|lt|nbsp|quot);/gi;
+function decodeVisibleHtmlEntities(value) {
+	return value.replace(MATRIX_HTML_ENTITY_RE, (entity) => {
+		const decoded = decodeHtmlEntities(entity.startsWith("&#") ? entity : entity.toLowerCase());
+		return decoded === "\xA0" ? " " : decoded;
 	});
 }
 function normalizeVisibleMentionText(value) {
-	return normalizeLowercaseStringOrEmpty(decodeHtmlEntities(value.replace(/<[^>]+>/g, " ").replace(/[\u200b-\u200f\u202a-\u202e\u2060-\u206f]/g, "")).replace(/\s+/g, " "));
+	return normalizeLowercaseStringOrEmpty(decodeVisibleHtmlEntities(value.replace(/<[^>]+>/g, " ").replace(/[\u200b-\u200f\u202a-\u202e\u2060-\u206f]/g, "")).replace(/\s+/g, " "));
 }
 function extractVisibleMentionText(value) {
 	return normalizeVisibleMentionText(value ?? "");
@@ -2099,14 +2081,6 @@ function createRoomHistoryTrackerInternal(maxQueueSize = DEFAULT_MAX_QUEUE_SIZE,
 				discarded: true
 			};
 		},
-		getPendingHistory(agentId, roomId, limit, threadRootId) {
-			const queue = findScopedQueue(roomId, threadRootId);
-			if (!queue) return [];
-			return computePendingHistory(queue, agentId, roomId, limit, void 0, void 0, threadRootId);
-		},
-		recordTrigger(roomId, entry, threadRootId) {
-			return appendToQueue(getScopedQueue(roomId, threadRootId), entry);
-		},
 		prepareTrigger(agentId, roomId, limit, entry, threadRootId) {
 			return prepareTriggerInternal(agentId, roomId, limit, entry, threadRootId);
 		},
@@ -2230,11 +2204,11 @@ function createMatrixThreadContextResolver(params) {
 const ALLOW_FROM_STORE_CACHE_TTL_MS = 3e4;
 const PAIRING_REPLY_COOLDOWN_MS = 5 * 6e4;
 const MATRIX_TOOL_PROGRESS_MAX_CHARS = 300;
-const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-D92v6Yy0.js").then((n) => n.l));
+const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-yre1krm8.js").then((n) => n.l));
 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-DentrVii.js"));
-const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-D4EH25gv.js"));
+const loadMatrixReactionEvents = createLazyRuntimeModule(() => import("./reaction-events-QUgxkQKQ.js"));
+const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-GOdPZMBm.js"));
 async function matrixTextWouldActivateMentions(client, text) {
 	const { resolveMatrixMentionsForBody } = await loadMatrixSendModule();
 	const mentions = await resolveMatrixMentionsForBody({
@@ -2245,12 +2219,6 @@ async function matrixTextWouldActivateMentions(client, text) {
 }
 const MAX_TRACKED_PAIRING_REPLY_SENDERS = 512;
 const MAX_TRACKED_SHARED_DM_CONTEXT_NOTICES = 512;
-var MatrixRetryableInboundError = class extends Error {
-	constructor(message, options) {
-		super(message, options);
-		this.name = "MatrixRetryableInboundError";
-	}
-};
 async function redactMatrixDraftEvent(client, roomId, draftEventId) {
 	await client.redactEvent(roomId, draftEventId).catch(() => {});
 }
@@ -2357,7 +2325,7 @@ function resolveMatrixAllowBotsMode(value) {
 	return "off";
 }
 function formatMatrixToolProgressMarkdownCode(text) {
-	return `\`${(text.length <= MATRIX_TOOL_PROGRESS_MAX_CHARS ? text : `${text.slice(0, MATRIX_TOOL_PROGRESS_MAX_CHARS - 1).trimEnd()}...`).replaceAll("`", "'")}\``;
+	return `\`${(text.length <= MATRIX_TOOL_PROGRESS_MAX_CHARS ? text : `${truncateUtf16Safe(text, MATRIX_TOOL_PROGRESS_MAX_CHARS - 1).trimEnd()}...`).replaceAll("`", "'")}\``;
 }
 function createMatrixRoomMessageHandler(params) {
 	const { client, core, cfg, accountId, accountConfig, runtime, logger, logVerboseMessage, allowFromResolvedEntries = [], groupAllowFromResolvedEntries = [], roomsConfig, accountAllowBots, configuredBotUserIds = /* @__PURE__ */ new Set(), groupPolicy, replyToMode, threadReplies, dmThreadReplies, dmSessionScope, streaming, previewToolProgressEnabled, blockStreamingEnabled, dmEnabled, dmPolicy, textLimit, mediaMaxBytes, historyLimit, startupMs, startupGraceMs, dropPreStartupMessages, inboundDeduper, directTracker, getRoomInfo, getMemberDisplayName, needsRoomAliasesForConfig, resolveLiveUserAllowlist = resolveMatrixMonitorLiveUserAllowlist } = params;
@@ -2445,7 +2413,7 @@ function createMatrixRoomMessageHandler(params) {
 	};
 	return async (roomId, event) => {
 		const eventId = typeof event.event_id === "string" ? event.event_id.trim() : "";
-		let claimedInboundEvent = false;
+		let inboundReplayClaim;
 		let draftStreamRef;
 		let draftConsumed = false;
 		try {
@@ -2463,12 +2431,9 @@ function createMatrixRoomMessageHandler(params) {
 			const eventTs = event.origin_server_ts;
 			const eventAge = event.unsigned?.age;
 			const commitInboundEventIfClaimed = async () => {
-				if (!claimedInboundEvent || !inboundDeduper || !eventId) return;
-				await inboundDeduper.commitEvent({
-					roomId,
-					eventId
-				});
-				claimedInboundEvent = false;
+				if (!inboundReplayClaim) return;
+				await inboundReplayClaim.commit();
+				inboundReplayClaim = void 0;
 			};
 			const readIngressPrefix = async () => {
 				const selfUserId = await client.getUserId();
@@ -2493,11 +2458,12 @@ function createMatrixRoomMessageHandler(params) {
 				if (relates && "rel_type" in relates && relates.rel_type === RelationType.Replace) return;
 				if (hasBundledMatrixReplacementRelation(event)) return;
 				if (eventId && inboundDeduper) {
-					claimedInboundEvent = inboundDeduper.claimEvent({
+					const claim = await inboundDeduper.claim({
 						roomId,
 						eventId
 					});
-					if (!claimedInboundEvent) {
+					if (claim.kind === "claimed") inboundReplayClaim = claim.handle;
+					else if (claim.kind !== "invalid") {
 						logVerboseMessage(`matrix: skip duplicate inbound event room=${roomId} id=${eventId}`);
 						return;
 					}
@@ -3184,7 +3150,7 @@ function createMatrixRoomMessageHandler(params) {
 				}
 			});
 			if (quoteHidden) logVerboseMessage(`matrix: drop reply context (mode=${contextVisibilityMode})`);
-			const preview = bodyText.slice(0, 200).replace(/\n/g, "\\n");
+			const preview = truncateUtf16Safe(bodyText, 200).replace(/\n/g, "\\n");
 			logVerboseMessage(`matrix inbound: room=${roomId} from=${senderId} preview="${preview}"`);
 			const replyTarget = ctxPayload.To;
 			if (!replyTarget) {
@@ -3220,7 +3186,6 @@ function createMatrixRoomMessageHandler(params) {
 			const mediaLocalRoots = getAgentScopedMediaLocalRoots(cfg, _route.agentId);
 			let finalReplyDeliveryFailed = false;
 			let nonFinalReplyDeliveryFailed = false;
-			let retryableReplyDeliveryFailed = false;
 			const { onModelSelected, ...prefixOptions } = createReplyPrefixOptions({
 				cfg,
 				agentId: _route.agentId,
@@ -3281,16 +3246,20 @@ function createMatrixRoomMessageHandler(params) {
 			let currentDraftReplyToId = draftReplyToId;
 			let previewToolProgressSuppressed = false;
 			let previewToolProgressLines = [];
+			let latestPlan;
+			let latestPlanExplanation;
 			const progressConfigEntry = params.accountConfig ?? cfg.channels?.matrix;
 			const progressSeed = `${_route.accountId}:${roomId}`;
 			const renderProgressDraft = () => {
-				if (!draftStream || !progressDraftStreaming) return;
+				if (!draftStream) return;
 				const previewText = formatChannelProgressDraftText({
 					entry: progressConfigEntry,
 					lines: previewToolProgressLines,
 					seed: progressSeed,
 					formatLine: formatMatrixToolProgressMarkdownCode,
-					bullet: "-"
+					bullet: "-",
+					narration: latestPlanExplanation,
+					plan: latestPlan
 				});
 				if (!previewText) return;
 				draftStream.update(previewText);
@@ -3311,7 +3280,9 @@ function createMatrixRoomMessageHandler(params) {
 						lines: previewToolProgressLines,
 						seed: progressSeed,
 						formatLine: formatMatrixToolProgressMarkdownCode,
-						bullet: "-"
+						bullet: "-",
+						narration: latestPlanExplanation,
+						plan: latestPlan
 					}));
 					return;
 				}
@@ -3320,14 +3291,30 @@ function createMatrixRoomMessageHandler(params) {
 				const progressActive = await progressDraftGate.noteWork();
 				if ((alreadyStarted || progressActive) && progressDraftGate.hasStarted) renderProgressDraft();
 			};
+			const pushPlanProgress = async (steps, explanation) => {
+				latestPlan = steps?.length ? steps.map((entry) => ({ ...entry })) : void 0;
+				latestPlanExplanation = explanation?.replace(/\s+/g, " ").trim() || void 0;
+				if (!draftStream || previewToolProgressSuppressed) return;
+				if (!progressDraftStreaming) {
+					renderProgressDraft();
+					return;
+				}
+				const alreadyStarted = progressDraftGate.hasStarted;
+				await progressDraftGate.startNow();
+				if (alreadyStarted && progressDraftGate.hasStarted) renderProgressDraft();
+			};
 			const suppressPreviewToolProgressForAnswerText = (text) => {
 				if (!text?.trim()) return;
 				previewToolProgressSuppressed = true;
 				previewToolProgressLines = [];
+				latestPlan = void 0;
+				latestPlanExplanation = void 0;
 			};
 			const resetPreviewToolProgress = () => {
 				previewToolProgressSuppressed = false;
 				previewToolProgressLines = [];
+				latestPlan = void 0;
+				latestPlanExplanation = void 0;
 			};
 			const buildPreviewToolProgressReplyOptions = () => {
 				if (!shouldSuppressDefaultToolProgressMessages) return {};
@@ -3363,13 +3350,7 @@ function createMatrixRoomMessageHandler(params) {
 					},
 					onPlanUpdate: async (payload) => {
 						if (payload.phase !== "update") return;
-						await pushPreviewToolProgress(formatChannelProgressDraftLine({
-							event: "plan",
-							phase: payload.phase,
-							title: payload.title,
-							explanation: payload.explanation,
-							steps: payload.steps
-						}));
+						await pushPlanProgress(payload.planSteps, payload.explanation);
 					},
 					onApprovalEvent: async (payload) => {
 						if (payload.phase !== "requested") return;
@@ -3445,6 +3426,19 @@ function createMatrixRoomMessageHandler(params) {
 				currentDraftBlockOffset = 0;
 				latestDraftFullText = "";
 			};
+			const resetDraftDeliveryState = async () => {
+				await draftStream?.discardPending();
+				draftStream?.reset();
+				draftConsumed = false;
+				currentDraftMessageGeneration = 0;
+				currentDraftBlockOffset = 0;
+				latestDraftFullText = "";
+				pendingDraftBoundaries.length = 0;
+				latestQueuedDraftBoundaryOffsets.clear();
+				currentDraftReplyToId = draftReplyToId;
+				progressDraftGate.reset();
+				resetPreviewToolProgress();
+			};
 			const { dispatcher, replyOptions, markDispatchIdle, markRunComplete } = core.channel.reply.createReplyDispatcherWithTyping({
 				...prefixOptions,
 				humanDelay: core.channel.reply.resolveHumanDelayConfig(cfg, _route.agentId),
@@ -3625,7 +3619,6 @@ function createMatrixRoomMessageHandler(params) {
 					});
 				},
 				onError: (err, info) => {
-					if (err instanceof MatrixRetryableInboundError) retryableReplyDeliveryFailed = true;
 					if (info.kind === "final") finalReplyDeliveryFailed = true;
 					else nonFinalReplyDeliveryFailed = true;
 					if (info.kind === "block") advanceDraftBlockBoundary({ fallbackToLatestEnd: true });
@@ -3746,6 +3739,7 @@ function createMatrixRoomMessageHandler(params) {
 													resetDraftBlockOffsets();
 													resetPreviewToolProgress();
 												} : void 0,
+												onQueuedFollowupAdmitted: draftStream ? resetDraftDeliveryState : void 0,
 												...buildPreviewToolProgressReplyOptions(),
 												onModelSelected
 											}
@@ -3767,19 +3761,11 @@ function createMatrixRoomMessageHandler(params) {
 			const { dispatchResult } = turnResult;
 			const { queuedFinal, counts } = dispatchResult;
 			if (finalReplyDeliveryFailed) {
-				if (retryableReplyDeliveryFailed) {
-					logVerboseMessage(`matrix: final reply delivery failed room=${roomId} id=${messageId}; leaving event uncommitted`);
-					return;
-				}
 				logVerboseMessage(`matrix: final reply delivery failed room=${roomId} id=${messageId}; keeping replay committed`);
 				await commitInboundEventIfClaimed();
 				return;
 			}
 			if (!queuedFinal && nonFinalReplyDeliveryFailed) {
-				if (retryableReplyDeliveryFailed) {
-					logVerboseMessage(`matrix: non-final reply delivery failed room=${roomId} id=${messageId}; leaving event uncommitted`);
-					return;
-				}
 				logVerboseMessage(`matrix: non-final reply delivery failed room=${roomId} id=${messageId}; keeping replay committed`);
 				await commitInboundEventIfClaimed();
 				return;
@@ -3802,225 +3788,8 @@ function createMatrixRoomMessageHandler(params) {
 				const draftEventId = await draftStreamRef.stop().catch(() => void 0);
 				if (draftEventId && !draftConsumed) await redactMatrixDraftEvent(client, roomId, draftEventId);
 			}
-			if (claimedInboundEvent && inboundDeduper && eventId) inboundDeduper.releaseEvent({
-				roomId,
-				eventId
-			});
-		}
-	};
-}
-//#endregion
-//#region extensions/matrix/src/matrix/monitor/inbound-dedupe.ts
-const INBOUND_DEDUPE_FILENAME = "inbound-dedupe.json";
-const INBOUND_DEDUPE_NAMESPACE = "inbound-dedupe";
-const INBOUND_DEDUPE_MIGRATIONS_NAMESPACE = "inbound-dedupe-migrations";
-const STORE_VERSION = 1;
-const DEFAULT_MAX_ENTRIES = 2e4;
-const DEFAULT_TTL_MS = 720 * 60 * 60 * 1e3;
-function normalizeEventPart(value) {
-	return value.trim();
-}
-function buildEventKey(params) {
-	const accountId = normalizeEventPart(params.auth.accountId) || "default";
-	const roomId = normalizeEventPart(params.roomId);
-	const eventId = normalizeEventPart(params.eventId);
-	if (!roomId || !eventId) return "";
-	return `${accountId}:${createHash("sha256").update(accountId).update("\0").update(roomId).update("\0").update(eventId).digest("hex")}`;
-}
-function resolveInboundDedupeStatePath(params) {
-	return resolveMatrixStateFilePath({
-		auth: params.auth,
-		env: params.env,
-		stateDir: params.stateDir,
-		filename: INBOUND_DEDUPE_FILENAME
-	});
-}
-function normalizeTimestamp(raw) {
-	if (typeof raw !== "number" || !Number.isFinite(raw)) return null;
-	return Math.max(0, Math.floor(raw));
-}
-function pruneSeenEvents(params) {
-	const { seen, ttlMs, maxEntries, nowMs } = params;
-	if (ttlMs > 0) {
-		const cutoff = nowMs - ttlMs;
-		for (const [key, ts] of seen) if (ts < cutoff) seen.delete(key);
-	}
-	const max = Math.max(0, Math.floor(maxEntries));
-	if (max <= 0) {
-		seen.clear();
-		return;
-	}
-	while (seen.size > max) {
-		const oldestKey = [...seen.entries()].toSorted((a, b) => a[1] - b[1] || a[0].localeCompare(b[0]))[0]?.[0];
-		if (typeof oldestKey !== "string") break;
-		seen.delete(oldestKey);
-	}
-}
-function openMatrixInboundDedupeStoreOptions(params) {
-	return {
-		namespace: INBOUND_DEDUPE_NAMESPACE,
-		maxEntries: DEFAULT_MAX_ENTRIES,
-		env: resolveMatrixSqliteStateEnv(params)
-	};
-}
-function createInboundDedupeStore(params) {
-	return getMatrixRuntime().state.openKeyedStore(openMatrixInboundDedupeStoreOptions(params));
-}
-function createInboundDedupeMigrationStore(params) {
-	return getMatrixRuntime().state.openKeyedStore({
-		namespace: INBOUND_DEDUPE_MIGRATIONS_NAMESPACE,
-		maxEntries: 1e3,
-		env: resolveMatrixSqliteStateEnv(params)
-	});
-}
-function buildLegacyImportKey(params) {
-	const accountId = normalizeEventPart(params.auth.accountId) || "default";
-	return `${accountId}:${createHash("sha256").update(accountId).update("\0").update(params.storagePath).digest("hex")}`;
-}
-async function loadLegacyEntries(storagePath) {
-	const { value } = await readJsonFileWithFallback(storagePath, null);
-	if (value?.version !== STORE_VERSION || !Array.isArray(value.entries)) return [];
-	const entries = [];
-	for (const entry of value.entries) {
-		if (!entry || typeof entry.key !== "string") continue;
-		const separatorIndex = entry.key.indexOf("|");
-		if (separatorIndex <= 0) continue;
-		const roomId = entry.key.slice(0, separatorIndex).trim();
-		const eventId = entry.key.slice(separatorIndex + 1).trim();
-		const ts = normalizeTimestamp(entry.ts);
-		if (!roomId || !eventId || ts === null) continue;
-		entries.push({
-			roomId,
-			eventId,
-			ts
-		});
-	}
-	return entries;
-}
-async function createMatrixInboundEventDeduper(params) {
-	const nowMs = params.nowMs ?? (() => Date.now());
-	const ttlMs = typeof params.ttlMs === "number" && Number.isFinite(params.ttlMs) ? Math.max(0, Math.floor(params.ttlMs)) : DEFAULT_TTL_MS;
-	const maxEntries = typeof params.maxEntries === "number" && Number.isFinite(params.maxEntries) ? Math.max(0, Math.floor(params.maxEntries)) : DEFAULT_MAX_ENTRIES;
-	const storagePath = params.storagePath ?? resolveInboundDedupeStatePath({
-		auth: params.auth,
-		env: params.env,
-		stateDir: params.stateDir
-	});
-	const stateDir = params.stateDir ?? path.dirname(storagePath);
-	const store = createInboundDedupeStore({
-		env: params.env,
-		stateDir
-	});
-	const migrationStore = createInboundDedupeMigrationStore({
-		env: params.env,
-		stateDir
-	});
-	const seen = /* @__PURE__ */ new Map();
-	const pending = /* @__PURE__ */ new Set();
-	try {
-		for (const entry of await store.entries()) {
-			const value = entry.value;
-			const roomId = typeof value?.roomId === "string" ? value.roomId.trim() : "";
-			const eventId = typeof value?.eventId === "string" ? value.eventId.trim() : "";
-			const ts = normalizeTimestamp(value?.ts);
-			const expectedKey = buildEventKey({
-				auth: params.auth,
-				roomId,
-				eventId
-			});
-			if (expectedKey && expectedKey === entry.key && ts !== null) seen.set(entry.key, ts);
-		}
-		const legacyImportKey = buildLegacyImportKey({
-			auth: params.auth,
-			storagePath
-		});
-		if (!await migrationStore.lookup(legacyImportKey)) {
-			const legacyEntries = await loadLegacyEntries(storagePath);
-			let migratedLegacyEntries = 0;
-			for (const entry of legacyEntries) {
-				const key = buildEventKey({
-					auth: params.auth,
-					roomId: entry.roomId,
-					eventId: entry.eventId
-				});
-				if (!key) continue;
-				if (seen.has(key)) {
-					migratedLegacyEntries += 1;
-					continue;
-				}
-				seen.set(key, entry.ts);
-				await store.register(key, entry, ttlMs > 0 ? { ttlMs } : void 0).then(() => {
-					migratedLegacyEntries += 1;
-				}).catch(() => {});
-			}
-			if (legacyEntries.length > 0 && migratedLegacyEntries === legacyEntries.length) {
-				await migrationStore.register(legacyImportKey, { importedAt: nowMs() });
-				await fs.rm(storagePath, { force: true }).catch(() => {});
-			}
+			inboundReplayClaim?.release();
 		}
-		pruneSeenEvents({
-			seen,
-			ttlMs,
-			maxEntries,
-			nowMs: nowMs()
-		});
-	} catch (err) {
-		LogService.warn("MatrixInboundDedupe", "Failed loading Matrix inbound dedupe store:", err);
-	}
-	return {
-		claimEvent: ({ roomId, eventId }) => {
-			const key = buildEventKey({
-				auth: params.auth,
-				roomId,
-				eventId
-			});
-			if (!key) return true;
-			pruneSeenEvents({
-				seen,
-				ttlMs,
-				maxEntries,
-				nowMs: nowMs()
-			});
-			if (seen.has(key) || pending.has(key)) return false;
-			pending.add(key);
-			return true;
-		},
-		commitEvent: async ({ roomId, eventId }) => {
-			const key = buildEventKey({
-				auth: params.auth,
-				roomId,
-				eventId
-			});
-			if (!key) return;
-			pending.delete(key);
-			const ts = nowMs();
-			seen.delete(key);
-			seen.set(key, ts);
-			pruneSeenEvents({
-				seen,
-				ttlMs,
-				maxEntries,
-				nowMs: nowMs()
-			});
-			await store.register(key, {
-				roomId: normalizeEventPart(roomId),
-				eventId: normalizeEventPart(eventId),
-				ts
-			}, ttlMs > 0 ? { ttlMs } : void 0).catch((err) => {
-				LogService.warn("MatrixInboundDedupe", "Failed persisting Matrix inbound dedupe entry:", err);
-			});
-		},
-		releaseEvent: ({ roomId, eventId }) => {
-			const key = buildEventKey({
-				auth: params.auth,
-				roomId,
-				eventId
-			});
-			if (!key) return;
-			pending.delete(key);
-		},
-		flush: async () => {},
-		stop: async () => {}
 	};
 }
 //#endregion
@@ -4036,101 +3805,16 @@ function shouldPromoteRecentInviteRoom(params) {
 	}).matchSource === void 0;
 }
 //#endregion
-//#region extensions/matrix/src/matrix/monitor/room-info.ts
-const MAX_TRACKED_ROOM_INFO = 1024;
-const MAX_TRACKED_MEMBER_DISPLAY_NAMES = 4096;
-function rememberBounded(map, key, value, maxEntries) {
-	map.set(key, value);
-	if (map.size > maxEntries) {
-		const oldest = map.keys().next().value;
-		if (typeof oldest === "string") map.delete(oldest);
-	}
-}
-function createMatrixRoomInfoResolver(client) {
-	const roomNameCache = /* @__PURE__ */ new Map();
-	const roomAliasCache = /* @__PURE__ */ new Map();
-	const memberDisplayNameCache = /* @__PURE__ */ new Map();
-	const getRoomName = async (roomId) => {
-		if (roomNameCache.has(roomId)) return roomNameCache.get(roomId) ?? { nameResolved: false };
-		let name;
-		let nameResolved = false;
-		try {
-			const nameState = await client.getRoomStateEvent(roomId, "m.room.name", "");
-			nameResolved = true;
-			if (nameState && typeof nameState.name === "string") name = nameState.name;
-		} catch (err) {
-			if (isMatrixNotFoundError(err)) nameResolved = true;
-		}
-		const info = {
-			name,
-			nameResolved
-		};
-		if (nameResolved) rememberBounded(roomNameCache, roomId, info, MAX_TRACKED_ROOM_INFO);
-		return info;
-	};
-	const getRoomAliases = async (roomId) => {
-		const cached = roomAliasCache.get(roomId);
-		if (cached) return cached;
-		let canonicalAlias;
-		let altAliases = [];
-		let aliasesResolved = false;
-		try {
-			const aliasState = await client.getRoomStateEvent(roomId, "m.room.canonical_alias", "");
-			aliasesResolved = true;
-			if (aliasState && typeof aliasState.alias === "string") canonicalAlias = aliasState.alias;
-			const rawAliases = aliasState?.alt_aliases;
-			if (Array.isArray(rawAliases)) altAliases = rawAliases.filter((entry) => typeof entry === "string");
-		} catch (err) {
-			if (isMatrixNotFoundError(err)) aliasesResolved = true;
-		}
-		const info = {
-			canonicalAlias,
-			altAliases,
-			aliasesResolved
-		};
-		if (aliasesResolved) rememberBounded(roomAliasCache, roomId, info, MAX_TRACKED_ROOM_INFO);
-		return info;
-	};
-	const getRoomInfo = async (roomId, opts = {}) => {
-		const { name, nameResolved } = await getRoomName(roomId);
-		if (!opts.includeAliases) return {
-			name,
-			altAliases: [],
-			nameResolved,
-			aliasesResolved: false
-		};
-		return {
-			name,
-			nameResolved,
-			...await getRoomAliases(roomId)
-		};
-	};
-	const getMemberDisplayName = async (roomId, userId) => {
-		const cacheKey = `${roomId}:${userId}`;
-		if (memberDisplayNameCache.has(cacheKey)) return memberDisplayNameCache.get(cacheKey) ?? userId;
-		const memberState = await client.getRoomStateEvent(roomId, "m.room.member", userId).catch(() => null);
-		const displayName = memberState && typeof memberState.displayname === "string" ? memberState.displayname : userId;
-		rememberBounded(memberDisplayNameCache, cacheKey, displayName, MAX_TRACKED_MEMBER_DISPLAY_NAMES);
-		return displayName;
-	};
-	return {
-		getRoomInfo,
-		getMemberDisplayName
-	};
-}
-//#endregion
 //#region extensions/matrix/src/matrix/monitor/startup.ts
 const loadMatrixStartupMaintenanceDeps = createLazyRuntimeModule(() => Promise.all([
-	import("./setup-core-BGgbrdaJ.js").then((n) => n.s),
+	import("./setup-core-CYQRY2oG.js").then((n) => n.s),
 	import("./device-health-D4LBxuPq.js"),
-	import("./setup-core-BGgbrdaJ.js").then((n) => n.a),
-	import("./legacy-crypto-restore-CIBfOmLn.js"),
-	import("./startup-verification-BKMAXvcV.js")
-]).then(([configUpdateModule, deviceHealthModule, profileModule, legacyCryptoRestoreModule, startupVerificationModule]) => ({
+	import("./setup-core-CYQRY2oG.js").then((n) => n.a),
+	import("./startup-verification-DSiyDKM5.js")
+]).then(([configUpdateModule, deviceHealthModule, profileModule, startupVerificationModule]) => ({
 	updateMatrixAccountConfig: configUpdateModule.updateMatrixAccountConfig,
 	summarizeMatrixDeviceHealth: deviceHealthModule.summarizeMatrixDeviceHealth,
 	syncMatrixOwnProfile: profileModule.syncMatrixOwnProfile,
-	maybeRestoreLegacyMatrixBackup: legacyCryptoRestoreModule.maybeRestoreLegacyMatrixBackup,
 	ensureMatrixStartupVerification: startupVerificationModule.ensureMatrixStartupVerification
 })));
 async function runMatrixStartupMaintenance(params, deps) {
@@ -4187,25 +3871,6 @@ async function runMatrixStartupMaintenance(params, deps) {
 		if (isMatrixStartupAbortError(err)) throw err;
 		params.logger.debug?.("Failed to resolve matrix verification status (non-fatal)", { error: String(err) });
 	}
-	try {
-		throwIfMatrixStartupAborted(params.abortSignal);
-		const legacyCryptoRestore = await runtimeDeps.maybeRestoreLegacyMatrixBackup({
-			client: params.client,
-			auth: params.auth,
-			env: params.env
-		});
-		throwIfMatrixStartupAborted(params.abortSignal);
-		if (legacyCryptoRestore.kind === "restored") {
-			params.logger.info(`matrix: restored ${legacyCryptoRestore.imported}/${legacyCryptoRestore.total} room key(s) from legacy encrypted-state backup`);
-			if (legacyCryptoRestore.localOnlyKeys > 0) params.logger.warn(`matrix: ${legacyCryptoRestore.localOnlyKeys} legacy local-only room key(s) were never backed up and could not be restored automatically`);
-		} else if (legacyCryptoRestore.kind === "failed") {
-			params.logger.warn(`matrix: failed restoring room keys from legacy encrypted-state backup: ${legacyCryptoRestore.error}`);
-			if (legacyCryptoRestore.localOnlyKeys > 0) params.logger.warn(`matrix: ${legacyCryptoRestore.localOnlyKeys} legacy local-only room key(s) were never backed up and may remain unavailable until manually recovered`);
-		}
-	} catch (err) {
-		if (isMatrixStartupAbortError(err)) throw err;
-		params.logger.warn("matrix: failed restoring legacy encrypted-state backup", { error: String(err) });
-	}
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/status.ts
@@ -4478,7 +4143,6 @@ async function monitorMatrixProvider(opts = {}) {
 	let cleanedUp = false;
 	let client = null;
 	let threadBindingManager = null;
-	let inboundDeduper = null;
 	const monitorTaskRunner = createMatrixMonitorTaskRunner({
 		logger,
 		logVerboseMessage
@@ -4492,7 +4156,6 @@ async function monitorMatrixProvider(opts = {}) {
 			if (client && mode === "persist") await client.drainPendingDecryptions("matrix monitor shutdown");
 			if (mode === "persist") await monitorTaskRunner.waitForIdle();
 			threadBindingManager?.stop();
-			await inboundDeduper?.stop();
 			if (client) await releaseSharedClientInstance(client, mode);
 		} finally {
 			client?.off("sync.state", onSyncState);
@@ -4540,7 +4203,7 @@ async function monitorMatrixProvider(opts = {}) {
 	const mediaMaxBytes = Math.max(1, mediaMaxMb) * 1024 * 1024;
 	const streaming = resolveMatrixStreamingMode(accountConfig.streaming);
 	const previewToolProgressEnabled = resolveMatrixPreviewToolProgressEnabled(accountConfig.streaming);
-	const blockStreamingEnabled = accountConfig.blockStreaming === true;
+	const blockStreamingEnabled = resolveChannelStreamingBlockEnabled(accountConfig) === true;
 	const startupMs = Date.now();
 	const startupGraceMs = 0;
 	const warnedEncryptedRooms = /* @__PURE__ */ new Set();
@@ -4564,7 +4227,7 @@ async function monitorMatrixProvider(opts = {}) {
 			accountId: auth.accountId
 		});
 		setActiveMatrixClient(client, auth.accountId);
-		inboundDeduper = await createMatrixInboundEventDeduper({
+		const inboundDeduper = createMatrixInboundEventDeduper({
 			auth,
 			env: process.env
 		});