@openclaw/matrix 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{monitor-skIntQVG.mjs → monitor-Dk_fQL1k.mjs}

@@ -1,30 +1,30 @@
 import { t as getMatrixRuntime } from "./runtime-1kn1P6io.mjs";
 import { a as resolveMatrixAccountConfig, i as resolveMatrixAccountAllowlistConfig } from "./account-config-CRsKoMqJ.mjs";
-import { n as resolveConfiguredMatrixBotUserIds } from "./accounts-C_r0UlEm.mjs";
-import { a as resolveMatrixThreadRouting, i as resolveMatrixInboundRoute, n as resolveMatrixStoredSessionMeta, o as resolveMatrixRoomConfig } from "./channel-CeRXEAEP.mjs";
-import { a as resolveMatrixAllowListMatch, i as normalizeMatrixUserId, r as normalizeMatrixAllowList } from "./channel.setup-DC2t7_PK.mjs";
-import { n as isMatrixRoomId, t as isMatrixQualifiedUserId } from "./target-ids-Nwx7cMVE.mjs";
+import { h as resolveConfiguredMatrixBotUserIds } from "./setup-core-CKnNTfgD.mjs";
+import { a as resolveMatrixThreadRouting, i as resolveMatrixInboundRoute, n as resolveMatrixStoredSessionMeta, o as resolveMatrixRoomConfig } from "./channel-BcwGspPw.mjs";
+import { a as resolveMatrixAllowListMatch, i as normalizeMatrixUserId, r as normalizeMatrixAllowList } from "./channel.setup-CwuYD_CT.mjs";
+import { n as isMatrixQualifiedUserId, r as isMatrixRoomId, t as isMatrixInviteAutoJoinTarget } from "./target-ids-HhcaKX1n.mjs";
 import { a as MATRIX_REACTION_EVENT_TYPE } from "./send-currentness-C2rMVVIQ.mjs";
-import { c as isStrictDirectMembership, f as resolveMatrixReplyToEventId, h as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, i as promoteMatrixDirectRoomCandidate, p as resolveMatrixThreadRootId, s as hasDirectMatrixMemberFlag, u as readJoinedMatrixMembers, v as RelationType } from "./direct-management-DJtQhLKH.mjs";
-import { _ as isPollEventType, c as formatMatrixMessageText, d as resolveMatrixReplacementContent, h as formatPollAsText, l as isLikelyBareFilename, r as sendMessageMatrix, v as isPollStartType, w as setBoundedMap, y as parsePollStart } from "./send-B1Y2L4wj.mjs";
-import { t as createMatrixThreadBindingManager } from "./thread-bindings-DveHVZqN.mjs";
-import { i as readMatrixMessages, u as fetchMatrixPollSnapshot } from "./messages-uCbwLRKS.mjs";
-import { a as isMatrixStartupAbortError, c as getMatrixMonitorTaskSignal, d as resolveMatrixAuthContext, l as backfillMatrixAuthDeviceIdAfterStartup, n as acquireSharedMatrixClient, o as throwIfMatrixStartupAborted, s as createMatrixMonitorTaskRunner, u as resolveMatrixAuth } from "./client-kmih04ng.mjs";
-import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-DfJY5Ck0.mjs";
-import { n as prepareMatrixReplyPayload, r as resolveMatrixExtraContent } from "./outbound-CqQou3ny.mjs";
-import { t as resolveMatrixTargets } from "./resolve-targets-DFeU1Ww6.mjs";
-import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-BEjKbiMR.mjs";
+import { c as isStrictDirectMembership, f as resolveMatrixReplyToEventId, h as MATRIX_OPENCLAW_FINALIZED_PREVIEW_KEY, i as promoteMatrixDirectRoomCandidate, p as resolveMatrixThreadRootId, s as hasDirectMatrixMemberFlag, u as readJoinedMatrixMembers, v as RelationType } from "./direct-management-B3wYhx_M.mjs";
+import { _ as isPollEventType, c as formatMatrixMessageText, d as resolveMatrixReplacementContent, h as formatPollAsText, l as isLikelyBareFilename, r as sendMessageMatrix, u as resolveMatrixMessageAttachment, v as isPollStartType, w as setBoundedMap, y as parsePollStart } from "./send-LCOuTVc1.mjs";
+import { t as createMatrixThreadBindingManager } from "./thread-bindings-CT4P-OSZ.mjs";
+import { i as readMatrixMessages, u as fetchMatrixPollSnapshot } from "./messages-B1CZqU8u.mjs";
+import { a as isMatrixStartupAbortError, c as getMatrixMonitorTaskSignal, d as resolveMatrixAuthContext, l as backfillMatrixAuthDeviceIdAfterStartup, n as acquireSharedMatrixClient, o as throwIfMatrixStartupAborted, s as createMatrixMonitorTaskRunner, u as resolveMatrixAuth } from "./client-vPPbaxNp.mjs";
+import { i as isMatrixMediaSizeLimitError, r as MatrixMediaSizeLimitError } from "./http-client-ByR4STVQ.mjs";
+import { n as prepareMatrixReplyPayload, r as resolveMatrixExtraContent } from "./outbound-LR3SqPIq.mjs";
+import { t as resolveMatrixTargets } from "./resolve-targets-BVVbbvP6.mjs";
+import { t as formatMatrixEncryptedEventDisabledWarning } from "./encryption-guidance-D5_IsDIy.mjs";
 import { createMatrixInboundEventDeduper } from "./inbound-dedupe-C-EBGY0B.mjs";
-import { a as isMatrixAccessTokenInvalidatedError, d as isMatrixDisconnectedSyncState, f as isMatrixReadySyncState, p as isMatrixTerminalSyncState } from "./client-support-D7BlioUb.mjs";
-import { r as getMatrixRoomInfo, t as createMatrixRoomInfoResolver } from "./room-info-BPMbwe8I.mjs";
+import { a as isMatrixAccessTokenInvalidatedError, d as isMatrixDisconnectedSyncState, f as isMatrixReadySyncState, p as isMatrixTerminalSyncState } from "./client-support-D-xHScuo.mjs";
+import { r as getMatrixRoomInfo, t as createMatrixRoomInfoResolver } from "./room-info-9Uqlpt1V.mjs";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
-import { createChannelProgressDraftCompositor, createLivePreviewLifecycle, createPreviewMessageReceipt, createReplyPrefixOptions, createTypingCallbacks, logTypingFailure, resolveChannelStreamingBlockEnabled, waitUntilAbort } from "openclaw/plugin-sdk/channel-outbound";
+import { createChannelDeliveryAccumulator, createChannelProgressDraftCompositor, createLivePreviewLifecycle, createPreviewMessageReceipt, createReplyPrefixOptions, createTypingCallbacks, logTypingFailure, resolveChannelStreamingBlockEnabled, waitUntilAbort } from "openclaw/plugin-sdk/channel-outbound";
+import { extractErrorCode, formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { normalizeLowercaseStringOrEmpty, normalizeNullableString, normalizeOptionalString, normalizeStringifiedEntries, normalizeUniqueTrimmedStringList, readStringValue, 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 { addAllowlistUserEntriesFromConfigEntry, buildAllowlistResolutionSummary, canonicalizeAllowlistWithResolvedIds, patchAllowlistUsersInConfigEntries, summarizeMapping } from "openclaw/plugin-sdk/allow-from";
 import { normalizeStringEntries as normalizeStringEntries$1 } from "openclaw/plugin-sdk/string-normalization-runtime";
-import { extractErrorCode, formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { isFutureDateTimestampMs, parseStrictFiniteNumber, resolveExpiresAtMsFromDurationMs, resolveOptionalIntegerOption, resolvePromptHistoryLimit } from "openclaw/plugin-sdk/number-runtime";
 import { resolveAgentRoute, resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
 import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
@@ -40,7 +40,7 @@ import { isDangerousNameMatchingEnabled } from "openclaw/plugin-sdk/dangerous-na
 import { reportChannelRoomJoin } from "openclaw/plugin-sdk/channel-join-intro-runtime";
 import { defineStableChannelIngressIdentity } from "openclaw/plugin-sdk/channel-ingress-runtime";
 import { resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
-import { createAcceptedChannelDeliveryResult, createChannelInboundEnvelopeBuilder, createChannelPartialDeliveryError, formatLocationText, hasFinalInboundReplyDispatch, isChannelPartialDeliveryError, logInboundDrop, resolveInboundMentionDecision, resolveInboundReplyDispatchCounts, toInboundMediaFactsWithMetadata, toLocationContext } from "openclaw/plugin-sdk/channel-inbound";
+import { createAcceptedChannelDeliveryResult, createChannelInboundEnvelopeBuilderAsync, createChannelPartialDeliveryError, formatLocationText, hasFinalInboundReplyDispatch, isChannelPartialDeliveryError, logInboundDrop, resolveInboundMentionDecision, resolveInboundReplyDispatchCounts, toInboundMediaFactsWithMetadata, toLocationContext } from "openclaw/plugin-sdk/channel-inbound";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-local-roots";
 import { getGlobalHookRunner } from "openclaw/plugin-sdk/plugin-runtime";
 import { evaluateSupplementalContextVisibility, resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
@@ -66,7 +66,11 @@ function registerMatrixAutoJoin(params) {
 	const resolvedAliasRoomIds = /* @__PURE__ */ new Map();
 	if (autoJoin === "off") return () => {};
 	if (autoJoin === "always") logVerbose("matrix: auto-join enabled for all invites");
-	else logVerbose("matrix: auto-join enabled for allowlist invites");
+	else {
+		logVerbose("matrix: auto-join enabled for allowlist invites");
+		const inertEntries = rawAllowlist.filter((entry) => !isMatrixInviteAutoJoinTarget(entry));
+		if (inertEntries.length > 0) core.logging.getChildLogger({ module: "matrix-auto-join" }).warn(`matrix: autoJoinAllowlist entries cannot match an invited room and are ignored: ${inertEntries.join(", ")}`);
+	}
 	const resolveAllowedAliasRoomId = async (alias) => {
 		if (resolvedAliasRoomIds.has(alias)) return resolvedAliasRoomIds.get(alias) ?? null;
 		const resolved = await params.client.resolveRoom(alias);
@@ -113,17 +117,12 @@ function normalizeMatrixUserLookupEntry(raw) {
 function normalizeMatrixRoomLookupEntry(raw) {
 	return raw.replace(/^matrix:/i, "").replace(/^(room|channel):/i, "").trim();
 }
-function filterResolvedMatrixAllowlistEntries(entries) {
+function filterMatrixAllowlistEntries(entries, failClosedOnUnresolved = false) {
 	return entries.filter((entry) => {
 		const trimmed = entry.trim();
-		if (!trimmed) return false;
-		if (trimmed === "*") return true;
-		return isMatrixQualifiedUserId(normalizeMatrixUserLookupEntry(trimmed));
+		return Boolean(trimmed) && (failClosedOnUnresolved || trimmed === "*" || isMatrixQualifiedUserId(normalizeMatrixUserLookupEntry(trimmed)));
 	});
 }
-function filterFailClosedMatrixAllowlistEntries(entries) {
-	return entries.filter((entry) => entry.trim().length > 0);
-}
 function listResolvedMatrixAllowlistEntries(params) {
 	const resolvedEntries = [];
 	const seen = /* @__PURE__ */ new Set();
@@ -224,7 +223,7 @@ async function resolveMatrixMonitorUserAllowlist(params) {
 		runtime: params.runtime
 	});
 	return {
-		entries: params.failClosedOnUnresolved ? filterFailClosedMatrixAllowlistEntries(canonicalized) : filterResolvedMatrixAllowlistEntries(canonicalized),
+		entries: filterMatrixAllowlistEntries(canonicalized, params.failClosedOnUnresolved),
 		resolvedEntries: listResolvedMatrixAllowlistEntries({
 			entries: allowList,
 			resolvedMap: resolution.resolvedMap
@@ -280,12 +279,11 @@ async function resolveMatrixMonitorLiveUserAllowlist(params) {
 		resolveTargets: params.resolveTargets ?? resolveMatrixTargets,
 		allowNameMatching
 	});
-	const canonicalized = canonicalizeAllowlistWithResolvedIds({
+	const resolvedEntries = filterMatrixAllowlistEntries(canonicalizeAllowlistWithResolvedIds({
 		existing: pending,
 		resolvedMap: resolution.resolvedMap,
 		entryKey: normalizeMatrixUserId
-	});
-	const resolvedEntries = params.failClosedOnUnresolved ? filterFailClosedMatrixAllowlistEntries(canonicalized) : filterResolvedMatrixAllowlistEntries(canonicalized);
+	}), params.failClosedOnUnresolved);
 	for (const entry of resolvedEntries) addEntry(entry);
 	return effective;
 }
@@ -474,36 +472,35 @@ function createDirectRoomTracker(client, opts = {}) {
 		}
 		return cached.remoteUserId === normalizedRemoteUserId;
 	};
-	const canPromoteRecentInvite = async (roomId) => {
-		try {
-			return await opts.canPromoteRecentInvite?.(roomId) ?? true;
-		} catch (err) {
-			log(`matrix: recent invite promotion veto failed room=${roomId} (${String(err)})`);
-			return false;
-		}
-	};
-	const canPromoteUnmappedStrictRoom = async (roomId) => {
-		try {
-			return await opts.canPromoteUnmappedStrictRoom?.(roomId) ?? false;
-		} catch (err) {
-			log(`matrix: unmapped strict room promotion veto failed room=${roomId} (${String(err)})`);
-			return false;
-		}
-	};
-	const shouldKeepLocallyPromotedDirectRoom = async (roomId) => {
-		try {
-			return await opts.shouldKeepLocallyPromotedDirectRoom?.(roomId);
-		} catch (err) {
-			log(`matrix: local promotion keep-check failed room=${roomId} (${String(err)})`);
-			return;
-		}
+	const roomPolicies = {
+		canPromoteRecentInvite: [
+			true,
+			false,
+			"recent invite promotion veto"
+		],
+		canPromoteUnmappedStrictRoom: [
+			false,
+			false,
+			"unmapped strict room promotion veto"
+		],
+		shouldKeepLocallyPromotedDirectRoom: [
+			void 0,
+			void 0,
+			"local promotion keep-check"
+		],
+		isExplicitlyConfiguredRoom: [
+			false,
+			true,
+			"configured room check"
+		]
 	};
-	const isExplicitlyConfiguredRoom = async (roomId) => {
+	const checkRoomPolicy = async (key, roomId) => {
+		const [fallback, onError, label] = roomPolicies[key];
 		try {
-			return await opts.isExplicitlyConfiguredRoom?.(roomId) ?? false;
+			return await opts[key]?.(roomId) ?? fallback;
 		} catch (err) {
-			log(`matrix: configured room check failed room=${roomId} (${String(err)})`);
-			return true;
+			log(`matrix: ${label} failed room=${roomId} (${String(err)})`);
+			return onError;
 		}
 	};
 	const hasLocallyPromotedDirectRoom = (roomId, remoteUserId) => {
@@ -534,7 +531,7 @@ function createDirectRoomTracker(client, opts = {}) {
 		},
 		isDirectMessage: async (params) => {
 			const { roomId, senderId } = params;
-			if (await isExplicitlyConfiguredRoom(roomId)) {
+			if (await checkRoomPolicy("isExplicitlyConfiguredRoom", roomId)) {
 				log(`matrix: dm rejected via explicit room config room=${roomId}`);
 				return false;
 			}
@@ -572,7 +569,7 @@ function createDirectRoomTracker(client, opts = {}) {
 					return true;
 				}
 				if (hasLocallyPromotedDirectRoom(roomId, senderId)) {
-					if (await shouldKeepLocallyPromotedDirectRoom(roomId) !== false) {
+					if (await checkRoomPolicy("shouldKeepLocallyPromotedDirectRoom", roomId) !== false) {
 						log(`matrix: dm detected via local promotion room=${roomId}`);
 						return true;
 					}
@@ -592,8 +589,8 @@ function createDirectRoomTracker(client, opts = {}) {
 					}
 					return promotion.classifyAsDirect;
 				};
-				if (hasRecentInviteCandidate(roomId, senderId) && await canPromoteRecentInvite(roomId) && await promoteDirectRoom("recent invite")) return true;
-				if (await canPromoteUnmappedStrictRoom(roomId) && await promoteDirectRoom("per-room strict fallback")) return true;
+				if (hasRecentInviteCandidate(roomId, senderId) && await checkRoomPolicy("canPromoteRecentInvite", roomId) && await promoteDirectRoom("recent invite")) return true;
+				if (await checkRoomPolicy("canPromoteUnmappedStrictRoom", roomId) && await promoteDirectRoom("per-room strict fallback")) return true;
 			}
 			log(`matrix: dm check room=${roomId} result=group members=${joinedMembers?.length ?? "unknown"}`);
 			return false;
@@ -750,7 +747,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("./direct-management-DJtQhLKH.mjs").then((n) => n.t), import("./direct-management-DJtQhLKH.mjs").then((n) => n.o)]).then(([directManagementModule, directRoomModule]) => ({
+const loadMatrixDirectRoomDeps = createLazyRuntimeModule(() => Promise.all([import("./direct-management-B3wYhx_M.mjs").then((n) => n.t), import("./direct-management-B3wYhx_M.mjs").then((n) => n.o)]).then(([directManagementModule, directRoomModule]) => ({
 	inspectMatrixDirectRooms: directManagementModule.inspectMatrixDirectRooms,
 	isStrictDirectRoom: directRoomModule.isStrictDirectRoom
 })));
@@ -872,20 +869,17 @@ async function resolveVerificationSummaryForSignal(client, params) {
 	return activeByUser.find((entry) => normalizeNullableString(entry.roomId) === params.roomId) ?? activeByUser[0] ?? null;
 }
 async function resolveVerificationSasNoticeForSignal(client, params) {
-	const summary = await resolveVerificationSummaryForSignal(client, params);
-	const immediateNotice = summary && isActiveVerificationSummary(summary) ? formatVerificationSasNotice(summary) : null;
-	if (immediateNotice || params.stage !== "ready" && params.stage !== "start") return {
-		summary,
-		sasNotice: immediateNotice
-	};
-	await new Promise((resolve) => {
-		setTimeout(resolve, params.sasNoticeRetryDelayMs ?? SAS_NOTICE_RETRY_DELAY_MS);
-	});
-	const retriedSummary = await resolveVerificationSummaryForSignal(client, params);
-	return {
-		summary: retriedSummary,
-		sasNotice: retriedSummary && isActiveVerificationSummary(retriedSummary) ? formatVerificationSasNotice(retriedSummary) : null
-	};
+	for (let attempt = 0;; attempt += 1) {
+		const summary = await resolveVerificationSummaryForSignal(client, params);
+		const sasNotice = summary && isActiveVerificationSummary(summary) ? formatVerificationSasNotice(summary) : null;
+		if (sasNotice || attempt > 0 || params.stage !== "ready" && params.stage !== "start") return {
+			summary,
+			sasNotice
+		};
+		await new Promise((resolve) => {
+			setTimeout(resolve, params.sasNoticeRetryDelayMs ?? SAS_NOTICE_RETRY_DELAY_MS);
+		});
+	}
 }
 function trackBounded(set, value) {
 	if (!value || set.has(value)) return false;
@@ -934,6 +928,18 @@ function createMatrixVerificationEventRouter(params) {
 		params.logVerboseMessage(`matrix: blocked verification sender ${senderId} (dmPolicy=${params.dmPolicy})`);
 		return false;
 	}
+	async function canRouteVerificationNotice(roomId, senderId, source) {
+		const { isStrictDirectRoom } = await loadMatrixDirectRoomDeps();
+		if (!await isStrictDirectRoom({
+			client: params.client,
+			roomId,
+			remoteUserId: senderId
+		})) {
+			params.logVerboseMessage(`matrix: ignoring verification ${source} outside strict DM room=${roomId} sender=${senderId}`);
+			return false;
+		}
+		return await isVerificationNoticeAuthorized(senderId);
+	}
 	async function resolveActiveDirectRoomId(remoteUserId) {
 		const { inspectMatrixDirectRooms } = await loadMatrixDirectRoomDeps();
 		const inspection = await inspectMatrixDirectRooms({
@@ -978,15 +984,7 @@ function createMatrixVerificationEventRouter(params) {
 	async function routeVerificationSummary(summary) {
 		const roomId = await resolveSummaryRoomId(summary);
 		if (!roomId || !isActiveVerificationSummary(summary)) return;
-		if (!await (await loadMatrixDirectRoomDeps()).isStrictDirectRoom({
-			client: params.client,
-			roomId,
-			remoteUserId: summary.otherUserId
-		})) {
-			params.logVerboseMessage(`matrix: ignoring verification summary outside strict DM room=${roomId} sender=${summary.otherUserId}`);
-			return;
-		}
-		if (!await isVerificationNoticeAuthorized(summary.otherUserId)) return;
+		if (!await canRouteVerificationNotice(roomId, summary.otherUserId, "summary")) return;
 		const sasNotice = formatVerificationSasNotice(summary);
 		if (!sasNotice) return;
 		const sasFingerprint = `${summary.id}:${JSON.stringify(summary.sas)}`;
@@ -1006,15 +1004,7 @@ function createMatrixVerificationEventRouter(params) {
 			}
 			const flowId = signal.flowId;
 			const sourceFingerprint = normalizeNullableString(event?.event_id) ?? `${senderId}:${event.type}:${flowId ?? "none"}`;
-			if (!await (await loadMatrixDirectRoomDeps()).isStrictDirectRoom({
-				client: params.client,
-				roomId,
-				remoteUserId: senderId
-			})) {
-				params.logVerboseMessage(`matrix: ignoring verification event outside strict DM room=${roomId} sender=${senderId}`);
-				return;
-			}
-			if (!await isVerificationNoticeAuthorized(senderId)) return;
+			if (!await canRouteVerificationNotice(roomId, senderId, "event")) return;
 			rememberVerificationUserRoom(senderId, roomId);
 			if (!trackBounded(routedVerificationEvents, sourceFingerprint)) return;
 			const stageNotice = formatVerificationStageNotice({
@@ -1064,11 +1054,11 @@ function formatMatrixPostHealthySyncDecryptionHint(accountId) {
 	return `matrix: repeated fresh encrypted messages are still failing to decrypt after Matrix resumed healthy sync. This device may still be missing new room keys. Check 'openclaw matrix verify status --verbose --account ${accountId}' and 'openclaw matrix devices list --account ${accountId}'.`;
 }
 function isFreshPostHealthySyncDecryptFailure(params) {
-	const { event, healthySyncSinceMs, graceMs = 0, nowMs } = params;
+	const { event, healthySyncSinceMs, nowMs } = params;
 	if (typeof healthySyncSinceMs !== "number" || !Number.isFinite(healthySyncSinceMs)) return false;
 	const eventTs = event.origin_server_ts;
 	if (!Number.isFinite(eventTs) || eventTs <= 0) return false;
-	if (eventTs < healthySyncSinceMs + graceMs) return false;
+	if (eventTs < healthySyncSinceMs) return false;
 	if (eventTs > nowMs + 6e4) return false;
 	return true;
 }
@@ -1094,7 +1084,6 @@ function createMatrixPostHealthySyncDecryptFailureTracker(params) {
 		if (!isFreshPostHealthySyncDecryptFailure({
 			event,
 			healthySyncSinceMs,
-			graceMs: params.startupGraceMs,
 			nowMs
 		})) return {
 			freshAfterHealthySync: false,
@@ -1116,18 +1105,18 @@ function createMatrixPostHealthySyncDecryptFailureTracker(params) {
 			failureCount
 		};
 		warningEmitted = true;
-		const rooms = uniqueStrings(observations.map((entry) => entry.roomId)).slice(0, MATRIX_POST_HEALTHY_SYNC_DECRYPT_FAILURE_SAMPLE_LIMIT);
-		const senders = uniqueStrings(observations.map((entry) => entry.sender).filter((sender) => Boolean(sender))).slice(0, MATRIX_POST_HEALTHY_SYNC_DECRYPT_FAILURE_SAMPLE_LIMIT);
+		const rooms = uniqueStrings(observations.map((entry) => entry.roomId));
+		const senders = uniqueStrings(observations.map((entry) => entry.sender).filter((sender) => Boolean(sender)));
 		const eventIds = observations.slice(-3).map((entry) => entry.eventId);
 		const latestError = observations.at(-1)?.error ?? error.message;
 		return {
 			freshAfterHealthySync: true,
 			failureCount,
 			warning: {
-				rooms,
-				roomCount: new Set(observations.map((entry) => entry.roomId)).size,
-				senders,
-				senderCount: new Set(observations.map((entry) => entry.sender).filter(Boolean)).size,
+				rooms: rooms.slice(0, MATRIX_POST_HEALTHY_SYNC_DECRYPT_FAILURE_SAMPLE_LIMIT),
+				roomCount: rooms.length,
+				senders: senders.slice(0, MATRIX_POST_HEALTHY_SYNC_DECRYPT_FAILURE_SAMPLE_LIMIT),
+				senderCount: senders.length,
 				eventIds,
 				latestError,
 				windowMs: MATRIX_POST_HEALTHY_SYNC_DECRYPT_FAILURE_WINDOW_MS
@@ -1148,11 +1137,8 @@ async function resolveMatrixSelfUserId(client, logVerboseMessage) {
 	}
 }
 function registerMatrixMonitorEvents(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
-	});
+	const { cfg, client, auth, allowFrom, dmEnabled, dmPolicy, readStoreAllowFrom, directTracker, invalidateMemberDisplayName, logVerboseMessage, warnedEncryptedRooms, warnedCryptoMissingRooms, logger, getHealthySyncSinceMs, formatNativeDependencyHint, onRoomMessage, runDetachedTask, sasNoticeRetryDelayMs } = params;
+	const postHealthySyncDecryptFailureTracker = createMatrixPostHealthySyncDecryptFailureTracker({ getHealthySyncSinceMs });
 	const { routeVerificationEvent, routeVerificationSummary } = createMatrixVerificationEventRouter({
 		client,
 		allowFrom,
@@ -1169,12 +1155,15 @@ function registerMatrixMonitorEvents(params) {
 			logVerboseMessage(`matrix: ${label} failed (${String(error)})`);
 		});
 	};
-	const onRoomMessageEvent = (roomId, event) => {
-		if (routeVerificationEvent(roomId, event)) return;
-		runMonitorTask(`room message handler room=${roomId} id=${event.event_id ?? "unknown"}`, async () => {
+	const dispatchRoomMessage = (label, roomId, event) => {
+		runMonitorTask(`${label} room=${roomId} id=${event.event_id ?? "unknown"}`, async () => {
 			await onRoomMessage(roomId, event);
 		});
 	};
+	const onRoomMessageEvent = (roomId, event) => {
+		if (routeVerificationEvent(roomId, event)) return;
+		dispatchRoomMessage("room message handler", roomId, event);
+	};
 	const onEncryptedEvent = (roomId, event) => {
 		const eventId = event?.event_id ?? "unknown";
 		const eventType = event?.type ?? "unknown";
@@ -1186,9 +1175,7 @@ function registerMatrixMonitorEvents(params) {
 		logVerboseMessage(`matrix: decrypted event room=${roomId} type=${eventType} id=${eventId}`);
 		if (routeVerificationEvent(roomId, event)) return;
 		if (eventType !== EventType.RoomMessage) return;
-		runMonitorTask(`decrypted room message handler room=${roomId} id=${event.event_id ?? "unknown"}`, async () => {
-			await onRoomMessage(roomId, event);
-		});
+		dispatchRoomMessage("decrypted room message handler", roomId, event);
 	};
 	const onFailedDecryption = (roomId, event, error) => {
 		runMonitorTask(`failed decryption handler room=${roomId} id=${event.event_id ?? "unknown"}`, async () => {
@@ -1335,9 +1322,7 @@ function registerMatrixMonitorEvents(params) {
 			logVerboseMessage(`matrix: member event room=${roomId} stateKey=${stateKey} membership=${membership ?? "unknown"}`);
 		}
 		if (eventType === EventType.Reaction) {
-			runMonitorTask(`reaction handler room=${roomId} id=${event.event_id ?? "unknown"}`, async () => {
-				await onRoomMessage(roomId, event);
-			});
+			dispatchRoomMessage("reaction handler", roomId, event);
 			return;
 		}
 		routeVerificationEvent(roomId, event);
@@ -1496,7 +1481,17 @@ function hasBundledMatrixReplacementRelation(event) {
 	return relations[RelationType.Replace] !== void 0;
 }
 function resolveMatrixInboundBodyText(params) {
-	if (params.mediaPlaceholder) return params.rawBody || params.mediaPlaceholder;
+	if (params.mediaPlaceholder) {
+		if (params.filename?.trim()) {
+			const attachment = resolveMatrixMessageAttachment({
+				body: params.rawBody,
+				filename: params.filename,
+				msgtype: params.msgtype
+			});
+			if (attachment && !attachment.caption) return params.mediaPlaceholder;
+		}
+		return params.rawBody || params.mediaPlaceholder;
+	}
 	if (!params.mediaDownloadFailed || !params.hadMediaUrl) return params.rawBody;
 	return formatMatrixMessageText({
 		body: params.rawBody,
@@ -1579,11 +1574,11 @@ function formatMatrixToolProgressMarkdownCode(text) {
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler-runtime.ts
-const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-B1Y2L4wj.mjs").then((n) => n.s));
+const loadMatrixSendModule = createLazyRuntimeModule(() => import("./send-LCOuTVc1.mjs").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-Cqq46xsG.mjs"));
-const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-B87DfA6a.mjs"));
+const loadMatrixReactionEvents = createLazyRuntimeModule(() => import("./reaction-events-CTSvOlXO.mjs"));
+const loadMatrixDraftStream = createLazyRuntimeModule(() => import("./draft-stream-Bdrh7dRt.mjs"));
 async function matrixTextWouldActivateMentions(client, text) {
 	const { resolveMatrixMentionsForBody } = await loadMatrixSendModule();
 	const mentions = await resolveMatrixMentionsForBody({
@@ -1596,7 +1591,7 @@ async function matrixTextWouldActivateMentions(client, text) {
 //#region extensions/matrix/src/matrix/monitor/handler-context.ts
 async function resolveMatrixInboundContext(config) {
 	const { handler, ingress, roomId, event, eventTs, resolveThreadContext, resolveReplyContext, senderId, sharedDmContextNoticeRooms } = config;
-	const { client, core, accountId, runtime, logVerboseMessage, groupPolicy, getRoomInfo, historyLimit, dmSessionScope, resolveStorePath: resolveStorePathImpl, createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl, finalizeInboundContext } = handler;
+	const { client, core, accountId, runtime, logVerboseMessage, groupPolicy, getRoomInfo, historyLimit, dmSessionScope, resolveStorePath: resolveStorePathImpl, createChannelInboundEnvelopeBuilderAsync: createChannelInboundEnvelopeBuilderImpl, finalizeInboundContext } = handler;
 	const { cfg, resolveMessageIngress, route: _route, isDirectMessage, isRoom, effectiveRoomUsers, effectiveGroupAllowFrom, threadRootId, thread, senderName, bodyText, commandBodyText, roomConfig, messageId, inboundHistory, wasMentioned, effectiveWasMentioned, shouldBypassMention, canDetectMention, shouldRequireMention, commandAuthorized, locationPayload, media, preflightAudioTranscript, hasExplicitSessionBinding } = ingress;
 	const contextVisibilityMode = resolveChannelContextVisibilityMode({
 		cfg,
@@ -1645,7 +1640,7 @@ async function resolveMatrixInboundContext(config) {
 	const envelopeFrom = isDirectMessage ? senderName : roomName ?? roomId;
 	const textWithId = `${bodyText}\n[matrix event id: ${messageId} room: ${roomId}]`;
 	const storePath = resolveStorePathImpl(cfg.session?.store, { agentId: _route.agentId });
-	const buildEnvelope = createChannelInboundEnvelopeBuilderImpl({
+	const buildEnvelope = await createChannelInboundEnvelopeBuilderImpl({
 		cfg,
 		route: _route
 	});
@@ -1815,7 +1810,6 @@ async function createMatrixDraftController(params) {
 	let currentDraftBlockOffset = 0;
 	let latestDraftFullText = "";
 	const pendingDraftBoundaries = [];
-	const latestQueuedDraftBoundaryOffsets = /* @__PURE__ */ new Map();
 	let currentDraftReplyToId = draftReplyToId;
 	const progressConfigEntry = accountConfig ?? cfg.channels?.matrix;
 	const progressSeed = `${accountId}:${roomId}`;
@@ -1874,8 +1868,7 @@ async function createMatrixDraftController(params) {
 	const queueDraftBlockBoundary = (payload, context) => {
 		const payloadTextLength = payload.text?.length ?? 0;
 		const messageGeneration = context?.assistantMessageIndex ?? currentDraftMessageGeneration;
-		const nextDraftBoundaryOffset = (latestQueuedDraftBoundaryOffsets.get(messageGeneration) ?? 0) + payloadTextLength;
-		latestQueuedDraftBoundaryOffsets.set(messageGeneration, nextDraftBoundaryOffset);
+		const nextDraftBoundaryOffset = (pendingDraftBoundaries.findLast((entry) => entry.messageGeneration === messageGeneration)?.endOffset ?? 0) + payloadTextLength;
 		pendingDraftBoundaries.push({
 			messageGeneration,
 			endOffset: nextDraftBoundaryOffset
@@ -1884,7 +1877,6 @@ async function createMatrixDraftController(params) {
 	const advanceDraftBlockBoundary = (options) => {
 		const completedBoundary = pendingDraftBoundaries.shift();
 		if (completedBoundary) {
-			if (!pendingDraftBoundaries.some((entry) => entry.messageGeneration === completedBoundary.messageGeneration)) latestQueuedDraftBoundaryOffsets.delete(completedBoundary.messageGeneration);
 			if (completedBoundary.messageGeneration === currentDraftMessageGeneration) currentDraftBlockOffset = completedBoundary.endOffset;
 			return;
 		}
@@ -1903,7 +1895,6 @@ async function createMatrixDraftController(params) {
 		currentDraftBlockOffset = 0;
 		latestDraftFullText = "";
 		pendingDraftBoundaries.length = 0;
-		latestQueuedDraftBoundaryOffsets.clear();
 		currentDraftReplyToId = draftReplyToId;
 		progressDraft.beginNewTurn({ force: true });
 	};
@@ -2512,7 +2503,7 @@ function resolveMentions(params) {
 async function resolveMatrixIngressContent(config) {
 	const { handler, params: paramsLocal, access, roomId, event, eventType, isPollEvent, eventTs, senderId, roomHistoryTracker, resolveThreadContext, commitInboundEventIfClaimed } = config;
 	const { client, core, accountId, accountConfig, logger, logVerboseMessage, historyLimit, mediaMaxBytes, dmSessionScope, getMemberDisplayName } = handler;
-	const { cfg, liveDmAllowFrom, 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 { cfg, content: accessContent, messageId, audioPreflightMode, isDirectMessage, isRoom, locationPayload, reservedHistorySlot, threadRootId, thread, historyThreadId, discardReservedHistorySlot, markReservedHistorySlotConsumed, commitInboundEventIfClaimedAndDiscardReserved, roomConfig, allowBotsMode, isConfiguredBotSender, selfUserId, roomMatchMeta, getSenderName, accessState } = access;
 	const { resolveMessageIngress } = accessState;
 	let content = accessContent;
 	let pollSnapshotPromise = null;
@@ -2779,39 +2770,29 @@ async function resolveMatrixIngressContent(config) {
 		messageId
 	}, historyThreadId, reservedHistorySlot) : void 0;
 	if (reservedHistorySlot && preparedTrigger) markReservedHistorySlotConsumed();
+	const inboundHistory = preparedTrigger ? buildInboundHistoryFromEntries({
+		entries: preparedTrigger.history,
+		limit: historyLimit
+	}) : void 0;
 	return {
-		cfg,
-		liveDmAllowFrom,
+		...access,
 		resolveMessageIngress,
 		route: _route,
 		hasExplicitSessionBinding,
-		roomConfig,
-		isDirectMessage,
-		isRoom,
 		shouldRequireMention,
 		wasMentioned,
 		effectiveWasMentioned,
 		shouldBypassMention,
 		canDetectMention,
 		commandAuthorized,
-		inboundHistory: preparedTrigger ? buildInboundHistoryFromEntries({
-			entries: preparedTrigger.history,
-			limit: historyLimit
-		}) : void 0,
+		inboundHistory,
 		senderName,
 		bodyText,
 		commandBodyText,
 		media,
 		preflightAudioTranscript,
-		locationPayload,
-		messageId,
 		triggerSnapshot: preparedTrigger,
-		threadRootId,
-		threadContext,
-		thread,
-		botLoopProtection,
-		effectiveGroupAllowFrom,
-		effectiveRoomUsers
+		threadContext
 	};
 }
 //#endregion
@@ -2824,10 +2805,8 @@ function decodeGeoUriParamValue(value) {
 	}
 }
 function parseGeoUri(value) {
-	const trimmed = value.trim();
-	if (!trimmed) return null;
-	if (!normalizeLowercaseStringOrEmpty(trimmed).startsWith("geo:")) return null;
-	const [coordsPart, ...paramParts] = trimmed.slice(4).split(";");
+	if (!value.toLowerCase().startsWith("geo:")) return null;
+	const [coordsPart, ...paramParts] = value.slice(4).split(";");
 	if (!coordsPart) return null;
 	const coords = coordsPart.split(",");
 	if (coords.length < 2) return null;
@@ -2877,12 +2856,12 @@ function resolveMatrixLocation(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler-ingress-prefix.ts
 async function readMatrixIngressPrefix(config) {
-	const { client, senderId, dropPreStartupMessages, eventTs, eventAge, startupMs, startupGraceMs, event, eventType, eventId, inboundDeduper, roomId, logVerboseMessage, directTracker, claimInboundReplay } = config;
+	const { client, senderId, dropPreStartupMessages, eventTs, eventAge, startupMs, event, eventType, eventId, inboundDeduper, roomId, logVerboseMessage, directTracker, claimInboundReplay } = config;
 	const selfUserId = await client.getUserId();
 	if (senderId === selfUserId) return;
 	if (dropPreStartupMessages) {
-		if (typeof eventTs === "number" && eventTs < startupMs - startupGraceMs) return;
-		if (typeof eventTs !== "number" && typeof eventAge === "number" && eventAge > startupGraceMs) return;
+		if (typeof eventTs === "number" && eventTs < startupMs) return;
+		if (typeof eventTs !== "number" && typeof eventAge === "number" && eventAge > 0) return;
 	}
 	const content = event.content;
 	if (eventType === EventType.RoomMessage && isMatrixVerificationRoomMessage({
@@ -2952,13 +2931,6 @@ function toMatrixPartialDeliveryError(error, settled) {
 		visibleReplySent: true
 	}) : error;
 }
-function createMatrixReplyDeliveryResult(results) {
-	if (results.length === 0) return mergeMatrixReplyDeliveryResults([]);
-	return createAcceptedChannelDeliveryResult({
-		results: results.map((result) => ({ receipt: result.receipt })),
-		content: joinMatrixVisibleContent(results.map((result) => result.content))
-	});
-}
 function resolveVisibleMatrixReplyText(text) {
 	if (typeof text !== "string") return;
 	const trimmedStart = text.trimStart();
@@ -2976,7 +2948,7 @@ async function deliverMatrixReplies(params) {
 		if (core.logging.shouldLogVerbose()) params.runtime.log?.(message);
 	};
 	const hasRepliedRef = params.hasRepliedRef ?? { value: false };
-	const acceptedResults = [];
+	const accepted = createChannelDeliveryAccumulator();
 	try {
 		for (const reply of params.replies) {
 			const visibleText = resolveVisibleMatrixReplyText(reply.text);
@@ -2998,7 +2970,7 @@ async function deliverMatrixReplies(params) {
 			const replyToIdForReply = explicitReplyToId || (!params.threadId && params.replyToMode !== "off" && (params.replyToMode === "all" || !hasRepliedRef.value) ? (reply.replyToId ?? params.replyToId)?.trim() : void 0);
 			const fallbackReplyToId = params.threadId ? (reply.replyToId ?? params.replyToId)?.trim() : void 0;
 			const onDeliveryResult = (result) => {
-				acceptedResults.push(result);
+				accepted.add({ receipt: result.receipt }, result.content);
 				if (replyToIdForReply) hasRepliedRef.value = true;
 			};
 			const extraContent = resolveMatrixExtraContent(reply);
@@ -3020,9 +2992,9 @@ async function deliverMatrixReplies(params) {
 			});
 		}
 	} catch (error) {
-		throw toMatrixPartialDeliveryError(error, [createMatrixReplyDeliveryResult(acceptedResults)]);
+		throw toMatrixPartialDeliveryError(error, [accepted.result()]);
 	}
-	return createMatrixReplyDeliveryResult(acceptedResults);
+	return accepted.result();
 }
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/handler-reply-dispatcher.ts
@@ -3248,7 +3220,7 @@ function createMatrixHandlerState(config) {
 const SESSION_RESTART_RECOVERY_TOMBSTONE_ERROR_CODE = "SESSION_RESTART_RECOVERY_TOMBSTONE";
 const RESTART_RECOVERY_TOMBSTONE_NOTICE = "This session ended during gateway restart recovery and cannot accept more messages. Send /new or /reset to start a replacement session.";
 function createMatrixRoomMessageHandler(params) {
-	const { client, core, cfg: startupConfig, accountId, runtime, logger, logVerboseMessage, allowFromResolvedEntries = [], groupAllowFromResolvedEntries = [], configuredBotUserIds = /* @__PURE__ */ new Set(), replyToMode, streaming, previewToolProgressEnabled, blockStreamingEnabled, historyLimit, startupMs, startupGraceMs, dropPreStartupMessages, inboundDeduper, directTracker, getMemberDisplayName, resolveLiveUserAllowlist = resolveMatrixMonitorLiveUserAllowlist, resolveStorePath: resolveStorePathImpl = resolveStorePath, createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl = createChannelInboundEnvelopeBuilder, resolveHumanDelayConfig: resolveHumanDelayConfigImpl = resolveHumanDelayConfig } = params;
+	const { client, core, cfg: startupConfig, accountId, runtime, logger, logVerboseMessage, allowFromResolvedEntries = [], groupAllowFromResolvedEntries = [], configuredBotUserIds = /* @__PURE__ */ new Set(), replyToMode, streaming, previewToolProgressEnabled, blockStreamingEnabled, historyLimit, startupMs, dropPreStartupMessages, inboundDeduper, directTracker, getMemberDisplayName, resolveLiveUserAllowlist = resolveMatrixMonitorLiveUserAllowlist, resolveStorePath: resolveStorePathImpl = resolveStorePath, createChannelInboundEnvelopeBuilderAsync: createChannelInboundEnvelopeBuilderImpl = createChannelInboundEnvelopeBuilderAsync, resolveHumanDelayConfig: resolveHumanDelayConfigImpl = resolveHumanDelayConfig } = params;
 	const handlerConfig = {
 		...params,
 		allowFromResolvedEntries,
@@ -3256,7 +3228,7 @@ function createMatrixRoomMessageHandler(params) {
 		configuredBotUserIds,
 		resolveLiveUserAllowlist,
 		resolveStorePath: resolveStorePathImpl,
-		createChannelInboundEnvelopeBuilder: createChannelInboundEnvelopeBuilderImpl,
+		createChannelInboundEnvelopeBuilderAsync: createChannelInboundEnvelopeBuilderImpl,
 		resolveHumanDelayConfig: resolveHumanDelayConfigImpl
 	};
 	const handlerState = createMatrixHandlerState({
@@ -3313,7 +3285,6 @@ function createMatrixRoomMessageHandler(params) {
 				eventTs: eventTs ?? void 0,
 				eventAge: eventAge ?? void 0,
 				startupMs,
-				startupGraceMs,
 				event,
 				eventType,
 				eventId,
@@ -3325,35 +3296,32 @@ function createMatrixRoomMessageHandler(params) {
 					inboundReplayClaim = handle;
 				}
 			});
+			const ingressContext = {
+				handler: handlerConfig,
+				roomId,
+				event,
+				eventTs: eventTs ?? void 0,
+				senderId,
+				roomHistoryTracker,
+				commitInboundEventIfClaimed
+			};
 			const continueIngress = async (paramsLocal) => {
 				const access = await resolveMatrixIngressAccess({
-					handler: handlerConfig,
+					...ingressContext,
 					params: paramsLocal,
-					roomId,
-					event,
-					eventTs: eventTs ?? void 0,
-					senderId,
 					isReactionEvent,
 					readStoreAllowFrom: handlerState.readStoreAllowFrom,
 					shouldSendPairingReply: handlerState.shouldSendPairingReply,
-					resolveLiveAccountAllowlists: handlerState.resolveLiveAccountAllowlists,
-					roomHistoryTracker,
-					commitInboundEventIfClaimed
+					resolveLiveAccountAllowlists: handlerState.resolveLiveAccountAllowlists
 				});
 				if (!access) return;
 				return await resolveMatrixIngressContent({
-					handler: handlerConfig,
+					...ingressContext,
 					params: paramsLocal,
 					access,
-					roomId,
-					event,
 					eventType,
 					isPollEvent,
-					eventTs: eventTs ?? void 0,
-					senderId,
-					roomHistoryTracker,
-					resolveThreadContext,
-					commitInboundEventIfClaimed
+					resolveThreadContext
 				});
 			};
 			const ingressResult = historyLimit > 0 ? await roomIngressQueue.enqueue(roomId, async () => {
@@ -3378,14 +3346,10 @@ function createMatrixRoomMessageHandler(params) {
 			if ("deferredPrefix" in resolvedIngressResult) return;
 			const { cfg, liveDmAllowFrom, route: _route, roomConfig, isDirectMessage, isRoom, bodyText, messageId, triggerSnapshot, threadRootId, thread, botLoopProtection } = resolvedIngressResult;
 			const inboundContext = await resolveMatrixInboundContext({
-				handler: handlerConfig,
+				...ingressContext,
 				ingress: resolvedIngressResult,
-				roomId,
-				event,
-				eventTs: eventTs ?? void 0,
 				resolveThreadContext,
 				resolveReplyContext,
-				senderId,
 				sharedDmContextNoticeRooms
 			});
 			if (!inboundContext) return;
@@ -3397,33 +3361,24 @@ function createMatrixRoomMessageHandler(params) {
 				channel: "matrix",
 				accountId: _route.accountId
 			});
+			const sendTyping = async (isTyping) => {
+				const { sendTypingMatrix } = await loadMatrixSendModule();
+				await sendTypingMatrix(roomId, isTyping, { client });
+			};
+			const onTypingError = (action, error) => {
+				logTypingFailure({
+					log: logVerboseMessage,
+					channel: "matrix",
+					action,
+					target: roomId,
+					error
+				});
+			};
 			const typingCallbacks = createTypingCallbacks({
-				start: async () => {
-					const { sendTypingMatrix } = await loadMatrixSendModule();
-					await sendTypingMatrix(roomId, true, { client });
-				},
-				stop: async () => {
-					const { sendTypingMatrix } = await loadMatrixSendModule();
-					await sendTypingMatrix(roomId, false, { client });
-				},
-				onStartError: (err) => {
-					logTypingFailure({
-						log: logVerboseMessage,
-						channel: "matrix",
-						action: "start",
-						target: roomId,
-						error: err
-					});
-				},
-				onStopError: (err) => {
-					logTypingFailure({
-						log: logVerboseMessage,
-						channel: "matrix",
-						action: "stop",
-						target: roomId,
-						error: err
-					});
-				}
+				start: () => sendTyping(true),
+				stop: () => sendTyping(false),
+				onStartError: (err) => onTypingError("start", err),
+				onStopError: (err) => onTypingError("stop", err)
 			});
 			const hookRunner = getGlobalHookRunner();
 			const allowProviderPreview = !((hookRunner?.hasHooks("reply_payload_sending") ?? false) || (hookRunner?.hasHooks("message_sending") ?? false));
@@ -3604,13 +3559,9 @@ function createMatrixRoomMessageHandler(params) {
 			}
 			const { dispatchResult } = turnResult;
 			const { queuedFinal } = dispatchResult;
-			if (draftController.previewLifecycle.finalFailed) {
-				logVerboseMessage(`matrix: final reply delivery failed room=${roomId} id=${messageId}; keeping replay committed`);
-				await commitInboundEventIfClaimed();
-				return;
-			}
-			if (!queuedFinal && replyDispatcher.nonFinalReplyDeliveryFailed()) {
-				logVerboseMessage(`matrix: non-final reply delivery failed room=${roomId} id=${messageId}; keeping replay committed`);
+			const failedDeliveryKind = draftController.previewLifecycle.finalFailed ? "final" : !queuedFinal && replyDispatcher.nonFinalReplyDeliveryFailed() ? "non-final" : void 0;
+			if (failedDeliveryKind) {
+				logVerboseMessage(`matrix: ${failedDeliveryKind} reply delivery failed room=${roomId} id=${messageId}; keeping replay committed`);
 				await commitInboundEventIfClaimed();
 				return;
 			}
@@ -3652,10 +3603,10 @@ function shouldPromoteRecentInviteRoom(params) {
 //#endregion
 //#region extensions/matrix/src/matrix/monitor/startup.ts
 const loadMatrixStartupMaintenanceDeps = createLazyRuntimeModule(() => Promise.all([
-	import("./config-update-CZndPxNd.mjs").then((n) => n.t),
+	import("./setup-core-CKnNTfgD.mjs").then((n) => n.f),
 	import("./device-health-Be60VF1w.mjs").then((n) => n.t),
-	import("./profile-DS0xdJAi.mjs").then((n) => n.n),
-	import("./startup-verification-D00eUt74.mjs")
+	import("./setup-core-CKnNTfgD.mjs").then((n) => n.u),
+	import("./startup-verification-CgfUb4yJ.mjs")
 ]).then(([configUpdateModule, deviceHealthModule, profileModule, startupVerificationModule]) => ({
 	updateMatrixAccountConfig: configUpdateModule.updateMatrixAccountConfig,
 	summarizeMatrixDeviceHealth: deviceHealthModule.summarizeMatrixDeviceHealth,
@@ -4035,7 +3986,6 @@ async function monitorMatrixProvider(opts = {}) {
 	const previewToolProgressEnabled = resolveMatrixPreviewToolProgressEnabled(accountConfig.streaming);
 	const blockStreamingEnabled = resolveChannelStreamingBlockEnabled(accountConfig) === true;
 	const startupMs = Date.now();
-	const startupGraceMs = 0;
 	const warnedEncryptedRooms = /* @__PURE__ */ new Set();
 	const warnedCryptoMissingRooms = /* @__PURE__ */ new Set();
 	let healthySyncSinceMs;
@@ -4154,7 +4104,6 @@ async function monitorMatrixProvider(opts = {}) {
 			mediaMaxBytes,
 			historyLimit,
 			startupMs,
-			startupGraceMs,
 			dropPreStartupMessages,
 			inboundDeduper,
 			directTracker,
@@ -4201,7 +4150,6 @@ async function monitorMatrixProvider(opts = {}) {
 			warnedEncryptedRooms,
 			warnedCryptoMissingRooms,
 			logger,
-			startupGraceMs,
 			getHealthySyncSinceMs: () => healthySyncSinceMs,
 			formatNativeDependencyHint: core.system.formatNativeDependencyHint,
 			onRoomMessage: handleRoomMessage,
@@ -4264,11 +4212,7 @@ async function monitorMatrixProvider(opts = {}) {
 		}), syncLifecycle.waitForFatalStop()]);
 		await cleanup();
 	} catch (err) {
-		if (monitorSetupClosed) {
-			await cleanup("stop");
-			return;
-		}
-		if (monitorLifecycleSignal?.aborted === true && isMatrixStartupAbortError(err)) {
+		if (monitorSetupClosed || monitorLifecycleSignal?.aborted && isMatrixStartupAbortError(err)) {
 			await cleanup("stop");
 			return;
 		}