@openclaw/imessage 2026.10.10 → 2026.11.5-beta.1

package/dist/.setup/{channel.runtime-BW4A0m4h.mjs → channel.runtime-XJGx1MIH.mjs}

@@ -1,22 +1,20 @@
-import { c as parseIMessageTarget, o as normalizeIMessageHandle, r as isAllowedIMessageReplyContextSender, s as parseIMessageAllowTarget, t as formatIMessageChatTarget } from "./targets-CIx4BKqL.mjs";
-import { d as resolveIMessageChatDbLookupPath, f as resolveIMessageHomeDir, l as resolveIMessageRemoteHost, o as resolveIMessageAccount, r as listEnabledIMessageAccounts, s as resolveIMessageDuplicateSourceOwner } from "./accounts-BH0coL46.mjs";
-import { r as imessageRpcSupportsMethod } from "./message-tool-api-CxSY_rh7.mjs";
-import { S as resolveIMessageDirectChatService, h as resolveIMessageEchoMediaKey, m as resolveIMessageCatchupCursorKey, n as createIMessageRpcClient, o as isKnownFromMeIMessageTarget, p as capFailureRetriesMap, s as rememberIMessageReplyCache, u as IMESSAGE_CATCHUP_CURSOR_NAMESPACE } from "./client-C3e7ZLqA.mjs";
-import { a as normalizeIMessageMessageId, i as normalizeIMessageGuid, n as probeIMessage, r as probeIMessagePrivateApi } from "./actions-CW7XYYF4.mjs";
-import { t as getIMessageRuntime } from "./runtime-BRQCPuAD.mjs";
-import { a as resolveIMessageGroupSystemPrompt, s as resolveIMessageInboundConversationId } from "./channel-6kcKpSRw.mjs";
-import { r as sanitizeOutboundText } from "./sanitize-outbound-C02fJrn6.mjs";
-import { n as resolveIMessageAttachmentRoots, r as resolveIMessageRemoteAttachmentRoots } from "./media-contract-CoixpXRX.mjs";
+import { c as parseIMessageAllowTarget, i as isAllowedIMessageReplyContextSender, l as parseIMessageTarget, n as iMessageTargetRpcParams, s as normalizeIMessageHandle, t as formatIMessageChatTarget } from "./targets-C7CIWJ0k.mjs";
+import { d as resolveIMessageChatDbLookupPath, f as resolveIMessageHomeDir, l as resolveIMessageRemoteHost, o as resolveIMessageAccount, r as listEnabledIMessageAccounts, s as resolveIMessageDuplicateSourceOwner } from "./accounts-C1Ypv3Wn.mjs";
+import { r as imessageRpcSupportsMethod } from "./message-tool-api-DtZ1wKbT.mjs";
+import { a as resolveIMessageDirectChatService } from "./chat-context-fTfJVqAi.mjs";
+import { n as createIMessageRpcClient, r as normalizeIMessageFullDiskAccessError } from "./client-D_BaG8sC.mjs";
+import { a as rememberIMessageReplyCache, b as normalizeIMessageMessageId, c as IMESSAGE_CATCHUP_CURSOR_NAMESPACE, d as capFailureRetriesMap, f as resolveIMessageCatchupCursorKey, h as getIMessageRuntime, i as isKnownFromMeIMessageTarget, n as probeIMessage, p as resolveIMessageEchoMediaKey, r as probeIMessagePrivateApi, y as normalizeIMessageGuid } from "./actions-qOuKy8To.mjs";
+import { a as resolveIMessageGroupSystemPrompt, s as resolveIMessageInboundConversationId } from "./channel-CLaN4mQn.mjs";
+import { r as sanitizeOutboundText } from "./sanitize-outbound-Dhjhz0a-.mjs";
+import { n as resolveIMessageAttachmentRoots, r as resolveIMessageRemoteAttachmentRoots } from "./media-contract-BErFBKV9.mjs";
 import { t as IMESSAGE_LEGACY_OUTBOUND_SEND_DEP_KEYS } from "./outbound-send-deps-_da8jqeo.mjs";
-import { i as resolveIMessageStartupRowidWatermark } from "./remote-file-CCgMYZ-u.mjs";
-import { i as registerIMessageApprovalReactionTarget, n as handleIMessageApprovalReaction, o as listPendingIMessageApprovalReactionPollTargets, r as maybeResolveIMessageApprovalReaction } from "./approval-reactions-B9CJS0NT.mjs";
-import { n as hasPersistedIMessageEcho, r as normalizeIMessageEchoText, s as maybeResolveIMessageApprovalPollVote, t as sendMessageIMessage } from "./send-D98hQFdv.mjs";
-import { t as resolveIMessageReactionContext } from "./reaction-context-Bw00FkmU.mjs";
-import { n as maybeResolveIMessageQuestionReaction, t as hasIMessageQuestionReactionTarget } from "./question-reactions-DTj-VH3N.mjs";
-import { imessageSetupWizard } from "./setup-surface-aRZhAzzQ.mjs";
+import { i as resolveIMessageStartupRowidWatermark } from "./remote-file-DpK3GQFD.mjs";
+import { a as resolveIMessageReactionContext, n as handleIMessageApprovalReaction, o as listPendingIMessageApprovalReactionPollTargets, r as registerIMessageApprovalReactionTarget } from "./approval-reactions-DBBsqbRC.mjs";
+import { n as hasPersistedIMessageEcho, r as normalizeIMessageEchoText, s as maybeResolveIMessageApprovalPollVote, t as sendMessageIMessage } from "./send-DhEW0gfe.mjs";
 import { asSafeIntegerInRange, hasNonEmptyString, isRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeStringEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { normalizeChannelDmPolicy } from "openclaw/plugin-sdk/channel-config-helpers";
 import { bindIngressLifecycleToReplyOptions, createAccountStatusSink, createChannelDeliveryAccumulator, createChannelIngressError, createChannelIngressMonitor, createChannelMessageReplyPipeline, resolveChannelStreamingBlockEnabled, resolveOutboundSendDep } from "openclaw/plugin-sdk/channel-outbound";
+import { resolveChannelGroupPolicy, resolveChannelGroups, resolveChannelGroupsConfigPath, resolveScopeRequireMention } from "openclaw/plugin-sdk/channel-policy";
 import { resolveTextChunkLimit } from "openclaw/plugin-sdk/reply-runtime";
 import { resolveAgentRoute, resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
 import path from "node:path";
@@ -24,17 +22,16 @@ import { resolveChannelMediaMaxBytes } from "openclaw/plugin-sdk/account-helpers
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import fs from "node:fs/promises";
 import { isInboundPathAllowed, kindFromMime } from "openclaw/plugin-sdk/media-runtime";
-import { createNonExitingRuntime, danger, logVerbose, shouldLogVerbose, sleepWithAbort, waitForAbortSignal, warn } from "openclaw/plugin-sdk/runtime-env";
-import { asDateTimestampMs, asPositiveFiniteNumber, parseDateStringTimestampMs, resolveIntegerOption, resolvePromptHistoryLimit, timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
+import { createNonExitingRuntime, danger, logVerbose, sleepWithAbort, waitForAbortSignal, warn } from "openclaw/plugin-sdk/runtime-env";
 import { createHash } from "node:crypto";
 import { captureRuntimeConfigAsyncReader, createRuntimeConfigReader } 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 { resolveChannelGroupPolicy, resolveChannelGroups, resolveChannelGroupsConfigPath, resolveScopeRequireMention } from "openclaw/plugin-sdk/channel-policy";
-import { convertMarkdownTables, findCodeRegions, isInsideCode, sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
+import { convertMarkdownTables, findCodeRegions, isInsideCode } from "openclaw/plugin-sdk/text-chunking";
 import { buildChannelInboundEventContext, buildMentionRegexes, createChannelInboundDebouncer, filterChannelInboundQuoteContext, formatInboundEnvelope, formatInboundFromLabel, formatInboundMediaUnavailableText, formatMediaPlaceholderText, logInboundDrop, matchesMentionPatterns, resolveEnvelopeFormatOptions, resolveInboundDebounceMs, resolveInboundMentionDecision, resolveInboundSupplementalSenderAllowed, runChannelInboundEvent, shouldDebounceTextInbound, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
 import { FsSafeError, openLocalFileSafely, resolvePinnedMainDmOwnerFromAllowlist } from "openclaw/plugin-sdk/security-runtime";
 import { resolvePreferredOpenClawTmpDir, withTempWorkspace } from "openclaw/plugin-sdk/temp-path";
+import { asDateTimestampMs, asPositiveFiniteNumber, parseDateStringTimestampMs, resolveIntegerOption, resolvePromptHistoryLimit, timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
 import { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-runtime";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
@@ -44,15 +41,16 @@ import { defineStableChannelIngressIdentity, fanInChannelIngressLifecycles } fro
 import { createChannelPairingChallengeIssuer } from "openclaw/plugin-sdk/channel-pairing";
 import { registerChannelRuntimeContext } from "openclaw/plugin-sdk/channel-runtime-context";
 import { ensureConfiguredBindingRouteReady, readChannelAllowFromStore, upsertChannelPairingRequest } from "openclaw/plugin-sdk/conversation-runtime";
+import { createDedupeCache } from "openclaw/plugin-sdk/dedupe-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";
 import { getSessionEntryAsync, readSessionUpdatedAtAsync, resolveSendPolicy, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { waitForTransportReady } from "openclaw/plugin-sdk/transport-ready-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
+import { isStringArray } from "openclaw/plugin-sdk/collection-input-runtime";
 import { chunkMarkdownTextWithMode, resolveChunkMode } from "openclaw/plugin-sdk/reply-chunking";
 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";
 import { resolveChannelContextVisibilityMode } from "openclaw/plugin-sdk/context-visibility-runtime";
 import { createChannelHistoryWindow } from "openclaw/plugin-sdk/reply-history";
@@ -62,112 +60,43 @@ import { readFileHandleBounded } from "openclaw/plugin-sdk/file-access-runtime";
 import { saveMediaBuffer } from "openclaw/plugin-sdk/media-store";
 import { loadWebMedia } from "openclaw/plugin-sdk/web-media";
 import { enqueueRoutedSystemEvent } from "openclaw/plugin-sdk/system-event-runtime";
+import { sha256Hex } from "openclaw/plugin-sdk/node-crypto-runtime";
 // extensions/imessage/src/approval-reaction-poller.ts
 const RECENT_CHAT_LIMIT = 50;
 const PER_CHAT_HISTORY_LIMIT$1 = 30;
 function normalizeChatId(value) {
 	return asPositiveFiniteNumber(value) ?? null;
 }
-function listTargetChatIds(targets) {
-	const chatIds = /* @__PURE__ */ new Set();
-	for (const target of targets) {
-		const chatId = normalizeChatId(target.conversation.chatId);
-		if (chatId !== null) chatIds.add(chatId);
-	}
-	return [...chatIds];
-}
-function hasUnscopedTarget(targets) {
-	return targets.some((target) => normalizeChatId(target.conversation.chatId) === null);
-}
 function enumerateMessageGuidCandidates(value) {
 	const trimmed = value.trim();
 	if (!trimmed) return [];
 	return [trimmed, normalizeIMessageGuid(trimmed)].filter((candidate, index, candidates) => candidate.length > 0 && candidates.indexOf(candidate) === index);
 }
-function buildPendingTargetsByMessageId(targets) {
-	const pendingByMessageId = /* @__PURE__ */ new Map();
-	for (const target of targets) for (const candidate of enumerateMessageGuidCandidates(target.messageId)) pendingByMessageId.set(candidate, target);
-	return pendingByMessageId;
-}
 async function listRecentChatIds(client) {
 	return ((await client.request("chats.list", { limit: RECENT_CHAT_LIMIT }, { timeoutMs: 1e4 })).chats ?? []).map((chat) => normalizeChatId(chat.id)).filter((chatId) => chatId !== null);
 }
-async function fetchRecentHistory(params) {
-	return ((await params.client.request("messages.history", {
-		chat_id: params.chatId,
-		limit: PER_CHAT_HISTORY_LIMIT$1
-	}, { timeoutMs: 1e4 })).messages ?? []).filter((message) => Boolean(message && typeof message === "object"));
-}
-function buildReactionPayload(params) {
-	const emoji = params.reaction.emoji?.trim();
-	const sender = params.reaction.sender?.trim();
-	const targetGuid = params.targetMessage.guid?.trim();
-	if (!emoji || !sender || !targetGuid) return null;
-	const reactionId = normalizeChatId(params.reaction.id);
-	return {
-		...reactionId !== null ? { id: reactionId } : {},
-		guid: `reaction:${targetGuid}:${sender}:${emoji}:${params.reaction.created_at ?? ""}`,
-		chat_id: params.targetMessage.chat_id,
-		chat_guid: params.targetMessage.chat_guid,
-		chat_identifier: params.targetMessage.chat_identifier,
-		chat_name: params.targetMessage.chat_name,
-		participants: params.targetMessage.participants,
-		is_group: params.targetMessage.is_group,
-		sender,
-		destination_caller_id: params.targetMessage.destination_caller_id,
-		is_from_me: params.reaction.is_from_me,
-		text: `${params.reaction.type ?? "reaction"} "${params.targetMessage.text ?? ""}"`,
-		created_at: params.reaction.created_at,
-		is_reaction: true,
-		is_tapback: true,
-		associated_message_guid: targetGuid,
-		associated_message_type: 2e3,
-		reaction_type: params.reaction.type ?? void 0,
-		reaction_emoji: emoji,
-		is_reaction_add: true,
-		reacted_to_guid: targetGuid
-	};
-}
-function buildConversationKeyFromMessage(message) {
-	return {
-		...message.chat_guid?.trim() ? { chatGuid: message.chat_guid.trim() } : {},
-		...message.chat_identifier?.trim() ? { chatIdentifier: message.chat_identifier.trim() } : {},
-		...normalizeChatId(message.chat_id) !== null ? { chatId: message.chat_id } : {}
-	};
-}
-async function bindObservedConversation(params) {
-	const nowMs = asDateTimestampMs(Date.now());
-	const expiresAtMs = asDateTimestampMs(params.target.expiresAtMs);
-	if (nowMs === void 0 || expiresAtMs === void 0 || expiresAtMs <= nowMs) return;
-	const ttlMs = expiresAtMs - nowMs;
-	const conversation = buildConversationKeyFromMessage(params.message);
-	const messageIds = /* @__PURE__ */ new Set([...enumerateMessageGuidCandidates(params.target.messageId), ...enumerateMessageGuidCandidates(params.message.guid ?? "")]);
-	await Promise.all([...messageIds].map((messageId) => registerIMessageApprovalReactionTarget({
-		accountId: params.target.accountId,
-		conversation,
-		messageId,
-		approvalId: params.target.approvalId,
-		approvalKind: params.target.approvalKind,
-		allowedDecisions: params.target.allowedDecisions,
-		ttlMs
-	})));
-}
 async function pollPendingIMessageApprovalReactions(params) {
 	const targets = await listPendingIMessageApprovalReactionPollTargets({ accountId: params.accountId });
 	if (params.signal?.aborted || targets.length === 0) return;
-	const pendingByMessageId = buildPendingTargetsByMessageId(targets);
-	const explicitChatIds = listTargetChatIds(targets);
-	const chatIds = params.allowRecentChatDiscovery === true && hasUnscopedTarget(targets) ? [.../* @__PURE__ */ new Set([...explicitChatIds, ...await listRecentChatIds(params.client)])] : explicitChatIds;
+	const pendingByMessageId = /* @__PURE__ */ new Map();
+	for (const target of targets) for (const candidate of enumerateMessageGuidCandidates(target.messageId)) pendingByMessageId.set(candidate, target);
+	const targetChatIds = /* @__PURE__ */ new Set();
+	for (const target of targets) {
+		const chatId = normalizeChatId(target.conversation.chatId);
+		if (chatId !== null) targetChatIds.add(chatId);
+	}
+	const explicitChatIds = [...targetChatIds];
+	const chatIds = params.allowRecentChatDiscovery === true && targets.some((target) => normalizeChatId(target.conversation.chatId) === null) ? [.../* @__PURE__ */ new Set([...explicitChatIds, ...await listRecentChatIds(params.client)])] : explicitChatIds;
 	for (const chatId of chatIds) {
 		if (params.signal?.aborted) return;
 		let messages;
 		try {
-			messages = await fetchRecentHistory({
-				client: params.client,
-				chatId
-			});
+			messages = ((await params.client.request("messages.history", {
+				chat_id: chatId,
+				limit: PER_CHAT_HISTORY_LIMIT$1
+			}, { timeoutMs: 1e4 })).messages ?? []).filter((message) => Boolean(message && typeof message === "object"));
 		} catch (err) {
-			params.logVerboseMessage?.(`imessage: approval reaction poll skipped chat_id=${chatId}: ${String(err)}`);
+			logVerbose(`imessage: approval reaction poll skipped chat_id=${chatId}: ${String(err)}`);
 			continue;
 		}
 		for (const message of messages) {
@@ -176,24 +105,66 @@ async function pollPendingIMessageApprovalReactions(params) {
 			if (!targetGuid) continue;
 			const target = pendingByMessageId.get(targetGuid) ?? pendingByMessageId.get(normalizeIMessageGuid(targetGuid));
 			if (!target) continue;
-			await bindObservedConversation({
-				target,
-				message
-			});
+			await (async () => {
+				const nowMs = asDateTimestampMs(Date.now());
+				const expiresAtMs = asDateTimestampMs(target.expiresAtMs);
+				if (nowMs === void 0 || expiresAtMs === void 0 || expiresAtMs <= nowMs) return;
+				const ttlMs = expiresAtMs - nowMs;
+				const conversation = {
+					...message.chat_guid?.trim() ? { chatGuid: message.chat_guid.trim() } : {},
+					...message.chat_identifier?.trim() ? { chatIdentifier: message.chat_identifier.trim() } : {},
+					...normalizeChatId(message.chat_id) !== null ? { chatId: message.chat_id } : {}
+				};
+				const messageIds = /* @__PURE__ */ new Set([...enumerateMessageGuidCandidates(target.messageId), ...enumerateMessageGuidCandidates(message.guid ?? "")]);
+				await Promise.all([...messageIds].map((messageId) => registerIMessageApprovalReactionTarget({
+					accountId: target.accountId,
+					conversation,
+					messageId,
+					approvalId: target.approvalId,
+					approvalKind: target.approvalKind,
+					allowedDecisions: target.allowedDecisions,
+					ttlMs
+				})));
+			})();
 			for (const reaction of message.reactions ?? []) {
 				if (params.signal?.aborted) return;
-				const reactionPayload = buildReactionPayload({
-					targetMessage: message,
-					reaction
-				});
+				const reactionPayload = (() => {
+					const emoji = reaction.emoji?.trim();
+					const sender = reaction.sender?.trim();
+					const reactionTargetGuid = message.guid?.trim();
+					if (!emoji || !sender || !reactionTargetGuid) return null;
+					const reactionId = normalizeChatId(reaction.id);
+					return {
+						...reactionId !== null ? { id: reactionId } : {},
+						guid: `reaction:${reactionTargetGuid}:${sender}:${emoji}:${reaction.created_at ?? ""}`,
+						chat_id: message.chat_id,
+						chat_guid: message.chat_guid,
+						chat_identifier: message.chat_identifier,
+						chat_name: message.chat_name,
+						participants: message.participants,
+						is_group: message.is_group,
+						sender,
+						destination_caller_id: message.destination_caller_id,
+						is_from_me: reaction.is_from_me,
+						text: `${reaction.type ?? "reaction"} "${message.text ?? ""}"`,
+						created_at: reaction.created_at,
+						is_reaction: true,
+						is_tapback: true,
+						associated_message_guid: reactionTargetGuid,
+						associated_message_type: 2e3,
+						reaction_type: reaction.type ?? void 0,
+						reaction_emoji: emoji,
+						is_reaction_add: true,
+						reacted_to_guid: reactionTargetGuid
+					};
+				})();
 				if (!reactionPayload) continue;
 				if ((await handleIMessageApprovalReaction({
 					cfg: params.cfg,
 					accountId: params.accountId,
 					message: reactionPayload,
 					bodyText: reactionPayload.text ?? "",
-					gatewayRuntime: params.gatewayRuntime,
-					logVerboseMessage: params.logVerboseMessage
+					gatewayRuntime: params.gatewayRuntime
 				})).stopPolling) return;
 			}
 		}
@@ -202,19 +173,15 @@ async function pollPendingIMessageApprovalReactions(params) {
 // extensions/imessage/src/chat.ts
 async function runChatAction(method, to, opts, isTyping) {
 	const cfg = requireRuntimeConfig(opts.cfg, "iMessage chat action");
-	const account = opts.account ?? resolveIMessageAccount({
+	const account = resolveIMessageAccount({
 		cfg,
 		accountId: opts.accountId
 	});
-	const target = parseIMessageTarget(opts.chatId ? formatIMessageChatTarget(opts.chatId) : to);
-	const params = {};
-	if (target.kind === "chat_id") params.chat_id = target.chatId;
-	else if (target.kind === "chat_guid") params.chat_guid = target.chatGuid;
-	else if (target.kind === "chat_identifier") params.chat_identifier = target.chatIdentifier;
-	else params.to = target.to;
+	const target = parseIMessageTarget(to);
+	const params = iMessageTargetRpcParams(target);
 	if (method === "typing") {
 		params.typing = isTyping;
-		const service = opts.service ?? (target.kind === "handle" ? target.service : void 0) ?? account.config.service;
+		const service = (target.kind === "handle" ? target.service : void 0) ?? account.config.service;
 		if (service) params.service = service;
 	}
 	const cliPath = opts.cliPath?.trim() || account.config.cliPath?.trim() || "imsg";
@@ -230,7 +197,7 @@ async function runChatAction(method, to, opts, isTyping) {
 	});
 	const shouldClose = !opts.client;
 	try {
-		await client.request(method, params, { timeoutMs: opts.timeoutMs });
+		await client.request(method, params);
 	} finally {
 		if (shouldClose) await client.stop();
 	}
@@ -358,13 +325,12 @@ async function advanceIMessageCatchupCursor(accountId, next, config) {
 	return await updateIMessageCatchupCursor(accountId, (existing) => decideLiveCatchupCursorAdvance(existing, cursor, config.maxFailureRetries));
 }
 async function performIMessageCatchup(params) {
-	const now = params.now ?? Date.now();
+	const 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,
@@ -372,20 +338,9 @@ async function performIMessageCatchup(params) {
 		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
+		givenUp: 0
 	};
 	let fetchResult;
 	try {
@@ -413,16 +368,10 @@ async function performIMessageCatchup(params) {
 	let highWatermarkRowid = cursorBeforeRowid;
 	let earliestHeldFailureRow = null;
 	for (const row of rows) {
-		if (row.rowid <= sinceRowid) {
-			summary.skippedPreCursor += 1;
-			continue;
-		}
+		if (row.rowid <= sinceRowid) continue;
 		highWatermarkMs = Math.max(highWatermarkMs, row.date);
 		highWatermarkRowid = Math.max(highWatermarkRowid, row.rowid);
-		if (row.date < ageBoundMs) {
-			summary.skippedPreCursor += 1;
-			continue;
-		}
+		if (row.date < ageBoundMs) continue;
 		if (row.isFromMe) {
 			try {
 				await params.observeSkippedFromMe?.(row);
@@ -473,10 +422,6 @@ async function performIMessageCatchup(params) {
 		lastSeenRowid = highWatermarkRowid;
 	}
 	const capped = capFailureRetriesMap(failureRetries);
-	summary.cursorAfter = {
-		lastSeenMs,
-		lastSeenRowid
-	};
 	const next = buildIMessageCatchupCursor({
 		lastSeenMs,
 		lastSeenRowid,
@@ -532,7 +477,7 @@ function isOptionalBoolean(value) {
 	return value === void 0 || value === null || typeof value === "boolean";
 }
 function isOptionalStringArray(value) {
-	return value === void 0 || value === null || Array.isArray(value) && value.every((entry) => typeof entry === "string");
+	return value === void 0 || value === null || isStringArray(value);
 }
 function isOptionalAttachments(value) {
 	if (value === void 0 || value === null) return true;
@@ -675,8 +620,7 @@ async function runIMessageCatchup(params) {
 			await params.observeSkippedFromMePayload?.(entry.message);
 		},
 		log,
-		warn: warnLog,
-		...params.now ? { now: params.now() } : {}
+		warn: warnLog
 	});
 }
 // extensions/imessage/src/monitor/coalesce.ts
@@ -707,7 +651,7 @@ function combineIMessagePayloads(payloads) {
 		const keepContent = payloadIndex < 9 || payloadIndex === payloads.length - 1;
 		payloadIndex += 1;
 		const createdAt = payload.created_at;
-		if (typeof createdAt === "string" && createdAt.length > 0 && (latestCreatedAt === void 0 || createdAt > latestCreatedAt)) latestCreatedAt = createdAt;
+		if (createdAt && (latestCreatedAt === void 0 || createdAt > latestCreatedAt)) latestCreatedAt = createdAt;
 		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() : "";
@@ -770,7 +714,7 @@ function extractAuthoritativeRecoveryProjection(entry) {
 	if (hasNonEmptyString(entry.chat_guid)) projection.chat_guid = entry.chat_guid;
 	if (hasNonEmptyString(entry.chat_identifier)) projection.chat_identifier = entry.chat_identifier;
 	if (typeof entry.chat_name === "string") projection.chat_name = entry.chat_name;
-	if (Array.isArray(entry.participants) && entry.participants.every((participant) => typeof participant === "string")) projection.participants = entry.participants;
+	if (isStringArray(entry.participants)) projection.participants = entry.participants;
 	return hasUsableConversationAnchor(projection) ? projection : null;
 }
 function projectionConflictKey(projection) {
@@ -930,14 +874,6 @@ function historyRowSortValue(message) {
 	const createdAtMs = typeof message.created_at === "string" ? Date.parse(message.created_at) : NaN;
 	return Number.isFinite(createdAtMs) ? createdAtMs : 0;
 }
-function isBeforeCurrentMessage(params) {
-	const { message, currentMessage } = params;
-	if (typeof message.id === "number" && typeof currentMessage.id === "number" && Number.isFinite(message.id) && Number.isFinite(currentMessage.id)) return message.id < currentMessage.id;
-	const guid = normalizeOptionalString(message.guid);
-	const currentGuid = normalizeOptionalString(currentMessage.guid);
-	if (guid && currentGuid) return guid !== currentGuid;
-	return true;
-}
 function historyEntryFromMessage(message, fallbackSender) {
 	const body = normalizeOptionalString(message.text);
 	if (!body) return null;
@@ -960,13 +896,17 @@ async function resolveIMessageDmHistoryContext(params) {
 			attachments: false
 		}, { timeoutMs: DM_HISTORY_RPC_TIMEOUT_MS });
 	} catch (err) {
-		params.logVerbose?.(`imessage: DM history fetch failed for chat_id=${chatId}: ${String(err)}`);
+		logVerbose(`imessage: DM history fetch failed for chat_id=${chatId}: ${String(err)}`);
 		return {};
 	}
-	const history = (Array.isArray(result?.messages) ? result.messages : []).map((row) => parseIMessageNotification({ message: row })).filter((message) => Boolean(message)).filter((message) => message.is_group !== true).filter((message) => isBeforeCurrentMessage({
-		message,
-		currentMessage: params.message
-	})).toSorted((a, b) => historyRowSortValue(a) - historyRowSortValue(b)).map((message) => historyEntryFromMessage(message, params.senderNormalized)).filter((entry) => Boolean(entry)).slice(-maxMessages);
+	const history = (Array.isArray(result?.messages) ? result.messages : []).map((row) => parseIMessageNotification({ message: row })).filter((message) => Boolean(message)).filter((message) => message.is_group !== true).filter((message) => {
+		const currentMessage = params.message;
+		if (typeof message.id === "number" && typeof currentMessage.id === "number" && Number.isFinite(message.id) && Number.isFinite(currentMessage.id)) return message.id < currentMessage.id;
+		const guid = normalizeOptionalString(message.guid);
+		const currentGuid = normalizeOptionalString(currentMessage.guid);
+		if (guid && currentGuid) return guid !== currentGuid;
+		return true;
+	}).toSorted((a, b) => historyRowSortValue(a) - historyRowSortValue(b)).map((message) => historyEntryFromMessage(message, params.senderNormalized)).filter((entry) => Boolean(entry)).slice(-maxMessages);
 	if (history.length === 0) return {};
 	return {
 		inboundHistory: history,
@@ -981,81 +921,56 @@ async function resolveIMessageDmHistoryContext(params) {
 		})).join("\n\n")
 	};
 }
-// extensions/imessage/src/monitor/drop-diagnostic-cache.ts
-const THROTTLED_DROP_DIAGNOSTIC_CACHE_MAX_SIZE = 512;
-function createIMessageThrottledDropDiagnosticCache() {
-	return createDedupeCache({
-		maxSize: THROTTLED_DROP_DIAGNOSTIC_CACHE_MAX_SIZE,
-		ttlMs: 0
-	});
-}
 // extensions/imessage/src/monitor/echo-cache.ts
 const SENT_MESSAGE_TEXT_TTL_MS = 4e3;
 const SENT_MESSAGE_ID_TTL_MS = 6e4;
 function createSentMessageCache() {
 	const textCache = /* @__PURE__ */ new Map();
-	const textBackedByIdCache = /* @__PURE__ */ new Map();
 	const mediaCache = /* @__PURE__ */ new Map();
-	const mediaBackedByIdCache = /* @__PURE__ */ new Map();
 	const messageIdCache = /* @__PURE__ */ new Map();
 	function remember(scope, lookup) {
-		const textKey = normalizeIMessageEchoText(lookup.text);
-		if (textKey) textCache.set(`${scope}:${textKey}`, Date.now());
-		const mediaKey = resolveIMessageEchoMediaKey(lookup.media);
-		if (mediaKey) mediaCache.set(`${scope}:${mediaKey}`, Date.now());
+		const now = Date.now();
 		const messageIdKey = normalizeIMessageMessageId(lookup.messageId);
-		if (messageIdKey) {
-			messageIdCache.set(`${scope}:${messageIdKey}`, Date.now());
-			if (textKey) textBackedByIdCache.set(`${scope}:${textKey}`, Date.now());
-			if (mediaKey) mediaBackedByIdCache.set(`${scope}:${mediaKey}`, Date.now());
+		if (messageIdKey) messageIdCache.set(`${scope}:${messageIdKey}`, now);
+		for (const [cache, value] of [[textCache, normalizeIMessageEchoText(lookup.text)], [mediaCache, resolveIMessageEchoMediaKey(lookup.media)]]) if (value) {
+			const key = `${scope}:${value}`;
+			cache.set(key, {
+				timestamp: now,
+				idTimestamp: messageIdKey ? now : cache.get(key)?.idTimestamp
+			});
 		}
 		cleanup();
 	}
-	async function has(scope, lookup, options = false) {
-		cleanup();
-		const resolvedOptions = typeof options === "boolean" ? { skipIdShortCircuit: options } : options;
+	async function has(scope, lookup, options = {}) {
 		if (await hasPersistedIMessageEcho({
 			scope,
 			text: lookup.text,
 			media: lookup.media,
 			messageId: lookup.messageId,
-			skipIdShortCircuit: resolvedOptions.skipIdShortCircuit,
-			includePendingText: resolvedOptions.includePendingText
+			skipIdShortCircuit: options.skipIdShortCircuit,
+			includePendingText: options.includePendingText
 		})) return true;
-		const matchesWithin = (cache, key, ttlMs) => {
-			const timestamp = key ? cache.get(`${scope}:${key}`) : void 0;
-			return Boolean(timestamp && Date.now() - timestamp <= ttlMs);
-		};
-		const hasContentOnlyMatch = (cache, backedById, key) => {
-			const timestamp = key ? cache.get(`${scope}:${key}`) : void 0;
-			const idTimestamp = key ? backedById.get(`${scope}:${key}`) : void 0;
-			return typeof timestamp === "number" && (!idTimestamp || timestamp > idTimestamp);
-		};
+		cleanup();
 		const textKey = normalizeIMessageEchoText(lookup.text);
 		const mediaKey = resolveIMessageEchoMediaKey(lookup.media);
+		const text = textKey ? textCache.get(`${scope}:${textKey}`) : void 0;
+		const media = mediaKey ? mediaCache.get(`${scope}:${mediaKey}`) : void 0;
+		const hasContentOnlyMatch = (entry) => Boolean(entry && (!entry.idTimestamp || entry.timestamp > entry.idTimestamp));
 		const messageIdKey = normalizeIMessageMessageId(lookup.messageId);
 		let canUseMediaFallback = !messageIdKey;
 		if (messageIdKey) {
-			if (matchesWithin(messageIdCache, messageIdKey, SENT_MESSAGE_ID_TTL_MS)) return true;
-			const hasTextOnlyMatch = hasContentOnlyMatch(textCache, textBackedByIdCache, textKey);
-			const hasMediaOnlyMatch = hasContentOnlyMatch(mediaCache, mediaBackedByIdCache, mediaKey);
+			if (messageIdCache.has(`${scope}:${messageIdKey}`)) return true;
+			const hasTextOnlyMatch = hasContentOnlyMatch(text);
+			const hasMediaOnlyMatch = hasContentOnlyMatch(media);
 			canUseMediaFallback = hasMediaOnlyMatch;
-			if (!resolvedOptions.skipIdShortCircuit && !hasTextOnlyMatch && !hasMediaOnlyMatch) return false;
+			if (!options.skipIdShortCircuit && !hasTextOnlyMatch && !hasMediaOnlyMatch) return false;
 		}
-		return matchesWithin(textCache, textKey, SENT_MESSAGE_TEXT_TTL_MS) || canUseMediaFallback && matchesWithin(mediaCache, mediaKey, SENT_MESSAGE_TEXT_TTL_MS);
+		return Boolean(text || canUseMediaFallback && media);
 	}
 	function cleanup() {
 		const now = Date.now();
-		for (const cache of [
-			textCache,
-			textBackedByIdCache,
-			mediaCache,
-			mediaBackedByIdCache,
-			messageIdCache
-		]) {
-			const ttlMs = cache === messageIdCache ? SENT_MESSAGE_ID_TTL_MS : SENT_MESSAGE_TEXT_TTL_MS;
-			for (const [key, timestamp] of cache) if (now - timestamp > ttlMs) cache.delete(key);
-		}
+		for (const cache of [textCache, mediaCache]) for (const [key, entry] of cache) if (now - entry.timestamp > SENT_MESSAGE_TEXT_TTL_MS) cache.delete(key);
+		for (const [key, timestamp] of messageIdCache) if (now - timestamp > SENT_MESSAGE_ID_TTL_MS) messageIdCache.delete(key);
 	}
 	return {
 		remember,
@@ -1166,8 +1081,6 @@ async function resolveIMessageConversationRoute(params) {
 		}
 	});
 	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 : bindingResolution
@@ -1204,8 +1117,7 @@ async function resolveIMessageInboundMentionPolicy(params) {
 		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
+		chatIdentifier: params.message.chat_identifier ?? void 0
 	}));
 	return {
 		...resolveBotThreadMentionPolicy({
@@ -1479,12 +1391,13 @@ async function resolveIMessageInboundDecision(params) {
 		sender,
 		chatId
 	});
+	let storeAllowFrom;
 	const ingressResolver = getIMessageRuntime().channel.inbound.ingress.createResolver({
 		channelId: "imessage",
 		accountId: params.accountId,
 		identity: imessageIngressIdentity,
 		cfg: params.cfg,
-		readStoreAllowFrom: async () => params.storeAllowFrom
+		readStoreAllowFrom: () => storeAllowFrom ??= params.readStoreAllowFrom()
 	});
 	const resolveChannelIngress = (contextBinding) => ingressResolver.message({
 		subject: {
@@ -1516,27 +1429,27 @@ async function resolveIMessageInboundDecision(params) {
 	if (senderAccess.decision !== "allow") {
 		if (isGroup) {
 			if (senderAccess.reasonCode === "group_policy_disabled") {
-				params.logVerbose?.("Blocked iMessage group message (groupPolicy: disabled)");
+				logVerbose("Blocked iMessage group message (groupPolicy: disabled)");
 				return {
 					kind: "drop",
 					reason: "groupPolicy disabled"
 				};
 			}
 			if (senderAccess.reasonCode === "group_policy_empty_allowlist") {
-				params.logVerbose?.("Blocked iMessage group message (groupPolicy: allowlist, no groupAllowFrom)");
+				logVerbose("Blocked iMessage group message (groupPolicy: allowlist, no groupAllowFrom)");
 				return {
 					kind: "drop",
 					reason: "groupPolicy allowlist (empty groupAllowFrom)"
 				};
 			}
 			if (senderAccess.reasonCode === "group_policy_not_allowlisted") {
-				params.logVerbose?.(`Blocked iMessage sender ${sender} (not in groupAllowFrom)`);
+				logVerbose(`Blocked iMessage sender ${sender} (not in groupAllowFrom)`);
 				return {
 					kind: "drop",
 					reason: "not in groupAllowFrom"
 				};
 			}
-			params.logVerbose?.(`Blocked iMessage group message (${senderAccess.reasonCode})`);
+			logVerbose(`Blocked iMessage group message (${senderAccess.reasonCode})`);
 			return {
 				kind: "drop",
 				reason: senderAccess.reasonCode
@@ -1550,14 +1463,14 @@ async function resolveIMessageInboundDecision(params) {
 			kind: "pairing",
 			senderId: senderNormalized
 		};
-		params.logVerbose?.(`Blocked iMessage sender ${sender} (dmPolicy=${params.dmPolicy})`);
+		logVerbose(`Blocked iMessage sender ${sender} (dmPolicy=${params.dmPolicy})`);
 		return {
 			kind: "drop",
 			reason: "dmPolicy blocked"
 		};
 	}
 	if (isGroup && groupListPolicy.allowlistEnabled && !groupListPolicy.allowed) {
-		params.logVerbose?.(`imessage: skipping group message (${groupId ?? "unknown"}) not in allowlist`);
+		logVerbose(`imessage: skipping group message (${groupId ?? "unknown"}) not in allowlist`);
 		return {
 			kind: "drop",
 			reason: "group id not in allowlist"
@@ -1580,8 +1493,7 @@ async function resolveIMessageInboundDecision(params) {
 			accountId: params.accountId,
 			chatId,
 			chatGuid,
-			chatIdentifier,
-			isKnownFromMeMessageId: params.isKnownFromMeMessageId
+			chatIdentifier
 		})));
 		if (notificationMode === "own" && !targetIsOwn) return {
 			kind: "drop",
@@ -1619,7 +1531,7 @@ async function resolveIMessageInboundDecision(params) {
 		...selfChatLookup,
 		text: bodyText
 	})) {
-		params.logVerbose?.("imessage: dropping self-chat reflected duplicate");
+		logVerbose("imessage: dropping self-chat reflected duplicate");
 		return {
 			kind: "drop",
 			reason: "self-chat echo"
@@ -1634,7 +1546,7 @@ async function resolveIMessageInboundDecision(params) {
 			messageIds: inboundMessageIds,
 			includePendingText: isSelfChat
 		})) {
-			params.logVerbose?.(`imessage: skipping echo message${inboundMessageId ? ` id=${inboundMessageId}` : ""}`);
+			logVerbose(`imessage: skipping echo message${inboundMessageId ? ` id=${inboundMessageId}` : ""}`);
 			return {
 				kind: "drop",
 				reason: "echo"
@@ -1643,7 +1555,7 @@ async function resolveIMessageInboundDecision(params) {
 	}
 	const reflection = detectReflectedContent(messageText);
 	if (reflection.isReflection) {
-		params.logVerbose?.(`imessage: dropping reflected assistant content (markers: ${reflection.matchedLabels.join(", ")})`);
+		logVerbose(`imessage: dropping reflected assistant content (markers: ${reflection.matchedLabels.join(", ")})`);
 		return {
 			kind: "drop",
 			reason: "reflected assistant content"
@@ -1684,7 +1596,7 @@ async function resolveIMessageInboundDecision(params) {
 		body: visibleReply.body ?? "",
 		sender: visibleReply.sender
 	} : null;
-	if (replyContext && !filteredReplyContext && isGroup) params.logVerbose?.(`imessage: drop reply context (mode=${contextVisibilityMode}, sender_allowed=${replySenderAllowed ? "yes" : "no"})`);
+	if (replyContext && !filteredReplyContext && isGroup) 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, implicitMentionKinds, enforceMentionRequirement } = await resolveIMessageInboundMentionPolicy({
@@ -1693,14 +1605,13 @@ async function resolveIMessageInboundDecision(params) {
 		groupId,
 		isGroup,
 		message: params.message,
-		requireMentionOverride: params.opts?.requireMention,
-		isKnownFromMeMessageId: params.isKnownFromMeMessageId
+		requireMentionOverride: params.opts?.requireMention
 	});
 	const canDetectMention = mentionRegexes.length > 0 || enforceMentionRequirement;
 	const commandAuthorized = commandAccess.authorized;
 	if (commandAccess.shouldBlockControlCommand) {
-		if (params.logVerbose) logInboundDrop({
-			log: params.logVerbose,
+		logInboundDrop({
+			log: logVerbose,
 			channel: "imessage",
 			reason: "control command (unauthorized)",
 			target: sender
@@ -1727,7 +1638,7 @@ async function resolveIMessageInboundDecision(params) {
 	});
 	const effectiveWasMentioned = mentionDecision.effectiveWasMentioned;
 	if (isGroup && requireMention && canDetectMention && mentionDecision.shouldSkip) {
-		params.logVerbose?.(`imessage: skipping group message (no mention)`);
+		logVerbose(`imessage: skipping group message (no mention)`);
 		createChannelHistoryWindow({ historyMap: params.groupHistories }).record({
 			historyKey: historyKey ?? "",
 			limit: params.historyLimit,
@@ -1770,7 +1681,7 @@ async function resolveIMessageInboundDecision(params) {
 	};
 }
 async function buildIMessageInboundContext(params) {
-	const envelopeOptions = params.envelopeOptions ?? resolveEnvelopeFormatOptions(params.cfg);
+	const envelopeOptions = resolveEnvelopeFormatOptions(params.cfg);
 	const { decision } = params;
 	const chatId = decision.chatId;
 	const chatTarget = decision.isGroup && chatId != null ? formatIMessageChatTarget(chatId) : void 0;
@@ -1979,7 +1890,6 @@ function resolveIMessageIngressNonRetryableFailure(error) {
 }
 function createIMessageDurableIngress(options) {
 	const queue = options.queue ?? getIMessageRuntime().state.openChannelIngressQueue({ accountId: options.accountId });
-	const now = options.now ?? Date.now;
 	const dispatchAdmissionQueue = new KeyedAsyncQueue();
 	const priorityDispatchQueue = new KeyedAsyncQueue();
 	const monitor = createChannelIngressMonitor({
@@ -2036,7 +1946,6 @@ function createIMessageDurableIngress(options) {
 			resolveNonRetryableFailure: resolveIMessageIngressNonRetryableFailure,
 			onLog: (message) => options.runtime.log?.(`imessage ${message}`)
 		},
-		now,
 		onError: (error) => options.runtime.error?.(`imessage: ingress drain failed: ${formatErrorMessage(error)}`)
 	});
 	let stopTask;
@@ -2150,7 +2059,7 @@ async function readAttachmentBuffer(params) {
 			originalFilename: `${path.parse(params.attachmentPath).name || "imessage-attachment"}.jpg`
 		};
 	} catch (err) {
-		params.deps.logVerbose?.(`imessage: HEIC attachment conversion failed; staging original instead: ${String(err)}`);
+		logVerbose(`imessage: HEIC attachment conversion failed; staging original instead: ${String(err)}`);
 	}
 	return {
 		buffer,
@@ -2159,7 +2068,6 @@ async function readAttachmentBuffer(params) {
 	};
 }
 async function stageIMessageAttachments(attachments, params) {
-	const deps = params.deps ?? {};
 	const staged = [];
 	let unavailableCount = 0;
 	for (const attachment of attachments) {
@@ -2174,8 +2082,7 @@ async function stageIMessageAttachments(attachments, params) {
 				attachmentPath,
 				mimeType: attachment.mime_type,
 				maxBytes: params.maxBytes,
-				allowedRoots: params.allowedRoots,
-				deps
+				allowedRoots: params.allowedRoots
 			});
 			const saved = await saveMediaBuffer(media.buffer, media.contentType, "inbound", params.maxBytes, media.originalFilename);
 			const contentType = saved.contentType ?? media.contentType;
@@ -2187,7 +2094,7 @@ async function stageIMessageAttachments(attachments, params) {
 		} catch (err) {
 			unavailableCount += 1;
 			staged.push(createTypeOnlyIMessageAttachment(attachment));
-			deps.logVerbose?.(`imessage: failed to stage inbound attachment: ${String(err)}`);
+			logVerbose(`imessage: failed to stage inbound attachment: ${String(err)}`);
 		}
 	}
 	return {
@@ -2196,12 +2103,11 @@ async function stageIMessageAttachments(attachments, params) {
 	};
 }
 // extensions/imessage/src/monitor/poll-comment.ts
-const DEFAULT_COMMENT_WINDOW_MS = 15e3;
-function createPollCommentFolder(options) {
-	const windowMs = options?.windowMs ?? DEFAULT_COMMENT_WINDOW_MS;
+const COMMENT_WINDOW_MS = 15e3;
+function createPollCommentFolder() {
 	const seenPolls = /* @__PURE__ */ new Map();
 	function prune(referenceMs) {
-		for (const [key, seen] of seenPolls) if (referenceMs - seen.atMs > windowMs) seenPolls.delete(key);
+		for (const [key, seen] of seenPolls) if (referenceMs - seen.atMs > COMMENT_WINDOW_MS) seenPolls.delete(key);
 	}
 	return {
 		rememberPoll(guid, atMs, sender) {
@@ -2217,7 +2123,7 @@ function createPollCommentFolder(options) {
 			const key = replyToGuid?.trim();
 			if (!key || !Number.isFinite(atMs)) return false;
 			const seen = seenPolls.get(key);
-			if (!seen || atMs < seen.atMs || atMs - seen.atMs > windowMs) return false;
+			if (!seen || atMs < seen.atMs || atMs - seen.atMs > COMMENT_WINDOW_MS) return false;
 			const replySender = normalizeLowercaseStringOrEmpty(sender);
 			return seen.sender.length > 0 && replySender.length > 0 && seen.sender === replySender;
 		}
@@ -2269,7 +2175,7 @@ function enqueueIMessageReactionSystemEvent(params) {
 	const { decision, runtime } = params;
 	const queued = enqueueRoutedSystemEvent(decision.text, decision.route, { contextKey: decision.contextKey });
 	runtime.log?.(`imessage: reaction system event ${queued ? "queued" : "deduped"} session=${decision.route.sessionKey} target=${decision.reaction.targetGuid ?? "unknown"} action=${decision.reaction.action} emoji=${decision.reaction.emoji}`);
-	params.logVerbose?.("imessage: reaction event enqueued");
+	logVerbose("imessage: reaction event enqueued");
 	return queued;
 }
 // extensions/imessage/src/monitor/recovery-cursor.ts
@@ -2332,36 +2238,28 @@ function applyRecoveryCursorUpdate(key, update) {
 	return write;
 }
 async function readRecoveryCursor(accountId, dbIdentity) {
-	try {
-		const store = openRecoveryCursorStore();
-		const key = recoveryCursorStoreKey(accountId, dbIdentity);
-		const value = await store.lookup(key);
-		if (value) return Number.isFinite(value.lastRowid) ? value.lastRowid : null;
-		const legacy = await store.consume(accountId);
-		if (legacy && Number.isFinite(legacy.lastRowid)) {
-			await store.registerIfAbsent(key, { lastRowid: legacy.lastRowid });
-			const adopted = await store.lookup(key);
-			return adopted && Number.isFinite(adopted.lastRowid) ? adopted.lastRowid : null;
-		}
-		return null;
-	} catch {
-		return null;
+	const store = openRecoveryCursorStore();
+	const key = recoveryCursorStoreKey(accountId, dbIdentity);
+	const value = await store.lookup(key);
+	if (value) return Number.isFinite(value.lastRowid) ? value.lastRowid : null;
+	const legacy = await store.consume(accountId);
+	if (legacy && Number.isFinite(legacy.lastRowid)) {
+		await store.registerIfAbsent(key, { lastRowid: legacy.lastRowid });
+		const adopted = await store.lookup(key);
+		return adopted && Number.isFinite(adopted.lastRowid) ? adopted.lastRowid : null;
 	}
+	return null;
 }
 async function migrateLegacyCatchupCursor(accountId, dbIdentity) {
-	try {
-		const legacy = getIMessageRuntime().state.openKeyedStoreV2({
-			namespace: LEGACY_CATCHUP_CURSOR_NAMESPACE,
-			maxEntries: LEGACY_CATCHUP_CURSOR_MAX_ENTRIES
-		});
-		const key = createHash("sha256").update(accountId, "utf8").digest("hex").slice(0, 32);
-		const value = await legacy.consume(key);
-		const rowid = typeof value?.lastSeenRowid === "number" && Number.isFinite(value.lastSeenRowid) ? value.lastSeenRowid : null;
-		if (rowid !== null) await advanceIMessageRecoveryCursor(accountId, dbIdentity, rowid);
-		return rowid;
-	} catch {
-		return null;
-	}
+	const legacy = getIMessageRuntime().state.openKeyedStoreV2({
+		namespace: LEGACY_CATCHUP_CURSOR_NAMESPACE,
+		maxEntries: LEGACY_CATCHUP_CURSOR_MAX_ENTRIES
+	});
+	const key = createHash("sha256").update(accountId, "utf8").digest("hex").slice(0, 32);
+	const value = await legacy.consume(key);
+	const rowid = typeof value?.lastSeenRowid === "number" && Number.isFinite(value.lastSeenRowid) ? value.lastSeenRowid : null;
+	if (rowid !== null) await advanceIMessageRecoveryCursor(accountId, dbIdentity, rowid);
+	return rowid;
 }
 async function reconcileRecoveryCursorToWatermark(accountId, dbIdentity, cursorRowid, watermarkRowid) {
 	if (cursorRowid === null || watermarkRowid === null || cursorRowid <= watermarkRowid) return cursorRowid;
@@ -2384,7 +2282,6 @@ async function loadIMessageRecoveryCursor(accountId, dbIdentity, options = {}) {
 	const watermarkRowid = typeof options.watermarkRowid === "number" && Number.isFinite(options.watermarkRowid) ? options.watermarkRowid : null;
 	const current = await readRecoveryCursor(accountId, dbIdentity);
 	if (current !== null) return await reconcileRecoveryCursorToWatermark(accountId, dbIdentity, current, watermarkRowid);
-	if (options.migrateLegacyCatchup === false) return null;
 	return await reconcileRecoveryCursorToWatermark(accountId, dbIdentity, await migrateLegacyCatchupCursor(accountId, dbIdentity), watermarkRowid);
 }
 /** Advance the cursor forward to `rowid` (monotonic per database; never rewinds). */
@@ -2400,7 +2297,6 @@ async function advanceIMessageRecoveryCursor(accountId, dbIdentity, rowid) {
 // extensions/imessage/src/monitor/self-chat-cache.ts
 const SELF_CHAT_TTL_MS = 1e4;
 const SELF_CHAT_CREATED_AT_TOLERANCE_MS = 1e3;
-const MAX_SELF_CHAT_CACHE_ENTRIES = 512;
 const CLEANUP_MIN_INTERVAL_MS = 1e3;
 function normalizeText(text) {
 	if (!text) return null;
@@ -2410,81 +2306,58 @@ function normalizeText(text) {
 function isUsableTimestamp(createdAt) {
 	return typeof createdAt === "number" && Number.isFinite(createdAt);
 }
-function digestText(text) {
-	return createHash("sha256").update(text).digest("hex");
-}
 function buildScope(parts) {
 	if (!parts.isGroup) return `${parts.accountId}:imessage:${parts.sender}`;
 	const chatTarget = formatIMessageChatTarget(parts.chatId) || "chat_id:unknown";
 	return `${parts.accountId}:${chatTarget}:imessage:${parts.sender}`;
 }
-var DefaultSelfChatCache = class {
+var SelfChatCache = class {
 	constructor() {
-		this.cache = /* @__PURE__ */ new Map();
-		this.insertionOrder = /* @__PURE__ */ new Map();
+		this.entries = [];
 		this.lastCleanupAt = 0;
 	}
 	buildBucketKey(lookup) {
 		const text = normalizeText(lookup.text);
 		if (!text) return null;
-		return `${buildScope(lookup)}:${digestText(text)}`;
+		return `${buildScope(lookup)}:${sha256Hex(text)}`;
 	}
 	remember(lookup) {
 		const key = this.buildBucketKey(lookup);
 		if (!key || !isUsableTimestamp(lookup.createdAt)) return;
-		const entries = this.cache.get(key) ?? /* @__PURE__ */ new Set();
-		const entry = {
+		this.entries.push({
+			key,
 			createdAt: lookup.createdAt,
 			createdAtSkewToleranceMs: lookup.allowCreatedAtSkew ? SELF_CHAT_CREATED_AT_TOLERANCE_MS : 0,
 			rememberedAt: Date.now()
-		};
-		entries.add(entry);
-		this.cache.set(key, entries);
-		this.insertionOrder.set(entry, key);
+		});
 		this.maybeCleanup();
 	}
 	has(lookup) {
 		this.maybeCleanup();
 		const key = this.buildBucketKey(lookup);
 		if (!key || !isUsableTimestamp(lookup.createdAt)) return false;
-		const entries = this.cache.get(key);
-		if (!entries) return false;
 		const now = Date.now();
 		const createdAt = lookup.createdAt;
-		return [...entries.values()].some((entry) => {
+		return this.entries.some((entry) => {
 			const createdAtDelta = Math.abs(entry.createdAt - createdAt);
-			return now - entry.rememberedAt <= SELF_CHAT_TTL_MS && (createdAtDelta === 0 || createdAtDelta < entry.createdAtSkewToleranceMs);
+			return entry.key === key && now - entry.rememberedAt <= SELF_CHAT_TTL_MS && (createdAtDelta === 0 || createdAtDelta < entry.createdAtSkewToleranceMs);
 		});
 	}
-	removeEntry(entry, key) {
-		this.insertionOrder.delete(entry);
-		const entries = this.cache.get(key);
-		entries?.delete(entry);
-		if (entries?.size === 0) this.cache.delete(key);
-	}
 	maybeCleanup() {
 		const now = Date.now();
 		if (now - this.lastCleanupAt < CLEANUP_MIN_INTERVAL_MS) return;
 		this.lastCleanupAt = now;
-		for (const [entry, key] of this.insertionOrder) if (now - entry.rememberedAt > SELF_CHAT_TTL_MS) this.removeEntry(entry, key);
-		while (this.insertionOrder.size > MAX_SELF_CHAT_CACHE_ENTRIES) {
-			const [entry, key] = expectDefined(this.insertionOrder.entries().next().value, "oldest iMessage self-chat cache entry");
-			this.removeEntry(entry, key);
-		}
+		this.entries = this.entries.filter((entry) => now - entry.rememberedAt <= SELF_CHAT_TTL_MS).slice(-512);
 	}
 };
-function createSelfChatCache() {
-	return new DefaultSelfChatCache();
-}
 // extensions/imessage/src/monitor/watch-error-log.ts
-const MAX_WATCH_ERROR_MESSAGE_CHARS = 200;
 function sanitizeIMessageWatchErrorPayload(payload) {
 	if (!isRecord(payload)) return {};
 	const safe = {};
 	if (typeof payload.code === "number" && Number.isFinite(payload.code)) safe.code = payload.code;
 	if (typeof payload.message === "string") {
-		const sanitizedMessage = sanitizeTerminalText(payload.message);
-		if (sanitizedMessage) safe.message = sanitizedMessage.length > MAX_WATCH_ERROR_MESSAGE_CHARS ? `${truncateUtf16Safe(sanitizedMessage, 199)}…` : sanitizedMessage;
+		const guidance = normalizeIMessageFullDiskAccessError(payload.message);
+		if (guidance) safe.message = guidance;
 	}
 	return safe;
 }
@@ -2547,7 +2420,7 @@ async function monitorIMessageProvider(opts) {
 	const historyLimit = resolvePromptHistoryLimit(imessageCfg.historyLimit ?? cfg.messages?.groupChat?.historyLimit);
 	const groupHistories = /* @__PURE__ */ new Map();
 	const sentMessageCache = createSentMessageCache();
-	const selfChatCache = createSelfChatCache();
+	const selfChatCache = new SelfChatCache();
 	const loopRateLimiter = createLoopRateLimiter();
 	const textLimit = resolveTextChunkLimit(cfg, "imessage", accountInfo.accountId);
 	const allowFrom = normalizeStringEntries(imessageCfg.allowFrom);
@@ -2611,7 +2484,10 @@ async function monitorIMessageProvider(opts) {
 		error
 	});
 	let staleBacklogSuppressed = 0;
-	const loggedThrottledDropDiagnostics = createIMessageThrottledDropDiagnosticCache();
+	const loggedThrottledDropDiagnostics = createDedupeCache({
+		maxSize: 512,
+		ttlMs: 0
+	});
 	const watchSourceDbPath = resolveIMessageChatDbLookupPath({
 		cliPath,
 		dbPath,
@@ -2623,10 +2499,7 @@ async function monitorIMessageProvider(opts) {
 		dbPath,
 		remoteHost
 	});
-	const recoveryCursorRowid = await loadIMessageRecoveryCursor(accountInfo.accountId, recoveryCursorDbIdentity, {
-		migrateLegacyCatchup: !catchupCfg.enabled,
-		watermarkRowid: recoveryBoundaryRowid
-	});
+	const recoveryCursorRowid = catchupCfg.enabled ? null : await loadIMessageRecoveryCursor(accountInfo.accountId, recoveryCursorDbIdentity, { watermarkRowid: recoveryBoundaryRowid });
 	const reconciledWatchSinceRowid = catchupCfg.enabled ? null : recoveryCursorRowid !== null ? recoveryBoundaryRowid !== null ? Math.max(recoveryCursorRowid, recoveryBoundaryRowid - 500) : recoveryCursorRowid : recoveryBoundaryRowid;
 	const watchSinceRowid = reconciledWatchSinceRowid === 0 ? -1 : reconciledWatchSinceRowid;
 	let latestAdvancedRecoveryCursorRowid = recoveryCursorRowid ?? -1;
@@ -2689,14 +2562,7 @@ async function monitorIMessageProvider(opts) {
 							await abandon();
 							return;
 						}
-						const combined = entries.length === 1 ? expectDefined(entries[0], "single iMessage dispatch entry").message : combineIMessagePayloads(entries.map((entry) => entry.message));
-						if (entries.length > 1 && shouldLogVerbose()) {
-							const text = combined.text ?? "";
-							const preview = sliceUtf16Safe(text, 0, 50);
-							const ellipsis = text.length > 50 ? "..." : "";
-							logVerbose(`[imessage] merged ${entries.length} debounced messages: "${preview}${ellipsis}"`);
-						}
-						await handleMessageNow(combined, admissionLifecycle);
+						await handleMessageNow(entries.length === 1 ? expectDefined(entries[0], "single iMessage dispatch entry").message : combineIMessagePayloads(entries.map((entry) => entry.message)), admissionLifecycle);
 						await settle();
 					} catch (err) {
 						await abandon();
@@ -2802,12 +2668,6 @@ async function monitorIMessageProvider(opts) {
 			return;
 		}
 		const { messageText, bodyText, mediaFacts, mediaCandidates, rawMediaAttachments, effectiveAttachmentRoots } = resolveIMessageInboundBodyText(message);
-		const storeAllowFrom = await readChannelAllowFromStore("imessage", process.env, accountInfo.accountId).catch(() => []);
-		const isQuestionReaction = hasIMessageQuestionReactionTarget({
-			accountId: accountInfo.accountId,
-			message,
-			bodyText
-		});
 		const decision = await resolveIMessageInboundDecision({
 			cfg,
 			accountId: accountInfo.accountId,
@@ -2821,13 +2681,12 @@ async function monitorIMessageProvider(opts) {
 			allowLegacyConversationAllowFromForGroup,
 			groupPolicy,
 			dmPolicy,
-			storeAllowFrom,
+			readStoreAllowFrom: () => readChannelAllowFromStore("imessage", process.env, accountInfo.accountId),
 			historyLimit,
 			groupHistories,
 			echoCache: sentMessageCache,
 			selfChatCache,
-			reactionNotifications: isQuestionReaction ? "all" : imessageCfg.reactionNotifications,
-			logVerbose
+			reactionNotifications: imessageCfg.reactionNotifications
 		});
 		const chatId = message.chat_id ?? void 0;
 		const senderForKey = (message.sender ?? "").trim();
@@ -2894,18 +2753,9 @@ async function monitorIMessageProvider(opts) {
 			return;
 		}
 		if (decision.kind === "reaction") {
-			if (await maybeResolveIMessageQuestionReaction({
-				cfg,
-				accountId: accountInfo.accountId,
-				message,
-				bodyText,
-				senderId: decision.senderNormalized,
-				logDebug: logVerbose
-			})) return;
 			enqueueIMessageReactionSystemEvent({
 				decision,
-				runtime,
-				logVerbose
+				runtime
 			});
 			return;
 		}
@@ -2964,8 +2814,7 @@ async function monitorIMessageProvider(opts) {
 			unavailableCount: rawMediaAttachments.filter((attachment) => !attachment.path).length
 		} : await stageIMessageAttachments(mediaCandidates, {
 			maxBytes: mediaMaxBytes,
-			allowedRoots: effectiveAttachmentRoots,
-			deps: { logVerbose }
+			allowedRoots: effectiveAttachmentRoots
 		});
 		const mediaAttachments = staged.attachments;
 		const unavailableCount = staged.unavailableCount;
@@ -2990,8 +2839,7 @@ async function monitorIMessageProvider(opts) {
 			message,
 			senderNormalized: decision.senderNormalized,
 			limit: dmHistoryLimit,
-			envelopeOptions: resolveEnvelopeFormatOptions(cfg),
-			logVerbose
+			envelopeOptions: resolveEnvelopeFormatOptions(cfg)
 		}) : void 0;
 		const pluginChannelRuntime = opts.channelRuntime;
 		const { ctxPayload, chatTarget, imessageTo } = await buildIMessageInboundContext({
@@ -3013,10 +2861,6 @@ async function monitorIMessageProvider(opts) {
 			allowFrom,
 			normalizeEntry: normalizeIMessageHandle
 		});
-		if (shouldLogVerbose()) {
-			const preview = truncateUtf16Safe(ctxPayload.Body ?? "", 200).replace(/\n/g, "\\n");
-			logVerbose(`imessage inbound: chatId=${chatId ?? "unknown"} from=${ctxPayload.From} len=${(ctxPayload.Body ?? "").length} preview="${preview}"`);
-		}
 		const sendReadReceipts = imessageCfg.sendReadReceipts !== false;
 		const typingTarget = ctxPayload.To;
 		const readTarget = !decision.isGroup && decision.chatGuid ? `chat_guid:${decision.chatGuid}` : typingTarget;
@@ -3182,14 +3026,13 @@ async function monitorIMessageProvider(opts) {
 			message,
 			gatewayRuntime: approvalGatewayRuntime
 		})) return true;
-		return await maybeResolveIMessageApprovalReaction({
+		return (await handleIMessageApprovalReaction({
 			cfg,
 			accountId: accountInfo.accountId,
 			message,
 			bodyText: resolveIMessageInboundBodyText(message).bodyText,
-			gatewayRuntime: approvalGatewayRuntime,
-			logVerboseMessage: logVerbose
-		});
+			gatewayRuntime: approvalGatewayRuntime
+		})).handled;
 	};
 	const ingress = createIMessageDurableIngress({
 		accountId: accountInfo.accountId,
@@ -3356,8 +3199,7 @@ async function monitorIMessageProvider(opts) {
 				cfg,
 				accountId: accountInfo.accountId,
 				allowRecentChatDiscovery,
-				gatewayRuntime: approvalGatewayRuntime,
-				logVerboseMessage: logVerbose
+				gatewayRuntime: approvalGatewayRuntime
 			}).catch((err) => {
 				logVerbose(`imessage: approval reaction poll failed: ${String(err)}`);
 			});
@@ -3425,8 +3267,8 @@ async function sendIMessageOutbound(params) {
 		...params.mediaReadFile ? { mediaReadFile: params.mediaReadFile } : {},
 		...params.audioAsVoice ? { audioAsVoice: true } : {},
 		maxBytes,
-		accountId: params.accountId ?? void 0,
-		replyToId: params.replyToId ?? void 0,
+		accountId: params.accountId,
+		replyToId: params.replyToId,
 		conversationReadOrigin: params.conversationReadOrigin,
 		assertDirectAdapterHandoff: params.assertDirectAdapterHandoff,
 		onPlatformSendDispatch: params.onPlatformSendDispatch,
@@ -3490,4 +3332,4 @@ async function startIMessageGatewayAccount(ctx) {
 		statusSink
 	});
 }
-export { imessageSetupWizard, probeIMessageAccount, sendIMessageOutbound, startIMessageGatewayAccount };
+export { probeIMessageAccount, sendIMessageOutbound, startIMessageGatewayAccount };