@poolzin/pool-bot 2026.2.24 → 2026.2.26

package/dist/discord/monitor/listeners.js

@@ -28,6 +28,27 @@ function logSlowDiscordListener(params) {
         consoleMessage: message,
     });
 }
+async function runDiscordListenerWithSlowLog(params) {
+    const startedAt = Date.now();
+    try {
+        await params.run();
+    }
+    catch (err) {
+        if (params.onError) {
+            params.onError(err);
+            return;
+        }
+        throw err;
+    }
+    finally {
+        logSlowDiscordListener({
+            logger: params.logger,
+            listener: params.listener,
+            event: params.event,
+            durationMs: Date.now() - startedAt,
+        });
+    }
+}
 export function registerDiscordListener(listeners, listener) {
     if (listeners.some((existing) => existing.constructor === listener.constructor)) {
         return false;
@@ -44,20 +65,15 @@ export class DiscordMessageListener extends MessageCreateListener {
         this.logger = logger;
     }
     async handle(data, client) {
-        const startedAt = Date.now();
-        const task = Promise.resolve(this.handler(data, client));
-        void task
-            .catch((err) => {
-            const logger = this.logger ?? discordEventQueueLog;
-            logger.error(danger(`discord handler failed: ${String(err)}`));
-        })
-            .finally(() => {
-            logSlowDiscordListener({
-                logger: this.logger,
-                listener: this.constructor.name,
-                event: this.type,
-                durationMs: Date.now() - startedAt,
-            });
+        await runDiscordListenerWithSlowLog({
+            logger: this.logger,
+            listener: this.constructor.name,
+            event: this.type,
+            run: () => this.handler(data, client),
+            onError: (err) => {
+                const logger = this.logger ?? discordEventQueueLog;
+                logger.error(danger(`discord handler failed: ${String(err)}`));
+            },
         });
     }
 }
@@ -96,9 +112,11 @@ export class DiscordReactionRemoveListener extends MessageReactionRemoveListener
     }
 }
 async function runDiscordReactionHandler(params) {
-    const startedAt = Date.now();
-    try {
-        await handleDiscordReactionEvent({
+    await runDiscordListenerWithSlowLog({
+        logger: params.handlerParams.logger,
+        listener: params.listener,
+        event: params.event,
+        run: () => handleDiscordReactionEvent({
             data: params.data,
             client: params.client,
             action: params.action,
@@ -107,16 +125,8 @@ async function runDiscordReactionHandler(params) {
             botUserId: params.handlerParams.botUserId,
             guildEntries: params.handlerParams.guildEntries,
             logger: params.handlerParams.logger,
-        });
-    }
-    finally {
-        logSlowDiscordListener({
-            logger: params.handlerParams.logger,
-            listener: params.listener,
-            event: params.event,
-            durationMs: Date.now() - startedAt,
-        });
-    }
+        }),
+    });
 }
 async function handleDiscordReactionEvent(params) {
     try {

package/dist/discord/monitor/message-handler.js

@@ -3,7 +3,7 @@ import { createInboundDebouncer, resolveInboundDebounceMs, } from "../../auto-re
 import { danger } from "../../globals.js";
 import { preflightDiscordMessage } from "./message-handler.preflight.js";
 import { processDiscordMessage } from "./message-handler.process.js";
-import { resolveDiscordMessageChannelId, resolveDiscordMessageText } from "./message-utils.js";
+import { hasDiscordMessageStickers, resolveDiscordMessageChannelId, resolveDiscordMessageText, } from "./message-utils.js";
 export function createDiscordMessageHandler(params) {
     const groupPolicy = params.discordConfig?.groupPolicy ?? "open";
     const ackReactionScope = params.cfg.messages?.ackReactionScope ?? "group-mentions";
@@ -33,6 +33,9 @@ export function createDiscordMessageHandler(params) {
             if (message.attachments && message.attachments.length > 0) {
                 return false;
             }
+            if (hasDiscordMessageStickers(message)) {
+                return false;
+            }
             const baseText = resolveDiscordMessageText(message, { includeForwarded: false });
             if (!baseText.trim()) {
                 return false;

package/dist/discord/monitor/message-handler.preflight.js

@@ -16,6 +16,7 @@ import { getChildLogger } from "../../logging.js";
 import { buildPairingReply } from "../../pairing/pairing-messages.js";
 import { readChannelAllowFromStore, upsertChannelPairingRequest, } from "../../pairing/pairing-store.js";
 import { resolveAgentRoute } from "../../routing/resolve-route.js";
+import { resolveAgentIdFromSessionKey } from "../../routing/session-key.js";
 import { fetchPluralKitMessageInfo } from "../pluralkit.js";
 import { sendMessageDiscord } from "../send.js";
 import { allowListMatches, isDiscordGroupAllowedByPolicy, normalizeDiscordAllowList, normalizeDiscordSlug, resolveDiscordAllowListMatch, resolveDiscordChannelConfigWithFallback, resolveDiscordGuildEntry, resolveDiscordMemberAccessState, resolveDiscordShouldRequireMention, resolveGroupDmAllow, } from "./allow-list.js";
@@ -23,7 +24,33 @@ import { formatDiscordUserTag, resolveDiscordSystemLocation, resolveTimestampMs,
 import { resolveDiscordChannelInfo, resolveDiscordMessageChannelId, resolveDiscordMessageText, } from "./message-utils.js";
 import { resolveDiscordSenderIdentity, resolveDiscordWebhookId } from "./sender-identity.js";
 import { resolveDiscordSystemEvent } from "./system-events.js";
+import { isRecentlyUnboundThreadWebhookMessage, } from "./thread-bindings.js";
 import { resolveDiscordThreadChannel, resolveDiscordThreadParentInfo } from "./threading.js";
+export function resolvePreflightMentionRequirement(params) {
+    if (!params.shouldRequireMention) {
+        return false;
+    }
+    return !params.isBoundThreadSession;
+}
+export function shouldIgnoreBoundThreadWebhookMessage(params) {
+    const webhookId = params.webhookId?.trim() || "";
+    if (!webhookId) {
+        return false;
+    }
+    const boundWebhookId = params.threadBinding?.webhookId?.trim() || "";
+    if (!boundWebhookId) {
+        const threadId = params.threadId?.trim() || "";
+        if (!threadId) {
+            return false;
+        }
+        return isRecentlyUnboundThreadWebhookMessage({
+            accountId: params.accountId,
+            threadId,
+            webhookId,
+        });
+    }
+    return webhookId === boundWebhookId;
+}
 export async function preflightDiscordMessage(params) {
     const logger = getChildLogger({ module: "discord-auto-reply" });
     const message = params.data.message;
@@ -91,7 +118,7 @@ export async function preflightDiscordMessage(params) {
             return null;
         }
         if (dmPolicy !== "open") {
-            const storeAllowFrom = await readChannelAllowFromStore("discord").catch(() => []);
+            const storeAllowFrom = dmPolicy === "allowlist" ? [] : await readChannelAllowFromStore("discord").catch(() => []);
             const effectiveAllowFrom = [...(params.allowFrom ?? []), ...storeAllowFrom];
             const allowList = normalizeDiscordAllowList(effectiveAllowFrom, ["discord:", "user:", "pk:"]);
             const allowMatch = allowList
@@ -196,7 +223,28 @@ export async function preflightDiscordMessage(params) {
         // Pass parent peer for thread binding inheritance
         parentPeer: earlyThreadParentId ? { kind: "channel", id: earlyThreadParentId } : undefined,
     });
-    const mentionRegexes = buildMentionRegexes(params.cfg, route.agentId);
+    const threadBinding = earlyThreadChannel
+        ? params.threadBindings?.getByThreadId(messageChannelId)
+        : undefined;
+    if (shouldIgnoreBoundThreadWebhookMessage({
+        accountId: params.accountId,
+        threadId: messageChannelId,
+        webhookId,
+        threadBinding,
+    })) {
+        logVerbose(`discord: drop bound-thread webhook echo message ${message.id}`);
+        return null;
+    }
+    const boundSessionKey = threadBinding?.targetSessionKey?.trim();
+    const boundAgentId = boundSessionKey ? resolveAgentIdFromSessionKey(boundSessionKey) : undefined;
+    const effectiveRoute = boundSessionKey
+        ? {
+            ...route,
+            sessionKey: boundSessionKey,
+            agentId: boundAgentId ?? route.agentId,
+        }
+        : route;
+    const mentionRegexes = buildMentionRegexes(params.cfg, effectiveRoute.agentId);
     const explicitlyMentioned = Boolean(botId && message.mentionedUsers?.some((user) => user.id === botId));
     const hasAnyMention = Boolean(!isDirectMessage &&
         (message.mentionedEveryone ||
@@ -237,7 +285,7 @@ export async function preflightDiscordMessage(params) {
         (params.data.guild?.name ? normalizeDiscordSlug(params.data.guild.name) : "");
     const threadChannelSlug = channelName ? normalizeDiscordSlug(channelName) : "";
     const threadParentSlug = threadParentName ? normalizeDiscordSlug(threadParentName) : "";
-    const baseSessionKey = route.sessionKey;
+    const baseSessionKey = effectiveRoute.sessionKey;
     const channelConfig = isGuildMessage
         ? resolveDiscordChannelConfigWithFallback({
             guildInfo,
@@ -313,7 +361,7 @@ export async function preflightDiscordMessage(params) {
         }
         : undefined;
     const threadOwnerId = threadChannel ? (threadChannel.ownerId ?? channelInfo?.ownerId) : undefined;
-    const shouldRequireMention = resolveDiscordShouldRequireMention({
+    const shouldRequireMentionByConfig = resolveDiscordShouldRequireMention({
         isGuildMessage,
         isThread: Boolean(threadChannel),
         botId,
@@ -321,6 +369,11 @@ export async function preflightDiscordMessage(params) {
         channelConfig,
         guildInfo,
     });
+    const isBoundThreadSession = Boolean(boundSessionKey && threadChannel);
+    const shouldRequireMention = resolvePreflightMentionRequirement({
+        shouldRequireMention: shouldRequireMentionByConfig,
+        isBoundThreadSession,
+    });
     // Preflight audio transcription for mention detection in guilds
     // This allows voice notes to be checked for mentions before being dropped
     let preflightTranscript;
@@ -432,7 +485,7 @@ export async function preflightDiscordMessage(params) {
         commandAuthorized,
     });
     const effectiveWasMentioned = mentionGate.effectiveWasMentioned;
-    logDebug(`[discord-preflight] shouldRequireMention=${shouldRequireMention} mentionGate.shouldSkip=${mentionGate.shouldSkip} wasMentioned=${wasMentioned}`);
+    logDebug(`[discord-preflight] shouldRequireMention=${shouldRequireMention} baseRequireMention=${shouldRequireMentionByConfig} boundThreadSession=${isBoundThreadSession} mentionGate.shouldSkip=${mentionGate.shouldSkip} wasMentioned=${wasMentioned}`);
     if (isGuildMessage && shouldRequireMention) {
         if (botId && mentionGate.shouldSkip) {
             logDebug(`[discord-preflight] drop: no-mention`);
@@ -465,7 +518,7 @@ export async function preflightDiscordMessage(params) {
     if (systemText) {
         logDebug(`[discord-preflight] drop: system event`);
         enqueueSystemEvent(systemText, {
-            sessionKey: route.sessionKey,
+            sessionKey: effectiveRoute.sessionKey,
             contextKey: `discord:system:${messageChannelId}:${message.id}`,
         });
         return null;
@@ -475,7 +528,7 @@ export async function preflightDiscordMessage(params) {
         logVerbose(`discord: drop message ${message.id} (empty content)`);
         return null;
     }
-    logDebug(`[discord-preflight] success: route=${route.agentId} sessionKey=${route.sessionKey}`);
+    logDebug(`[discord-preflight] success: route=${effectiveRoute.agentId} sessionKey=${effectiveRoute.sessionKey}`);
     return {
         cfg: params.cfg,
         discordConfig: params.discordConfig,
@@ -505,7 +558,10 @@ export async function preflightDiscordMessage(params) {
         baseText,
         messageText,
         wasMentioned,
-        route,
+        route: effectiveRoute,
+        threadBinding,
+        boundSessionKey: boundSessionKey || undefined,
+        boundAgentId,
         guildInfo,
         guildSlug,
         threadChannel,
@@ -528,5 +584,6 @@ export async function preflightDiscordMessage(params) {
         effectiveWasMentioned,
         canDetectMention,
         historyEntry,
+        threadBindings: params.threadBindings,
     };
 }