@openclaw/imessage 2026.10.10 → 2026.11.5-beta.1

package/dist/.setup/{sanitize-outbound-C02fJrn6.mjs → sanitize-outbound-Dhjhz0a-.mjs}

@@ -35,11 +35,23 @@ const IMESSAGE_STYLE_MAP = {
 	underline: "underline",
 	strikethrough: "strikethrough"
 };
-function codeDelimiter(content) {
-	const longestRun = Math.max(0, ...[...content.matchAll(/`+/gu)].map((match) => match[0].length));
-	return "`".repeat(longestRun + 1);
-}
-function restoreCodeMarkers(text, ranges, codeRanges) {
+function extractMarkdownFormatRuns(input) {
+	const ir = markdownToIR(input, {
+		autolink: false,
+		enableHtmlUnderline: true,
+		headingStyle: "rich",
+		linkify: false,
+		preserveDunderIdentifiers: true,
+		preserveSourceBlockSpacing: true
+	});
+	const rendered = renderMarkdownWithAttributedRanges(ir, { styleMap: IMESSAGE_STYLE_MAP }, IMESSAGE_FORMAT_PROFILE);
+	const codeRanges = ir.styles.some((span) => span.style === "code") ? renderMarkdownWithAttributedRanges(ir, { styleMap: { code: "code" } }, IMESSAGE_CODE_PROFILE).ranges : [];
+	const text = rendered.text;
+	const ranges = rendered.ranges.map(({ start, length, style }) => ({
+		start,
+		length,
+		styles: [style]
+	}));
 	if (codeRanges.length === 0) return {
 		text,
 		ranges
@@ -47,7 +59,8 @@ function restoreCodeMarkers(text, ranges, codeRanges) {
 	const edits = codeRanges.map((range) => {
 		const end = range.start + range.length;
 		const content = text.slice(range.start, end);
-		const marker = codeDelimiter(content);
+		const longestRun = Math.max(0, ...[...content.matchAll(/`+/gu)].map((match) => match[0].length));
+		const marker = "`".repeat(longestRun + 1);
 		const padding = content.startsWith("`") || content.endsWith("`") ? " " : "";
 		return {
 			start: range.start,
@@ -55,36 +68,19 @@ function restoreCodeMarkers(text, ranges, codeRanges) {
 			text: `${marker}${padding}${content}${padding}${marker}`
 		};
 	});
-	const { text: rendered, mapOffset } = applyMarkdownTextEdits(text, edits);
+	const { text: restoredText, mapOffset } = applyMarkdownTextEdits(text, edits);
 	return {
-		text: rendered,
+		text: restoredText,
 		ranges: ranges.map((range) => {
 			const start = mapOffset(range.start);
 			return {
-				...range,
 				start,
-				length: mapOffset(range.start + range.length) - start
+				length: mapOffset(range.start + range.length) - start,
+				styles: range.styles
 			};
 		})
 	};
 }
-function extractMarkdownFormatRuns(input) {
-	const ir = markdownToIR(input, {
-		autolink: false,
-		enableHtmlUnderline: true,
-		headingStyle: "rich",
-		linkify: false,
-		preserveDunderIdentifiers: true,
-		preserveSourceBlockSpacing: true
-	});
-	const rendered = renderMarkdownWithAttributedRanges(ir, { styleMap: IMESSAGE_STYLE_MAP }, IMESSAGE_FORMAT_PROFILE);
-	const codeRanges = ir.styles.some((span) => span.style === "code") ? renderMarkdownWithAttributedRanges(ir, { styleMap: { code: "code" } }, IMESSAGE_CODE_PROFILE).ranges : [];
-	return restoreCodeMarkers(rendered.text, rendered.ranges.map(({ start, length, style }) => ({
-		start,
-		length,
-		styles: [style]
-	})), codeRanges);
-}
 // extensions/imessage/src/monitor/sanitize-outbound.ts
 /**
 * Patterns that indicate assistant-internal metadata leaked into text.

package/dist/.setup/{send-D98hQFdv.mjs → send-DhEW0gfe.mjs}

@@ -1,26 +1,26 @@
-import { c as parseIMessageTarget, o as normalizeIMessageHandle, t as formatIMessageChatTarget } from "./targets-CIx4BKqL.mjs";
-import { d as resolveIMessageChatDbLookupPath, l as resolveIMessageRemoteHost, n as hasExclusiveIMessageLocalDatabase, o as resolveIMessageAccount } from "./accounts-BH0coL46.mjs";
-import { S as resolveIMessageDirectChatService, d as IMESSAGE_SENT_ECHOES_NAMESPACE, f as IMESSAGE_SENT_ECHOES_TTL_MS, g as resolveIMessageSentEchoEntryKey, h as resolveIMessageEchoMediaKey, n as createIMessageRpcClient, r as runIMessageCliJsonCommand, s as rememberIMessageReplyCache, t as IMessageRpcRequestError, y as chatContextFromIMessageTarget } from "./client-C3e7ZLqA.mjs";
-import { a as normalizeIMessageMessageId, i as normalizeIMessageGuid } from "./actions-CW7XYYF4.mjs";
-import { n as getOptionalIMessageRuntime, t as getIMessageRuntime } from "./runtime-BRQCPuAD.mjs";
-import { d as getIMessageApprovalApprovers, f as imessageApprovalAuth } from "./channel-6kcKpSRw.mjs";
-import { n as sanitizeIMessageFinalOutboundText, t as protectIMessageFencedRoleMarkers } from "./sanitize-outbound-C02fJrn6.mjs";
-import { a as withIMessageReceiptGuidReader, r as resolveAuthorizedIMessageReplyReference, t as withIMessageRemoteFile } from "./remote-file-CCgMYZ-u.mjs";
-import { d as resolveIMessageApprovalControlActor, i as registerIMessageApprovalReactionTarget, l as enumerateApprovalTargetKeys, s as buildIMessageApprovalConversationKeyForInbound, u as normalizeConversationKey } from "./approval-reactions-B9CJS0NT.mjs";
+import { l as parseIMessageTarget, n as iMessageTargetRpcParams, s as normalizeIMessageHandle, t as formatIMessageChatTarget } from "./targets-C7CIWJ0k.mjs";
+import { d as resolveIMessageChatDbLookupPath, l as resolveIMessageRemoteHost, n as hasExclusiveIMessageLocalDatabase, o as resolveIMessageAccount } from "./accounts-C1Ypv3Wn.mjs";
+import { a as resolveIMessageDirectChatService, t as chatContextFromIMessageTarget } from "./chat-context-fTfJVqAi.mjs";
+import { i as runIMessageCliJsonCommand, n as createIMessageRpcClient, t as IMessageRpcRequestError } from "./client-D_BaG8sC.mjs";
+import { a as rememberIMessageReplyCache, b as normalizeIMessageMessageId, g as getOptionalIMessageRuntime, h as getIMessageRuntime, l as IMESSAGE_SENT_ECHOES_NAMESPACE, m as resolveIMessageSentEchoEntryKey, p as resolveIMessageEchoMediaKey, u as IMESSAGE_SENT_ECHOES_TTL_MS, v as createPersistenceFailureReporter, y as normalizeIMessageGuid } from "./actions-qOuKy8To.mjs";
+import { d as getIMessageApprovalApprovers, f as imessageApprovalAuth } from "./channel-CLaN4mQn.mjs";
+import { n as sanitizeIMessageFinalOutboundText, t as protectIMessageFencedRoleMarkers } from "./sanitize-outbound-Dhjhz0a-.mjs";
+import { a as withIMessageReceiptGuidReader, r as resolveAuthorizedIMessageReplyReference, t as withIMessageRemoteFile } from "./remote-file-DpK3GQFD.mjs";
+import { d as resolveIMessageApprovalControlActor, l as enumerateApprovalTargetKeys, r as registerIMessageApprovalReactionTarget, s as buildIMessageApprovalConversationKeyForInbound, u as normalizeConversationKey } from "./approval-reactions-DBBsqbRC.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 { extractOriginalFilename, kindFromMime, resolveOutboundAttachmentFromUrl } from "openclaw/plugin-sdk/media-runtime";
-import { logVerbose, sleep } from "openclaw/plugin-sdk/runtime-env";
-import { asDateTimestampMs } from "openclaw/plugin-sdk/number-runtime";
+import { sleep } from "openclaw/plugin-sdk/runtime-env";
 import { PlatformMessageNotDispatchedError, isApprovalNotFoundError } from "openclaw/plugin-sdk/error-runtime";
 import { captureChannelReadAuthority, captureEffectAuthority } from "openclaw/plugin-sdk/fetch-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 { resolvePreferredOpenClawTmpDir, withTempWorkspace } from "openclaw/plugin-sdk/temp-path";
+import { asDateTimestampMs } from "openclaw/plugin-sdk/number-runtime";
 import { createPluginStateErrorReporter } from "openclaw/plugin-sdk/plugin-state-runtime";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
@@ -313,7 +313,6 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 			channel: "imessage",
 			accountId: params.accountId,
 			senderId: event.actorHandle,
-			gatewayUrl: params.gatewayUrl,
 			...params.gatewayRuntime ? { gatewayRuntime: params.gatewayRuntime } : {}
 		});
 		await unregisterIMessageApprovalPollTarget({
@@ -345,16 +344,10 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 		throw error;
 	}
 }
-function clearIMessageApprovalPollTargetsForTest() {
-	pollTargets.clearForTest();
-	pollTombstones.clearForTest();
-	loadResolveApprovalOverGateway.clear();
-}
 const iMessageApprovalPollTargets = {
 	register: registerIMessageApprovalPollTarget,
 	unregister: unregisterIMessageApprovalPollTarget,
-	registerTombstone: registerIMessageApprovalPollTombstone,
-	clearForTest: clearIMessageApprovalPollTargetsForTest
+	registerTombstone: registerIMessageApprovalPollTombstone
 };
 // extensions/imessage/src/monitor/echo-text-corruption.ts
 function isLeadingEchoTextCorruptionMarker(code) {
@@ -368,12 +361,7 @@ function normalizeIMessageEchoText(text) {
 	return normalized.slice(offset).trim() || void 0;
 }
 // extensions/imessage/src/monitor/persisted-echo-cache.ts
-let persistenceFailureLogged = false;
-function reportFailure(scope, err) {
-	if (persistenceFailureLogged) return;
-	persistenceFailureLogged = true;
-	logVerbose(`imessage echo-cache: ${scope} disabled after first failure: ${String(err)}`);
-}
+const reportFailure = createPersistenceFailureReporter("echo-cache");
 function normalizeMedia(media) {
 	if (!resolveIMessageEchoMediaKey(media)) return;
 	const contentType = media?.contentType?.trim().toLowerCase() || void 0;
@@ -393,28 +381,23 @@ function remainingTtlMs(timestamp) {
 	const remaining = IMESSAGE_SENT_ECHOES_TTL_MS - Math.max(0, Date.now() - timestamp);
 	return remaining > 0 ? remaining : void 0;
 }
-function resolveEntryTtlMs(entry, ttlMs) {
-	if (typeof ttlMs === "number" && Number.isFinite(ttlMs) && ttlMs > 0) return ttlMs;
-	return remainingTtlMs(entry.timestamp);
-}
 function isLiveEntry(entry, now = Date.now()) {
 	const cutoff = now - IMESSAGE_SENT_ECHOES_TTL_MS;
 	return entry.timestamp >= cutoff && (entry.expiresAt == null || entry.expiresAt > now);
 }
 async function readRecentEntries() {
 	try {
-		return (await 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));
 	} catch (err) {
 		reportFailure("read", err);
 		return [];
 	}
 }
 async function persistEntry(entry, ttlMs) {
-	const effectiveTtlMs = resolveEntryTtlMs(entry, ttlMs);
-	if (!effectiveTtlMs) return;
+	if (!ttlMs) return;
 	const key = resolveIMessageSentEchoEntryKey(entry);
 	try {
-		await openPersistedEchoStore().register(key, entry, { ttlMs: effectiveTtlMs });
+		await openPersistedEchoStore().register(key, entry, { ttlMs });
 	} catch (err) {
 		reportFailure("write", err);
 		return;
@@ -433,9 +416,10 @@ async function rememberPersistedIMessageEcho(params) {
 		...messageId ? { messageId } : {},
 		...params.pending ? { pending: true } : {}
 	};
-	if (typeof params.ttlMs === "number" && Number.isFinite(params.ttlMs) && params.ttlMs > 0) entry.expiresAt = entry.timestamp + params.ttlMs;
+	const ttlMs = typeof params.ttlMs === "number" && Number.isFinite(params.ttlMs) && params.ttlMs > 0 ? params.ttlMs : void 0;
+	if (ttlMs !== void 0) entry.expiresAt = entry.timestamp + ttlMs;
 	if (!entry.text && !entry.media && !entry.messageId) return;
-	return await persistEntry(entry, params.ttlMs);
+	return await persistEntry(entry, ttlMs ?? remainingTtlMs(entry.timestamp));
 }
 async function forgetPersistedIMessageEchoKey(key) {
 	if (!key) return;
@@ -463,14 +447,13 @@ async function hasPersistedIMessageEcho(params) {
 function bindIMessageCliSend(handoff, options) {
 	const effect = captureEffectAuthority();
 	const assertReadAuthority = captureChannelReadAuthority();
-	const runCli = handoff.runCliJson ?? ((args) => runIMessageCliJsonCommand({
-		...options,
-		args
-	}));
 	return (args) => effect.initiate(() => {
 		assertReadAuthority?.();
 		handoff.assertDirectAdapterHandoff?.();
-		return runCli(args);
+		return runIMessageCliJsonCommand({
+			...options,
+			args
+		});
 	});
 }
 function normalizeIMessageRpcSendError(error) {
@@ -517,74 +500,25 @@ function canResolveLatestSentMessageGuidFromChatDb(dbPath) {
 		return false;
 	}
 }
-async function resolveApprovalBindingMessageGuid(params) {
-	for (const key of [
-		"messageGuid",
-		"guid",
-		"messageId",
-		"message_id",
-		"id"
-	]) {
-		const guid = normalizeResolvedMessageGuid(params.result?.[key]);
-		if (guid) return guid;
-	}
-	const messageId = params.messageId?.trim();
-	if (!messageId || !isNumericMessageRowId(messageId)) return null;
-	if (params.resolveMessageGuidImpl) return normalizeResolvedMessageGuid(await params.resolveMessageGuidImpl({
-		dbPath: params.dbPath,
-		messageId
-	}));
-	const dbPath = params.dbPath?.trim();
-	return dbPath ? normalizeResolvedMessageGuid(await withIMessageReceiptGuidReader(dbPath, (read) => read({
-		type: "messageGuid",
-		input: { messageId }
-	}))) : null;
-}
 async function resolveFallbackSentMessageGuid(params) {
 	const dbPath = params.dbPath?.trim();
-	if (!params.resolveSentMessageGuidImpl && !canResolveLatestSentMessageGuidFromChatDb(dbPath)) return null;
+	if (!dbPath || !canResolveLatestSentMessageGuidFromChatDb(dbPath)) return null;
 	const deadlineMs = Date.now() + 5e3;
-	const poll = async (resolver) => {
+	return await withIMessageReceiptGuidReader(dbPath, async (read) => {
 		while (Date.now() <= deadlineMs) {
-			const resolved = normalizeResolvedMessageGuid(await resolver({
-				dbPath: params.dbPath,
-				target: params.target,
-				text: params.text,
-				sentAfterMs: params.sentAfterMs
+			const resolved = normalizeResolvedMessageGuid(await read({
+				type: "latestSentGuid",
+				input: {
+					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 createIMessageSendReceipt(params) {
-	const messageId = params.messageId.trim();
-	const results = normalizeIMessageMessageId(messageId) ? [{
-		channel: "imessage",
-		messageId,
-		meta: { targetKind: params.target.kind }
-	}] : [];
-	if (results[0]) {
-		if (params.target.kind === "chat_id") results[0].chatId = String(params.target.chatId);
-		else if (params.target.kind === "chat_guid") results[0].conversationId = params.target.chatGuid;
-		else if (params.target.kind === "chat_identifier") results[0].conversationId = params.target.chatIdentifier;
-	}
-	return createMessageReceiptFromOutboundResults({
-		results,
-		kind: params.kind,
-		...params.replyToId ? { replyToId: params.replyToId } : {}
 	});
 }
 async function withOriginalIMessageAttachmentPath(filePath, send) {
@@ -595,12 +529,6 @@ async function withOriginalIMessageAttachmentPath(filePath, send) {
 		prefix: "openclaw-imessage-outbound-"
 	}, async (workspace) => await send(await workspace.copyIn(filename, filePath)));
 }
-function resolveOutboundEchoScope(params) {
-	if (params.target.kind === "chat_id") return `${params.accountId}:${formatIMessageChatTarget(params.target.chatId)}`;
-	if (params.target.kind === "chat_guid") return `${params.accountId}:chat_guid:${params.target.chatGuid}`;
-	if (params.target.kind === "chat_identifier") return `${params.accountId}:chat_identifier:${params.target.chatIdentifier}`;
-	return `${params.accountId}:imessage:${params.target.to}`;
-}
 function resolveIMessageSendFailure(result) {
 	if (result.success !== false) return null;
 	return typeof result.error === "string" && result.error.trim() ? result.error.trim() : "iMessage action failed";
@@ -664,7 +592,7 @@ async function sendMessageIMessage(to, text, opts) {
 	const timeoutMs = opts.timeoutMs ?? Math.max(account.config.probeTimeoutMs ?? 0, 18e4);
 	const pendingEchoTtlMs = Math.max(MIN_PENDING_PERSISTED_ECHO_TTL_MS, Math.max(0, timeoutMs) + PENDING_PERSISTED_ECHO_GRACE_MS);
 	const region = opts.region?.trim() || account.config.region?.trim() || "US";
-	const maxBytes = typeof opts.maxBytes === "number" ? opts.maxBytes : typeof account.config.mediaMaxMb === "number" ? account.config.mediaMaxMb * 1024 * 1024 : 16777216;
+	const maxBytes = opts.maxBytes ?? (account.config.mediaMaxMb ?? 16) * 1024 * 1024;
 	let message = opts.approvalPrompt ? addApprovalReactionHintToText({
 		text,
 		allowedDecisions: opts.approvalPrompt.allowedDecisions
@@ -674,7 +602,7 @@ async function sendMessageIMessage(to, text, opts) {
 	let filePath;
 	let mediaContentType;
 	if (opts.mediaUrl?.trim()) {
-		const resolved = await (opts.resolveAttachmentImpl ?? resolveOutboundAttachmentFromUrl)(opts.mediaUrl.trim(), maxBytes, {
+		const resolved = await resolveOutboundAttachmentFromUrl(opts.mediaUrl.trim(), maxBytes, {
 			mediaAccess: opts.mediaAccess,
 			localRoots: opts.mediaLocalRoots,
 			readFile: opts.mediaReadFile
@@ -717,7 +645,7 @@ async function sendMessageIMessage(to, text, opts) {
 	});
 	const requestOwnedRpc = async (method, rpcParams) => {
 		opts.assertDirectAdapterHandoff?.();
-		const rpcClient = await (opts.createClient ?? createIMessageRpcClient)({
+		const rpcClient = await createIMessageRpcClient({
 			cliPath,
 			dbPath,
 			remoteHost
@@ -728,10 +656,109 @@ async function sendMessageIMessage(to, text, opts) {
 			await rpcClient.stop();
 		}
 	};
-	const withRemoteFile = opts.withRemoteFile ?? withIMessageRemoteFile;
+	const echoScope = target.kind === "chat_id" ? `${account.accountId}:${formatIMessageChatTarget(target.chatId)}` : target.kind === "chat_guid" ? `${account.accountId}:chat_guid:${target.chatGuid}` : target.kind === "chat_identifier" ? `${account.accountId}:chat_identifier:${target.chatIdentifier}` : `${account.accountId}:imessage:${target.to}`;
+	async function recordAcceptedSend(result, delivery) {
+		const isMessage = delivery.kind === "message";
+		const resolvedId = resolveMessageId(result);
+		const messageId = resolvedId ?? (result.ok || result.success || isMessage && result.status === "sent" ? "ok" : "unknown");
+		let guid = null;
+		for (const key of [
+			"messageGuid",
+			"guid",
+			"messageId",
+			"message_id",
+			"id"
+		]) {
+			guid = normalizeResolvedMessageGuid(result[key]);
+			if (guid) break;
+		}
+		if (!guid) {
+			const rowId = resolvedId?.trim();
+			if (rowId && isNumericMessageRowId(rowId)) {
+				const lookupPath = chatDbLookupPath?.trim();
+				if (lookupPath) guid = normalizeResolvedMessageGuid(await withIMessageReceiptGuidReader(lookupPath, (read) => read({
+					type: "messageGuid",
+					input: { messageId: rowId }
+				})));
+			}
+		}
+		if (!guid && isMessage && opts.approvalPrompt && !filePath && !effectiveReplyToId) guid = await resolveFallbackSentMessageGuid({
+			dbPath: chatDbLookupPath,
+			target,
+			text: message,
+			sentAfterMs: delivery.startedAtMs
+		});
+		await rememberPersistedIMessageEcho({
+			scope: echoScope,
+			text: isMessage ? echoText : void 0,
+			media: echoMedia,
+			messageId: resolvedId ?? void 0
+		});
+		const providerChatGuid = isMessage ? normalizeOptionalString(result.chat_guid) ?? normalizeOptionalString(result.chatGuid) : void 0;
+		const confirmedService = isMessage ? resolveIMessageDirectChatService(resultService(result.service) ?? service, providerChatGuid) : void 0;
+		if (resolvedId && normalizeIMessageMessageId(resolvedId)) {
+			const chatContext = isMessage ? {
+				...chatContextFromIMessageTarget(target, confirmedService ?? service),
+				...providerChatGuid ? { chatGuid: providerChatGuid } : {}
+			} : {
+				chatGuid: target.kind === "chat_guid" ? target.chatGuid : target.kind === "chat_id" ? delivery.chatTarget : void 0,
+				chatIdentifier: target.kind === "chat_identifier" || target.kind === "handle" ? delivery.chatTarget : void 0,
+				chatId: target.kind === "chat_id" ? target.chatId : void 0
+			};
+			await rememberIMessageReplyCache({
+				accountId: account.accountId,
+				messageId: resolvedId,
+				...chatContext,
+				timestamp: Date.now(),
+				isFromMe: true
+			});
+		}
+		if (isMessage && message && guid && opts.approvalPrompt) {
+			const handle = target.kind === "handle" ? normalizeIMessageHandle(target.to) : void 0;
+			const conversation = {
+				...target.kind === "chat_guid" ? { chatGuid: target.chatGuid } : {},
+				...target.kind === "chat_identifier" ? { chatIdentifier: target.chatIdentifier } : {},
+				...target.kind === "chat_id" ? { chatId: target.chatId } : {},
+				...handle ? { handle } : {}
+			};
+			await registerIMessageApprovalReactionTarget({
+				accountId: account.accountId,
+				conversation,
+				messageId: guid,
+				approvalId: opts.approvalPrompt.approvalId,
+				approvalKind: opts.approvalPrompt.approvalKind,
+				allowedDecisions: opts.approvalPrompt.allowedDecisions
+			});
+		}
+		const replyToId = isMessage ? effectiveReplyToId : resolvedReplyToId;
+		const receiptMessageId = messageId.trim();
+		const results = normalizeIMessageMessageId(receiptMessageId) ? [{
+			channel: "imessage",
+			messageId: receiptMessageId,
+			meta: { targetKind: target.kind }
+		}] : [];
+		if (results[0]) {
+			if (target.kind === "chat_id") results[0].chatId = String(target.chatId);
+			else if (target.kind === "chat_guid") results[0].conversationId = target.chatGuid;
+			else if (target.kind === "chat_identifier") results[0].conversationId = target.chatIdentifier;
+		}
+		return {
+			messageId,
+			...guid ? { guid } : {},
+			...confirmedService ? { service: confirmedService } : {},
+			...providerChatGuid ? { chatGuid: providerChatGuid } : {},
+			sentText: isMessage ? message : "",
+			...isMessage && echoText ? { echoText } : {},
+			...echoMedia ? { echoMedia } : {},
+			receipt: createMessageReceiptFromOutboundResults({
+				results,
+				kind: isMessage ? filePath ? "media" : "text" : delivery.audioAsVoice ? "voice" : "media",
+				...replyToId ? { replyToId } : {}
+			})
+		};
+	}
 	async function trySendAttachment(attachmentFilePath) {
-		const { audioAsVoice, resolveMessageGuidImpl, assertDirectAdapterHandoff, onPlatformSendDispatch } = opts;
-		const accountId = account.accountId;
+		const { audioAsVoice, assertDirectAdapterHandoff, onPlatformSendDispatch } = opts;
 		if (audioAsVoice && sendTransport === "applescript") throw new Error("iMessage voice messages require bridge transport; AppleScript cannot send native voice notes. Set sendTransport to bridge or auto.");
 		if (target.kind === "handle" && !audioAsVoice && sendTransport !== "bridge" && (service === "sms" || service === "imessage")) return null;
 		if (remoteHost && sendTransport === "applescript") return null;
@@ -763,10 +790,6 @@ async function sendMessageIMessage(to, text, opts) {
 			return null;
 		}
 		assertDirectAdapterHandoff?.();
-		const echoScope = resolveOutboundEchoScope({
-			accountId,
-			target
-		});
 		let result;
 		let pendingEchoKey;
 		try {
@@ -777,7 +800,7 @@ async function sendMessageIMessage(to, text, opts) {
 				pending: true
 			});
 			result = await withOriginalIMessageAttachmentPath(attachmentFilePath, async (attachmentPath) => {
-				if (remoteHost) return await withRemoteFile({
+				if (remoteHost) return await withIMessageRemoteFile({
 					remoteHost,
 					localPath: attachmentPath,
 					timeoutMs,
@@ -816,40 +839,11 @@ async function sendMessageIMessage(to, text, opts) {
 			if (!audioAsVoice && isAttachmentCommandFallbackError(error)) return null;
 			throw error;
 		}
-		const resolvedId = resolveMessageId(result);
-		const approvalBindingMessageId = await resolveApprovalBindingMessageGuid({
-			dbPath: chatDbLookupPath,
-			messageId: resolvedId,
-			result,
-			resolveMessageGuidImpl
+		return await recordAcceptedSend(result, {
+			kind: "attachment",
+			chatTarget: attachmentChatTarget,
+			audioAsVoice
 		});
-		const messageId = resolvedId ?? (result.ok || result.success ? "ok" : "unknown");
-		await rememberPersistedIMessageEcho({
-			scope: echoScope,
-			media: echoMedia,
-			messageId: resolvedId ?? void 0
-		});
-		if (resolvedId && normalizeIMessageMessageId(resolvedId)) await rememberIMessageReplyCache({
-			accountId,
-			messageId: resolvedId,
-			chatGuid: target.kind === "chat_guid" ? target.chatGuid : target.kind === "chat_id" ? attachmentChatTarget : void 0,
-			chatIdentifier: target.kind === "chat_identifier" || target.kind === "handle" ? attachmentChatTarget : void 0,
-			chatId: target.kind === "chat_id" ? target.chatId : void 0,
-			timestamp: Date.now(),
-			isFromMe: true
-		});
-		return {
-			messageId,
-			...approvalBindingMessageId ? { guid: approvalBindingMessageId } : {},
-			sentText: "",
-			...echoMedia ? { echoMedia } : {},
-			receipt: createIMessageSendReceipt({
-				messageId,
-				target,
-				kind: audioAsVoice ? "voice" : "media",
-				...resolvedReplyToId ? { replyToId: resolvedReplyToId } : {}
-			})
-		};
 	}
 	if (filePath && (!resolvedReplyToId || opts.audioAsVoice)) {
 		const attachmentResult = await trySendAttachment(filePath);
@@ -891,6 +885,7 @@ async function sendMessageIMessage(to, text, opts) {
 		}
 	}
 	const params = {
+		...iMessageTargetRpcParams(target),
 		text: message,
 		service: service || "auto",
 		region,
@@ -899,16 +894,8 @@ async function sendMessageIMessage(to, text, opts) {
 	if (resolvedReplyToId) params.reply_to = resolvedReplyToId;
 	if (formatted.ranges.length > 0) params.formatting = formatted.ranges;
 	if (filePath) params.file = filePath;
-	if (target.kind === "chat_id") params.chat_id = target.chatId;
-	else if (target.kind === "chat_guid") params.chat_guid = target.chatGuid;
-	else if (target.kind === "chat_identifier") params.chat_identifier = target.chatIdentifier;
-	else params.to = target.to;
-	const echoScope = resolveOutboundEchoScope({
-		accountId: account.accountId,
-		target
-	});
 	opts.assertDirectAdapterHandoff?.();
-	const client = opts.client ?? await (opts.createClient ?? createIMessageRpcClient)({
+	const client = opts.client ?? await createIMessageRpcClient({
 		cliPath,
 		dbPath,
 		remoteHost
@@ -917,7 +904,7 @@ async function sendMessageIMessage(to, text, opts) {
 	const requestSuccessfulSend = async (sendParams) => {
 		const request = async (nativeParams) => await requestIMessageRpcSend(client, "send", nativeParams, timeoutMs, opts);
 		const response = filePath ? await withOriginalIMessageAttachmentPath(filePath, async (attachmentPath) => {
-			if (remoteHost) return await withRemoteFile({
+			if (remoteHost) return await withIMessageRemoteFile({
 				remoteHost,
 				localPath: attachmentPath,
 				timeoutMs,
@@ -956,14 +943,13 @@ async function sendMessageIMessage(to, text, opts) {
 				result = await requestSuccessfulSend(plainParams);
 				effectiveReplyToId = void 0;
 			} else if (filePath || !isIMessageRpcSendTimeout(error)) throw error;
-			else if (!opts.approvalPrompt || resolvedReplyToId || !(opts.resolveSentMessageGuidImpl || canResolveLatestSentMessageGuidFromChatDb(chatDbLookupPath))) throw error;
+			else if (!opts.approvalPrompt || resolvedReplyToId || !canResolveLatestSentMessageGuidFromChatDb(chatDbLookupPath)) throw error;
 			else {
 				const recoveredGuid = await resolveFallbackSentMessageGuid({
 					dbPath: chatDbLookupPath,
 					target,
 					text: message,
-					sentAfterMs: sendStartedAtMs,
-					resolveSentMessageGuidImpl: opts.resolveSentMessageGuidImpl
+					sentAfterMs: sendStartedAtMs
 				});
 				if (recoveredGuid) result = {
 					guid: recoveredGuid,
@@ -972,72 +958,10 @@ async function sendMessageIMessage(to, text, opts) {
 				else throw error;
 			}
 		}
-		const resolvedId = resolveMessageId(result);
-		const messageId = resolvedId ?? (result?.ok || result?.success || result?.status === "sent" ? "ok" : "unknown");
-		let approvalBindingMessageId = await resolveApprovalBindingMessageGuid({
-			dbPath: chatDbLookupPath,
-			messageId: resolvedId,
-			result,
-			resolveMessageGuidImpl: opts.resolveMessageGuidImpl
-		});
-		if (!approvalBindingMessageId && opts.approvalPrompt && !filePath && !effectiveReplyToId) approvalBindingMessageId = await resolveFallbackSentMessageGuid({
-			dbPath: chatDbLookupPath,
-			target,
-			text: message,
-			sentAfterMs: sendStartedAtMs,
-			resolveSentMessageGuidImpl: opts.resolveSentMessageGuidImpl
-		});
-		await rememberPersistedIMessageEcho({
-			scope: echoScope,
-			text: echoText,
-			media: echoMedia,
-			messageId: resolvedId ?? void 0
+		return await recordAcceptedSend(result, {
+			kind: "message",
+			startedAtMs: sendStartedAtMs
 		});
-		const providerChatGuid = normalizeOptionalString(result.chat_guid) ?? normalizeOptionalString(result.chatGuid);
-		const confirmedService = resolveIMessageDirectChatService(resultService(result.service) ?? service, providerChatGuid);
-		if (resolvedId && normalizeIMessageMessageId(resolvedId)) {
-			const chatContext = chatContextFromIMessageTarget(target, confirmedService ?? service);
-			await rememberIMessageReplyCache({
-				accountId: account.accountId,
-				messageId: resolvedId,
-				...chatContext,
-				...providerChatGuid ? { chatGuid: providerChatGuid } : {},
-				timestamp: Date.now(),
-				isFromMe: true
-			});
-		}
-		if (message && approvalBindingMessageId && opts.approvalPrompt) {
-			const handleForKey = target.kind === "handle" ? normalizeIMessageHandle(target.to) : void 0;
-			const conversation = {
-				...target.kind === "chat_guid" ? { chatGuid: target.chatGuid } : {},
-				...target.kind === "chat_identifier" ? { chatIdentifier: target.chatIdentifier } : {},
-				...target.kind === "chat_id" ? { chatId: target.chatId } : {},
-				...handleForKey ? { handle: handleForKey } : {}
-			};
-			await registerIMessageApprovalReactionTarget({
-				accountId: account.accountId,
-				conversation,
-				messageId: approvalBindingMessageId,
-				approvalId: opts.approvalPrompt.approvalId,
-				approvalKind: opts.approvalPrompt.approvalKind,
-				allowedDecisions: opts.approvalPrompt.allowedDecisions
-			});
-		}
-		return {
-			messageId,
-			...approvalBindingMessageId ? { guid: approvalBindingMessageId } : {},
-			...confirmedService ? { service: confirmedService } : {},
-			...providerChatGuid ? { chatGuid: providerChatGuid } : {},
-			sentText: message,
-			...echoText ? { echoText } : {},
-			...echoMedia ? { echoMedia } : {},
-			receipt: createIMessageSendReceipt({
-				messageId,
-				target,
-				kind: filePath ? "media" : "text",
-				...effectiveReplyToId ? { replyToId: effectiveReplyToId } : {}
-			})
-		};
 	} catch (error) {
 		await forgetPersistedIMessageEchoKey(pendingEchoKey);
 		throw error;

package/dist/.setup/{setup-core-BWnW0czE.mjs → setup-core-B1_P_t4T.mjs}

@@ -1,5 +1,5 @@
-import { l as IMESSAGE_CHAT_TARGET_PREFIX_RE, o as normalizeIMessageHandle } from "./targets-CIx4BKqL.mjs";
-import { a as resolveDefaultIMessageAccountId, o as resolveIMessageAccount } from "./accounts-BH0coL46.mjs";
+import { s as normalizeIMessageHandle, u as IMESSAGE_CHAT_TARGET_PREFIX_RE } from "./targets-C7CIWJ0k.mjs";
+import { a as resolveDefaultIMessageAccountId, o as resolveIMessageAccount } from "./accounts-C1Ypv3Wn.mjs";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { parseAllowFromEntries } from "openclaw/plugin-sdk/allow-from";
 import { createChannelDmPolicy } from "openclaw/plugin-sdk/channel-dm-policy";