fix(imessage): strip leading echo corruption markers in the persisted echo cache (#94442)

ly-wang19 · claude · web-flow · commit 81e1ec467cf0 · 2026-06-22T19:07:45.000Z
The persisted iMessage echo-dedupe cache normalized text with CRLF->LF + trim only, not the leading attributedBody corruption-marker stripping the in-memory echo cache applies (#93511). The persisted 12h cache is the only matcher once the 4s in-memory text TTL expires, so a delayed reflected own-message echo whose text decoded with a leading NUL/replacement/BOM marker did not match the clean stored send -- the agent's own message was re-ingested as fresh inbound, causing a self-reply loop. Extract the marker-stripping into a leaf module shared by both echo caches (the in-memory cache already imports the persisted one, so importing back would be a cycle) and apply it in the persisted normalizeText, so both caches strip identically. Co-authored-by: ly-wang19 <ly-wang19@users.noreply.github.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
diff --git a/extensions/imessage/src/monitor/echo-cache.ts b/extensions/imessage/src/monitor/echo-cache.ts
@@ -1,4 +1,5 @@
 // Imessage plugin module implements echo cache behavior.
+import { stripLeadingEchoTextCorruptionMarkers } from "./echo-text-corruption.js";
 import { hasPersistedIMessageEcho } from "./persisted-echo-cache.js";
 
 type SentMessageLookup = {
@@ -35,20 +36,6 @@ export type SentMessageCache = {
 const SENT_MESSAGE_TEXT_TTL_MS = 4_000;
 const SENT_MESSAGE_ID_TTL_MS = 60_000;
 
-function isLeadingEchoTextCorruptionMarker(code: number): boolean {
-  return (
-    code === 0x0000 || code === 0xfeff || code === 0xfffd || code === 0xfffe || code === 0xffff
-  );
-}
-
-function stripLeadingEchoTextCorruptionMarkers(text: string): string {
-  let offset = 0;
-  while (offset < text.length && isLeadingEchoTextCorruptionMarker(text.charCodeAt(offset))) {
-    offset += 1;
-  }
-  return offset === 0 ? text : text.slice(offset);
-}
-
 function normalizeEchoTextKey(text: string | undefined): string | null {
   if (!text) {
     return null;
diff --git a/extensions/imessage/src/monitor/echo-text-corruption.ts b/extensions/imessage/src/monitor/echo-text-corruption.ts
@@ -0,0 +1,19 @@
+// Imessage plugin shared helper: strip leading attributedBody corruption markers from echo text.
+// The in-memory (echo-cache) and persisted (persisted-echo-cache) echo-dedupe paths must normalize
+// identically, so a reflected own-message echo whose attributedBody decoded with a leading
+// NUL/replacement marker still matches the clean stored send. Kept here (a leaf module with no
+// imports) so the persisted path can reuse it without an echo-cache <-> persisted-echo-cache cycle.
+
+function isLeadingEchoTextCorruptionMarker(code: number): boolean {
+  return (
+    code === 0x0000 || code === 0xfeff || code === 0xfffd || code === 0xfffe || code === 0xffff
+  );
+}
+
+export function stripLeadingEchoTextCorruptionMarkers(text: string): string {
+  let offset = 0;
+  while (offset < text.length && isLeadingEchoTextCorruptionMarker(text.charCodeAt(offset))) {
+    offset += 1;
+  }
+  return offset === 0 ? text : text.slice(offset);
+}
diff --git a/extensions/imessage/src/monitor/monitor-provider.echo-cache.test.ts b/extensions/imessage/src/monitor/monitor-provider.echo-cache.test.ts
@@ -91,6 +91,21 @@ describe("iMessage sent-message echo cache", () => {
     expect(cache.has("acct:imessage:+1555", { text: "Delayed\u0000echo reply" })).toBe(false);
   });
 
+  it("matches a delayed reflected echo with leading corruption markers via the persisted cache", () => {
+    // The persisted 12h cache is the only matcher once the 4s in-memory text TTL expires, so it
+    // must strip leading attributedBody corruption markers exactly like the in-memory key (#93511).
+    const scope = "acct:imessage:+1555";
+    const markers = String.fromCharCode(0x0000, 0xfffd, 0xfffe, 0xffff, 0xfeff);
+    rememberPersistedIMessageEcho({ scope, text: "Delayed echo reply" });
+
+    expect(hasPersistedIMessageEcho({ scope, text: "Delayed echo reply" })).toBe(true);
+    expect(hasPersistedIMessageEcho({ scope, text: `${markers}Delayed echo reply` })).toBe(true);
+    // Leading-only: a mid-string marker stays distinct.
+    expect(
+      hasPersistedIMessageEcho({ scope, text: `Delayed${String.fromCharCode(0x0000)}echo reply` }),
+    ).toBe(false);
+  });
+
   it("matches by outbound message id and ignores placeholder ids", () => {
     vi.useFakeTimers();
     vi.setSystemTime(new Date("2026-02-25T00:00:00Z"));
diff --git a/extensions/imessage/src/monitor/persisted-echo-cache.ts b/extensions/imessage/src/monitor/persisted-echo-cache.ts
@@ -3,6 +3,7 @@ import { createHash } from "node:crypto";
 import type { PluginStateSyncKeyedStore } from "openclaw/plugin-sdk/plugin-state-runtime";
 import { logVerbose } from "openclaw/plugin-sdk/runtime-env";
 import { getIMessageRuntime } from "../runtime.js";
+import { stripLeadingEchoTextCorruptionMarkers } from "./echo-text-corruption.js";
 
 type PersistedEchoEntry = {
   scope: string;
@@ -26,7 +27,14 @@ export const IMESSAGE_SENT_ECHOES_MAX_ENTRIES = 256;
 type PersistedEchoStore = PluginStateSyncKeyedStore<PersistedEchoEntry>;
 
 function normalizeText(text: string | undefined): string | undefined {
-  const normalized = text?.replace(/\r\n?/g, "\n").trim();
+  if (!text) {
+    return undefined;
+  }
+  // Match the in-memory echo-cache key so a reflected echo with a leading attributedBody
+  // corruption marker still matches the clean stored send (the persisted sibling of #93511).
+  const normalized = stripLeadingEchoTextCorruptionMarkers(
+    text.replace(/\r\n?/g, "\n").trim(),
+  ).trim();
   return normalized || undefined;
 }
 
