@openclaw/imessage 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{channel.runtime-DY7JJ0_9.mjs → channel.runtime-DrLDEY4R.mjs}

@@ -1,22 +1,22 @@
-import { c as parseIMessageTarget, o as normalizeIMessageHandle, r as isAllowedIMessageReplyContextSender, s as parseIMessageAllowTarget, t as formatIMessageChatTarget } from "./targets-BicBiYsM.mjs";
-import { d as resolveIMessageChatDbLookupPath, f as resolveIMessageHomeDir, l as resolveIMessageRemoteHost, o as resolveIMessageAccount, r as listEnabledIMessageAccounts, s as resolveIMessageDuplicateSourceOwner } from "./accounts-evTpvJMv.mjs";
-import { r as imessageRpcSupportsMethod } from "./message-tool-api-CqfRxLlT.mjs";
-import { C as resolveIMessageDirectChatService, c as rememberIMessageReplyCache, d as IMESSAGE_CATCHUP_CURSOR_NAMESPACE, g as resolveIMessageEchoMediaKey, h as resolveIMessageCatchupCursorKey, m as capFailureRetriesMap, n as createIMessageRpcClient, s as isKnownFromMeIMessageTarget } from "./client-12apu4Ip.mjs";
-import { a as normalizeIMessageMessageId, i as normalizeIMessageGuid, n as probeIMessage, r as probeIMessagePrivateApi } from "./actions-DJqbUmbN.mjs";
+import { c as parseIMessageTarget, o as normalizeIMessageHandle, r as isAllowedIMessageReplyContextSender, s as parseIMessageAllowTarget, t as formatIMessageChatTarget } from "./targets-B4oU7n-v.mjs";
+import { d as resolveIMessageChatDbLookupPath, f as resolveIMessageHomeDir, l as resolveIMessageRemoteHost, o as resolveIMessageAccount, r as listEnabledIMessageAccounts, s as resolveIMessageDuplicateSourceOwner } from "./accounts-DacCvDBt.mjs";
+import { r as imessageRpcSupportsMethod } from "./message-tool-api-B5NfPnFL.mjs";
+import { C as resolveIMessageDirectChatService, c as rememberIMessageReplyCache, d as IMESSAGE_CATCHUP_CURSOR_NAMESPACE, g as resolveIMessageEchoMediaKey, h as resolveIMessageCatchupCursorKey, m as capFailureRetriesMap, n as createIMessageRpcClient, s as isKnownFromMeIMessageTarget } from "./client-HixFQQWY.mjs";
+import { a as normalizeIMessageMessageId, i as normalizeIMessageGuid, n as probeIMessage, r as probeIMessagePrivateApi } from "./actions-Hxh12myO.mjs";
 import { t as getIMessageRuntime } from "./runtime-Cza4CY5T.mjs";
-import { a as resolveIMessageGroupSystemPrompt, s as resolveIMessageInboundConversationId } from "./channel-CL73qdMG.mjs";
-import { r as sanitizeOutboundText } from "./sanitize-outbound-C0x4BPky.mjs";
-import { n as resolveIMessageAttachmentRoots, r as resolveIMessageRemoteAttachmentRoots } from "./media-contract-DjQGZlfl.mjs";
+import { a as resolveIMessageGroupSystemPrompt, s as resolveIMessageInboundConversationId } from "./channel-9TWBUDkP.mjs";
+import { r as sanitizeOutboundText } from "./sanitize-outbound-DpdQERYJ.mjs";
+import { n as resolveIMessageAttachmentRoots, r as resolveIMessageRemoteAttachmentRoots } from "./media-contract-BwWs5PM7.mjs";
 import { t as IMESSAGE_LEGACY_OUTBOUND_SEND_DEP_KEYS } from "./outbound-send-deps-B-QEsLSM.mjs";
-import { i as resolveIMessageStartupRowidWatermark } from "./remote-file-BU7pA-Zi.mjs";
-import { i as registerIMessageApprovalReactionTarget, n as handleIMessageApprovalReaction, o as listPendingIMessageApprovalReactionPollTargets, r as maybeResolveIMessageApprovalReaction, s as buildIMessageApprovalConversationKeyForInbound } from "./approval-reactions-L9Ul7PAu.mjs";
-import { c as iMessageApprovalControlBindings, n as hasPersistedIMessageEcho, r as normalizeIMessageEchoText, s as maybeResolveIMessageApprovalPollVote, t as sendMessageIMessage } from "./send-pkYwL6Rt.mjs";
-import { t as resolveIMessageReactionContext } from "./reaction-context-By7kUMBC.mjs";
-import { n as maybeResolveIMessageQuestionReaction, t as hasIMessageQuestionReactionTarget } from "./question-reactions-DJV-TnA8.mjs";
-import { imessageSetupWizard } from "./setup-surface-zKhIinwY.mjs";
-import { asSafeIntegerInRange, hasNonEmptyString, isRecord, normalizeOptionalString, normalizeStringEntries, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { i as resolveIMessageStartupRowidWatermark } from "./remote-file-Dq5Asi_F.mjs";
+import { f as resolveIMessageApprovalControlActor, i as registerIMessageApprovalReactionTarget, n as handleIMessageApprovalReaction, o as listPendingIMessageApprovalReactionPollTargets, r as maybeResolveIMessageApprovalReaction, s as buildIMessageApprovalConversationKeyForInbound } from "./approval-reactions-JvzJCJ4a.mjs";
+import { c as iMessageApprovalControlBindings, n as hasPersistedIMessageEcho, r as normalizeIMessageEchoText, s as maybeResolveIMessageApprovalPollVote, t as sendMessageIMessage } from "./send-BZZzMbdi.mjs";
+import { t as resolveIMessageReactionContext } from "./reaction-context-CRXpeYAr.mjs";
+import { n as maybeResolveIMessageQuestionReaction, t as hasIMessageQuestionReactionTarget } from "./question-reactions-9jrqVZgE.mjs";
+import { imessageSetupWizard } from "./setup-surface-BMWS7VuY.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, createChannelIngressError, createChannelIngressMonitor, createChannelMessageReplyPipeline, resolveChannelStreamingBlockEnabled, resolveOutboundSendDep } from "openclaw/plugin-sdk/channel-outbound";
+import { bindIngressLifecycleToReplyOptions, createAccountStatusSink, createChannelDeliveryAccumulator, createChannelIngressError, createChannelIngressMonitor, createChannelMessageReplyPipeline, resolveChannelStreamingBlockEnabled, resolveOutboundSendDep } from "openclaw/plugin-sdk/channel-outbound";
 import { resolveTextChunkLimit } from "openclaw/plugin-sdk/reply-runtime";
 import { resolveAgentRoute, resolveInboundLastRouteSessionKey } from "openclaw/plugin-sdk/routing";
 import path from "node:path";
@@ -32,7 +32,7 @@ import { sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-util
 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 { buildChannelInboundEventContext, buildMentionRegexes, createAcceptedChannelDeliveryResult, createChannelInboundDebouncer, createChannelPartialDeliveryError, filterChannelInboundQuoteContext, formatInboundEnvelope, formatInboundFromLabel, formatInboundMediaUnavailableText, formatMediaPlaceholderText, isChannelPartialDeliveryError, logInboundDrop, matchesMentionPatterns, resolveEnvelopeFormatOptions, resolveInboundDebounceMs, resolveInboundMentionDecision, resolveInboundSupplementalSenderAllowed, runChannelInboundEvent, shouldDebounceTextInbound, toInboundMediaFactsWithMetadata } from "openclaw/plugin-sdk/channel-inbound";
+import { 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 { CHANNEL_APPROVAL_NATIVE_RUNTIME_CONTEXT_CAPABILITY } from "openclaw/plugin-sdk/approval-handler-runtime";
@@ -47,7 +47,7 @@ import { ensureConfiguredBindingRouteReady, readChannelAllowFromStore, upsertCha
 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 { getSessionEntry, readSessionUpdatedAt, resolveSendPolicy, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
+import { getSessionEntry, 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 { chunkMarkdownTextWithMode, resolveChunkMode } from "openclaw/plugin-sdk/reply-chunking";
@@ -201,7 +201,7 @@ async function pollPendingIMessageApprovalReactions(params) {
 }
 //#endregion
 //#region extensions/imessage/src/chat.ts
-function buildChatTargetParams(to, opts) {
+async function runChatAction(method, to, opts, isTyping) {
 	const cfg = requireRuntimeConfig(opts.cfg, "iMessage chat action");
 	const account = opts.account ?? resolveIMessageAccount({
 		cfg,
@@ -213,17 +213,11 @@ function buildChatTargetParams(to, opts) {
 	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;
-	return {
-		params,
-		service: opts.service ?? (target.kind === "handle" ? target.service : void 0) ?? account.config.service
-	};
-}
-async function runChatAction(method, params, opts) {
-	const cfg = requireRuntimeConfig(opts.cfg, "iMessage chat action");
-	const account = opts.account ?? resolveIMessageAccount({
-		cfg,
-		accountId: opts.accountId
-	});
+	if (method === "typing") {
+		params.typing = isTyping;
+		const service = opts.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";
 	const dbPath = opts.dbPath?.trim() || account.config.dbPath?.trim();
 	const remoteHost = await resolveIMessageRemoteHost({
@@ -237,20 +231,16 @@ async function runChatAction(method, params, opts) {
 	});
 	const shouldClose = !opts.client;
 	try {
-		return await client.request(method, params, { timeoutMs: opts.timeoutMs });
+		await client.request(method, params, { timeoutMs: opts.timeoutMs });
 	} finally {
 		if (shouldClose) await client.stop();
 	}
 }
 async function sendIMessageTyping(to, isTyping, opts) {
-	const { params, service } = buildChatTargetParams(to, opts);
-	params.typing = isTyping;
-	if (service) params.service = service;
-	await runChatAction("typing", params, opts);
+	await runChatAction("typing", to, opts, isTyping);
 }
 async function markIMessageChatRead(to, opts) {
-	const { params } = buildChatTargetParams(to, opts);
-	await runChatAction("read", params, opts);
+	await runChatAction("read", to, opts);
 }
 //#endregion
 //#region extensions/imessage/src/monitor/abort-handler.ts
@@ -296,14 +286,11 @@ function normalizeIMessageCatchupCursor(value) {
 	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 {
+	return buildIMessageCatchupCursor({
 		lastSeenMs: raw.lastSeenMs,
 		lastSeenRowid: raw.lastSeenRowid,
-		updatedAt: typeof raw.updatedAt === "number" ? raw.updatedAt : 0,
-		...hasRetries ? { failureRetries } : {}
-	};
+		failureRetries: raw.failureRetries
+	}, typeof raw.updatedAt === "number" ? raw.updatedAt : 0);
 }
 async function loadIMessageCatchupCursor(accountId) {
 	return normalizeIMessageCatchupCursor(await openCatchupCursorStore().lookup(resolveIMessageCatchupCursorKey(accountId)));
@@ -344,11 +331,6 @@ function decideCatchupCursorSave(existingValue, cursor, allowCursorRewindForRetr
 		value: cursor
 	};
 }
-async function saveIMessageCatchupCursor(accountId, next, options = {}) {
-	const cursor = buildIMessageCatchupCursor(next, Date.now());
-	const allowCursorRewindForRetries = options.allowCursorRewindForRetries === true;
-	await updateIMessageCatchupCursor(accountId, (existing) => decideCatchupCursorSave(existing, cursor, allowCursorRewindForRetries));
-}
 async function updateIMessageCatchupCursor(accountId, decide) {
 	const store = openCatchupCursorStore();
 	if (!store.observe || !store.compareAndApply) throw new Error("iMessage catchup cursor persistence requires plugin-state comparison support.");
@@ -464,10 +446,10 @@ async function performIMessageCatchup(params) {
 			summary.skippedPreCursor += 1;
 			continue;
 		}
+		highWatermarkMs = Math.max(highWatermarkMs, row.date);
+		highWatermarkRowid = Math.max(highWatermarkRowid, row.rowid);
 		if (row.date < ageBoundMs) {
 			summary.skippedPreCursor += 1;
-			highWatermarkMs = Math.max(highWatermarkMs, row.date);
-			highWatermarkRowid = Math.max(highWatermarkRowid, row.rowid);
 			continue;
 		}
 		if (row.isFromMe) {
@@ -477,15 +459,11 @@ async function performIMessageCatchup(params) {
 				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;
@@ -498,8 +476,6 @@ async function performIMessageCatchup(params) {
 		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;
@@ -508,8 +484,6 @@ async function performIMessageCatchup(params) {
 		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;
@@ -532,11 +506,12 @@ async function performIMessageCatchup(params) {
 		lastSeenMs,
 		lastSeenRowid
 	};
-	await saveIMessageCatchupCursor(params.accountId, {
+	const next = buildIMessageCatchupCursor({
 		lastSeenMs,
 		lastSeenRowid,
 		failureRetries: capped
-	}, { allowCursorRewindForRetries: earliestHeldFailureRow !== null });
+	}, Date.now());
+	await updateIMessageCatchupCursor(params.accountId, (existing) => decideCatchupCursorSave(existing, next, 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;
 }
@@ -853,7 +828,7 @@ async function repairIMessageConversationAnchor(params) {
 	}
 	let chatsResult;
 	try {
-		chatsResult = await client.request("chats.list", { limit: params.chatsLimit ?? DEFAULT_CHATS_LIMIT }, { timeoutMs: params.rpcTimeoutMs ?? DEFAULT_RPC_TIMEOUT_MS });
+		chatsResult = await client.request("chats.list", { limit: DEFAULT_CHATS_LIMIT }, { timeoutMs: DEFAULT_RPC_TIMEOUT_MS });
 	} catch (err) {
 		runtime?.error?.(`imessage: anchorless message recovery failed listing chats: ${String(err)}`);
 		return null;
@@ -868,8 +843,8 @@ async function repairIMessageConversationAnchor(params) {
 			historyResult = await client.request("messages.history", {
 				attachments: false,
 				chat_id: chatId,
-				limit: params.perChatHistoryLimit ?? DEFAULT_PER_CHAT_HISTORY_LIMIT
-			}, { timeoutMs: params.rpcTimeoutMs ?? DEFAULT_RPC_TIMEOUT_MS });
+				limit: DEFAULT_PER_CHAT_HISTORY_LIMIT
+			}, { timeoutMs: DEFAULT_RPC_TIMEOUT_MS });
 		} catch {
 			continue;
 		}
@@ -921,7 +896,7 @@ async function deliverIMessageReply(params) {
 	const chunkMode = resolveChunkMode(cfg, "imessage", accountId);
 	const rawText = sanitizeOutboundText(payload.text ?? "");
 	const reply = resolveSendableOutboundReplyParts(payload, { text: convertMarkdownTables(rawText, tableMode) });
-	const accepted = [];
+	const accepted = createChannelDeliveryAccumulator({ kind: reply.mediaUrls.length > 0 ? "media" : "text" });
 	const sendAccepted = async (text, mediaUrl) => {
 		const sent = await sendMessageIMessage(target, text, {
 			config: cfg,
@@ -933,7 +908,7 @@ async function deliverIMessageReply(params) {
 			accountId,
 			replyToId: payload.replyToId
 		});
-		accepted.push(sent);
+		accepted.add({ receipt: sent.receipt }, sent.sentText);
 		const echoText = sent.echoText ?? (sent.sentText || void 0);
 		sentMessageCache?.remember(scope, {
 			...echoText ? { text: echoText } : {},
@@ -951,25 +926,10 @@ async function deliverIMessageReply(params) {
 			sendMedia: ({ mediaUrl, caption }) => sendAccepted(caption ?? "", mediaUrl)
 		});
 	} catch (error) {
-		const partial = isChannelPartialDeliveryError(error) ? error.deliveryResult : void 0;
-		if (accepted.length === 0 && partial?.visibleReplySent !== true) throw error;
-		throw createChannelPartialDeliveryError(error, createAcceptedChannelDeliveryResult({
-			results: accepted.map((result) => ({ receipt: result.receipt })),
-			deliveryResults: partial ? [partial] : [],
-			kind: reply.mediaUrls.length > 0 ? "media" : "text",
-			content: [...accepted.map((result) => result.sentText), partial?.content].filter(Boolean).join("\n")
-		}));
-	}
-	if (delivered === "empty") return {
-		visibleReplySent: false,
-		suppression: { reason: "no_visible_result" }
-	};
-	const deliveryResult = createAcceptedChannelDeliveryResult({
-		results: accepted.map((result) => ({ receipt: result.receipt })),
-		kind: delivered,
-		content: accepted.map((result) => result.sentText).filter(Boolean).join("\n")
-	});
-	runtime.log?.(`imessage: delivered reply to ${target}`);
+		throw accepted.partialError(error);
+	}
+	const deliveryResult = accepted.result();
+	if (delivered !== "empty") runtime.log?.(`imessage: delivered reply to ${target}`);
 	return deliveryResult;
 }
 function createIMessageEchoCachingSend(params) {
@@ -1070,29 +1030,27 @@ function createIMessageThrottledDropDiagnosticCache() {
 //#region extensions/imessage/src/monitor/echo-cache.ts
 const SENT_MESSAGE_TEXT_TTL_MS = 4e3;
 const SENT_MESSAGE_ID_TTL_MS = 6e4;
-var DefaultSentMessageCache = class {
-	constructor() {
-		this.textCache = /* @__PURE__ */ new Map();
-		this.textBackedByIdCache = /* @__PURE__ */ new Map();
-		this.mediaCache = /* @__PURE__ */ new Map();
-		this.mediaBackedByIdCache = /* @__PURE__ */ new Map();
-		this.messageIdCache = /* @__PURE__ */ new Map();
-	}
-	remember(scope, lookup) {
+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) this.textCache.set(`${scope}:${textKey}`, Date.now());
+		if (textKey) textCache.set(`${scope}:${textKey}`, Date.now());
 		const mediaKey = resolveIMessageEchoMediaKey(lookup.media);
-		if (mediaKey) this.mediaCache.set(`${scope}:${mediaKey}`, Date.now());
+		if (mediaKey) mediaCache.set(`${scope}:${mediaKey}`, Date.now());
 		const messageIdKey = normalizeIMessageMessageId(lookup.messageId);
 		if (messageIdKey) {
-			this.messageIdCache.set(`${scope}:${messageIdKey}`, Date.now());
-			if (textKey) this.textBackedByIdCache.set(`${scope}:${textKey}`, Date.now());
-			if (mediaKey) this.mediaBackedByIdCache.set(`${scope}:${mediaKey}`, Date.now());
+			messageIdCache.set(`${scope}:${messageIdKey}`, Date.now());
+			if (textKey) textBackedByIdCache.set(`${scope}:${textKey}`, Date.now());
+			if (mediaKey) mediaBackedByIdCache.set(`${scope}:${mediaKey}`, Date.now());
 		}
-		this.cleanup();
+		cleanup();
 	}
-	async has(scope, lookup, options = false) {
-		this.cleanup();
+	async function has(scope, lookup, options = false) {
+		cleanup();
 		const resolvedOptions = typeof options === "boolean" ? { skipIdShortCircuit: options } : options;
 		if (await hasPersistedIMessageEcho({
 			scope,
@@ -1102,48 +1060,45 @@ var DefaultSentMessageCache = class {
 			skipIdShortCircuit: resolvedOptions.skipIdShortCircuit,
 			includePendingText: resolvedOptions.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);
+		};
 		const textKey = normalizeIMessageEchoText(lookup.text);
 		const mediaKey = resolveIMessageEchoMediaKey(lookup.media);
 		const messageIdKey = normalizeIMessageMessageId(lookup.messageId);
 		let canUseMediaFallback = !messageIdKey;
 		if (messageIdKey) {
-			const idTimestamp = this.messageIdCache.get(`${scope}:${messageIdKey}`);
-			if (idTimestamp && Date.now() - idTimestamp <= SENT_MESSAGE_ID_TTL_MS) return true;
-			const textTimestamp = textKey ? this.textCache.get(`${scope}:${textKey}`) : void 0;
-			const textBackedByIdTimestamp = textKey ? this.textBackedByIdCache.get(`${scope}:${textKey}`) : void 0;
-			const hasTextOnlyMatch = typeof textTimestamp === "number" && (!textBackedByIdTimestamp || textTimestamp > textBackedByIdTimestamp);
-			const mediaTimestamp = mediaKey ? this.mediaCache.get(`${scope}:${mediaKey}`) : void 0;
-			const mediaBackedByIdTimestamp = mediaKey ? this.mediaBackedByIdCache.get(`${scope}:${mediaKey}`) : void 0;
-			const hasMediaOnlyMatch = typeof mediaTimestamp === "number" && (!mediaBackedByIdTimestamp || mediaTimestamp > mediaBackedByIdTimestamp);
+			if (matchesWithin(messageIdCache, messageIdKey, SENT_MESSAGE_ID_TTL_MS)) return true;
+			const hasTextOnlyMatch = hasContentOnlyMatch(textCache, textBackedByIdCache, textKey);
+			const hasMediaOnlyMatch = hasContentOnlyMatch(mediaCache, mediaBackedByIdCache, mediaKey);
 			canUseMediaFallback = hasMediaOnlyMatch;
 			if (!resolvedOptions.skipIdShortCircuit && !hasTextOnlyMatch && !hasMediaOnlyMatch) return false;
 		}
-		if (textKey) {
-			const textTimestamp = this.textCache.get(`${scope}:${textKey}`);
-			if (textTimestamp && Date.now() - textTimestamp <= SENT_MESSAGE_TEXT_TTL_MS) return true;
-		}
-		if (mediaKey && canUseMediaFallback) {
-			const mediaTimestamp = this.mediaCache.get(`${scope}:${mediaKey}`);
-			if (mediaTimestamp && Date.now() - mediaTimestamp <= SENT_MESSAGE_TEXT_TTL_MS) return true;
-		}
-		return false;
+		return matchesWithin(textCache, textKey, SENT_MESSAGE_TEXT_TTL_MS) || canUseMediaFallback && matchesWithin(mediaCache, mediaKey, SENT_MESSAGE_TEXT_TTL_MS);
 	}
-	cleanup() {
+	function cleanup() {
 		const now = Date.now();
 		for (const cache of [
-			this.textCache,
-			this.textBackedByIdCache,
-			this.mediaCache,
-			this.mediaBackedByIdCache,
-			this.messageIdCache
+			textCache,
+			textBackedByIdCache,
+			mediaCache,
+			mediaBackedByIdCache,
+			messageIdCache
 		]) {
-			const ttlMs = cache === this.messageIdCache ? SENT_MESSAGE_ID_TTL_MS : SENT_MESSAGE_TEXT_TTL_MS;
+			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);
 		}
 	}
-};
-function createSentMessageCache() {
-	return new DefaultSentMessageCache();
+	return {
+		remember,
+		has
+	};
 }
 //#endregion
 //#region extensions/imessage/src/monitor/group-allowlist-warnings.ts
@@ -1338,10 +1293,7 @@ const REFLECTION_PATTERNS = [
 ];
 function hasMatchOutsideCode(text, re, codeRegions) {
 	const globalRe = new RegExp(re.source, re.flags.includes("g") ? re.flags : `${re.flags}g`);
-	for (const match of text.matchAll(globalRe)) {
-		const start = match.index ?? -1;
-		if (start >= 0 && !isInsideCode(start, codeRegions)) return true;
-	}
+	for (const match of text.matchAll(globalRe)) if (!isInsideCode(match.index, codeRegions)) return true;
 	return false;
 }
 /**
@@ -1372,13 +1324,12 @@ const imessageConversationIdentityKinds = /* @__PURE__ */ new Set([
 const matchIMessageIngressEntry = ({ entry, context }) => {
 	if (imessageConversationIdentityKinds.has(entry.kind) && context !== "group") return false;
 };
-function isIMessageConversationAllowTarget(entry) {
-	const parsed = parseIMessageAllowTarget(entry);
-	return parsed.kind === "chat_id" || parsed.kind === "chat_guid" || parsed.kind === "chat_identifier";
-}
 function mergeIMessageGroupAllowFromWithLegacyChatTargets(params) {
 	if (params.groupAllowFrom.length > 0 || !params.allowLegacyConversationTargets) return params.groupAllowFrom;
-	const legacyChatTargets = params.allowFrom.filter((entry) => isIMessageConversationAllowTarget(entry));
+	const legacyChatTargets = params.allowFrom.filter((entry) => {
+		const parsed = parseIMessageAllowTarget(entry);
+		return parsed.kind === "chat_id" || parsed.kind === "chat_guid" || parsed.kind === "chat_identifier";
+	});
 	if (legacyChatTargets.length === 0) return params.groupAllowFrom;
 	return uniqueStrings([...params.groupAllowFrom, ...legacyChatTargets]);
 }
@@ -1429,25 +1380,9 @@ function normalizeIMessageChatIdentifierEntry(entry) {
 	const parsed = parseIMessageAllowTarget(entry.trim());
 	return parsed.kind === "chat_identifier" ? parsed.chatIdentifier.trim() || null : null;
 }
-function normalizeGroupPolicy(policy) {
-	return policy === "open" || policy === "disabled" ? policy : "allowlist";
-}
 function normalizeReplyField(value) {
 	return typeof value === "number" ? String(value) : normalizeOptionalString(value);
 }
-function describeReplyContext(message) {
-	const body = normalizeReplyField(message.reply_to_text);
-	if (!body) return null;
-	return {
-		body,
-		id: normalizeReplyField(message.thread_originator_guid) ?? normalizeReplyField(message.reply_to_guid),
-		sender: normalizeReplyField(message.reply_to_sender)
-	};
-}
-function resolveInboundEchoMessageIds(message) {
-	const values = [message.id != null ? String(message.id) : void 0, normalizeReplyField(message.guid)];
-	return uniqueStrings(values.filter((value) => Boolean(value)));
-}
 function classifyIMessageSelfChat(message, isGroup, senderNormalized) {
 	const chatIdentifier = normalizeIMessageHandle(message.chat_identifier ?? "") || void 0;
 	const destination = normalizeIMessageHandle(message.destination_caller_id ?? "") || void 0;
@@ -1480,9 +1415,7 @@ function rememberIMessageSkippedFromMeForSelfChatDedupe(params) {
 	else if (isAmbiguousSelfThread) params.selfChatCache?.remember(lookup);
 }
 async function hasIMessageEchoMatch(params) {
-	const scopes = typeof params.scope === "string" ? [params.scope] : params.scope;
-	for (const scope of scopes) {
-		if (!scope) continue;
+	for (const scope of params.scope) {
 		for (const messageId of params.messageIds) if (await params.echoCache.has(scope, { messageId })) return true;
 		const fallbackMessageId = params.messageIds[0];
 		if (!params.text && !params.media && !fallbackMessageId) continue;
@@ -1542,17 +1475,16 @@ async function resolveIMessageInboundDecision(params) {
 	};
 	const { isSelfChat, isAmbiguousSelfThread } = classifyIMessageSelfChat(params.message, isGroup, senderNormalized);
 	let skipSelfChatHasCheck = false;
-	const inboundMessageIds = resolveInboundEchoMessageIds(params.message);
+	const inboundMessageIds = uniqueStrings([params.message.id != null ? String(params.message.id) : void 0, normalizeReplyField(params.message.guid)].filter((value) => Boolean(value)));
 	const inboundMessageId = inboundMessageIds[0];
 	const hasInboundGuid = Boolean(normalizeReplyField(params.message.guid));
-	const echoScope = buildIMessageEchoScope({
-		accountId: params.accountId,
-		isGroup,
-		chatId,
-		chatGuid,
-		chatIdentifier,
-		sender
-	});
+	const echoScope = [];
+	if (isGroup) {
+		const chatIdScope = formatIMessageChatTarget(chatId);
+		if (chatIdScope) echoScope.push(`${params.accountId}:${chatIdScope}`);
+	} else echoScope.push(`${params.accountId}:imessage:${sender}`);
+	if (chatGuid) echoScope.push(`${params.accountId}:chat_guid:${chatGuid}`);
+	if (chatIdentifier) echoScope.push(`${params.accountId}:chat_identifier:${chatIdentifier}`);
 	if (params.message.is_from_me) {
 		if (isAmbiguousSelfThread) params.selfChatCache?.remember(selfChatLookup);
 		if (isSelfChat) {
@@ -1615,7 +1547,7 @@ async function resolveIMessageInboundDecision(params) {
 		},
 		contextBinding,
 		dmPolicy: normalizeChannelDmPolicy(params.dmPolicy) ?? "pairing",
-		groupPolicy: normalizeGroupPolicy(params.groupPolicy),
+		groupPolicy: params.groupPolicy === "open" || params.groupPolicy === "disabled" ? params.groupPolicy : "allowlist",
 		policy: { groupAllowFromFallbackToAllowFrom: false },
 		allowFrom: params.allowFrom,
 		groupAllowFrom: groupAllowFromForAccess,
@@ -1749,10 +1681,7 @@ async function resolveIMessageInboundDecision(params) {
 			messageIds: inboundMessageIds,
 			includePendingText: isSelfChat
 		})) {
-			params.logVerbose?.(describeIMessageEchoDropLog({
-				messageText: bodyText,
-				messageId: inboundMessageId
-			}));
+			params.logVerbose?.(`imessage: skipping echo message${inboundMessageId ? ` id=${inboundMessageId}` : ""}: "${truncateUtf16Safe(bodyText, 50)}"`);
 			return {
 				kind: "drop",
 				reason: "echo"
@@ -1767,7 +1696,12 @@ async function resolveIMessageInboundDecision(params) {
 			reason: "reflected assistant content"
 		};
 	}
-	const replyContext = describeReplyContext(params.message);
+	const replyBody = normalizeReplyField(params.message.reply_to_text);
+	const replyContext = replyBody ? {
+		body: replyBody,
+		id: normalizeReplyField(params.message.thread_originator_guid) ?? normalizeReplyField(params.message.reply_to_guid),
+		sender: normalizeReplyField(params.message.reply_to_sender)
+	} : null;
 	const contextVisibilityMode = resolveChannelContextVisibilityMode({
 		cfg: params.cfg,
 		channel: "imessage",
@@ -2020,20 +1954,6 @@ async function buildIMessageInboundContext(params) {
 		inboundHistory
 	};
 }
-function buildIMessageEchoScope(params) {
-	const scopes = [];
-	if (params.isGroup) {
-		const chatIdScope = formatIMessageChatTarget(params.chatId);
-		if (chatIdScope) scopes.push(`${params.accountId}:${chatIdScope}`);
-	} else scopes.push(`${params.accountId}:imessage:${params.sender}`);
-	if (params.chatGuid) scopes.push(`${params.accountId}:chat_guid:${params.chatGuid}`);
-	if (params.chatIdentifier) scopes.push(`${params.accountId}:chat_identifier:${params.chatIdentifier}`);
-	return scopes;
-}
-function describeIMessageEchoDropLog(params) {
-	const preview = truncateUtf16Safe(params.messageText, 50);
-	return `imessage: skipping echo message${params.messageId ? ` id=${params.messageId}` : ""}: "${preview}"`;
-}
 //#endregion
 //#region extensions/imessage/src/monitor/ingress.ts
 const IMESSAGE_INGRESS_PAYLOAD_VERSION = 1;
@@ -2195,9 +2115,7 @@ function createIMessageDurableIngress(options) {
 const DEFAULT_WINDOW_MS = 6e4;
 const DEFAULT_MAX_HITS = 5;
 const CLEANUP_INTERVAL_MS = 12e4;
-function createLoopRateLimiter(opts) {
-	const windowMs = opts?.windowMs ?? DEFAULT_WINDOW_MS;
-	const maxHits = opts?.maxHits ?? DEFAULT_MAX_HITS;
+function createLoopRateLimiter() {
 	const conversations = /* @__PURE__ */ new Map();
 	let lastCleanup = Date.now();
 	function cleanup() {
@@ -2205,7 +2123,7 @@ function createLoopRateLimiter(opts) {
 		if (now - lastCleanup < CLEANUP_INTERVAL_MS) return;
 		lastCleanup = now;
 		for (const [key, timestamps] of conversations.entries()) {
-			const recent = timestamps.filter((ts) => now - ts <= windowMs);
+			const recent = timestamps.filter((ts) => now - ts <= DEFAULT_WINDOW_MS);
 			if (recent.length === 0) conversations.delete(key);
 			else conversations.set(key, recent);
 		}
@@ -2225,9 +2143,9 @@ function createLoopRateLimiter(opts) {
 			const timestamps = conversations.get(conversationKey);
 			if (!timestamps) return false;
 			const now = Date.now();
-			const recent = timestamps.filter((ts) => now - ts <= windowMs);
+			const recent = timestamps.filter((ts) => now - ts <= DEFAULT_WINDOW_MS);
 			conversations.set(conversationKey, recent);
-			return recent.length >= maxHits;
+			return recent.length >= DEFAULT_MAX_HITS;
 		}
 	};
 }
@@ -2246,37 +2164,22 @@ function isHeicAttachment(attachmentPath, mimeType) {
 	const ext = path.extname(attachmentPath).toLowerCase();
 	return ext === ".heic" || ext === ".heif";
 }
-function jpegFilenameForAttachment(attachmentPath) {
-	return `${path.parse(attachmentPath).name || "imessage-attachment"}.jpg`;
-}
-function hasWildcardSegment(root) {
-	return root.replaceAll("\\", "/").split("/").includes("*");
-}
-async function canonicalizeAllowedRoots(roots) {
-	const canonicalRoots = [];
-	for (const root of roots) {
-		canonicalRoots.push(root);
-		if (hasWildcardSegment(root)) continue;
-		const canonicalRoot = await fs.realpath(root).catch(() => void 0);
-		if (canonicalRoot && canonicalRoot !== root) canonicalRoots.push(canonicalRoot);
-	}
-	return canonicalRoots;
-}
-async function assertAllowedCanonicalAttachmentPath(params) {
-	if (!params.allowedRoots) return;
-	const canonicalRoots = await canonicalizeAllowedRoots(params.allowedRoots);
-	if (!isInboundPathAllowed({
-		filePath: params.canonicalPath,
-		roots: canonicalRoots
-	})) throw new Error("attachment path resolves outside allowed roots");
-}
 async function readAttachmentBuffer(params) {
 	await using opened = await (params.deps.openLocalFileSafely ?? openLocalFileSafely)({ filePath: params.attachmentPath });
 	if (opened.stat.size > params.maxBytes) throw new Error(`attachment exceeds ${Math.round(params.maxBytes / 1048576)}MB limit`);
-	await assertAllowedCanonicalAttachmentPath({
-		canonicalPath: opened.realPath,
-		allowedRoots: params.allowedRoots
-	});
+	if (params.allowedRoots) {
+		const canonicalRoots = [];
+		for (const root of params.allowedRoots) {
+			canonicalRoots.push(root);
+			if (root.replaceAll("\\", "/").split("/").includes("*")) continue;
+			const canonicalRoot = await fs.realpath(root).catch(() => void 0);
+			if (canonicalRoot && canonicalRoot !== root) canonicalRoots.push(canonicalRoot);
+		}
+		if (!isInboundPathAllowed({
+			filePath: opened.realPath,
+			roots: canonicalRoots
+		})) throw new Error("attachment path resolves outside allowed roots");
+	}
 	const buffer = await readFileHandleBounded(opened.handle, params.maxBytes).catch((error) => {
 		if (error instanceof FsSafeError && error.code === "too-large") throw new Error(`attachment exceeds ${Math.round(params.maxBytes / 1048576)}MB limit`);
 		throw error;
@@ -2295,7 +2198,7 @@ async function readAttachmentBuffer(params) {
 				});
 			})).buffer,
 			contentType: "image/jpeg",
-			originalFilename: jpegFilenameForAttachment(params.attachmentPath)
+			originalFilename: `${path.parse(params.attachmentPath).name || "imessage-attachment"}.jpg`
 		};
 	} catch (err) {
 		params.deps.logVerbose?.(`imessage: HEIC attachment conversion failed; staging original instead: ${String(err)}`);
@@ -2347,12 +2250,6 @@ async function stageIMessageAttachments(attachments, params) {
 //#endregion
 //#region extensions/imessage/src/monitor/poll-comment.ts
 const DEFAULT_COMMENT_WINDOW_MS = 15e3;
-function normalizeGuid(guid) {
-	return guid?.trim() ?? "";
-}
-function normalizeSender(sender) {
-	return sender?.trim().toLowerCase() ?? "";
-}
 function createPollCommentFolder(options) {
 	const windowMs = options?.windowMs ?? DEFAULT_COMMENT_WINDOW_MS;
 	const seenPolls = /* @__PURE__ */ new Map();
@@ -2361,20 +2258,20 @@ function createPollCommentFolder(options) {
 	}
 	return {
 		rememberPoll(guid, atMs, sender) {
-			const key = normalizeGuid(guid);
+			const key = guid?.trim();
 			if (!key || !Number.isFinite(atMs)) return;
 			prune(atMs);
 			seenPolls.set(key, {
 				atMs,
-				sender: normalizeSender(sender)
+				sender: normalizeLowercaseStringOrEmpty(sender)
 			});
 		},
 		isPollComment(replyToGuid, atMs, sender) {
-			const key = normalizeGuid(replyToGuid);
+			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;
-			const replySender = normalizeSender(sender);
+			const replySender = normalizeLowercaseStringOrEmpty(sender);
 			return seen.sender.length > 0 && replySender.length > 0 && seen.sender === replySender;
 		}
 	};
@@ -2599,7 +2496,6 @@ var DefaultSelfChatCache = class {
 		this.cache = /* @__PURE__ */ new Map();
 		this.insertionOrder = /* @__PURE__ */ new Map();
 		this.lastCleanupAt = 0;
-		this.nextEntryId = 1;
 	}
 	buildBucketKey(lookup) {
 		const text = normalizeText(lookup.text);
@@ -2609,16 +2505,15 @@ var DefaultSelfChatCache = class {
 	remember(lookup) {
 		const key = this.buildBucketKey(lookup);
 		if (!key || !isUsableTimestamp(lookup.createdAt)) return;
-		const entries = this.cache.get(key) ?? /* @__PURE__ */ new Map();
+		const entries = this.cache.get(key) ?? /* @__PURE__ */ new Set();
 		const entry = {
 			createdAt: lookup.createdAt,
 			createdAtSkewToleranceMs: lookup.allowCreatedAtSkew ? SELF_CHAT_CREATED_AT_TOLERANCE_MS : 0,
 			rememberedAt: Date.now()
 		};
-		const id = this.nextEntryId++;
-		entries.set(id, entry);
+		entries.add(entry);
 		this.cache.set(key, entries);
-		this.insertionOrder.set(id, key);
+		this.insertionOrder.set(entry, key);
 		this.maybeCleanup();
 	}
 	has(lookup) {
@@ -2634,24 +2529,20 @@ var DefaultSelfChatCache = class {
 			return 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 [key, entries] of this.cache.entries()) {
-			for (const [id, entry] of entries.entries()) if (now - entry.rememberedAt > SELF_CHAT_TTL_MS) {
-				entries.delete(id);
-				this.insertionOrder.delete(id);
-			}
-			if (entries.size === 0) this.cache.delete(key);
-		}
+		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 [id, key] = expectDefined(this.insertionOrder.entries().next().value, "oldest iMessage self-chat cache entry");
-			this.insertionOrder.delete(id);
-			const entries = this.cache.get(key);
-			if (!entries) continue;
-			entries.delete(id);
-			if (entries.size === 0) this.cache.delete(key);
+			const [entry, key] = expectDefined(this.insertionOrder.entries().next().value, "oldest iMessage self-chat cache entry");
+			this.removeEntry(entry, key);
 		}
 	}
 };
@@ -2680,53 +2571,12 @@ const APPROVAL_REACTION_POLL_INTERVAL_MS = 2e3;
 const APPROVAL_REACTION_DISCOVERY_INTERVAL_MS = 6e4;
 const IMESSAGE_TYPING_KEEPALIVE_INTERVAL_MS = 8e3;
 const IMESSAGE_TYPING_KEEPALIVE_MAX_DURATION_MS = 6e5;
-function resolveConfiguredIMessageTypingMode(cfg, agentId) {
-	return resolveAgentConfig(cfg, agentId)?.typingMode ?? cfg.agents?.defaults?.typingMode;
-}
 function isIMessagePluginPayloadAttachment(attachment) {
 	const attachmentPath = attachment.original_path?.trim().toLowerCase() ?? "";
 	const transferName = attachment.transfer_name?.trim().toLowerCase() ?? "";
 	const uti = attachment.uti?.trim().toLowerCase() ?? "";
 	return attachmentPath.endsWith(".pluginpayloadattachment") || transferName.endsWith(".pluginpayloadattachment") || uti === "com.apple.messages.pluginpayloadattachment";
 }
-function resolveIMessageInboundMediaInput(params) {
-	const mediaCandidates = params.attachments.filter((entry) => !isIMessagePluginPayloadAttachment(entry));
-	const mediaFacts = mediaCandidates.map((attachment) => {
-		const contentType = attachment.mime_type?.trim() || void 0;
-		return {
-			contentType,
-			kind: kindFromMime(contentType) ?? "unknown"
-		};
-	});
-	const rawMediaAttachments = mediaCandidates.map((attachment, index) => {
-		const fact = mediaFacts[index] ?? { kind: "unknown" };
-		const attachmentPath = attachment.original_path?.trim();
-		if (!attachmentPath || attachment.missing) return fact;
-		if (!isInboundPathAllowed({
-			filePath: attachmentPath,
-			roots: params.effectiveAttachmentRoots
-		})) {
-			params.logVerbose?.(`imessage: dropping inbound attachment outside allowed roots: ${attachmentPath}`);
-			return fact;
-		}
-		return {
-			...fact,
-			path: attachmentPath
-		};
-	});
-	return {
-		bodyText: params.messageText,
-		mediaFacts,
-		mediaCandidates,
-		rawMediaAttachments
-	};
-}
-function formatIMessageInboundMediaBody(params) {
-	return formatInboundMediaUnavailableText({
-		body: params.messageText,
-		notice: `[imessage ${params.unavailableCount > 1 ? `${params.unavailableCount} attachments` : "attachment"} unavailable]`
-	});
-}
 const warnIfImsgUpgradeNeeded = (() => {
 	let fired = false;
 	return { fireOnce: (rpcMethods, runtime) => {
@@ -2748,16 +2598,6 @@ const IMESSAGE_DIAGNOSTIC_DROP_REASONS = /* @__PURE__ */ new Set([
 	"self-chat echo"
 ]);
 const IMESSAGE_THROTTLED_DIAGNOSTIC_DROP_REASONS = /* @__PURE__ */ new Set(["from me", "no mention"]);
-function describeIMessageInboundDropDiagnostic(params) {
-	if (!IMESSAGE_DIAGNOSTIC_DROP_REASONS.has(params.reason)) return null;
-	const messageId = typeof params.message.id === "number" || typeof params.message.id === "string" ? String(params.message.id) : "unknown";
-	const mentionHint = params.reason === "no mention" ? ` Mention the agent (default patterns come from its identity name/emoji), or set ${params.groupsConfigPath}["${params.message.chat_id}"].requireMention=false. Preserve existing groups entries; when adding the first groups map, include "*": {} to keep other chats admitted.` : "";
-	return `imessage: dropped inbound message account=${params.accountId} reason=${JSON.stringify(params.reason)} chat_id=${params.message.chat_id ?? "unknown"} group=${params.message.is_group === true} message_id=${messageId} guid=${params.message.guid ? "present" : "missing"} created_at=${params.message.created_at ?? "unknown"}${mentionHint}`;
-}
-function describeIMessageWatchSubscribeStartupFailure(params) {
-	const retry = params.retryDelayMs !== void 0 ? ` retry_in_ms=${params.retryDelayMs}` : "";
-	return `imessage: watch.subscribe startup failed attempt=${params.attempt}/${params.maxAttempts} account=${params.accountId} cliPath=${params.cliPath} dbPath=${params.dbPath ? "configured" : "default"} remoteHost=${params.remoteHost ? "configured" : "none"} timeoutMs=${params.probeTimeoutMs} since_rowid=${params.watchSinceRowid ?? "none"} attachments=${params.includeAttachments} include_reactions=true${retry}: ${String(params.error)}`;
-}
 async function monitorIMessageProvider(opts) {
 	const { scheduler } = opts;
 	const runtime = opts.runtime ?? createNonExitingRuntime();
@@ -2785,8 +2625,8 @@ async function monitorIMessageProvider(opts) {
 	const selfChatCache = createSelfChatCache();
 	const loopRateLimiter = createLoopRateLimiter();
 	const textLimit = resolveTextChunkLimit(cfg, "imessage", accountInfo.accountId);
-	const allowFrom = normalizeStringEntries(opts.allowFrom ?? imessageCfg.allowFrom);
-	const configuredGroupAllowFrom = opts.groupAllowFrom ?? imessageCfg.groupAllowFrom;
+	const allowFrom = normalizeStringEntries(imessageCfg.allowFrom);
+	const configuredGroupAllowFrom = imessageCfg.groupAllowFrom;
 	const groupAllowFrom = normalizeStringEntries(configuredGroupAllowFrom ?? (imessageCfg.allowFrom && imessageCfg.allowFrom.length > 0 ? imessageCfg.allowFrom : []));
 	const allowLegacyConversationAllowFromForGroup = configuredGroupAllowFrom == null;
 	const defaultGroupPolicy = resolveDefaultGroupPolicy(cfg);
@@ -2813,10 +2653,10 @@ async function monitorIMessageProvider(opts) {
 	});
 	const dmPolicy = imessageCfg.dmPolicy ?? "pairing";
 	const catchupCfg = resolveCatchupConfig(imessageCfg.catchup);
-	const includeAttachments = opts.includeAttachments ?? imessageCfg.includeAttachments ?? false;
-	const mediaMaxBytes = (opts.mediaMaxMb ?? imessageCfg.mediaMaxMb ?? 16) * 1024 * 1024;
-	const cliPath = opts.cliPath ?? imessageCfg.cliPath ?? "imsg";
-	const dbPath = opts.dbPath ?? imessageCfg.dbPath;
+	const includeAttachments = imessageCfg.includeAttachments ?? false;
+	const mediaMaxBytes = (imessageCfg.mediaMaxMb ?? 16) * 1024 * 1024;
+	const cliPath = imessageCfg.cliPath ?? "imsg";
+	const dbPath = imessageCfg.dbPath;
 	const probeTimeoutMs = imessageCfg.probeTimeoutMs ?? 1e4;
 	const attachmentRoots = resolveIMessageAttachmentRoots({
 		cfg,
@@ -2995,13 +2835,34 @@ async function monitorIMessageProvider(opts) {
 		const messageText = ((message.poll ? renderIMessagePollBody(message.poll, message.sender, { preferOptionId: Boolean(remoteHost) }) : null) ?? message.text ?? "").trim();
 		const attachments = includeAttachments ? message.attachments ?? [] : [];
 		const effectiveAttachmentRoots = remoteHost ? remoteAttachmentRoots : attachmentRoots;
+		const mediaCandidates = attachments.filter((entry) => !isIMessagePluginPayloadAttachment(entry));
+		const mediaFacts = mediaCandidates.map((attachment) => {
+			const contentType = attachment.mime_type?.trim() || void 0;
+			return {
+				contentType,
+				kind: kindFromMime(contentType) ?? "unknown"
+			};
+		});
 		return {
 			messageText,
-			...resolveIMessageInboundMediaInput({
-				messageText,
-				attachments,
-				effectiveAttachmentRoots,
-				logVerbose
+			bodyText: messageText,
+			mediaFacts,
+			mediaCandidates,
+			rawMediaAttachments: mediaCandidates.map((attachment, index) => {
+				const fact = mediaFacts[index] ?? { kind: "unknown" };
+				const attachmentPath = attachment.original_path?.trim();
+				if (!attachmentPath || attachment.missing) return fact;
+				if (!isInboundPathAllowed({
+					filePath: attachmentPath,
+					roots: effectiveAttachmentRoots
+				})) {
+					logVerbose(`imessage: dropping inbound attachment outside allowed roots: ${attachmentPath}`);
+					return fact;
+				}
+				return {
+					...fact,
+					path: attachmentPath
+				};
 			}),
 			effectiveAttachmentRoots
 		};
@@ -3049,13 +2910,10 @@ async function monitorIMessageProvider(opts) {
 		const rateLimitKey = `${accountInfo.accountId}:${conversationKey}`;
 		if (decision.kind === "drop") {
 			if (decision.reason === "echo" || decision.reason === "reflected assistant content") loopRateLimiter.record(rateLimitKey);
-			const diagnostic = describeIMessageInboundDropDiagnostic({
-				accountId: accountInfo.accountId,
-				groupsConfigPath,
-				reason: decision.reason,
-				message
-			});
-			if (diagnostic) {
+			if (IMESSAGE_DIAGNOSTIC_DROP_REASONS.has(decision.reason)) {
+				const messageId = typeof message.id === "number" || typeof message.id === "string" ? String(message.id) : "unknown";
+				const mentionHint = decision.reason === "no mention" ? ` Mention the agent (default patterns come from its identity name/emoji), or set ${groupsConfigPath}["${message.chat_id}"].requireMention=false. Preserve existing groups entries; when adding the first groups map, include "*": {} to keep other chats admitted.` : "";
+				const diagnostic = `imessage: dropped inbound message account=${accountInfo.accountId} reason=${JSON.stringify(decision.reason)} chat_id=${message.chat_id ?? "unknown"} group=${message.is_group === true} message_id=${messageId} guid=${message.guid ? "present" : "missing"} created_at=${message.created_at ?? "unknown"}${mentionHint}`;
 				const throttleKey = `${rateLimitKey}:${decision.reason}`;
 				if (!IMESSAGE_THROTTLED_DIAGNOSTIC_DROP_REASONS.has(decision.reason) || !loggedThrottledDropDiagnostics.check(throttleKey)) runtime.log?.(warn(diagnostic));
 			}
@@ -3143,7 +3001,7 @@ async function monitorIMessageProvider(opts) {
 		if (privateApiStatus.available) {
 			if (!supportsTyping || !supportsRead) warnIfImsgUpgradeNeeded.fireOnce(privateApiStatus.rpcMethods, runtime);
 		}
-		const configuredTypingMode = resolveConfiguredIMessageTypingMode(cfg, decision.route.agentId);
+		const configuredTypingMode = resolveAgentConfig(cfg, decision.route.agentId)?.typingMode ?? cfg.agents?.defaults?.typingMode;
 		const sendPolicy = resolveSendPolicy({
 			cfg,
 			entry: getSessionEntry({
@@ -3188,12 +3046,12 @@ async function monitorIMessageProvider(opts) {
 		const unavailableCount = staged.unavailableCount;
 		const contextDecision = unavailableCount > 0 ? {
 			...decision,
-			agentBodyText: formatIMessageInboundMediaBody({
-				messageText,
-				unavailableCount
+			agentBodyText: formatInboundMediaUnavailableText({
+				body: messageText,
+				notice: `[imessage ${unavailableCount > 1 ? `${unavailableCount} attachments` : "attachment"} unavailable]`
 			})
 		} : decision;
-		const previousTimestamp = readSessionUpdatedAt({
+		const previousTimestamp = await readSessionUpdatedAtAsync({
 			storePath,
 			sessionKey: decision.route.sessionKey
 		});
@@ -3409,16 +3267,8 @@ async function monitorIMessageProvider(opts) {
 		});
 	};
 	const resolveApprovalControlConversation = (message) => {
-		const sender = normalizeIMessageHandle((message.sender ?? "").trim());
-		const destination = normalizeIMessageHandle((message.destination_caller_id ?? "").trim());
-		const actorHandle = (message.is_from_me !== true && Boolean(sender) && sender === destination ? "" : sender) || (message.is_from_me === true ? destination : "");
-		return actorHandle ? buildIMessageApprovalConversationKeyForInbound({
-			chatGuid: message.chat_guid,
-			chatIdentifier: message.chat_identifier,
-			chatId: message.chat_id,
-			isGroup: message.is_group,
-			actorHandle
-		}) : null;
+		const actorHandle = resolveIMessageApprovalControlActor(message);
+		return actorHandle ? buildIMessageApprovalConversationKeyForInbound(message, actorHandle) : null;
 	};
 	const ingress = createIMessageDurableIngress({
 		accountId: accountInfo.accountId,
@@ -3492,25 +3342,24 @@ async function monitorIMessageProvider(opts) {
 	});
 	if (opts.abortSignal?.aborted) return;
 	const abort = opts.abortSignal;
-	const createWatchClient = async () => await createIMessageRpcClient({
-		cliPath,
-		dbPath,
-		remoteHost,
-		runtime,
-		onNotification: (msg) => {
-			if (msg.method === "message") ingress.receive(msg.params).catch((err) => {
-				runtime.error?.(`imessage: durable admission failed: ${String(err)}`);
-			});
-			else if (msg.method === "error") runtime.error?.(`imessage: watch error ${JSON.stringify(sanitizeIMessageWatchErrorPayload(msg.params))}`);
-		}
-	});
 	for (let attempt = 1; attempt <= WATCH_SUBSCRIBE_MAX_ATTEMPTS; attempt++) {
 		if (abort?.aborted) return;
 		let attemptClient;
 		let attemptDetachAbortHandler = () => {};
 		let keepAttemptClient = false;
 		try {
-			attemptClient = await createWatchClient();
+			attemptClient = await createIMessageRpcClient({
+				cliPath,
+				dbPath,
+				remoteHost,
+				runtime,
+				onNotification: (msg) => {
+					if (msg.method === "message") ingress.receive(msg.params).catch((err) => {
+						runtime.error?.(`imessage: durable admission failed: ${String(err)}`);
+					});
+					else if (msg.method === "error") runtime.error?.(`imessage: watch error ${JSON.stringify(sanitizeIMessageWatchErrorPayload(msg.params))}`);
+				}
+			});
 			let attemptSubscriptionId = null;
 			attemptDetachAbortHandler = attachIMessageMonitorAbortHandler({
 				abortSignal: abort,
@@ -3531,18 +3380,8 @@ async function monitorIMessageProvider(opts) {
 			if (abort?.aborted) return;
 			const retriable = isRetriableWatchSubscribeStartupError(err);
 			const shouldRetry = attempt < WATCH_SUBSCRIBE_MAX_ATTEMPTS && retriable;
-			const failureParams = {
-				accountId: accountInfo.accountId,
-				attempt,
-				maxAttempts: WATCH_SUBSCRIBE_MAX_ATTEMPTS,
-				cliPath,
-				dbPath,
-				remoteHost,
-				includeAttachments,
-				probeTimeoutMs,
-				watchSinceRowid,
-				error: err
-			};
+			const retry = shouldRetry ? ` retry_in_ms=${WATCH_SUBSCRIBE_RETRY_DELAY_MS}` : "";
+			const failure = `imessage: watch.subscribe startup failed attempt=${attempt}/${WATCH_SUBSCRIBE_MAX_ATTEMPTS} account=${accountInfo.accountId} cliPath=${cliPath} dbPath=${dbPath ? "configured" : "default"} remoteHost=${remoteHost ? "configured" : "none"} timeoutMs=${probeTimeoutMs} since_rowid=${watchSinceRowid ?? "none"} attachments=${includeAttachments} include_reactions=true${retry}: ${String(err)}`;
 			if (!shouldRetry) {
 				opts.statusSink?.({
 					connected: false,
@@ -3550,7 +3389,7 @@ async function monitorIMessageProvider(opts) {
 					terminalDisconnect: retriable ? void 0 : true,
 					lastError: String(err)
 				});
-				runtime.error?.(danger(`imessage: monitor failed: ${describeIMessageWatchSubscribeStartupFailure(failureParams)}`));
+				runtime.error?.(danger(`imessage: monitor failed: ${failure}`));
 				throw err;
 			}
 			opts.statusSink?.({
@@ -3558,10 +3397,7 @@ async function monitorIMessageProvider(opts) {
 				lifecycle: "recovering",
 				lastError: String(err)
 			});
-			runtime.log?.(warn(describeIMessageWatchSubscribeStartupFailure({
-				...failureParams,
-				retryDelayMs: WATCH_SUBSCRIBE_RETRY_DELAY_MS
-			})));
+			runtime.log?.(warn(failure));
 			attemptDetachAbortHandler();
 			attemptDetachAbortHandler = () => {};
 			await attemptClient?.stop();