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

vincentkoc · vincentkoc · commit eec4bb724d08 · 2026-04-28T18:42:30.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ Docs: https://docs.openclaw.ai
 
 ### Fixes
 
+- iMessage/echo cache: strip only leading imsg corruption bytes from reflected text keys while preserving interior control characters, so duplicate-reply suppression does not collapse unrelated messages. (#62191) Thanks @maguilar631697.
 - NVIDIA/NIM: persist the `NVIDIA_API_KEY` provider marker and mark bundled NVIDIA Chat Completions models as string-content compatible, so NIM models load from `models.json` and OpenAI-compatible subagent calls send plain text content. Fixes #73013 and #50107; refs #73014. Thanks @bautrey, @iot2edge, @ifearghal, and @futhgar.
 - Channels/Discord: let text-only configs drop the `GuildVoiceStates` gateway intent and expose a bounded `/gateway/bot` metadata timeout with rate-limited fallback logs, reducing idle CPU and warning floods. Fixes #73709 and #73585. Thanks @sanchezm86 and @trac3r00.
 - CLI/plugins: use plugin metadata snapshots for install slot selection and add opt-in plugin lifecycle timing traces, so plugin install avoids runtime-loading the plugin registry for metadata-only decisions. Thanks @shakkernerd.
diff --git a/extensions/imessage/src/monitor/echo-cache.ts b/extensions/imessage/src/monitor/echo-cache.ts
@@ -23,18 +23,16 @@ export type SentMessageCache = {
 const SENT_MESSAGE_TEXT_TTL_MS = 4_000;
 const SENT_MESSAGE_ID_TTL_MS = 60_000;
 
-// U+FFFD replacement characters and C0/C1 control characters that imsg injects when
-// extracting text from NSAttributedString (attributedBody column). The pattern intentionally
-// matches control characters to strip garbage from echo cache keys. See: #61312, #61821
+// U+FFFD replacement characters and C0/C1 control characters that imsg can prepend when
+// extracting text from NSAttributedString (attributedBody column). Keep interior text intact.
 // eslint-disable-next-line no-control-regex
-const IMSG_GARBAGE_CHARS_RE =
-  /[\ufffd\ufffe\uffff\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f-\u009f]+/g;
+const LEADING_IMSG_GARBAGE_CHARS_RE = /^[\ufffd\ufffe\uffff\u0000-\u001f\u007f-\u009f]+/;
 
 function normalizeEchoTextKey(text: string | undefined): string | null {
   if (!text) {
     return null;
   }
-  const normalized = text.replace(IMSG_GARBAGE_CHARS_RE, "").replace(/\r\n?/g, "\n").trim();
+  const normalized = text.replace(LEADING_IMSG_GARBAGE_CHARS_RE, "").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,27 @@ describe("iMessage sent-message echo cache", () => {
     expect(cache.has("acct:imessage:+1666", { text: "Reasoning:\n_step_" })).toBe(false);
   });
 
+  it("strips leading imsg corruption bytes from text keys", () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-02-25T00:00:00Z"));
+    const cache = createSentMessageCache();
+
+    cache.remember("acct:imessage:+1555", { text: "\ufffd\u0000Reasoning:\n\t_step_" });
+
+    expect(cache.has("acct:imessage:+1555", { text: "Reasoning:\n\t_step_" })).toBe(true);
+  });
+
+  it("preserves interior control characters in text keys", () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-02-25T00:00:00Z"));
+    const cache = createSentMessageCache();
+
+    cache.remember("acct:imessage:+1555", { text: "alpha\u0007beta\n\tgamma" });
+
+    expect(cache.has("acct:imessage:+1555", { text: "alpha\u0007beta\n\tgamma" })).toBe(true);
+    expect(cache.has("acct:imessage:+1555", { text: "alphabeta\n\tgamma" })).toBe(false);
+  });
+
   it("matches by outbound message id and ignores placeholder ids", () => {
     vi.useFakeTimers();
     vi.setSystemTime(new Date("2026-02-25T00:00:00Z"));
