@openclaw/matrix 2026.7.2-beta.1 → 2026.7.2-beta.3

package/dist/{monitor-C_kgPPeV.js → monitor-BtUIds8T.js}

@@ -1,22 +1,22 @@
 import { a as resolveMatrixAccountConfig, i as resolveMatrixAccountAllowlistConfig } from "./account-config-BZWN9tGS.js";
-import { t as getMatrixRuntime } from "./runtime-CveSqMOP.js";
-import { m as resolveConfiguredMatrixBotUserIds } from "./setup-core-DlmTyIP0.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-CxqDh7mS.js";
-import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-CG9goLWp.js";
+import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
+import { m as resolveConfiguredMatrixBotUserIds } from "./setup-core-XCdAx1nY.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-j331Xd7b.js";
+import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-B5GRV8wL.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, _ 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-C7xuGWpv.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-BI8MHWp9.js";
-import { i as createMatrixInboundEventDeduper } from "./inbound-dedupe-DcMs0YXL.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-DWaotsZB.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-BJbrdmNm.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-Cw194yEn.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-BMXEXb1j.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-DgvN5rBx.js";
-import "./client-DP0nmFxK.js";
-import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-W4TJQM6r.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-DquM1oz6.js";
+import "./client-CA0PULls.js";
+import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-BmrgOZTL.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-DlLrfWDy.js";
-import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-BFfgq7c7.js";
+import { t as resolveMatrixTargets } from "./resolve-targets-DVoj-YxB.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 { 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";
@@ -25,8 +25,8 @@ import { buildChannelProgressDraftLineForEntry, createChannelProgressDraftGate,
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringifiedEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 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 { buildChannelInboundEventContext, createChannelInboundEnvelopeBuilder, hasFinalInboundReplyDispatch, resolveInboundMentionDecision, toInboundMediaFacts } 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 { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { format } from "node:util";
@@ -36,6 +36,7 @@ import { resolveAckReaction } from "openclaw/plugin-sdk/channel-feedback";
 import { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runtime-context";
 import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-name-runtime";
 import { createChannelIngressResolver, defineStableChannelIngressIdentity } from "openclaw/plugin-sdk/channel-ingress-runtime";
+import { resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { evaluateSupplementalContextVisibility, resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
 import { mergePairLoopGuardConfig } from "openclaw/plugin-sdk/pair-loop-guard-runtime";
 import { buildInboundHistoryFromEntries } from "openclaw/plugin-sdk/reply-history";
@@ -817,7 +818,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-C7xuGWpv.js").then((n) => n.d), import("./send-C7xuGWpv.js").then((n) => n.m)]).then(([directManagementModule, directRoomModule]) => ({
+const loadMatrixDirectRoomDeps = createLazyRuntimeModule(() => Promise.all([import("./send-BJbrdmNm.js").then((n) => n.d), import("./send-BJbrdmNm.js").then((n) => n.m)]).then(([directManagementModule, directRoomModule]) => ({
 	inspectMatrixDirectRooms: directManagementModule.inspectMatrixDirectRooms,
 	isStrictDirectRoom: directRoomModule.isStrictDirectRoom
 })));
@@ -2081,14 +2082,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);
 		},
@@ -2212,11 +2205,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-C7xuGWpv.js").then((n) => n.l));
+const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-BJbrdmNm.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-0tubdHRM.js"));
-const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-De7uikGn.js"));
+const loadMatrixReactionEvents = createLazyRuntimeModule(() => import("./reaction-events-BwAKtUyQ.js"));
+const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-CTLKtJJ0.js"));
 async function matrixTextWouldActivateMentions(client, text) {
 	const { resolveMatrixMentionsForBody } = await loadMatrixSendModule();
 	const mentions = await resolveMatrixMentionsForBody({
@@ -2227,12 +2220,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(() => {});
 }
@@ -2342,7 +2329,7 @@ function formatMatrixToolProgressMarkdownCode(text) {
 	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;
+	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, resolveStorePath: resolveStorePathImpl = resolveStorePath, createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl = createChannelInboundEnvelopeBuilder, finalizeInboundContext, resolveHumanDelayConfig: resolveHumanDelayConfigImpl = resolveHumanDelayConfig } = params;
 	const contextVisibilityMode = resolveChannelContextVisibilityMode({
 		cfg,
 		channel: "matrix",
@@ -2427,7 +2414,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 {
@@ -2445,12 +2432,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();
@@ -2475,11 +2459,12 @@ function createMatrixRoomMessageHandler(params) {
 				if (relates && "rel_type" in relates && relates.rel_type === RelationType.Replace) return;
 				if (hasBundledMatrixReplacementRelation(event)) return;
 				if (eventId && inboundDeduper) {
-					claimedInboundEvent = await 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;
 					}
@@ -2837,9 +2822,23 @@ function createMatrixRoomMessageHandler(params) {
 					return;
 				}
 				const shouldRequireMention = isRoom ? roomConfig?.autoReply === true ? false : roomConfig?.autoReply === false ? true : typeof roomConfig?.requireMention === "boolean" ? roomConfig?.requireMention : true : false;
-				const shouldBypassMention = allowTextCommands && isRoom && shouldRequireMention && !wasMentioned && !hasExplicitMention && commandAuthorized && hasControlCommandInMessage;
+				const mentionDecision = resolveInboundMentionDecision({
+					facts: {
+						canDetectMention: true,
+						wasMentioned,
+						hasAnyMention: hasExplicitMention
+					},
+					policy: {
+						isGroup: isRoom,
+						requireMention: shouldRequireMention,
+						allowTextCommands,
+						hasControlCommand: hasControlCommandInMessage,
+						commandAuthorized
+					}
+				});
+				const { effectiveWasMentioned, shouldBypassMention } = mentionDecision;
 				const canDetectMention = agentMentionRegexes.length > 0 || hasExplicitMention;
-				if (isRoom && shouldRequireMention && !wasMentioned && !shouldBypassMention) {
+				if (mentionDecision.shouldSkip) {
 					const pendingHistoryBody = preflightAudioTranscript ? formatMatrixAudioTranscript(preflightAudioTranscript) : pendingHistoryText || pendingHistoryPollText;
 					if (historyLimit > 0 && pendingHistoryBody) {
 						const pendingEntry = {
@@ -2972,6 +2971,7 @@ function createMatrixRoomMessageHandler(params) {
 					isRoom,
 					shouldRequireMention,
 					wasMentioned,
+					effectiveWasMentioned,
 					shouldBypassMention,
 					canDetectMention,
 					commandAuthorized,
@@ -3014,7 +3014,7 @@ function createMatrixRoomMessageHandler(params) {
 			})();
 			if (!resolvedIngressResult) return;
 			if ("deferredPrefix" in resolvedIngressResult) return;
-			const { route: _route, hasExplicitSessionBinding, roomConfig, isDirectMessage, isRoom, shouldRequireMention, wasMentioned, shouldBypassMention, canDetectMention, commandAuthorized, inboundHistory, senderName, bodyText, commandBodyText, media, preflightAudioTranscript, locationPayload, messageId, triggerSnapshot, threadRootId, thread, botLoopProtection, effectiveGroupAllowFrom, effectiveRoomUsers } = resolvedIngressResult;
+			const { route: _route, hasExplicitSessionBinding, roomConfig, isDirectMessage, isRoom, shouldRequireMention, wasMentioned, effectiveWasMentioned, shouldBypassMention, canDetectMention, commandAuthorized, inboundHistory, senderName, bodyText, commandBodyText, media, preflightAudioTranscript, locationPayload, messageId, triggerSnapshot, threadRootId, thread, botLoopProtection, effectiveGroupAllowFrom, effectiveRoomUsers } = resolvedIngressResult;
 			const replyToEventId = resolveMatrixReplyToEventId(event.content);
 			const threadTarget = thread.threadId;
 			const isRoomContextSenderAllowed = (contextSenderId) => {
@@ -3062,11 +3062,10 @@ function createMatrixRoomMessageHandler(params) {
 			const roomName = (isRoom ? await getRoomInfo(roomId) : void 0)?.name;
 			const envelopeFrom = isDirectMessage ? senderName : roomName ?? roomId;
 			const textWithId = `${bodyText}\n[matrix event id: ${messageId} room: ${roomId}]`;
-			const storePath = core.channel.session.resolveStorePath(cfg.session?.store, { agentId: _route.agentId });
-			const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);
-			const previousTimestamp = core.channel.session.readSessionUpdatedAt({
-				storePath,
-				sessionKey: _route.sessionKey
+			const storePath = resolveStorePathImpl(cfg.session?.store, { agentId: _route.agentId });
+			const buildEnvelope = createChannelInboundEnvelopeBuilderImpl({
+				cfg,
+				route: _route
 			});
 			const sharedDmNoticeSessionKey = threadTarget ? _route.mainSessionKey || _route.sessionKey : _route.sessionKey;
 			const sharedDmContextNotice = isDirectMessage ? hasExplicitSessionBinding ? null : resolveMatrixSharedDmContextNotice({
@@ -3078,12 +3077,10 @@ function createMatrixRoomMessageHandler(params) {
 				sentRooms: sharedDmContextNoticeRooms,
 				logVerboseMessage
 			}) : null;
-			const body = core.channel.reply.formatAgentEnvelope({
+			const body = buildEnvelope({
 				channel: "Matrix",
 				from: envelopeFrom,
 				timestamp: eventTs ?? void 0,
-				previousTimestamp,
-				envelope: envelopeOptions,
 				body: textWithId
 			});
 			const groupSystemPrompt = normalizeOptionalString(roomConfig?.systemPrompt);
@@ -3094,8 +3091,8 @@ function createMatrixRoomMessageHandler(params) {
 			}).include);
 			const ctxPayload = buildChannelInboundEventContext({
 				channel: "matrix",
-				finalize: core.channel.reply.finalizeInboundContext,
 				contextVisibility: contextVisibilityMode,
+				finalize: finalizeInboundContext,
 				supplemental: {
 					quote: replyContext ? {
 						id: threadTarget ? void 0 : replyToEventId ?? void 0,
@@ -3132,6 +3129,7 @@ function createMatrixRoomMessageHandler(params) {
 				},
 				route: {
 					agentId: _route.agentId,
+					dmScope: _route.dmScope,
 					accountId: _route.accountId,
 					routeSessionKey: _route.sessionKey
 				},
@@ -3185,7 +3183,7 @@ function createMatrixRoomMessageHandler(params) {
 				isMentionableGroup: isRoom,
 				requireMention: shouldRequireMention,
 				canDetectMention,
-				effectiveWasMentioned: wasMentioned || shouldBypassMention,
+				effectiveWasMentioned,
 				shouldBypassMention
 			}));
 			if (shouldAckReaction() && messageId) loadMatrixSendModule().then(({ reactMatrixMessage }) => reactMatrixMessage(roomId, messageId, ackReaction, client)).catch((err) => {
@@ -3202,7 +3200,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,
@@ -3263,16 +3260,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);
@@ -3293,7 +3294,9 @@ function createMatrixRoomMessageHandler(params) {
 						lines: previewToolProgressLines,
 						seed: progressSeed,
 						formatLine: formatMatrixToolProgressMarkdownCode,
-						bullet: "-"
+						bullet: "-",
+						narration: latestPlanExplanation,
+						plan: latestPlan
 					}));
 					return;
 				}
@@ -3302,14 +3305,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 {};
@@ -3345,13 +3364,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.steps, payload.explanation);
 					},
 					onApprovalEvent: async (payload) => {
 						if (payload.phase !== "requested") return;
@@ -3427,9 +3440,22 @@ function createMatrixRoomMessageHandler(params) {
 				currentDraftBlockOffset = 0;
 				latestDraftFullText = "";
 			};
-			const { dispatcher, replyOptions, markDispatchIdle, markRunComplete } = core.channel.reply.createReplyDispatcherWithTyping({
+			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 { deliver: deliverReply, onError: onReplyError, ...turnDispatcherOptions } = {
 				...prefixOptions,
-				humanDelay: core.channel.reply.resolveHumanDelayConfig(cfg, _route.agentId),
+				humanDelay: resolveHumanDelayConfigImpl(cfg, _route.agentId),
 				deliver: async (payload, info) => {
 					if (draftStream && info.kind !== "tool" && !payload.isCompactionNotice) {
 						const hasMedia = Boolean(payload.mediaUrl) || (payload.mediaUrls?.length ?? 0) > 0;
@@ -3607,7 +3633,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 });
@@ -3615,7 +3640,7 @@ function createMatrixRoomMessageHandler(params) {
 				},
 				onReplyStart: typingCallbacks.onReplyStart,
 				onIdle: typingCallbacks.onIdle
-			});
+			};
 			const pinnedMainDmOwner = isDirectMessage ? await (async () => {
 				const livePinnedCfg = core.config.current();
 				const livePinnedAllowlists = resolveMatrixAccountAllowlistConfig({
@@ -3654,12 +3679,14 @@ function createMatrixRoomMessageHandler(params) {
 						raw: event
 					}),
 					resolveTurn: () => ({
+						cfg,
 						channel: "matrix",
 						accountId: _route.accountId,
-						routeSessionKey: _route.sessionKey,
-						storePath,
+						route: {
+							agentId: _route.agentId,
+							sessionKey: _route.sessionKey
+						},
 						ctxPayload,
-						recordInboundSession: core.channel.session.recordInboundSession,
 						botLoopProtection,
 						record: {
 							updateLastRoute: isDirectMessage ? {
@@ -3683,14 +3710,7 @@ function createMatrixRoomMessageHandler(params) {
 								});
 							}
 						},
-						onPreDispatchFailure: () => core.channel.reply.settleReplyDispatcher({
-							dispatcher,
-							onSettled: () => {
-								markRunComplete();
-								markDispatchIdle();
-							}
-						}),
-						runDispatch: async () => {
+						afterRecord: async () => {
 							if (sharedDmContextNotice && markTrackedRoomIfFirst(sharedDmContextNoticeRooms, roomId)) try {
 								await client.sendMessage(roomId, {
 									msgtype: "m.notice",
@@ -3699,45 +3719,35 @@ function createMatrixRoomMessageHandler(params) {
 							} catch (err) {
 								logVerboseMessage(`matrix: failed sending shared DM session notice room=${roomId}: ${String(err)}`);
 							}
-							return await core.channel.reply.withReplyDispatcher({
-								dispatcher,
-								onSettled: () => {
-									markDispatchIdle();
-								},
-								run: async () => {
-									try {
-										return await core.channel.reply.dispatchReplyFromConfig({
-											ctx: ctxPayload,
-											cfg,
-											dispatcher,
-											replyOptions: {
-												...replyOptions,
-												skillFilter: roomConfig?.skills,
-												disableBlockStreaming: !blockStreamingEnabled,
-												onPartialReply: draftStream ? (payload) => {
-													if (progressDraftStreaming) return;
-													latestDraftFullText = payload.text ?? "";
-													suppressPreviewToolProgressForAnswerText(latestDraftFullText);
-													updateDraftFromLatestFullText();
-												} : void 0,
-												onBlockReplyQueued: draftStream ? (payload, context) => {
-													if (payload.isCompactionNotice === true) return;
-													queueDraftBlockBoundary(payload, context);
-												} : void 0,
-												onAssistantMessageStart: draftStream ? () => {
-													resetDraftBlockOffsets();
-													resetPreviewToolProgress();
-												} : void 0,
-												...buildPreviewToolProgressReplyOptions(),
-												onModelSelected
-											}
-										});
-									} finally {
-										progressDraftGate.cancel();
-										markRunComplete();
-									}
-								}
-							});
+						},
+						delivery: {
+							deliver: deliverReply,
+							onError: (err, info) => onReplyError(err, info)
+						},
+						dispatcherOptions: {
+							...turnDispatcherOptions,
+							onSettled: () => progressDraftGate.cancel()
+						},
+						replyOptions: {
+							skillFilter: roomConfig?.skills,
+							disableBlockStreaming: !blockStreamingEnabled,
+							onPartialReply: draftStream ? (payload) => {
+								if (progressDraftStreaming) return;
+								latestDraftFullText = payload.text ?? "";
+								suppressPreviewToolProgressForAnswerText(latestDraftFullText);
+								updateDraftFromLatestFullText();
+							} : void 0,
+							onBlockReplyQueued: draftStream ? (payload, context) => {
+								if (payload.isCompactionNotice === true) return;
+								queueDraftBlockBoundary(payload, context);
+							} : void 0,
+							onAssistantMessageStart: draftStream ? () => {
+								resetDraftBlockOffsets();
+								resetPreviewToolProgress();
+							} : void 0,
+							onQueuedFollowupAdmitted: draftStream ? resetDraftDeliveryState : void 0,
+							...buildPreviewToolProgressReplyOptions(),
+							onModelSelected
 						}
 					})
 				}
@@ -3749,19 +3759,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;
@@ -3784,10 +3786,7 @@ 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
-			});
+			inboundReplayClaim?.release();
 		}
 	};
 }
@@ -3806,10 +3805,10 @@ function shouldPromoteRecentInviteRoom(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/startup.ts
 const loadMatrixStartupMaintenanceDeps = createLazyRuntimeModule(() => Promise.all([
-	import("./setup-core-DlmTyIP0.js").then((n) => n.s),
+	import("./setup-core-XCdAx1nY.js").then((n) => n.s),
 	import("./device-health-D4LBxuPq.js"),
-	import("./setup-core-DlmTyIP0.js").then((n) => n.a),
-	import("./startup-verification-CbIyF7z1.js")
+	import("./setup-core-XCdAx1nY.js").then((n) => n.a),
+	import("./startup-verification-CA00kebL.js")
 ]).then(([configUpdateModule, deviceHealthModule, profileModule, startupVerificationModule]) => ({
 	updateMatrixAccountConfig: configUpdateModule.updateMatrixAccountConfig,
 	summarizeMatrixDeviceHealth: deviceHealthModule.summarizeMatrixDeviceHealth,

package/dist/plugin-entry.handlers.runtime.js

@@ -2,7 +2,7 @@ import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/matrix/src/plugin-entry.runtime.ts
-const loadMatrixVerificationRuntime = createLazyRuntimeModule(() => import("./verification-DLSe3sP7.js").then((n) => n.y));
+const loadMatrixVerificationRuntime = createLazyRuntimeModule(() => import("./verification-DjxyWTNP.js").then((n) => n.y));
 function sendError(respond, err) {
 	respond(false, { error: formatMatrixErrorMessage(err) });
 }

package/dist/probe.runtime-sBV-Govx.js

@@ -0,0 +1,3 @@
+import { t as createMatrixClient } from "./create-client-WQExaby_.js";
+import "./client-CA0PULls.js";
+export { createMatrixClient };

package/dist/{profile-update-iUHCoks3.js → profile-update-Bh2XtJwN.js}

@@ -1,6 +1,6 @@
-import { t as getMatrixRuntime } from "./runtime-CveSqMOP.js";
-import { c as resolveMatrixConfigPath, l as updateMatrixAccountConfig, o as syncMatrixOwnProfile } from "./setup-core-DlmTyIP0.js";
-import { n as withResolvedActionClient } from "./client-ClHisZbf.js";
+import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
+import { c as resolveMatrixConfigPath, l as updateMatrixAccountConfig, o as syncMatrixOwnProfile } from "./setup-core-XCdAx1nY.js";
+import { n as withResolvedActionClient } from "./client-BtG4quUl.js";
 import { normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 //#region extensions/matrix/src/matrix/actions/profile.ts
 async function updateMatrixOwnProfile(opts = {}) {

package/dist/{reaction-events-0tubdHRM.js → reaction-events-BwAKtUyQ.js}

@@ -1,14 +1,14 @@
 import { a as resolveMatrixAccountConfig } from "./account-config-BZWN9tGS.js";
 import { a as extractMatrixReactionAnnotation } from "./reaction-common-DkrQdBSZ.js";
-import { i as resolveMatrixApprovalReactionTargetWithPersistence, o as unregisterMatrixApprovalReactionTargetsForApproval } from "./approval-reactions-BgU51JGd.js";
+import { i as resolveMatrixApprovalReactionTargetWithPersistence, o as unregisterMatrixApprovalReactionTargetsForApproval } from "./approval-reactions-D-BxBK_L.js";
 import { i as resolveMatrixThreadRouting, r as resolveMatrixThreadRootId, t as resolveMatrixInboundRoute } from "./route-DY6at4qJ.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 import { normalizeAccountId } from "openclaw/plugin-sdk/routing";
 import { getSessionBindingService } from "openclaw/plugin-sdk/session-binding-runtime";
 //#region extensions/matrix/src/matrix/monitor/reaction-events.ts
-const loadApprovalReactionAuth = createLazyRuntimeModule(() => import("./approval-reaction-auth-TdVPcgxP.js"));
+const loadApprovalReactionAuth = createLazyRuntimeModule(() => import("./approval-reaction-auth-kXkCJBGi.js"));
 const loadExecApprovalResolver = createLazyRuntimeModule(() => import("./exec-approval-resolver-BCgqRtZS.js"));
-const loadMatrixSend = createLazyRuntimeModule(() => import("./send-C7xuGWpv.js").then((n) => n.l));
+const loadMatrixSend = createLazyRuntimeModule(() => import("./send-BJbrdmNm.js").then((n) => n.l));
 function buildMatrixApprovalTerminalText(result) {
 	const approval = result.approval;
 	const terminalLabel = approval.status === "allowed" ? approval.decision === "allow-always" ? "Allowed always" : "Allowed once" : approval.status === "denied" ? "Denied" : approval.status === "expired" ? "Expired" : "Cancelled";

package/dist/record-shared-CWWx6fvI.js

@@ -0,0 +1,2 @@
+import { isRecord as isRecord$1 } from "openclaw/plugin-sdk/string-coerce-runtime";
+export { isRecord$1 as t };

package/dist/{recovery-key-store-Bx0zTJcB.js → recovery-key-store-CW6eePfp.js}

@@ -1,6 +1,6 @@
 import { n as formatMatrixErrorReason, t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { A as writeMatrixRecoveryKeyStateForPath, C as readLegacyMatrixRecoveryKeyFile, E as readMatrixRecoveryKeyStateForPath, v as migrateLegacyMatrixRecoveryKeyFilePathToStore } from "./storage-BtSOar8T.js";
-import { n as LogService } from "./logger-BMClpI5b.js";
+import { A as writeMatrixRecoveryKeyStateForPath, C as readLegacyMatrixRecoveryKeyFile, E as readMatrixRecoveryKeyStateForPath, v as migrateLegacyMatrixRecoveryKeyFilePathToStore } from "./storage-CzHxeF5E.js";
+import { n as LogService } from "./logger-D0GCSDQq.js";
 import path from "node:path";
 import { decodeRecoveryKey } from "matrix-js-sdk/lib/crypto-api/recovery-key.js";
 //#region extensions/matrix/src/matrix/sdk/recovery-key-store.ts

package/dist/{resolve-targets-DlLrfWDy.js → resolve-targets-DVoj-YxB.js}

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

package/dist/{resolver.runtime-MeaT1zXx.js → resolver.runtime-CC0VVsAt.js}

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

package/dist/{runtime-CveSqMOP.js → runtime-6S3DNFNv.js}

@@ -1,6 +1,6 @@
 import { createPluginRuntimeStore } from "openclaw/plugin-sdk/runtime-store";
 //#region extensions/matrix/src/runtime.ts
-const { setRuntime: setMatrixRuntime, clearRuntime: clearMatrixRuntime, getRuntime: getMatrixRuntime, tryGetRuntime: getOptionalMatrixRuntime } = createPluginRuntimeStore({
+const { setRuntime: setMatrixRuntime, getRuntime: getMatrixRuntime, tryGetRuntime: getOptionalMatrixRuntime } = createPluginRuntimeStore({
 	pluginId: "matrix",
 	errorMessage: "Matrix runtime not initialized"
 });