@openclaw/imessage 2026.8.1-beta.2 → 2026.8.1

package/dist/{monitor-DnxJ8pW9.js → monitor-BywJn1QW.js}

@@ -1,13 +1,14 @@
-import { C as registerIMessageApprovalReactionTarget, D as buildIMessageApprovalConversationKeyForInbound, E as resolveIMessageReactionContext, I as probeIMessage, S as maybeResolveIMessageApprovalReaction, b as handleIMessageApprovalReaction, r as resolveIMessageInboundConversationId, x as listPendingIMessageApprovalReactionPollTargets, y as extractIMessageApprovalPromptBinding } from "./group-policy-DF9xSdik.js";
-import { d as resolveIMessageChatDbLookupPath, f as resolveIMessageHomeDir, l as resolveIMessageRemoteHost, o as resolveIMessageAccount } from "./accounts-D00Njxg2.js";
-import { c as parseIMessageAllowTarget, i as isAllowedIMessageReplyContextSender, l as parseIMessageTarget, n as formatIMessageChatTarget, s as normalizeIMessageHandle, v as getCachedIMessagePrivateApiStatus, y as imessageRpcSupportsMethod } from "./message-tool-api-CPDfJJoE.js";
-import { c as rememberIMessageReplyCache, f as getIMessageRuntime, s as isKnownFromMeIMessageMessageId } from "./monitor-reply-cache-DKlYGd5x.js";
-import { o as createIMessageRpcClient, r as sanitizeOutboundText } from "./sanitize-outbound-CoTZLXMw.js";
-import { n as resolveIMessageAttachmentRoots, r as resolveIMessageRemoteAttachmentRoots } from "./media-contract-BEgdvYhW.js";
-import { a as resolveCatchupConfig, i as performIMessageCatchup, n as advanceIMessageCatchupCursor } from "./catchup-D32oYNxR.js";
-import { c as stripLeadingEchoTextCorruptionMarkers, i as hasPersistedIMessageEcho, o as resolveIMessageEchoMediaKey } from "./persisted-echo-cache-BPWGUK-L.js";
-import { a as maybeResolveIMessageApprovalPollVote, o as iMessageApprovalControlBindings, t as sendMessageIMessage } from "./send-BUXW76tw.js";
-import { n as maybeResolveIMessageQuestionReaction, t as hasIMessageQuestionReactionTarget } from "./question-reactions-DVe50UhB.js";
+import { d as resolveIMessageChatDbLookupPath, f as resolveIMessageHomeDir, l as resolveIMessageRemoteHost, o as resolveIMessageAccount } from "./accounts-CCirBEIm.js";
+import { c as parseIMessageAllowTarget, f as getCachedIMessagePrivateApiStatus, i as isAllowedIMessageReplyContextSender, l as parseIMessageTarget, n as formatIMessageChatTarget, p as imessageRpcSupportsMethod, s as normalizeIMessageHandle } from "./message-tool-api-CvIgJpOo.js";
+import { l as isKnownFromMeIMessageMessageId, o as createIMessageRpcClient, r as sanitizeOutboundText, u as rememberIMessageReplyCache, v as resolveIMessageDirectChatService } from "./sanitize-outbound-Du-r1lNQ.js";
+import { f as probeIMessage, r as resolveIMessageInboundConversationId } from "./group-policy-Dvc-BcWo.js";
+import { t as getIMessageRuntime } from "./runtime-Cza4CY5T.js";
+import { d as resolveIMessageEchoMediaKey, l as capFailureRetriesMap, t as IMESSAGE_CATCHUP_CURSOR_NAMESPACE, u as resolveIMessageCatchupCursorKey } from "./state-contract-4TK_cDDb.js";
+import { n as resolveIMessageAttachmentRoots, r as resolveIMessageRemoteAttachmentRoots } from "./media-contract-D-FhGE98.js";
+import { i as registerIMessageApprovalReactionTarget, n as handleIMessageApprovalReaction, o as listPendingIMessageApprovalReactionPollTargets, r as maybeResolveIMessageApprovalReaction, s as buildIMessageApprovalConversationKeyForInbound } from "./approval-reactions-LL5yn1Rc.js";
+import { c as iMessageApprovalControlBindings, n as hasPersistedIMessageEcho, r as stripLeadingEchoTextCorruptionMarkers, s as maybeResolveIMessageApprovalPollVote, t as sendMessageIMessage } from "./send-mgWPKqSV.js";
+import { t as resolveIMessageReactionContext } from "./reaction-context-BAYI7pz0.js";
+import { n as maybeResolveIMessageQuestionReaction, t as hasIMessageQuestionReactionTarget } from "./question-reactions-viP7ZcyG.js";
 import { bindIngressLifecycleToReplyOptions, createChannelIngressError, createChannelIngressMonitor, createChannelMessageReplyPipeline, createMessageReceiptFromOutboundResults, listMessageReceiptPlatformIds, resolveChannelStreamingBlockEnabled } from "openclaw/plugin-sdk/channel-outbound";
 import { chunkMarkdownTextWithMode as chunkTextWithMode, resolveChunkMode, resolveTextChunkLimit } from "openclaw/plugin-sdk/reply-runtime";
 import { resolveAgentRoute, resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
@@ -16,34 +17,34 @@ import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { asSafeIntegerInRange, hasNonEmptyString, isRecord, normalizeOptionalString, normalizeStringEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs/promises";
 import { createNonExitingRuntime, danger, logVerbose, shouldLogVerbose, warn } from "openclaw/plugin-sdk/runtime-env";
-import { asDateTimestampMs, asPositiveFiniteNumber, parseDateStringTimestampMs, resolveExpiresAtMsFromDurationMs, timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
+import { isInboundPathAllowed, kindFromMime } from "openclaw/plugin-sdk/media-runtime";
+import { asDateTimestampMs, asPositiveFiniteNumber, parseDateStringTimestampMs, resolveIntegerOption, timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
 import { createHash } from "node:crypto";
 import { 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 { isInboundPathAllowed, kindFromMime } from "openclaw/plugin-sdk/media-runtime";
-import { convertMarkdownTables as convertMarkdownTables$1, findCodeRegions, isInsideCode, sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
 import { buildChannelGroupsScopeTree, resolveChannelGroupPolicy, resolveScopeRequireMention } from "openclaw/plugin-sdk/channel-policy";
+import { convertMarkdownTables as convertMarkdownTables$1, findCodeRegions, isInsideCode, sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
 import { buildChannelInboundEventContext, buildMentionRegexes, createChannelInboundDebouncer, createChannelPartialDeliveryError, filterChannelInboundQuoteContext, formatInboundEnvelope, formatInboundFromLabel, formatInboundMediaUnavailableText, formatMediaPlaceholderText, isChannelPartialDeliveryError, logInboundDrop, matchesMentionPatterns, resolveEnvelopeFormatOptions, resolveInboundMentionDecision, resolveInboundSupplementalSenderAllowed, runChannelInboundEvent, shouldDebounceTextInbound, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
-import { openLocalFileSafely, resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
-import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { resolveAgentConfig, resolveHumanDelayConfig } from "openclaw/plugin-sdk/agent-runtime";
 import { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-runtime";
 import { logTypingFailure } from "openclaw/plugin-sdk/channel-feedback";
 import { createChannelIngressResolver, 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 { readChannelAllowFromStore, resolveConfiguredBindingRoute, resolveRuntimeConversationBindingRoute, upsertChannelPairingRequest } from "openclaw/plugin-sdk/conversation-runtime";
+import { ensureConfiguredBindingRouteReady, readChannelAllowFromStore, resolveConfiguredBindingRoute, resolveRuntimeConversationBindingRoute, upsertChannelPairingRequest } from "openclaw/plugin-sdk/conversation-runtime";
 import { channelReadyPatch } from "openclaw/plugin-sdk/gateway-runtime";
 import { redactIdentifier } from "openclaw/plugin-sdk/logging-core";
 import { DEFAULT_GROUP_HISTORY_LIMIT, createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
 import { resolveDefaultGroupPolicy, resolveOpenProviderRuntimeGroupPolicy, warnMissingProviderGroupPolicyFallbackOnce } from "openclaw/plugin-sdk/runtime-group-policy";
+import { openLocalFileSafely, resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
 import { getSessionEntry, readSessionUpdatedAt, resolveSendPolicy, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { openNodeSqliteDatabase } from "openclaw/plugin-sdk/sqlite-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 { resolvePreferredOpenClawTmpDir, withTempWorkspace } from "openclaw/plugin-sdk/temp-path";
+import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { deliverTextOrMediaReply, resolveSendableOutboundReplyParts } from "openclaw/plugin-sdk/reply-payload";
 import { createDedupeCache } from "openclaw/plugin-sdk/dedupe-runtime";
 import { hasControlCommand } from "openclaw/plugin-sdk/command-auth-native";
@@ -55,8 +56,6 @@ import { enqueueSystemEvent } from "openclaw/plugin-sdk/system-event-runtime";
 //#region extensions/imessage/src/approval-reaction-poller.ts
 const RECENT_CHAT_LIMIT = 50;
 const PER_CHAT_HISTORY_LIMIT = 30;
-const OBSERVED_APPROVAL_PROMPT_TARGET_TTL_MS = 300 * 1e3;
-const accountIdsWithCompletedNoTargetDiscovery = /* @__PURE__ */ new Set();
 function normalizeChatId(value) {
 	return asPositiveFiniteNumber(value) ?? null;
 }
@@ -150,42 +149,13 @@ function bindObservedConversation(params) {
 		ttlMs
 	});
 }
-function bindObservedApprovalPrompt(params) {
-	if (params.message.is_from_me !== true) return null;
-	const messageId = params.message.guid?.trim();
-	if (!messageId) return null;
-	const binding = extractIMessageApprovalPromptBinding(params.message.text ?? "");
-	if (!binding) return null;
-	const conversation = buildConversationKeyFromMessage(params.message);
-	const expiresAtMs = resolveExpiresAtMsFromDurationMs(OBSERVED_APPROVAL_PROMPT_TARGET_TTL_MS);
-	if (expiresAtMs === void 0) return null;
-	const target = {
-		accountId: params.accountId,
-		conversation,
-		messageId,
-		approvalId: binding.approvalId,
-		approvalKind: binding.approvalKind,
-		allowedDecisions: binding.allowedDecisions,
-		expiresAtMs
-	};
-	bindObservedConversation({
-		target,
-		message: params.message
-	});
-	return target;
-}
 async function pollPendingIMessageApprovalReactions(params) {
-	const targets = listPendingIMessageApprovalReactionPollTargets({ accountId: params.accountId });
-	const shouldAttemptNoTargetDiscovery = targets.length === 0 && params.allowRecentChatDiscovery === true && !accountIdsWithCompletedNoTargetDiscovery.has(params.accountId);
-	if (targets.length === 0 && !shouldAttemptNoTargetDiscovery) return;
+	const targets = await listPendingIMessageApprovalReactionPollTargets({ accountId: params.accountId });
+	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;
-	if (chatIds.length === 0) {
-		if (shouldAttemptNoTargetDiscovery) accountIdsWithCompletedNoTargetDiscovery.add(params.accountId);
-		return;
-	}
-	let hadHistoryFetchError = false;
+	const chatIds = params.allowRecentChatDiscovery === true && targets.length > 0 && hasUnscopedTarget(targets) ? uniqueChatIds([...explicitChatIds, ...await listRecentChatIds(params.client)]) : explicitChatIds;
+	if (chatIds.length === 0) return;
 	for (const chatId of chatIds) {
 		let messages;
 		try {
@@ -194,17 +164,13 @@ async function pollPendingIMessageApprovalReactions(params) {
 				chatId
 			});
 		} catch (err) {
-			hadHistoryFetchError = true;
 			params.logVerboseMessage?.(`imessage: approval reaction poll skipped chat_id=${chatId}: ${String(err)}`);
 			continue;
 		}
 		for (const message of messages) {
 			const targetGuid = message.guid?.trim();
 			if (!targetGuid) continue;
-			const target = pendingByMessageId.get(targetGuid) ?? pendingByMessageId.get(normalizeMessageGuid(targetGuid)) ?? bindObservedApprovalPrompt({
-				accountId: params.accountId,
-				message
-			});
+			const target = pendingByMessageId.get(targetGuid) ?? pendingByMessageId.get(normalizeMessageGuid(targetGuid));
 			if (!target) continue;
 			bindObservedConversation({
 				target,
@@ -216,22 +182,17 @@ async function pollPendingIMessageApprovalReactions(params) {
 					reaction
 				});
 				if (!reactionPayload) continue;
-				const handled = await handleIMessageApprovalReaction({
+				if ((await handleIMessageApprovalReaction({
 					cfg: params.cfg,
 					accountId: params.accountId,
 					message: reactionPayload,
 					bodyText: reactionPayload.text ?? "",
 					gatewayRuntime: params.gatewayRuntime,
 					logVerboseMessage: params.logVerboseMessage
-				});
-				if (handled.stopPolling) {
-					if (shouldAttemptNoTargetDiscovery && handled.stopPollingReason !== "resolver-error") break;
-					return;
-				}
+				})).stopPolling) return;
 			}
 		}
 	}
-	if (shouldAttemptNoTargetDiscovery && !hadHistoryFetchError) accountIdsWithCompletedNoTargetDiscovery.add(params.accountId);
 }
 //#endregion
 //#region extensions/imessage/src/chat.ts
@@ -302,6 +263,269 @@ function attachIMessageMonitorAbortHandler(params) {
 	return () => abort.removeEventListener("abort", onAbort);
 }
 //#endregion
+//#region extensions/imessage/src/monitor/catchup.ts
+const DEFAULT_MAX_AGE_MINUTES = 120;
+const MAX_MAX_AGE_MINUTES = 720;
+const DEFAULT_PER_RUN_LIMIT = 50;
+const MAX_PER_RUN_LIMIT = 500;
+const DEFAULT_FIRST_RUN_LOOKBACK_MINUTES = 30;
+const DEFAULT_MAX_FAILURE_RETRIES = 10;
+const MAX_MAX_FAILURE_RETRIES = 1e3;
+const cursorWriteQueue = new KeyedAsyncQueue();
+function openCatchupCursorStore() {
+	return getIMessageRuntime().state.openSyncKeyedStore({
+		namespace: IMESSAGE_CATCHUP_CURSOR_NAMESPACE,
+		maxEntries: 256
+	});
+}
+function updateCatchupCursorStore(key, updateValue) {
+	const store = openCatchupCursorStore();
+	if (!store.update) throw new Error("iMessage catchup cursor persistence requires atomic plugin-state update.");
+	return store.update(key, updateValue);
+}
+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 (typeof count !== "number" || !Number.isFinite(count) || count <= 0) continue;
+		out[guid] = Math.floor(count);
+	}
+	return out;
+}
+function normalizeIMessageCatchupCursor(value) {
+	if (!value || typeof value !== "object") return null;
+	const raw = value;
+	if (typeof raw.lastSeenMs !== "number" || !Number.isFinite(raw.lastSeenMs)) return null;
+	if (typeof raw.lastSeenRowid !== "number" || !Number.isFinite(raw.lastSeenRowid)) return null;
+	const failureRetries = sanitizeFailureRetriesInput(raw.failureRetries);
+	const hasRetries = Object.keys(failureRetries).length > 0;
+	return {
+		lastSeenMs: raw.lastSeenMs,
+		lastSeenRowid: raw.lastSeenRowid,
+		updatedAt: typeof raw.updatedAt === "number" ? raw.updatedAt : 0,
+		...hasRetries ? { failureRetries } : {}
+	};
+}
+function readIMessageCatchupCursor(accountId) {
+	return normalizeIMessageCatchupCursor(openCatchupCursorStore().lookup(resolveIMessageCatchupCursorKey(accountId)));
+}
+async function loadIMessageCatchupCursor(accountId) {
+	return readIMessageCatchupCursor(accountId);
+}
+function buildIMessageCatchupCursor(next) {
+	const sanitized = sanitizeFailureRetriesInput(next.failureRetries);
+	const hasRetries = Object.keys(sanitized).length > 0;
+	return {
+		lastSeenMs: next.lastSeenMs,
+		lastSeenRowid: next.lastSeenRowid,
+		updatedAt: Date.now(),
+		...hasRetries ? { failureRetries: sanitized } : {}
+	};
+}
+async function saveIMessageCatchupCursor(accountId, next, options = {}) {
+	const cursor = buildIMessageCatchupCursor(next);
+	updateCatchupCursorStore(resolveIMessageCatchupCursorKey(accountId), (existingValue) => {
+		const existing = normalizeIMessageCatchupCursor(existingValue);
+		if (existing && cursor.lastSeenRowid < existing.lastSeenRowid) {
+			if (!options.allowCursorRewindForRetries) return;
+			return buildIMessageCatchupCursor({
+				lastSeenMs: cursor.lastSeenMs,
+				lastSeenRowid: cursor.lastSeenRowid,
+				failureRetries: {
+					...existing.failureRetries,
+					...cursor.failureRetries
+				}
+			});
+		}
+		return cursor;
+	});
+}
+function clampInt(value, min, max, fallback) {
+	return resolveIntegerOption(value, fallback, {
+		min,
+		max
+	});
+}
+function resolveCatchupConfig(raw) {
+	return {
+		enabled: Boolean(raw?.enabled),
+		maxAgeMinutes: clampInt(raw?.maxAgeMinutes, 1, MAX_MAX_AGE_MINUTES, DEFAULT_MAX_AGE_MINUTES),
+		perRunLimit: clampInt(raw?.perRunLimit, 1, MAX_PER_RUN_LIMIT, DEFAULT_PER_RUN_LIMIT),
+		firstRunLookbackMinutes: clampInt(raw?.firstRunLookbackMinutes, 1, MAX_MAX_AGE_MINUTES, DEFAULT_FIRST_RUN_LOOKBACK_MINUTES),
+		maxFailureRetries: clampInt(raw?.maxFailureRetries, 1, MAX_MAX_FAILURE_RETRIES, DEFAULT_MAX_FAILURE_RETRIES)
+	};
+}
+async function advanceIMessageCatchupCursor(accountId, next, config) {
+	if (!Number.isFinite(next.lastSeenMs) || !Number.isFinite(next.lastSeenRowid)) return false;
+	return await enqueueCursorWrite(accountId, async () => {
+		let advanced = false;
+		updateCatchupCursorStore(resolveIMessageCatchupCursorKey(accountId), (existingValue) => {
+			const cursor = normalizeIMessageCatchupCursor(existingValue);
+			if (cursor && next.lastSeenRowid <= cursor.lastSeenRowid) return;
+			if (Object.values(cursor?.failureRetries ?? {}).some((count) => count < config.maxFailureRetries)) return;
+			advanced = true;
+			return buildIMessageCatchupCursor({
+				lastSeenMs: Math.max(cursor?.lastSeenMs ?? next.lastSeenMs, next.lastSeenMs),
+				lastSeenRowid: next.lastSeenRowid,
+				failureRetries: cursor?.failureRetries
+			});
+		});
+		return advanced;
+	});
+}
+/**
+* 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;
+	const cursor = await loadIMessageCatchupCursor(params.accountId);
+	const lookbackMs = cursor === null ? cfg.firstRunLookbackMinutes * 6e4 : cfg.maxAgeMinutes * 6e4;
+	const ageBoundMs = now - cfg.maxAgeMinutes * 6e4;
+	const windowStartMs = Math.max(cursor?.lastSeenMs ?? now - lookbackMs, ageBoundMs);
+	const windowEndMs = now;
+	const sinceRowid = cursor?.lastSeenRowid ?? 0;
+	const summary = {
+		querySucceeded: false,
+		fullyCaughtUp: false,
+		fetchedCount: 0,
+		replayed: 0,
+		skippedFromMe: 0,
+		skippedPreCursor: 0,
+		skippedGivenUp: 0,
+		failed: 0,
+		givenUp: 0,
+		cursorBefore: cursor ? {
+			lastSeenMs: cursor.lastSeenMs,
+			lastSeenRowid: cursor.lastSeenRowid
+		} : null,
+		cursorAfter: {
+			lastSeenMs: cursor?.lastSeenMs ?? windowStartMs,
+			lastSeenRowid: cursor?.lastSeenRowid ?? 0
+		},
+		windowStartMs,
+		windowEndMs
+	};
+	let fetchResult;
+	try {
+		fetchResult = await params.fetch({
+			sinceMs: windowStartMs,
+			sinceRowid,
+			limit: cfg.perRunLimit
+		});
+	} catch (err) {
+		params.warn?.(`imessage catchup: fetch failed: ${String(err)}`);
+		return summary;
+	}
+	if (!fetchResult.resolved) {
+		params.warn?.(`imessage catchup: fetch returned unresolved result`);
+		return summary;
+	}
+	summary.querySucceeded = true;
+	summary.fullyCaughtUp = fetchResult.fullyCaughtUp !== false;
+	summary.fetchedCount = fetchResult.rows.length;
+	const rows = fetchResult.rows.toSorted((a, b) => a.rowid - b.rowid);
+	const failureRetries = { ...cursor?.failureRetries };
+	const cursorBeforeMs = cursor?.lastSeenMs ?? windowStartMs;
+	const cursorBeforeRowid = cursor?.lastSeenRowid ?? 0;
+	let highWatermarkMs = cursorBeforeMs;
+	let highWatermarkRowid = cursorBeforeRowid;
+	let earliestHeldFailureRow = null;
+	for (const row of rows) {
+		if (row.rowid <= sinceRowid) {
+			summary.skippedPreCursor += 1;
+			continue;
+		}
+		if (row.date < ageBoundMs) {
+			summary.skippedPreCursor += 1;
+			highWatermarkMs = Math.max(highWatermarkMs, row.date);
+			highWatermarkRowid = Math.max(highWatermarkRowid, row.rowid);
+			continue;
+		}
+		if (row.isFromMe) {
+			try {
+				await params.observeSkippedFromMe?.(row);
+			} catch (err) {
+				params.warn?.(`imessage catchup: from-me observer failed for guid=${row.guid}: ${String(err)}`);
+			}
+			summary.skippedFromMe += 1;
+			highWatermarkMs = Math.max(highWatermarkMs, row.date);
+			highWatermarkRowid = Math.max(highWatermarkRowid, row.rowid);
+			continue;
+		}
+		const priorCount = failureRetries[row.guid] ?? 0;
+		if (priorCount >= cfg.maxFailureRetries) {
+			summary.skippedGivenUp += 1;
+			highWatermarkMs = Math.max(highWatermarkMs, row.date);
+			highWatermarkRowid = Math.max(highWatermarkRowid, row.rowid);
+			continue;
+		}
+		let dispatched;
+		try {
+			dispatched = await params.dispatch(row);
+		} catch (err) {
+			params.warn?.(`imessage catchup: dispatch threw for guid=${row.guid}: ${String(err)}`);
+			dispatched = { ok: false };
+		}
+		if (dispatched.ok) {
+			summary.replayed += 1;
+			delete failureRetries[row.guid];
+			highWatermarkMs = Math.max(highWatermarkMs, row.date);
+			highWatermarkRowid = Math.max(highWatermarkRowid, row.rowid);
+			continue;
+		}
+		const nextCount = priorCount + 1;
+		failureRetries[row.guid] = nextCount;
+		summary.failed += 1;
+		if (nextCount >= cfg.maxFailureRetries) {
+			summary.givenUp += 1;
+			params.warn?.(`imessage catchup: giving up on guid=${row.guid} after ${nextCount} failures; advancing cursor past it`);
+			highWatermarkMs = Math.max(highWatermarkMs, row.date);
+			highWatermarkRowid = Math.max(highWatermarkRowid, row.rowid);
+			continue;
+		}
+		if (earliestHeldFailureRow === null || row.rowid < earliestHeldFailureRow.rowid) earliestHeldFailureRow = row;
+	}
+	if (earliestHeldFailureRow === null) {
+		if (typeof fetchResult.highWatermarkMs === "number") highWatermarkMs = Math.max(highWatermarkMs, fetchResult.highWatermarkMs);
+		if (typeof fetchResult.highWatermarkRowid === "number") highWatermarkRowid = Math.max(highWatermarkRowid, fetchResult.highWatermarkRowid);
+	}
+	let lastSeenMs;
+	let lastSeenRowid;
+	if (earliestHeldFailureRow !== null) {
+		lastSeenMs = Math.max(cursorBeforeMs, earliestHeldFailureRow.date - 1);
+		lastSeenRowid = Math.max(cursorBeforeRowid, earliestHeldFailureRow.rowid - 1);
+	} else {
+		lastSeenMs = highWatermarkMs;
+		lastSeenRowid = highWatermarkRowid;
+	}
+	const capped = capFailureRetriesMap(failureRetries);
+	summary.cursorAfter = {
+		lastSeenMs,
+		lastSeenRowid
+	};
+	await saveIMessageCatchupCursor(params.accountId, {
+		lastSeenMs,
+		lastSeenRowid,
+		failureRetries: capped
+	}, { allowCursorRewindForRetries: earliestHeldFailureRow !== null });
+	if (summary.replayed > 0 || summary.failed > 0 || summary.givenUp > 0) params.log?.(`imessage catchup: replayed=${summary.replayed} skippedFromMe=${summary.skippedFromMe} skippedGivenUp=${summary.skippedGivenUp} failed=${summary.failed} givenUp=${summary.givenUp} fetchedCount=${summary.fetchedCount}`);
+	return summary;
+}
+//#endregion
 //#region extensions/imessage/src/monitor/strip-imsg-length-prefixed-text.ts
 const utf8Decoder = new TextDecoder();
 function readVarint(buf, start) {
@@ -342,9 +566,6 @@ function stripImessageLengthPrefixedUtf8Text(text) {
 function isOptionalString(value) {
 	return value === void 0 || value === null || typeof value === "string";
 }
-function isOptionalStringOrNumber(value) {
-	return value === void 0 || value === null || typeof value === "string" || typeof value === "number";
-}
 function isOptionalNumber(value) {
 	return value === void 0 || value === null || typeof value === "number";
 }
@@ -367,7 +588,7 @@ function parseIMessageNotification(raw) {
 	const maybeMessage = raw.message;
 	if (!isRecord(maybeMessage)) return null;
 	const message = maybeMessage;
-	if (!isOptionalNumber(message.id) || !isOptionalString(message.guid) || !isOptionalNumber(message.chat_id) || !isOptionalString(message.sender) || !isOptionalString(message.destination_caller_id) || !isOptionalBoolean(message.is_from_me) || !isOptionalString(message.text) || !isOptionalStringOrNumber(message.reply_to_id) || !isOptionalString(message.reply_to_guid) || !isOptionalString(message.reply_to_text) || !isOptionalString(message.reply_to_sender) || !isOptionalString(message.created_at) || !isOptionalBoolean(message.is_reaction) || !isOptionalBoolean(message.is_tapback) || !isOptionalString(message.associated_message_guid) || !isOptionalNumber(message.associated_message_type) || !isOptionalString(message.reaction_type) || !isOptionalString(message.reaction_emoji) || !isOptionalBoolean(message.is_reaction_add) || !isOptionalString(message.reacted_to_guid) || !isOptionalAttachments(message.attachments) || !isOptionalString(message.chat_identifier) || !isOptionalString(message.chat_guid) || !isOptionalString(message.chat_name) || !isOptionalStringArray(message.participants) || !isOptionalBoolean(message.is_group)) return null;
+	if (!isOptionalNumber(message.id) || !isOptionalString(message.guid) || !isOptionalNumber(message.chat_id) || !isOptionalString(message.sender) || !isOptionalString(message.destination_caller_id) || !isOptionalBoolean(message.is_from_me) || !isOptionalString(message.text) || !isOptionalString(message.thread_originator_guid) || !isOptionalString(message.reply_to_guid) || !isOptionalString(message.reply_to_text) || !isOptionalString(message.reply_to_sender) || !isOptionalString(message.created_at) || !isOptionalBoolean(message.is_reaction) || !isOptionalBoolean(message.is_tapback) || !isOptionalString(message.associated_message_guid) || !isOptionalNumber(message.associated_message_type) || !isOptionalString(message.reaction_type) || !isOptionalString(message.reaction_emoji) || !isOptionalBoolean(message.is_reaction_add) || !isOptionalString(message.reacted_to_guid) || !isOptionalAttachments(message.attachments) || !isOptionalString(message.chat_identifier) || !isOptionalString(message.chat_guid) || !isOptionalString(message.chat_name) || !isOptionalStringArray(message.participants) || !isOptionalBoolean(message.is_group)) return null;
 	return {
 		...message,
 		text: typeof message.text === "string" ? stripImessageLengthPrefixedUtf8Text(message.text) : message.text,
@@ -587,15 +808,16 @@ function combineIMessagePayloads(payloads) {
 		seenGuids.add(guid);
 		coalescedMessageGuids.push(guid);
 	}
-	const entryWithReply = payloads.find((p) => p.reply_to_id != null);
+	const reply = payloads.find((payload) => payload.thread_originator_guid != null || payload.reply_to_guid != null) ?? first;
 	return {
 		...first,
 		text: combinedText,
 		attachments: allAttachments.length > 0 ? allAttachments : null,
 		created_at: latestCreatedAt,
-		reply_to_id: entryWithReply?.reply_to_id ?? first.reply_to_id ?? null,
-		reply_to_text: entryWithReply?.reply_to_text ?? first.reply_to_text ?? null,
-		reply_to_sender: entryWithReply?.reply_to_sender ?? first.reply_to_sender ?? null,
+		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,
@@ -1033,7 +1255,7 @@ function isStaleIMessageBacklog(message, nowMs, thresholdMs = IMESSAGE_STALE_INB
 //#endregion
 //#region extensions/imessage/src/conversation-route.ts
 function resolveIMessageConversationRoute(params) {
-	let route = resolveAgentRoute({
+	const route = resolveAgentRoute({
 		cfg: params.cfg,
 		channel: "imessage",
 		accountId: params.accountId,
@@ -1047,28 +1269,30 @@ function resolveIMessageConversationRoute(params) {
 		sender: params.sender,
 		chatId: params.chatId
 	});
-	if (!conversationId) return route;
-	route = resolveConfiguredBindingRoute({
+	if (!conversationId) return {
+		route,
+		bindingResolution: null
+	};
+	const conversation = {
+		channel: "imessage",
+		accountId: params.accountId,
+		conversationId
+	};
+	const configuredRoute = resolveConfiguredBindingRoute({
 		cfg: params.cfg,
 		route,
-		conversation: {
-			channel: "imessage",
-			accountId: params.accountId,
-			conversationId
-		}
-	}).route;
+		conversation
+	});
 	const runtimeRoute = resolveRuntimeConversationBindingRoute({
-		route,
-		conversation: {
-			channel: "imessage",
-			accountId: params.accountId,
-			conversationId
-		}
+		route: configuredRoute.route,
+		conversation
 	});
-	route = runtimeRoute.route;
 	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;
+	return {
+		route: runtimeRoute.route,
+		bindingResolution: runtimeRoute.bindingRecord ? null : configuredRoute.bindingResolution
+	};
 }
 //#endregion
 //#region extensions/imessage/src/monitor/reflection-guard.ts
@@ -1213,7 +1437,7 @@ function describeReplyContext(message) {
 	if (!body) return null;
 	return {
 		body,
-		id: normalizeReplyField(message.reply_to_id),
+		id: normalizeReplyField(message.thread_originator_guid) ?? normalizeReplyField(message.reply_to_guid),
 		sender: normalizeReplyField(message.reply_to_sender)
 	};
 }
@@ -1391,7 +1615,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 = resolveIMessageConversationRoute({
+	const { route, bindingResolution } = resolveIMessageConversationRoute({
 		cfg: params.cfg,
 		accountId: params.accountId,
 		isGroup,
@@ -1689,6 +1913,7 @@ async function resolveIMessageInboundDecision(params) {
 		sender,
 		senderNormalized,
 		route,
+		bindingResolution,
 		bodyText,
 		createdAt,
 		replyContext: filteredReplyContext,
@@ -1754,11 +1979,8 @@ async function buildIMessageInboundContext(params) {
 			envelope: envelopeOptions
 		})
 	});
-	const imessageTo = decision.isGroup ? chatTarget || `imessage:${decision.sender}` : buildDirectIMessageReplyTarget({
-		cfg: params.cfg,
-		accountId: decision.route.accountId,
-		sender: decision.sender
-	});
+	const directService = resolveIMessageDirectChatService(params.accountService, decision.chatGuid) ?? "auto";
+	const imessageTo = decision.isGroup ? chatTarget || `imessage:${decision.sender}` : `${directService}:${decision.sender}`;
 	const imessageFrom = decision.isGroup ? `imessage:group:${chatId ?? "unknown"}` : imessageTo;
 	const inboundHistory = !decision.isGroup && params.dmHistory?.inboundHistory ? params.dmHistory.inboundHistory : decision.isGroup && decision.historyKey && params.historyLimit > 0 ? createChannelHistoryWindow({ historyMap: params.groupHistories }).buildInboundHistory({
 		historyKey: decision.historyKey,
@@ -1787,11 +2009,16 @@ async function buildIMessageInboundContext(params) {
 			from: imessageFrom,
 			sender: {
 				id: decision.sender,
-				name: decision.senderNormalized
+				name: decision.senderNormalized,
+				isSelf: params.message.is_from_me === true
 			},
 			conversation: {
 				kind: decision.isGroup ? "group" : "direct",
 				id: chatId != null ? String(chatId) : decision.sender,
+				...decision.isGroup && chatId == null ? {} : { routePeer: {
+					kind: decision.isGroup ? "group" : "direct",
+					id: decision.isGroup ? String(chatId) : decision.senderNormalized
+				} },
 				label: fromLabel
 			},
 			route: {
@@ -1840,13 +2067,6 @@ function buildIMessageEchoScope(params) {
 	if (params.chatIdentifier) scopes.push(`${params.accountId}:chat_identifier:${params.chatIdentifier}`);
 	return scopes;
 }
-function buildDirectIMessageReplyTarget(params) {
-	if (resolveIMessageAccount({
-		cfg: params.cfg,
-		accountId: params.accountId
-	}).config.service === "sms") return `sms:${params.sender}`;
-	return `imessage:${params.sender}`;
-}
 function describeIMessageEchoDropLog(params) {
 	const preview = truncateUtf16Safe(params.messageText, 50);
 	return `imessage: skipping echo message${params.messageId ? ` id=${params.messageId}` : ""}: "${preview}"`;
@@ -2879,7 +3099,7 @@ async function monitorIMessageProvider(opts = {}) {
 		const conversationKey = chatId != null ? `group:${chatId}` : `dm:${senderForKey}`;
 		const rateLimitKey = `${accountInfo.accountId}:${conversationKey}`;
 		if (decision.kind === "drop") {
-			if (decision.reason === "echo" || decision.reason === "self-chat echo" || decision.reason === "reflected assistant content") loopRateLimiter.record(rateLimitKey);
+			if (decision.reason === "echo" || decision.reason === "reflected assistant content") loopRateLimiter.record(rateLimitKey);
 			const diagnostic = describeIMessageInboundDropDiagnostic({
 				accountId: accountInfo.accountId,
 				reason: decision.reason,
@@ -2956,6 +3176,16 @@ async function monitorIMessageProvider(opts = {}) {
 			});
 			return;
 		}
+		if (decision.bindingResolution) {
+			const readiness = await ensureConfiguredBindingRouteReady({
+				cfg,
+				bindingResolution: decision.bindingResolution
+			});
+			if (!readiness.ok) {
+				runtime.error?.(`imessage: dropped inbound message; configured ACP binding unavailable for ${decision.bindingResolution.record.conversation.conversationId}: ${readiness.error}`);
+				return;
+			}
+		}
 		const storePath = resolveStorePath(cfg.session?.store, { agentId: decision.route.agentId });
 		const privateApiStatus = getCachedIMessagePrivateApiStatus(cliPath);
 		const supportsTyping = imessageRpcSupportsMethod(privateApiStatus, "typing");
@@ -2975,11 +3205,9 @@ async function monitorIMessageProvider(opts = {}) {
 			chatType: decision.isGroup ? "group" : "direct"
 		});
 		const shouldUseDirectToolTypingOptions = !decision.isGroup && sendPolicy !== "deny" && (configuredTypingMode === void 0 || configuredTypingMode === "instant");
-		const earlyDirectTypingTarget = supportsTyping && shouldUseDirectToolTypingOptions ? buildDirectIMessageReplyTarget({
-			cfg,
-			accountId: decision.route.accountId,
-			sender: decision.sender
-		}) : void 0;
+		const shouldStartDirectTyping = supportsTyping && shouldUseDirectToolTypingOptions;
+		const earlyDirectTypingService = resolveIMessageDirectChatService(imessageCfg.service, decision.chatGuid) ?? "auto";
+		const earlyDirectTypingTarget = shouldStartDirectTyping ? `${earlyDirectTypingService}:${decision.sender}` : void 0;
 		let stopEarlyDirectTyping;
 		if (earlyDirectTypingTarget) {
 			const earlyDirectTypingStarted = sendIMessageTyping(earlyDirectTypingTarget, true, {
@@ -3056,8 +3284,10 @@ async function monitorIMessageProvider(opts = {}) {
 			envelopeOptions: resolveEnvelopeFormatOptions(cfg),
 			logVerbose
 		}) : void 0;
+		const pluginChannelRuntime = opts.channelRuntime;
 		const { ctxPayload, chatTarget, imessageTo } = await buildIMessageInboundContext({
 			cfg,
+			accountService: imessageCfg.service,
 			decision: contextDecision,
 			message,
 			previousTimestamp,
@@ -3065,7 +3295,7 @@ async function monitorIMessageProvider(opts = {}) {
 			historyLimit,
 			groupHistories,
 			dmHistory,
-			buildContext: opts.channelRuntime?.inbound.buildContext,
+			buildContext: pluginChannelRuntime?.inbound.buildContext,
 			media: { facts: mediaAttachments }
 		});
 		const updateTarget = chatTarget || imessageTo;
@@ -3080,7 +3310,8 @@ async function monitorIMessageProvider(opts = {}) {
 		}
 		const sendReadReceipts = imessageCfg.sendReadReceipts !== false;
 		const typingTarget = ctxPayload.To;
-		if (supportsRead && sendReadReceipts && typingTarget) markIMessageChatRead(typingTarget, {
+		const readTarget = !decision.isGroup && decision.chatGuid ? `chat_guid:${decision.chatGuid}` : typingTarget;
+		if (supportsRead && sendReadReceipts && readTarget) markIMessageChatRead(readTarget, {
 			cfg,
 			accountId: accountInfo.accountId,
 			cliPath,
@@ -3217,6 +3448,7 @@ async function monitorIMessageProvider(opts = {}) {
 						sessionKey: decision.route.sessionKey
 					},
 					ctxPayload,
+					dispatchReplyFromConfig: pluginChannelRuntime?.reply?.dispatchReplyFromConfig,
 					record: {
 						updateLastRoute: !decision.isGroup && updateTarget ? {
 							sessionKey: inboundLastRouteSessionKey,