@openclaw/imessage 2026.9.5 → 2026.9.7

package/dist/.setup/{accounts-Dv0uksBG.mjs → accounts-nzcU0cq2.mjs}

@@ -6,9 +6,8 @@ import path from "node:path";
 import { createAccountListHelpers } from "openclaw/plugin-sdk/account-helpers";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import os from "node:os";
-import fs$1 from "node:fs/promises";
+import fs from "node:fs/promises";
 import { normalizeScpRemoteHost } from "openclaw/plugin-sdk/host-runtime";
-import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 //#region extensions/imessage/src/cli-path.ts
 const localCliPathCache = /* @__PURE__ */ new Map();
 const MACH_O_MAGICS = /* @__PURE__ */ new Set([
@@ -151,6 +150,7 @@ function getCachedIMessageRemoteHost(params) {
 async function resolveIMessageRemoteHost(params) {
 	const configured = normalizeScpRemoteHost(params.remoteHost);
 	if (configured) return configured;
+	const { logVerbose } = await import("openclaw/plugin-sdk/runtime-env");
 	if (params.remoteHost?.trim()) logVerbose("imessage: ignoring unsafe configured remoteHost value");
 	const key = cacheKey(params.cliPath);
 	if (detectedRemoteHosts.has(key)) {
@@ -167,7 +167,7 @@ async function resolveIMessageRemoteHost(params) {
 	const lookup = (async () => {
 		let detected;
 		try {
-			detected = parseRemoteHost(await fs$1.readFile(key, "utf8"));
+			detected = parseRemoteHost(await fs.readFile(key, "utf8"));
 		} catch (error) {
 			const code = error?.code;
 			if (code !== "ENOENT" && code !== "ENOTDIR") logVerbose(`imessage: failed to inspect cliPath ${params.cliPath}: ${String(error)}`);
@@ -190,9 +190,6 @@ async function resolveIMessageRemoteHost(params) {
 const { listAccountIds, resolveDefaultAccountId, resolveAccountConfig: resolveMergedIMessageAccountConfig } = createAccountListHelpers("imessage", { implicitDefaultAccount: { channelKeys: ["cliPath", "dbPath"] } });
 const listIMessageAccountIds = listAccountIds;
 const resolveDefaultIMessageAccountId = resolveDefaultAccountId;
-function resolveIMessageAccountConfig(cfg, accountId) {
-	return resolveAccountEntry(cfg.channels?.imessage?.accounts, accountId);
-}
 function asStreamingConfigObject(value) {
 	return asOptionalRecord(value);
 }
@@ -214,7 +211,7 @@ function mergeIMessageStreamingConfig(base, account) {
 	};
 }
 function mergeIMessageAccountConfig(cfg, accountId) {
-	const accountConfig = resolveIMessageAccountConfig(cfg, accountId);
+	const accountConfig = resolveAccountEntry(cfg.channels?.imessage?.accounts, accountId);
 	const merged = resolveMergedIMessageAccountConfig(cfg, accountId);
 	const streaming = mergeIMessageStreamingConfig((cfg.channels?.imessage)?.streaming, accountConfig?.streaming);
 	return streaming !== void 0 ? {

package/dist/.setup/{actions.runtime-B-qGAkYG.mjs → actions.runtime-DdBN29zj.mjs}

@@ -1,5 +1,5 @@
-import { m as resolveIMessageMessageId, n as sanitizeIMessageFinalOutboundText, o as createIMessageRpcClient, s as runIMessageCliJsonCommand, y as normalizeDirectChatIdentifier } from "./sanitize-outbound-o1ePXajW.mjs";
-import { n as authorizeIMessageResourceReference, t as withIMessageRemoteFile } from "./remote-file-4RbwiXYh.mjs";
+import { E as normalizeDirectChatIdentifier, m as resolveIMessageMessageId, n as sanitizeIMessageFinalOutboundText, o as createIMessageRpcClient, s as runIMessageCliJsonCommand } from "./sanitize-outbound-3MLljgtY.mjs";
+import { n as authorizeIMessageResourceReference, t as withIMessageRemoteFile } from "./remote-file-DRPCaVmg.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { basename, parse, win32 } from "node:path";
 import { asDateTimestampMs, parseStrictInteger, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
@@ -144,9 +144,7 @@ async function withTempFile(input, options, fn) {
 }
 const imessageActionsRuntime = {
 	resolveIMessageMessageId,
-	async authorizeMessageReference(params) {
-		await authorizeIMessageResourceReference(params);
-	},
+	authorizeMessageReference: authorizeIMessageResourceReference,
 	resolveChatGuidForTarget: resolveIMessageActionChatGuid,
 	async sendReaction(params) {
 		await runIMessageAction(params.options, "tapback", {

package/dist/.setup/{api-_NoJAo2x.mjs → api-B9Qx21G-.mjs}

@@ -1,8 +1,9 @@
-import "./targets-Cc9vthzI.mjs";
-import "./accounts-Dv0uksBG.mjs";
-import "./message-tool-api-DZSH-2gY.mjs";
-import { _ as imessageSetupContract } from "./group-policy-BoOAkmoQ.mjs";
-import { n as createIMessagePluginBase, r as imessageSetupWizard } from "./channel-CCbYCQiN.mjs";
+import "./targets-BicBiYsM.mjs";
+import "./accounts-nzcU0cq2.mjs";
+import "./message-tool-api-D032l82H.mjs";
+import "./group-policy-90pw4tyG.mjs";
+import { s as imessageSetupContract } from "./setup-core-8MDdYHj5.mjs";
+import { n as createIMessagePluginBase, r as imessageSetupWizard } from "./channel-9fyvuN_p.mjs";
 import "./conversation-bindings-GDQ_Laxj.mjs";
 import { createAllowedChatSenderMatcher as createAllowedChatSenderMatcher$1, parseChatAllowTargetPrefixes, parseChatTargetPrefixesOrThrow as parseChatTargetPrefixesOrThrow$1, resolveServicePrefixedAllowTarget, resolveServicePrefixedChatTarget as resolveServicePrefixedChatTarget$1, resolveServicePrefixedOrChatAllowTarget as resolveServicePrefixedOrChatAllowTarget$1, resolveServicePrefixedTarget } from "openclaw/plugin-sdk/channel-targets";
 //#region extensions/imessage/src/channel.setup.ts

package/dist/.setup/{api-DcUWvBmD.mjs → api-D2S6FhGw.mjs}

@@ -1,10 +1,10 @@
-import { a as looksLikeIMessageExplicitTargetId, c as parseIMessageTarget, i as isAllowedIMessageSender, l as looksLikeIMessageTargetId, n as inferIMessageTargetChatType, o as normalizeIMessageHandle, s as parseIMessageAllowTarget, t as formatIMessageChatTarget, u as normalizeIMessageMessagingTarget } from "./targets-Cc9vthzI.mjs";
-import { a as resolveDefaultIMessageAccountId, i as listIMessageAccountIds, o as resolveIMessageAccount, r as listEnabledIMessageAccounts } from "./accounts-Dv0uksBG.mjs";
-import { o as IMESSAGE_ACTIONS, s as IMESSAGE_ACTION_NAMES } from "./message-tool-api-DZSH-2gY.mjs";
-import { h as DEFAULT_IMESSAGE_PROBE_TIMEOUT_MS } from "./sanitize-outbound-o1ePXajW.mjs";
-import { a as normalizeIMessageAcpConversationId, i as matchIMessageAcpConversation, n as resolveIMessageGroupToolPolicy, o as resolveIMessageConversationIdFromTarget, r as resolveIMessageInboundConversationId, t as resolveIMessageGroupRequireMention, u as probeIMessage } from "./group-policy-BoOAkmoQ.mjs";
-import { t as imessagePlugin } from "./channel-CCbYCQiN.mjs";
+import { a as looksLikeIMessageExplicitTargetId, c as parseIMessageTarget, i as isAllowedIMessageSender, l as looksLikeIMessageTargetId, n as inferIMessageTargetChatType, o as normalizeIMessageHandle, s as parseIMessageAllowTarget, t as formatIMessageChatTarget, u as normalizeIMessageMessagingTarget } from "./targets-BicBiYsM.mjs";
+import { a as resolveDefaultIMessageAccountId, i as listIMessageAccountIds, o as resolveIMessageAccount, r as listEnabledIMessageAccounts } from "./accounts-nzcU0cq2.mjs";
+import { o as IMESSAGE_ACTIONS, s as IMESSAGE_ACTION_NAMES } from "./message-tool-api-D032l82H.mjs";
+import { S as DEFAULT_IMESSAGE_PROBE_TIMEOUT_MS } from "./sanitize-outbound-3MLljgtY.mjs";
+import { a as matchIMessageAcpConversation, d as probeIMessage, i as resolveIMessageInboundConversationId, o as normalizeIMessageAcpConversationId, r as resolveIMessageGroupToolPolicy, s as resolveIMessageConversationIdFromTarget, t as resolveIMessageGroupRequireMention } from "./group-policy-90pw4tyG.mjs";
+import { t as imessagePlugin } from "./channel-9fyvuN_p.mjs";
 import { t as createIMessageConversationBindingManager } from "./conversation-bindings-GDQ_Laxj.mjs";
-import { a as resolveServicePrefixedChatTarget, c as imessageSetupPlugin, i as resolveServicePrefixedAllowTarget, n as parseChatAllowTargetPrefixes, o as resolveServicePrefixedOrChatAllowTarget, r as parseChatTargetPrefixesOrThrow, s as resolveServicePrefixedTarget, t as createAllowedChatSenderMatcher } from "./api-_NoJAo2x.mjs";
+import { a as resolveServicePrefixedChatTarget, c as imessageSetupPlugin, i as resolveServicePrefixedAllowTarget, n as parseChatAllowTargetPrefixes, o as resolveServicePrefixedOrChatAllowTarget, r as parseChatTargetPrefixesOrThrow, s as resolveServicePrefixedTarget, t as createAllowedChatSenderMatcher } from "./api-B9Qx21G-.mjs";
 import { t as IMESSAGE_LEGACY_OUTBOUND_SEND_DEP_KEYS } from "./outbound-send-deps-B-QEsLSM.mjs";
 export { DEFAULT_IMESSAGE_PROBE_TIMEOUT_MS, IMESSAGE_ACTIONS, IMESSAGE_ACTION_NAMES, IMESSAGE_LEGACY_OUTBOUND_SEND_DEP_KEYS, createAllowedChatSenderMatcher, createIMessageConversationBindingManager, formatIMessageChatTarget, imessagePlugin, imessageSetupPlugin, inferIMessageTargetChatType, isAllowedIMessageSender, listEnabledIMessageAccounts, listIMessageAccountIds, looksLikeIMessageExplicitTargetId, looksLikeIMessageTargetId, matchIMessageAcpConversation, normalizeIMessageAcpConversationId, normalizeIMessageHandle, normalizeIMessageMessagingTarget, parseChatAllowTargetPrefixes, parseChatTargetPrefixesOrThrow, parseIMessageAllowTarget, parseIMessageTarget, probeIMessage, resolveDefaultIMessageAccountId, resolveIMessageAccount, resolveIMessageConversationIdFromTarget, resolveIMessageGroupRequireMention, resolveIMessageGroupToolPolicy, resolveIMessageInboundConversationId, resolveServicePrefixedAllowTarget, resolveServicePrefixedChatTarget, resolveServicePrefixedOrChatAllowTarget, resolveServicePrefixedTarget };

package/dist/.setup/{approval-handler.runtime-CkG235P7.mjs → approval-handler.runtime-DKSq0DWq.mjs}

@@ -1,20 +1,20 @@
-import { c as parseIMessageTarget, u as normalizeIMessageMessagingTarget } from "./targets-Cc9vthzI.mjs";
-import { o as resolveIMessageAccount } from "./accounts-Dv0uksBG.mjs";
-import { n as getCachedIMessagePrivateApiStatus } from "./message-tool-api-DZSH-2gY.mjs";
-import { i as extractMarkdownFormatRuns } from "./sanitize-outbound-o1ePXajW.mjs";
-import { s as getIMessageApprovalApprovers } from "./group-policy-BoOAkmoQ.mjs";
-import { a as unregisterIMessageApprovalReactionTarget, c as buildIMessageApprovalConversationKeyForTarget, i as registerIMessageApprovalReactionTarget } from "./approval-reactions-CX1-6KeG.mjs";
-import { a as iMessageApprovalPollTargets, c as iMessageApprovalControlBindings, i as buildApprovalPollOptions, o as mapSentPollOptionsToDecisions, t as sendMessageIMessage } from "./send-DXiUWygv.mjs";
+import { c as parseIMessageTarget, u as normalizeIMessageMessagingTarget } from "./targets-BicBiYsM.mjs";
+import { o as resolveIMessageAccount } from "./accounts-nzcU0cq2.mjs";
+import { n as getCachedIMessagePrivateApiStatus } from "./message-tool-api-D032l82H.mjs";
+import { i as extractMarkdownFormatRuns } from "./sanitize-outbound-3MLljgtY.mjs";
+import { c as getIMessageApprovalApprovers } from "./group-policy-90pw4tyG.mjs";
+import { a as unregisterIMessageApprovalReactionTarget, c as buildIMessageApprovalConversationKeyForTarget, i as registerIMessageApprovalReactionTarget } from "./approval-reactions-Bp33xc83.mjs";
+import { a as iMessageApprovalPollTargets, c as iMessageApprovalControlBindings, i as buildApprovalPollOptions, o as mapSentPollOptionsToDecisions, t as sendMessageIMessage } from "./send-Cu9nl757.mjs";
 import { createLazyRuntimeNamedExport } from "openclaw/plugin-sdk/lazy-runtime";
-import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
 import { createActionGate } from "openclaw/plugin-sdk/channel-actions";
+import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
 import { buildChannelApprovalNativeTargetKey } from "openclaw/plugin-sdk/approval-native-runtime";
 import { buildApprovalNativeControlsPromptText, buildApprovalReactionPendingContent } from "openclaw/plugin-sdk/approval-reaction-runtime";
 import { buildChannelApprovalExpiredText, buildChannelApprovalResolvedText, createChannelApprovalNativeRuntimeAdapter, resolvePreparedApprovalAccountId } from "openclaw/plugin-sdk/approval-handler-runtime";
 import { setTimeout } from "node:timers/promises";
 //#region extensions/imessage/src/approval-handler.runtime.ts
 const log = createSubsystemLogger("imessage/approvals");
-const loadIMessageActionsRuntime = createLazyRuntimeNamedExport(() => import("./actions.runtime-B-qGAkYG.mjs"), "imessageActionsRuntime");
+const loadIMessageActionsRuntime = createLazyRuntimeNamedExport(() => import("./actions.runtime-DdBN29zj.mjs"), "imessageActionsRuntime");
 const DEFAULT_PROBE_TIMEOUT_MS = 5e3;
 const APPROVAL_POLL_ORDERING_DELAY_MS = 1100;
 function buildPendingPayload(params) {

package/dist/.setup/{approval-reactions-CX1-6KeG.mjs → approval-reactions-Bp33xc83.mjs}

@@ -1,6 +1,6 @@
-import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { c as parseIMessageTarget, o as normalizeIMessageHandle } from "./targets-Cc9vthzI.mjs";
-import { c as imessageApprovalAuth, s as getIMessageApprovalApprovers } from "./group-policy-BoOAkmoQ.mjs";
+import { t as __exportAll } from "./rolldown-runtime-BBjsoOtd.mjs";
+import { c as parseIMessageTarget, o as normalizeIMessageHandle } from "./targets-BicBiYsM.mjs";
+import { c as getIMessageApprovalApprovers, l as imessageApprovalAuth } from "./group-policy-90pw4tyG.mjs";
 import { n as getOptionalIMessageRuntime } from "./runtime-Cza4CY5T.mjs";
 import { n as normalizeIMessageGuid, t as resolveIMessageReactionContext } from "./reaction-context-Br-vAJFp.mjs";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -128,7 +128,7 @@ function readPersistedPollTarget(value) {
 		...typeof rawConversation.chatId === "string" || typeof rawConversation.chatId === "number" ? { chatId: rawConversation.chatId } : {},
 		...typeof rawConversation.handle === "string" ? { handle: rawConversation.handle.trim() } : {}
 	};
-	if (!accountId || !messageId || !approvalId || expiresAtMs === void 0 || !allowedDecisions || target.approvalKind !== "exec" && target.approvalKind !== "plugin" || !normalizeConversationKey(conversation)) return null;
+	if (!accountId || !messageId || !approvalId || expiresAtMs === void 0 || !allowedDecisions || target.approvalKind !== "exec" && target.approvalKind !== "plugin" && target.approvalKind !== "system-agent" || !normalizeConversationKey(conversation)) return null;
 	return {
 		accountId,
 		conversation,
@@ -305,7 +305,7 @@ async function registerIMessageApprovalReactionTarget(params) {
 	const messageId = params.messageId.trim();
 	const approvalId = params.approvalId.trim();
 	const allowedDecisions = listApprovalReactionBindings({ allowedDecisions: params.allowedDecisions }).map((binding) => binding.decision);
-	if (!accountId || !messageId || !approvalId || params.approvalKind !== "exec" && params.approvalKind !== "plugin" || allowedDecisions.length === 0) return null;
+	if (!accountId || !messageId || !approvalId || params.approvalKind !== "exec" && params.approvalKind !== "plugin" && params.approvalKind !== "system-agent" || allowedDecisions.length === 0) return null;
 	const target = {
 		approvalId,
 		approvalKind: params.approvalKind,

package/dist/.setup/{channel-CCbYCQiN.mjs → channel-9fyvuN_p.mjs}

@@ -1,10 +1,11 @@
-import { a as looksLikeIMessageExplicitTargetId, c as parseIMessageTarget, d as isIMessagePhoneLikeHandle, n as inferIMessageTargetChatType, o as normalizeIMessageHandle, u as normalizeIMessageMessagingTarget } from "./targets-Cc9vthzI.mjs";
-import { a as resolveDefaultIMessageAccountId, i as listIMessageAccountIds, o as resolveIMessageAccount, t as collectIMessageDuplicateAccountSourceWarnings } from "./accounts-Dv0uksBG.mjs";
-import { b as resolveIMessageDirectChatService, n as sanitizeIMessageFinalOutboundText, r as sanitizeOutboundText } from "./sanitize-outbound-o1ePXajW.mjs";
-import { _ as imessageSetupContract, a as normalizeIMessageAcpConversationId, c as imessageApprovalAuth, i as matchIMessageAcpConversation, l as imessageMessageActions, m as createIMessageSetupWizardProxy, n as resolveIMessageGroupToolPolicy, o as resolveIMessageConversationIdFromTarget, s as getIMessageApprovalApprovers, t as resolveIMessageGroupRequireMention } from "./group-policy-BoOAkmoQ.mjs";
+import { a as looksLikeIMessageExplicitTargetId, c as parseIMessageTarget, d as isIMessagePhoneLikeHandle, n as inferIMessageTargetChatType, o as normalizeIMessageHandle, u as normalizeIMessageMessagingTarget } from "./targets-BicBiYsM.mjs";
+import { a as resolveDefaultIMessageAccountId, i as listIMessageAccountIds, o as resolveIMessageAccount, t as collectIMessageDuplicateAccountSourceWarnings } from "./accounts-nzcU0cq2.mjs";
+import { D as resolveIMessageDirectChatService, n as sanitizeIMessageFinalOutboundText, r as sanitizeOutboundText } from "./sanitize-outbound-3MLljgtY.mjs";
+import { a as matchIMessageAcpConversation, c as getIMessageApprovalApprovers, l as imessageApprovalAuth, o as normalizeIMessageAcpConversationId, r as resolveIMessageGroupToolPolicy, s as resolveIMessageConversationIdFromTarget, t as resolveIMessageGroupRequireMention, u as imessageMessageActions } from "./group-policy-90pw4tyG.mjs";
+import { i as createIMessageSetupWizardProxy, s as imessageSetupContract } from "./setup-core-8MDdYHj5.mjs";
 import { t as createIMessageConversationBindingManager } from "./conversation-bindings-GDQ_Laxj.mjs";
-import { t as IMessageChannelConfigSchema } from "./config-schema-CCbTcJEV.mjs";
-import { n as resolveIMessageAttachmentRoots, r as resolveIMessageRemoteAttachmentRoots } from "./media-contract-BpPh5Oh1.mjs";
+import { t as IMessageChannelConfigSchema } from "./config-schema-4Q3_EqYt.mjs";
+import { n as resolveIMessageAttachmentRoots, r as resolveIMessageRemoteAttachmentRoots } from "./media-contract-CagwSMvo.mjs";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id";
 import { buildDmGroupAccountAllowlistAdapter } from "openclaw/plugin-sdk/allowlist-config-edit";
@@ -29,8 +30,7 @@ import { createRestrictSendersChannelSecurity } from "openclaw/plugin-sdk/channe
 import { createChannelPluginBase, getChatChannelMeta } from "openclaw/plugin-sdk/core";
 //#region extensions/imessage/src/approval-text.ts
 function replaceApprovalIdPlaceholder(text, approvalId) {
-	const safeApprovalId = approvalId.replace(/\$/g, "$$$$");
-	return (text ?? "").replace(/\/approve\s+<id>/g, `/approve ${safeApprovalId}`);
+	return (text ?? "").replace(/\/approve\s+<id>/g, () => `/approve ${approvalId}`);
 }
 //#endregion
 //#region extensions/imessage/src/approval-native.ts
@@ -92,7 +92,7 @@ const imessageApproval = createApproverRestrictedNativeApprovalCapabilityFromFor
 			approvalKind,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-CkG235P7.mjs")).imessageApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-DKSq0DWq.mjs")).imessageApprovalNativeRuntime
 	})
 });
 const imessageApprovalRouting = imessageApproval.routing;
@@ -146,12 +146,6 @@ function shouldSuppressLocalIMessageExecApprovalPrompt(params) {
 		nativeSessionOnly: true
 	});
 }
-function appendIMessageReactionHint(params) {
-	return addApprovalReactionHintToText({
-		text: params.text ?? "",
-		allowedDecisions: params.allowedDecisions
-	});
-}
 function buildIMessageExecPendingPayload(params) {
 	const allowedDecisions = resolveExecApprovalRequestAllowedDecisions(params.request.request);
 	const command = resolveExecApprovalCommandDisplay(params.request.request).commandText;
@@ -174,7 +168,7 @@ function buildIMessageExecPendingPayload(params) {
 	});
 	return {
 		...payload,
-		text: appendIMessageReactionHint({
+		text: addApprovalReactionHintToText({
 			text: replaceApprovalIdPlaceholder(payload.text, params.request.id),
 			allowedDecisions
 		})
@@ -190,7 +184,7 @@ function buildIMessagePluginPendingPayload(params) {
 	});
 	return {
 		...payload,
-		text: appendIMessageReactionHint({
+		text: addApprovalReactionHintToText({
 			text: replaceApprovalIdPlaceholder(payload.text, params.request.id),
 			allowedDecisions
 		})
@@ -206,10 +200,7 @@ const imessageDoctor = {
 //#endregion
 //#region extensions/imessage/src/shared.ts
 const IMESSAGE_CHANNEL = "imessage";
-async function loadIMessageChannelRuntime$1() {
-	return await import("./channel.runtime-Kw4iCQax.mjs");
-}
-const imessageSetupWizard = createIMessageSetupWizardProxy(async () => (await loadIMessageChannelRuntime$1()).imessageSetupWizard);
+const imessageSetupWizard = createIMessageSetupWizardProxy(async () => (await import("./setup-surface-tGXFDdWh.mjs")).imessageSetupWizard);
 const imessageConfigAdapter = createScopedChannelConfigAdapter({
 	sectionKey: IMESSAGE_CHANNEL,
 	listAccountIds: listIMessageAccountIds,
@@ -223,7 +214,7 @@ const imessageConfigAdapter = createScopedChannelConfigAdapter({
 		"name"
 	],
 	resolveAllowFrom: (account) => account.config.allowFrom,
-	formatAllowFrom: (allowFrom) => formatTrimmedAllowFromEntries(allowFrom),
+	formatAllowFrom: formatTrimmedAllowFromEntries,
 	resolveDefaultTo: (account) => account.config.defaultTo
 });
 const imessageSecurityAdapter = createRestrictSendersChannelSecurity({
@@ -249,51 +240,45 @@ function createIMessagePluginBase(params) {
 				exposure: { configured: false }
 			},
 			setupWizard: params.setupWizard,
-			capabilities: {
-				chatTypes: ["direct", "group"],
-				media: true,
-				tts: { voice: {
-					synthesisTarget: "audio-file",
-					audioFileFormats: [
-						"mp3",
-						"caf",
-						"audio/mpeg",
-						"audio/x-caf"
-					],
-					preferAudioFileFormat: "caf"
-				} },
-				reactions: true,
-				edit: true,
-				unsend: true,
-				reply: true,
-				effects: true,
-				groupManagement: true
-			},
 			reload: {
 				configPrefixes: ["channels.imessage"],
 				noopPrefixes: ["messages.inbound"]
 			},
 			configSchema: IMessageChannelConfigSchema,
-			config: {
-				...imessageConfigAdapter,
-				isConfigured: (account) => account.configured,
-				describeAccount: (account) => describeAccountSnapshot({
-					account,
-					configured: account.configured
-				})
-			},
 			security: imessageSecurityAdapter,
 			setupContract: params.setupContract
 		}),
-		messaging: {
-			resolveInboundAttachmentRoots: (paramsValue) => resolveIMessageAttachmentRoots({
-				accountId: paramsValue.accountId,
-				cfg: paramsValue.cfg
-			}),
-			resolveRemoteInboundAttachmentRoots: (paramsLocal) => resolveIMessageRemoteAttachmentRoots({
-				accountId: paramsLocal.accountId,
-				cfg: paramsLocal.cfg
+		capabilities: {
+			chatTypes: ["direct", "group"],
+			media: true,
+			tts: { voice: {
+				synthesisTarget: "audio-file",
+				audioFileFormats: [
+					"mp3",
+					"caf",
+					"audio/mpeg",
+					"audio/x-caf"
+				],
+				preferAudioFileFormat: "caf"
+			} },
+			reactions: true,
+			edit: true,
+			unsend: true,
+			reply: true,
+			effects: true,
+			groupManagement: true
+		},
+		config: {
+			...imessageConfigAdapter,
+			isConfigured: (account) => account.configured,
+			describeAccount: (account) => describeAccountSnapshot({
+				account,
+				configured: account.configured
 			})
+		},
+		messaging: {
+			resolveInboundAttachmentRoots: resolveIMessageAttachmentRoots,
+			resolveRemoteInboundAttachmentRoots: resolveIMessageRemoteAttachmentRoots
 		}
 	};
 }
@@ -309,7 +294,27 @@ async function probeIMessageStatusAccount(params) {
 }
 //#endregion
 //#region extensions/imessage/src/channel.ts
-const loadIMessageChannelRuntime = createLazyRuntimeModule(() => import("./channel.runtime-Kw4iCQax.mjs"));
+const loadIMessageChannelRuntime = createLazyRuntimeModule(() => import("./channel.runtime-n-MPKL8k.mjs"));
+async function sendIMessageOutbound(ctx, kind, options = {}) {
+	return await (await loadIMessageChannelRuntime()).sendIMessageOutbound({
+		cfg: ctx.cfg,
+		to: ctx.to,
+		text: ctx.text,
+		accountId: ctx.accountId ?? void 0,
+		deps: ctx.deps,
+		replyToId: ctx.replyToId ?? void 0,
+		assertDirectAdapterHandoff: ctx.assertDirectAdapterHandoff,
+		onPlatformSendDispatch: ctx.onPlatformSendDispatch,
+		...options,
+		...kind === "media" ? {
+			mediaUrl: ctx.mediaUrl,
+			mediaAccess: ctx.mediaAccess,
+			mediaLocalRoots: ctx.mediaLocalRoots,
+			mediaReadFile: ctx.mediaReadFile,
+			audioAsVoice: ctx.audioAsVoice
+		} : {}
+	});
+}
 function toIMessageMessageSendResult(result, kind, replyToId) {
 	const receipt = result.receipt ?? createMessageReceiptFromOutboundResults({
 		results: result.messageId ? [{
@@ -325,8 +330,8 @@ function toIMessageMessageSendResult(result, kind, replyToId) {
 		...result.meta && Object.keys(result.meta).length > 0 ? { meta: result.meta } : {}
 	};
 }
-const loadIMessageApprovalReactionsModule = createLazyRuntimeModule(() => import("./approval-reactions-CX1-6KeG.mjs").then((n) => n.t));
-const loadIMessageQuestionReactionsModule = createLazyRuntimeModule(() => import("./question-reactions-lm8OxWbb.mjs").then((n) => n.r));
+const loadIMessageApprovalReactionsModule = createLazyRuntimeModule(() => import("./approval-reactions-Bp33xc83.mjs").then((n) => n.t));
+const loadIMessageQuestionReactionsModule = createLazyRuntimeModule(() => import("./question-reactions-Cy-dmU_j.mjs").then((n) => n.r));
 async function prepareForwardedIMessageApprovalPayload(params) {
 	const prepared = (await loadIMessageApprovalReactionsModule()).addIMessageApprovalReactionHintToStructuredPayload(params);
 	if (prepared) Object.assign(params.payload, prepared);
@@ -359,33 +364,10 @@ const imessageMessageAdapter = defineChannelMessageAdapter({
 	} },
 	send: {
 		text: async (ctx) => {
-			return toIMessageMessageSendResult(await (await loadIMessageChannelRuntime()).sendIMessageOutbound({
-				cfg: ctx.cfg,
-				to: ctx.to,
-				text: ctx.text,
-				accountId: ctx.accountId ?? void 0,
-				deps: ctx.deps,
-				replyToId: ctx.replyToId ?? void 0,
-				assertDirectAdapterHandoff: ctx.assertDirectAdapterHandoff,
-				onPlatformSendDispatch: ctx.onPlatformSendDispatch,
-				conversationReadOrigin: ctx.conversationReadOrigin
-			}), "text", ctx.replyToId);
+			return toIMessageMessageSendResult(await sendIMessageOutbound(ctx, "text", { conversationReadOrigin: ctx.conversationReadOrigin }), "text", ctx.replyToId);
 		},
 		media: async (ctx) => {
-			return toIMessageMessageSendResult(await (await loadIMessageChannelRuntime()).sendIMessageOutbound({
-				cfg: ctx.cfg,
-				to: ctx.to,
-				text: ctx.text,
-				mediaUrl: ctx.mediaUrl,
-				mediaAccess: ctx.mediaAccess,
-				mediaLocalRoots: ctx.mediaLocalRoots,
-				mediaReadFile: ctx.mediaReadFile,
-				audioAsVoice: ctx.audioAsVoice,
-				accountId: ctx.accountId ?? void 0,
-				deps: ctx.deps,
-				replyToId: ctx.replyToId ?? void 0,
-				assertDirectAdapterHandoff: ctx.assertDirectAdapterHandoff,
-				onPlatformSendDispatch: ctx.onPlatformSendDispatch,
+			return toIMessageMessageSendResult(await sendIMessageOutbound(ctx, "media", {
 				conversationReadOrigin: ctx.conversationReadOrigin,
 				...ctx.onDeliveryResult ? { onDeliveryResult: async (acceptedResult) => {
 					await ctx.onDeliveryResult?.(toIMessageMessageSendResult(acceptedResult, ctx.audioAsVoice ? "voice" : "media", ctx.replyToId));
@@ -394,12 +376,6 @@ const imessageMessageAdapter = defineChannelMessageAdapter({
 		}
 	}
 });
-function buildIMessageBaseSessionKey(params) {
-	return buildOutboundBaseSessionKey({
-		...params,
-		channel: "imessage"
-	});
-}
 function isCanonicalIMessageDirectHandle(raw, normalized) {
 	const trimmed = raw.trim();
 	if (!trimmed || !normalized) return false;
@@ -408,6 +384,10 @@ function isCanonicalIMessageDirectHandle(raw, normalized) {
 }
 function resolveIMessageOutboundSessionRoute(params) {
 	const parsed = parseIMessageTarget(params.target);
+	let peer;
+	let from;
+	let to;
+	let recipientSessionExact = false;
 	if (parsed.kind === "handle") {
 		const handle = normalizeIMessageHandle(parsed.to);
 		if (!handle) return null;
@@ -415,48 +395,37 @@ function resolveIMessageOutboundSessionRoute(params) {
 			cfg: params.cfg,
 			accountId: params.accountId
 		});
-		const directTarget = `${resolveIMessageDirectChatService(parsed.serviceExplicit ? parsed.service : account.config.service) ?? "auto"}:${handle}`;
-		const peer = {
+		from = to = `${resolveIMessageDirectChatService(parsed.serviceExplicit ? parsed.service : account.config.service) ?? "auto"}:${handle}`;
+		peer = {
 			kind: "direct",
 			id: handle
 		};
-		const baseSessionKey = buildIMessageBaseSessionKey({
-			cfg: params.cfg,
-			agentId: params.agentId,
-			accountId: params.accountId,
-			peer
-		});
-		return {
-			sessionKey: baseSessionKey,
-			baseSessionKey,
-			recipientSessionExact: isCanonicalIMessageDirectHandle(parsed.to, handle),
-			peer,
-			chatType: "direct",
-			from: directTarget,
-			to: directTarget
+		recipientSessionExact = isCanonicalIMessageDirectHandle(parsed.to, handle);
+	} else {
+		const peerId = parsed.kind === "chat_id" ? String(parsed.chatId) : parsed.kind === "chat_guid" ? parsed.chatGuid : parsed.chatIdentifier;
+		if (!peerId) return null;
+		peer = {
+			kind: "group",
+			id: peerId
 		};
+		from = `imessage:group:${peerId}`;
+		to = `${parsed.kind}:${peerId}`;
 	}
-	const peerId = parsed.kind === "chat_id" ? String(parsed.chatId) : parsed.kind === "chat_guid" ? parsed.chatGuid : parsed.chatIdentifier;
-	if (!peerId) return null;
-	const peer = {
-		kind: "group",
-		id: peerId
-	};
-	const baseSessionKey = buildIMessageBaseSessionKey({
+	const baseSessionKey = buildOutboundBaseSessionKey({
 		cfg: params.cfg,
+		channel: "imessage",
 		agentId: params.agentId,
 		accountId: params.accountId,
 		peer
 	});
-	const toPrefix = parsed.kind === "chat_id" ? "chat_id" : parsed.kind === "chat_guid" ? "chat_guid" : "chat_identifier";
 	return {
 		sessionKey: baseSessionKey,
 		baseSessionKey,
-		recipientSessionExact: false,
+		recipientSessionExact,
 		peer,
-		chatType: "group",
-		from: `imessage:group:${peerId}`,
-		to: `${toPrefix}:${peerId}`
+		chatType: peer.kind,
+		from,
+		to
 	};
 }
 const imessagePlugin = createChatChannelPlugin({
@@ -576,6 +545,19 @@ const imessagePlugin = createChatChannelPlugin({
 		}
 	} },
 	security: imessageSecurityAdapter,
+	threading: { resolveReplyTransport: ({ cfg, accountId, replyToId, currentMessageId, replyToCurrent, replyToIsExplicit, replyDelivery }) => {
+		if (resolveIMessageAccount({
+			cfg,
+			accountId
+		}).config.actions?.reply === false) return { replyToId: null };
+		const existingReplyToId = normalizeOptionalString(replyToId);
+		const explicitCurrentReply = replyToIsExplicit === true && replyToCurrent === true;
+		const implicitReplyToId = replyToCurrent === false || replyDelivery?.replyToMode === "off" && !explicitCurrentReply ? void 0 : normalizeOptionalString(currentMessageId);
+		return {
+			replyToId: existingReplyToId ?? implicitReplyToId ?? null,
+			...!existingReplyToId && !explicitCurrentReply && implicitReplyToId ? { replyToIdSource: "implicit" } : {}
+		};
+	} },
 	outbound: {
 		base: {
 			deliveryMode: "direct",
@@ -610,38 +592,14 @@ const imessagePlugin = createChatChannelPlugin({
 		},
 		attachedResults: {
 			channel: "imessage",
-			sendText: async ({ cfg, to, text, accountId, deps, replyToId, assertDirectAdapterHandoff, onPlatformSendDispatch }) => await (await loadIMessageChannelRuntime()).sendIMessageOutbound({
-				cfg,
-				to,
-				text,
-				accountId: accountId ?? void 0,
-				deps,
-				replyToId: replyToId ?? void 0,
-				assertDirectAdapterHandoff,
-				onPlatformSendDispatch
-			}),
-			sendMedia: async ({ cfg, to, text, mediaUrl, mediaAccess, mediaLocalRoots, mediaReadFile, audioAsVoice, accountId, deps, replyToId, onDeliveryResult, assertDirectAdapterHandoff, onPlatformSendDispatch }) => await (await loadIMessageChannelRuntime()).sendIMessageOutbound({
-				cfg,
-				to,
-				text,
-				mediaUrl,
-				mediaAccess,
-				mediaLocalRoots,
-				mediaReadFile,
-				audioAsVoice,
-				accountId: accountId ?? void 0,
-				deps,
-				replyToId: replyToId ?? void 0,
-				assertDirectAdapterHandoff,
-				onPlatformSendDispatch,
-				...onDeliveryResult ? { onDeliveryResult: async (result) => {
-					await onDeliveryResult({
-						channel: "imessage",
-						...toIMessageMessageSendResult(result, audioAsVoice ? "voice" : "media", replyToId),
-						messageId: result.messageId
-					});
-				} } : {}
-			})
+			sendText: (ctx) => sendIMessageOutbound(ctx, "text"),
+			sendMedia: (ctx) => sendIMessageOutbound(ctx, "media", ctx.onDeliveryResult ? { onDeliveryResult: async (result) => {
+				await ctx.onDeliveryResult?.({
+					channel: "imessage",
+					...toIMessageMessageSendResult(result, ctx.audioAsVoice ? "voice" : "media", ctx.replyToId),
+					messageId: result.messageId
+				});
+			} } : {})
 		}
 	}
 });