fix(imessage): normalize leading echo-cache corruption bytes

openclaw-clownfish[bot] · openclaw-clownfish[bot] · commit febe43f51ebb · 2026-04-29T02:33:12.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ Docs: https://docs.openclaw.ai
 
 ### Fixes
 
+- Channels/iMessage: strip only known leading attributedBody corruption markers from echo-cache text keys so reflected outbound replies are still deduped without dropping interior replacement or control characters. Fixes #41330; refs #59973; carries forward #62191. Thanks @maguilar631697.
 - Gateway/shutdown: report structured shutdown warnings and HTTP close timeout warnings through `ShutdownResult` while preserving lifecycle hook hardening. Carries forward #41296. Thanks @edenfunf.
 - Plugins/QA: prebuild the private QA channel runtime before plugin gauntlet source runs so wrapper CPU/RSS measurements are not polluted by private QA dist rebuild work. Thanks @vincentkoc.
 - Gateway/reload: bound default restart deferral and SIGUSR1 restart drain to five minutes while preserving explicit `deferralTimeoutMs: 0` indefinite waits, so stale active work accounting cannot block config reloads forever. Thanks @vincentkoc.
diff --git a/extensions/imessage/src/monitor/echo-cache.ts b/extensions/imessage/src/monitor/echo-cache.ts
@@ -23,11 +23,30 @@ export type SentMessageCache = {
 const SENT_MESSAGE_TEXT_TTL_MS = 4_000;
 const SENT_MESSAGE_ID_TTL_MS = 60_000;
 
+function isLeadingIMessageEchoCorruptionCode(code: number): boolean {
+  return (
+    code <= 0x1f ||
+    code === 0x7f ||
+    (code >= 0x80 && code <= 0x9f) ||
+    code === 0xfffd ||
+    code === 0xfffe ||
+    code === 0xffff
+  );
+}
+
+function stripLeadingIMessageEchoCorruption(text: string): string {
+  let index = 0;
+  while (index < text.length && isLeadingIMessageEchoCorruptionCode(text.charCodeAt(index))) {
+    index += 1;
+  }
+  return index === 0 ? text : text.slice(index);
+}
+
 function normalizeEchoTextKey(text: string | undefined): string | null {
   if (!text) {
     return null;
   }
-  const normalized = text.replace(/\r\n?/g, "\n").trim();
+  const normalized = stripLeadingIMessageEchoCorruption(text.replace(/\r\n?/g, "\n")).trim();
   return normalized ? normalized : null;
 }
 
diff --git a/extensions/imessage/src/monitor/monitor-provider.echo-cache.test.ts b/extensions/imessage/src/monitor/monitor-provider.echo-cache.test.ts
@@ -17,6 +17,44 @@ describe("iMessage sent-message echo cache", () => {
     expect(cache.has("acct:imessage:+1666", { text: "Reasoning:\n_step_" })).toBe(false);
   });
 
+  it("matches delayed reflected text after known leading attributedBody corruption markers", () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-02-25T00:00:00Z"));
+    const cache = createSentMessageCache();
+    const scope = "acct:imessage:+1555";
+    const leadingCorruption = String.fromCharCode(
+      0xfffd,
+      0xfffe,
+      0xffff,
+      0x00,
+      0x1f,
+      0x7f,
+      0x80,
+      0x9f,
+    );
+
+    cache.remember(scope, { text: "Cached reply\tline\nwith interior \ufffd intact" });
+    vi.advanceTimersByTime(3_000);
+
+    expect(
+      cache.has(scope, {
+        text: `${leadingCorruption}Cached reply\tline\nwith interior \ufffd intact`,
+        messageId: "123456",
+      }),
+    ).toBe(true);
+  });
+
+  it("preserves interior corruption-looking user text while stripping only the prefix", () => {
+    const cache = createSentMessageCache();
+    const scope = "acct:imessage:+1555";
+    const textWithInteriorMarkers = "Keep \ufffd and \u0001 inside\nnext\tline";
+
+    cache.remember(scope, { text: textWithInteriorMarkers });
+
+    expect(cache.has(scope, { text: `\u0002${textWithInteriorMarkers}` })).toBe(true);
+    expect(cache.has(scope, { text: "Keep  and  inside\nnext\tline" })).toBe(false);
+  });
+
   it("matches by outbound message id and ignores placeholder ids", () => {
     vi.useFakeTimers();
     vi.setSystemTime(new Date("2026-02-25T00:00:00Z"));
