@openclaw/imessage 2026.9.3 → 2026.9.5

package/dist/{send-CIHiLtcY.js → .setup/send-DXiUWygv.mjs}

@@ -1,25 +1,26 @@
-import { d as resolveIMessageChatDbLookupPath, l as resolveIMessageRemoteHost, n as hasExclusiveIMessageLocalDatabase, o as resolveIMessageAccount } from "./accounts-CCirBEIm.js";
-import { l as parseIMessageTarget, n as formatIMessageChatTarget, s as normalizeIMessageHandle } from "./message-tool-api-CUoFESHj.js";
-import { a as IMessageRpcRequestError, d as rememberIMessageReplyCache, g as chatContextFromIMessageTarget, n as sanitizeIMessageFinalOutboundText, o as createIMessageRpcClient, s as runIMessageCliJsonCommand, t as protectIMessageFencedRoleMarkers, y as resolveIMessageDirectChatService } from "./sanitize-outbound-C6UF2cvr.js";
-import { l as getIMessageApprovalApprovers, u as imessageApprovalAuth } from "./group-policy-Duro87b4.js";
-import { n as getOptionalIMessageRuntime, t as getIMessageRuntime } from "./runtime-Cza4CY5T.js";
-import { c as IMESSAGE_SENT_ECHOES_TTL_MS, d as resolveIMessageEchoMediaKey, p as resolveIMessageSentEchoEntryKey, s as IMESSAGE_SENT_ECHOES_NAMESPACE } from "./state-contract-DvahEY4X.js";
-import { d as normalizeConversationKey, i as registerIMessageApprovalReactionTarget, l as enumerateApprovalTargetKeys, s as buildIMessageApprovalConversationKeyForInbound, u as enumerateConversationKeyForms } from "./approval-reactions-BM_AwHPq.js";
-import { n as normalizeIMessageGuid } from "./reaction-context-Br-vAJFp.js";
-import { r as resolveAuthorizedIMessageReplyReference, t as withIMessageRemoteFile } from "./remote-file-5n5LznCa.js";
+import { c as parseIMessageTarget, o as normalizeIMessageHandle, t as formatIMessageChatTarget } from "./targets-Cc9vthzI.mjs";
+import { d as resolveIMessageChatDbLookupPath, l as resolveIMessageRemoteHost, n as hasExclusiveIMessageLocalDatabase, o as resolveIMessageAccount } from "./accounts-Dv0uksBG.mjs";
+import { _ as chatContextFromIMessageTarget, a as IMessageRpcRequestError, b as resolveIMessageDirectChatService, f as rememberIMessageReplyCache, n as sanitizeIMessageFinalOutboundText, o as createIMessageRpcClient, s as runIMessageCliJsonCommand, t as protectIMessageFencedRoleMarkers } from "./sanitize-outbound-o1ePXajW.mjs";
+import { c as imessageApprovalAuth, s as getIMessageApprovalApprovers } from "./group-policy-BoOAkmoQ.mjs";
+import { n as getOptionalIMessageRuntime, t as getIMessageRuntime } from "./runtime-Cza4CY5T.mjs";
+import { c as IMESSAGE_SENT_ECHOES_TTL_MS, d as resolveIMessageEchoMediaKey, p as resolveIMessageSentEchoEntryKey, s as IMESSAGE_SENT_ECHOES_NAMESPACE } from "./state-contract-DvahEY4X.mjs";
+import { d as normalizeConversationKey, i as registerIMessageApprovalReactionTarget, l as enumerateApprovalTargetKeys, s as buildIMessageApprovalConversationKeyForInbound, u as enumerateConversationKeyForms } from "./approval-reactions-CX1-6KeG.mjs";
+import { n as normalizeIMessageGuid } from "./reaction-context-Br-vAJFp.mjs";
+import { r as resolveAuthorizedIMessageReplyReference, t as withIMessageRemoteFile } from "./remote-file-4RbwiXYh.mjs";
+import { asOptionalRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createMessageReceiptFromOutboundResults } from "openclaw/plugin-sdk/channel-outbound";
 import { createLazyRuntimeSurface } from "openclaw/plugin-sdk/lazy-runtime";
 import { accessSync, constants } from "node:fs";
 import { basename } from "node:path";
-import { asOptionalRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { logVerbose, sleep } from "openclaw/plugin-sdk/runtime-env";
 import { extractOriginalFilename, kindFromMime, resolveOutboundAttachmentFromUrl } from "openclaw/plugin-sdk/media-runtime";
 import { asDateTimestampMs } from "openclaw/plugin-sdk/number-runtime";
+import { resolveRuntimeWorkerUrl } from "openclaw/plugin-sdk/process-runtime";
 import { PlatformMessageNotDispatchedError, isApprovalNotFoundError } from "openclaw/plugin-sdk/error-runtime";
 import { addApprovalReactionHintToText, createApprovalReactionTargetStore, listApprovalReactionBindings } from "openclaw/plugin-sdk/approval-reaction-runtime";
 import { convertMarkdownTables, stripInlineDirectiveTagsForDelivery } from "openclaw/plugin-sdk/text-chunking";
 import { createChannelPartialDeliveryError } from "openclaw/plugin-sdk/channel-inbound";
-import { openNodeSqliteDatabase } from "openclaw/plugin-sdk/sqlite-runtime";
+import { openSqliteWorkerStore } from "openclaw/plugin-sdk/sqlite-runtime";
 import { createPluginStateErrorReporter } from "openclaw/plugin-sdk/plugin-state-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
@@ -176,7 +177,7 @@ function mapSentPollOptionsToDecisions(params) {
 	}
 	return seenDecisions.size === params.requested.length ? mapped : [];
 }
-function registerIMessageApprovalPollTarget(params) {
+async function registerIMessageApprovalPollTarget(params) {
 	const accountId = params.accountId.trim();
 	const approvalId = params.approvalId.trim();
 	const expiresAtMs = asDateTimestampMs(params.expiresAtMs);
@@ -194,28 +195,23 @@ function registerIMessageApprovalPollTarget(params) {
 		approvalKind: params.approvalKind,
 		optionDecisions: params.optionDecisions
 	};
-	for (const key of keys) {
-		pollTargets.register(key, target, { ttlMs });
-		pollTombstones.register(key, { approvalId }, { ttlMs: TOMBSTONE_TTL_MS });
-	}
+	await Promise.all(keys.flatMap((key) => [pollTargets.register(key, target, { ttlMs }), pollTombstones.register(key, { approvalId }, { ttlMs: TOMBSTONE_TTL_MS })]));
 	return true;
 }
-function unregisterIMessageApprovalPollTarget(params) {
-	for (const key of enumeratePollTargetKeys({
+async function unregisterIMessageApprovalPollTarget(params) {
+	const keys = enumeratePollTargetKeys({
 		accountId: params.accountId,
 		conversation: params.conversation,
 		pollGuid: params.pollGuid,
 		optionIds: params.optionDecisions?.map(([optionId]) => optionId)
-	})) {
-		pollTargets.delete(key);
-		pollTombstones.register(key, { approvalId: params.approvalId ?? "" }, { ttlMs: TOMBSTONE_TTL_MS });
-	}
+	});
+	await Promise.all(keys.flatMap((key) => [pollTargets.delete(key), pollTombstones.register(key, { approvalId: params.approvalId ?? "" }, { ttlMs: TOMBSTONE_TTL_MS })]));
 }
 /**
 * Consume votes for a poll that was created but could not be safely bound.
 * Messages has no reliable retract primitive for this balloon.
 */
-function registerIMessageApprovalPollTombstone(params) {
+async function registerIMessageApprovalPollTombstone(params) {
 	const keys = enumeratePollTargetKeys({
 		accountId: params.accountId,
 		conversation: params.conversation,
@@ -223,7 +219,7 @@ function registerIMessageApprovalPollTombstone(params) {
 		optionIds: params.optionIds
 	});
 	if (keys.length === 0) return false;
-	for (const key of keys) pollTombstones.register(key, { approvalId: params.approvalId }, { ttlMs: TOMBSTONE_TTL_MS });
+	await Promise.all(keys.map((key) => pollTombstones.register(key, { approvalId: params.approvalId }, { ttlMs: TOMBSTONE_TTL_MS })));
 	return true;
 }
 function enumeratePollTargetKeys(params) {
@@ -413,7 +409,7 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 			gatewayUrl: params.gatewayUrl,
 			...params.gatewayRuntime ? { gatewayRuntime: params.gatewayRuntime } : {}
 		});
-		unregisterIMessageApprovalPollTarget({
+		await unregisterIMessageApprovalPollTarget({
 			...lookupKey,
 			optionDecisions: target.optionDecisions,
 			approvalId: target.approvalId
@@ -426,7 +422,7 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 		return true;
 	} catch (error) {
 		if (isApprovalNotFoundError(error)) {
-			unregisterIMessageApprovalPollTarget({
+			await unregisterIMessageApprovalPollTarget({
 				...lookupKey,
 				optionDecisions: target.optionDecisions,
 				approvalId: target.approvalId
@@ -474,7 +470,6 @@ function normalizeMessageId(messageId) {
 	if (!normalized || normalized === "ok" || normalized === "unknown") return;
 	return normalized;
 }
-let mirror = null;
 let persistenceFailureLogged = false;
 function reportFailure(scope, err) {
 	if (persistenceFailureLogged) return;
@@ -491,7 +486,7 @@ function normalizeMedia(media) {
 	};
 }
 function openPersistedEchoStore() {
-	return getIMessageRuntime().state.openSyncKeyedStore({
+	return getIMessageRuntime().state.openKeyedStore({
 		namespace: IMESSAGE_SENT_ECHOES_NAMESPACE,
 		maxEntries: 256
 	});
@@ -508,31 +503,27 @@ function isLiveEntry(entry, now = Date.now()) {
 	const cutoff = now - IMESSAGE_SENT_ECHOES_TTL_MS;
 	return entry.timestamp >= cutoff && (entry.expiresAt == null || entry.expiresAt > now);
 }
-function loadMirrorFromStore() {
+async function readRecentEntries() {
 	try {
-		mirror = openPersistedEchoStore().entries().map(({ value }) => value).filter((entry) => isLiveEntry(entry)).toSorted((a, b) => a.timestamp - b.timestamp).slice(-256);
+		return (await openPersistedEchoStore().entries()).map(({ value }) => value).filter((entry) => isLiveEntry(entry)).toSorted((a, b) => a.timestamp - b.timestamp).slice(-256);
 	} catch (err) {
 		reportFailure("read", err);
-		mirror = [];
+		return [];
 	}
 }
-function readRecentEntries() {
-	loadMirrorFromStore();
-	return mirror ?? [];
-}
-function persistEntry(entry, ttlMs) {
+async function persistEntry(entry, ttlMs) {
 	const effectiveTtlMs = resolveEntryTtlMs(entry, ttlMs);
 	if (!effectiveTtlMs) return;
 	const key = resolveIMessageSentEchoEntryKey(entry);
 	try {
-		openPersistedEchoStore().register(key, entry, { ttlMs: effectiveTtlMs });
+		await openPersistedEchoStore().register(key, entry, { ttlMs: effectiveTtlMs });
 	} catch (err) {
 		reportFailure("write", err);
 		return;
 	}
 	return key;
 }
-function rememberPersistedIMessageEcho(params) {
+async function rememberPersistedIMessageEcho(params) {
 	const text = normalizeText(params.text);
 	const media = normalizeMedia(params.media);
 	const messageId = normalizeMessageId(params.messageId);
@@ -546,26 +537,22 @@ function rememberPersistedIMessageEcho(params) {
 	};
 	if (typeof params.ttlMs === "number" && Number.isFinite(params.ttlMs) && params.ttlMs > 0) entry.expiresAt = entry.timestamp + params.ttlMs;
 	if (!entry.text && !entry.media && !entry.messageId) return;
-	loadMirrorFromStore();
-	const key = persistEntry(entry, params.ttlMs);
-	mirror = [...mirror ?? [], entry].filter((candidate) => isLiveEntry(candidate)).slice(-256);
-	return key;
+	return await persistEntry(entry, params.ttlMs);
 }
-function forgetPersistedIMessageEchoKey(key) {
+async function forgetPersistedIMessageEchoKey(key) {
 	if (!key) return;
 	try {
-		openPersistedEchoStore().delete(key);
+		await openPersistedEchoStore().delete(key);
 	} catch (err) {
 		reportFailure("delete", err);
 	}
-	mirror = (mirror ?? []).filter((entry) => resolveIMessageSentEchoEntryKey(entry) !== key);
 }
-function hasPersistedIMessageEcho(params) {
+async function hasPersistedIMessageEcho(params) {
 	const text = normalizeText(params.text);
 	const mediaKey = resolveIMessageEchoMediaKey(params.media);
 	const messageId = normalizeMessageId(params.messageId);
 	if (!text && !mediaKey && !messageId) return false;
-	for (const entry of readRecentEntries()) {
+	for (const entry of await readRecentEntries()) {
 		if (entry.scope !== params.scope) continue;
 		if (messageId && entry.messageId === messageId) return true;
 		const hasConflictingMessageIds = Boolean(messageId && entry.messageId && messageId !== entry.messageId);
@@ -575,6 +562,59 @@ function hasPersistedIMessageEcho(params) {
 	return false;
 }
 //#endregion
+//#region extensions/imessage/src/send-receipt-db.ts
+async function withIMessageReceiptGuidReader(databasePath, use) {
+	let store;
+	let closed = false;
+	const read = async (command) => {
+		if (closed) throw new Error("iMessage receipt lookup is closed");
+		try {
+			store ??= await openSqliteWorkerStore({
+				moduleUrl: resolveRuntimeWorkerUrl({
+					currentModuleUrl: import.meta.url,
+					sourceWorkerName: "send-receipt-db.worker",
+					distWorkerPath: "extensions/imessage/src/send-receipt-db.worker.js",
+					package: {
+						name: "@openclaw/imessage",
+						distWorkerPath: "src/send-receipt-db.worker.js"
+					}
+				}),
+				databasePath,
+				existingOnly: true,
+				input: void 0
+			});
+			return store ? await store.execute(command) : null;
+		} catch {
+			return null;
+		}
+	};
+	try {
+		return await use(read);
+	} finally {
+		closed = true;
+		try {
+			await store?.close();
+		} catch {}
+	}
+}
+//#endregion
+//#region extensions/imessage/src/send-transport.ts
+function normalizeIMessageRpcSendError(error) {
+	if (!(error instanceof IMessageRpcRequestError)) return error;
+	const data = asOptionalRecord(error.data);
+	return data?.disposition === "not_started" && data.retry_safe === true ? new PlatformMessageNotDispatchedError(error.message, { cause: error }) : error;
+}
+async function requestIMessageRpcSend(client, method, params, timeoutMs, handoff) {
+	handoff.assertDirectAdapterHandoff?.();
+	await handoff.onPlatformSendDispatch?.();
+	handoff.assertDirectAdapterHandoff?.();
+	try {
+		return await client.request(method, params, { timeoutMs });
+	} catch (error) {
+		throw normalizeIMessageRpcSendError(error);
+	}
+}
+//#endregion
 //#region extensions/imessage/src/send.ts
 const MIN_PENDING_PERSISTED_ECHO_TTL_MS = 6e4;
 const PENDING_PERSISTED_ECHO_GRACE_MS = 5e3;
@@ -609,79 +649,14 @@ function normalizeResolvedMessageGuid(value) {
 	const trimmed = value.trim();
 	return isConcreteIMessageMessageId(trimmed) && !isNumericMessageRowId(trimmed) ? trimmed : null;
 }
-function resolveMessageGuidFromChatDb(params) {
+async function resolveMessageGuidFromChatDb(params) {
 	const dbPath = params.dbPath?.trim();
 	const messageId = params.messageId.trim();
 	if (!dbPath || !isNumericMessageRowId(messageId)) return null;
-	let db = null;
-	try {
-		db = openNodeSqliteDatabase(dbPath, { readOnly: true });
-		return normalizeResolvedMessageGuid(db.prepare("SELECT guid FROM message WHERE ROWID = ?").get(messageId)?.guid);
-	} catch {
-		return null;
-	} finally {
-		try {
-			db?.close();
-		} catch {}
-	}
-}
-function getStringRowValue(row, key) {
-	return normalizeResolvedMessageGuid(row?.[key]);
-}
-function appleMessageDateLowerBoundMs(sentAfterMs) {
-	if (!Number.isFinite(sentAfterMs)) return null;
-	return Math.max(0, Math.floor((sentAfterMs - 9783072e5 - 5e3) * 1e6));
-}
-function resolveLatestSentMessageGuidFromChatDb(params) {
-	const dbPath = params.dbPath?.trim();
-	if (!dbPath) return null;
-	let db = null;
-	try {
-		db = openNodeSqliteDatabase(dbPath, { readOnly: true });
-		const targetClauses = [];
-		const targetParams = [];
-		const lowerBound = appleMessageDateLowerBoundMs(params.sentAfterMs);
-		if (params.text) {
-			targetClauses.push("m.text = ?");
-			targetParams.push(params.text);
-		}
-		if (lowerBound !== null) {
-			targetClauses.push("m.date >= ?");
-			targetParams.push(lowerBound);
-		}
-		if (params.target.kind === "chat_id") {
-			targetClauses.push("cmj.chat_id = ?");
-			targetParams.push(params.target.chatId);
-		} else if (params.target.kind === "chat_guid") {
-			targetClauses.push("c.guid = ?");
-			targetParams.push(params.target.chatGuid);
-		} else if (params.target.kind === "chat_identifier") {
-			targetClauses.push("c.chat_identifier = ?");
-			targetParams.push(params.target.chatIdentifier);
-		} else {
-			const normalizedHandle = normalizeIMessageHandle(params.target.to);
-			targetClauses.push("(h.id = ? OR h.uncanonicalized_id = ?)");
-			targetParams.push(normalizedHandle, params.target.to);
-		}
-		const selectSql = `
-      SELECT m.guid
-      FROM message m
-      LEFT JOIN chat_message_join cmj ON cmj.message_id = m.ROWID
-      LEFT JOIN chat c ON c.ROWID = cmj.chat_id
-      LEFT JOIN handle h ON h.ROWID = m.handle_id
-      WHERE m.is_from_me = 1
-      ${targetClauses.length ? `AND ${targetClauses.join(" AND ")}` : ""}
-      ORDER BY m.date DESC, m.ROWID DESC
-      LIMIT 10
-    `;
-		return getStringRowValue(db.prepare(selectSql).all(...targetParams)[0], "guid");
-	} catch {
-		return null;
-	} finally {
-		try {
-			db?.close();
-		} catch {}
-	}
+	return normalizeResolvedMessageGuid(await withIMessageReceiptGuidReader(dbPath, (read) => read({
+		type: "messageGuid",
+		input: { messageId }
+	})));
 }
 function canResolveLatestSentMessageGuidFromChatDb(dbPath) {
 	const normalizedDbPath = dbPath?.trim();
@@ -704,21 +679,33 @@ async function resolveApprovalBindingMessageGuid(params) {
 	}));
 }
 async function resolveFallbackSentMessageGuid(params) {
-	const resolver = params.resolveSentMessageGuidImpl ?? resolveLatestSentMessageGuidFromChatDb;
-	if (!params.resolveSentMessageGuidImpl && !canResolveLatestSentMessageGuidFromChatDb(params.dbPath)) return null;
+	const dbPath = params.dbPath?.trim();
+	if (!params.resolveSentMessageGuidImpl && !canResolveLatestSentMessageGuidFromChatDb(dbPath)) return null;
 	const deadlineMs = Date.now() + 5e3;
-	while (Date.now() <= deadlineMs) {
-		const resolved = normalizeResolvedMessageGuid(await resolver({
-			dbPath: params.dbPath,
-			target: params.target,
-			text: params.text,
-			sentAfterMs: params.sentAfterMs
-		}));
-		if (resolved) return resolved;
-		if (Date.now() >= deadlineMs) return null;
-		await sleep(250);
-	}
-	return null;
+	const poll = async (resolver) => {
+		while (Date.now() <= deadlineMs) {
+			const resolved = normalizeResolvedMessageGuid(await resolver({
+				dbPath: params.dbPath,
+				target: params.target,
+				text: params.text,
+				sentAfterMs: params.sentAfterMs
+			}));
+			if (resolved) return resolved;
+			if (Date.now() >= deadlineMs) return null;
+			await sleep(250);
+		}
+		return null;
+	};
+	if (params.resolveSentMessageGuidImpl) return await poll(params.resolveSentMessageGuidImpl);
+	if (!dbPath) return null;
+	return await withIMessageReceiptGuidReader(dbPath, (read) => poll(({ target, text, sentAfterMs }) => read({
+		type: "latestSentGuid",
+		input: {
+			target,
+			text,
+			sentAfterMs
+		}
+	})));
 }
 function shouldRecoverApprovalPromptGuid(params) {
 	return Boolean(params.approvalPrompt && !params.filePath && !params.replyToId);
@@ -781,30 +768,10 @@ function resolveIMessageSendFailure(result) {
 	if (result.success !== false) return null;
 	return typeof result.error === "string" && result.error.trim() ? result.error.trim() : "iMessage action failed";
 }
-function normalizeIMessageRpcSendError(error) {
-	if (!(error instanceof IMessageRpcRequestError)) return error;
-	const data = asOptionalRecord(error.data);
-	return data?.disposition === "not_started" && data.retry_safe === true ? new PlatformMessageNotDispatchedError(error.message, { cause: error }) : error;
-}
-async function requestIMessageRpcSend(client, method, params, timeoutMs) {
-	try {
-		return await client.request(method, params, { timeoutMs });
-	} catch (error) {
-		throw normalizeIMessageRpcSendError(error);
-	}
-}
 function isIMessageRpcSendTimeout(error) {
 	const message = error instanceof Error ? error.message : String(error);
 	return /imsg rpc timeout \(send\)/i.test(message);
 }
-async function runIMessageCliJson(cliPath, dbPath, args, timeoutMs) {
-	return await runIMessageCliJsonCommand({
-		args,
-		cliPath,
-		dbPath,
-		timeoutMs
-	});
-}
 function resultService(value) {
 	const normalized = normalizeOptionalString(value)?.toLowerCase();
 	return normalized === "imessage" || normalized === "sms" ? normalized : void 0;
@@ -868,6 +835,7 @@ async function trySendAttachmentForTarget(params) {
 		if (params.audioAsVoice) throw new Error("iMessage voice messages require an existing chat and bridge transport.");
 		return null;
 	}
+	params.assertDirectAdapterHandoff?.();
 	const echoScope = resolveOutboundEchoScope({
 		accountId: params.accountId,
 		target: params.target
@@ -875,7 +843,7 @@ async function trySendAttachmentForTarget(params) {
 	let result;
 	let pendingEchoKey;
 	try {
-		if (echoScope) pendingEchoKey = rememberPersistedIMessageEcho({
+		if (echoScope) pendingEchoKey = await rememberPersistedIMessageEcho({
 			scope: echoScope,
 			text: params.echoText,
 			media: params.echoMedia,
@@ -890,6 +858,7 @@ async function trySendAttachmentForTarget(params) {
 					remoteHost: params.remoteHost,
 					localPath: attachmentPath,
 					timeoutMs: params.timeoutMs,
+					assertDirectAdapterHandoff: params.assertDirectAdapterHandoff,
 					use: async (remotePath) => {
 						const rpcParams = {
 							file: remotePath,
@@ -903,6 +872,9 @@ async function trySendAttachmentForTarget(params) {
 					}
 				});
 			}
+			params.assertDirectAdapterHandoff?.();
+			await params.onPlatformSendDispatch?.();
+			params.assertDirectAdapterHandoff?.();
 			return await params.runCliJson([
 				"send-attachment",
 				"--chat",
@@ -916,14 +888,14 @@ async function trySendAttachmentForTarget(params) {
 			]);
 		});
 	} catch (error) {
-		forgetPersistedIMessageEchoKey(pendingEchoKey);
+		await forgetPersistedIMessageEchoKey(pendingEchoKey);
 		if (!params.audioAsVoice && isAttachmentCommandFallbackError(error)) return null;
 		throw error;
 	}
 	const failure = resolveIMessageSendFailure(result);
 	if (failure) {
 		const error = new Error(failure);
-		forgetPersistedIMessageEchoKey(pendingEchoKey);
+		await forgetPersistedIMessageEchoKey(pendingEchoKey);
 		if (!params.audioAsVoice && isAttachmentCommandFallbackError(error)) return null;
 		throw error;
 	}
@@ -935,13 +907,13 @@ async function trySendAttachmentForTarget(params) {
 		resolveMessageGuidImpl: params.resolveMessageGuidImpl
 	});
 	const messageId = resolvedId ?? (result.ok || result.success ? "ok" : "unknown");
-	if (echoScope) rememberPersistedIMessageEcho({
+	if (echoScope) await rememberPersistedIMessageEcho({
 		scope: echoScope,
 		text: params.echoText,
 		media: params.echoMedia,
 		messageId: resolvedId ?? void 0
 	});
-	if (resolvedId && isConcreteIMessageMessageId(resolvedId)) rememberIMessageReplyCache({
+	if (resolvedId && isConcreteIMessageMessageId(resolvedId)) await rememberIMessageReplyCache({
 		accountId: params.accountId,
 		messageId: resolvedId,
 		chatGuid: params.target.kind === "chat_guid" ? params.target.chatGuid : params.target.kind === "chat_id" ? attachmentChatTarget : void 0,
@@ -966,6 +938,7 @@ async function trySendAttachmentForTarget(params) {
 }
 async function sendMessageIMessage(to, text, opts) {
 	const cfg = requireRuntimeConfig(opts.config, "iMessage send");
+	opts.assertDirectAdapterHandoff?.();
 	const account = opts.account ?? resolveIMessageAccount({
 		cfg,
 		accountId: opts.accountId
@@ -976,6 +949,7 @@ async function sendMessageIMessage(to, text, opts) {
 		cliPath,
 		remoteHost: account.config.remoteHost
 	});
+	opts.assertDirectAdapterHandoff?.();
 	const chatDbLookupPath = resolveIMessageChatDbLookupPath({
 		cliPath,
 		dbPath,
@@ -984,7 +958,7 @@ async function sendMessageIMessage(to, text, opts) {
 	const target = parseIMessageTarget(opts.chatId ? formatIMessageChatTarget(opts.chatId) : to);
 	const service = opts.service ?? resolveTargetService(target) ?? account.config.service;
 	const sendTransport = account.config.sendTransport ?? "auto";
-	const resolvedReplyToId = resolveAuthorizedIMessageReplyReference({
+	const resolvedReplyToId = await resolveAuthorizedIMessageReplyReference({
 		account,
 		target,
 		cliPath,
@@ -1001,6 +975,7 @@ async function sendMessageIMessage(to, text, opts) {
 		replyToId: opts.replyToId,
 		conversationReadOrigin: opts.conversationReadOrigin
 	});
+	opts.assertDirectAdapterHandoff?.();
 	const timeoutMs = opts.timeoutMs ?? Math.max(account.config.probeTimeoutMs ?? 0, 18e4);
 	const pendingEchoTtlMs = resolvePendingPersistedEchoTtlMs(timeoutMs);
 	const region = opts.region?.trim() || account.config.region?.trim() || "US";
@@ -1021,6 +996,7 @@ async function sendMessageIMessage(to, text, opts) {
 		});
 		filePath = resolved.path;
 		mediaContentType = resolved.contentType ?? void 0;
+		opts.assertDirectAdapterHandoff?.();
 	}
 	if (!message.trim() && !filePath) throw new Error("iMessage send requires text or media");
 	if (message.trim()) {
@@ -1046,8 +1022,18 @@ async function sendMessageIMessage(to, text, opts) {
 	const echoText = resolveOutboundEchoText(message);
 	const echoMedia = filePath ? resolveOutboundEchoMedia(mediaContentType) : void 0;
 	let effectiveReplyToId = resolvedReplyToId;
-	const runCliJson = opts.runCliJson ?? ((args) => runIMessageCliJson(cliPath, dbPath, args, timeoutMs));
+	const runCli = opts.runCliJson ?? ((args) => runIMessageCliJsonCommand({
+		args,
+		cliPath,
+		dbPath,
+		timeoutMs
+	}));
+	const runCliJson = async (args) => {
+		opts.assertDirectAdapterHandoff?.();
+		return await runCli(args);
+	};
 	const requestOwnedRpc = async (method, rpcParams) => {
+		opts.assertDirectAdapterHandoff?.();
 		const rpcClient = opts.createClient ? await opts.createClient({
 			cliPath,
 			dbPath,
@@ -1058,7 +1044,7 @@ async function sendMessageIMessage(to, text, opts) {
 			remoteHost
 		});
 		try {
-			return await requestIMessageRpcSend(rpcClient, method, rpcParams, timeoutMs);
+			return await requestIMessageRpcSend(rpcClient, method, rpcParams, timeoutMs, opts);
 		} finally {
 			await rpcClient.stop();
 		}
@@ -1081,7 +1067,9 @@ async function sendMessageIMessage(to, text, opts) {
 			runCliJson,
 			requestRpc: requestOwnedRpc,
 			withRemoteFile,
-			resolveMessageGuidImpl: opts.resolveMessageGuidImpl
+			resolveMessageGuidImpl: opts.resolveMessageGuidImpl,
+			assertDirectAdapterHandoff: opts.assertDirectAdapterHandoff,
+			onPlatformSendDispatch: opts.onPlatformSendDispatch
 		});
 		if (attachmentResult) {
 			if (!message.trim()) return attachmentResult;
@@ -1138,6 +1126,7 @@ async function sendMessageIMessage(to, text, opts) {
 		accountId: account.accountId,
 		target
 	});
+	opts.assertDirectAdapterHandoff?.();
 	const client = opts.client ?? (opts.createClient ? await opts.createClient({
 		cliPath,
 		dbPath,
@@ -1148,19 +1137,14 @@ async function sendMessageIMessage(to, text, opts) {
 		remoteHost
 	}));
 	const shouldClose = !opts.client;
-	let closedClient = false;
-	const stopOwnedClient = async () => {
-		if (!shouldClose || closedClient) return;
-		closedClient = true;
-		await client.stop();
-	};
 	const requestSuccessfulSend = async (sendParams) => {
-		const request = async (nativeParams) => await requestIMessageRpcSend(client, "send", nativeParams, timeoutMs);
+		const request = async (nativeParams) => await requestIMessageRpcSend(client, "send", nativeParams, timeoutMs, opts);
 		const response = filePath ? await withOriginalIMessageAttachmentPath(filePath, async (attachmentPath) => {
 			if (remoteHost) return await withRemoteFile({
 				remoteHost,
 				localPath: attachmentPath,
 				timeoutMs,
+				assertDirectAdapterHandoff: opts.assertDirectAdapterHandoff,
 				use: async (remotePath) => request({
 					...sendParams,
 					file: remotePath
@@ -1180,7 +1164,7 @@ async function sendMessageIMessage(to, text, opts) {
 	let pendingEchoKey;
 	try {
 		try {
-			if (echoScope) pendingEchoKey = rememberPersistedIMessageEcho({
+			if (echoScope) pendingEchoKey = await rememberPersistedIMessageEcho({
 				scope: echoScope,
 				text: echoText,
 				media: echoMedia,
@@ -1237,7 +1221,7 @@ async function sendMessageIMessage(to, text, opts) {
 			sentAfterMs: sendStartedAtMs,
 			resolveSentMessageGuidImpl: opts.resolveSentMessageGuidImpl
 		});
-		if (echoScope) rememberPersistedIMessageEcho({
+		if (echoScope) await rememberPersistedIMessageEcho({
 			scope: echoScope,
 			text: echoText,
 			media: echoMedia,
@@ -1247,7 +1231,7 @@ async function sendMessageIMessage(to, text, opts) {
 		const confirmedService = resolveIMessageDirectChatService(resultService(result.service) ?? service, providerChatGuid);
 		if (resolvedId && isConcreteIMessageMessageId(resolvedId)) {
 			const chatContext = chatContextFromIMessageTarget(target, confirmedService ?? service);
-			rememberIMessageReplyCache({
+			await rememberIMessageReplyCache({
 				accountId: account.accountId,
 				messageId: resolvedId,
 				...chatContext,
@@ -1264,7 +1248,7 @@ async function sendMessageIMessage(to, text, opts) {
 				...target.kind === "chat_id" ? { chatId: target.chatId } : {},
 				...handleForKey ? { handle: handleForKey } : {}
 			};
-			registerIMessageApprovalReactionTarget({
+			await registerIMessageApprovalReactionTarget({
 				accountId: account.accountId,
 				conversation,
 				messageId: approvalBindingMessageId,
@@ -1289,10 +1273,10 @@ async function sendMessageIMessage(to, text, opts) {
 			})
 		};
 	} catch (error) {
-		forgetPersistedIMessageEchoKey(pendingEchoKey);
+		await forgetPersistedIMessageEchoKey(pendingEchoKey);
 		throw error;
 	} finally {
-		await stopOwnedClient();
+		if (shouldClose) await client.stop();
 	}
 }
 //#endregion

package/dist/{state-migrations-D-fyHVcb.js → .setup/state-migrations-CIwg07l5.mjs}

@@ -1,8 +1,8 @@
-import { a as resolveDefaultIMessageAccountId, i as listIMessageAccountIds, o as resolveIMessageAccount } from "./accounts-CCirBEIm.js";
-import { a as IMESSAGE_REPLY_CACHE_NAMESPACE, c as IMESSAGE_SENT_ECHOES_TTL_MS, f as resolveIMessageReplyCacheEntryKey, i as IMESSAGE_REPLY_CACHE_MAX_ENTRIES, l as capFailureRetriesMap, n as IMESSAGE_REPLY_CACHE_COUNTER_KEY, o as IMESSAGE_REPLY_CACHE_TTL_MS, p as resolveIMessageSentEchoEntryKey, r as IMESSAGE_REPLY_CACHE_COUNTER_NAMESPACE, s as IMESSAGE_SENT_ECHOES_NAMESPACE, t as IMESSAGE_CATCHUP_CURSOR_NAMESPACE, u as resolveIMessageCatchupCursorKey } from "./state-contract-DvahEY4X.js";
+import { a as resolveDefaultIMessageAccountId, i as listIMessageAccountIds, o as resolveIMessageAccount } from "./accounts-Dv0uksBG.mjs";
+import { a as IMESSAGE_REPLY_CACHE_NAMESPACE, c as IMESSAGE_SENT_ECHOES_TTL_MS, f as resolveIMessageReplyCacheEntryKey, i as IMESSAGE_REPLY_CACHE_MAX_ENTRIES, l as capFailureRetriesMap, n as IMESSAGE_REPLY_CACHE_COUNTER_KEY, o as IMESSAGE_REPLY_CACHE_TTL_MS, p as resolveIMessageSentEchoEntryKey, r as IMESSAGE_REPLY_CACHE_COUNTER_NAMESPACE, s as IMESSAGE_SENT_ECHOES_NAMESPACE, t as IMESSAGE_CATCHUP_CURSOR_NAMESPACE, u as resolveIMessageCatchupCursorKey } from "./state-contract-DvahEY4X.mjs";
+import { asFiniteNumber, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs";
 import path from "node:path";
-import { asFiniteNumber, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import { fileExists } from "openclaw/plugin-sdk/file-access-runtime";
 import { resolveStateDir } from "openclaw/plugin-sdk/state-paths";