@openclaw/imessage 2026.9.6 → 2026.9.7

package/dist/.setup/{monitor-BJ3Ozi6I.mjs → monitor-fv9nRuTH.mjs}

@@ -1,15 +1,15 @@
-import { c as parseIMessageTarget, o as normalizeIMessageHandle, r as isAllowedIMessageReplyContextSender, s as parseIMessageAllowTarget, t as formatIMessageChatTarget } from "./targets-Cc9vthzI.mjs";
-import { d as resolveIMessageChatDbLookupPath, f as resolveIMessageHomeDir, l as resolveIMessageRemoteHost, o as resolveIMessageAccount } from "./accounts-CUxZrTcY.mjs";
-import { r as imessageRpcSupportsMethod } from "./message-tool-api-pvlcOJPG.mjs";
-import { b as resolveIMessageDirectChatService, d as isKnownFromMeIMessageMessageId, f as rememberIMessageReplyCache, o as createIMessageRpcClient, r as sanitizeOutboundText } from "./sanitize-outbound-sJPF2DVM.mjs";
-import { d as probeIMessage, f as probeIMessagePrivateApi, i as resolveIMessageInboundConversationId, n as resolveIMessageGroupSystemPrompt } from "./group-policy-Cjztkquv.mjs";
+import { c as parseIMessageTarget, o as normalizeIMessageHandle, r as isAllowedIMessageReplyContextSender, s as parseIMessageAllowTarget, t as formatIMessageChatTarget } from "./targets-BicBiYsM.mjs";
+import { d as resolveIMessageChatDbLookupPath, f as resolveIMessageHomeDir, l as resolveIMessageRemoteHost, o as resolveIMessageAccount } from "./accounts-nzcU0cq2.mjs";
+import { r as imessageRpcSupportsMethod } from "./message-tool-api-D032l82H.mjs";
+import { D as resolveIMessageDirectChatService, b as resolveIMessageEchoMediaKey, d as isKnownFromMeIMessageTarget, f as rememberIMessageReplyCache, h as IMESSAGE_CATCHUP_CURSOR_NAMESPACE, o as createIMessageRpcClient, r as sanitizeOutboundText, v as capFailureRetriesMap, y as resolveIMessageCatchupCursorKey } from "./sanitize-outbound-3MLljgtY.mjs";
+import { d as probeIMessage, f as probeIMessagePrivateApi, i as resolveIMessageInboundConversationId, n as resolveIMessageGroupSystemPrompt } from "./group-policy-90pw4tyG.mjs";
 import { t as getIMessageRuntime } from "./runtime-Cza4CY5T.mjs";
-import { d as resolveIMessageEchoMediaKey, l as capFailureRetriesMap, t as IMESSAGE_CATCHUP_CURSOR_NAMESPACE, u as resolveIMessageCatchupCursorKey } from "./state-contract-DvahEY4X.mjs";
-import { n as resolveIMessageAttachmentRoots, r as resolveIMessageRemoteAttachmentRoots } from "./media-contract-DKJK7rh3.mjs";
-import { i as registerIMessageApprovalReactionTarget, n as handleIMessageApprovalReaction, o as listPendingIMessageApprovalReactionPollTargets, r as maybeResolveIMessageApprovalReaction, s as buildIMessageApprovalConversationKeyForInbound } from "./approval-reactions-D6RFg6lU.mjs";
-import { c as maybeResolveIMessageApprovalPollVote, i as resolveIMessageStartupRowidWatermark, l as iMessageApprovalControlBindings, n as hasPersistedIMessageEcho, r as stripLeadingEchoTextCorruptionMarkers, t as sendMessageIMessage } from "./send-odAfTQ2J.mjs";
+import { n as resolveIMessageAttachmentRoots, r as resolveIMessageRemoteAttachmentRoots } from "./media-contract-CagwSMvo.mjs";
+import { i as registerIMessageApprovalReactionTarget, n as handleIMessageApprovalReaction, o as listPendingIMessageApprovalReactionPollTargets, r as maybeResolveIMessageApprovalReaction, s as buildIMessageApprovalConversationKeyForInbound } from "./approval-reactions-Bp33xc83.mjs";
+import { c as iMessageApprovalControlBindings, n as hasPersistedIMessageEcho, r as normalizeIMessageEchoText, s as maybeResolveIMessageApprovalPollVote, t as sendMessageIMessage } from "./send-Cu9nl757.mjs";
 import { n as normalizeIMessageGuid, t as resolveIMessageReactionContext } from "./reaction-context-Br-vAJFp.mjs";
-import { n as maybeResolveIMessageQuestionReaction, t as hasIMessageQuestionReactionTarget } from "./question-reactions-lm8OxWbb.mjs";
+import { i as resolveIMessageStartupRowidWatermark } from "./remote-file-DRPCaVmg.mjs";
+import { n as maybeResolveIMessageQuestionReaction, t as hasIMessageQuestionReactionTarget } from "./question-reactions-Cy-dmU_j.mjs";
 import { asSafeIntegerInRange, hasNonEmptyString, isRecord, normalizeOptionalString, normalizeStringEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { bindIngressLifecycleToReplyOptions, createChannelIngressError, createChannelIngressMonitor, createChannelMessageReplyPipeline, resolveChannelStreamingBlockEnabled } from "openclaw/plugin-sdk/channel-outbound";
 import { resolveTextChunkLimit } from "openclaw/plugin-sdk/reply-runtime";
@@ -24,8 +24,8 @@ import { createHash } from "node:crypto";
 import { createRuntimeConfigReader, getRuntimeConfig } from "openclaw/plugin-sdk/runtime-config-snapshot";
 import { sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { collectErrorGraphCandidates, formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
-import { buildChannelGroupsScopeTree, resolveChannelGroupPolicy, resolveChannelGroups, resolveChannelGroupsConfigPath, resolveScopeRequireMention } from "openclaw/plugin-sdk/channel-policy";
-import { convertMarkdownTables as convertMarkdownTables$1, findCodeRegions, isInsideCode, sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
+import { resolveChannelGroupPolicy, resolveChannelGroups, resolveChannelGroupsConfigPath, resolveScopeRequireMention } from "openclaw/plugin-sdk/channel-policy";
+import { convertMarkdownTables, findCodeRegions, isInsideCode, sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
 import { buildChannelInboundEventContext, buildMentionRegexes, createAcceptedChannelDeliveryResult, createChannelInboundDebouncer, createChannelPartialDeliveryError, filterChannelInboundQuoteContext, formatInboundEnvelope, formatInboundFromLabel, formatInboundMediaUnavailableText, formatMediaPlaceholderText, isChannelPartialDeliveryError, logInboundDrop, matchesMentionPatterns, resolveEnvelopeFormatOptions, resolveInboundDebounceMs, resolveInboundMentionDecision, resolveInboundSupplementalSenderAllowed, runChannelInboundEvent, shouldDebounceTextInbound, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
 import { resolveAgentConfig, resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-runtime";
@@ -33,7 +33,7 @@ import { logTypingFailure } from "openclaw/plugin-sdk/channel-feedback";
 import { defineStableChannelIngressIdentity, fanInChannelIngressLifecycles } from "openclaw/plugin-sdk/channel-ingress-runtime";
 import { createChannelPairingChallengeIssuer } from "openclaw/plugin-sdk/channel-pairing";
 import { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runtime-context";
-import { ensureConfiguredBindingRouteReady, readChannelAllowFromStore, resolveConfiguredBindingRoute, resolveRuntimeConversationBindingRoute, upsertChannelPairingRequest } from "openclaw/plugin-sdk/conversation-runtime";
+import { ensureConfiguredBindingRouteReady, readChannelAllowFromStore, upsertChannelPairingRequest } from "openclaw/plugin-sdk/conversation-runtime";
 import { channelReadyPatch } from "openclaw/plugin-sdk/gateway-runtime";
 import { redactIdentifier } from "openclaw/plugin-sdk/logging-core";
 import { resolveDefaultGroupPolicy, resolveOpenProviderRuntimeGroupPolicy, warnMissingProviderGroupPolicyFallbackOnce } from "openclaw/plugin-sdk/runtime-group-policy";
@@ -41,15 +41,16 @@ import { FsSafeError, openLocalFileSafely, resolvePinnedMainDmOwnerFromAllowlist
 import { getSessionEntry, readSessionUpdatedAt, resolveSendPolicy, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { waitForTransportReady } from "openclaw/plugin-sdk/transport-ready-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
-import { resolveMarkdownTableMode as resolveMarkdownTableMode$1 } from "openclaw/plugin-sdk/markdown-table-runtime";
+import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { resolvePreferredOpenClawTmpDir, withTempWorkspace } from "openclaw/plugin-sdk/temp-path";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
+import { chunkMarkdownTextWithMode, resolveChunkMode } from "openclaw/plugin-sdk/reply-chunking";
 import { deliverTextOrMediaReply, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
-import { chunkMarkdownTextWithMode as chunkTextWithMode, resolveChunkMode } from "openclaw/plugin-sdk/reply-chunking";
 import { createDedupeCache } from "openclaw/plugin-sdk/dedupe-runtime";
 import { hasControlCommand } from "openclaw/plugin-sdk/command-auth-native";
 import { resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
 import { createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
+import { getSessionBindingService, inspectRuntimeConversationBindingRoute, resolveConfiguredBindingRoute } from "openclaw/plugin-sdk/conversation-binding-runtime";
 import { isRecord as isRecord$1 } from "openclaw/plugin-sdk/channel-secret-basic-runtime";
 import { readFileHandleBounded } from "openclaw/plugin-sdk/file-access-runtime";
 import { saveMediaBuffer } from "openclaw/plugin-sdk/media-store";
@@ -72,9 +73,6 @@ function listTargetChatIds(targets) {
 function hasUnscopedTarget(targets) {
 	return targets.some((target) => normalizeChatId(target.conversation.chatId) === null);
 }
-function uniqueChatIds(chatIds) {
-	return [...new Set(chatIds)];
-}
 function enumerateMessageGuidCandidates(value) {
 	const trimmed = value.trim();
 	if (!trimmed) return [];
@@ -153,7 +151,7 @@ async function pollPendingIMessageApprovalReactions(params) {
 	if (targets.length === 0) return;
 	const pendingByMessageId = buildPendingTargetsByMessageId(targets);
 	const explicitChatIds = listTargetChatIds(targets);
-	const chatIds = params.allowRecentChatDiscovery === true && targets.length > 0 && hasUnscopedTarget(targets) ? uniqueChatIds([...explicitChatIds, ...await listRecentChatIds(params.client)]) : explicitChatIds;
+	const chatIds = params.allowRecentChatDiscovery === true && hasUnscopedTarget(targets) ? [.../* @__PURE__ */ new Set([...explicitChatIds, ...await listRecentChatIds(params.client)])] : explicitChatIds;
 	if (chatIds.length === 0) return;
 	for (const chatId of chatIds) {
 		let messages;
@@ -209,9 +207,7 @@ function buildChatTargetParams(to, opts) {
 	else params.to = target.to;
 	return {
 		params,
-		service: opts.service ?? (target.kind === "handle" ? target.service : void 0) ?? account.config.service,
-		region: opts.region?.trim() || account.config.region?.trim() || "US",
-		account
+		service: opts.service ?? (target.kind === "handle" ? target.service : void 0) ?? account.config.service
 	};
 }
 async function runChatAction(method, params, opts) {
@@ -277,15 +273,11 @@ function openCatchupCursorStore() {
 		maxEntries: 256
 	});
 }
-function enqueueCursorWrite(accountId, fn) {
-	const key = resolveIMessageCatchupCursorKey(accountId);
-	return cursorWriteQueue.enqueue(key, fn);
-}
 function sanitizeFailureRetriesInput(raw) {
 	if (!raw || typeof raw !== "object") return {};
 	const out = {};
 	for (const [guid, count] of Object.entries(raw)) {
-		if (!guid || typeof guid !== "string") continue;
+		if (!guid) continue;
 		if (typeof count !== "number" || !Number.isFinite(count) || count <= 0) continue;
 		out[guid] = Math.floor(count);
 	}
@@ -347,14 +339,17 @@ function decideCatchupCursorSave(existingValue, cursor, allowCursorRewindForRetr
 async function saveIMessageCatchupCursor(accountId, next, options = {}) {
 	const cursor = buildIMessageCatchupCursor(next, Date.now());
 	const allowCursorRewindForRetries = options.allowCursorRewindForRetries === true;
+	await updateIMessageCatchupCursor(accountId, (existing) => decideCatchupCursorSave(existing, cursor, allowCursorRewindForRetries));
+}
+async function updateIMessageCatchupCursor(accountId, decide) {
 	const store = openCatchupCursorStore();
 	if (!store.observe || !store.compareAndApply) throw new Error("iMessage catchup cursor persistence requires plugin-state comparison support.");
 	const key = resolveIMessageCatchupCursorKey(accountId);
 	let observation = await store.observe(key);
 	for (;;) {
-		const intent = decideCatchupCursorSave(observation.value, cursor, allowCursorRewindForRetries);
+		const intent = decide(observation.value);
 		const result = await store.compareAndApply(key, observation.comparison, intent);
-		if (result.status !== "conflict") return;
+		if (result.status !== "conflict") return result.status === "applied";
 		observation = result.current;
 	}
 }
@@ -395,32 +390,12 @@ function decideLiveCatchupCursorAdvance(existingValue, next, maxFailureRetries)
 }
 async function advanceIMessageCatchupCursor(accountId, next, config) {
 	if (!Number.isFinite(next.lastSeenMs) || !Number.isFinite(next.lastSeenRowid)) return false;
-	return await enqueueCursorWrite(accountId, async () => {
+	return await cursorWriteQueue.enqueue(resolveIMessageCatchupCursorKey(accountId), async () => {
 		const cursor = buildIMessageCatchupCursor(next, Date.now());
 		const maxFailureRetries = config.maxFailureRetries;
-		const store = openCatchupCursorStore();
-		if (!store.observe || !store.compareAndApply) throw new Error("iMessage catchup cursor persistence requires plugin-state comparison support.");
-		const key = resolveIMessageCatchupCursorKey(accountId);
-		let observation = await store.observe(key);
-		for (;;) {
-			const intent = decideLiveCatchupCursorAdvance(observation.value, cursor, maxFailureRetries);
-			const result = await store.compareAndApply(key, observation.comparison, intent);
-			if (result.status !== "conflict") return result.status === "applied";
-			observation = result.current;
-		}
+		return updateIMessageCatchupCursor(accountId, (existing) => decideLiveCatchupCursorAdvance(existing, cursor, maxFailureRetries));
 	});
 }
-/**
-* One catchup pass. Loads the cursor, fetches `messages.history`, replays
-* each row through `dispatch`, advances the cursor on success / give-up,
-* persists the cursor, returns a summary.
-*
-* The fetch and dispatch functions are injected so this loop is unit-testable
-* without standing up an `imsg` daemon. The wiring in `monitor-provider.ts`
-* passes the live `client.request("messages.history", ...)` adapter as
-* `fetch` and the `evaluateIMessageInbound` + `runChannelInboundEvent`
-* pipeline as `dispatch`.
-*/
 async function performIMessageCatchup(params) {
 	const now = params.now ?? Date.now();
 	const cfg = params.config;
@@ -755,13 +730,8 @@ async function runIMessageCatchup(params) {
 			warnLog(`imessage catchup: missing payload for guid=${row.guid}, skipping`);
 			return { ok: false };
 		}
-		try {
-			await dispatchPayload(entry.message, entry.rawEnvelope);
-			return { ok: true };
-		} catch (err) {
-			warnLog(`imessage catchup: dispatch threw for guid=${row.guid}: ${String(err)}`);
-			return { ok: false };
-		}
+		await dispatchPayload(entry.message, entry.rawEnvelope);
+		return { ok: true };
 	};
 	return await performIMessageCatchup({
 		accountId,
@@ -783,13 +753,6 @@ async function runIMessageCatchup(params) {
 }
 //#endregion
 //#region extensions/imessage/src/monitor/coalesce.ts
-/**
-* Bounds on the merged output when multiple inbound iMessage payloads are
-* folded into one agent turn. Caps each merge so a sender who
-* rapid-fires DMs inside the debounce window cannot amplify the downstream
-* prompt past a safe ceiling. Every source GUID still surfaces via
-* `coalescedMessageGuids` so a future replay path can recognize duplicates.
-*/
 const MAX_COALESCED_TEXT_CHARS = 4e3;
 const MAX_COALESCED_ATTACHMENTS = 20;
 /**
@@ -809,12 +772,8 @@ function combineIMessagePayloads(payloads) {
 	const seenTexts = /* @__PURE__ */ new Set();
 	const textParts = [];
 	const allAttachments = [];
-	const seenGuids = /* @__PURE__ */ new Set();
-	const coalescedMessageGuids = [];
 	let textLength = 0;
 	let latestCreatedAt;
-	let maxRowid = -Infinity;
-	let maxDateMs = -Infinity;
 	let reply;
 	let payloadIndex = 0;
 	for (const payload of payloads) {
@@ -822,14 +781,6 @@ function combineIMessagePayloads(payloads) {
 		payloadIndex += 1;
 		const createdAt = payload.created_at;
 		if (typeof createdAt === "string" && createdAt.length > 0 && (latestCreatedAt === void 0 || createdAt > latestCreatedAt)) latestCreatedAt = createdAt;
-		if (typeof payload.id === "number" && Number.isFinite(payload.id)) maxRowid = Math.max(maxRowid, payload.id);
-		const dateMs = typeof createdAt === "string" ? Date.parse(createdAt) : NaN;
-		if (Number.isFinite(dateMs)) maxDateMs = Math.max(maxDateMs, dateMs);
-		const guid = payload.guid?.trim();
-		if (guid && !seenGuids.has(guid)) {
-			seenGuids.add(guid);
-			coalescedMessageGuids.push(guid);
-		}
 		if (!reply && (payload.thread_originator_guid != null || payload.reply_to_guid != null)) reply = payload;
 		if (!keepContent) continue;
 		const text = textLength <= MAX_COALESCED_TEXT_CHARS ? (payload.text ?? "").trim() : "";
@@ -859,12 +810,7 @@ function combineIMessagePayloads(payloads) {
 		thread_originator_guid: reply.thread_originator_guid ?? null,
 		reply_to_guid: reply.reply_to_guid ?? null,
 		reply_to_text: reply.reply_to_text ?? null,
-		reply_to_sender: reply.reply_to_sender ?? null,
-		coalescedMessageGuids: coalescedMessageGuids.length > 0 ? coalescedMessageGuids : void 0,
-		coalescedCatchupCursor: Number.isFinite(maxRowid) && Number.isFinite(maxDateMs) ? {
-			lastSeenMs: maxDateMs,
-			lastSeenRowid: maxRowid
-		} : void 0
+		reply_to_sender: reply.reply_to_sender ?? null
 	};
 }
 //#endregion
@@ -912,20 +858,6 @@ function projectionConflictKey(projection) {
 		is_from_me: projection.is_from_me
 	});
 }
-function applyAuthoritativeRecoveryProjection(message, projection) {
-	return {
-		...message,
-		...projection.chat_id !== void 0 ? { chat_id: projection.chat_id } : {},
-		...projection.chat_guid !== void 0 ? { chat_guid: projection.chat_guid } : {},
-		...projection.chat_identifier !== void 0 ? { chat_identifier: projection.chat_identifier } : {},
-		...projection.chat_name !== void 0 ? { chat_name: projection.chat_name } : {},
-		...projection.participants !== void 0 ? { participants: projection.participants } : {},
-		is_group: projection.is_group,
-		sender: projection.sender,
-		destination_caller_id: projection.destination_caller_id ?? null,
-		is_from_me: projection.is_from_me
-	};
-}
 async function repairIMessageConversationAnchor(params) {
 	const { client, message, runtime } = params;
 	if (!isIMessageAnchorless(message)) return message;
@@ -982,12 +914,12 @@ async function repairIMessageConversationAnchor(params) {
 		runtime?.error?.(`imessage: dropping anchorless message GUID=${guid}; recovered authoritative row is from-me`);
 		return null;
 	}
-	const repaired = applyAuthoritativeRecoveryProjection(message, projection);
-	if (isIMessageAnchorless(repaired)) {
-		runtime?.error?.(`imessage: dropping anchorless message GUID=${guid} after recovery found no usable conversation anchor`);
-		return null;
-	}
-	runtime?.log?.(`imessage: recovered anchorless message GUID=${guid} chat_id=${repaired.chat_id ?? "unknown"} is_group=${repaired.is_group === true}`);
+	const repaired = {
+		...message,
+		...projection,
+		destination_caller_id: projection.destination_caller_id ?? null
+	};
+	runtime?.log?.(`imessage: recovered anchorless message GUID=${guid} chat_id=${repaired.chat_id ?? "unknown"} is_group=${repaired.is_group}`);
 	return repaired;
 }
 //#endregion
@@ -996,14 +928,14 @@ async function deliverIMessageReply(params) {
 	const { payload, target, runtime, maxBytes, textLimit, accountId, sentMessageCache } = params;
 	const scope = `${accountId ?? ""}:${target}`;
 	const { cfg } = params;
-	const tableMode = resolveMarkdownTableMode$1({
+	const tableMode = resolveMarkdownTableMode({
 		cfg,
 		channel: "imessage",
 		accountId
 	});
 	const chunkMode = resolveChunkMode(cfg, "imessage", accountId);
 	const rawText = sanitizeOutboundText(payload.text ?? "");
-	const reply = resolveSendableOutboundReplyParts(payload, { text: convertMarkdownTables$1(rawText, tableMode) });
+	const reply = resolveSendableOutboundReplyParts(payload, { text: convertMarkdownTables(rawText, tableMode) });
 	const accepted = [];
 	const sendAccepted = async (text, mediaUrl) => {
 		const sent = await sendMessageIMessage(target, text, {
@@ -1029,7 +961,7 @@ async function deliverIMessageReply(params) {
 		delivered = await deliverTextOrMediaReply({
 			payload,
 			text: reply.text,
-			chunkText: (value) => chunkTextWithMode(value, textLimit, chunkMode),
+			chunkText: (value) => chunkMarkdownTextWithMode(value, textLimit, chunkMode),
 			sendText: sendAccepted,
 			sendMedia: ({ mediaUrl, caption }) => sendAccepted(caption ?? "", mediaUrl)
 		});
@@ -1153,11 +1085,6 @@ function createIMessageThrottledDropDiagnosticCache() {
 //#region extensions/imessage/src/monitor/echo-cache.ts
 const SENT_MESSAGE_TEXT_TTL_MS = 4e3;
 const SENT_MESSAGE_ID_TTL_MS = 6e4;
-function normalizeEchoTextKey(text) {
-	if (!text) return null;
-	const normalized = stripLeadingEchoTextCorruptionMarkers(text.replace(/\r\n?/g, "\n").trim()).trim();
-	return normalized ? normalized : null;
-}
 function normalizeEchoMessageIdKey(messageId) {
 	if (!messageId) return null;
 	const normalized = messageId.trim();
@@ -1173,7 +1100,7 @@ var DefaultSentMessageCache = class {
 		this.messageIdCache = /* @__PURE__ */ new Map();
 	}
 	remember(scope, lookup) {
-		const textKey = normalizeEchoTextKey(lookup.text);
+		const textKey = normalizeIMessageEchoText(lookup.text);
 		if (textKey) this.textCache.set(`${scope}:${textKey}`, Date.now());
 		const mediaKey = resolveIMessageEchoMediaKey(lookup.media);
 		if (mediaKey) this.mediaCache.set(`${scope}:${mediaKey}`, Date.now());
@@ -1196,7 +1123,7 @@ var DefaultSentMessageCache = class {
 			skipIdShortCircuit: resolvedOptions.skipIdShortCircuit,
 			includePendingText: resolvedOptions.includePendingText
 		})) return true;
-		const textKey = normalizeEchoTextKey(lookup.text);
+		const textKey = normalizeIMessageEchoText(lookup.text);
 		const mediaKey = resolveIMessageEchoMediaKey(lookup.media);
 		const messageIdKey = normalizeEchoMessageIdKey(lookup.messageId);
 		let canUseMediaFallback = !messageIdKey;
@@ -1224,11 +1151,16 @@ var DefaultSentMessageCache = class {
 	}
 	cleanup() {
 		const now = Date.now();
-		for (const [key, timestamp] of this.textCache.entries()) if (now - timestamp > SENT_MESSAGE_TEXT_TTL_MS) this.textCache.delete(key);
-		for (const [key, timestamp] of this.textBackedByIdCache.entries()) if (now - timestamp > SENT_MESSAGE_TEXT_TTL_MS) this.textBackedByIdCache.delete(key);
-		for (const [key, timestamp] of this.mediaCache.entries()) if (now - timestamp > SENT_MESSAGE_TEXT_TTL_MS) this.mediaCache.delete(key);
-		for (const [key, timestamp] of this.mediaBackedByIdCache.entries()) if (now - timestamp > SENT_MESSAGE_TEXT_TTL_MS) this.mediaBackedByIdCache.delete(key);
-		for (const [key, timestamp] of this.messageIdCache.entries()) if (now - timestamp > SENT_MESSAGE_ID_TTL_MS) this.messageIdCache.delete(key);
+		for (const cache of [
+			this.textCache,
+			this.textBackedByIdCache,
+			this.mediaCache,
+			this.mediaBackedByIdCache,
+			this.messageIdCache
+		]) {
+			const ttlMs = cache === this.messageIdCache ? SENT_MESSAGE_ID_TTL_MS : SENT_MESSAGE_TEXT_TTL_MS;
+			for (const [key, timestamp] of cache) if (now - timestamp > ttlMs) cache.delete(key);
+		}
 	}
 };
 function createSentMessageCache() {
@@ -1290,23 +1222,25 @@ function isStaleIMessageBacklog(message, nowMs, thresholdMs = IMESSAGE_STALE_INB
 }
 //#endregion
 //#region extensions/imessage/src/conversation-route.ts
-function resolveIMessageConversationRoute(params) {
-	const route = resolveAgentRoute({
-		cfg: params.cfg,
+async function resolveIMessageConversationRoute(params) {
+	const routeInput = {
 		channel: "imessage",
 		accountId: params.accountId,
 		peer: {
 			kind: params.isGroup ? "group" : "direct",
 			id: params.peerId
 		}
-	});
+	};
 	const conversationId = resolveIMessageInboundConversationId({
 		isGroup: params.isGroup,
 		sender: params.sender,
 		chatId: params.chatId
 	});
 	if (!conversationId) return {
-		route,
+		route: resolveAgentRoute({
+			...routeInput,
+			cfg: params.cfg
+		}),
 		bindingResolution: null
 	};
 	const conversation = {
@@ -1314,20 +1248,81 @@ function resolveIMessageConversationRoute(params) {
 		accountId: params.accountId,
 		conversationId
 	};
-	const configuredRoute = resolveConfiguredBindingRoute({
-		cfg: params.cfg,
-		route,
-		conversation
-	});
-	const runtimeRoute = resolveRuntimeConversationBindingRoute({
-		route: configuredRoute.route,
-		conversation
+	const service = getSessionBindingService();
+	const inspection = await service.inspectByConversationAsync(conversation);
+	if (inspection.status === "unavailable") throw new Error("iMessage conversation binding owner is temporarily unavailable; retry the message.");
+	let bindingResolution = null;
+	const runtimeRoute = inspectRuntimeConversationBindingRoute({
+		inspection,
+		resolveRoute: ({ boundAgentId }) => {
+			if (boundAgentId) return resolveAgentRoute({
+				...routeInput,
+				cfg: { session: params.cfg.session },
+				defaultAgentId: boundAgentId
+			});
+			const configuredRoute = resolveConfiguredBindingRoute({
+				cfg: params.cfg,
+				route: resolveAgentRoute({
+					...routeInput,
+					cfg: params.cfg
+				}),
+				conversation
+			});
+			bindingResolution = configuredRoute.bindingResolution;
+			return configuredRoute.route;
+		}
 	});
+	if (runtimeRoute.bindingRecord) await service.touchAsync(runtimeRoute.bindingRecord.bindingId, void 0, runtimeRoute.bindingRecord.conversation);
 	if (runtimeRoute.bindingRecord && !runtimeRoute.boundSessionKey) logVerbose(`imessage: plugin-bound conversation ${conversationId}`);
 	else if (runtimeRoute.boundSessionKey) logVerbose(`imessage: routed via bound conversation ${conversationId} -> ${runtimeRoute.boundSessionKey}`);
 	return {
 		route: runtimeRoute.route,
-		bindingResolution: runtimeRoute.bindingRecord ? null : configuredRoute.bindingResolution
+		bindingResolution: runtimeRoute.bindingRecord ? null : bindingResolution
+	};
+}
+//#endregion
+//#region src/channels/mention-gating.ts
+function resolveBotThreadMentionPolicy(params) {
+	if (!params.isBotOwnedThread || params.requireMentionInBotThreads === void 0) return {
+		requireMention: params.requireMention,
+		implicitMentionKinds: params.implicitMentionKinds
+	};
+	return {
+		requireMention: params.requireMentionInBotThreads,
+		implicitMentionKinds: params.requireMentionInBotThreads ? params.implicitMentionKinds?.filter((kind) => kind === "native") : params.implicitMentionKinds
+	};
+}
+//#endregion
+//#region extensions/imessage/src/monitor/mention-policy.ts
+async function resolveIMessageInboundMentionPolicy(params) {
+	const groups = resolveChannelGroups(params.cfg, "imessage", params.accountId);
+	const { "*": defaults, ...scopes } = groups ?? {};
+	const requireMention = resolveScopeRequireMention({
+		tree: {
+			defaults,
+			scopes
+		},
+		path: params.groupId ? [params.groupId] : [],
+		requireMentionOverride: params.requireMentionOverride,
+		overrideOrder: "before-config"
+	});
+	const requireMentionInBotThreads = (params.groupId ? groups?.[params.groupId]?.requireMentionInBotThreads : void 0) ?? defaults?.requireMentionInBotThreads;
+	const threadOriginatorGuid = params.message.thread_originator_guid?.trim();
+	const isBotOwnedThread = Boolean(params.isGroup && requireMentionInBotThreads !== void 0 && threadOriginatorGuid && await isKnownFromMeIMessageTarget({
+		messageIds: uniqueStrings([normalizeIMessageGuid(threadOriginatorGuid), threadOriginatorGuid]),
+		accountId: params.accountId,
+		chatId: params.message.chat_id ?? void 0,
+		chatGuid: params.message.chat_guid ?? void 0,
+		chatIdentifier: params.message.chat_identifier ?? void 0,
+		isKnownFromMeMessageId: params.isKnownFromMeMessageId
+	}));
+	return {
+		...resolveBotThreadMentionPolicy({
+			isBotOwnedThread,
+			requireMentionInBotThreads,
+			requireMention
+		}),
+		enforceMentionRequirement: isBotOwnedThread && requireMentionInBotThreads === true
 	};
 }
 //#endregion
@@ -1362,8 +1357,7 @@ const REFLECTION_PATTERNS = [
 		label: "gateway-missing-api-key"
 	}
 ];
-function hasMatchOutsideCode(text, re) {
-	const codeRegions = findCodeRegions(text);
+function hasMatchOutsideCode(text, re, codeRegions) {
 	const globalRe = new RegExp(re.source, re.flags.includes("g") ? re.flags : `${re.flags}g`);
 	for (const match of text.matchAll(globalRe)) {
 		const start = match.index ?? -1;
@@ -1380,8 +1374,9 @@ function detectReflectedContent(text) {
 		isReflection: false,
 		matchedLabels: []
 	};
+	const codeRegions = findCodeRegions(text);
 	const matchedLabels = [];
-	for (const { re, label } of REFLECTION_PATTERNS) if (hasMatchOutsideCode(text, re)) matchedLabels.push(label);
+	for (const { re, label } of REFLECTION_PATTERNS) if (hasMatchOutsideCode(text, re, codeRegions)) matchedLabels.push(label);
 	return {
 		isReflection: matchedLabels.length > 0,
 		matchedLabels
@@ -1481,15 +1476,21 @@ function resolveInboundEchoMessageIds(message) {
 	const values = [message.id != null ? String(message.id) : void 0, normalizeReplyField(message.guid)];
 	return uniqueStrings(values.filter((value) => Boolean(value)));
 }
+function classifyIMessageSelfChat(message, isGroup, senderNormalized) {
+	const chatIdentifier = normalizeIMessageHandle(message.chat_identifier ?? "") || void 0;
+	const destination = normalizeIMessageHandle(message.destination_caller_id ?? "") || void 0;
+	const matchesThread = !isGroup && chatIdentifier != null && senderNormalized === chatIdentifier;
+	return {
+		isSelfChat: matchesThread && destination != null && destination === senderNormalized,
+		isAmbiguousSelfThread: matchesThread && destination == null
+	};
+}
 function rememberIMessageSkippedFromMeForSelfChatDedupe(params) {
 	if (params.message.is_from_me !== true) return;
 	const sender = params.message.sender?.trim();
 	if (!sender) return;
 	const chatId = params.message.chat_id ?? void 0;
 	const isGroup = Boolean(params.message.is_group);
-	const chatIdentifierNormalized = normalizeIMessageHandle(params.message.chat_identifier ?? "") || void 0;
-	const destinationCallerIdNormalized = normalizeIMessageHandle(params.message.destination_caller_id ?? "") || void 0;
-	const senderNormalized = normalizeIMessageHandle(sender);
 	const createdAt = params.message.created_at ? Date.parse(params.message.created_at) : void 0;
 	const lookup = {
 		accountId: params.accountId,
@@ -1499,8 +1500,7 @@ function rememberIMessageSkippedFromMeForSelfChatDedupe(params) {
 		text: params.bodyText.trim(),
 		createdAt
 	};
-	const isSelfChat = !isGroup && chatIdentifierNormalized != null && senderNormalized === chatIdentifierNormalized && destinationCallerIdNormalized != null && destinationCallerIdNormalized === senderNormalized;
-	const isAmbiguousSelfThread = !isGroup && chatIdentifierNormalized != null && senderNormalized === chatIdentifierNormalized && destinationCallerIdNormalized == null;
+	const { isSelfChat, isAmbiguousSelfThread } = classifyIMessageSelfChat(params.message, isGroup, normalizeIMessageHandle(sender));
 	if (isSelfChat) params.selfChatCache?.remember({
 		...lookup,
 		allowCreatedAtSkew: true
@@ -1525,18 +1525,6 @@ async function hasIMessageEchoMatch(params) {
 	}
 	return false;
 }
-async function isKnownFromMeIMessageReactionTarget(params) {
-	const { accountId, chatId, chatGuid, chatIdentifier } = params;
-	const ctx = {
-		accountId,
-		chatId,
-		chatGuid,
-		chatIdentifier
-	};
-	const isKnownFromMe = params.isKnownFromMeMessageId ?? isKnownFromMeIMessageMessageId;
-	for (const messageId of params.messageIds) if (await isKnownFromMe(messageId, ctx)) return true;
-	return false;
-}
 async function resolveIMessageInboundDecision(params) {
 	const sender = (params.message.sender ?? "").trim();
 	if (!sender) return {
@@ -1547,7 +1535,6 @@ async function resolveIMessageInboundDecision(params) {
 	const chatId = params.message.chat_id ?? void 0;
 	const chatGuid = params.message.chat_guid ?? void 0;
 	const chatIdentifier = params.message.chat_identifier ?? void 0;
-	const destinationCallerId = params.message.destination_caller_id ?? void 0;
 	const createdAt = params.message.created_at ? Date.parse(params.message.created_at) : void 0;
 	const messageText = params.messageText.trim();
 	const bodyText = params.bodyText.trim();
@@ -1581,10 +1568,7 @@ async function resolveIMessageInboundDecision(params) {
 		text: bodyText,
 		createdAt
 	};
-	const chatIdentifierNormalized = normalizeIMessageHandle(chatIdentifier ?? "") || void 0;
-	const destinationCallerIdNormalized = normalizeIMessageHandle(destinationCallerId ?? "") || void 0;
-	const isSelfChat = !isGroup && chatIdentifierNormalized != null && senderNormalized === chatIdentifierNormalized && destinationCallerIdNormalized != null && destinationCallerIdNormalized === senderNormalized;
-	const isAmbiguousSelfThread = !isGroup && chatIdentifierNormalized != null && senderNormalized === chatIdentifierNormalized && destinationCallerIdNormalized == null;
+	const { isSelfChat, isAmbiguousSelfThread } = classifyIMessageSelfChat(params.message, isGroup, senderNormalized);
 	let skipSelfChatHasCheck = false;
 	const inboundMessageIds = resolveInboundEchoMessageIds(params.message);
 	const inboundMessageId = inboundMessageIds[0];
@@ -1629,7 +1613,7 @@ async function resolveIMessageInboundDecision(params) {
 	const groupId = isGroup ? groupIdCandidate : void 0;
 	const hasControlCommandInMessage = hasControlCommand(messageText, params.cfg);
 	const groupAllowFromForAccess = isGroup ? groupAllowFromWithLegacyChatTargets : params.groupAllowFrom;
-	const { route, bindingResolution } = resolveIMessageConversationRoute({
+	const { route, bindingResolution } = await resolveIMessageConversationRoute({
 		cfg: params.cfg,
 		accountId: params.accountId,
 		isGroup,
@@ -1740,7 +1724,7 @@ async function resolveIMessageInboundDecision(params) {
 				sender
 			}),
 			messageIds: targetGuids
-		}) || await isKnownFromMeIMessageReactionTarget({
+		}) || await isKnownFromMeIMessageTarget({
 			messageIds: targetGuids,
 			accountId: params.accountId,
 			chatId,
@@ -1859,13 +1843,16 @@ async function resolveIMessageInboundDecision(params) {
 	if (replyContext && !filteredReplyContext && isGroup) params.logVerbose?.(`imessage: drop reply context (mode=${contextVisibilityMode}, sender_allowed=${replySenderAllowed ? "yes" : "no"})`);
 	const historyKey = isGroup ? String(chatId ?? chatGuid ?? chatIdentifier ?? "unknown") : void 0;
 	const mentioned = isGroup ? matchesMentionPatterns(messageText, mentionRegexes) : true;
-	const requireMention = resolveScopeRequireMention({
-		tree: buildChannelGroupsScopeTree(params.cfg, "imessage", params.accountId),
-		path: groupId ? [groupId] : [],
+	const { requireMention, implicitMentionKinds, enforceMentionRequirement } = await resolveIMessageInboundMentionPolicy({
+		cfg: params.cfg,
+		accountId: params.accountId,
+		groupId,
+		isGroup,
+		message: params.message,
 		requireMentionOverride: params.opts?.requireMention,
-		overrideOrder: "before-config"
+		isKnownFromMeMessageId: params.isKnownFromMeMessageId
 	});
-	const canDetectMention = mentionRegexes.length > 0;
+	const canDetectMention = mentionRegexes.length > 0 || enforceMentionRequirement;
 	const commandAuthorized = commandAccess.authorized;
 	if (commandAccess.shouldBlockControlCommand) {
 		if (params.logVerbose) logInboundDrop({
@@ -1884,7 +1871,7 @@ async function resolveIMessageInboundDecision(params) {
 			canDetectMention,
 			wasMentioned: mentioned,
 			hasAnyMention: false,
-			implicitMentionKinds: []
+			implicitMentionKinds
 		},
 		policy: {
 			isGroup,
@@ -2327,44 +2314,40 @@ async function assertAllowedCanonicalAttachmentPath(params) {
 	})) throw new Error("attachment path resolves outside allowed roots");
 }
 async function readAttachmentBuffer(params) {
-	const opened = await (params.deps.openLocalFileSafely ?? openLocalFileSafely)({ filePath: params.attachmentPath });
-	try {
-		if (opened.stat.size > params.maxBytes) throw new Error(`attachment exceeds ${Math.round(params.maxBytes / 1048576)}MB limit`);
-		await assertAllowedCanonicalAttachmentPath({
-			canonicalPath: opened.realPath,
-			allowedRoots: params.allowedRoots
-		});
-		const buffer = await readFileHandleBounded(opened.handle, params.maxBytes).catch((error) => {
-			if (error instanceof FsSafeError && error.code === "too-large") throw new Error(`attachment exceeds ${Math.round(params.maxBytes / 1048576)}MB limit`);
-			throw error;
-		});
-		if (isHeicAttachment(params.attachmentPath, params.mimeType)) try {
-			const convert = params.deps.convertHeicToJpeg;
-			return {
-				buffer: (await withTempWorkspace({
-					rootDir: resolvePreferredOpenClawTmpDir(),
-					prefix: "openclaw-imessage-heic-"
-				}, async (workspace) => {
-					const pinnedPath = await workspace.write("attachment.heic", buffer);
-					return convert ? { buffer: await convert(pinnedPath, params.maxBytes) } : await loadWebMedia(pinnedPath, {
-						maxBytes: params.maxBytes,
-						localRoots: [workspace.dir]
-					});
-				})).buffer,
-				contentType: "image/jpeg",
-				originalFilename: jpegFilenameForAttachment(params.attachmentPath)
-			};
-		} catch (err) {
-			params.deps.logVerbose?.(`imessage: HEIC attachment conversion failed; staging original instead: ${String(err)}`);
-		}
+	await using opened = await (params.deps.openLocalFileSafely ?? openLocalFileSafely)({ filePath: params.attachmentPath });
+	if (opened.stat.size > params.maxBytes) throw new Error(`attachment exceeds ${Math.round(params.maxBytes / 1048576)}MB limit`);
+	await assertAllowedCanonicalAttachmentPath({
+		canonicalPath: opened.realPath,
+		allowedRoots: params.allowedRoots
+	});
+	const buffer = await readFileHandleBounded(opened.handle, params.maxBytes).catch((error) => {
+		if (error instanceof FsSafeError && error.code === "too-large") throw new Error(`attachment exceeds ${Math.round(params.maxBytes / 1048576)}MB limit`);
+		throw error;
+	});
+	if (isHeicAttachment(params.attachmentPath, params.mimeType)) try {
+		const convert = params.deps.convertHeicToJpeg;
 		return {
-			buffer,
-			contentType: params.mimeType ?? void 0,
-			originalFilename: path.basename(params.attachmentPath)
+			buffer: (await withTempWorkspace({
+				rootDir: resolvePreferredOpenClawTmpDir(),
+				prefix: "openclaw-imessage-heic-"
+			}, async (workspace) => {
+				const pinnedPath = await workspace.write("attachment.heic", buffer);
+				return convert ? { buffer: await convert(pinnedPath, params.maxBytes) } : await loadWebMedia(pinnedPath, {
+					maxBytes: params.maxBytes,
+					localRoots: [workspace.dir]
+				});
+			})).buffer,
+			contentType: "image/jpeg",
+			originalFilename: jpegFilenameForAttachment(params.attachmentPath)
 		};
-	} finally {
-		await opened.handle.close().catch(() => void 0);
+	} catch (err) {
+		params.deps.logVerbose?.(`imessage: HEIC attachment conversion failed; staging original instead: ${String(err)}`);
 	}
+	return {
+		buffer,
+		contentType: params.mimeType ?? void 0,
+		originalFilename: path.basename(params.attachmentPath)
+	};
 }
 async function stageIMessageAttachments(attachments, params) {
 	const deps = params.deps ?? {};
@@ -2633,11 +2616,6 @@ async function advanceIMessageRecoveryCursor(accountId, dbIdentity, rowid) {
 	} catch {}
 }
 //#endregion
-//#region extensions/imessage/src/monitor/runtime.ts
-function resolveRuntime(opts) {
-	return opts.runtime ?? createNonExitingRuntime();
-}
-//#endregion
 //#region extensions/imessage/src/monitor/self-chat-cache.ts
 const SELF_CHAT_TTL_MS = 1e4;
 const SELF_CHAT_CREATED_AT_TOLERANCE_MS = 1e3;
@@ -2806,9 +2784,6 @@ function formatIMessageInboundMediaBody(params) {
 		notice: `[imessage ${params.unavailableCount > 1 ? `${params.unavailableCount} attachments` : "attachment"} unavailable]`
 	});
 }
-function resolveIMessageWatchSourceDbPath(params) {
-	return resolveIMessageChatDbLookupPath(params);
-}
 const warnIfImsgUpgradeNeeded = (() => {
 	let fired = false;
 	return { fireOnce: (rpcMethods, runtime) => {
@@ -2856,7 +2831,7 @@ async function waitForWatchSubscribeRetryDelay(params) {
 	});
 }
 async function monitorIMessageProvider(opts = {}) {
-	const runtime = resolveRuntime(opts);
+	const runtime = opts.runtime ?? createNonExitingRuntime();
 	const cfg = opts.config ?? getRuntimeConfig();
 	const readConfig = createRuntimeConfigReader(cfg);
 	const accountInfo = resolveIMessageAccount({
@@ -2926,9 +2901,24 @@ async function monitorIMessageProvider(opts = {}) {
 		cliPath,
 		remoteHost: imessageCfg.remoteHost
 	});
+	const sendTyping = (target, isTyping, client) => sendIMessageTyping(target, isTyping, {
+		cfg,
+		accountId: accountInfo.accountId,
+		cliPath,
+		dbPath,
+		remoteHost,
+		...client ? { client } : {}
+	});
+	const logTypingError = (action, target, error) => logTypingFailure({
+		log: logVerbose,
+		channel: "imessage",
+		action,
+		target,
+		error
+	});
 	let staleBacklogSuppressed = 0;
 	const loggedThrottledDropDiagnostics = createIMessageThrottledDropDiagnosticCache();
-	const watchSourceDbPath = resolveIMessageWatchSourceDbPath({
+	const watchSourceDbPath = resolveIMessageChatDbLookupPath({
 		cliPath,
 		dbPath,
 		remoteHost
@@ -3047,9 +3037,8 @@ async function monitorIMessageProvider(opts = {}) {
 		});
 	}
 	function resolveLiveCatchupCursor(message) {
-		const coalescedCursor = message.coalescedCatchupCursor;
-		const rowid = typeof coalescedCursor?.lastSeenRowid === "number" && Number.isFinite(coalescedCursor.lastSeenRowid) ? coalescedCursor.lastSeenRowid : typeof message.id === "number" && Number.isFinite(message.id) ? message.id : null;
-		const dateMs = typeof coalescedCursor?.lastSeenMs === "number" && Number.isFinite(coalescedCursor.lastSeenMs) ? coalescedCursor.lastSeenMs : typeof message.created_at === "string" ? Date.parse(message.created_at) : NaN;
+		const rowid = typeof message.id === "number" && Number.isFinite(message.id) ? message.id : null;
+		const dateMs = typeof message.created_at === "string" ? Date.parse(message.created_at) : NaN;
 		if (rowid === null || !Number.isFinite(dateMs)) return null;
 		return {
 			lastSeenMs: dateMs,
@@ -3247,20 +3236,8 @@ async function monitorIMessageProvider(opts = {}) {
 		const earlyDirectTypingTarget = shouldStartDirectTyping ? `${earlyDirectTypingService}:${decision.sender}` : void 0;
 		let stopEarlyDirectTyping;
 		if (earlyDirectTypingTarget) {
-			const earlyDirectTypingStarted = sendIMessageTyping(earlyDirectTypingTarget, true, {
-				cfg,
-				accountId: accountInfo.accountId,
-				cliPath,
-				dbPath,
-				remoteHost
-			}).then(() => true, (err) => {
-				logTypingFailure({
-					log: (msg) => logVerbose(msg),
-					channel: "imessage",
-					action: "start",
-					target: earlyDirectTypingTarget,
-					error: err
-				});
+			const earlyDirectTypingStarted = sendTyping(earlyDirectTypingTarget, true).then(() => true, (err) => {
+				logTypingError("start", earlyDirectTypingTarget, err);
 				return false;
 			});
 			let earlyTypingStopQueued = false;
@@ -3269,21 +3246,9 @@ async function monitorIMessageProvider(opts = {}) {
 				earlyTypingStopQueued = true;
 				earlyDirectTypingStarted.then(async (started) => {
 					if (!started) return;
-					await sendIMessageTyping(earlyDirectTypingTarget, false, {
-						cfg,
-						accountId: accountInfo.accountId,
-						cliPath,
-						dbPath,
-						remoteHost
-					});
+					await sendTyping(earlyDirectTypingTarget, false);
 				}).catch((err) => {
-					logTypingFailure({
-						log: (msg) => logVerbose(msg),
-						channel: "imessage",
-						action: "stop",
-						target: earlyDirectTypingTarget,
-						error: err
-					});
+					logTypingError("stop", earlyDirectTypingTarget, err);
 				});
 			};
 		}
@@ -3364,45 +3329,15 @@ async function monitorIMessageProvider(opts = {}) {
 			accountId: decision.route.accountId,
 			typing: supportsTyping && typingTarget ? {
 				start: async () => {
-					await sendIMessageTyping(typingTarget, true, {
-						cfg,
-						accountId: accountInfo.accountId,
-						client: getActiveClient(),
-						cliPath,
-						dbPath,
-						remoteHost
-					});
+					await sendTyping(typingTarget, true, getActiveClient());
 				},
 				stop: async () => {
-					await sendIMessageTyping(typingTarget, false, {
-						cfg,
-						accountId: accountInfo.accountId,
-						client: getActiveClient(),
-						cliPath,
-						dbPath,
-						remoteHost
-					});
+					await sendTyping(typingTarget, false, getActiveClient());
 				},
 				keepaliveIntervalMs: IMESSAGE_TYPING_KEEPALIVE_INTERVAL_MS,
 				maxDurationMs: IMESSAGE_TYPING_KEEPALIVE_MAX_DURATION_MS,
-				onStartError: (err) => {
-					logTypingFailure({
-						log: (msg) => logVerbose(msg),
-						channel: "imessage",
-						action: "start",
-						target: typingTarget,
-						error: err
-					});
-				},
-				onStopError: (err) => {
-					logTypingFailure({
-						log: (msg) => logVerbose(msg),
-						channel: "imessage",
-						action: "stop",
-						target: typingTarget,
-						error: err
-					});
-				}
+				onStartError: (err) => logTypingError("start", typingTarget, err),
+				onStopError: (err) => logTypingError("stop", typingTarget, err)
 			} : void 0
 		});
 		const dispatcherOptions = {
@@ -3647,17 +3582,13 @@ async function monitorIMessageProvider(opts = {}) {
 			else if (msg.method === "error") runtime.error?.(`imessage: watch error ${JSON.stringify(sanitizeIMessageWatchErrorPayload(msg.params))}`);
 		}
 	});
-	const requireWatchClient = (watchClient) => {
-		if (!watchClient) throw new Error("imessage monitor client not initialized");
-		return watchClient;
-	};
 	for (let attempt = 1; attempt <= WATCH_SUBSCRIBE_MAX_ATTEMPTS; attempt++) {
 		if (abort?.aborted) return;
 		let attemptClient;
 		let attemptDetachAbortHandler = () => {};
 		let keepAttemptClient = false;
 		try {
-			attemptClient = requireWatchClient(await createWatchClient());
+			attemptClient = await createWatchClient();
 			let attemptSubscriptionId = null;
 			attemptDetachAbortHandler = attachIMessageMonitorAbortHandler({
 				abortSignal: abort,