@openclaw/imessage 2026.10.10 → 2026.11.5-beta.1

package/dist/.setup/{actions.runtime-B2ZHQ3TJ.mjs → actions.runtime-Ccg9CARL.mjs}

@@ -1,65 +1,19 @@
-import { l as resolveIMessageMessageId, n as createIMessageRpcClient, r as runIMessageCliJsonCommand, x as normalizeDirectChatIdentifier } from "./client-C3e7ZLqA.mjs";
-import { n as sanitizeIMessageFinalOutboundText } from "./sanitize-outbound-C02fJrn6.mjs";
-import { n as authorizeIMessageResourceReference, t as withIMessageRemoteFile } from "./remote-file-CCgMYZ-u.mjs";
-import { isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { i as runIMessageCliJsonCommand, n as createIMessageRpcClient } from "./client-D_BaG8sC.mjs";
+import { s as resolveIMessageMessageId } from "./actions-qOuKy8To.mjs";
+import { n as sanitizeIMessageFinalOutboundText } from "./sanitize-outbound-Dhjhz0a-.mjs";
+import { resolveIMessageChat } from "./chat-lookup-xtPsOBkl.mjs";
+import { n as authorizeIMessageResourceReference, t as withIMessageRemoteFile } from "./remote-file-DpK3GQFD.mjs";
 import { basename, parse, win32 } from "node:path";
-import { parseStrictInteger } from "openclaw/plugin-sdk/number-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { captureChannelReadAuthority, captureEffectAuthority } from "openclaw/plugin-sdk/fetch-runtime";
 import { sanitizeUntrustedFileName } from "openclaw/plugin-sdk/security-runtime";
 import { resolvePreferredOpenClawTmpDir, withTempWorkspace } from "openclaw/plugin-sdk/temp-path";
-// extensions/imessage/src/actions-chat-guid.ts
-const CHAT_LIST_CACHE_TTL_MS = 3e4;
-const chatListCache = /* @__PURE__ */ new Map();
-function numberFromUnknown(value) {
-	return typeof value === "number" && Number.isFinite(value) ? value : parseStrictInteger(value);
-}
-function findChatGuid(chats, target) {
-	if (target.kind === "chat_id") {
-		for (const chat of chats) {
-			const id = numberFromUnknown(chat.id);
-			const guid = normalizeOptionalString(chat.guid);
-			if (id === target.chatId && guid) return guid;
-		}
-		return null;
-	}
-	const wanted = normalizeDirectChatIdentifier(target.chatIdentifier);
-	for (const chat of chats) {
-		const identifier = normalizeOptionalString(chat.identifier);
-		const guid = normalizeOptionalString(chat.guid);
-		if (guid && (identifier === target.chatIdentifier || guid === target.chatIdentifier || identifier && normalizeDirectChatIdentifier(identifier) === wanted || normalizeDirectChatIdentifier(guid) === wanted)) return guid;
-	}
-	return null;
-}
-async function resolveIMessageActionChatGuid(params) {
-	const { cliPath, dbPath, remoteHost } = params.options;
-	const key = `${cliPath}\0${dbPath ?? ""}\0${remoteHost ?? ""}`;
-	const cached = chatListCache.get(key);
-	if (cached && cached.expiresAt > Date.now()) return findChatGuid(cached.list, params.target);
-	chatListCache.delete(key);
-	const client = await createIMessageRpcClient(params.options);
-	try {
-		const result = await client.request("chats.list", { limit: 1e3 }, { timeoutMs: params.options.timeoutMs });
-		const list = isRecord(result) && Array.isArray(result.chats) ? result.chats.filter(isRecord) : [];
-		chatListCache.set(key, {
-			list,
-			expiresAt: Date.now() + CHAT_LIST_CACHE_TTL_MS
-		});
-		return findChatGuid(list, params.target);
-	} finally {
-		await client.stop();
-	}
-}
 // extensions/imessage/src/actions-transport.ts
-var IMessageRemoteUnsupportedError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.code = "IMESSAGE_REMOTE_UNSUPPORTED";
-		this.name = "IMessageRemoteUnsupportedError";
-	}
-};
 function throwIMessageRemoteUnsupported(message) {
-	throw new IMessageRemoteUnsupportedError(`iMessage Remote Mac limitation: ${message}`);
+	throw Object.assign(/* @__PURE__ */ new Error(`iMessage Remote Mac limitation: ${message}`), {
+		code: "IMESSAGE_REMOTE_UNSUPPORTED",
+		name: "IMessageRemoteUnsupportedError"
+	});
 }
 async function runIMessageAction(options, method, params, args) {
 	if (!options.remoteHost) {
@@ -165,7 +119,7 @@ function participantAction(method, command) {
 const imessageActionsRuntime = {
 	resolveIMessageMessageId,
 	authorizeMessageReference: authorizeIMessageResourceReference,
-	resolveChatGuidForTarget: resolveIMessageActionChatGuid,
+	resolveChatGuidForTarget: async (params) => (await resolveIMessageChat(params))?.guid ?? null,
 	async sendReaction(params) {
 		await runMessageAction(params, "tapback", "tapback", {
 			reaction: params.reaction,

package/dist/.setup/{api-6xi-NBrt.mjs → api-BXXuQQCS.mjs}

@@ -1,10 +1,10 @@
-import "./targets-CIx4BKqL.mjs";
-import "./accounts-BH0coL46.mjs";
-import "./message-tool-api-CxSY_rh7.mjs";
-import "./actions-CW7XYYF4.mjs";
-import { s as imessageSetupContract } from "./setup-core-BWnW0czE.mjs";
-import { n as createIMessagePluginBase, r as imessageSetupWizard } from "./channel-6kcKpSRw.mjs";
-import "./conversation-bindings-vZFn6sN2.mjs";
+import "./targets-C7CIWJ0k.mjs";
+import "./accounts-C1Ypv3Wn.mjs";
+import "./message-tool-api-DtZ1wKbT.mjs";
+import "./actions-qOuKy8To.mjs";
+import { s as imessageSetupContract } from "./setup-core-B1_P_t4T.mjs";
+import { n as createIMessagePluginBase, r as imessageSetupWizard } from "./channel-CLaN4mQn.mjs";
+import "./conversation-bindings-8DjxoIYU.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";
 // extensions/imessage/src/channel.setup.ts
 const imessageSetupPlugin = createIMessagePluginBase({

package/dist/.setup/{api-B0ih8Iof.mjs → api-DTbxSOPc.mjs}

@@ -1,10 +1,10 @@
-import { a as looksLikeIMessageExplicitTargetId, c as parseIMessageTarget, d as normalizeIMessageMessagingTarget, i as isAllowedIMessageSender, n as inferIMessageTargetChatType, o as normalizeIMessageHandle, s as parseIMessageAllowTarget, t as formatIMessageChatTarget, u as looksLikeIMessageTargetId } from "./targets-CIx4BKqL.mjs";
-import { a as resolveDefaultIMessageAccountId, i as listIMessageAccountIds, o as resolveIMessageAccount, r as listEnabledIMessageAccounts } from "./accounts-BH0coL46.mjs";
-import { o as IMESSAGE_ACTIONS, s as IMESSAGE_ACTION_NAMES } from "./message-tool-api-CxSY_rh7.mjs";
-import { _ as DEFAULT_IMESSAGE_PROBE_TIMEOUT_MS } from "./client-C3e7ZLqA.mjs";
-import { n as probeIMessage } from "./actions-CW7XYYF4.mjs";
-import { c as matchIMessageAcpConversation, i as resolveIMessageGroupRequireMention, l as normalizeIMessageAcpConversationId, o as resolveIMessageGroupToolPolicy, s as resolveIMessageInboundConversationId, t as imessagePlugin, u as resolveIMessageConversationIdFromTarget } from "./channel-6kcKpSRw.mjs";
-import { n as createIMessageConversationBindingManagerV2, t as createIMessageConversationBindingManager } from "./conversation-bindings-vZFn6sN2.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-6xi-NBrt.mjs";
+import { a as isAllowedIMessageSender, c as parseIMessageAllowTarget, d as looksLikeIMessageTargetId, f as normalizeIMessageMessagingTarget, l as parseIMessageTarget, o as looksLikeIMessageExplicitTargetId, r as inferIMessageTargetChatType, s as normalizeIMessageHandle, t as formatIMessageChatTarget } from "./targets-C7CIWJ0k.mjs";
+import { a as resolveDefaultIMessageAccountId, i as listIMessageAccountIds, o as resolveIMessageAccount, r as listEnabledIMessageAccounts } from "./accounts-C1Ypv3Wn.mjs";
+import { o as IMESSAGE_ACTIONS, s as IMESSAGE_ACTION_NAMES } from "./message-tool-api-DtZ1wKbT.mjs";
+import { a as DEFAULT_IMESSAGE_PROBE_TIMEOUT_MS } from "./client-D_BaG8sC.mjs";
+import { n as probeIMessage } from "./actions-qOuKy8To.mjs";
+import { c as matchIMessageAcpConversation, i as resolveIMessageGroupRequireMention, l as normalizeIMessageAcpConversationId, o as resolveIMessageGroupToolPolicy, s as resolveIMessageInboundConversationId, t as imessagePlugin, u as resolveIMessageConversationIdFromTarget } from "./channel-CLaN4mQn.mjs";
+import { n as createIMessageConversationBindingManagerV2, t as createIMessageConversationBindingManager } from "./conversation-bindings-8DjxoIYU.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-BXXuQQCS.mjs";
 import { t as IMESSAGE_LEGACY_OUTBOUND_SEND_DEP_KEYS } from "./outbound-send-deps-_da8jqeo.mjs";
 export { DEFAULT_IMESSAGE_PROBE_TIMEOUT_MS, IMESSAGE_ACTIONS, IMESSAGE_ACTION_NAMES, IMESSAGE_LEGACY_OUTBOUND_SEND_DEP_KEYS, createAllowedChatSenderMatcher, createIMessageConversationBindingManager, createIMessageConversationBindingManagerV2, 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-BKmqba3L.mjs → approval-handler.runtime-B6vrFfZx.mjs}

@@ -1,11 +1,11 @@
-import { c as parseIMessageTarget, d as normalizeIMessageMessagingTarget } from "./targets-CIx4BKqL.mjs";
-import { o as resolveIMessageAccount } from "./accounts-BH0coL46.mjs";
-import { n as getCachedIMessagePrivateApiStatus } from "./message-tool-api-CxSY_rh7.mjs";
-import { a as normalizeIMessageMessageId } from "./actions-CW7XYYF4.mjs";
-import { d as getIMessageApprovalApprovers } from "./channel-6kcKpSRw.mjs";
-import { i as extractMarkdownFormatRuns } from "./sanitize-outbound-C02fJrn6.mjs";
-import { a as unregisterIMessageApprovalReactionTarget, c as buildIMessageApprovalConversationKeyForTarget, i as registerIMessageApprovalReactionTarget } from "./approval-reactions-B9CJS0NT.mjs";
-import { a as iMessageApprovalPollTargets, i as buildApprovalPollOptions, o as mapSentPollOptionsToDecisions, t as sendMessageIMessage } from "./send-D98hQFdv.mjs";
+import { f as normalizeIMessageMessagingTarget, l as parseIMessageTarget } from "./targets-C7CIWJ0k.mjs";
+import { o as resolveIMessageAccount } from "./accounts-C1Ypv3Wn.mjs";
+import { n as getCachedIMessagePrivateApiStatus } from "./message-tool-api-DtZ1wKbT.mjs";
+import { b as normalizeIMessageMessageId } from "./actions-qOuKy8To.mjs";
+import { d as getIMessageApprovalApprovers } from "./channel-CLaN4mQn.mjs";
+import { i as extractMarkdownFormatRuns } from "./sanitize-outbound-Dhjhz0a-.mjs";
+import { c as buildIMessageApprovalConversationKeyForTarget, i as unregisterIMessageApprovalReactionTarget, r as registerIMessageApprovalReactionTarget } from "./approval-reactions-DBBsqbRC.mjs";
+import { a as iMessageApprovalPollTargets, i as buildApprovalPollOptions, o as mapSentPollOptionsToDecisions, t as sendMessageIMessage } from "./send-DhEW0gfe.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, createChannelApprovalNativeRuntimeAdapterAsync, resolvePreparedApprovalAccountId } from "openclaw/plugin-sdk/approval-handler-runtime";
 // extensions/imessage/src/approval-handler.runtime.ts
 const log = createSubsystemLogger("imessage/approvals");
-const loadIMessageActionsRuntime = createLazyRuntimeNamedExport(() => import("./actions.runtime-B2ZHQ3TJ.mjs"), "imessageActionsRuntime");
+const loadIMessageActionsRuntime = createLazyRuntimeNamedExport(() => import("./actions.runtime-Ccg9CARL.mjs"), "imessageActionsRuntime");
 const DEFAULT_PROBE_TIMEOUT_MS = 5e3;
 const APPROVAL_POLL_ORDERING_DELAY_MS = 1100;
 function classifyIMessageApprovalTargetTransport(params) {
@@ -33,113 +33,6 @@ function classifyIMessageApprovalTargetTransport(params) {
 	if (/^SMS;/i.test(conversationId)) return "sms";
 	return "unknown";
 }
-function canIMessageApprovalUsePoll(params) {
-	if (params.plannedTarget.surface !== "origin" && params.plannedTarget.surface !== "approver-dm") return false;
-	if (buildApprovalPollOptions({ allowedDecisions: params.allowedDecisions }).length < 2) return false;
-	try {
-		const account = resolveIMessageAccount({
-			cfg: params.cfg,
-			accountId: params.target.accountId
-		});
-		if (classifyIMessageApprovalTargetTransport({
-			cfg: params.cfg,
-			target: params.target
-		}) === "sms") return false;
-		if (!createActionGate(account.config.actions)("polls") || getIMessageApprovalApprovers({
-			cfg: params.cfg,
-			accountId: account.accountId
-		}).length === 0) return false;
-		const cliPath = account.config.cliPath?.trim() || "imsg";
-		const status = getCachedIMessagePrivateApiStatus(cliPath);
-		return status?.available === true && status?.selectors?.pollPayloadMessage === true && status.cliCapabilities?.pollSendSupportsNoComment === true;
-	} catch {
-		return false;
-	}
-}
-async function deliverIMessageApprovalPoll(params) {
-	const options = buildApprovalPollOptions({ allowedDecisions: params.allowedDecisions });
-	try {
-		const account = resolveIMessageAccount({
-			cfg: params.cfg,
-			accountId: params.target.accountId
-		});
-		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);
-		const sent = await (await loadIMessageActionsRuntime()).sendPoll({
-			chatGuid,
-			question: extractMarkdownFormatRuns(params.question).text,
-			choices: options.map((option) => option.text),
-			suppressComment: true,
-			options: cliOptions
-		});
-		const pollGuid = normalizeIMessageMessageId(sent.messageId);
-		const optionDecisions = mapSentPollOptionsToDecisions({
-			requested: options,
-			sent: sent.pollOptions
-		});
-		if (optionDecisions.length !== options.length) {
-			log.error("imessage approvals: imsg poll response did not return a complete option mapping");
-			await iMessageApprovalPollTargets.registerTombstone({
-				accountId: resolveIMessageAccount({
-					cfg: params.cfg,
-					accountId: params.target.accountId
-				}).accountId,
-				conversation: { chatGuid },
-				...pollGuid ? { pollGuid } : {},
-				optionIds: sent.pollOptions.map((option) => option.id),
-				approvalId: params.approvalId
-			});
-			return null;
-		}
-		const accountId = resolveIMessageAccount({
-			cfg: params.cfg,
-			accountId: params.target.accountId
-		}).accountId;
-		if (!await iMessageApprovalPollTargets.register({
-			accountId,
-			conversation: { chatGuid },
-			...pollGuid ? { pollGuid } : {},
-			approvalId: params.approvalId,
-			approvalKind: params.approvalKind,
-			optionDecisions,
-			expiresAtMs: params.expiresAtMs
-		})) {
-			await iMessageApprovalPollTargets.registerTombstone({
-				accountId,
-				conversation: { chatGuid },
-				...pollGuid ? { pollGuid } : {},
-				optionIds: optionDecisions.map(([optionId]) => optionId),
-				approvalId: params.approvalId
-			});
-			log.error("imessage approvals: poll target could not be registered");
-			return null;
-		}
-		return {
-			...pollGuid ? { pollGuid } : {},
-			chatGuid,
-			optionDecisions
-		};
-	} catch (error) {
-		log.warn(`imessage approvals: poll send failed, falling back to tapbacks: ${String(error)}`);
-		return null;
-	}
-}
 /** Clear both controls together; a stale binding would resolve a dead approval. */
 async function clearIMessageApprovalBindings(entry) {
 	const accountId = entry.accountId?.trim();
@@ -259,12 +152,30 @@ const imessageApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapterA
 			};
 		},
 		deliverPending: async ({ cfg, preparedTarget, plannedTarget, pendingPayload, view }) => {
-			const expectPoll = canIMessageApprovalUsePoll({
-				cfg,
-				target: preparedTarget,
-				plannedTarget,
-				allowedDecisions: pendingPayload.allowedDecisions
-			});
+			const canUsePoll = (surface) => {
+				if (surface !== "origin" && surface !== "approver-dm") return false;
+				if (buildApprovalPollOptions({ allowedDecisions: pendingPayload.allowedDecisions }).length < 2) return false;
+				try {
+					const account = resolveIMessageAccount({
+						cfg,
+						accountId: preparedTarget.accountId
+					});
+					if (classifyIMessageApprovalTargetTransport({
+						cfg,
+						target: preparedTarget
+					}) === "sms") return false;
+					if (!createActionGate(account.config.actions)("polls") || getIMessageApprovalApprovers({
+						cfg,
+						accountId: account.accountId
+					}).length === 0) return false;
+					const cliPath = account.config.cliPath?.trim() || "imsg";
+					const status = getCachedIMessagePrivateApiStatus(cliPath);
+					return status?.available === true && status?.selectors?.pollPayloadMessage === true && status.cliCapabilities?.pollSendSupportsNoComment === true;
+				} catch {
+					return false;
+				}
+			};
+			const expectPoll = canUsePoll(plannedTarget.surface);
 			const conversation = buildIMessageApprovalConversationKeyForTarget(preparedTarget.to);
 			if (!conversation) return null;
 			const accountId = resolveIMessageAccount({
@@ -290,15 +201,85 @@ const imessageApprovalNativeRuntime = createChannelApprovalNativeRuntimeAdapterA
 			});
 			if (!result.guid) return null;
 			const confirmedTransport = result.service ?? (result.chatGuid && /^iMessage;/i.test(result.chatGuid) ? "imessage" : result.chatGuid && /^SMS;/i.test(result.chatGuid) ? "sms" : targetTransport);
-			const poll = expectPoll && confirmedTransport === "imessage" ? await deliverIMessageApprovalPoll({
-				cfg,
-				target: preparedTarget,
-				approvalId: view.approvalId,
-				approvalKind: view.approvalKind,
-				expiresAtMs: view.expiresAtMs,
-				question: pendingPayload.pollText,
-				allowedDecisions: pendingPayload.allowedDecisions
-			}) : null;
+			const poll = expectPoll && confirmedTransport === "imessage" ? await (async () => {
+				const { approvalId, approvalKind, expiresAtMs } = view;
+				const { pollText: question, allowedDecisions } = pendingPayload;
+				const options = buildApprovalPollOptions({ allowedDecisions });
+				try {
+					const account = resolveIMessageAccount({
+						cfg,
+						accountId: preparedTarget.accountId
+					});
+					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(preparedTarget.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);
+					const sent = await (await loadIMessageActionsRuntime()).sendPoll({
+						chatGuid,
+						question: extractMarkdownFormatRuns(question).text,
+						choices: options.map((option) => option.text),
+						suppressComment: true,
+						options: cliOptions
+					});
+					const pollGuid = normalizeIMessageMessageId(sent.messageId);
+					const optionDecisions = mapSentPollOptionsToDecisions({
+						requested: options,
+						sent: sent.pollOptions
+					});
+					if (optionDecisions.length !== options.length) {
+						log.error("imessage approvals: imsg poll response did not return a complete option mapping");
+						await iMessageApprovalPollTargets.registerTombstone({
+							accountId: account.accountId,
+							conversation: { chatGuid },
+							...pollGuid ? { pollGuid } : {},
+							optionIds: sent.pollOptions.map((option) => option.id),
+							approvalId
+						});
+						return null;
+					}
+					if (!await iMessageApprovalPollTargets.register({
+						accountId: account.accountId,
+						conversation: { chatGuid },
+						...pollGuid ? { pollGuid } : {},
+						approvalId,
+						approvalKind,
+						optionDecisions,
+						expiresAtMs
+					})) {
+						await iMessageApprovalPollTargets.registerTombstone({
+							accountId: account.accountId,
+							conversation: { chatGuid },
+							...pollGuid ? { pollGuid } : {},
+							optionIds: optionDecisions.map(([optionId]) => optionId),
+							approvalId
+						});
+						log.error("imessage approvals: poll target could not be registered");
+						return null;
+					}
+					return {
+						...pollGuid ? { pollGuid } : {},
+						chatGuid,
+						optionDecisions
+					};
+				} catch (error) {
+					log.warn(`imessage approvals: poll send failed, falling back to tapbacks: ${String(error)}`);
+					return null;
+				}
+			})() : null;
 			let hintMessageId;
 			if (expectPoll && !poll && !reactionFallbackVisible) try {
 				hintMessageId = (await sendMessageIMessage(preparedTarget.to, pendingPayload.text, {

package/dist/.setup/{approval-reactions-B9CJS0NT.mjs → approval-reactions-DBBsqbRC.mjs}

@@ -1,13 +1,13 @@
 import { t as __exportAll } from "./rolldown-runtime-782esTHO.mjs";
-import { c as parseIMessageTarget, o as normalizeIMessageHandle } from "./targets-CIx4BKqL.mjs";
-import { i as normalizeIMessageGuid } from "./actions-CW7XYYF4.mjs";
-import { n as getOptionalIMessageRuntime } from "./runtime-BRQCPuAD.mjs";
-import { d as getIMessageApprovalApprovers, f as imessageApprovalAuth } from "./channel-6kcKpSRw.mjs";
-import { t as resolveIMessageReactionContext } from "./reaction-context-Bw00FkmU.mjs";
+import { l as parseIMessageTarget, s as normalizeIMessageHandle } from "./targets-C7CIWJ0k.mjs";
+import { t as chatContextFromIMessageTarget } from "./chat-context-fTfJVqAi.mjs";
+import { g as getOptionalIMessageRuntime, y as normalizeIMessageGuid } from "./actions-qOuKy8To.mjs";
+import { d as getIMessageApprovalApprovers, f as imessageApprovalAuth } from "./channel-CLaN4mQn.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";
+import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { addApprovalReactionHintToText, approvalReactionDecisionSetsMatch, buildApprovalReactionDeliveredBindingMarker, buildApprovalReactionHint, createApprovalReactionTargetStore, listApprovalReactionBindings, normalizeApprovalReactionDecision, readApprovalReactionDecisionList, readApprovalReactionDeliveredBinding, readApprovalReactionPresentationBinding, readApprovalReactionTargetRecord, resolveTypedApprovalReactionTarget, settleApprovalReaction } from "openclaw/plugin-sdk/approval-reaction-runtime";
+import { asDateTimestampMs, isFutureDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
 import { createPluginStateErrorReporter } from "openclaw/plugin-sdk/plugin-state-runtime";
 // extensions/imessage/src/approval-target-keys.ts
 function chatIdToKeyValue(chatId) {
@@ -46,9 +46,7 @@ function enumerateApprovalTargetKeys(params) {
 function buildIMessageApprovalConversationKeyForTarget(to) {
 	try {
 		const target = parseIMessageTarget(to);
-		if (target.kind === "chat_id") return { chatId: target.chatId };
-		if (target.kind === "chat_guid") return { chatGuid: target.chatGuid };
-		if (target.kind === "chat_identifier") return { chatIdentifier: target.chatIdentifier };
+		if (target.kind !== "handle") return chatContextFromIMessageTarget(target);
 		const handle = normalizeIMessageHandle(target.to);
 		return handle ? { handle } : null;
 	} catch {
@@ -205,17 +203,113 @@ async function listPendingIMessageApprovalReactionPollTargets(params) {
 	}
 	return [...targetByApprovalAndMessage.values()];
 }
-function clearIMessageApprovalReactionPollTargetsForTest() {
-	pendingReactionPollTargets.clear();
-	pendingReactionPollTargetStore = void 0;
+// extensions/imessage/src/monitor/reaction-context.ts
+const TAPBACK_TEXT_PATTERNS = [
+	{
+		prefix: "loved",
+		action: "added",
+		emoji: "❤️"
+	},
+	{
+		prefix: "liked",
+		action: "added",
+		emoji: "👍"
+	},
+	{
+		prefix: "disliked",
+		action: "added",
+		emoji: "👎"
+	},
+	{
+		prefix: "laughed at",
+		action: "added",
+		emoji: "😂"
+	},
+	{
+		prefix: "emphasized",
+		action: "added",
+		emoji: "‼️"
+	},
+	{
+		prefix: "questioned",
+		action: "added",
+		emoji: "❓"
+	},
+	{
+		prefix: "removed a heart from",
+		action: "removed",
+		emoji: "❤️"
+	},
+	{
+		prefix: "removed a like from",
+		action: "removed",
+		emoji: "👍"
+	},
+	{
+		prefix: "removed a dislike from",
+		action: "removed",
+		emoji: "👎"
+	},
+	{
+		prefix: "removed a laugh from",
+		action: "removed",
+		emoji: "😂"
+	},
+	{
+		prefix: "removed an emphasis from",
+		action: "removed",
+		emoji: "‼️"
+	},
+	{
+		prefix: "removed a question from",
+		action: "removed",
+		emoji: "❓"
+	}
+];
+function normalizeReactionValue(value) {
+	return value ? normalizeIMessageGuid(value) || void 0 : void 0;
+}
+function resolveReactionTargetGuidCandidates(...values) {
+	const candidates = [];
+	for (const value of values) {
+		const raw = value?.trim();
+		if (!raw) continue;
+		const normalized = normalizeIMessageGuid(raw);
+		for (const candidate of [normalized, raw]) if (candidate && !candidates.includes(candidate)) candidates.push(candidate);
+	}
+	return candidates;
+}
+function resolveTapbackTextContext(bodyText) {
+	const lower = bodyText.toLowerCase();
+	for (const pattern of TAPBACK_TEXT_PATTERNS) {
+		if (!lower.startsWith(pattern.prefix)) continue;
+		const afterPrefix = bodyText.slice(pattern.prefix.length).trim();
+		if (!/^(?:"[\s\S]*"|“[\s\S]*”)$/u.test(afterPrefix)) continue;
+		return {
+			action: pattern.action,
+			emoji: pattern.emoji,
+			targetText: afterPrefix.slice(1, -1).trim()
+		};
+	}
+	return null;
+}
+function resolveIMessageReactionContext(message, bodyText) {
+	if (message.is_reaction === true || message.is_tapback === true || message.associated_message_type != null && Number.isFinite(message.associated_message_type) && message.associated_message_type >= 2e3 && message.associated_message_type < 4e3) {
+		const targetGuids = resolveReactionTargetGuidCandidates(message.reacted_to_guid, message.associated_message_guid);
+		return {
+			action: message.is_reaction_add === false ? "removed" : "added",
+			emoji: normalizeReactionValue(message.reaction_emoji) ?? normalizeReactionValue(message.reaction_type) ?? "reaction",
+			targetGuid: targetGuids[0],
+			targetGuids
+		};
+	}
+	return resolveTapbackTextContext(bodyText);
 }
 // extensions/imessage/src/approval-reactions.ts
 var approval_reactions_exports = /* @__PURE__ */ __exportAll({
 	addIMessageApprovalReactionHintToStructuredPayload: () => addIMessageApprovalReactionHintToStructuredPayload,
 	buildIMessageApprovalConversationKeyForTarget: () => buildIMessageApprovalConversationKeyForTarget,
-	clearIMessageApprovalReactionTargetsForTest: () => clearIMessageApprovalReactionTargetsForTest,
 	handleIMessageApprovalReaction: () => handleIMessageApprovalReaction,
-	maybeResolveIMessageApprovalReaction: () => maybeResolveIMessageApprovalReaction,
 	registerIMessageApprovalReactionTarget: () => registerIMessageApprovalReactionTarget,
 	registerIMessageApprovalReactionTargetForDeliveredPayload: () => registerIMessageApprovalReactionTargetForDeliveredPayload,
 	resolveIMessageApprovalReactionTargetWithPersistence: () => resolveIMessageApprovalReactionTargetWithPersistence,
@@ -447,64 +541,50 @@ async function handleIMessageApprovalReaction(params) {
 		handled: false,
 		stopPolling: false
 	};
-	const settlement = await settleApprovalReaction({
-		request: {
-			cfg: params.cfg,
-			approvalId: target.approvalId,
-			approvalKind: target.approvalKind,
-			decision: target.decision,
-			channel: "imessage",
-			accountId: params.accountId,
-			senderId: event.actorHandle,
-			gatewayUrl: params.gatewayUrl,
-			...params.gatewayRuntime ? { gatewayRuntime: params.gatewayRuntime } : {}
-		},
-		approvers: getIMessageApprovalApprovers({
-			cfg: params.cfg,
-			accountId: params.accountId
-		}),
-		authorizeActorAction: (input) => imessageApprovalAuth.authorizeActorAction(input),
-		loadResolver: loadResolveApprovalOverGateway,
-		clearTarget: async () => {
-			await Promise.all(event.messageIdCandidates.map((candidate) => unregisterIMessageApprovalReactionTarget({
-				accountId: params.accountId,
-				conversation: event.conversation,
-				messageId: candidate
-			})));
-		},
-		onResolved: (result) => {
-			const outcome = result.applied ? "resolved" : "already resolved";
-			params.logVerboseMessage?.(`imessage: approval reaction ${outcome} id=${target.approvalId} sender=${event.actorHandle} ${formatCanonicalApprovalTerminalState(result.approval)} via messageId=${matchedMessageId ?? event.messageId}`);
-		},
-		onError: (error) => {
-			try {
-				getOptionalIMessageRuntime()?.logging.getChildLogger({
-					plugin: "imessage",
-					feature: "approval-reactions"
-				}).warn("approval reaction failed", {
-					approvalId: target.approvalId,
-					senderId: event.actorHandle,
-					error: String(error)
-				});
-			} catch {}
-		},
-		logVerboseMessage: params.logVerboseMessage
-	});
-	return settlement === "denied" ? {
-		handled: true,
-		stopPolling: false
-	} : {
+	return {
 		handled: true,
-		stopPolling: true,
-		stopPollingReason: settlement
+		stopPolling: await settleApprovalReaction({
+			request: {
+				cfg: params.cfg,
+				approvalId: target.approvalId,
+				approvalKind: target.approvalKind,
+				decision: target.decision,
+				channel: "imessage",
+				accountId: params.accountId,
+				senderId: event.actorHandle,
+				...params.gatewayRuntime ? { gatewayRuntime: params.gatewayRuntime } : {}
+			},
+			approvers: getIMessageApprovalApprovers({
+				cfg: params.cfg,
+				accountId: params.accountId
+			}),
+			authorizeActorAction: (input) => imessageApprovalAuth.authorizeActorAction(input),
+			loadResolver: loadResolveApprovalOverGateway,
+			clearTarget: async () => {
+				await Promise.all(event.messageIdCandidates.map((candidate) => unregisterIMessageApprovalReactionTarget({
+					accountId: params.accountId,
+					conversation: event.conversation,
+					messageId: candidate
+				})));
+			},
+			onResolved: (result) => {
+				const outcome = result.applied ? "resolved" : "already resolved";
+				logVerbose(`imessage: approval reaction ${outcome} id=${target.approvalId} sender=${event.actorHandle} ${formatCanonicalApprovalTerminalState(result.approval)} via messageId=${matchedMessageId ?? event.messageId}`);
+			},
+			onError: (error) => {
+				try {
+					getOptionalIMessageRuntime()?.logging.getChildLogger({
+						plugin: "imessage",
+						feature: "approval-reactions"
+					}).warn("approval reaction failed", {
+						approvalId: target.approvalId,
+						senderId: event.actorHandle,
+						error: String(error)
+					});
+				} catch {}
+			},
+			logVerboseMessage: logVerbose
+		}) !== "denied"
 	};
 }
-async function maybeResolveIMessageApprovalReaction(params) {
-	return (await handleIMessageApprovalReaction(params)).handled;
-}
-function clearIMessageApprovalReactionTargetsForTest() {
-	imessageApprovalReactionTargets.clearForTest();
-	clearIMessageApprovalReactionPollTargetsForTest();
-	loadResolveApprovalOverGateway.clear();
-}
-export { unregisterIMessageApprovalReactionTarget as a, buildIMessageApprovalConversationKeyForTarget as c, resolveIMessageApprovalControlActor 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, normalizeConversationKey as u };
+export { resolveIMessageReactionContext as a, buildIMessageApprovalConversationKeyForTarget as c, resolveIMessageApprovalControlActor as d, unregisterIMessageApprovalReactionTarget as i, enumerateApprovalTargetKeys as l, handleIMessageApprovalReaction as n, listPendingIMessageApprovalReactionPollTargets as o, registerIMessageApprovalReactionTarget as r, buildIMessageApprovalConversationKeyForInbound as s, approval_reactions_exports as t, normalizeConversationKey as u };