@openclaw/imessage 2026.10.1 → 2026.10.5-beta.1

package/dist/.setup/{approval-handler.runtime-Bj2NGNXF.mjs → approval-handler.runtime-Dc3KzakG.mjs}

@@ -1,11 +1,11 @@
-import { c as parseIMessageTarget, u as normalizeIMessageMessagingTarget } from "./targets-BicBiYsM.mjs";
-import { o as resolveIMessageAccount } from "./accounts-evTpvJMv.mjs";
-import { n as getCachedIMessagePrivateApiStatus } from "./message-tool-api-CqfRxLlT.mjs";
-import { a as normalizeIMessageMessageId } from "./actions-DJqbUmbN.mjs";
-import { d as getIMessageApprovalApprovers } from "./channel-CL73qdMG.mjs";
-import { i as extractMarkdownFormatRuns } from "./sanitize-outbound-C0x4BPky.mjs";
-import { a as unregisterIMessageApprovalReactionTarget, c as buildIMessageApprovalConversationKeyForTarget, i as registerIMessageApprovalReactionTarget } from "./approval-reactions-L9Ul7PAu.mjs";
-import { a as iMessageApprovalPollTargets, c as iMessageApprovalControlBindings, i as buildApprovalPollOptions, o as mapSentPollOptionsToDecisions, t as sendMessageIMessage } from "./send-pkYwL6Rt.mjs";
+import { c as parseIMessageTarget, d as normalizeIMessageMessagingTarget } from "./targets-B4oU7n-v.mjs";
+import { o as resolveIMessageAccount } from "./accounts-DacCvDBt.mjs";
+import { n as getCachedIMessagePrivateApiStatus } from "./message-tool-api-B5NfPnFL.mjs";
+import { a as normalizeIMessageMessageId } from "./actions-Hxh12myO.mjs";
+import { d as getIMessageApprovalApprovers } from "./channel-9TWBUDkP.mjs";
+import { i as extractMarkdownFormatRuns } from "./sanitize-outbound-DpdQERYJ.mjs";
+import { a as unregisterIMessageApprovalReactionTarget, c as buildIMessageApprovalConversationKeyForTarget, i as registerIMessageApprovalReactionTarget } from "./approval-reactions-JvzJCJ4a.mjs";
+import { a as iMessageApprovalPollTargets, c as iMessageApprovalControlBindings, i as buildApprovalPollOptions, o as mapSentPollOptionsToDecisions, t as sendMessageIMessage } from "./send-BZZzMbdi.mjs";
 import { createLazyRuntimeNamedExport } from "openclaw/plugin-sdk/lazy-runtime";
 import { createActionGate } from "openclaw/plugin-sdk/channel-actions";
 import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
@@ -15,7 +15,7 @@ import { setTimeout } from "node:timers/promises";
 import { buildChannelApprovalExpiredText, buildChannelApprovalResolvedText, createChannelApprovalNativeRuntimeAdapter, resolvePreparedApprovalAccountId } from "openclaw/plugin-sdk/approval-handler-runtime";
 //#region extensions/imessage/src/approval-handler.runtime.ts
 const log = createSubsystemLogger("imessage/approvals");
-const loadIMessageActionsRuntime = createLazyRuntimeNamedExport(() => import("./actions.runtime-DL5i-Y4J.mjs"), "imessageActionsRuntime");
+const loadIMessageActionsRuntime = createLazyRuntimeNamedExport(() => import("./actions.runtime-DOIX6Fkf.mjs"), "imessageActionsRuntime");
 const DEFAULT_PROBE_TIMEOUT_MS = 5e3;
 const APPROVAL_POLL_ORDERING_DELAY_MS = 1100;
 function classifyIMessageApprovalTargetTransport(params) {
@@ -56,27 +56,28 @@ function canIMessageApprovalUsePoll(params) {
 		return false;
 	}
 }
-function resolveIMessageApprovalCliOptions(params) {
-	const account = resolveIMessageAccount({
-		cfg: params.cfg,
-		accountId: params.target.accountId
-	});
-	return {
-		cliPath: account.config.cliPath?.trim() || "imsg",
-		dbPath: account.config.dbPath?.trim() || void 0,
-		timeoutMs: account.config.probeTimeoutMs ?? DEFAULT_PROBE_TIMEOUT_MS
-	};
-}
 async function deliverIMessageApprovalPoll(params) {
 	const options = buildApprovalPollOptions({ allowedDecisions: params.allowedDecisions });
 	try {
-		const cliOptions = resolveIMessageApprovalCliOptions({
+		const account = resolveIMessageAccount({
 			cfg: params.cfg,
-			target: params.target
+			accountId: params.target.accountId
 		});
-		const chatGuid = await resolveIMessageApprovalChatGuid({
-			to: params.target.to,
-			cliOptions
+		const cliOptions = {
+			cliPath: account.config.cliPath?.trim() || "imsg",
+			dbPath: account.config.dbPath?.trim() || void 0,
+			timeoutMs: account.config.probeTimeoutMs ?? DEFAULT_PROBE_TIMEOUT_MS
+		};
+		const target = parseIMessageTarget(params.target.to);
+		let chatGuid;
+		if (target.kind === "chat_guid") chatGuid = target.chatGuid;
+		else chatGuid = await (await loadIMessageActionsRuntime()).resolveChatGuidForTarget({
+			target: target.kind === "handle" ? {
+				kind: "chat_identifier",
+				chatIdentifier: `${target.service === "sms" ? "SMS" : "iMessage"};-;${target.to}`
+			} : target,
+			options: cliOptions,
+			conversationReadOrigin: "direct-operator"
 		});
 		if (!chatGuid || /^SMS;/i.test(chatGuid)) return null;
 		await setTimeout(APPROVAL_POLL_ORDERING_DELAY_MS);
@@ -139,40 +140,6 @@ async function deliverIMessageApprovalPoll(params) {
 		return null;
 	}
 }
-async function resolveIMessageApprovalChatGuid(params) {
-	const target = parseIMessageTarget(params.to);
-	if (target.kind === "chat_guid") return target.chatGuid;
-	const runtime = await loadIMessageActionsRuntime();
-	if (target.kind === "chat_id" || target.kind === "chat_identifier") return await runtime.resolveChatGuidForTarget({
-		target,
-		options: params.cliOptions,
-		conversationReadOrigin: "direct-operator"
-	});
-	if (target.kind !== "handle") return null;
-	const service = target.service === "sms" ? "SMS" : "iMessage";
-	return await runtime.resolveChatGuidForTarget({
-		target: {
-			kind: "chat_identifier",
-			chatIdentifier: `${service};-;${target.to}`
-		},
-		options: params.cliOptions,
-		conversationReadOrigin: "direct-operator"
-	});
-}
-async function recoverIMessageApprovalTextFallback(params) {
-	try {
-		return (await sendMessageIMessage(params.target.to, params.fallbackText, {
-			config: params.cfg,
-			approvalPrompt: params.approvalPrompt,
-			conversationReadOrigin: "direct-operator",
-			...params.target.accountId ? { accountId: params.target.accountId } : {},
-			...params.promptMessageId ? { replyToId: params.promptMessageId } : {}
-		})).guid;
-	} catch (error) {
-		log.error(`imessage approvals: text-fallback recovery failed: ${String(error)}`);
-		return;
-	}
-}
 /** Clear both controls together; a stale binding would resolve a dead approval. */
 async function clearIMessageApprovalBindings(entry) {
 	const accountId = entry.accountId?.trim();
@@ -337,13 +304,18 @@ const imessageApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapter(
 					question: pendingPayload.pollText,
 					allowedDecisions: pendingPayload.allowedDecisions
 				}) : null;
-				const hintMessageId = expectPoll && !poll && !reactionFallbackVisible ? await recoverIMessageApprovalTextFallback({
-					cfg,
-					target: preparedTarget,
-					promptMessageId: result.guid,
-					fallbackText: pendingPayload.text,
-					approvalPrompt
-				}) : void 0;
+				let hintMessageId;
+				if (expectPoll && !poll && !reactionFallbackVisible) try {
+					hintMessageId = (await sendMessageIMessage(preparedTarget.to, pendingPayload.text, {
+						config: cfg,
+						approvalPrompt,
+						conversationReadOrigin: "direct-operator",
+						...preparedTarget.accountId ? { accountId: preparedTarget.accountId } : {},
+						replyToId: result.guid
+					})).guid;
+				} catch (error) {
+					log.error(`imessage approvals: text-fallback recovery failed: ${String(error)}`);
+				}
 				const entry = {
 					accountId,
 					to: preparedTarget.to,

package/dist/.setup/{approval-reactions-L9Ul7PAu.mjs → approval-reactions-JvzJCJ4a.mjs}

@@ -1,9 +1,9 @@
 import { t as __exportAll } from "./rolldown-runtime-BBjsoOtd.mjs";
-import { c as parseIMessageTarget, o as normalizeIMessageHandle } from "./targets-BicBiYsM.mjs";
-import { i as normalizeIMessageGuid } from "./actions-DJqbUmbN.mjs";
+import { c as parseIMessageTarget, o as normalizeIMessageHandle } from "./targets-B4oU7n-v.mjs";
+import { i as normalizeIMessageGuid } from "./actions-Hxh12myO.mjs";
 import { n as getOptionalIMessageRuntime } from "./runtime-Cza4CY5T.mjs";
-import { d as getIMessageApprovalApprovers, f as imessageApprovalAuth } from "./channel-CL73qdMG.mjs";
-import { t as resolveIMessageReactionContext } from "./reaction-context-By7kUMBC.mjs";
+import { d as getIMessageApprovalApprovers, f as imessageApprovalAuth } from "./channel-9TWBUDkP.mjs";
+import { t as resolveIMessageReactionContext } from "./reaction-context-CRXpeYAr.mjs";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createLazyRuntimeSurface } from "openclaw/plugin-sdk/lazy-runtime";
 import { asDateTimestampMs, isFutureDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
@@ -56,14 +56,19 @@ function buildIMessageApprovalConversationKeyForTarget(to) {
 	}
 }
 /** Conversation key for an inbound event, mirroring the outbound key forms. */
-function buildIMessageApprovalConversationKeyForInbound(params) {
+function buildIMessageApprovalConversationKeyForInbound(message, actorHandle) {
 	return {
-		...params.chatGuid?.trim() ? { chatGuid: params.chatGuid.trim() } : {},
-		...params.chatIdentifier?.trim() ? { chatIdentifier: params.chatIdentifier.trim() } : {},
-		...chatIdToKeyValue(params.chatId ?? void 0) ? { chatId: params.chatId } : {},
-		...params.isGroup ? {} : { handle: params.actorHandle }
+		...message.chat_guid?.trim() ? { chatGuid: message.chat_guid.trim() } : {},
+		...message.chat_identifier?.trim() ? { chatIdentifier: message.chat_identifier.trim() } : {},
+		...chatIdToKeyValue(message.chat_id ?? void 0) ? { chatId: message.chat_id } : {},
+		...message.is_group ? {} : { handle: actorHandle }
 	};
 }
+function resolveIMessageApprovalControlActor(message) {
+	const sender = normalizeIMessageHandle(message.sender ?? "");
+	const destination = normalizeIMessageHandle(message.destination_caller_id ?? "");
+	return (message.is_from_me !== true && Boolean(sender) && sender === destination ? "" : sender) || (message.is_from_me === true ? destination : "");
+}
 //#endregion
 //#region extensions/imessage/src/approval-reaction-poll-targets.ts
 const PERSISTENT_POLL_TARGET_NAMESPACE = "imessage.approval-reaction-poll-targets";
@@ -382,14 +387,6 @@ async function unregisterIMessageApprovalReactionTarget(params) {
 	const keys = enumerateApprovalTargetKeys(params);
 	await Promise.all([...keys.map((key) => imessageApprovalReactionTargets.delete(key)), deleteIMessageApprovalReactionPollTargets(keys)]);
 }
-function resolveTarget(params) {
-	const target = resolveTypedApprovalReactionTarget(params);
-	return target ? {
-		approvalId: target.approvalId,
-		approvalKind: target.approvalKind,
-		decision: target.decision
-	} : null;
-}
 function formatCanonicalApprovalTerminalState(approval) {
 	const decision = approval.status === "allowed" || approval.status === "denied" ? ` decision=${approval.decision}` : "";
 	return `status=${approval.status}${decision} reason=${approval.reason}`;
@@ -397,35 +394,31 @@ function formatCanonicalApprovalTerminalState(approval) {
 async function resolveIMessageApprovalReactionTargetWithPersistence(params) {
 	const keys = enumerateApprovalTargetKeys(params);
 	for (const key of keys) {
-		const target = resolveTarget({
+		const target = resolveTypedApprovalReactionTarget({
 			target: await imessageApprovalReactionTargets.lookup(key),
 			reactionKey: params.reactionKey
 		});
-		if (target) return target;
+		if (target) return {
+			approvalId: target.approvalId,
+			approvalKind: target.approvalKind,
+			decision: target.decision
+		};
 	}
 	return null;
 }
 function readApprovalReactionEvent(message, bodyText) {
 	const reaction = resolveIMessageReactionContext(message, bodyText);
 	if (!reaction) return null;
-	const reactionKey = reaction.emoji.trim();
-	const candidates = (reaction.targetGuids ?? []).map((value) => value.trim()).filter((value) => value.length > 0);
-	const primary = reaction.targetGuid?.trim() || candidates[0] || "";
-	const messageIdCandidates = candidates.length > 0 ? candidates : primary ? [primary] : [];
-	const actorHandle = normalizeIMessageHandle((message.sender ?? "").trim());
+	const reactionKey = reaction.emoji;
+	const primary = reaction.targetGuid;
+	const actorHandle = normalizeIMessageHandle(message.sender ?? "");
 	if (!reactionKey || !primary || !actorHandle) return null;
-	const conversation = buildIMessageApprovalConversationKeyForInbound({
-		chatGuid: message.chat_guid,
-		chatIdentifier: message.chat_identifier,
-		chatId: message.chat_id,
-		isGroup: message.is_group,
-		actorHandle
-	});
+	const conversation = buildIMessageApprovalConversationKeyForInbound(message, actorHandle);
 	if (!normalizeConversationKey(conversation)) return null;
 	return {
 		conversation,
 		messageId: primary,
-		messageIdCandidates,
+		messageIdCandidates: reaction.targetGuids ?? [],
 		actorHandle,
 		reactionKey,
 		action: reaction.action
@@ -521,4 +514,4 @@ function clearIMessageApprovalReactionTargetsForTest() {
 	loadResolveApprovalOverGateway.clear();
 }
 //#endregion
-export { unregisterIMessageApprovalReactionTarget as a, buildIMessageApprovalConversationKeyForTarget as c, normalizeConversationKey as d, registerIMessageApprovalReactionTarget as i, enumerateApprovalTargetKeys as l, handleIMessageApprovalReaction as n, listPendingIMessageApprovalReactionPollTargets as o, maybeResolveIMessageApprovalReaction as r, buildIMessageApprovalConversationKeyForInbound as s, approval_reactions_exports as t, enumerateConversationKeyForms as u };
+export { unregisterIMessageApprovalReactionTarget as a, buildIMessageApprovalConversationKeyForTarget as c, normalizeConversationKey as d, resolveIMessageApprovalControlActor as f, registerIMessageApprovalReactionTarget as i, enumerateApprovalTargetKeys as l, handleIMessageApprovalReaction as n, listPendingIMessageApprovalReactionPollTargets as o, maybeResolveIMessageApprovalReaction as r, buildIMessageApprovalConversationKeyForInbound as s, approval_reactions_exports as t, enumerateConversationKeyForms as u };

package/dist/.setup/{channel-CL73qdMG.mjs → channel-9TWBUDkP.mjs}

@@ -1,12 +1,12 @@
-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-evTpvJMv.mjs";
-import { C as resolveIMessageDirectChatService } from "./client-12apu4Ip.mjs";
-import { t as imessageMessageActions } from "./actions-DJqbUmbN.mjs";
-import { i as createIMessageSetupWizardProxy, s as imessageSetupContract } from "./setup-core-DqOBe-n0.mjs";
+import { a as looksLikeIMessageExplicitTargetId, c as parseIMessageTarget, d as normalizeIMessageMessagingTarget, f as isIMessagePhoneLikeHandle, n as inferIMessageTargetChatType, o as normalizeIMessageHandle } from "./targets-B4oU7n-v.mjs";
+import { a as resolveDefaultIMessageAccountId, i as listIMessageAccountIds, o as resolveIMessageAccount, t as collectIMessageDuplicateAccountSourceWarnings } from "./accounts-DacCvDBt.mjs";
+import { C as resolveIMessageDirectChatService } from "./client-HixFQQWY.mjs";
+import { t as imessageMessageActions } from "./actions-Hxh12myO.mjs";
+import { i as createIMessageSetupWizardProxy, s as imessageSetupContract } from "./setup-core-CaRGbZOL.mjs";
 import { t as createIMessageConversationBindingManager } from "./conversation-bindings-GDQ_Laxj.mjs";
-import { n as sanitizeIMessageFinalOutboundText, r as sanitizeOutboundText } from "./sanitize-outbound-C0x4BPky.mjs";
+import { n as sanitizeIMessageFinalOutboundText, r as sanitizeOutboundText } from "./sanitize-outbound-DpdQERYJ.mjs";
 import { t as IMessageChannelConfigSchema } from "./config-schema-DXwa_3V5.mjs";
-import { n as resolveIMessageAttachmentRoots, r as resolveIMessageRemoteAttachmentRoots } from "./media-contract-DjQGZlfl.mjs";
+import { n as resolveIMessageAttachmentRoots, r as resolveIMessageRemoteAttachmentRoots } from "./media-contract-BwWs5PM7.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";
@@ -32,9 +32,7 @@ import { buildChannelGroupsScopeTree, createRestrictSendersChannelSecurity, reso
 import { createChannelPluginBase, getChatChannelMeta } from "openclaw/plugin-sdk/core";
 //#region extensions/imessage/src/approval-auth.ts
 function normalizeIMessageApproverId(value) {
-	const raw = String(value).trim();
-	if (!raw) return;
-	const normalized = normalizeIMessageHandle(raw);
+	const normalized = normalizeIMessageHandle(String(value));
 	if (!normalized || normalized.startsWith("chat_id:") || normalized.startsWith("chat_guid:") || normalized.startsWith("chat_identifier:")) return;
 	return normalized;
 }
@@ -120,7 +118,7 @@ const imessageApproval = createApproverRestrictedNativeApprovalCapabilityFromFor
 			approvalKind,
 			request
 		}),
-		load: async () => (await import("./approval-handler.runtime-Bj2NGNXF.mjs")).imessageApprovalNativeRuntime
+		load: async () => (await import("./approval-handler.runtime-Dc3KzakG.mjs")).imessageApprovalNativeRuntime
 	})
 });
 const imessageApprovalRouting = imessageApproval.routing;
@@ -289,7 +287,7 @@ function resolveIMessageGroupSystemPrompt(params) {
 //#endregion
 //#region extensions/imessage/src/shared.ts
 const IMESSAGE_CHANNEL = "imessage";
-const imessageSetupWizard = createIMessageSetupWizardProxy(async () => (await import("./setup-surface-zKhIinwY.mjs")).imessageSetupWizard);
+const imessageSetupWizard = createIMessageSetupWizardProxy(async () => (await import("./setup-surface-BMWS7VuY.mjs")).imessageSetupWizard);
 const imessageConfigAdapter = createScopedChannelConfigAdapter({
 	sectionKey: IMESSAGE_CHANNEL,
 	listAccountIds: listIMessageAccountIds,
@@ -373,7 +371,7 @@ function createIMessagePluginBase(params) {
 }
 //#endregion
 //#region extensions/imessage/src/channel.ts
-const loadIMessageChannelRuntime = createLazyRuntimeModule(() => import("./channel.runtime-DY7JJ0_9.mjs"));
+const loadIMessageChannelRuntime = createLazyRuntimeModule(() => import("./channel.runtime-DrLDEY4R.mjs"));
 async function sendIMessageOutbound(ctx, kind, options = {}) {
 	return await (await loadIMessageChannelRuntime()).sendIMessageOutbound({
 		cfg: ctx.cfg,
@@ -409,8 +407,8 @@ function toIMessageMessageSendResult(result, kind, replyToId) {
 		...result.meta && Object.keys(result.meta).length > 0 ? { meta: result.meta } : {}
 	};
 }
-const loadIMessageApprovalReactionsModule = createLazyRuntimeModule(() => import("./approval-reactions-L9Ul7PAu.mjs").then((n) => n.t));
-const loadIMessageQuestionReactionsModule = createLazyRuntimeModule(() => import("./question-reactions-DJV-TnA8.mjs").then((n) => n.r));
+const loadIMessageApprovalReactionsModule = createLazyRuntimeModule(() => import("./approval-reactions-JvzJCJ4a.mjs").then((n) => n.t));
+const loadIMessageQuestionReactionsModule = createLazyRuntimeModule(() => import("./question-reactions-9jrqVZgE.mjs").then((n) => n.r));
 const imessageMessageAdapter = defineChannelMessageAdapter({
 	id: "imessage",
 	durableFinal: { capabilities: {
@@ -528,7 +526,7 @@ const imessagePlugin = createChatChannelPlugin({
 		messaging: {
 			normalizeTarget: normalizeIMessageMessagingTarget,
 			inferTargetChatType: ({ to }) => inferIMessageTargetChatType(to),
-			resolveOutboundSessionRoute: (params) => resolveIMessageOutboundSessionRoute(params),
+			resolveOutboundSessionRoute: resolveIMessageOutboundSessionRoute,
 			targetResolver: {
 				looksLikeId: looksLikeIMessageExplicitTargetId,
 				hint: "<phone|email|chat_id:ID|auto:contact|imessage:contact|sms:contact>",