Merge 4f323f0 into 53fe2e4

omarshahine · web-flow · commit fed24523cc8a · 2026-07-01T18:22:42.000Z
diff --git a/src/agents/tools/message-tool.test.ts b/src/agents/tools/message-tool.test.ts
@@ -493,7 +493,7 @@ describe("message tool gateway timeout", () => {
 describe("poll vote echo guard", () => {
   const currentChat = "iMessage;-;+15550001111";
 
-  function createPollVoteTool() {
+  function createPollVoteTool(votedOption = "Blue") {
     setActivePluginRegistry(
       createTestRegistry([
         {
@@ -525,7 +525,7 @@ describe("poll vote echo guard", () => {
             payload: {},
             toolResult: {
               content: [{ type: "text", text: "vote cast" }],
-              details: { pollVotedOption: "Blue" },
+              details: { pollVotedOption: votedOption },
             },
             dryRun: false,
           } as MessageActionRunResult)
@@ -575,6 +575,37 @@ describe("poll vote echo guard", () => {
     expect(mocks.runMessageAction).toHaveBeenCalledTimes(1);
   });
 
+  it("suppresses an emoji-suffixed option echoed with a leading emoji", async () => {
+    // Live regression: iMessage poll options carry a trailing emoji
+    // ("Lobster 🦞 ") while the agent echoes a leading one ("🦞 Lobster.").
+    // A leading-only emoji strip left "lobster 🦞" != "lobster" and leaked.
+    const tool = createPollVoteTool("Lobster 🦞 ");
+    await castBlueVote(tool);
+
+    const result = await tool.execute("send", {
+      action: "send",
+      channel: "imessage",
+      message: "🦞 Lobster.",
+    });
+
+    expect(result.details).toMatchObject({ status: "suppressed", reason: "poll_vote_echo" });
+    expect(mocks.runMessageAction).toHaveBeenCalledTimes(1);
+  });
+
+  it("does not suppress a different keycap option with the same words", async () => {
+    const tool = createPollVoteTool("Option 1️⃣");
+    await castBlueVote(tool);
+
+    const result = await tool.execute("send", {
+      action: "send",
+      channel: "imessage",
+      message: "2️⃣ Option.",
+    });
+
+    expect(result.details).not.toMatchObject({ status: "suppressed" });
+    expect(mocks.runMessageAction).toHaveBeenCalledTimes(2);
+  });
+
   it("does not cross accounts, delivery targets, or conflicting target fields", async () => {
     const accountTool = createPollVoteTool();
     await castBlueVote(accountTool);
diff --git a/src/agents/tools/message-tool.ts b/src/agents/tools/message-tool.ts
@@ -82,6 +82,7 @@ import {
   resolveGatewayOptions,
   type GatewayCallOptions,
 } from "./gateway.js";
+import { isPollVoteEchoText } from "./poll-vote-echo.js";
 
 const AllMessageActions = CHANNEL_MESSAGE_ACTION_NAMES;
 const MESSAGE_TOOL_THREAD_READ_HINT =
@@ -172,14 +173,6 @@ type VisibleTextSuppressionReason =
 
 const POLL_VOTE_ECHO_TTL_MS = 30_000;
 
-function normalizePollEchoText(text: string): string {
-  return text
-    .replace(/^[\p{Extended_Pictographic}️‍]+\s+/u, "")
-    .replace(/[.!?\s]+$/u, "")
-    .trim()
-    .toLowerCase();
-}
-
 function resolvePollVoteEchoRoute(params: {
   action: ChannelMessageActionName;
   args: Record<string, unknown>;
@@ -1399,12 +1392,7 @@ export function createMessageTool(options?: MessageToolOptions): AnyAgentTool {
             readStringParam(params, "text") ??
             readStringParam(params, "message") ??
             readStringParam(params, "content");
-          const normalizedOption = normalizePollEchoText(vote.option);
-          if (
-            outboundText &&
-            normalizedOption &&
-            normalizePollEchoText(outboundText) === normalizedOption
-          ) {
+          if (outboundText && isPollVoteEchoText(vote.option, outboundText)) {
             return jsonResult({
               status: "suppressed",
               reason: "poll_vote_echo" satisfies VisibleTextSuppressionReason,
diff --git a/src/agents/tools/poll-vote-echo.test.ts b/src/agents/tools/poll-vote-echo.test.ts
@@ -0,0 +1,34 @@
+import { describe, expect, it } from "vitest";
+import { isPollVoteEchoText } from "./poll-vote-echo.js";
+
+describe("isPollVoteEchoText", () => {
+  it.each([
+    ["Lobster 🦞 ", "🦞 Lobster."],
+    ["USA 🇺🇸 ", "🇺🇸 USA."],
+    ["Scotland 🏴󠁧󠁢󠁳󠁣󠁴󠁿", "🏴󠁧󠁢󠁳󠁣󠁴󠁿 Scotland."],
+    ["Team 👍🏽", "👍🏽 Team."],
+    ["Family 👨‍👩‍👧", "👨‍👩‍👧 Family."],
+    ["Option 1️⃣", "1️⃣ Option."],
+    ["1️⃣", "1️⃣"],
+    ["Blue", "Blue!"],
+    ["Blue", "🦞 Blue."],
+    ["Lobster 🦞", "Lobster."],
+    ["🍎", "🍎"],
+  ])("matches the same label and emoji signature: %s", (option, outboundText) => {
+    expect(isPollVoteEchoText(option, outboundText)).toBe(true);
+  });
+
+  it.each([
+    ["Option 1️⃣", "2️⃣ Option."],
+    ["1️⃣", "2️⃣"],
+    ["1", "1️⃣"],
+    ["Lobster 🦞", "🦀 Lobster."],
+    ["C#", "C"],
+    ["C++", "C"],
+    ["Node.js", "Node js"],
+    ["Blue", "Red"],
+    ["", ""],
+  ])("does not collapse distinct labels or emoji: %s / %s", (option, outboundText) => {
+    expect(isPollVoteEchoText(option, outboundText)).toBe(false);
+  });
+});
diff --git a/src/agents/tools/poll-vote-echo.ts b/src/agents/tools/poll-vote-echo.ts
@@ -0,0 +1,40 @@
+type NormalizedPollEchoText = {
+  emojiSignature: string;
+  words: string;
+};
+
+// Keep the emoji identity while ignoring where it appears. Messages stores poll
+// options with a trailing emoji, while models commonly restate the same emoji
+// before the label. Retaining the signature avoids collapsing distinct options.
+const POLL_ECHO_EMOJI_SEQUENCE =
+  /(?:[0-9#*]\u{FE0F}?\u{20E3}|(?:\p{Extended_Pictographic}|\p{Regional_Indicator}|\p{Emoji_Modifier}|[\u{E0020}-\u{E007F}]|\u{FE0E}|\u{FE0F}|\u{200D})+)/gu;
+
+function normalizePollEchoText(text: string): NormalizedPollEchoText {
+  let emojiSignature = "";
+  const words = text
+    .replace(POLL_ECHO_EMOJI_SEQUENCE, (emoji) => {
+      emojiSignature += emoji.replace(/[\u{FE0E}\u{FE0F}]/gu, "");
+      return " ";
+    })
+    .replace(/\s+/gu, " ")
+    .trim()
+    .replace(/[.!?]+$/u, "")
+    .trim()
+    .toLowerCase();
+  return { emojiSignature, words };
+}
+
+export function isPollVoteEchoText(option: string, outboundText: string): boolean {
+  const normalizedOption = normalizePollEchoText(option);
+  const normalizedOutbound = normalizePollEchoText(outboundText);
+  const optionHasContent = Boolean(normalizedOption.words || normalizedOption.emojiSignature);
+  if (!optionHasContent || normalizedOption.words !== normalizedOutbound.words) {
+    return false;
+  }
+  if (normalizedOption.emojiSignature && normalizedOutbound.emojiSignature) {
+    return normalizedOption.emojiSignature === normalizedOutbound.emojiSignature;
+  }
+  // A model may add or omit a decorative emoji around a word label. Emoji-only
+  // options still require an exact signature so unrelated symbols never match.
+  return Boolean(normalizedOption.words);
+}
