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

package/dist/.setup/{client-12apu4Ip.mjs → client-HixFQQWY.mjs}

@@ -1,5 +1,5 @@
-import { u as expandIMessageUserPath } from "./accounts-evTpvJMv.mjs";
-import { i as invalidateCachedIMessagePrivateApiStatus } from "./message-tool-api-CqfRxLlT.mjs";
+import { u as expandIMessageUserPath } from "./accounts-DacCvDBt.mjs";
+import { i as invalidateCachedIMessagePrivateApiStatus } from "./message-tool-api-B5NfPnFL.mjs";
 import { t as getIMessageRuntime } from "./runtime-Cza4CY5T.mjs";
 import { asNullableRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { normalizeE164 } from "openclaw/plugin-sdk/account-resolution";
@@ -10,6 +10,7 @@ import { resolveUserPath } from "openclaw/plugin-sdk/text-utility-runtime";
 import { spawn } from "node:child_process";
 import { StringDecoder } from "node:string_decoder";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { captureChannelReadAuthority, captureEffectAuthority } from "openclaw/plugin-sdk/fetch-runtime";
 import { raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
 //#region extensions/imessage/src/chat-context.ts
 const EMAIL_HANDLE_PATTERN = /^[^\s@]+@[^\s@]+$/u;
@@ -87,7 +88,6 @@ function resolveIMessageChatMatch(cached, current) {
 }
 //#endregion
 //#region extensions/imessage/src/constants.ts
-/** Default timeout for iMessage probe/RPC operations (10 seconds). */
 const DEFAULT_IMESSAGE_PROBE_TIMEOUT_MS = 1e4;
 const DEFAULT_IMESSAGE_SEND_TIMEOUT_MS = 18e4;
 //#endregion
@@ -273,20 +273,16 @@ async function rememberIMessageReplyCache(entry) {
 	imessageReplyCacheByMessageId.set(messageId, fullEntry);
 	const cutoff = Date.now() - IMESSAGE_REPLY_CACHE_TTL_MS;
 	const deletedMessageIds = [];
-	for (const [key, value] of imessageReplyCacheByMessageId) {
-		if (value.timestamp >= cutoff) break;
-		imessageReplyCacheByMessageId.delete(key);
-		deletedMessageIds.push(key);
-		if (value.shortId) imessageShortIdToUuid.delete(value.shortId);
-	}
-	while (imessageReplyCacheByMessageId.size > IMESSAGE_REPLY_CACHE_MAX_ENTRIES) {
-		const oldest = imessageReplyCacheByMessageId.keys().next().value;
-		if (!oldest) break;
-		const oldEntry = imessageReplyCacheByMessageId.get(oldest);
-		imessageReplyCacheByMessageId.delete(oldest);
-		deletedMessageIds.push(oldest);
-		if (oldEntry?.shortId) imessageShortIdToUuid.delete(oldEntry.shortId);
-	}
+	const pruneUntil = (retain) => {
+		for (const [key, cached] of imessageReplyCacheByMessageId) {
+			if (retain(key, cached)) break;
+			imessageReplyCacheByMessageId.delete(key);
+			deletedMessageIds.push(key);
+			if (cached.shortId) imessageShortIdToUuid.delete(cached.shortId);
+		}
+	};
+	pruneUntil((_key, cached) => cached.timestamp >= cutoff);
+	pruneUntil((key) => !key || imessageReplyCacheByMessageId.size <= 2e3);
 	const counter = imessageShortIdCounter;
 	persistence = persistence.then(async () => {
 		if (isNewMessage) await persistReplyCacheCounter(counter);
@@ -532,7 +528,6 @@ var IMessageRpcClient = class {
 		this.pending = /* @__PURE__ */ new Map();
 		this.terminalResolve = null;
 		this.reapedResolve = null;
-		this.isReaped = false;
 		this.child = null;
 		this.stopPromise = null;
 		this.stdoutFramer = createLfLineFramer((line) => this.handleStdoutLine(line));
@@ -563,13 +558,8 @@ var IMessageRpcClient = class {
 			"pipe"
 		] });
 		this.child = child;
-		child.stdout.on("data", (chunk) => {
-			if (this.child !== child) return;
-			this.stdoutFramer.write(chunk);
-		});
-		child.stderr?.on("data", (chunk) => {
-			if (this.child !== child) return;
-			this.stderrFramer.write(chunk);
+		for (const [stream, framer] of [[child.stdout, this.stdoutFramer], [child.stderr, this.stderrFramer]]) stream.on("data", (chunk) => {
+			if (this.child === child) framer.write(chunk);
 		});
 		const failFromProcessError = (err) => this.failTransport(err, child);
 		child.on("error", failFromProcessError);
@@ -605,6 +595,17 @@ var IMessageRpcClient = class {
 		throw await this.terminal;
 	}
 	async request(method, params, opts) {
+		const child = this.child;
+		const stdin = child?.stdin;
+		const assertReadAuthority = captureChannelReadAuthority();
+		return captureEffectAuthority().initiate(() => {
+			if (child !== this.child || stdin !== this.child?.stdin) throw new Error("imsg rpc process changed before request initiation");
+			assertReadAuthority?.();
+			opts?.assertCurrent?.();
+			return this.initiateRequest(method, params, opts);
+		});
+	}
+	async initiateRequest(method, params, opts) {
 		if (!this.child || !this.child.stdin) throw new Error("imsg rpc not running");
 		const id = this.nextId++;
 		const line = `${JSON.stringify({
@@ -614,18 +615,17 @@ var IMessageRpcClient = class {
 			params: params ?? {}
 		})}\n`;
 		const timeoutMs = opts?.timeoutMs ?? 1e4;
-		const response = new Promise((resolve, reject) => {
-			const key = String(id);
-			const timer = timeoutMs > 0 ? setTimeout(() => {
-				this.pending.delete(key);
-				reject(/* @__PURE__ */ new Error(`imsg rpc timeout (${method})`));
-			}, timeoutMs) : void 0;
+		const key = String(id);
+		const pendingResponse = new Promise((resolve, reject) => {
 			this.pending.set(key, {
 				resolve: (value) => resolve(value),
-				reject,
-				timer
+				reject
 			});
 		});
+		const response = timeoutMs > 0 ? raceWithTimeout(pendingResponse, timeoutMs, () => {
+			this.pending.delete(key);
+			throw new Error(`imsg rpc timeout (${method})`);
+		}) : pendingResponse;
 		try {
 			this.child.stdin.write(line, (err) => {
 				if (err) this.failTransport(err, this.child);
@@ -661,7 +661,7 @@ var IMessageRpcClient = class {
 		if (!await this.waitForReap(IMESSAGE_RPC_CLOSE_GRACE_MS)) throw new Error("imsg rpc did not exit after SIGKILL");
 	}
 	async waitForReap(timeoutMs) {
-		if (this.isReaped) return true;
+		if (!this.reapedResolve) return true;
 		return await raceWithTimeout(this.reaped.then(() => true), timeoutMs, () => false);
 	}
 	signalChild(child, signal) {
@@ -702,7 +702,6 @@ var IMessageRpcClient = class {
 			const key = String(parsed.id);
 			const pending = this.pending.get(key);
 			if (!pending) return;
-			if (pending.timer) clearTimeout(pending.timer);
 			this.pending.delete(key);
 			if (parsed.error) {
 				const baseMessage = parsed.error.message ?? "imsg rpc error";
@@ -739,7 +738,6 @@ var IMessageRpcClient = class {
 	}
 	failAll(err) {
 		for (const [key, pending] of this.pending.entries()) {
-			if (pending.timer) clearTimeout(pending.timer);
 			pending.reject(err);
 			this.pending.delete(key);
 		}
@@ -753,8 +751,6 @@ var IMessageRpcClient = class {
 		return true;
 	}
 	markReaped() {
-		if (this.isReaped) return;
-		this.isReaped = true;
 		const resolve = this.reapedResolve;
 		this.reapedResolve = null;
 		resolve?.();

package/dist/.setup/{media-contract-DjQGZlfl.mjs → media-contract-BwWs5PM7.mjs}

@@ -1,4 +1,4 @@
-import { o as resolveIMessageAccount } from "./accounts-evTpvJMv.mjs";
+import { o as resolveIMessageAccount } from "./accounts-DacCvDBt.mjs";
 import { mergeInboundPathRoots } from "openclaw/plugin-sdk/channel-inbound";
 //#region extensions/imessage/src/media-contract.ts
 const DEFAULT_IMESSAGE_ATTACHMENT_ROOTS = ["/Users/*/Library/Messages/Attachments"];

package/dist/.setup/{message-tool-api-CqfRxLlT.mjs → message-tool-api-B5NfPnFL.mjs}

@@ -1,5 +1,5 @@
-import { n as inferIMessageTargetChatType } from "./targets-BicBiYsM.mjs";
-import { c as getCachedIMessageRemoteHost, o as resolveIMessageAccount } from "./accounts-evTpvJMv.mjs";
+import { n as inferIMessageTargetChatType } from "./targets-B4oU7n-v.mjs";
+import { c as getCachedIMessageRemoteHost, o as resolveIMessageAccount } from "./accounts-DacCvDBt.mjs";
 import { createActionGate } from "openclaw/plugin-sdk/channel-actions";
 import { Type } from "typebox";
 import { asDateTimestampMs } from "openclaw/plugin-sdk/number-runtime";

package/dist/.setup/{question-reactions-DJV-TnA8.mjs → question-reactions-9jrqVZgE.mjs}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-BBjsoOtd.mjs";
-import { i as normalizeIMessageGuid } from "./actions-DJqbUmbN.mjs";
-import { t as resolveIMessageReactionContext } from "./reaction-context-By7kUMBC.mjs";
+import { i as normalizeIMessageGuid } from "./actions-Hxh12myO.mjs";
+import { t as resolveIMessageReactionContext } from "./reaction-context-CRXpeYAr.mjs";
 import { createQuestionReactionTargetStore, questionGatewayRuntime } from "openclaw/plugin-sdk/question-gateway-runtime";
 //#region extensions/imessage/src/question-reactions.ts
 var question_reactions_exports = /* @__PURE__ */ __exportAll({
@@ -20,15 +20,19 @@ const questionReactionTargets = createQuestionReactionTargetStore({
 	registerChannelDelivery: questionGatewayRuntime.registerChannelDelivery,
 	resolveReaction: questionGatewayRuntime.resolveReaction
 });
-function reactionCandidates(message, bodyText) {
-	const reaction = resolveIMessageReactionContext(message, bodyText);
-	if (!reaction) return null;
-	const guids = Array.from(new Set([...reaction.targetGuids ?? [], reaction.targetGuid ?? ""].map(normalizeIMessageGuid).filter(Boolean)));
-	return guids.length > 0 ? {
-		action: reaction.action,
-		emoji: reaction.emoji,
-		guids
-	} : null;
+function resolveQuestionReaction(params) {
+	const reaction = resolveIMessageReactionContext(params.message, params.bodyText);
+	if (!reaction || reaction.action !== "added") return null;
+	const guids = [...new Set((reaction.targetGuids ?? []).map(normalizeIMessageGuid).filter(Boolean))];
+	if (guids.length === 0) return null;
+	const optionIndex = questionGatewayRuntime.resolveReactionIndex(reaction.emoji);
+	return optionIndex === void 0 ? null : {
+		optionIndex,
+		identities: guids.map((messageGuid) => ({
+			accountId: params.accountId,
+			messageGuid
+		}))
+	};
 }
 function registerIMessageQuestionReactionTargetForDeliveredPayload(params) {
 	const binding = questionGatewayRuntime.readReactionBinding(params.payload);
@@ -46,23 +50,14 @@ function registerIMessageQuestionReactionTargetForDeliveredPayload(params) {
 	return registered;
 }
 function hasIMessageQuestionReactionTarget(params) {
-	const reaction = reactionCandidates(params.message, params.bodyText);
-	if (!reaction || reaction.action !== "added" || questionGatewayRuntime.resolveReactionIndex(reaction.emoji) === void 0) return false;
-	return questionReactionTargets.has(reaction.guids.map((messageGuid) => ({
-		accountId: params.accountId,
-		messageGuid
-	})));
+	const reaction = resolveQuestionReaction(params);
+	return reaction ? questionReactionTargets.has(reaction.identities) : false;
 }
 async function maybeResolveIMessageQuestionReaction(params) {
-	const reaction = reactionCandidates(params.message, params.bodyText);
-	const optionIndex = reaction ? questionGatewayRuntime.resolveReactionIndex(reaction.emoji) : void 0;
-	if (!reaction || reaction.action === "removed" || optionIndex === void 0) return false;
+	const reaction = resolveQuestionReaction(params);
+	if (!reaction) return false;
 	return await questionReactionTargets.resolve({
-		identities: reaction.guids.map((messageGuid) => ({
-			accountId: params.accountId,
-			messageGuid
-		})),
-		optionIndex,
+		...reaction,
 		cfg: params.cfg,
 		senderId: params.senderId,
 		gatewayUrl: params.gatewayUrl,

package/dist/.setup/{reaction-context-By7kUMBC.mjs → reaction-context-CRXpeYAr.mjs}

@@ -1,4 +1,4 @@
-import { i as normalizeIMessageGuid } from "./actions-DJqbUmbN.mjs";
+import { i as normalizeIMessageGuid } from "./actions-Hxh12myO.mjs";
 //#region extensions/imessage/src/monitor/reaction-context.ts
 const TAPBACK_TEXT_PATTERNS = [
 	{

package/dist/.setup/{remote-file-BU7pA-Zi.mjs → remote-file-Dq5Asi_F.mjs}

@@ -1,5 +1,5 @@
-import { p as resolveLocalIMessageChatDbPath } from "./accounts-evTpvJMv.mjs";
-import { b as chatContextFromIMessageTarget, l as resolveIMessageCachedResourceBinding, u as resolveIMessageMessageId, x as isIMessageEmailChatIdentifier } from "./client-12apu4Ip.mjs";
+import { p as resolveLocalIMessageChatDbPath } from "./accounts-DacCvDBt.mjs";
+import { b as chatContextFromIMessageTarget, l as resolveIMessageCachedResourceBinding, u as resolveIMessageMessageId, x as isIMessageEmailChatIdentifier } from "./client-HixFQQWY.mjs";
 import path from "node:path";
 import { normalizeScpRemoteHost } from "openclaw/plugin-sdk/host-runtime";
 import { createActionGate } from "openclaw/plugin-sdk/channel-actions";
@@ -188,7 +188,6 @@ async function authorizeIMessageResourceReference(params) {
 }
 //#endregion
 //#region extensions/imessage/src/remote-file.ts
-const TOKEN_PATTERN = /^[a-f0-9]{32}$/u;
 const SSH_OPTIONS = [
 	"-o",
 	"BatchMode=yes",
@@ -205,8 +204,8 @@ const SSH_OPTIONS = [
 ];
 const CLEANUP_TIMEOUT_MS = 1e4;
 const log = createSubsystemLogger("channels/imessage");
-async function runChecked(run, label, argv, options) {
-	const result = await run(argv, {
+async function runChecked(label, argv, options) {
+	const result = await runCommandWithTimeout(argv, {
 		killProcessTree: true,
 		maxOutputBytes: {
 			stdout: 4096,
@@ -223,16 +222,10 @@ async function runChecked(run, label, argv, options) {
 		throw new Error(`${label} failed (${result.termination}${result.code === null ? "" : `, code ${result.code}`})${detail ? `: ${detail}` : ""}`);
 	}
 }
-function requireToken(createToken) {
-	const token = createToken().replaceAll("-", "").toLowerCase();
-	if (!TOKEN_PATTERN.test(token)) throw new Error("iMessage remote staging generated an invalid temporary token");
-	return token;
-}
 async function withIMessageRemoteFile(params) {
 	const remoteHost = normalizeScpRemoteHost(params.remoteHost);
 	if (!remoteHost) throw new Error("invalid iMessage remoteHost for SSH/SCP staging");
-	const run = params.deps?.runCommand ?? runCommandWithTimeout;
-	const remoteDir = `/tmp/openclaw-imessage-${requireToken(params.deps?.createToken ?? randomUUID)}`;
+	const remoteDir = `/tmp/openclaw-imessage-${randomUUID().replaceAll("-", "")}`;
 	const remotePath = `${remoteDir}/${sanitizeTempFileName(path.basename(params.localPath))}`;
 	const createScript = `set -eu
 umask 077
@@ -246,7 +239,7 @@ rm -rf -- ${remoteDir}
 `;
 	params.assertDirectAdapterHandoff?.();
 	try {
-		await runChecked(run, "iMessage remote temporary directory allocation", [
+		await runChecked("iMessage remote temporary directory allocation", [
 			"ssh",
 			...SSH_OPTIONS,
 			"-T",
@@ -259,7 +252,7 @@ rm -rf -- ${remoteDir}
 			signal: params.signal
 		});
 		params.assertDirectAdapterHandoff?.();
-		await runChecked(run, "iMessage remote file upload", [
+		await runChecked("iMessage remote file upload", [
 			"scp",
 			...SSH_OPTIONS,
 			"--",
@@ -273,7 +266,7 @@ rm -rf -- ${remoteDir}
 		return await params.use(remotePath);
 	} finally {
 		try {
-			await runChecked(run, "iMessage remote file cleanup", [
+			await runChecked("iMessage remote file cleanup", [
 				"ssh",
 				...SSH_OPTIONS,
 				"-T",
@@ -285,7 +278,8 @@ rm -rf -- ${remoteDir}
 				timeoutMs: CLEANUP_TIMEOUT_MS
 			});
 		} catch (cleanupError) {
-			(params.deps?.onCleanupError ?? ((error) => log.warn(`remote attachment cleanup failed: ${error.message}`)))(cleanupError instanceof Error ? cleanupError : new Error(String(cleanupError)));
+			const detail = cleanupError instanceof Error ? cleanupError.message : String(cleanupError);
+			log.warn(`remote attachment cleanup failed: ${detail}`);
 		}
 	}
 }

package/dist/.setup/{sanitize-outbound-C0x4BPky.mjs → sanitize-outbound-DpdQERYJ.mjs}

@@ -1,4 +1,4 @@
-import { FormatCapabilityProfile, findCodeRegions, isInsideCode, markdownToIR, renderMarkdownWithAttributedRanges, sanitizeAssistantVisibleText, stripMarkdown, tokenizeHtmlTags } from "openclaw/plugin-sdk/text-chunking";
+import { FormatCapabilityProfile, applyMarkdownTextEdits, findCodeRegions, isInsideCode, markdownToIR, renderMarkdownWithAttributedRanges, sanitizeAssistantVisibleText, stripMarkdown, tokenizeHtmlTags } from "openclaw/plugin-sdk/text-chunking";
 //#region extensions/imessage/src/markdown-format.ts
 const IMESSAGE_FORMAT_PROFILE = FormatCapabilityProfile.define({
 	mechanism: "ranges",
@@ -44,32 +44,18 @@ function restoreCodeMarkers(text, ranges, codeRanges) {
 		text,
 		ranges
 	};
-	let rendered = "";
-	let cursor = 0;
 	const edits = codeRanges.map((range) => {
 		const end = range.start + range.length;
 		const content = text.slice(range.start, end);
 		const marker = codeDelimiter(content);
 		const padding = content.startsWith("`") || content.endsWith("`") ? " " : "";
-		rendered += text.slice(cursor, range.start) + `${marker}${padding}${content}${padding}${marker}`;
-		cursor = end;
 		return {
+			start: range.start,
 			end,
-			shift: rendered.length - end
+			text: `${marker}${padding}${content}${padding}${marker}`
 		};
 	});
-	rendered += text.slice(cursor);
-	const mapOffset = (offset) => {
-		let low = 0;
-		let high = edits.length;
-		while (low < high) {
-			const middle = low + Math.floor((high - low) / 2);
-			const edit = edits[middle];
-			if (edit && edit.end <= offset) low = middle + 1;
-			else high = middle;
-		}
-		return offset + (edits[low - 1]?.shift ?? 0);
-	};
+	const { text: rendered, mapOffset } = applyMarkdownTextEdits(text, edits);
 	return {
 		text: rendered,
 		ranges: ranges.map((range) => {
@@ -175,6 +161,23 @@ function assertSafeIMessageOutboundMarkup(text) {
 		}
 	}
 }
+function findIMessageMarkupEnd(text, start, kind, contentOffset = 2) {
+	const terminator = kind === "instruction" ? "?>" : ">";
+	let quote;
+	let bracketDepth = 0;
+	for (let index = start + contentOffset; index <= text.length - terminator.length; index += 1) {
+		if (kind === "private" && index - start > MAX_PRIVATE_MARKDOWN_UNWRAP_PASSES ** 2) throw new Error("iMessage outbound runtime scaffolding exceeded its limit");
+		const character = text[index];
+		if (quote) {
+			if (character === quote) quote = void 0;
+		} else if (character === "'" || character === "\"") quote = character;
+		else if (kind === "declaration" && character === "[") bracketDepth += 1;
+		else if (kind === "declaration" && character === "]" && bracketDepth > 0) bracketDepth -= 1;
+		else if (kind === "private" && character === "<") throw new Error("iMessage outbound runtime scaffolding is malformed");
+		else if (bracketDepth === 0 && text.startsWith(terminator, index)) return index + terminator.length;
+	}
+	return -1;
+}
 function stripIMessageBalancedPrivateRuntimeBlocks(text, verifyProtectedRoles) {
 	const openBlocks = [];
 	const completedBlocks = [];
@@ -219,7 +222,7 @@ function stripIMessageBalancedPrivateRuntimeBlocks(text, verifyProtectedRoles) {
 			cursor = enclosingTag.end;
 			continue;
 		}
-		let end = -1;
+		let end;
 		let delimiterLength = 0;
 		if (text.startsWith("<!--", start)) {
 			end = text.indexOf("-->", start + 4);
@@ -227,36 +230,9 @@ function stripIMessageBalancedPrivateRuntimeBlocks(text, verifyProtectedRoles) {
 		} else if (/^<!\[CDATA\[/i.test(text.slice(start, start + 9))) {
 			end = text.indexOf("]]>", start + 9);
 			delimiterLength = 3;
-		} else if (text.startsWith("<?", start)) {
-			let quote;
-			for (let index = start + 2; index < text.length - 1; index += 1) {
-				const character = text[index];
-				if (quote) {
-					if (character === quote) quote = void 0;
-				} else if (character === "'" || character === "\"") quote = character;
-				else if (character === "?" && text[index + 1] === ">") {
-					end = index;
-					delimiterLength = 2;
-					break;
-				}
-			}
-		} else if (/^<![a-z][a-z0-9_.:-]*\b/i.test(text.slice(start))) {
-			let quote;
-			let bracketDepth = 0;
-			for (let index = start + 2; index < text.length; index += 1) {
-				const character = text[index];
-				if (quote) {
-					if (character === quote) quote = void 0;
-				} else if (character === "'" || character === "\"") quote = character;
-				else if (character === "[") bracketDepth += 1;
-				else if (character === "]" && bracketDepth > 0) bracketDepth -= 1;
-				else if (character === ">" && bracketDepth === 0) {
-					end = index;
-					delimiterLength = 1;
-					break;
-				}
-			}
-		} else if (text.startsWith("<!", start) || text.startsWith("</", start) && start + 2 < text.length && !/[A-Za-z>]/.test(text[start + 2] ?? "")) {
+		} else if (text.startsWith("<?", start)) end = findIMessageMarkupEnd(text, start, "instruction");
+		else if (/^<![a-z][a-z0-9_.:-]*\b/i.test(text.slice(start))) end = findIMessageMarkupEnd(text, start, "declaration");
+		else if (text.startsWith("<!", start) || text.startsWith("</", start) && start + 2 < text.length && !/[A-Za-z>]/.test(text[start + 2] ?? "")) {
 			end = text.indexOf(">", start + 2);
 			delimiterLength = 1;
 		} else {
@@ -299,19 +275,8 @@ function stripIMessageBalancedPrivateRuntimeBlocks(text, verifyProtectedRoles) {
 		}
 		if (enclosingBlock?.codeRegion && enclosingBlock.codeRegion !== codeRegion) throw new Error("iMessage outbound runtime scaffolding is malformed");
 		if (++scannedTags > MAX_PRIVATE_MARKDOWN_UNWRAP_PASSES ** 2) throw new Error("iMessage outbound runtime scaffolding exceeded its limit");
-		let quote;
-		let end = start + token[0].length;
-		for (; end < text.length; end += 1) {
-			if (end - start > MAX_PRIVATE_MARKDOWN_UNWRAP_PASSES ** 2) throw new Error("iMessage outbound runtime scaffolding exceeded its limit");
-			const character = text[end];
-			if (quote) {
-				if (character === quote) quote = void 0;
-			} else if (character === "'" || character === "\"") quote = character;
-			else if (character === "<") throw new Error("iMessage outbound runtime scaffolding is malformed");
-			else if (character === ">") break;
-		}
-		if (end >= text.length || quote) throw new Error("iMessage outbound runtime scaffolding is malformed");
-		end += 1;
+		const end = findIMessageMarkupEnd(text, start, "private", token[0].length);
+		if (end < 0) throw new Error("iMessage outbound runtime scaffolding is malformed");
 		if (enclosingBlock?.codeRegion && enclosingBlock.codeRegion === codeRegion) {
 			if (!enclosingBlock.nestedCodeRegions) {
 				if (codeRegion.end - enclosingBlock.end > MAX_PRIVATE_MARKDOWN_UNWRAP_PASSES ** 3) throw new Error("iMessage outbound runtime scaffolding exceeded its limit");