fix: unify mention gating across providers

src/discord/monitor.tool-result.test.ts

@@ -147,4 +147,59 @@ describe("monitorDiscordProvider tool results", () => {
     expect(sendMock.mock.calls[0][1]).toBe("PFX tool update");
     expect(sendMock.mock.calls[1][1]).toBe("PFX final reply");
   });
+
+  it("accepts guild messages when mentionPatterns match", async () => {
+    config = {
+      messages: { responsePrefix: "PFX" },
+      discord: {
+        dm: { enabled: true },
+        guilds: { "*": { requireMention: true } },
+      },
+      routing: {
+        allowFrom: [],
+        groupChat: { mentionPatterns: ["\\bclawd\\b"] },
+      },
+    };
+    replyMock.mockResolvedValue({ text: "hi" });
+
+    const controller = new AbortController();
+    const run = monitorDiscordProvider({
+      token: "token",
+      abortSignal: controller.signal,
+    });
+
+    const discord = await import("discord.js");
+    const client = await waitForClient();
+    if (!client) throw new Error("Discord client not created");
+
+    client.emit(discord.Events.MessageCreate, {
+      id: "m2",
+      content: "clawd: hello",
+      author: { id: "u1", bot: false, username: "Ada", tag: "Ada#1" },
+      member: { displayName: "Ada" },
+      channelId: "c1",
+      channel: {
+        type: discord.ChannelType.GuildText,
+        name: "general",
+        isSendable: () => false,
+      },
+      guild: { id: "g1", name: "Guild" },
+      mentions: {
+        has: () => false,
+        everyone: false,
+        users: { size: 0 },
+        roles: { size: 0 },
+      },
+      attachments: { first: () => undefined },
+      type: discord.MessageType.Default,
+      createdTimestamp: Date.now(),
+    });
+
+    await flush();
+    controller.abort();
+    await run;
+
+    expect(replyMock).toHaveBeenCalledTimes(1);
+    expect(replyMock.mock.calls[0][0].WasMentioned).toBe(true);
+  });
 });

src/discord/monitor.ts

@@ -18,6 +18,10 @@ import {
 import { chunkText, resolveTextChunkLimit } from "../auto-reply/chunk.js";
 import { hasControlCommand } from "../auto-reply/command-detection.js";
 import { formatAgentEnvelope } from "../auto-reply/envelope.js";
+import {
+  buildMentionRegexes,
+  matchesMentionPatterns,
+} from "../auto-reply/reply/mentions.js";
 import { createReplyDispatcher } from "../auto-reply/reply/reply-dispatcher.js";
 import { getReplyFromConfig } from "../auto-reply/reply.js";
 import type { ReplyPayload } from "../auto-reply/types.js";
@@ -140,6 +144,7 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
   const mediaMaxBytes =
     (opts.mediaMaxMb ?? cfg.discord?.mediaMaxMb ?? 8) * 1024 * 1024;
   const textLimit = resolveTextChunkLimit(cfg, "discord");
+  const mentionRegexes = buildMentionRegexes(cfg);
   const historyLimit = Math.max(
     0,
     opts.historyLimit ?? cfg.discord?.historyLimit ?? 20,
@@ -202,13 +207,15 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
         return;
       }
       const botId = client.user?.id;
-      const wasMentioned =
-        !isDirectMessage && Boolean(botId && message.mentions.has(botId));
       const forwardedSnapshot = resolveForwardedSnapshot(message);
       const forwardedText = forwardedSnapshot
         ? resolveDiscordSnapshotText(forwardedSnapshot.snapshot)
         : "";
       const baseText = resolveDiscordMessageText(message, forwardedText);
+      const wasMentioned =
+        !isDirectMessage &&
+        (Boolean(botId && message.mentions.has(botId)) ||
+          matchesMentionPatterns(baseText, mentionRegexes));
       if (shouldLogVerbose()) {
         logVerbose(
           `discord: inbound id=${message.id} guild=${message.guild?.id ?? "dm"} channel=${message.channelId} mention=${wasMentioned ? "yes" : "no"} type=${isDirectMessage ? "dm" : isGroupDm ? "group-dm" : "guild"} content=${baseText ? "yes" : "no"}`,
@@ -309,8 +316,9 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
         !hasAnyMention &&
         commandAuthorized &&
         hasControlCommand(baseText);
-      if (isGuildMessage && resolvedRequireMention) {
-        if (botId && !wasMentioned && !shouldBypassMention) {
+      const canDetectMention = Boolean(botId) || mentionRegexes.length > 0;
+      if (isGuildMessage && resolvedRequireMention && canDetectMention) {
+        if (!wasMentioned && !shouldBypassMention) {
           logVerbose(
             `discord: drop guild message (mention required, botId=${botId})`,
           );