@openclaw/imessage 2026.9.6 → 2026.9.7

package/dist/.setup/{question-reactions-lm8OxWbb.mjs → question-reactions-Cy-dmU_j.mjs}

@@ -1,4 +1,4 @@
-import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
+import { t as __exportAll } from "./rolldown-runtime-BBjsoOtd.mjs";
 import { n as normalizeIMessageGuid, t as resolveIMessageReactionContext } from "./reaction-context-Br-vAJFp.mjs";
 import { createQuestionReactionTargetStore, questionGatewayRuntime } from "openclaw/plugin-sdk/question-gateway-runtime";
 //#region extensions/imessage/src/question-reactions.ts

package/dist/.setup/{remote-file-Bye99O-C.mjs → remote-file-DRPCaVmg.mjs}

@@ -1,13 +1,68 @@
-import { p as resolveLocalIMessageChatDbPath } from "./accounts-CUxZrTcY.mjs";
-import { _ as chatContextFromIMessageTarget, m as resolveIMessageMessageId, p as resolveIMessageCachedResourceBinding, v as isIMessageEmailChatIdentifier } from "./sanitize-outbound-sJPF2DVM.mjs";
+import { p as resolveLocalIMessageChatDbPath } from "./accounts-nzcU0cq2.mjs";
+import { T as isIMessageEmailChatIdentifier, m as resolveIMessageMessageId, p as resolveIMessageCachedResourceBinding, w as chatContextFromIMessageTarget } from "./sanitize-outbound-3MLljgtY.mjs";
 import path from "node:path";
 import { normalizeScpRemoteHost } from "openclaw/plugin-sdk/host-runtime";
 import { createActionGate } from "openclaw/plugin-sdk/channel-actions";
-import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
+import { createSubsystemLogger, logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { randomUUID } from "node:crypto";
-import { runCommandWithTimeout } from "openclaw/plugin-sdk/process-runtime";
-import { openNodeSqliteDatabase } from "openclaw/plugin-sdk/sqlite-runtime";
+import { resolveRuntimeWorkerUrl, runCommandWithTimeout } from "openclaw/plugin-sdk/process-runtime";
+import { openSqliteWorkerStore } from "openclaw/plugin-sdk/sqlite-runtime";
 import { sanitizeTempFileName } from "openclaw/plugin-sdk/temp-path";
+//#region extensions/imessage/src/chat-db.ts
+function openIMessageChatDbReader(databasePath) {
+	return openSqliteWorkerStore({
+		moduleUrl: resolveRuntimeWorkerUrl({
+			currentModuleUrl: import.meta.url,
+			sourceWorkerName: "chat-db.worker",
+			distWorkerPath: "extensions/imessage/src/chat-db.worker.js",
+			package: {
+				name: "@openclaw/imessage",
+				distWorkerPath: "src/chat-db.worker.js"
+			}
+		}),
+		databasePath,
+		existingOnly: true,
+		input: void 0
+	});
+}
+async function resolveIMessageStartupRowidWatermark(dbPath) {
+	let store;
+	try {
+		store = await openIMessageChatDbReader(dbPath);
+		if (!store) throw new Error("Messages database is unavailable");
+		return await store.execute({
+			type: "startupWatermark",
+			input: void 0
+		});
+	} catch (err) {
+		logVerbose(`imessage: startup rowid watermark unavailable for db=${dbPath}: ${String(err)}`);
+		return null;
+	} finally {
+		await store?.close();
+	}
+}
+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 openIMessageChatDbReader(databasePath);
+			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/message-resource-db.ts
 function normalizeIMessageMessageGuidForLookup(messageId) {
 	const trimmed = messageId.trim();
@@ -53,7 +108,7 @@ function matchesAnyChatCandidate(stored, candidates) {
 	if (typeof stored !== "string") return false;
 	return candidates.some((candidate) => matchesChatCandidate(stored, candidate));
 }
-function checkIMessageResourceBinding(params) {
+async function checkIMessageResourceBinding(params) {
 	const dbPath = resolveLocalIMessageChatDbPath(params);
 	if (!dbPath) return "unavailable";
 	const messageGuid = normalizeIMessageMessageGuidForLookup(params.messageId);
@@ -64,25 +119,19 @@ function checkIMessageResourceBinding(params) {
 	const chatId = params.chatContext.chatId;
 	const hasChatId = typeof chatId === "number" && Number.isSafeInteger(chatId) && chatId > 0;
 	if (!hasChatId && expectedChatGuids.length === 0 && expectedChatIdentifiers.length === 0 && identifierChatGuids.length === 0) return "unavailable";
-	let db;
+	let store;
 	try {
-		db = openNodeSqliteDatabase(dbPath, { readOnly: true });
-		return db.prepare(`SELECT cmj.chat_id AS chatId,
-                c.guid AS chatGuid,
-                c.chat_identifier AS chatIdentifier
-         FROM message m
-         JOIN chat_message_join cmj ON cmj.message_id = m.ROWID
-         JOIN chat c ON c.ROWID = cmj.chat_id
-         WHERE m.guid = ?`).all(messageGuid).map((row) => ({
-			chatId: row.chatId,
-			chatGuid: row.chatGuid,
-			chatIdentifier: row.chatIdentifier
+		store = await openIMessageChatDbReader(dbPath);
+		if (!store) return "unavailable";
+		return (await store.execute({
+			type: "messageChats",
+			input: { messageGuid }
 		})).some((row) => (!hasChatId || row.chatId === chatId) && (expectedChatGuids.length === 0 || matchesAnyChatCandidate(row.chatGuid, expectedChatGuids)) && (expectedChatIdentifiers.length === 0 || matchesAnyChatCandidate(row.chatIdentifier, expectedChatIdentifiers)) && (identifierChatGuids.length === 0 || matchesAnyChatCandidate(row.chatGuid, identifierChatGuids))) ? "match" : "mismatch";
 	} catch {
 		return "unavailable";
 	} finally {
 		try {
-			db?.close();
+			await store?.close();
 		} catch {}
 	}
 }
@@ -131,7 +180,7 @@ async function authorizeIMessageResourceReference(params) {
 	if (cacheBinding === "unknown" && normalizedMessageId !== params.messageId.trim()) cacheBinding = await resolveIMessageCachedResourceBinding(normalizedMessageId, cacheContext);
 	if (cacheBinding === "match") return;
 	if (cacheBinding === "mismatch") throw new Error("iMessage message reference belongs to a different account or conversation.");
-	const providerBinding = params.hasExclusiveLocalDatabase ? checkIMessageResourceBinding(params) : "unavailable";
+	const providerBinding = params.hasExclusiveLocalDatabase ? await checkIMessageResourceBinding(params) : "unavailable";
 	if (providerBinding === "match") return;
 	if (providerBinding === "mismatch") throw new Error("iMessage message reference does not belong to the selected conversation.");
 	if (params.conversationReadOrigin === "direct-operator") return;
@@ -245,4 +294,4 @@ rm -rf -- ${remoteDir}
 	}
 }
 //#endregion
-export { authorizeIMessageResourceReference as n, resolveAuthorizedIMessageReplyReference as r, withIMessageRemoteFile as t };
+export { withIMessageReceiptGuidReader as a, resolveIMessageStartupRowidWatermark as i, authorizeIMessageResourceReference as n, resolveAuthorizedIMessageReplyReference as r, withIMessageRemoteFile as t };

package/dist/.setup/rolldown-runtime-BBjsoOtd.mjs

@@ -0,0 +1,27 @@
+//#region \0rolldown/runtime.js
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __exportAll = (all, no_symbols) => {
+	let target = {};
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
+	return target;
+};
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+//#endregion
+export { __reExport as n, __exportAll as t };

package/dist/.setup/{sanitize-outbound-sJPF2DVM.mjs → sanitize-outbound-3MLljgtY.mjs}

@@ -1,10 +1,10 @@
-import { u as expandIMessageUserPath } from "./accounts-CUxZrTcY.mjs";
-import { i as invalidateCachedIMessagePrivateApiStatus } from "./message-tool-api-pvlcOJPG.mjs";
+import { u as expandIMessageUserPath } from "./accounts-nzcU0cq2.mjs";
+import { i as invalidateCachedIMessagePrivateApiStatus } from "./message-tool-api-D032l82H.mjs";
 import { t as getIMessageRuntime } from "./runtime-Cza4CY5T.mjs";
-import { a as IMESSAGE_REPLY_CACHE_NAMESPACE, f as resolveIMessageReplyCacheEntryKey, i as IMESSAGE_REPLY_CACHE_MAX_ENTRIES, n as IMESSAGE_REPLY_CACHE_COUNTER_KEY, o as IMESSAGE_REPLY_CACHE_TTL_MS, r as IMESSAGE_REPLY_CACHE_COUNTER_NAMESPACE } from "./state-contract-DvahEY4X.mjs";
 import { normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { normalizeE164 } from "openclaw/plugin-sdk/account-resolution";
 import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
+import { createHash } from "node:crypto";
 import { runCommandWithTimeout } from "openclaw/plugin-sdk/process-runtime";
 import { resolveUserPath } from "openclaw/plugin-sdk/text-utility-runtime";
 import { spawn } from "node:child_process";
@@ -98,6 +98,60 @@ function isPositiveIMessageChatMatch(cached, current) {
 const DEFAULT_IMESSAGE_PROBE_TIMEOUT_MS = 1e4;
 const DEFAULT_IMESSAGE_SEND_TIMEOUT_MS = 18e4;
 //#endregion
+//#region extensions/imessage/src/state-contract.ts
+const IMESSAGE_REPLY_CACHE_NAMESPACE = "imessage.reply-cache";
+const IMESSAGE_REPLY_CACHE_MAX_ENTRIES = 2e3;
+const IMESSAGE_REPLY_CACHE_COUNTER_NAMESPACE = "imessage.reply-cache-counter";
+const IMESSAGE_REPLY_CACHE_COUNTER_KEY = "short-id-counter";
+const IMESSAGE_REPLY_CACHE_TTL_MS = 216e5;
+function resolveIMessageReplyCacheEntryKey(messageId) {
+	return createHash("sha256").update(messageId, "utf8").digest("hex").slice(0, 32);
+}
+const MAX_FAILURE_RETRY_MAP_SIZE = 512;
+const MAX_FAILURE_RETRY_MAP_JSON_BYTES = 48e3;
+const textEncoder = new TextEncoder();
+const IMESSAGE_CATCHUP_CURSOR_NAMESPACE = "imessage.catchup-cursors";
+function resolveIMessageCatchupCursorKey(accountId) {
+	return createHash("sha256").update(accountId, "utf8").digest("hex").slice(0, 32);
+}
+/**
+* Bound the retry map so a pathological storm of unique failing GUIDs
+* cannot grow the cursor value without limit. Keeps the `maxSize` entries
+* with the highest counts (closest to give-up) when over the bound.
+*/
+function capFailureRetriesMap(map, maxSize = MAX_FAILURE_RETRY_MAP_SIZE, maxBytes = MAX_FAILURE_RETRY_MAP_JSON_BYTES) {
+	const entries = Object.entries(map);
+	if (entries.length <= maxSize && textEncoder.encode(JSON.stringify(map)).byteLength <= maxBytes) return map;
+	entries.sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]));
+	const capped = {};
+	for (const [guid, count] of entries.slice(0, maxSize)) {
+		capped[guid] = count;
+		if (textEncoder.encode(JSON.stringify(capped)).byteLength > maxBytes) {
+			delete capped[guid];
+			break;
+		}
+	}
+	return capped;
+}
+const IMESSAGE_SENT_ECHOES_TTL_MS = 432e5;
+const IMESSAGE_SENT_ECHOES_NAMESPACE = "imessage.sent-echoes";
+function resolveIMessageSentEchoEntryKey(entry) {
+	return createHash("sha256").update(JSON.stringify([
+		entry.scope,
+		entry.text ?? "",
+		resolveIMessageEchoMediaKey(entry.media) ?? "",
+		entry.messageId ?? "",
+		entry.timestamp
+	])).digest("hex").slice(0, 32);
+}
+function resolveIMessageEchoMediaKey(media) {
+	const contentType = media?.contentType?.trim().toLowerCase() || void 0;
+	const kind = media?.kind && media.kind !== "unknown" ? media.kind : void 0;
+	if (kind) return `kind:${kind}`;
+	const normalizedContentType = contentType?.split(";", 1)[0]?.trim();
+	return normalizedContentType ? `mime:${normalizedContentType}` : void 0;
+}
+//#endregion
 //#region extensions/imessage/src/monitor-reply-cache.ts
 /** Recency window for the "react to the latest message" fallback. */
 const LATEST_FALLBACK_MS = 6e5;
@@ -109,7 +163,6 @@ function reportPersistenceFailure(scope, err) {
 }
 const imessageReplyCacheByMessageId = /* @__PURE__ */ new Map();
 const imessageShortIdToUuid = /* @__PURE__ */ new Map();
-const imessageUuidToShortId = /* @__PURE__ */ new Map();
 let imessageShortIdCounter = 0;
 function openReplyCacheStore() {
 	return getIMessageRuntime().state.openKeyedStore({
@@ -135,12 +188,11 @@ function hydrateCounter(counter) {
 }
 function hydrateRows(entries) {
 	const cutoff = Date.now() - IMESSAGE_REPLY_CACHE_TTL_MS;
-	for (const entry of entries.filter((cached) => cached.timestamp >= cutoff).toSorted((a, b) => a.timestamp - b.timestamp).slice(-IMESSAGE_REPLY_CACHE_MAX_ENTRIES)) {
+	for (const entry of entries.filter((cached) => cached.timestamp >= cutoff).toSorted((a, b) => a.timestamp - b.timestamp).slice(-2e3)) {
 		const numeric = Number.parseInt(entry.shortId, 10);
 		if (Number.isFinite(numeric) && numeric > imessageShortIdCounter) imessageShortIdCounter = numeric;
 		imessageReplyCacheByMessageId.set(entry.messageId, entry);
 		imessageShortIdToUuid.set(entry.shortId, entry.messageId);
-		imessageUuidToShortId.set(entry.messageId, entry.shortId);
 	}
 }
 async function hydrateFromStoreOnce() {
@@ -221,12 +273,11 @@ async function rememberIMessageReplyCache(entry) {
 		...entry,
 		shortId: ""
 	};
-	let shortId = imessageUuidToShortId.get(messageId);
+	let shortId = imessageReplyCacheByMessageId.get(messageId)?.shortId;
 	const isNewMessage = !shortId;
 	if (!shortId) {
 		shortId = generateShortId();
 		imessageShortIdToUuid.set(shortId, messageId);
-		imessageUuidToShortId.set(messageId, shortId);
 	}
 	const fullEntry = buildReplyCacheEntry(entry, messageId, shortId);
 	imessageReplyCacheByMessageId.delete(messageId);
@@ -237,10 +288,7 @@ async function rememberIMessageReplyCache(entry) {
 		if (value.timestamp >= cutoff) break;
 		imessageReplyCacheByMessageId.delete(key);
 		deletedMessageIds.push(key);
-		if (value.shortId) {
-			imessageShortIdToUuid.delete(value.shortId);
-			imessageUuidToShortId.delete(key);
-		}
+		if (value.shortId) imessageShortIdToUuid.delete(value.shortId);
 	}
 	while (imessageReplyCacheByMessageId.size > IMESSAGE_REPLY_CACHE_MAX_ENTRIES) {
 		const oldest = imessageReplyCacheByMessageId.keys().next().value;
@@ -248,10 +296,7 @@ async function rememberIMessageReplyCache(entry) {
 		const oldEntry = imessageReplyCacheByMessageId.get(oldest);
 		imessageReplyCacheByMessageId.delete(oldest);
 		deletedMessageIds.push(oldest);
-		if (oldEntry?.shortId) {
-			imessageShortIdToUuid.delete(oldEntry.shortId);
-			imessageUuidToShortId.delete(oldest);
-		}
+		if (oldEntry?.shortId) imessageShortIdToUuid.delete(oldEntry.shortId);
 	}
 	const counter = imessageShortIdCounter;
 	persistence = persistence.then(async () => {
@@ -314,8 +359,23 @@ async function isKnownFromMeIMessageMessageId(messageId, ctx) {
 	if (!trimmed || !ctx.accountId || !hasChatScope(ctx)) return false;
 	await hydrateFromStoreOnce();
 	const cached = imessageReplyCacheByMessageId.get(trimmed);
-	if (!cached || cached.isFromMe !== true || cached.accountId !== ctx.accountId) return false;
-	return isPositiveIMessageChatMatch(cached, ctx);
+	if (!cached || cached.isFromMe !== true) return false;
+	return resolveCachedResourceBinding(trimmed, {
+		...ctx,
+		accountId: ctx.accountId
+	}) === "match";
+}
+async function isKnownFromMeIMessageTarget(params) {
+	const { accountId, chatId, chatGuid, chatIdentifier } = params;
+	const ctx = {
+		accountId,
+		chatId,
+		chatGuid,
+		chatIdentifier
+	};
+	const isKnownFromMe = params.isKnownFromMeMessageId ?? isKnownFromMeIMessageMessageId;
+	for (const messageId of params.messageIds) if (await isKnownFromMe(messageId, ctx)) return true;
+	return false;
 }
 function buildFromMeError(inputId, inputKind) {
 	return /* @__PURE__ */ new Error(`iMessage message id ${describeMessageIdForError(inputId, inputKind)} is not one this agent sent. edit and unsend can only target messages the gateway delivered itself; messages received from other participants cannot be modified.`);
@@ -360,9 +420,7 @@ function resolveCachedResourceBinding(messageId, ctx) {
 	if (!entry) return "unknown";
 	if (Date.now() - entry.timestamp > 216e5) return "unknown";
 	if (entry.accountId !== ctx.accountId) return "mismatch";
-	const chatMatch = resolveIMessageChatMatch(entry, ctx);
-	if (chatMatch !== "match") return chatMatch;
-	return "match";
+	return resolveIMessageChatMatch(entry, ctx);
 }
 /** @deprecated Used only by hosts without asynchronous conversation matching. */
 function isIMessageCurrentMessageInChat(params) {
@@ -457,6 +515,7 @@ function recoverIMessageBridge(cliPath) {
 }
 //#endregion
 //#region extensions/imessage/src/client.ts
+const IMSG_APPLE_FRAMEWORK_STDERR_PATTERN = /^(?:\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ imsg\[\d+:\d+\] )?Could not fetch group for change type \d+ with identifier [^:]+:ABGroup, making it a delete change type\.$/u;
 var IMessageRpcRequestError = class extends Error {
 	constructor(message, code, data) {
 		super(message);
@@ -466,8 +525,7 @@ var IMessageRpcRequestError = class extends Error {
 	}
 };
 function isIMessageBridgeStall(error) {
-	if (!(error instanceof Error)) return false;
-	return error.message.includes("Timed out waiting for response");
+	return error instanceof Error && error.message.includes("Timed out waiting for response");
 }
 const BRIDGE_STALL_GUIDANCE = "The imsg private API bridge stopped responding. Run `imsg launch` to re-inject the dylib, then `openclaw channels status --probe` to refresh capability detection.";
 function describeIMessageBridgeStall(error) {
@@ -671,6 +729,10 @@ var IMessageRpcClient = class {
 		const trimmed = line.trim();
 		if (!trimmed) return;
 		this.recordProcessDiagnostic(trimmed);
+		if (IMSG_APPLE_FRAMEWORK_STDERR_PATTERN.test(trimmed)) {
+			logVerbose(`imsg rpc: ${trimmed}`);
+			return;
+		}
 		this.runtime?.error?.(`imsg rpc: ${trimmed}`);
 	}
 	handleLine(line) {
@@ -1313,4 +1375,4 @@ function sanitizeOutboundText(text) {
 	return cleaned;
 }
 //#endregion
-export { chatContextFromIMessageTarget as _, IMessageRpcRequestError as a, resolveIMessageDirectChatService as b, findLatestIMessageEntryForChat as c, isKnownFromMeIMessageMessageId as d, rememberIMessageReplyCache as f, DEFAULT_IMESSAGE_SEND_TIMEOUT_MS as g, DEFAULT_IMESSAGE_PROBE_TIMEOUT_MS as h, extractMarkdownFormatRuns as i, isIMessageCurrentMessageInChat as l, resolveIMessageMessageId as m, sanitizeIMessageFinalOutboundText as n, createIMessageRpcClient as o, resolveIMessageCachedResourceBinding as p, sanitizeOutboundText as r, runIMessageCliJsonCommand as s, protectIMessageFencedRoleMarkers as t, isIMessageCurrentMessageInChatAsync as u, isIMessageEmailChatIdentifier as v, normalizeDirectChatIdentifier as y };
+export { DEFAULT_IMESSAGE_SEND_TIMEOUT_MS as C, resolveIMessageDirectChatService as D, normalizeDirectChatIdentifier as E, DEFAULT_IMESSAGE_PROBE_TIMEOUT_MS as S, isIMessageEmailChatIdentifier as T, IMESSAGE_SENT_ECHOES_TTL_MS as _, IMessageRpcRequestError as a, resolveIMessageEchoMediaKey as b, findLatestIMessageEntryForChat as c, isKnownFromMeIMessageTarget as d, rememberIMessageReplyCache as f, IMESSAGE_SENT_ECHOES_NAMESPACE as g, IMESSAGE_CATCHUP_CURSOR_NAMESPACE as h, extractMarkdownFormatRuns as i, isIMessageCurrentMessageInChat as l, resolveIMessageMessageId as m, sanitizeIMessageFinalOutboundText as n, createIMessageRpcClient as o, resolveIMessageCachedResourceBinding as p, sanitizeOutboundText as r, runIMessageCliJsonCommand as s, protectIMessageFencedRoleMarkers as t, isIMessageCurrentMessageInChatAsync as u, capFailureRetriesMap as v, chatContextFromIMessageTarget as w, resolveIMessageSentEchoEntryKey as x, resolveIMessageCatchupCursorKey as y };

package/dist/.setup/{send-odAfTQ2J.mjs → send-Cu9nl757.mjs}

@@ -1,12 +1,11 @@
-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-CUxZrTcY.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-sJPF2DVM.mjs";
-import { c as getIMessageApprovalApprovers, l as imessageApprovalAuth } from "./group-policy-Cjztkquv.mjs";
+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-nzcU0cq2.mjs";
+import { D as resolveIMessageDirectChatService, _ as IMESSAGE_SENT_ECHOES_TTL_MS, a as IMessageRpcRequestError, b as resolveIMessageEchoMediaKey, f as rememberIMessageReplyCache, g as IMESSAGE_SENT_ECHOES_NAMESPACE, n as sanitizeIMessageFinalOutboundText, o as createIMessageRpcClient, s as runIMessageCliJsonCommand, t as protectIMessageFencedRoleMarkers, w as chatContextFromIMessageTarget, x as resolveIMessageSentEchoEntryKey } from "./sanitize-outbound-3MLljgtY.mjs";
+import { c as getIMessageApprovalApprovers, l as imessageApprovalAuth } from "./group-policy-90pw4tyG.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-D6RFg6lU.mjs";
+import { d as normalizeConversationKey, i as registerIMessageApprovalReactionTarget, l as enumerateApprovalTargetKeys, s as buildIMessageApprovalConversationKeyForInbound, u as enumerateConversationKeyForms } from "./approval-reactions-Bp33xc83.mjs";
 import { n as normalizeIMessageGuid } from "./reaction-context-Br-vAJFp.mjs";
-import { r as resolveAuthorizedIMessageReplyReference, t as withIMessageRemoteFile } from "./remote-file-Bye99O-C.mjs";
+import { a as withIMessageReceiptGuidReader, r as resolveAuthorizedIMessageReplyReference, t as withIMessageRemoteFile } from "./remote-file-DRPCaVmg.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";
@@ -15,13 +14,11 @@ 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 { 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 { createPluginStateErrorReporter } from "openclaw/plugin-sdk/plugin-state-runtime";
-import { openSqliteWorkerStore } from "openclaw/plugin-sdk/sqlite-runtime";
 import { requireRuntimeConfig } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { resolveMarkdownTableMode } from "openclaw/plugin-sdk/markdown-table-runtime";
 import { resolvePreferredOpenClawTmpDir, withTempWorkspace } from "openclaw/plugin-sdk/temp-path";
@@ -113,7 +110,7 @@ const loadResolveApprovalOverGateway = createLazyRuntimeSurface(() => import("op
 const reportPersistentError = createPluginStateErrorReporter(getOptionalIMessageRuntime, "imessage", "approval-poll-state", "iMessage persistent approval poll state failed");
 function readPersistedTarget(value) {
 	const target = value;
-	if (!target || typeof target.approvalId !== "string" || target.approvalKind !== "exec" && target.approvalKind !== "plugin" || !Array.isArray(target.optionDecisions)) return null;
+	if (!target || typeof target.approvalId !== "string" || target.approvalKind !== "exec" && target.approvalKind !== "plugin" && target.approvalKind !== "system-agent" || !Array.isArray(target.optionDecisions)) return null;
 	const optionDecisions = target.optionDecisions.flatMap((pair) => {
 		if (!Array.isArray(pair) || pair.length !== 2) return [];
 		const [optionId, decision] = pair;
@@ -275,27 +272,18 @@ function readPollVoteEvent(message) {
 		malformedVotes
 	};
 }
-async function lookupPollTarget(params) {
+async function lookupPollRecord(store, params) {
 	for (const key of enumeratePollTargetKeys({
 		accountId: params.accountId,
 		conversation: params.conversation,
 		pollGuid: params.pollGuid,
 		optionIds: params.optionIds
 	})) {
-		const target = await pollTargets.lookup(key);
+		const target = await store.lookup(key);
 		if (target) return target;
 	}
 	return null;
 }
-async function hasTombstone(params) {
-	for (const key of enumeratePollTargetKeys({
-		accountId: params.accountId,
-		conversation: params.conversation,
-		pollGuid: params.pollGuid,
-		optionIds: params.optionIds
-	})) if (await pollTombstones.lookup(key)) return true;
-	return false;
-}
 /**
 * Outcomes for votes we own are logged at info, not verbose: an approval
 * decision is security-relevant, and diagnosing "the tap did nothing" must not
@@ -331,8 +319,8 @@ async function maybeResolveIMessageApprovalPollVote(params) {
 		pollGuid: event.pollGuid,
 		optionIds: event.votes.map((vote) => vote.optionId)
 	};
-	const target = await lookupPollTarget(lookupKey);
-	if (!target) return await hasTombstone(lookupKey);
+	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", {
 			approvalId: target.approvalId,
@@ -450,76 +438,19 @@ const iMessageApprovalPollTargets = {
 	clearForTest: clearIMessageApprovalPollTargetsForTest
 };
 //#endregion
-//#region extensions/imessage/src/chat-db.ts
-function openIMessageChatDbReader(databasePath) {
-	return openSqliteWorkerStore({
-		moduleUrl: resolveRuntimeWorkerUrl({
-			currentModuleUrl: import.meta.url,
-			sourceWorkerName: "chat-db.worker",
-			distWorkerPath: "extensions/imessage/src/chat-db.worker.js",
-			package: {
-				name: "@openclaw/imessage",
-				distWorkerPath: "src/chat-db.worker.js"
-			}
-		}),
-		databasePath,
-		existingOnly: true,
-		input: void 0
-	});
-}
-async function resolveIMessageStartupRowidWatermark(dbPath) {
-	let store;
-	try {
-		store = await openIMessageChatDbReader(dbPath);
-		if (!store) throw new Error("Messages database is unavailable");
-		return await store.execute({
-			type: "startupWatermark",
-			input: void 0
-		});
-	} catch (err) {
-		logVerbose(`imessage: startup rowid watermark unavailable for db=${dbPath}: ${String(err)}`);
-		return null;
-	} finally {
-		await store?.close();
-	}
-}
-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 openIMessageChatDbReader(databasePath);
-			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/monitor/echo-text-corruption.ts
 function isLeadingEchoTextCorruptionMarker(code) {
 	return code === 0 || code === 65279 || code === 65533 || code === 65534 || code === 65535;
 }
-function stripLeadingEchoTextCorruptionMarkers(text) {
+function normalizeIMessageEchoText(text) {
+	if (!text) return;
+	const normalized = text.replace(/\r\n?/g, "\n").trim();
 	let offset = 0;
-	while (offset < text.length && isLeadingEchoTextCorruptionMarker(text.charCodeAt(offset))) offset += 1;
-	return offset === 0 ? text : text.slice(offset);
+	while (offset < normalized.length && isLeadingEchoTextCorruptionMarker(normalized.charCodeAt(offset))) offset += 1;
+	return normalized.slice(offset).trim() || void 0;
 }
 //#endregion
 //#region extensions/imessage/src/monitor/persisted-echo-cache.ts
-function normalizeText(text) {
-	if (!text) return;
-	return stripLeadingEchoTextCorruptionMarkers(text.replace(/\r\n?/g, "\n").trim()).trim() || void 0;
-}
 function normalizeMessageId(messageId) {
 	const normalized = messageId?.trim();
 	if (!normalized || normalized === "ok" || normalized === "unknown") return;
@@ -579,7 +510,7 @@ async function persistEntry(entry, ttlMs) {
 	return key;
 }
 async function rememberPersistedIMessageEcho(params) {
-	const text = normalizeText(params.text);
+	const text = normalizeIMessageEchoText(params.text);
 	const media = normalizeMedia(params.media);
 	const messageId = normalizeMessageId(params.messageId);
 	const entry = {
@@ -603,7 +534,7 @@ async function forgetPersistedIMessageEchoKey(key) {
 	}
 }
 async function hasPersistedIMessageEcho(params) {
-	const text = normalizeText(params.text);
+	const text = normalizeIMessageEchoText(params.text);
 	const mediaKey = resolveIMessageEchoMediaKey(params.media);
 	const messageId = normalizeMessageId(params.messageId);
 	if (!text && !mediaKey && !messageId) return false;
@@ -659,10 +590,6 @@ function resolveOutboundMessageGuid(result) {
 function isNumericMessageRowId(value) {
 	return typeof value === "string" && /^\d+$/.test(value.trim());
 }
-function resolveTargetService(target) {
-	if (target.kind !== "handle") return;
-	if (target.serviceExplicit || target.service !== "auto") return target.service;
-}
 function normalizeResolvedMessageGuid(value) {
 	if (typeof value !== "string") return null;
 	const trimmed = value.trim();
@@ -732,9 +659,6 @@ function shouldRecoverApprovalPromptGuid(params) {
 function canCheckSentMessageAfterRpcTimeout(params) {
 	return Boolean(params.resolveSentMessageGuidImpl) || canResolveLatestSentMessageGuidFromChatDb(params.dbPath);
 }
-function resolveOutboundEchoText(text) {
-	return text.trim() || void 0;
-}
 function resolveOutboundEchoMedia(mediaContentType) {
 	if (!mediaContentType) return;
 	return {
@@ -862,7 +786,7 @@ async function trySendAttachmentForTarget(params) {
 	let result;
 	let pendingEchoKey;
 	try {
-		if (echoScope) pendingEchoKey = await rememberPersistedIMessageEcho({
+		pendingEchoKey = await rememberPersistedIMessageEcho({
 			scope: echoScope,
 			text: params.echoText,
 			media: params.echoMedia,
@@ -926,7 +850,7 @@ async function trySendAttachmentForTarget(params) {
 		resolveMessageGuidImpl: params.resolveMessageGuidImpl
 	});
 	const messageId = resolvedId ?? (result.ok || result.success ? "ok" : "unknown");
-	if (echoScope) await rememberPersistedIMessageEcho({
+	await rememberPersistedIMessageEcho({
 		scope: echoScope,
 		text: params.echoText,
 		media: params.echoMedia,
@@ -975,7 +899,7 @@ async function sendMessageIMessage(to, text, opts) {
 		remoteHost
 	});
 	const target = parseIMessageTarget(opts.chatId ? formatIMessageChatTarget(opts.chatId) : to);
-	const service = opts.service ?? resolveTargetService(target) ?? account.config.service;
+	const service = opts.service ?? (target.kind === "handle" && (target.serviceExplicit || target.service !== "auto") ? target.service : void 0) ?? account.config.service;
 	const sendTransport = account.config.sendTransport ?? "auto";
 	const resolvedReplyToId = await resolveAuthorizedIMessageReplyReference({
 		account,
@@ -1038,7 +962,7 @@ async function sendMessageIMessage(to, text, opts) {
 	});
 	message = formatted.text;
 	if (!message.trim() && !filePath) throw new Error("iMessage send requires text or media");
-	const echoText = resolveOutboundEchoText(message);
+	const echoText = message.trim() || void 0;
 	const echoMedia = filePath ? resolveOutboundEchoMedia(mediaContentType) : void 0;
 	let effectiveReplyToId = resolvedReplyToId;
 	const runCli = opts.runCliJson ?? ((args) => runIMessageCliJsonCommand({
@@ -1053,11 +977,7 @@ async function sendMessageIMessage(to, text, opts) {
 	};
 	const requestOwnedRpc = async (method, rpcParams) => {
 		opts.assertDirectAdapterHandoff?.();
-		const rpcClient = opts.createClient ? await opts.createClient({
-			cliPath,
-			dbPath,
-			remoteHost
-		}) : await createIMessageRpcClient({
+		const rpcClient = await (opts.createClient ?? createIMessageRpcClient)({
 			cliPath,
 			dbPath,
 			remoteHost
@@ -1146,15 +1066,11 @@ async function sendMessageIMessage(to, text, opts) {
 		target
 	});
 	opts.assertDirectAdapterHandoff?.();
-	const client = opts.client ?? (opts.createClient ? await opts.createClient({
+	const client = opts.client ?? await (opts.createClient ?? createIMessageRpcClient)({
 		cliPath,
 		dbPath,
 		remoteHost
-	}) : await createIMessageRpcClient({
-		cliPath,
-		dbPath,
-		remoteHost
-	}));
+	});
 	const shouldClose = !opts.client;
 	const requestSuccessfulSend = async (sendParams) => {
 		const request = async (nativeParams) => await requestIMessageRpcSend(client, "send", nativeParams, timeoutMs, opts);
@@ -1183,7 +1099,7 @@ async function sendMessageIMessage(to, text, opts) {
 	let pendingEchoKey;
 	try {
 		try {
-			if (echoScope) pendingEchoKey = await rememberPersistedIMessageEcho({
+			pendingEchoKey = await rememberPersistedIMessageEcho({
 				scope: echoScope,
 				text: echoText,
 				media: echoMedia,
@@ -1240,7 +1156,7 @@ async function sendMessageIMessage(to, text, opts) {
 			sentAfterMs: sendStartedAtMs,
 			resolveSentMessageGuidImpl: opts.resolveSentMessageGuidImpl
 		});
-		if (echoScope) await rememberPersistedIMessageEcho({
+		await rememberPersistedIMessageEcho({
 			scope: echoScope,
 			text: echoText,
 			media: echoMedia,
@@ -1299,4 +1215,4 @@ async function sendMessageIMessage(to, text, opts) {
 	}
 }
 //#endregion
-export { buildApprovalPollOptions as a, maybeResolveIMessageApprovalPollVote as c, resolveIMessageStartupRowidWatermark as i, iMessageApprovalControlBindings as l, hasPersistedIMessageEcho as n, iMessageApprovalPollTargets as o, stripLeadingEchoTextCorruptionMarkers as r, mapSentPollOptionsToDecisions as s, sendMessageIMessage as t };
+export { iMessageApprovalPollTargets as a, iMessageApprovalControlBindings as c, buildApprovalPollOptions as i, hasPersistedIMessageEcho as n, mapSentPollOptionsToDecisions as o, normalizeIMessageEchoText as r, maybeResolveIMessageApprovalPollVote as s, sendMessageIMessage as t };