fix(imessage): normalize echo-cache text prefixes

vincentkoc · vincentkoc · commit 780395a4c2ef · 2026-04-28T07:16:30.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ Docs: https://docs.openclaw.ai
 
 ### Fixes
 
+- Channels/iMessage: normalize leading attributed-text, replacement, and control corruption bytes before sent-message echo-cache text matching, while ignoring all-prefix/all-control keys so echoed agent replies are deduped without suppressing intentional message body text. Carries forward #66169; covers #62191. Thanks @coder999999999 and @maguilar631697.
 - Agents/models: keep per-agent primary models strict when `fallbacks` is omitted, so probe-only custom providers are not tried as hidden fallback candidates unless the agent explicitly opts in. Fixes #73332. Thanks @haumanto.
 - Cron/Telegram: preserve explicit `:topic:` delivery targets over stale session-derived thread IDs when isolated cron announces to Telegram forum topics. Carries forward #59069; refs #49704 and #43808. Thanks @roytong9.
 - Build/runtime: write the runtime-postbuild stamp after `pnpm build` writes the build stamp, so the next CLI invocation does not re-sync runtime artifacts after a successful build. Fixes #73151. Thanks @bittoby.
diff --git a/extensions/imessage/src/monitor/echo-cache.ts b/extensions/imessage/src/monitor/echo-cache.ts
@@ -52,16 +52,17 @@ function stripLeadingIMessageAttributedTextPrefix(text: string): string {
     if (!first) {
       break;
     }
-    const second = text[offset + 1];
-    const third = text[offset + 2];
-    if (
-      isHighAttributedLeadChar(first) &&
-      third &&
-      isLowControlOrReplacementChar(third) &&
-      (!second || isAsciiPrintableChar(second))
-    ) {
-      offset += second ? 3 : 2;
-      continue;
+    if (isHighAttributedLeadChar(first)) {
+      const second = text[offset + 1];
+      const third = text[offset + 2];
+      if (second && third && isAsciiPrintableChar(second) && isLowControlOrReplacementChar(third)) {
+        offset += 3;
+        continue;
+      }
+      if (second && isLowControlOrReplacementChar(second)) {
+        offset += 2;
+        continue;
+      }
     }
 
     let runEnd = offset;
@@ -80,8 +81,7 @@ function stripLeadingIMessageAttributedTextPrefix(text: string): string {
     break;
   }
 
-  const stripped = offset > 0 ? text.slice(offset) : text;
-  return stripped || text;
+  return offset > 0 ? text.slice(offset) : text;
 }
 
 function normalizeEchoTextKey(text: string | undefined): string | 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
@@ -60,4 +60,54 @@ describe("iMessage sent-message echo cache", () => {
       ),
     ).toBe(true);
   });
+
+  it("strips two-byte attributed-text prefixes before text fallback matching", () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-02-25T00:00:00Z"));
+    const cache = createSentMessageCache();
+
+    cache.remember("acct:imessage:+1555", {
+      text: "Confirmed full access",
+      messageId: "p:0/GUID-outbound",
+    });
+
+    expect(
+      cache.has(
+        "acct:imessage:+1555",
+        { text: "\u0093\u0002Confirmed full access", messageId: "123800" },
+        true,
+      ),
+    ).toBe(true);
+  });
+
+  it("strips replacement/control prefixes before text fallback matching", () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-02-25T00:00:00Z"));
+    const cache = createSentMessageCache();
+
+    cache.remember("acct:imessage:+1555", {
+      text: "Confirmed full access",
+      messageId: "p:0/GUID-outbound",
+    });
+
+    expect(
+      cache.has(
+        "acct:imessage:+1555",
+        { text: "\uFFFD\u0000\u0001Confirmed full access", messageId: "123801" },
+        true,
+      ),
+    ).toBe(true);
+  });
+
+  it("does not cache all-prefix or all-control text keys", () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-02-25T00:00:00Z"));
+    const cache = createSentMessageCache();
+
+    cache.remember("acct:imessage:+1555", { text: "\u0093\u0002" });
+    cache.remember("acct:imessage:+1555", { text: "\uFFFD\u0000\u0001" });
+
+    expect(cache.has("acct:imessage:+1555", { text: "\u0093\u0002" })).toBe(false);
+    expect(cache.has("acct:imessage:+1555", { text: "\uFFFD\u0000\u0001" })).toBe(false);
+  });
 });
