imessage keep leading nul cleanup

drvoss · Copilot · drvoss · commit 86b845a1d73a · 2026-05-06T11:26:40.000+09:00
Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/extensions/imessage/src/monitor/echo-cache.ts b/extensions/imessage/src/monitor/echo-cache.ts
@@ -22,17 +22,29 @@ export type SentMessageCache = {
 // duplicate delivery (noisy but not lossy) — never message loss.
 const SENT_MESSAGE_TEXT_TTL_MS = 4_000;
 const SENT_MESSAGE_ID_TTL_MS = 60_000;
-const LEADING_ATTRIBUTED_BODY_CORRUPTION_MARKERS = /^[\u0000\uFEFF\uFFFD\uFFFE\uFFFF]+/u;
+const LEADING_ATTRIBUTED_BODY_CORRUPTION_MARKERS = new Set([
+  "\u0000",
+  "\uFEFF",
+  "\uFFFD",
+  "\uFFFE",
+  "\uFFFF",
+]);
+
+function stripLeadingAttributedBodyCorruptionMarkers(text: string): string {
+  let start = 0;
+  while (start < text.length && LEADING_ATTRIBUTED_BODY_CORRUPTION_MARKERS.has(text[start] ?? "")) {
+    start += 1;
+  }
+  return start === 0 ? text : text.slice(start);
+}
 
 function normalizeEchoTextKey(text: string | undefined): string | null {
   if (!text) {
     return null;
   }
-  const normalized = text
-    .replace(/\r\n?/g, "\n")
-    .trim()
-    .replace(LEADING_ATTRIBUTED_BODY_CORRUPTION_MARKERS, "")
-    .trim();
+  const normalized = stripLeadingAttributedBodyCorruptionMarkers(
+    text.replace(/\r\n?/g, "\n").trim(),
+  ).trim();
   return normalized ? normalized : null;
 }
 
