@openclaw/imessage 2026.10.1-beta.2 → 2026.10.5-beta.1

package/dist/.setup/{send-pkYwL6Rt.mjs → send-BZZzMbdi.mjs}

@@ -1,12 +1,12 @@
-import { c as parseIMessageTarget, o as normalizeIMessageHandle, t as formatIMessageChatTarget } from "./targets-BicBiYsM.mjs";
-import { d as resolveIMessageChatDbLookupPath, l as resolveIMessageRemoteHost, n as hasExclusiveIMessageLocalDatabase, o as resolveIMessageAccount } from "./accounts-evTpvJMv.mjs";
-import { C as resolveIMessageDirectChatService, _ as resolveIMessageSentEchoEntryKey, b as chatContextFromIMessageTarget, c as rememberIMessageReplyCache, f as IMESSAGE_SENT_ECHOES_NAMESPACE, g as resolveIMessageEchoMediaKey, n as createIMessageRpcClient, p as IMESSAGE_SENT_ECHOES_TTL_MS, r as runIMessageCliJsonCommand, t as IMessageRpcRequestError } from "./client-12apu4Ip.mjs";
-import { a as normalizeIMessageMessageId, i as normalizeIMessageGuid } from "./actions-DJqbUmbN.mjs";
+import { c as parseIMessageTarget, o as normalizeIMessageHandle, t as formatIMessageChatTarget } from "./targets-B4oU7n-v.mjs";
+import { d as resolveIMessageChatDbLookupPath, l as resolveIMessageRemoteHost, n as hasExclusiveIMessageLocalDatabase, o as resolveIMessageAccount } from "./accounts-DacCvDBt.mjs";
+import { C as resolveIMessageDirectChatService, _ as resolveIMessageSentEchoEntryKey, b as chatContextFromIMessageTarget, c as rememberIMessageReplyCache, f as IMESSAGE_SENT_ECHOES_NAMESPACE, g as resolveIMessageEchoMediaKey, n as createIMessageRpcClient, p as IMESSAGE_SENT_ECHOES_TTL_MS, r as runIMessageCliJsonCommand, t as IMessageRpcRequestError } from "./client-HixFQQWY.mjs";
+import { a as normalizeIMessageMessageId, i as normalizeIMessageGuid } from "./actions-Hxh12myO.mjs";
 import { n as getOptionalIMessageRuntime, t as getIMessageRuntime } from "./runtime-Cza4CY5T.mjs";
-import { d as getIMessageApprovalApprovers, f as imessageApprovalAuth } from "./channel-CL73qdMG.mjs";
-import { n as sanitizeIMessageFinalOutboundText, t as protectIMessageFencedRoleMarkers } from "./sanitize-outbound-C0x4BPky.mjs";
-import { a as withIMessageReceiptGuidReader, r as resolveAuthorizedIMessageReplyReference, t as withIMessageRemoteFile } from "./remote-file-BU7pA-Zi.mjs";
-import { d as normalizeConversationKey, i as registerIMessageApprovalReactionTarget, l as enumerateApprovalTargetKeys, s as buildIMessageApprovalConversationKeyForInbound, u as enumerateConversationKeyForms } from "./approval-reactions-L9Ul7PAu.mjs";
+import { d as getIMessageApprovalApprovers, f as imessageApprovalAuth } from "./channel-9TWBUDkP.mjs";
+import { n as sanitizeIMessageFinalOutboundText, t as protectIMessageFencedRoleMarkers } from "./sanitize-outbound-DpdQERYJ.mjs";
+import { a as withIMessageReceiptGuidReader, r as resolveAuthorizedIMessageReplyReference, t as withIMessageRemoteFile } from "./remote-file-Dq5Asi_F.mjs";
+import { d as normalizeConversationKey, f as resolveIMessageApprovalControlActor, i as registerIMessageApprovalReactionTarget, l as enumerateApprovalTargetKeys, s as buildIMessageApprovalConversationKeyForInbound, u as enumerateConversationKeyForms } from "./approval-reactions-JvzJCJ4a.mjs";
 import { asOptionalRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createMessageReceiptFromOutboundResults } from "openclaw/plugin-sdk/channel-outbound";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
@@ -17,6 +17,7 @@ import { extractOriginalFilename, kindFromMime, resolveOutboundAttachmentFromUrl
 import { logVerbose, sleep } from "openclaw/plugin-sdk/runtime-env";
 import { asDateTimestampMs } from "openclaw/plugin-sdk/number-runtime";
 import { PlatformMessageNotDispatchedError, isApprovalNotFoundError } from "openclaw/plugin-sdk/error-runtime";
+import { captureChannelReadAuthority, captureEffectAuthority } from "openclaw/plugin-sdk/fetch-runtime";
 import { racePromiseWithAbortSignal } from "openclaw/plugin-sdk/time-runtime";
 import { addApprovalReactionHintToText, createApprovalReactionTargetStore, listApprovalReactionBindings } from "openclaw/plugin-sdk/approval-reaction-runtime";
 import { convertMarkdownTables, stripInlineDirectiveTagsForDelivery } from "openclaw/plugin-sdk/text-chunking";
@@ -39,12 +40,9 @@ function bindingKeys(accountId, conversation) {
 function beginIMessageApprovalControlBinding(params) {
 	const keys = bindingKeys(params.accountId, params.conversation);
 	const { promise, resolve } = createDeferred();
-	let closed = false;
 	const window = {
 		done: promise,
 		close: () => {
-			if (closed) return;
-			closed = true;
 			for (const key of keys) {
 				const windows = pendingByConversation.get(key);
 				windows?.delete(window);
@@ -224,9 +222,7 @@ function readPollVoteEvent(message) {
 	const poll = message.poll;
 	if (!poll || poll.kind !== "vote") return null;
 	const pollGuid = normalizeIMessageGuid(typeof poll.original_guid === "string" && poll.original_guid || typeof poll.poll_guid === "string" && poll.poll_guid || "");
-	const sender = normalizeIMessageHandle((message.sender ?? "").trim());
-	const destinationCallerId = normalizeIMessageHandle((message.destination_caller_id ?? "").trim());
-	const actorHandle = (message.is_from_me !== true && Boolean(sender) && Boolean(destinationCallerId) && sender === destinationCallerId ? "" : sender) || (message.is_from_me === true ? destinationCallerId : "");
+	const actorHandle = resolveIMessageApprovalControlActor(message);
 	if (!pollGuid || !actorHandle) return null;
 	const rawVotes = Array.isArray(poll.votes) ? poll.votes : poll.vote ? [poll.vote] : [];
 	let malformedVotes = false;
@@ -246,13 +242,7 @@ function readPollVoteEvent(message) {
 			selected: vote.event_type === "selected"
 		}];
 	});
-	const conversation = buildIMessageApprovalConversationKeyForInbound({
-		chatGuid: message.chat_guid,
-		chatIdentifier: message.chat_identifier,
-		chatId: message.chat_id,
-		isGroup: message.is_group,
-		actorHandle
-	});
+	const conversation = buildIMessageApprovalConversationKeyForInbound(message, actorHandle);
 	if (!normalizeConversationKey(conversation)) return null;
 	return {
 		conversation,
@@ -279,20 +269,12 @@ async function lookupPollRecord(store, params) {
 * decision is security-relevant, and diagnosing "the tap did nothing" must not
 * require re-running the gateway in debug.
 */
-function info(message, fields) {
+function logPollVote(level, message, fields) {
 	try {
-		getOptionalIMessageRuntime()?.logging.getChildLogger({
+		(getOptionalIMessageRuntime()?.logging.getChildLogger({
 			plugin: "imessage",
 			feature: "approval-polls"
-		}).info(message, fields);
-	} catch {}
-}
-function warn$1(message, fields) {
-	try {
-		getOptionalIMessageRuntime()?.logging.getChildLogger({
-			plugin: "imessage",
-			feature: "approval-polls"
-		}).warn(message, fields);
+		}))?.[level](message, fields);
 	} catch {}
 }
 /**
@@ -312,7 +294,7 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 	const target = await lookupPollRecord(pollTargets, lookupKey);
 	if (!target) return Boolean(await lookupPollRecord(pollTombstones, lookupKey));
 	if (event.malformedVotes) {
-		warn$1("approval poll vote ignored: malformed complete vote set", {
+		logPollVote("warn", "approval poll vote ignored: malformed complete vote set", {
 			approvalId: target.approvalId,
 			actorHandle: event.actorHandle
 		});
@@ -322,7 +304,7 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 	const participantKeys = new Set(event.votes.map((vote) => vote.participantKey).filter(Boolean));
 	const actorVotes = directlyAttributedVotes.length > 0 ? directlyAttributedVotes : event.votes.length === 1 || participantKeys.size === 1 ? event.votes : [];
 	if (actorVotes.length === 0) {
-		warn$1("approval poll vote participants did not identify the transport actor", {
+		logPollVote("warn", "approval poll vote participants did not identify the transport actor", {
 			approvalId: target.approvalId,
 			actorHandle: event.actorHandle
 		});
@@ -330,7 +312,7 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 	}
 	const selectedVotes = actorVotes.filter((vote) => vote.selected);
 	if (selectedVotes.length === 0) {
-		info("approval poll deselect ignored; first selection decides", { approvalId: target.approvalId });
+		logPollVote("info", "approval poll deselect ignored; first selection decides", { approvalId: target.approvalId });
 		return true;
 	}
 	const selectedDecisions = selectedVotes.map((vote) => ({
@@ -338,7 +320,7 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 		decision: target.optionDecisions.find(([optionId]) => optionId === vote.optionId)?.[1]
 	}));
 	if (selectedDecisions.some((entry) => !entry.decision)) {
-		warn$1("approval poll vote ignored: selected option not bound to a decision", {
+		logPollVote("warn", "approval poll vote ignored: selected option not bound to a decision", {
 			approvalId: target.approvalId,
 			optionIds: selectedDecisions.map((entry) => entry.optionId)
 		});
@@ -346,7 +328,7 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 	}
 	const decisions = [...new Set(selectedDecisions.map((entry) => entry.decision))];
 	if (decisions.length !== 1) {
-		warn$1("approval poll vote ignored: ambiguous selected decisions", {
+		logPollVote("warn", "approval poll vote ignored: ambiguous selected decisions", {
 			approvalId: target.approvalId,
 			decisions
 		});
@@ -358,7 +340,7 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 		cfg: params.cfg,
 		accountId: params.accountId
 	}).length === 0) {
-		info("approval poll vote denied: no explicit approvers configured", { approvalId: target.approvalId });
+		logPollVote("info", "approval poll vote denied: no explicit approvers configured", { approvalId: target.approvalId });
 		return true;
 	}
 	if (!imessageApprovalAuth.authorizeActorAction({
@@ -368,7 +350,7 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 		action: "approve",
 		approvalKind: target.approvalKind
 	}).authorized) {
-		info("approval poll vote denied: sender not an approver", {
+		logPollVote("info", "approval poll vote denied: sender not an approver", {
 			approvalId: target.approvalId,
 			actorHandle: event.actorHandle
 		});
@@ -392,7 +374,7 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 			optionDecisions: target.optionDecisions,
 			approvalId: target.approvalId
 		});
-		info(`approval poll vote ${result.applied ? "resolved" : "already resolved"}`, {
+		logPollVote("info", `approval poll vote ${result.applied ? "resolved" : "already resolved"}`, {
 			approvalId: target.approvalId,
 			actorHandle: event.actorHandle,
 			decision
@@ -405,10 +387,10 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 				optionDecisions: target.optionDecisions,
 				approvalId: target.approvalId
 			});
-			info("approval poll vote ignored: approval already gone", { approvalId: target.approvalId });
+			logPollVote("info", "approval poll vote ignored: approval already gone", { approvalId: target.approvalId });
 			return true;
 		}
-		warn$1("approval poll vote failed", {
+		logPollVote("warn", "approval poll vote failed", {
 			approvalId: target.approvalId,
 			senderId: event.actorHandle,
 			error: String(error)
@@ -534,6 +516,19 @@ async function hasPersistedIMessageEcho(params) {
 }
 //#endregion
 //#region extensions/imessage/src/send-transport.ts
+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);
+	});
+}
 function normalizeIMessageRpcSendError(error) {
 	if (!(error instanceof IMessageRpcRequestError)) return error;
 	const data = asOptionalRecord(error.data);
@@ -544,7 +539,10 @@ async function requestIMessageRpcSend(client, method, params, timeoutMs, handoff
 	await handoff.onPlatformSendDispatch?.();
 	handoff.assertDirectAdapterHandoff?.();
 	try {
-		return await client.request(method, params, { timeoutMs });
+		return await client.request(method, params, {
+			timeoutMs,
+			assertCurrent: handoff.assertDirectAdapterHandoff
+		});
 	} catch (error) {
 		throw normalizeIMessageRpcSendError(error);
 	}
@@ -558,20 +556,6 @@ function resolveMessageId(result) {
 	const raw = typeof result.messageGuid === "string" && result.messageGuid.trim() || typeof result.messageId === "string" && result.messageId.trim() || typeof result.message_id === "string" && result.message_id.trim() || typeof result.id === "string" && result.id.trim() || typeof result.guid === "string" && result.guid.trim() || (typeof result.message_id === "number" ? String(result.message_id) : null) || (typeof result.id === "number" ? String(result.id) : null);
 	return raw ? raw.trim() : null;
 }
-function resolveOutboundMessageGuid(result) {
-	if (!result) return null;
-	for (const key of [
-		"messageGuid",
-		"guid",
-		"messageId",
-		"message_id",
-		"id"
-	]) {
-		const guid = normalizeResolvedMessageGuid(result[key]);
-		if (guid) return guid;
-	}
-	return null;
-}
 function isNumericMessageRowId(value) {
 	return typeof value === "string" && /^\d+$/.test(value.trim());
 }
@@ -580,15 +564,6 @@ function normalizeResolvedMessageGuid(value) {
 	const trimmed = value.trim();
 	return normalizeIMessageMessageId(trimmed) && !isNumericMessageRowId(trimmed) ? trimmed : null;
 }
-async function resolveMessageGuidFromChatDb(params) {
-	const dbPath = params.dbPath?.trim();
-	const messageId = params.messageId.trim();
-	if (!dbPath || !isNumericMessageRowId(messageId)) return null;
-	return normalizeResolvedMessageGuid(await withIMessageReceiptGuidReader(dbPath, (read) => read({
-		type: "messageGuid",
-		input: { messageId }
-	})));
-}
 function canResolveLatestSentMessageGuidFromChatDb(dbPath) {
 	const normalizedDbPath = dbPath?.trim();
 	if (!normalizedDbPath) return false;
@@ -600,14 +575,27 @@ function canResolveLatestSentMessageGuidFromChatDb(dbPath) {
 	}
 }
 async function resolveApprovalBindingMessageGuid(params) {
-	const immediateGuid = resolveOutboundMessageGuid(params.result);
-	if (immediateGuid) return immediateGuid;
+	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;
-	return normalizeResolvedMessageGuid(await (params.resolveMessageGuidImpl ?? resolveMessageGuidFromChatDb)({
+	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();
@@ -638,13 +626,6 @@ async function resolveFallbackSentMessageGuid(params) {
 		}
 	})));
 }
-function resolveOutboundEchoMedia(mediaContentType) {
-	if (!mediaContentType) return;
-	return {
-		contentType: mediaContentType,
-		kind: kindFromMime(mediaContentType) ?? "unknown"
-	};
-}
 function createIMessageSendReceipt(params) {
 	const messageId = params.messageId.trim();
 	const results = normalizeIMessageMessageId(messageId) ? [{
@@ -671,10 +652,6 @@ async function withOriginalIMessageAttachmentPath(filePath, send) {
 		prefix: "openclaw-imessage-outbound-"
 	}, async (workspace) => await send(await workspace.copyIn(filename, filePath)));
 }
-function canSynthesizeAttachmentChatHandle(raw) {
-	const trimmed = raw.trim();
-	return trimmed.includes("@") || trimmed.startsWith("+");
-}
 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}`;
@@ -693,9 +670,6 @@ function resultService(value) {
 	const normalized = normalizeOptionalString(value)?.toLowerCase();
 	return normalized === "imessage" || normalized === "sms" ? normalized : void 0;
 }
-function resolvePendingPersistedEchoTtlMs(timeoutMs) {
-	return Math.max(MIN_PENDING_PERSISTED_ECHO_TTL_MS, Math.max(0, timeoutMs) + PENDING_PERSISTED_ECHO_GRACE_MS);
-}
 function isAttachmentCommandFallbackError(error) {
 	const message = error instanceof Error ? error.message : String(error);
 	return /(?:unknown|unrecognized|invalid|unsupported)\s+(?:command|subcommand)|not a recognized command|send-attachment.*(?:not found|unsupported|unavailable)|private api bridge.*unavailable|requires the imsg private api bridge|run imsg launch/iu.test(message);
@@ -704,146 +678,6 @@ function isThreadedReplyUnsupportedError(error) {
 	const message = error instanceof Error ? error.message : String(error);
 	return /reply_to requires bridge transport|cannot send threaded repl|threaded repl(?:y|ies)\b.*(?:unsupported|not supported|requires|unavailable)|requires bridge transport/iu.test(message);
 }
-async function resolveAttachmentChatTarget(params) {
-	if (params.target.kind === "chat_guid") return params.target.chatGuid;
-	if (params.target.kind === "handle") {
-		if (!canSynthesizeAttachmentChatHandle(params.target.to)) return null;
-		const normalizedHandle = normalizeIMessageHandle(params.target.to);
-		if (!normalizedHandle) return null;
-		const service = params.target.service !== "auto" ? params.target.service : params.service;
-		if (service === "sms") return `SMS;-;${normalizedHandle}`;
-		if (service === "imessage") return `iMessage;-;${normalizedHandle}`;
-		return `any;-;${normalizedHandle}`;
-	}
-	if (params.target.kind !== "chat_id") return null;
-	const result = await params.runCliJson([
-		"group",
-		"--chat-id",
-		String(params.target.chatId)
-	]);
-	return normalizeOptionalString(result.guid) ?? normalizeOptionalString(result.chat_guid) ?? null;
-}
-async function trySendAttachmentForTarget(params) {
-	if (params.audioAsVoice && params.sendTransport === "applescript") throw new Error("iMessage voice messages require bridge transport; AppleScript cannot send native voice notes. Set sendTransport to bridge or auto.");
-	if (params.target.kind === "handle" && !params.audioAsVoice && params.sendTransport !== "bridge" && (params.service === "sms" || params.service === "imessage")) return null;
-	if (params.remoteHost && params.sendTransport === "applescript") return null;
-	let attachmentChatTarget = null;
-	if (params.remoteHost) {
-		if (params.target.kind === "chat_guid") attachmentChatTarget = params.target.chatGuid;
-		else if (params.target.kind === "chat_identifier") attachmentChatTarget = params.target.chatIdentifier;
-		else if (params.target.kind === "handle") {
-			const normalizedHandle = normalizeIMessageHandle(params.target.to);
-			if (normalizedHandle) {
-				const service = params.target.service !== "auto" ? params.target.service : params.service;
-				attachmentChatTarget = `${service === "sms" ? "SMS" : service === "imessage" ? "iMessage" : "any"};-;${normalizedHandle}`;
-			}
-		} else attachmentChatTarget = formatIMessageChatTarget(params.target.chatId);
-	} else try {
-		attachmentChatTarget = await resolveAttachmentChatTarget({
-			target: params.target,
-			service: params.service,
-			runCliJson: params.runCliJson
-		});
-	} catch (error) {
-		if (!params.audioAsVoice && isAttachmentCommandFallbackError(error)) return null;
-		throw error;
-	}
-	if (!attachmentChatTarget) {
-		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
-	});
-	let result;
-	let pendingEchoKey;
-	try {
-		pendingEchoKey = await rememberPersistedIMessageEcho({
-			scope: echoScope,
-			text: params.echoText,
-			media: params.echoMedia,
-			ttlMs: params.pendingEchoTtlMs,
-			pending: true
-		});
-		result = await withOriginalIMessageAttachmentPath(params.filePath, async (attachmentPath) => {
-			if (params.remoteHost) return await params.withRemoteFile({
-				remoteHost: params.remoteHost,
-				localPath: attachmentPath,
-				timeoutMs: params.timeoutMs,
-				assertDirectAdapterHandoff: params.assertDirectAdapterHandoff,
-				use: async (remotePath) => {
-					const rpcParams = {
-						file: remotePath,
-						...params.audioAsVoice ? { audio: true } : {},
-						...params.replyToId ? { reply_to: params.replyToId } : {}
-					};
-					if (params.target.kind === "chat_id") rpcParams.chat_id = params.target.chatId;
-					else if (params.target.kind === "chat_guid") rpcParams.chat_guid = params.target.chatGuid;
-					else rpcParams.chat_identifier = attachmentChatTarget;
-					return await params.requestRpc("send.attachment", rpcParams);
-				}
-			});
-			params.assertDirectAdapterHandoff?.();
-			await params.onPlatformSendDispatch?.();
-			params.assertDirectAdapterHandoff?.();
-			return await params.runCliJson([
-				"send-attachment",
-				"--chat",
-				attachmentChatTarget,
-				"--file",
-				attachmentPath,
-				...params.audioAsVoice ? ["--audio"] : [],
-				...params.replyToId ? ["--reply-to", params.replyToId] : [],
-				"--transport",
-				params.sendTransport === "bridge" ? "dylib" : params.sendTransport
-			]);
-		});
-		const failure = resolveIMessageSendFailure(result);
-		if (failure) throw new Error(failure);
-	} catch (error) {
-		await forgetPersistedIMessageEchoKey(pendingEchoKey);
-		if (!params.audioAsVoice && isAttachmentCommandFallbackError(error)) return null;
-		throw error;
-	}
-	const resolvedId = resolveMessageId(result);
-	const approvalBindingMessageId = await resolveApprovalBindingMessageGuid({
-		dbPath: params.dbPath,
-		messageId: resolvedId,
-		result,
-		resolveMessageGuidImpl: params.resolveMessageGuidImpl
-	});
-	const messageId = resolvedId ?? (result.ok || result.success ? "ok" : "unknown");
-	await rememberPersistedIMessageEcho({
-		scope: echoScope,
-		text: params.echoText,
-		media: params.echoMedia,
-		messageId: resolvedId ?? void 0
-	});
-	if (resolvedId && normalizeIMessageMessageId(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,
-		chatIdentifier: params.target.kind === "chat_identifier" || params.target.kind === "handle" ? attachmentChatTarget : void 0,
-		chatId: params.target.kind === "chat_id" ? params.target.chatId : void 0,
-		timestamp: Date.now(),
-		isFromMe: true
-	});
-	return {
-		messageId,
-		...approvalBindingMessageId ? { guid: approvalBindingMessageId } : {},
-		sentText: "",
-		...params.echoText ? { echoText: params.echoText } : {},
-		...params.echoMedia ? { echoMedia: params.echoMedia } : {},
-		receipt: createIMessageSendReceipt({
-			messageId,
-			target: params.target,
-			kind: params.audioAsVoice ? "voice" : "media",
-			...params.replyToId ? { replyToId: params.replyToId } : {}
-		})
-	};
-}
 async function sendMessageIMessage(to, text, opts) {
 	const cfg = requireRuntimeConfig(opts.config, "iMessage send");
 	opts.assertDirectAdapterHandoff?.();
@@ -885,7 +719,7 @@ async function sendMessageIMessage(to, text, opts) {
 	});
 	opts.assertDirectAdapterHandoff?.();
 	const timeoutMs = opts.timeoutMs ?? Math.max(account.config.probeTimeoutMs ?? 0, 18e4);
-	const pendingEchoTtlMs = resolvePendingPersistedEchoTtlMs(timeoutMs);
+	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;
 	let message = opts.approvalPrompt ? addApprovalReactionHintToText({
@@ -928,18 +762,16 @@ async function sendMessageIMessage(to, text, opts) {
 	message = formatted.text;
 	if (!message.trim() && !filePath) throw new Error("iMessage send requires text or media");
 	const echoText = message.trim() || void 0;
-	const echoMedia = filePath ? resolveOutboundEchoMedia(mediaContentType) : void 0;
+	const echoMedia = filePath && mediaContentType ? {
+		contentType: mediaContentType,
+		kind: kindFromMime(mediaContentType) ?? "unknown"
+	} : void 0;
 	let effectiveReplyToId = resolvedReplyToId;
-	const runCli = opts.runCliJson ?? ((args) => runIMessageCliJsonCommand({
-		args,
+	const runCliJson = bindIMessageCliSend(opts, {
 		cliPath,
 		dbPath,
 		timeoutMs
-	}));
-	const runCliJson = async (args) => {
-		opts.assertDirectAdapterHandoff?.();
-		return await runCli(args);
-	};
+	});
 	const requestOwnedRpc = async (method, rpcParams) => {
 		opts.assertDirectAdapterHandoff?.();
 		const rpcClient = await (opts.createClient ?? createIMessageRpcClient)({
@@ -954,27 +786,130 @@ async function sendMessageIMessage(to, text, opts) {
 		}
 	};
 	const withRemoteFile = opts.withRemoteFile ?? withIMessageRemoteFile;
-	if (filePath && (!resolvedReplyToId || opts.audioAsVoice)) {
-		const attachmentResult = await trySendAttachmentForTarget({
-			accountId: account.accountId,
+	async function trySendAttachment(attachmentFilePath) {
+		const { audioAsVoice, resolveMessageGuidImpl, assertDirectAdapterHandoff, onPlatformSendDispatch } = opts;
+		const accountId = account.accountId;
+		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;
+		let attachmentChatTarget = null;
+		if (target.kind === "chat_guid") attachmentChatTarget = target.chatGuid;
+		else if (target.kind === "handle") {
+			const rawHandle = target.to.trim();
+			if (remoteHost || rawHandle.includes("@") || rawHandle.startsWith("+")) {
+				const normalizedHandle = normalizeIMessageHandle(target.to);
+				if (normalizedHandle) {
+					const attachmentService = target.service !== "auto" ? target.service : service;
+					attachmentChatTarget = `${attachmentService === "sms" ? "SMS" : attachmentService === "imessage" ? "iMessage" : "any"};-;${normalizedHandle}`;
+				}
+			}
+		} else if (remoteHost) attachmentChatTarget = target.kind === "chat_identifier" ? target.chatIdentifier : formatIMessageChatTarget(target.chatId);
+		else if (target.kind === "chat_id") try {
+			const result = await runCliJson([
+				"group",
+				"--chat-id",
+				String(target.chatId)
+			]);
+			attachmentChatTarget = normalizeOptionalString(result.guid) ?? normalizeOptionalString(result.chat_guid) ?? null;
+		} catch (error) {
+			if (!audioAsVoice && isAttachmentCommandFallbackError(error)) return null;
+			throw error;
+		}
+		if (!attachmentChatTarget) {
+			if (audioAsVoice) throw new Error("iMessage voice messages require an existing chat and bridge transport.");
+			return null;
+		}
+		assertDirectAdapterHandoff?.();
+		const echoScope = resolveOutboundEchoScope({
+			accountId,
+			target
+		});
+		let result;
+		let pendingEchoKey;
+		try {
+			pendingEchoKey = await rememberPersistedIMessageEcho({
+				scope: echoScope,
+				media: echoMedia,
+				ttlMs: pendingEchoTtlMs,
+				pending: true
+			});
+			result = await withOriginalIMessageAttachmentPath(attachmentFilePath, async (attachmentPath) => {
+				if (remoteHost) return await withRemoteFile({
+					remoteHost,
+					localPath: attachmentPath,
+					timeoutMs,
+					assertDirectAdapterHandoff,
+					use: async (remotePath) => {
+						const rpcParams = {
+							file: remotePath,
+							...audioAsVoice ? { audio: true } : {},
+							...resolvedReplyToId ? { reply_to: resolvedReplyToId } : {}
+						};
+						if (target.kind === "chat_id") rpcParams.chat_id = target.chatId;
+						else if (target.kind === "chat_guid") rpcParams.chat_guid = target.chatGuid;
+						else rpcParams.chat_identifier = attachmentChatTarget;
+						return await requestOwnedRpc("send.attachment", rpcParams);
+					}
+				});
+				assertDirectAdapterHandoff?.();
+				await onPlatformSendDispatch?.();
+				assertDirectAdapterHandoff?.();
+				return await runCliJson([
+					"send-attachment",
+					"--chat",
+					attachmentChatTarget,
+					"--file",
+					attachmentPath,
+					...audioAsVoice ? ["--audio"] : [],
+					...resolvedReplyToId ? ["--reply-to", resolvedReplyToId] : [],
+					"--transport",
+					sendTransport === "bridge" ? "dylib" : sendTransport
+				]);
+			});
+			const failure = resolveIMessageSendFailure(result);
+			if (failure) throw new Error(failure);
+		} catch (error) {
+			await forgetPersistedIMessageEchoKey(pendingEchoKey);
+			if (!audioAsVoice && isAttachmentCommandFallbackError(error)) return null;
+			throw error;
+		}
+		const resolvedId = resolveMessageId(result);
+		const approvalBindingMessageId = await resolveApprovalBindingMessageGuid({
 			dbPath: chatDbLookupPath,
-			target,
-			service,
-			sendTransport,
-			filePath,
-			audioAsVoice: opts.audioAsVoice,
-			...resolvedReplyToId ? { replyToId: resolvedReplyToId } : {},
-			echoMedia,
-			pendingEchoTtlMs,
-			timeoutMs,
-			remoteHost,
-			runCliJson,
-			requestRpc: requestOwnedRpc,
-			withRemoteFile,
-			resolveMessageGuidImpl: opts.resolveMessageGuidImpl,
-			assertDirectAdapterHandoff: opts.assertDirectAdapterHandoff,
-			onPlatformSendDispatch: opts.onPlatformSendDispatch
+			messageId: resolvedId,
+			result,
+			resolveMessageGuidImpl
 		});
+		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);
 		if (attachmentResult) {
 			if (!message.trim()) return attachmentResult;
 			await opts.onDeliveryResult?.({