@openclaw/matrix 2026.7.2-beta.7 → 2026.8.1-beta.2

package/dist/{monitor-VyWlSLwo.js → monitor-Ddfc-vjX.js}

@@ -1,51 +1,50 @@
 import { a as resolveMatrixAccountConfig, i as resolveMatrixAccountAllowlistConfig } from "./account-config-BZWN9tGS.js";
 import { t as getMatrixRuntime } from "./runtime-6S3DNFNv.js";
-import { n as resolveConfiguredMatrixBotUserIds } from "./accounts-DfngqebB.js";
-import { a as buildAllowlistResolutionSummary, c as createTypingCallbacks, d as logInboundDrop, f as logTypingFailure, h as toLocationContext, i as addAllowlistUserEntriesFromConfigEntry, l as formatLocationText, m as summarizeMapping, n as resolveMatrixStoredSessionMeta, o as canonicalizeAllowlistWithResolvedIds, p as patchAllowlistUsersInConfigEntries, r as resolveMatrixRoomConfig, s as createReplyPrefixOptions, u as getAgentScopedMediaLocalRoots } from "./channel-vj788dNZ.js";
-import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./config-schema-Djxw3C6b.js";
+import { n as resolveConfiguredMatrixBotUserIds } from "./accounts-BCzyubQt.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-VSrHgTON.js";
+import { a as normalizeMatrixUserId, i as normalizeMatrixAllowList, o as resolveMatrixAllowListMatch } from "./channel.setup-PpxRP9Du.js";
 import { t as isMatrixQualifiedUserId } from "./target-ids-B-5aQxwn.js";
-import { t as formatMatrixErrorMessage } from "./errors-C47hvAF8.js";
-import { D as parsePollStartContent, S as formatPollAsText, T as isPollStartType, g as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, h as readJoinedMatrixMembers, m as isStrictDirectMembership, p as hasDirectMatrixMemberFlag, r as sendMessageMatrix, u as promoteMatrixDirectRoomCandidate, v as chunkMatrixText, w as isPollEventType } from "./send-BldGYG8g.js";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-DGbl3vDW.js";
-import { i as createMatrixInboundEventDeduper } from "./inbound-dedupe-CaBLblef.js";
-import { a as resolveMatrixMessageAttachment, c as fetchMatrixPollSnapshot, i as isLikelyBareFilename, n as formatMatrixMediaUnavailableText, o as resolveMatrixMessageBody, r as formatMatrixMessageText, t as formatMatrixMediaTooLargeText } from "./media-text-BTwzADS_.js";
-import { n as setActiveMatrixClient } from "./active-client-DXvz2gCo.js";
+import { C as promoteMatrixDirectRoomCandidate, T as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, _ as parsePollStartContent, c as chunkMatrixText, f as formatPollAsText, h as isPollStartType, m as isPollEventType, r as sendMessageMatrix } from "./send-ZDLU4JTk.js";
+import { i as isStrictDirectMembership, n as hasDirectMatrixMemberFlag, o as readJoinedMatrixMembers } from "./direct-room-RinHjtqX.js";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-CcHZP3w2.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-JudlYOSc.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-CUMWxcMz.js";
-import "./client-Dbso3-0V.js";
+import { a as throwIfMatrixStartupAborted, c as resolveMatrixAuth, i as isMatrixStartupAbortError, l as resolveMatrixAuthContext, n as acquireSharedMatrixClient, s as backfillMatrixAuthDeviceIdAfterStartup } from "./client-CeGw0G5S.js";
 import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-CycYxU9-.js";
-import { d as resolveAllowlistProviderRuntimeGroupPolicy, f as resolveDefaultGroupPolicy, g as warnMissingProviderGroupPolicyFallbackOnce, h as resolveThreadBindingMaxAgeMsForChannel, m as resolveThreadBindingIdleTimeoutMsForChannel, t as GROUP_POLICY_BLOCKED_LABEL } from "./runtime-api-D1xI_cvh.js";
-import { t as resolveMatrixTargets } from "./resolve-targets-nm2L48sh.js";
-import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-CbEFe38F.js";
-import { n as isMatrixReadySyncState, r as isMatrixTerminalSyncState, t as isMatrixDisconnectedSyncState } from "./sync-state-CWbp0QSY.js";
-import { n as setBoundedMap, t as createMatrixRoomInfoResolver } from "./room-info-CAFZ3Z9J.js";
+import { d as resolveAllowlistProviderRuntimeGroupPolicy, f as resolveDefaultGroupPolicy, g as warnMissingProviderGroupPolicyFallbackOnce, h as resolveThreadBindingMaxAgeMsForChannel, m as resolveThreadBindingIdleTimeoutMsForChannel, t as GROUP_POLICY_BLOCKED_LABEL } from "./runtime-api-BGO16Fu8.js";
+import { t as resolveMatrixTargets } from "./resolve-targets-BJAPY4Vb.js";
+import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-DmLY8NiO.js";
+import { createMatrixInboundEventDeduper } from "./inbound-dedupe-RvSLqdsz.js";
+import { a as isMatrixAccessTokenInvalidatedError, d as isMatrixDisconnectedSyncState, f as isMatrixReadySyncState, p as isMatrixTerminalSyncState } from "./client-support-DLj4vDeu.js";
+import { n as setBoundedMap, t as createMatrixRoomInfoResolver } from "./room-info-BXQA7y10.js";
 import { a as EventType, i as resolveMatrixThreadRouting, n as resolveMatrixReplyToEventId, o as RelationType, r as resolveMatrixThreadRootId, t as resolveMatrixInboundRoute } from "./route-DY6at4qJ.js";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
-import { buildChannelProgressDraftLineForEntry, createChannelProgressDraftGate, createMessageReceiptFromOutboundResults, createPreviewMessageReceipt, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, formatChannelProgressDraftLine, formatChannelProgressDraftText, isChannelProgressDraftWorkToolName, listMessageReceiptPlatformIds, mergeChannelProgressDraftLine, normalizeChannelProgressDraftLineIdentity, resolveChannelProgressDraftMaxLines, resolveChannelStreamingBlockEnabled, waitUntilAbort } from "openclaw/plugin-sdk/channel-outbound";
+import { buildChannelProgressDraftLineForEntry, createChannelProgressDraftCompositor, createMessageReceiptFromOutboundResults, createPreviewMessageReceipt, defineFinalizableLivePreviewAdapter, deliverWithFinalizableLivePreviewAdapter, formatChannelProgressDraftLine, formatChannelProgressDraftText, listMessageReceiptPlatformIds, resolveChannelStreamingBlockEnabled, waitUntilAbort } from "openclaw/plugin-sdk/channel-outbound";
 import { normalizeLowercaseStringOrEmpty, normalizeNullableString, normalizeOptionalString, normalizeStringifiedEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { stripReasoningTagsFromText } from "openclaw/plugin-sdk/text-chunking";
 import { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-adapter-runtime";
+import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { isFutureDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs, resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
 import { resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
-import { buildChannelInboundEventContext, createChannelInboundEnvelopeBuilder, createChannelPartialDeliveryError, hasFinalInboundReplyDispatch, isChannelPartialDeliveryError, resolveInboundMentionDecision, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
+import { createChannelInboundEnvelopeBuilder, createChannelPartialDeliveryError, hasFinalInboundReplyDispatch, isChannelPartialDeliveryError, resolveInboundMentionDecision, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
 import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
-import { isFutureDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs, resolveOptionalIntegerOption } from "openclaw/plugin-sdk/number-runtime";
-import { resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { format } from "node:util";
-import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
+import { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
 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";
 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 { getGlobalHookRunner } from "openclaw/plugin-sdk/plugin-runtime";
-import { resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
+import { createChannelPreflightAudio } from "openclaw/plugin-sdk/media-understanding-runtime";
 import { mergePairLoopGuardConfig } from "openclaw/plugin-sdk/pair-loop-guard-runtime";
 import { buildInboundHistoryFromEntries } from "openclaw/plugin-sdk/reply-history";
 import { decodeHtmlEntities } from "openclaw/plugin-sdk/html-entity-runtime";
-import { createConnectedChannelStatusPatch, createTransportActivityStatusPatch } from "openclaw/plugin-sdk/gateway-runtime";
+import { channelBlockedPatch, channelReadyPatch, channelStoppedPatch, createTransportActivityStatusPatch } from "openclaw/plugin-sdk/gateway-runtime";
 //#region extensions/matrix/src/matrix/monitor/auto-join.ts
 function registerMatrixAutoJoin(params) {
 	const { client, accountConfig, runtime } = params;
@@ -60,7 +59,7 @@ function registerMatrixAutoJoin(params) {
 	const allowedRoomIds = new Set(rawAllowlist.filter((entry) => entry.startsWith("!")));
 	const allowedAliases = rawAllowlist.filter((entry) => entry.startsWith("#"));
 	const resolvedAliasRoomIds = /* @__PURE__ */ new Map();
-	if (autoJoin === "off") return;
+	if (autoJoin === "off") return () => {};
 	if (autoJoin === "always") logVerbose("matrix: auto-join enabled for all invites");
 	else logVerbose("matrix: auto-join enabled for allowlist invites");
 	const resolveAllowedAliasRoomId = async (alias) => {
@@ -79,13 +78,8 @@ function registerMatrixAutoJoin(params) {
 			}
 		}))).filter((roomId) => Boolean(roomId));
 	};
-	const runInviteTask = (roomId, task) => {
-		Promise.resolve().then(task).catch((err) => {
-			runtime.error?.(`matrix: auto-join invite handler failed for room ${roomId}: ${String(err)}`);
-		});
-	};
-	client.on("room.invite", (roomId, _inviteEvent) => {
-		runInviteTask(roomId, async () => {
+	const onInvite = (roomId, _inviteEvent) => {
+		params.runDetachedTask(`auto-join invite handler room=${roomId}`, async () => {
 			if (autoJoin === "allowlist") {
 				const allowedAliasRoomIds = await resolveAllowedAliasRoomIds();
 				if (!(autoJoinAllowlist.has("*") || allowedRoomIds.has(roomId) || allowedAliasRoomIds.some((resolvedRoomId) => resolvedRoomId === roomId))) {
@@ -100,7 +94,11 @@ function registerMatrixAutoJoin(params) {
 				runtime.error?.(`matrix: failed to join room ${roomId}: ${String(err)}`);
 			}
 		});
-	});
+	};
+	client.on("room.invite", onInvite);
+	return () => {
+		client.off("room.invite", onInvite);
+	};
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/config.ts
@@ -719,34 +717,38 @@ async function resolveMatrixMonitorAccessState(params) {
 	});
 	const accountId = params.accountId ?? "default";
 	const eventKind = params.eventKind ?? "message";
+	const ingress = createChannelIngressResolver({
+		channelId: "matrix",
+		accountId,
+		identity: matrixIngressIdentity,
+		readStoreAllowFrom: async () => params.storeAllowFrom
+	});
+	const resolveMessageIngress = async (contextBinding, conversation) => await ingress.message({
+		subject: { stableId: params.senderId },
+		conversation: conversation ?? {
+			kind: params.isRoom ? "channel" : "direct",
+			id: params.conversationId ?? (params.isRoom ? "matrix-room" : "matrix-dm")
+		},
+		...contextBinding ? { contextBinding } : {},
+		event: {
+			kind: eventKind,
+			authMode: "inbound",
+			mayPair: params.isRoom ? false : eventKind === "message"
+		},
+		dmPolicy,
+		groupPolicy: params.isRoom ? groupIngress.groupPolicy : "disabled",
+		policy: { groupAllowFromFallbackToAllowFrom: false },
+		allowFrom: params.allowFrom,
+		...params.isRoom ? { groupAllowFrom: groupIngress.groupAllowFrom } : {}
+	});
 	return {
 		effectiveGroupAllowFrom,
 		effectiveRoomUsers,
-		messageIngress: await createChannelIngressResolver({
-			channelId: "matrix",
-			accountId,
-			identity: matrixIngressIdentity,
-			readStoreAllowFrom: async () => params.storeAllowFrom
-		}).message({
-			subject: { stableId: params.senderId },
-			conversation: {
-				kind: params.isRoom ? "group" : "direct",
-				id: params.isRoom ? "matrix-room" : "matrix-dm"
-			},
-			event: {
-				kind: eventKind,
-				authMode: "inbound",
-				mayPair: params.isRoom ? false : eventKind === "message"
-			},
-			dmPolicy,
-			groupPolicy: params.isRoom ? groupIngress.groupPolicy : "disabled",
-			policy: { groupAllowFromFallbackToAllowFrom: false },
-			allowFrom: params.allowFrom,
-			...params.isRoom ? { groupAllowFrom: groupIngress.groupAllowFrom } : {}
-		}),
+		messageIngress: await resolveMessageIngress(),
 		accountId,
 		senderId: params.senderId,
-		isRoom: params.isRoom
+		isRoom: params.isRoom,
+		resolveMessageIngress
 	};
 }
 async function resolveMatrixMonitorCommandAccess(state, params) {
@@ -813,7 +815,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-BldGYG8g.js").then((n) => n.l), import("./send-BldGYG8g.js").then((n) => n.f)]).then(([directManagementModule, directRoomModule]) => ({
+const loadMatrixDirectRoomDeps = createLazyRuntimeModule(() => Promise.all([import("./send-ZDLU4JTk.js").then((n) => n.S), import("./direct-room-RinHjtqX.js").then((n) => n.t)]).then(([directManagementModule, directRoomModule]) => ({
 	inspectMatrixDirectRooms: directManagementModule.inspectMatrixDirectRooms,
 	isStrictDirectRoom: directRoomModule.isStrictDirectRoom
 })));
@@ -1253,7 +1255,7 @@ async function resolveMatrixSelfUserId(client, logVerboseMessage) {
 	}
 }
 function registerMatrixMonitorEvents(params) {
-	const { cfg, client, auth, allowFrom, dmEnabled, dmPolicy, readStoreAllowFrom, directTracker, logVerboseMessage, warnedEncryptedRooms, warnedCryptoMissingRooms, logger, startupGraceMs, getHealthySyncSinceMs, formatNativeDependencyHint, onRoomMessage, runDetachedTask, sasNoticeRetryDelayMs } = params;
+	const { cfg, client, auth, allowFrom, dmEnabled, dmPolicy, readStoreAllowFrom, directTracker, invalidateMemberDisplayName, logVerboseMessage, warnedEncryptedRooms, warnedCryptoMissingRooms, logger, startupGraceMs, getHealthySyncSinceMs, formatNativeDependencyHint, onRoomMessage, runDetachedTask, sasNoticeRetryDelayMs } = params;
 	const postHealthySyncDecryptFailureTracker = createMatrixPostHealthySyncDecryptFailureTracker({
 		getHealthySyncSinceMs,
 		startupGraceMs
@@ -1274,18 +1276,18 @@ function registerMatrixMonitorEvents(params) {
 			logVerboseMessage(`matrix: ${label} failed (${String(error)})`);
 		});
 	};
-	client.on("room.message", (roomId, event) => {
+	const onRoomMessageEvent = (roomId, event) => {
 		if (routeVerificationEvent(roomId, event)) return;
 		runMonitorTask(`room message handler room=${roomId} id=${event.event_id ?? "unknown"}`, async () => {
 			await onRoomMessage(roomId, event);
 		});
-	});
-	client.on("room.encrypted_event", (roomId, event) => {
+	};
+	const onEncryptedEvent = (roomId, event) => {
 		const eventId = event?.event_id ?? "unknown";
 		const eventType = event?.type ?? "unknown";
 		logVerboseMessage(`matrix: encrypted event room=${roomId} type=${eventType} id=${eventId}`);
-	});
-	client.on("room.decrypted_event", (roomId, event) => {
+	};
+	const onDecryptedEvent = (roomId, event) => {
 		const eventId = event?.event_id ?? "unknown";
 		const eventType = event?.type ?? "unknown";
 		logVerboseMessage(`matrix: decrypted event room=${roomId} type=${eventType} id=${eventId}`);
@@ -1294,8 +1296,8 @@ function registerMatrixMonitorEvents(params) {
 		runMonitorTask(`decrypted room message handler room=${roomId} id=${event.event_id ?? "unknown"}`, async () => {
 			await onRoomMessage(roomId, event);
 		});
-	});
-	client.on("room.failed_decryption", (roomId, event, error) => {
+	};
+	const onFailedDecryption = (roomId, event, error) => {
 		runMonitorTask(`failed decryption handler room=${roomId} id=${event.event_id ?? "unknown"}`, async () => {
 			const failureState = postHealthySyncDecryptFailureTracker.recordFailure(roomId, event, error);
 			const selfUserId = await resolveMatrixSelfUserId(client, logVerboseMessage);
@@ -1329,13 +1331,13 @@ function registerMatrixMonitorEvents(params) {
 			});
 			logVerboseMessage(`matrix: failed decrypt room=${roomId} id=${event.event_id ?? "unknown"} freshAfterHealthySync=${String(failureState.freshAfterHealthySync)} error=${error.message}`);
 		});
-	});
-	client.on("verification.summary", (summary) => {
+	};
+	const onVerificationSummary = (summary) => {
 		runMonitorTask("verification summary handler", async () => {
 			await routeVerificationSummary(summary);
 		});
-	});
-	client.on("room.invite", (roomId, event) => {
+	};
+	const onInvite = (roomId, event) => {
 		directTracker?.invalidateRoom(roomId);
 		const eventId = event?.event_id ?? "unknown";
 		const sender = event?.sender ?? "unknown";
@@ -1345,13 +1347,13 @@ function registerMatrixMonitorEvents(params) {
 		const rememberedSender = normalizeOptionalString(event?.sender);
 		if (rememberedSender && !senderIsInvitee) directTracker?.rememberInvite?.(roomId, rememberedSender);
 		logVerboseMessage(`matrix: invite room=${roomId} sender=${sender} direct=${String(isDirect)} id=${eventId}`);
-	});
-	client.on("room.join", (roomId, event) => {
+	};
+	const onJoin = (roomId, event) => {
 		directTracker?.invalidateRoom(roomId);
 		const eventId = event?.event_id ?? "unknown";
 		logVerboseMessage(`matrix: join room=${roomId} id=${eventId}`);
-	});
-	client.on("room.event", (roomId, event) => {
+	};
+	const onRoomEvent = (roomId, event) => {
 		const eventType = event?.type ?? "unknown";
 		if (eventType === EventType.RoomMessageEncrypted) {
 			logVerboseMessage(`matrix: encrypted raw event room=${roomId} id=${event?.event_id ?? "unknown"}`);
@@ -1375,6 +1377,7 @@ function registerMatrixMonitorEvents(params) {
 			directTracker?.invalidateRoom(roomId);
 			const membership = (event?.content)?.membership;
 			const stateKey = event.state_key ?? "";
+			if (stateKey) invalidateMemberDisplayName?.(roomId, stateKey);
 			logVerboseMessage(`matrix: member event room=${roomId} stateKey=${stateKey} membership=${membership ?? "unknown"}`);
 		}
 		if (eventType === EventType.Reaction) {
@@ -1384,7 +1387,25 @@ function registerMatrixMonitorEvents(params) {
 			return;
 		}
 		routeVerificationEvent(roomId, event);
-	});
+	};
+	client.on("room.message", onRoomMessageEvent);
+	client.on("room.encrypted_event", onEncryptedEvent);
+	client.on("room.decrypted_event", onDecryptedEvent);
+	client.on("room.failed_decryption", onFailedDecryption);
+	client.on("verification.summary", onVerificationSummary);
+	client.on("room.invite", onInvite);
+	client.on("room.join", onJoin);
+	client.on("room.event", onRoomEvent);
+	return () => {
+		client.off("room.message", onRoomMessageEvent);
+		client.off("room.encrypted_event", onEncryptedEvent);
+		client.off("room.decrypted_event", onDecryptedEvent);
+		client.off("room.failed_decryption", onFailedDecryption);
+		client.off("verification.summary", onVerificationSummary);
+		client.off("room.invite", onInvite);
+		client.off("room.join", onJoin);
+		client.off("room.event", onRoomEvent);
+	};
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/ack-config.ts
@@ -1404,42 +1425,21 @@ function resolveMatrixAckReactionConfig(params) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/preflight-audio.ts
-const MATRIX_DEFAULT_ECHO_TRANSCRIPT_FORMAT = "📝 \"{transcript}\"";
-const loadMatrixPreflightAudioRuntime = createLazyRuntimeModule(() => import("./preflight-audio.runtime-BZxxQsxY.js"));
 function formatMatrixAudioTranscript(transcript) {
 	return `[Audio transcript (machine-generated, untrusted)]: ${JSON.stringify(transcript)}`;
 }
-function formatMatrixAudioTranscriptEcho(transcript, format) {
-	return format.replace("{transcript}", () => transcript);
-}
-function suppressMatrixPreflightAudioEcho(cfg) {
-	const audio = cfg.tools?.media?.audio;
-	if (!audio?.echoTranscript) return cfg;
-	return {
-		...cfg,
-		tools: {
-			...cfg.tools,
-			media: {
-				...cfg.tools?.media,
-				audio: {
-					...audio,
-					echoTranscript: false
-				}
-			}
-		}
-	};
-}
 function isMatrixAudioContent(params) {
 	if (params.msgtype === "m.audio") return true;
 	if (params.msgtype === "m.file" && typeof params.mimetype === "string") return params.mimetype.toLowerCase().startsWith("audio/");
 	return false;
 }
+const matrixPreflightAudio = createChannelPreflightAudio({
+	channel: "matrix",
+	isAudio: isMatrixAudioContent
+});
 async function resolveMatrixPreflightAudioTranscript(params) {
-	if (params.abortSignal?.aborted) return;
-	try {
-		const { transcribeFirstAudio } = await loadMatrixPreflightAudioRuntime();
-		if (params.abortSignal?.aborted) return;
-		const transcript = await transcribeFirstAudio({
+	return await matrixPreflightAudio.resolve({
+		request: {
 			ctx: {
 				media: [{
 					path: params.mediaPath,
@@ -1454,34 +1454,13 @@ async function resolveMatrixPreflightAudioTranscript(params) {
 				ChatType: params.chatType,
 				SessionKey: params.sessionKey
 			},
-			cfg: suppressMatrixPreflightAudioEcho(params.cfg)
-		});
-		return params.abortSignal?.aborted ? void 0 : transcript;
-	} catch (err) {
-		logVerbose(`matrix: audio preflight transcription failed: ${String(err)}`);
-		return;
-	}
+			cfg: params.cfg
+		},
+		abortSignal: params.abortSignal
+	});
 }
 async function sendMatrixPreflightAudioTranscriptEcho(params) {
-	const audio = params.cfg.tools?.media?.audio;
-	if (!audio?.echoTranscript) return;
-	const text = formatMatrixAudioTranscriptEcho(params.transcript, audio.echoFormat ?? MATRIX_DEFAULT_ECHO_TRANSCRIPT_FORMAT);
-	try {
-		const { sendDurableMessageBatch } = await loadMatrixPreflightAudioRuntime();
-		const send = await sendDurableMessageBatch({
-			cfg: params.cfg,
-			channel: "matrix",
-			to: params.originatingTo,
-			accountId: params.accountId,
-			threadId: params.messageThreadId,
-			payloads: [{ text }],
-			bestEffort: true,
-			durability: "best_effort"
-		});
-		if (send.status === "failed") throw send.error;
-	} catch (err) {
-		logVerbose(`matrix: audio transcript echo failed: ${String(err)}`);
-	}
+	await matrixPreflightAudio.send(params);
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler-helpers.ts
@@ -1597,11 +1576,11 @@ async function redactMatrixDraftEvent(client, roomId, draftEventId) {
 function buildMatrixFinalizedPreviewContent() {
 	return { [MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY]: true };
 }
-const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-BldGYG8g.js").then((n) => n.s));
+const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-ZDLU4JTk.js").then((n) => n.s));
 const loadAcpBindingRuntime = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/acp-binding-runtime"));
 const loadSessionBindingRuntime = createLazyRuntimeModule(() => import("openclaw/plugin-sdk/session-binding-runtime"));
-const loadMatrixReactionEvents = createLazyRuntimeModule(() => import("./reaction-events-B00WSi98.js"));
-const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-CtvOXq0Z.js"));
+const loadMatrixReactionEvents = createLazyRuntimeModule(() => import("./reaction-events-nfUbFLdV.js"));
+const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-BRi7PRRS.js"));
 async function matrixTextWouldActivateMentions(client, text) {
 	const { resolveMatrixMentionsForBody } = await loadMatrixSendModule();
 	const mentions = await resolveMatrixMentionsForBody({
@@ -1747,7 +1726,7 @@ function createMatrixThreadContextResolver(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler-context.ts
 async function resolveMatrixInboundContext(config) {
-	const { client, core, cfg, accountId, runtime, logVerboseMessage, roomId, event, eventTs, route: _route, isDirectMessage, isRoom, effectiveRoomUsers, groupPolicy, effectiveGroupAllowFrom, contextVisibilityMode, resolveThreadContext, resolveReplyContext, threadRootId, thread, getRoomInfo, senderId, senderName, bodyText, commandBodyText, roomConfig, messageId, inboundHistory, wasMentioned, effectiveWasMentioned, shouldBypassMention, canDetectMention, shouldRequireMention, commandAuthorized, locationPayload, media, preflightAudioTranscript, historyLimit, hasExplicitSessionBinding, dmSessionScope, sharedDmContextNoticeRooms, resolveStorePath: resolveStorePathImpl, createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl, finalizeInboundContext } = config;
+	const { client, core, cfg, accountId, resolveMessageIngress, runtime, logVerboseMessage, roomId, event, eventTs, route: _route, isDirectMessage, isRoom, effectiveRoomUsers, groupPolicy, effectiveGroupAllowFrom, contextVisibilityMode, resolveThreadContext, resolveReplyContext, threadRootId, thread, getRoomInfo, senderId, senderName, bodyText, commandBodyText, roomConfig, messageId, inboundHistory, wasMentioned, effectiveWasMentioned, shouldBypassMention, canDetectMention, shouldRequireMention, commandAuthorized, locationPayload, media, preflightAudioTranscript, historyLimit, hasExplicitSessionBinding, dmSessionScope, sharedDmContextNoticeRooms, resolveStorePath: resolveStorePathImpl, createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl, finalizeInboundContext } = config;
 	const replyToEventId = resolveMatrixReplyToEventId(event.content);
 	const threadTarget = thread.threadId;
 	const isRoomContextSenderAllowed = (contextSenderId) => {
@@ -1822,7 +1801,18 @@ async function resolveMatrixInboundContext(config) {
 		kind: "quote",
 		senderAllowed: replySenderAllowed
 	}).include);
-	const ctxPayload = buildChannelInboundEventContext({
+	const channelIngress = await resolveMessageIngress({
+		agentId: _route.agentId,
+		sessionKey: _route.sessionKey,
+		messageId,
+		inboundEventKind: "user_request"
+	}, {
+		kind: isDirectMessage ? "direct" : "channel",
+		id: roomId,
+		threadId: threadTarget
+	});
+	const ctxPayload = core.channel.inbound.buildContext({
+		channelIngress,
 		channel: "matrix",
 		contextVisibility: contextVisibilityMode,
 		finalize: finalizeInboundContext,
@@ -1891,7 +1881,6 @@ async function resolveMatrixInboundContext(config) {
 		extra: {
 			GroupSubject: isRoom ? roomName ?? roomId : void 0,
 			GroupId: isRoom ? roomId : void 0,
-			GroupChannel: isRoom ? roomId : void 0,
 			...locationPayload?.context,
 			CommandSource: "text",
 			NativeDirectUserId: isDirectMessage ? senderId : void 0
@@ -1937,7 +1926,7 @@ async function resolveMatrixInboundContext(config) {
 //#region extensions/matrix/src/matrix/monitor/handler-draft-controller.ts
 async function createMatrixDraftController(params) {
 	const { streaming, previewToolProgressEnabled, replyToMode, messageId, threadTarget, accountConfig, cfg, accountId, roomId, client, logVerboseMessage } = params;
-	let draftConsumed = false;
+	let draftDisposition = "active";
 	const draftStreamingEnabled = streaming !== "off";
 	const quietDraftStreaming = streaming === "quiet" || streaming === "progress";
 	const progressDraftStreaming = streaming === "progress";
@@ -1961,77 +1950,40 @@ async function createMatrixDraftController(params) {
 	const pendingDraftBoundaries = [];
 	const latestQueuedDraftBoundaryOffsets = /* @__PURE__ */ new Map();
 	let currentDraftReplyToId = draftReplyToId;
-	let previewToolProgressSuppressed = false;
-	let previewToolProgressLines = [];
-	let latestPlan;
-	let latestPlanExplanation;
+	let previewPlan;
+	let previewPlanExplanation;
+	let previewPlanSuppressed = false;
 	const progressConfigEntry = accountConfig ?? cfg.channels?.matrix;
 	const progressSeed = `${accountId}:${roomId}`;
-	const renderProgressDraft = () => {
-		if (!draftStream) return;
-		const previewText = formatChannelProgressDraftText({
-			entry: progressConfigEntry,
-			lines: previewToolProgressLines,
-			seed: progressSeed,
-			formatLine: formatMatrixToolProgressMarkdownCode,
-			bullet: "-",
-			narration: latestPlanExplanation,
-			plan: latestPlan
-		});
-		if (!previewText) return;
-		draftStream.update(previewText);
-	};
-	const progressDraftGate = createChannelProgressDraftGate({ onStart: renderProgressDraft });
-	const pushPreviewToolProgress = async (line, options) => {
-		if (!draftStream) return;
-		if (options?.toolName !== void 0 && !isChannelProgressDraftWorkToolName(options.toolName)) return;
-		const normalized = normalizeChannelProgressDraftLineIdentity(line);
-		const progressLine = typeof line === "object" && line !== void 0 ? line : normalized;
-		if (!progressDraftStreaming) {
-			if (!shouldStreamPreviewToolProgress || previewToolProgressSuppressed || !normalized) return;
-			const nextLines = mergeChannelProgressDraftLine(previewToolProgressLines, progressLine, { maxLines: resolveChannelProgressDraftMaxLines(progressConfigEntry) });
-			if (nextLines === previewToolProgressLines) return;
-			previewToolProgressLines = nextLines;
-			draftStream.update(formatChannelProgressDraftText({
-				entry: progressConfigEntry,
-				lines: previewToolProgressLines,
-				seed: progressSeed,
-				formatLine: formatMatrixToolProgressMarkdownCode,
-				bullet: "-",
-				narration: latestPlanExplanation,
-				plan: latestPlan
-			}));
-			return;
-		}
-		if (shouldStreamPreviewToolProgress && !previewToolProgressSuppressed && normalized) previewToolProgressLines = mergeChannelProgressDraftLine(previewToolProgressLines, progressLine, { maxLines: resolveChannelProgressDraftMaxLines(progressConfigEntry) });
-		const alreadyStarted = progressDraftGate.hasStarted;
-		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 renderPreviewPlan = () => formatChannelProgressDraftText({
+		entry: progressConfigEntry,
+		lines: [...progressDraft.getSnapshot().lines],
+		seed: progressSeed,
+		formatLine: formatMatrixToolProgressMarkdownCode,
+		bullet: "-",
+		narration: previewPlanExplanation,
+		plan: previewPlan
+	});
+	const progressDraft = createChannelProgressDraftCompositor({
+		entry: progressConfigEntry,
+		mode: streaming === "quiet" ? "partial" : streaming,
+		active: Boolean(draftStream),
+		seed: progressSeed,
+		formatLine: formatMatrixToolProgressMarkdownCode,
+		buildProgressEventLine: (input, options) => input.event === "approval" ? formatChannelProgressDraftLine(input, options) : buildChannelProgressDraftLineForEntry(progressConfigEntry, input, options),
+		update: async (text, options) => {
+			const previewText = !progressDraftStreaming && (previewPlan || previewPlanExplanation) ? renderPreviewPlan() : text.replace(/^• /gmu, "- ");
+			if (!draftStream) return false;
+			draftStream.update(previewText);
+			if (options?.flush) await draftStream.flush();
+			return Boolean(draftStream.eventId());
 		}
-		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;
+		previewPlan = void 0;
+		previewPlanExplanation = void 0;
+		previewPlanSuppressed = false;
+		progressDraft.reset();
 	};
 	const buildPreviewToolProgressReplyOptions = () => {
 		if (!shouldSuppressDefaultToolProgressMessages) return {};
@@ -2040,73 +1992,29 @@ async function createMatrixDraftController(params) {
 		return {
 			...options,
 			onToolStart: async (payload) => {
-				const toolName = payload.name?.trim();
-				await pushPreviewToolProgress(buildChannelProgressDraftLineForEntry(progressConfigEntry, {
-					event: "tool",
-					itemId: payload.itemId,
-					toolCallId: payload.toolCallId,
-					name: toolName,
-					phase: payload.phase,
-					args: payload.args
-				}, payload.detailMode ? { detailMode: payload.detailMode } : void 0), { toolName });
+				return await progressDraft.pushToolEvent(payload);
 			},
 			onItemEvent: async (payload) => {
-				await pushPreviewToolProgress(buildChannelProgressDraftLineForEntry(progressConfigEntry, {
-					event: "item",
-					itemId: payload.itemId,
-					toolCallId: payload.toolCallId,
-					itemKind: payload.kind,
-					title: payload.title,
-					name: payload.name,
-					phase: payload.phase,
-					status: payload.status,
-					summary: payload.summary,
-					progressText: payload.progressText,
-					meta: payload.meta
-				}));
+				return await progressDraft.pushItemEvent(payload);
 			},
 			onPlanUpdate: async (payload) => {
-				if (payload.phase !== "update") return;
-				await pushPlanProgress(payload.steps, payload.explanation);
+				if (payload.phase !== "update") return false;
+				if (progressDraftStreaming) return await progressDraft.pushPlanProgress(payload.steps, { explanation: payload.explanation });
+				if (!draftStream || previewPlanSuppressed) return false;
+				previewPlan = payload.steps?.length ? payload.steps.map((step) => ({ ...step })) : void 0;
+				previewPlanExplanation = payload.explanation?.replace(/\s+/g, " ").trim() || void 0;
+				const text = renderPreviewPlan();
+				if (text) draftStream.update(text);
+				return false;
 			},
 			onApprovalEvent: async (payload) => {
-				if (payload.phase !== "requested") return;
-				await pushPreviewToolProgress(formatChannelProgressDraftLine({
-					event: "approval",
-					phase: payload.phase,
-					title: payload.title,
-					command: payload.command,
-					reason: payload.reason,
-					message: payload.message
-				}));
+				return await progressDraft.pushApprovalEvent(payload);
 			},
 			onCommandOutput: async (payload) => {
-				if (payload.phase !== "end") return;
-				await pushPreviewToolProgress(buildChannelProgressDraftLineForEntry(progressConfigEntry, {
-					event: "command-output",
-					itemId: payload.itemId,
-					toolCallId: payload.toolCallId,
-					phase: payload.phase,
-					title: payload.title,
-					name: payload.name,
-					status: payload.status,
-					exitCode: payload.exitCode
-				}));
+				return await progressDraft.pushCommandOutputEvent(payload);
 			},
 			onPatchSummary: async (payload) => {
-				if (payload.phase !== "end") return;
-				await pushPreviewToolProgress(buildChannelProgressDraftLineForEntry(progressConfigEntry, {
-					event: "patch",
-					itemId: payload.itemId,
-					toolCallId: payload.toolCallId,
-					phase: payload.phase,
-					title: payload.title,
-					name: payload.name,
-					added: payload.added,
-					modified: payload.modified,
-					deleted: payload.deleted,
-					summary: payload.summary
-				}));
+				return await progressDraft.pushPatchEvent(payload);
 			}
 		};
 	};
@@ -2146,19 +2054,19 @@ async function createMatrixDraftController(params) {
 	const resetDraftDeliveryState = async () => {
 		await draftStream?.discardPending();
 		draftStream?.reset();
-		draftConsumed = false;
+		draftDisposition = "active";
 		currentDraftMessageGeneration = 0;
 		currentDraftBlockOffset = 0;
 		latestDraftFullText = "";
 		pendingDraftBoundaries.length = 0;
 		latestQueuedDraftBoundaryOffsets.clear();
 		currentDraftReplyToId = draftReplyToId;
-		progressDraftGate.reset();
+		progressDraft.beginNewTurn({ force: true });
 		resetPreviewToolProgress();
 	};
 	return {
 		draftStream,
-		progressDraftGate,
+		cancelProgressDraft: () => progressDraft.cancel(),
 		buildPreviewToolProgressReplyOptions,
 		queueDraftBlockBoundary,
 		advanceDraftBlockBoundary,
@@ -2166,12 +2074,15 @@ async function createMatrixDraftController(params) {
 		resetPreviewToolProgress,
 		resetDraftDeliveryState,
 		updateDraftFromLatestFullText,
-		isDraftConsumed: () => draftConsumed,
+		draftDisposition: () => draftDisposition,
+		beginDraftGeneration: () => {
+			draftDisposition = "active";
+		},
 		markDraftConsumed: () => {
-			draftConsumed = true;
+			draftDisposition = "consumed";
 		},
-		clearDraftConsumed: () => {
-			draftConsumed = false;
+		markDraftRetained: () => {
+			draftDisposition = "retained";
 		},
 		currentReplyToId: () => currentDraftReplyToId,
 		setCurrentReplyToId: (replyToId) => {
@@ -2181,10 +2092,16 @@ async function createMatrixDraftController(params) {
 			currentDraftReplyToId = replyToMode === "all" ? draftReplyToId : void 0;
 		},
 		onPartialReply: (text) => {
-			if (progressDraftStreaming) return;
+			if (progressDraftStreaming) return false;
 			latestDraftFullText = text;
-			suppressPreviewToolProgressForAnswerText(text);
+			if (text.trim()) {
+				previewPlanSuppressed = true;
+				previewPlan = void 0;
+				previewPlanExplanation = void 0;
+				progressDraft.suppress();
+			}
 			updateDraftFromLatestFullText();
+			return false;
 		}
 	};
 }
@@ -2528,6 +2445,7 @@ async function resolveMatrixIngressAccess(config) {
 		roomUsers,
 		senderId,
 		isRoom,
+		conversationId: roomId,
 		accountId,
 		eventKind: isReactionEvent ? "reaction" : "message"
 	});
@@ -2702,6 +2620,11 @@ function resolveMatrixUserLocalpart(userId) {
 	if (colonIndex <= 1) return null;
 	return trimmed.slice(1, colonIndex).trim() || null;
 }
+function hasVisibleNativeMatrixUserMention(text, userId) {
+	const localpart = resolveMatrixUserLocalpart(userId);
+	if (!text || !localpart) return false;
+	return new RegExp(String.raw`(?:^|\p{White_Space})(?:${escapeRegExp(userId)}(?=$|\p{White_Space}|:\p{White_Space}|[,!?;](?=$|\p{White_Space}))|${escapeRegExp(`@${localpart}`)}(?=$|\p{White_Space}|:\p{White_Space}))`, "u").test(text);
+}
 function resolveMatrixMentionPrefixCandidates(params) {
 	const candidates = [];
 	const seen = /* @__PURE__ */ new Set();
@@ -2803,7 +2726,7 @@ function resolveMentions(params) {
 		displayName: params.displayName,
 		mentionRegexes: params.mentionRegexes
 	}) : false;
-	const metadataBackedUserMention = Boolean(params.userId && mentionedUsers.has(params.userId) && (mentionedInFormattedBody || textMentioned));
+	const metadataBackedUserMention = Boolean(params.userId && mentionedUsers.has(params.userId) && (mentionedInFormattedBody || textMentioned || hasVisibleNativeMatrixUserMention(params.text, params.userId)));
 	const metadataBackedRoomMention = Boolean(mentions?.room) && visibleRoomMention;
 	const explicitMention = mentionedInFormattedBody || metadataBackedUserMention || metadataBackedRoomMention;
 	return {
@@ -2817,6 +2740,7 @@ async function resolveMatrixIngressContent(config) {
 	const { handler, params: paramsLocal, access, roomId, event, eventType, isPollEvent, eventTs, senderId, roomHistoryTracker, commitInboundEventIfClaimed } = config;
 	const { client, core, cfg, accountId, accountConfig, logger, logVerboseMessage, historyLimit, mediaMaxBytes, dmSessionScope, getMemberDisplayName } = handler;
 	const { content: accessContent, messageId, audioPreflightMode, isDirectMessage, isRoom, locationPayload, reservedHistorySlot, threadRootId, thread, historyThreadId, discardReservedHistorySlot, markReservedHistorySlotConsumed, commitInboundEventIfClaimedAndDiscardReserved, roomConfig, allowBotsMode, isConfiguredBotSender, selfUserId, botLoopProtection, roomMatchMeta, getSenderName, accessState, effectiveGroupAllowFrom, effectiveRoomUsers } = access;
+	const { messageIngress, resolveMessageIngress } = accessState;
 	let content = accessContent;
 	let pollSnapshotPromise = null;
 	const getPollSnapshot = async () => {
@@ -2898,7 +2822,7 @@ async function resolveMatrixIngressContent(config) {
 		} catch (err) {
 			preflightMediaDownloadFailed = true;
 			if (isMatrixMediaSizeLimitError(err)) preflightMediaSizeLimitExceeded = true;
-			const errorText = formatMatrixErrorMessage(err);
+			const errorText = formatErrorMessage(err);
 			logVerboseMessage(`matrix: media download failed room=${roomId} id=${event.event_id ?? "unknown"} type=${content.msgtype} error=${errorText}`);
 			logger.warn("matrix media download failed", {
 				roomId,
@@ -3046,7 +2970,7 @@ async function resolveMatrixIngressContent(config) {
 	} catch (err) {
 		mediaDownloadFailed = true;
 		if (isMatrixMediaSizeLimitError(err)) mediaSizeLimitExceeded = true;
-		const errorText = formatMatrixErrorMessage(err);
+		const errorText = formatErrorMessage(err);
 		logVerboseMessage(`matrix: media download failed room=${roomId} id=${event.event_id ?? "unknown"} type=${content.msgtype} error=${errorText}`);
 		logger.warn("matrix media download failed", {
 			roomId,
@@ -3109,6 +3033,8 @@ async function resolveMatrixIngressContent(config) {
 	}, historyThreadId) : void 0;
 	if (reservedHistorySlot && preparedTrigger) markReservedHistorySlotConsumed();
 	return {
+		messageIngress,
+		resolveMessageIngress,
 		route: _route,
 		hasExplicitSessionBinding,
 		roomConfig,
@@ -3346,12 +3272,12 @@ async function deliverMatrixReplies(params) {
 				const { chunks } = chunkMatrixText(rawText, {
 					cfg: params.cfg,
 					accountId: params.accountId,
-					tableMode
+					tableMode,
+					preserveWhitespace: true
 				});
 				for (const chunk of chunks) {
-					const trimmed = chunk.trim();
-					if (!trimmed) continue;
-					await sendMessageMatrix(params.roomId, trimmed, {
+					if (!chunk.trim()) continue;
+					await sendMessageMatrix(params.roomId, chunk, {
 						client: params.client,
 						cfg: params.cfg,
 						replyToId: replyToIdForReply,
@@ -3392,19 +3318,21 @@ function createMatrixReplyDispatcher(config) {
 	const hasRepliedRef = { value: false };
 	let finalReplyDeliveryFailed = false;
 	let nonFinalReplyDeliveryFailed = false;
+	const beginNextBlockDraft = () => {
+		draftController.beginDraftGeneration();
+		draftController.advanceDraftBlockBoundary({ fallbackToLatestEnd: true });
+		draftStream?.reset();
+		draftController.resetReplyToIdForNextBlock();
+		draftController.updateDraftFromLatestFullText();
+	};
 	const { deliver: deliverReply, onError: onReplyError, ...turnDispatcherOptions } = {
 		...prefixOptions,
 		humanDelay,
 		deliver: async (payload, info) => {
 			const completeDelivery = async (result) => {
 				if (info.kind === "block") {
-					draftController.clearDraftConsumed();
-					draftController.advanceDraftBlockBoundary({ fallbackToLatestEnd: true });
-					draftStream?.reset();
-					draftController.resetReplyToIdForNextBlock();
-					draftController.updateDraftFromLatestFullText();
-					const { sendTypingMatrix } = await loadMatrixSendModule();
-					await sendTypingMatrix(roomId, true, void 0, client).catch(() => {});
+					beginNextBlockDraft();
+					await typingCallbacks.onReplyStart();
 				}
 				return result;
 			};
@@ -3422,9 +3350,25 @@ function createMatrixReplyDispatcher(config) {
 					content
 				};
 			};
-			const createSurvivingDraftDelivery = (id, redacted) => {
-				const content = redacted ? void 0 : draftStream?.content();
-				return content ? createDraftDeliveryResult(id, content) : mergeMatrixReplyDeliveryResults([]);
+			const settleDraftReplacement = async (params) => {
+				const draftDelivery = createDraftDeliveryResult(params.draftEventId, params.draftContent);
+				let replacement;
+				try {
+					replacement = await params.deliver();
+				} catch (error) {
+					draftController.markDraftRetained();
+					throw toMatrixPartialDeliveryError(error, [draftDelivery]);
+				}
+				if (!replacement.visibleReplySent) {
+					draftController.markDraftRetained();
+					return draftDelivery;
+				}
+				if (!await redactMatrixDraftEvent(client, roomId, params.draftEventId)) {
+					draftController.markDraftRetained();
+					return mergeMatrixReplyDeliveryResults([draftDelivery, replacement]);
+				}
+				draftController.markDraftConsumed();
+				return replacement;
 			};
 			if (draftStream && info.kind !== "tool" && !payload.isCompactionNotice) {
 				const hasMedia = Boolean(payload.mediaUrl) || (payload.mediaUrls?.length ?? 0) > 0;
@@ -3433,7 +3377,7 @@ function createMatrixReplyDispatcher(config) {
 					...payload,
 					text: ttsSupplement.spokenText
 				} : payload;
-				if (draftController.isDraftConsumed()) {
+				if (draftController.draftDisposition() !== "active") {
 					await draftStream.discardPending();
 					return await completeDelivery(await deliverMatrixReplies({
 						cfg,
@@ -3511,11 +3455,10 @@ function createMatrixReplyDispatcher(config) {
 							}
 						}),
 						deliverNormally: async () => {
-							const draftRedacted = await redactMatrixDraftEvent(client, roomId, draftEventId);
-							const survivingDraft = createSurvivingDraftDelivery(draftEventId, draftRedacted);
-							let deliveredFallback;
-							try {
-								deliveredFallback = await deliverMatrixReplies({
+							fallbackResult = await settleDraftReplacement({
+								draftEventId,
+								draftContent: draftStream.content() ?? preparedFinalPreviewContent,
+								deliver: async () => await deliverMatrixReplies({
 									cfg,
 									replies: [fallbackPayload],
 									roomId,
@@ -3529,15 +3472,12 @@ function createMatrixReplyDispatcher(config) {
 									accountId,
 									mediaLocalRoots,
 									tableMode
-								});
-							} catch (error) {
-								throw toMatrixPartialDeliveryError(error, [survivingDraft]);
-							}
-							fallbackResult = mergeMatrixReplyDeliveryResults([survivingDraft, deliveredFallback]);
+								})
+							});
 							return fallbackResult.visibleReplySent;
 						}
 					});
-					draftController.markDraftConsumed();
+					if (previewResult.kind === "preview-finalized") draftController.markDraftConsumed();
 					return await completeDelivery(previewResult.kind === "preview-finalized" && previewResult.liveState?.receipt ? createDraftDeliveryResult(draftEventId, finalizedDraftContent ?? preparedFinalPreviewContent) : fallbackResult ?? mergeMatrixReplyDeliveryResults([]));
 				} else if (draftEventId && hasMedia && !payloadReplyMismatch) {
 					let textEditOk = !mustDeliverFinalNormally;
@@ -3575,44 +3515,15 @@ function createMatrixReplyDispatcher(config) {
 					}
 					const reusesDraftAsFinalText = Boolean(payloadText?.trim()) && textEditOk;
 					const draftContent = draftStream.content();
-					const draftRedacted = reusesDraftAsFinalText ? false : await redactMatrixDraftEvent(client, roomId, draftEventId);
 					const mediaPayload = ttsSupplement && reusesDraftAsFinalText ? buildTtsSupplementMediaPayload(payload) : {
 						...payload,
 						text: reusesDraftAsFinalText ? void 0 : payload.text ?? (ttsSupplement?.visibleTextAlreadyDelivered === true ? void 0 : ttsSupplement?.spokenText)
 					};
 					const providerDraftContent = finalizedDraftContent ?? preparedPayloadContent;
-					const previewDelivery = reusesDraftAsFinalText && providerDraftContent ? createDraftDeliveryResult(draftEventId, providerDraftContent) : !draftRedacted && draftContent ? createDraftDeliveryResult(draftEventId, draftContent) : mergeMatrixReplyDeliveryResults([]);
-					let mediaDelivery;
-					try {
-						mediaDelivery = await deliverMatrixReplies({
-							cfg,
-							replies: [mediaPayload],
-							roomId,
-							client,
-							runtime,
-							textLimit,
-							replyToMode,
-							hasRepliedRef,
-							threadId: threadTarget,
-							replyToId: threadTarget ?? replyToEventId ?? void 0,
-							accountId,
-							mediaLocalRoots,
-							tableMode
-						});
-					} catch (error) {
-						throw toMatrixPartialDeliveryError(error, [previewDelivery]);
-					}
-					draftController.markDraftConsumed();
-					return await completeDelivery(mergeMatrixReplyDeliveryResults([previewDelivery, mediaDelivery]));
-				}
-				const shouldRedactDraft = Boolean(draftEventId) && (payload.isError || payloadReplyMismatch || mustDeliverFinalNormally || draftFinalTextNeedsNormalMentionDelivery);
-				const draftRedacted = shouldRedactDraft && draftEventId ? await redactMatrixDraftEvent(client, roomId, draftEventId) : false;
-				const survivingDraft = shouldRedactDraft && draftEventId ? createSurvivingDraftDelivery(draftEventId, draftRedacted) : mergeMatrixReplyDeliveryResults([]);
-				let deliveredFallback;
-				try {
-					deliveredFallback = await deliverMatrixReplies({
+					const previewDelivery = reusesDraftAsFinalText && providerDraftContent ? createDraftDeliveryResult(draftEventId, providerDraftContent) : draftContent ? createDraftDeliveryResult(draftEventId, draftContent) : mergeMatrixReplyDeliveryResults([]);
+					const deliverMedia = async () => await deliverMatrixReplies({
 						cfg,
-						replies: [fallbackPayload],
+						replies: [mediaPayload],
 						roomId,
 						client,
 						runtime,
@@ -3625,11 +3536,46 @@ function createMatrixReplyDispatcher(config) {
 						mediaLocalRoots,
 						tableMode
 					});
-				} catch (error) {
-					throw toMatrixPartialDeliveryError(error, [survivingDraft]);
+					if (reusesDraftAsFinalText) {
+						draftController.markDraftConsumed();
+						let mediaDelivery;
+						try {
+							mediaDelivery = await deliverMedia();
+						} catch (error) {
+							throw toMatrixPartialDeliveryError(error, [previewDelivery]);
+						}
+						return await completeDelivery(mergeMatrixReplyDeliveryResults([previewDelivery, mediaDelivery]));
+					}
+					if (draftContent) return await completeDelivery(await settleDraftReplacement({
+						draftEventId,
+						draftContent,
+						deliver: deliverMedia
+					}));
+					return await completeDelivery(await deliverMedia());
 				}
-				if (shouldRedactDraft || deliveredFallback.visibleReplySent) draftController.markDraftConsumed();
-				return await completeDelivery(mergeMatrixReplyDeliveryResults([survivingDraft, deliveredFallback]));
+				const shouldRedactDraft = Boolean(draftEventId) && (payload.isError || payloadReplyMismatch || mustDeliverFinalNormally || draftFinalTextNeedsNormalMentionDelivery);
+				const deliverFallback = async () => await deliverMatrixReplies({
+					cfg,
+					replies: [fallbackPayload],
+					roomId,
+					client,
+					runtime,
+					textLimit,
+					replyToMode,
+					hasRepliedRef,
+					threadId: threadTarget,
+					replyToId: threadTarget ?? replyToEventId ?? void 0,
+					accountId,
+					mediaLocalRoots,
+					tableMode
+				});
+				const draftContent = draftStream.content();
+				if (shouldRedactDraft && draftEventId && draftContent) return await completeDelivery(await settleDraftReplacement({
+					draftEventId,
+					draftContent,
+					deliver: deliverFallback
+				}));
+				return await completeDelivery(await deliverFallback());
 			}
 			return await completeDelivery(await deliverMatrixReplies({
 				cfg,
@@ -3650,7 +3596,7 @@ function createMatrixReplyDispatcher(config) {
 		onError: (err, info) => {
 			if (info.kind === "final") finalReplyDeliveryFailed = true;
 			else nonFinalReplyDeliveryFailed = true;
-			if (info.kind === "block") draftController.advanceDraftBlockBoundary({ fallbackToLatestEnd: true });
+			if (info.kind === "block") beginNextBlockDraft();
 			runtime.error?.(`matrix ${info.kind} reply failed: ${String(err)}`);
 		},
 		onReplyStart: typingCallbacks.onReplyStart,
@@ -3902,8 +3848,9 @@ function createMatrixRoomMessageHandler(params) {
 			})();
 			if (!resolvedIngressResult) return;
 			if ("deferredPrefix" in resolvedIngressResult) return;
-			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 { 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, resolveMessageIngress } = resolvedIngressResult;
 			const inboundContext = await resolveMatrixInboundContext({
+				resolveMessageIngress,
 				client,
 				core,
 				cfg,
@@ -4102,19 +4049,21 @@ function createMatrixRoomMessageHandler(params) {
 						},
 						dispatcherOptions: {
 							...turnDispatcherOptions,
-							onSettled: () => draftController.progressDraftGate.cancel()
+							onSettled: () => draftController.cancelProgressDraft()
 						},
 						replyOptions: {
 							skillFilter: roomConfig?.skills,
 							disableBlockStreaming: !blockStreamingEnabled,
 							onPartialReply: draftStream ? (payload) => draftController.onPartialReply(payload.text ?? "") : void 0,
 							onBlockReplyQueued: draftStream ? (payload, context) => {
-								if (payload.isCompactionNotice === true) return;
+								if (payload.isCompactionNotice === true) return false;
 								draftController.queueDraftBlockBoundary(payload, context);
+								return false;
 							} : void 0,
 							onAssistantMessageStart: draftStream ? () => {
 								draftController.resetDraftBlockOffsets();
 								draftController.resetPreviewToolProgress();
+								return false;
 							} : void 0,
 							onQueuedFollowupAdmitted: draftStream ? draftController.resetDraftDeliveryState : void 0,
 							...draftController.buildPreviewToolProgressReplyOptions(),
@@ -4151,12 +4100,14 @@ function createMatrixRoomMessageHandler(params) {
 			logVerboseMessage(`matrix: delivered ${finalCount} reply${finalCount === 1 ? "" : "ies"} to ${replyTarget}`);
 			await commitInboundEventIfClaimed();
 		} catch (err) {
+			const draftController = draftControllerRef;
+			if (draftController?.draftStream?.eventId() && draftController.draftDisposition() === "active") draftController.markDraftRetained();
 			runtime.error?.(`matrix handler failed: ${String(err)}`);
 		} finally {
 			const draftStream = draftControllerRef?.draftStream;
 			if (draftStream) {
 				const draftEventId = await draftStream.stop().catch(() => void 0);
-				if (draftEventId && draftControllerRef?.isDraftConsumed() !== true) await redactMatrixDraftEvent(client, roomId, draftEventId);
+				if (draftEventId && draftControllerRef?.draftDisposition() === "active") await redactMatrixDraftEvent(client, roomId, draftEventId);
 			}
 			inboundReplayClaim?.release();
 		}
@@ -4177,10 +4128,10 @@ function shouldPromoteRecentInviteRoom(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/startup.ts
 const loadMatrixStartupMaintenanceDeps = createLazyRuntimeModule(() => Promise.all([
-	import("./setup-core-BVfBv2ai.js").then((n) => n.c),
+	import("./config-update-Bor_Pjsv.js").then((n) => n.t),
 	import("./device-health-B4-YXtJR.js").then((n) => n.t),
-	import("./setup-core-BVfBv2ai.js").then((n) => n.o),
-	import("./startup-verification-wm3_i88s.js")
+	import("./profile-D-Wubo0A.js").then((n) => n.n),
+	import("./startup-verification-Cs08ca8u.js")
 ]).then(([configUpdateModule, deviceHealthModule, profileModule, startupVerificationModule]) => ({
 	updateMatrixAccountConfig: configUpdateModule.updateMatrixAccountConfig,
 	summarizeMatrixDeviceHealth: deviceHealthModule.summarizeMatrixDeviceHealth,
@@ -4251,7 +4202,7 @@ function cloneLastDisconnect(value) {
 function formatSyncError(error) {
 	if (!error) return null;
 	if (error instanceof Error) return error.message || error.name || "unknown";
-	return formatMatrixErrorMessage(error);
+	return formatErrorMessage(error);
 }
 function createMatrixMonitorStatusController(params) {
 	const status = {
@@ -4261,7 +4212,8 @@ function createMatrixMonitorStatusController(params) {
 		lastConnectedAt: null,
 		lastDisconnect: null,
 		lastError: null,
-		healthState: "starting"
+		healthState: "starting",
+		lifecycle: "starting"
 	};
 	const emit = () => {
 		params.statusSink?.({
@@ -4270,16 +4222,25 @@ function createMatrixMonitorStatusController(params) {
 		});
 	};
 	const noteConnected = (at = Date.now(), options) => {
-		if (status.connected === true) status.lastEventAt = at;
-		else Object.assign(status, createConnectedChannelStatusPatch(at));
+		const lastConnectedAt = status.connected === true ? status.lastConnectedAt ?? at : at;
+		Object.assign(status, channelReadyPatch({
+			lastConnectedAt,
+			lastEventAt: at,
+			lastDisconnect: null,
+			healthState: "healthy"
+		}));
 		if (options?.transportActivity) Object.assign(status, createTransportActivityStatusPatch(at));
-		status.lastError = null;
-		status.lastDisconnect = null;
-		status.healthState = "healthy";
 		emit();
 	};
 	const noteDisconnected = (paramsLocal) => {
 		const at = paramsLocal.at ?? Date.now();
+		const tokenInvalidated = isMatrixAccessTokenInvalidatedError(paramsLocal.error);
+		if (status.lifecycle === "blocked" && status.terminalDisconnect === true && !tokenInvalidated) {
+			status.connected = false;
+			status.lastEventAt = at;
+			emit();
+			return;
+		}
 		const error = formatSyncError(paramsLocal.error);
 		status.connected = false;
 		status.lastEventAt = at;
@@ -4287,8 +4248,13 @@ function createMatrixMonitorStatusController(params) {
 			at,
 			...error ? { error } : {}
 		};
-		status.lastError = error;
 		status.healthState = paramsLocal.state.toLowerCase();
+		if (tokenInvalidated) Object.assign(status, channelBlockedPatch(error ?? "Matrix access token invalidated"));
+		else {
+			status.lastError = error;
+			status.lifecycle = "recovering";
+			status.terminalDisconnect = void 0;
+		}
 		emit();
 	};
 	emit();
@@ -4318,9 +4284,14 @@ function createMatrixMonitorStatusController(params) {
 			});
 		},
 		markStopped(at = Date.now()) {
-			status.connected = false;
-			status.lastEventAt = at;
-			if (status.healthState !== "error") status.healthState = "stopped";
+			if (status.lifecycle !== "blocked" && status.healthState !== "error") Object.assign(status, channelStoppedPatch({
+				lastEventAt: at,
+				healthState: "stopped"
+			}));
+			else {
+				status.connected = false;
+				status.lastEventAt = at;
+			}
 			emit();
 		}
 	};
@@ -4385,7 +4356,9 @@ function createMatrixMonitorSyncLifecycle(params) {
 //#region extensions/matrix/src/matrix/monitor/task-runner.ts
 function createMatrixMonitorTaskRunner(params) {
 	const inFlight = /* @__PURE__ */ new Set();
+	let closed = false;
 	const runDetachedTask = (label, task) => {
+		if (closed) return Promise.resolve();
 		const trackedTask = Promise.resolve().then(task).catch((error) => {
 			const message = String(error);
 			params.logVerboseMessage(`matrix: ${label} failed (${message})`);
@@ -4403,6 +4376,7 @@ function createMatrixMonitorTaskRunner(params) {
 		while (inFlight.size > 0) await Promise.allSettled(Array.from(inFlight));
 	};
 	return {
+		close: () => closed = true,
 		runDetachedTask,
 		waitForIdle
 	};
@@ -4504,28 +4478,30 @@ async function monitorMatrixProvider(opts = {}) {
 		statusSink: opts.setStatus
 	});
 	let cleanedUp = false;
+	let cleanupPromise = null;
 	let client = null;
+	let clientLease = null;
+	let monitorLifecycleSignal = opts.abortSignal;
 	let threadBindingManager = null;
 	const monitorTaskRunner = createMatrixMonitorTaskRunner({
 		logger,
 		logVerboseMessage
 	});
+	let disposeAutoJoin = () => {};
+	let disposeMonitorEvents = () => {};
 	let syncLifecycle = null;
-	const cleanup = async (mode = "persist") => {
-		if (cleanedUp) return;
+	let monitorSetupClosed = false;
+	const cleanup = (mode = "persist") => {
+		if (cleanupPromise) return cleanupPromise;
 		cleanedUp = true;
-		try {
-			client?.stopSyncWithoutPersist();
-			if (client && mode === "persist") await client.drainPendingDecryptions("matrix monitor shutdown");
-			if (mode === "persist") await monitorTaskRunner.waitForIdle();
-			threadBindingManager?.stop();
-			if (client) await releaseSharedClientInstance(client, mode);
-		} finally {
-			client?.off("sync.state", onSyncState);
-			syncLifecycle?.dispose();
-			statusController.markStopped();
-			setActiveMatrixClient(null, auth.accountId);
-		}
+		cleanupPromise = (async () => {
+			try {
+				await clientLease?.release({ mode });
+			} finally {
+				statusController.markStopped();
+			}
+		})();
+		return cleanupPromise;
 	};
 	const defaultGroupPolicy = resolveDefaultGroupPolicy(cfg);
 	const { groupPolicy: groupPolicyRaw, providerMissingFallbackApplied } = resolveAllowlistProviderRuntimeGroupPolicy({
@@ -4582,14 +4558,32 @@ async function monitorMatrixProvider(opts = {}) {
 	const onSyncState = (state) => {
 		noteSyncHealthState(state);
 	};
+	const monitorRetirement = {
+		closeTaskAdmission: () => {
+			monitorSetupClosed = true;
+			monitorTaskRunner.close();
+		},
+		detachListeners: () => {
+			disposeAutoJoin();
+			disposeMonitorEvents();
+			client?.off("sync.state", onSyncState);
+			syncLifecycle?.dispose();
+		},
+		waitForTasks: monitorTaskRunner.waitForIdle,
+		cleanup: () => threadBindingManager?.stop()
+	};
 	try {
-		client = await resolveSharedMatrixClient({
+		clientLease = await acquireSharedMatrixClient({
 			cfg,
 			auth: authWithLimit,
 			startClient: false,
-			accountId: auth.accountId
+			accountId: auth.accountId,
+			abortSignal: opts.abortSignal,
+			role: "monitor"
 		});
-		setActiveMatrixClient(client, auth.accountId);
+		client = clientLease.client;
+		monitorLifecycleSignal = opts.abortSignal ? AbortSignal.any([opts.abortSignal, clientLease.abortSignal]) : clientLease.abortSignal;
+		clientLease.registerMonitorRetirement(monitorRetirement);
 		const inboundDeduper = createMatrixInboundEventDeduper({
 			auth,
 			env: process.env
@@ -4597,11 +4591,11 @@ async function monitorMatrixProvider(opts = {}) {
 		syncLifecycle = createMatrixMonitorSyncLifecycle({
 			client,
 			statusController,
-			isStopping: () => cleanedUp || opts.abortSignal?.aborted === true
+			isStopping: () => cleanedUp || monitorLifecycleSignal?.aborted === true
 		});
 		client.on("sync.state", onSyncState);
 		const dropPreStartupMessages = !client.hasPersistedSyncState();
-		const { getRoomInfo, getMemberDisplayName } = createMatrixRoomInfoResolver(client);
+		const { getRoomInfo, getMemberDisplayName, invalidateMemberDisplayName } = createMatrixRoomInfoResolver(client);
 		const isExplicitlyConfiguredRoom = async (roomId) => {
 			const roomInfoForConfig = needsRoomAliasesForConfig ? await getRoomInfo(roomId, { includeAliases: true }) : void 0;
 			const aliases = roomInfoForConfig ? [roomInfoForConfig.canonicalAlias ?? "", ...roomInfoForConfig.altAliases].filter(Boolean) : [];
@@ -4639,10 +4633,11 @@ async function monitorMatrixProvider(opts = {}) {
 				}
 			}
 		});
-		registerMatrixAutoJoin({
+		disposeAutoJoin = registerMatrixAutoJoin({
 			client,
 			accountConfig,
-			runtime
+			runtime,
+			runDetachedTask: monitorTaskRunner.runDetachedTask
 		});
 		const handleRoomMessage = createMatrixRoomMessageHandler({
 			client,
@@ -4682,7 +4677,7 @@ async function monitorMatrixProvider(opts = {}) {
 			getMemberDisplayName,
 			needsRoomAliasesForConfig
 		});
-		threadBindingManager = await createMatrixThreadBindingManager({
+		const createdThreadBindingManager = await createMatrixThreadBindingManager({
 			cfg,
 			accountId: effectiveAccountId,
 			auth,
@@ -4692,8 +4687,14 @@ async function monitorMatrixProvider(opts = {}) {
 			maxAgeMs: threadBindingMaxAgeMs,
 			logVerboseMessage
 		});
+		if (monitorSetupClosed) {
+			createdThreadBindingManager.stop();
+			await cleanup("stop");
+			return;
+		}
+		threadBindingManager = createdThreadBindingManager;
 		logVerboseMessage(`matrix: thread bindings ready account=${threadBindingManager.accountId} idleMs=${threadBindingIdleTimeoutMs} maxAgeMs=${threadBindingMaxAgeMs}`);
-		registerMatrixMonitorEvents({
+		disposeMonitorEvents = registerMatrixMonitorEvents({
 			cfg,
 			client,
 			auth,
@@ -4706,6 +4707,7 @@ async function monitorMatrixProvider(opts = {}) {
 				accountId: effectiveAccountId
 			}).catch(() => []),
 			directTracker,
+			invalidateMemberDisplayName,
 			logVerboseMessage,
 			warnedEncryptedRooms,
 			warnedCryptoMissingRooms,
@@ -4717,18 +4719,17 @@ async function monitorMatrixProvider(opts = {}) {
 			runDetachedTask: monitorTaskRunner.runDetachedTask
 		});
 		logVerboseMessage("matrix: starting client");
-		await resolveSharedMatrixClient({
-			cfg,
-			auth: authWithLimit,
-			accountId: auth.accountId,
-			abortSignal: opts.abortSignal
-		});
+		await clientLease.start(monitorLifecycleSignal);
+		if (monitorSetupClosed) {
+			await cleanup("stop");
+			return;
+		}
 		logVerboseMessage("matrix: client started");
 		logger.info(`matrix: logged in as ${auth.userId}`);
 		backfillMatrixAuthDeviceIdAfterStartup({
 			auth,
 			env: process.env,
-			abortSignal: opts.abortSignal
+			abortSignal: monitorLifecycleSignal
 		}).catch((err) => {
 			logVerboseMessage(`matrix: failed to backfill deviceId after startup (${String(err)})`);
 		});
@@ -4738,7 +4739,7 @@ async function monitorMatrixProvider(opts = {}) {
 			accountId: effectiveAccountId,
 			capability: CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY,
 			context: { client },
-			abortSignal: opts.abortSignal
+			abortSignal: monitorLifecycleSignal
 		});
 		await runMatrixStartupMaintenance({
 			client,
@@ -4757,9 +4758,13 @@ async function monitorMatrixProvider(opts = {}) {
 			},
 			loadWebMedia: async (url, maxBytes) => await core.media.loadWebMedia(url, maxBytes),
 			env: process.env,
-			abortSignal: opts.abortSignal
+			abortSignal: monitorLifecycleSignal
 		});
-		await Promise.race([waitUntilAbort(opts.abortSignal, async () => {
+		if (monitorSetupClosed) {
+			await cleanup("stop");
+			return;
+		}
+		await Promise.race([waitUntilAbort(monitorLifecycleSignal, async () => {
 			try {
 				logVerboseMessage("matrix: stopping client");
 				await cleanup();
@@ -4767,8 +4772,13 @@ async function monitorMatrixProvider(opts = {}) {
 				logger.warn("matrix: failed during monitor shutdown cleanup", { error: String(err) });
 			}
 		}), syncLifecycle.waitForFatalStop()]);
+		await cleanup();
 	} catch (err) {
-		if (opts.abortSignal?.aborted === true && isMatrixStartupAbortError(err)) {
+		if (monitorSetupClosed) {
+			await cleanup("stop");
+			return;
+		}
+		if (monitorLifecycleSignal?.aborted === true && isMatrixStartupAbortError(err)) {
 			await cleanup("stop");
 			return;
 		}