@0xmaxma/claude-gateway 1.3.23 → 1.3.25

package/dist/discord/receiver.js

@@ -39,6 +39,11 @@ const path = __importStar(require("path"));
 const logger_1 = require("../logger");
 const AUTO_RESTART_DELAY_MS = 5000;
 const MAX_RESTARTS = 3;
+// After MAX_RESTARTS fast attempts, fall back to a slow indefinite retry
+// instead of giving up permanently — self-heals if the admin fixes the
+// underlying cause later (e.g. a Discord Developer Portal intent toggle)
+// without needing to notice and manually reconnect.
+const SLOW_RESTART_DELAY_MS = 5 * 60000;
 class DiscordReceiver {
     constructor(agentConfig, callbackPort, logDir) {
         this.agentConfig = agentConfig;
@@ -47,12 +52,14 @@ class DiscordReceiver {
         this.process = null;
         this.stopping = false;
         this.restartCount = 0;
+        this.slowPhaseAnnounced = false;
         this.restartTimer = null;
         this.logger = (0, logger_1.createLogger)(`${agentConfig.id}:discord-receiver`, logDir);
     }
     start() {
         this.stopping = false;
         this.restartCount = 0;
+        this.slowPhaseAnnounced = false;
         this.spawnProcess();
     }
     spawnProcess() {
@@ -63,6 +70,10 @@ class DiscordReceiver {
                 ...process.env,
                 DISCORD_BOT_TOKEN: this.agentConfig.discord?.botToken ?? '',
                 DISCORD_STATE_DIR: stateDir,
+                // Legacy seed value: when no explicit dmPolicy is configured (the common
+                // token-only case), 'pairing' flows through access.ts:migrateAccess to
+                // { dmPolicy:'allowlist', pairing:true } — i.e. a new agent comes up with
+                // pairing ON so the owner can DM the bot and self-approve via a code.
                 DISCORD_DM_POLICY: this.agentConfig.discord?.dmPolicy ?? 'pairing',
                 DISCORD_DM_ALLOWLIST: (this.agentConfig.discord?.dmAllowlist ?? []).join(','),
                 DISCORD_GUILD_ALLOWLIST: (this.agentConfig.discord?.guildAllowlist ?? []).join(','),
@@ -84,19 +95,26 @@ class DiscordReceiver {
         this.logger.info('DiscordReceiver started');
     }
     scheduleRestart() {
-        if (this.restartCount >= MAX_RESTARTS) {
-            this.logger.error('DiscordReceiver max restarts reached');
-            return;
+        const slowPhase = this.restartCount >= MAX_RESTARTS;
+        const delay = slowPhase ? SLOW_RESTART_DELAY_MS : AUTO_RESTART_DELAY_MS;
+        if (!slowPhase)
+            this.restartCount++;
+        // Surface the transition into indefinite slow-retry once at error level so a
+        // permanently-broken config (bad token, missing intent) is visible instead
+        // of hiding behind a steady stream of warn-level retry lines.
+        if (slowPhase && !this.slowPhaseAnnounced) {
+            this.slowPhaseAnnounced = true;
+            this.logger.error(`DiscordReceiver failed ${MAX_RESTARTS} fast restarts; switching to slow retry every ${SLOW_RESTART_DELAY_MS}ms — check the bot token and Developer Portal intents`);
         }
-        this.restartCount++;
-        this.logger.warn(`Restarting DiscordReceiver in ${AUTO_RESTART_DELAY_MS}ms`, {
+        this.logger.warn(`Restarting DiscordReceiver in ${delay}ms`, {
             attempt: this.restartCount,
+            slowPhase,
         });
         this.restartTimer = setTimeout(() => {
             this.restartTimer = null;
             if (!this.stopping)
                 this.spawnProcess();
-        }, AUTO_RESTART_DELAY_MS);
+        }, delay);
     }
     stop() {
         this.stopping = true;

package/dist/discord/receiver.js.map

@@ -1 +1 @@
-{"version":3,"file":"receiver.js","sourceRoot":"","sources":["../../src/discord/receiver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"receiver.js","sourceRoot":"","sources":["../../src/discord/receiver.ts"],"names":[],"mappings":"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"}

package/dist/telegram/receiver.d.ts

@@ -6,6 +6,7 @@ export declare class TelegramReceiver {
     private process;
     private stopping;
     private restartCount;
+    private slowPhaseAnnounced;
     private restartTimer;
     private readonly logger;
     constructor(agentConfig: AgentConfig, callbackPort: number, logDir: string);

package/dist/telegram/receiver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"receiver.d.ts","sourceRoot":"","sources":["../../src/telegram/receiver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAMvC,qBAAa,gBAAgB;IAQzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IATzB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,YAAY,CAA8C;IAClE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkC;gBAGtC,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM;IAKjC,KAAK,IAAI,IAAI;IAMb,OAAO,CAAC,YAAY;IAgCpB,OAAO,CAAC,eAAe;IAevB,IAAI,IAAI,IAAI;IASZ,SAAS,IAAI,OAAO;CAGrB"}
+{"version":3,"file":"receiver.d.ts","sourceRoot":"","sources":["../../src/telegram/receiver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AASvC,qBAAa,gBAAgB;IASzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVzB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,YAAY,CAA8C;IAClE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkC;gBAGtC,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM;IAKjC,KAAK,IAAI,IAAI;IAOb,OAAO,CAAC,YAAY;IAgCpB,OAAO,CAAC,eAAe;IAuBvB,IAAI,IAAI,IAAI;IASZ,SAAS,IAAI,OAAO;CAGrB"}

package/dist/telegram/receiver.js

@@ -39,6 +39,9 @@ const path = __importStar(require("path"));
 const logger_1 = require("../logger");
 const AUTO_RESTART_DELAY_MS = 5000;
 const MAX_RESTARTS = 3;
+// After MAX_RESTARTS fast attempts, fall back to a slow indefinite retry
+// instead of giving up permanently — mirrors discord/receiver.ts.
+const SLOW_RESTART_DELAY_MS = 5 * 60000;
 class TelegramReceiver {
     constructor(agentConfig, callbackPort, logDir) {
         this.agentConfig = agentConfig;
@@ -47,12 +50,14 @@ class TelegramReceiver {
         this.process = null;
         this.stopping = false;
         this.restartCount = 0;
+        this.slowPhaseAnnounced = false;
         this.restartTimer = null;
         this.logger = (0, logger_1.createLogger)(`${agentConfig.id}:receiver`, logDir);
     }
     start() {
         this.stopping = false;
         this.restartCount = 0;
+        this.slowPhaseAnnounced = false;
         this.spawnProcess();
     }
     spawnProcess() {
@@ -80,19 +85,26 @@ class TelegramReceiver {
         this.logger.info('TelegramReceiver started');
     }
     scheduleRestart() {
-        if (this.restartCount >= MAX_RESTARTS) {
-            this.logger.error('TelegramReceiver max restarts reached');
-            return;
+        const slowPhase = this.restartCount >= MAX_RESTARTS;
+        const delay = slowPhase ? SLOW_RESTART_DELAY_MS : AUTO_RESTART_DELAY_MS;
+        if (!slowPhase)
+            this.restartCount++;
+        // Surface the transition into indefinite slow-retry once at error level so a
+        // permanently-broken config (bad/revoked token) is visible instead of hiding
+        // behind a steady stream of warn-level retry lines.
+        if (slowPhase && !this.slowPhaseAnnounced) {
+            this.slowPhaseAnnounced = true;
+            this.logger.error(`TelegramReceiver failed ${MAX_RESTARTS} fast restarts; switching to slow retry every ${SLOW_RESTART_DELAY_MS}ms — check the bot token`);
         }
-        this.restartCount++;
-        this.logger.warn(`Restarting TelegramReceiver in ${AUTO_RESTART_DELAY_MS}ms`, {
+        this.logger.warn(`Restarting TelegramReceiver in ${delay}ms`, {
             attempt: this.restartCount,
+            slowPhase,
         });
         this.restartTimer = setTimeout(() => {
             this.restartTimer = null;
             if (!this.stopping)
                 this.spawnProcess();
-        }, AUTO_RESTART_DELAY_MS);
+        }, delay);
     }
     stop() {
         this.stopping = true;

package/dist/telegram/receiver.js.map

@@ -1 +1 @@
-{"version":3,"file":"receiver.js","sourceRoot":"","sources":["../../src/telegram/receiver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"receiver.js","sourceRoot":"","sources":["../../src/telegram/receiver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAoD;AACpD,2CAA6B;AAE7B,sCAAyC;AAEzC,MAAM,qBAAqB,GAAG,IAAK,CAAC;AACpC,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,yEAAyE;AACzE,kEAAkE;AAClE,MAAM,qBAAqB,GAAG,CAAC,GAAG,KAAM,CAAC;AAEzC,MAAa,gBAAgB;IAQ3B,YACmB,WAAwB,EACxB,YAAoB,EACpB,MAAc;QAFd,gBAAW,GAAX,WAAW,CAAa;QACxB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,WAAM,GAAN,MAAM,CAAQ;QAVzB,YAAO,GAAwB,IAAI,CAAC;QACpC,aAAQ,GAAG,KAAK,CAAC;QACjB,iBAAY,GAAG,CAAC,CAAC;QACjB,uBAAkB,GAAG,KAAK,CAAC;QAC3B,iBAAY,GAAyC,IAAI,CAAC;QAQhE,IAAI,CAAC,MAAM,GAAG,IAAA,qBAAY,EAAC,GAAG,WAAW,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;QACtB,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;QAChC,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAEO,YAAY;QAClB,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,oBAAoB,CAAC,CAAC;QAC3G,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAE1E,IAAI,CAAC,OAAO,GAAG,IAAA,qBAAK,EAAC,KAAK,EAAE,CAAC,YAAY,CAAC,EAAE;YAC1C,GAAG,EAAE;gBACH,GAAG,OAAO,CAAC,GAAG;gBACd,sBAAsB,EAAE,MAAM;gBAC9B,kBAAkB,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,IAAI,EAAE;gBAC7D,kBAAkB,EAAE,QAAQ;gBAC5B,uBAAuB,EAAE,oBAAoB,IAAI,CAAC,YAAY,UAAU;aACzE;YACD,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;SAClC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,CAAS,EAAE,EAAE,CAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CACpE,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,CAAS,EAAE,EAAE,CAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAC5D,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACvC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YAC9D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,QAAQ;gBAAE,IAAI,CAAC,eAAe,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CACpE,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IAC/C,CAAC;IAEO,eAAe;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC;QACpD,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBAAqB,CAAC;QACxE,IAAI,CAAC,SAAS;YAAE,IAAI,CAAC,YAAY,EAAE,CAAC;QACpC,6EAA6E;QAC7E,6EAA6E;QAC7E,oDAAoD;QACpD,IAAI,SAAS,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1C,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,2BAA2B,YAAY,iDAAiD,qBAAqB,0BAA0B,CACxI,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,KAAK,IAAI,EAAE;YAC5D,OAAO,EAAE,IAAI,CAAC,YAAY;YAC1B,SAAS;SACV,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;YAClC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,QAAQ;gBAAE,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1C,CAAC,EAAE,KAAK,CAAC,CAAC;IACZ,CAAC;IAED,IAAI;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAChC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IACvD,CAAC;CACF;AA1FD,4CA0FC"}

package/mcp/tools/discord/access.ts

@@ -6,7 +6,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { randomBytes } from 'crypto';
-import type { DiscordAccessConfig, DiscordMessageContext, DiscordAccess, DiscordGateResult } from './types';
+import type { DiscordAccessConfig, DiscordMessageContext, DiscordAccess, DiscordGateResult, DiscordPending } from './types';
 export type { DiscordAccessConfig, DiscordAccess } from './types';
 
 export type AccessResult = { allowed: boolean; reason?: string };
@@ -15,10 +15,17 @@ export type AccessResult = { allowed: boolean; reason?: string };
 // File-based access (new — pairing flow)
 // ---------------------------------------------------------------------------
 
+// Default for a brand-new agent (no access.json yet): closed base + pairing on,
+// so the owner can DM the bot and capture their own id via a code. This matches
+// the pre-split behavior where a missing file defaulted to dmPolicy:'pairing'.
 export function defaultAccess(): DiscordAccess {
   return {
-    dmPolicy: 'pairing',
+    dmPolicy: 'allowlist',
+    pairing: true,
     allowFrom: [],
+    // Secure new-agent default: guilds closed + answer only when @mentioned.
+    groupPolicy: 'allowlist',
+    requireMention: true,
     guildAllowlist: [],
     channelAllowlist: [],
     roleAllowlist: [],
@@ -26,24 +33,83 @@ export function defaultAccess(): DiscordAccess {
   };
 }
 
+/**
+ * Normalize a parsed access.json into the current split shape, migrating the
+ * legacy fused dmPolicy ('pairing' folded pairing in) to the split model.
+ * Mirrors telegram/pure.ts:migrateAccess.
+ *
+ * SECURITY: a legacy `allowlist` file was deliberately locked down — it must
+ * migrate to `pairing:false`, NOT true, or it would start minting codes for
+ * strangers. Here an absent `pairing` on an existing file means a pre-split
+ * file → pairing off. Only the brand-new/ENOENT path (defaultAccess) is on.
+ */
+export function migrateAccess(parsed: {
+  dmPolicy?: string;
+  pairing?: boolean;
+  allowFrom?: string[];
+  groupPolicy?: string;
+  requireMention?: boolean;
+  guildAllowlist?: string[];
+  channelAllowlist?: string[];
+  roleAllowlist?: string[];
+  pending?: Record<string, DiscordPending>;
+}): DiscordAccess {
+  const legacy = parsed.dmPolicy;
+  let dmPolicy: DiscordAccess['dmPolicy'];
+  let pairing: boolean;
+  if (legacy === 'pairing') {
+    dmPolicy = 'allowlist';
+    pairing = true;
+  } else {
+    dmPolicy = (legacy as DiscordAccess['dmPolicy']) ?? 'allowlist';
+    pairing = parsed.pairing ?? false;
+  }
+  const guildAllowlist = parsed.guildAllowlist ?? [];
+  // Guild tier migration must be behavior-preserving on upgrade. Today an empty
+  // guildAllowlist means "deliver to all guilds" — so derive 'open' when empty,
+  // 'allowlist' when non-empty; and requireMention defaults to false for
+  // existing files (they had no mention gate). New agents get the secure
+  // 'allowlist'+requireMention:true from defaultAccess() instead.
+  const groupPolicy = (parsed.groupPolicy as DiscordAccess['groupPolicy'])
+    ?? (guildAllowlist.length > 0 ? 'allowlist' : 'open');
+  const requireMention = parsed.requireMention ?? false;
+  return {
+    dmPolicy,
+    pairing,
+    allowFrom: parsed.allowFrom ?? [],
+    groupPolicy,
+    requireMention,
+    guildAllowlist,
+    channelAllowlist: parsed.channelAllowlist ?? [],
+    roleAllowlist: parsed.roleAllowlist ?? [],
+    pending: parsed.pending ?? {},
+  };
+}
+
 export function loadAccess(stateDir: string): DiscordAccess {
   const accessFile = path.join(stateDir, 'access.json');
   try {
     const raw = fs.readFileSync(accessFile, 'utf8');
-    const parsed = JSON.parse(raw) as Partial<DiscordAccess>;
-    return {
-      dmPolicy: parsed.dmPolicy ?? 'pairing',
-      allowFrom: parsed.allowFrom ?? [],
-      guildAllowlist: parsed.guildAllowlist ?? [],
-      channelAllowlist: parsed.channelAllowlist ?? [],
-      roleAllowlist: parsed.roleAllowlist ?? [],
-      pending: parsed.pending ?? {},
-    };
+    const parsed = JSON.parse(raw) as Partial<DiscordAccess> & { dmPolicy?: string };
+    return migrateAccess(parsed);
   } catch (err) {
     if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
-      // Seed from env vars for backward compat
-      return {
-        dmPolicy: (process.env.DISCORD_DM_POLICY as DiscordAccess['dmPolicy']) ?? 'pairing',
+      // Brand-new agent (no access.json yet). If the deployment configured
+      // access via DISCORD_* env vars, honour that (legacy backward-compat,
+      // normalized through migrate). Otherwise fall back to defaultAccess() so
+      // the owner can DM the bot and self-pair — migrateAccess would yield
+      // pairing:false here (its "locked existing file" rule), which wrongly
+      // drops the owner's first DM on a fresh agent.
+      const hasEnvConfig = Boolean(
+        process.env.DISCORD_DM_POLICY ||
+        process.env.DISCORD_DM_ALLOWLIST ||
+        process.env.DISCORD_GUILD_ALLOWLIST ||
+        process.env.DISCORD_CHANNEL_ALLOWLIST ||
+        process.env.DISCORD_ROLE_ALLOWLIST,
+      );
+      if (!hasEnvConfig) return defaultAccess();
+      return migrateAccess({
+        dmPolicy: process.env.DISCORD_DM_POLICY,
         allowFrom: process.env.DISCORD_DM_ALLOWLIST
           ? process.env.DISCORD_DM_ALLOWLIST.split(',').filter(Boolean)
           : [],
@@ -57,7 +123,7 @@ export function loadAccess(stateDir: string): DiscordAccess {
           ? process.env.DISCORD_ROLE_ALLOWLIST.split(',').filter(Boolean)
           : [],
         pending: {},
-      };
+      });
     }
     try {
       fs.renameSync(accessFile, `${accessFile}.corrupt-${Date.now()}`);
@@ -100,36 +166,77 @@ export function gate(
   const { isDM, userId, guildId, channelId } = context;
 
   if (!isDM) {
-    if (access.guildAllowlist.length > 0 && guildId) {
-      if (!access.guildAllowlist.includes(guildId)) return { action: 'drop' };
+    if (access.groupPolicy === 'disabled') return { action: 'drop' };
+
+    if (access.groupPolicy === 'allowlist' && guildId && !access.guildAllowlist.includes(guildId)) {
+      // Unknown guild. Pairing off ⇒ silent drop. On ⇒ mint a code keyed on the
+      // guild id and post it here; a member relays it to the admin (mirrors LINE).
+      if (!access.pairing) return { action: 'drop' };
+      for (const [code, p] of Object.entries(access.pending)) {
+        if (p.kind === 'guild' && p.guildId === guildId) {
+          if (p.replies >= 2) return { action: 'drop' };
+          p.replies++;
+          saveAccessFn(access);
+          return { action: 'pair', code, isResend: true, isGuild: true };
+        }
+      }
+      if (countPending(access, 'guild') >= 5) return { action: 'drop' };
+      const code = generateCode();
+      access.pending[code] = {
+        senderId: userId,
+        channelId,
+        guildId,
+        kind: 'guild',
+        createdAt: ts,
+        expiresAt: ts + 60 * 60 * 1000,
+        replies: 1,
+      };
+      saveAccessFn(access);
+      return { action: 'pair', code, isResend: false, isGuild: true };
     }
+
+    // Allowlisted (or open policy) → keep the channel filter, then mention gate.
     if (access.channelAllowlist.length > 0) {
       if (!access.channelAllowlist.includes(channelId)) return { action: 'drop' };
     }
+    if (access.requireMention !== false && !context.mentionsBot) return { action: 'drop' };
     return { action: 'deliver' };
   }
 
   // DM message
   if (access.dmPolicy === 'disabled') return { action: 'drop' };
 
+  if (access.dmPolicy === 'open') {
+    // Open base: anyone may DM; capture their id so future messages are known.
+    if (!access.allowFrom.includes(userId)) {
+      access.allowFrom.push(userId);
+      saveAccessFn(access);
+    }
+    return { action: 'deliver' };
+  }
+
   if (access.allowFrom.includes(userId)) return { action: 'deliver' };
-  if (access.dmPolicy === 'allowlist') return { action: 'drop' };
+  // Base policy is 'allowlist' ('disabled'/'open' handled above). Pairing is the
+  // orthogonal toggle: off ⇒ pure allowlist (drop strangers, no code).
+  if (!access.pairing) return { action: 'drop' };
 
   // pairing mode
   for (const [code, p] of Object.entries(access.pending)) {
-    if (p.senderId === userId) {
+    if ((p.kind ?? 'dm') === 'dm' && p.senderId === userId) {
       if (p.replies >= 2) return { action: 'drop' };
       p.replies++;
       saveAccessFn(access);
       return { action: 'pair', code, isResend: true };
     }
   }
-  if (Object.keys(access.pending).length >= 3) return { action: 'drop' };
+  // Cap pending per-kind so guild knocks and DM knocks don't starve each other.
+  if (countPending(access, 'dm') >= 5) return { action: 'drop' };
 
   const code = generateCode();
   access.pending[code] = {
     senderId: userId,
     channelId,
+    kind: 'dm',
     createdAt: ts,
     expiresAt: ts + 60 * 60 * 1000,
     replies: 1,
@@ -138,6 +245,15 @@ export function gate(
   return { action: 'pair', code, isResend: false };
 }
 
+/** Count pending entries of a given kind (absent kind ⇒ 'dm'). */
+function countPending(access: DiscordAccess, kind: 'dm' | 'guild'): number {
+  let n = 0;
+  for (const p of Object.values(access.pending)) {
+    if ((p.kind ?? 'dm') === kind) n++;
+  }
+  return n;
+}
+
 // ---------------------------------------------------------------------------
 // Env-var based access (backward compat)
 // ---------------------------------------------------------------------------

package/mcp/tools/discord/client.ts

@@ -22,7 +22,9 @@ export async function createDiscordClient(token: string): Promise<any> {
   });
 
   await new Promise<void>((resolve, reject) => {
-    client.once('ready', () => resolve());
+    // 'clientReady' is the renamed 'ready' event (discord.js v14 emits both;
+    // 'ready' is deprecated and becomes clientReady-only in v15).
+    client.once('clientReady', () => resolve());
     client.once('error', reject);
     client.login(token).catch(reject);
   });

package/mcp/tools/discord/module.ts

@@ -23,6 +23,12 @@ import { sendMessage, buildChoiceComponents } from './outbound';
 import { loadAccess, saveAccess, gate } from './access';
 import { maybeCreateThread } from './threading';
 import { createMessageHandler } from './inbound';
+// Cross-process message dedup (shared with Telegram): when more than one
+// receiver instance is connected on the same bot token — Discord's gateway
+// delivers every event to all sessions, unlike Telegram's single-consumer
+// getUpdates — the first instance to claim (channelId, messageId) processes it;
+// the others see the O_EXCL marker and drop, so a stranger's DM is handled once.
+import { initDedupDir, isDuplicate, pruneDedup } from '../telegram/dedup';
 import type { DiscordMessageContext } from './types';
 
 const MAX_ATTACHMENT_BYTES = 50 * 1024 * 1024;
@@ -185,6 +191,14 @@ export class DiscordModule implements ChannelModule {
     const loadAccessFn = () => loadAccess(stateDir);
     const saveAccessFn = (a: ReturnType<typeof loadAccess>) => saveAccess(stateDir, a);
 
+    // Dedup dir shared by every receiver instance on this bot token (same
+    // DISCORD_STATE_DIR). Init once here, prune stale markers on a timer —
+    // mirrors the Telegram receiver's setup.
+    const dedupDir = path.join(stateDir, 'dedup');
+    initDedupDir(dedupDir);
+    pruneDedup(dedupDir);
+    setInterval(() => pruneDedup(dedupDir), 60_000).unref();
+
     // Permissive config — gate() already handled access, inbound.ts skips re-check
     const permissiveConfig = {
       botToken: this.getToken()!,
@@ -208,14 +222,24 @@ export class DiscordModule implements ChannelModule {
 
     const msgHandler = createMessageHandler(agentId, handler, permissiveConfig, permissiveAccessConfig);
 
-    this.client.on('messageCreate', async (msg: any) => {
+    const handleDiscordMessage = async (msg: any): Promise<void> => {
       if (msg.author?.bot) return;
       if (msg.system) return;
 
+      // Drop if another receiver instance already claimed this message. Must run
+      // before gate() so a duplicate never mints a pairing code or replies twice.
+      if (isDuplicate(dedupDir, msg.channelId, msg.id)) return;
+
       this.lastMessageAt = Date.now();
 
       const isDM = !msg.guild;
       const isThread = msg.channel?.isThread?.() ?? false;
+      // Did this message @mention the bot (or reply to one of its messages)?
+      // Computed here so gate() stays discord.js-free. Works regardless of the
+      // MessageContent intent — mention entities are always delivered.
+      const botUser = this.client.user;
+      const mentionsBot = Boolean(botUser && msg.mentions?.has?.(botUser))
+        || (!!botUser && msg.mentions?.repliedUser?.id === botUser.id);
 
       const context: DiscordMessageContext = {
         guildId: msg.guildId ?? null,
@@ -226,6 +250,7 @@ export class DiscordModule implements ChannelModule {
         messageId: msg.id,
         isDM,
         isThread,
+        mentionsBot,
       };
 
       const access = loadAccessFn();
@@ -235,9 +260,18 @@ export class DiscordModule implements ChannelModule {
 
       if (result.action === 'pair') {
         try {
-          await msg.channel.send(
-            `Pairing required — run in Claude Code:\n\n/discord:access pair ${result.code}`,
-          );
+          if (result.isGuild) {
+            // LINE-style guild knock: post the code in the channel so a member
+            // can relay it to the admin, who approves it from the web UI. The
+            // user runs no command — a guild has no single owner to run one.
+            await msg.channel.send(
+              `This bot is private in this server.\n\nPairing code: ${result.code}\n\nShare this code with an admin to enable me here.`,
+            );
+          } else {
+            await msg.channel.send(
+              `Pairing required — run in Claude Code:\n\n/discord:access pair ${result.code}`,
+            );
+          }
         } catch {}
         return;
       }
@@ -259,6 +293,39 @@ export class DiscordModule implements ChannelModule {
       if (autoThread) {
         await maybeCreateThread(msg, autoThread, autoArchive).catch(() => {});
       }
+    };
+
+    this.client.on('messageCreate', handleDiscordMessage);
+
+    // discord.js's own MESSAGE_CREATE handling resolves msg.channel from its
+    // in-memory cache; DM channels are never included in the initial
+    // GUILD_CREATE/READY payload, so the *first* DM after every process
+    // restart hits an uncached channel. MessageCreateAction's partial-channel
+    // fallback constructs the stub without a `type` field (it only forwards
+    // {id, author, guild_id}), so ChannelManager#_add can't pick a Channel
+    // subclass, logs "Failed to find guild, or unknown type for channel ...
+    // undefined", and silently drops the event — messageCreate never fires,
+    // no error, no pairing code. Every subsequent DM in that channel fails
+    // the same way since the failed resolution never populates the cache.
+    // Work around it: on the raw MESSAGE_CREATE dispatch, if it's a DM whose
+    // channel isn't cached yet, fetch the channel (and the message) via REST
+    // — a real API response includes `type`, so this caches it properly —
+    // then hand the fully-formed Message object to the same handler used by
+    // the normal path. isDuplicate() above ensures no double-processing if
+    // discord.js's own path ever does resolve it first.
+    this.client.on('raw', async (packet: { t?: string; d?: any }) => {
+      if (packet.t !== 'MESSAGE_CREATE') return;
+      const d = packet.d;
+      if (!d || d.guild_id || d.author?.bot) return;
+      if (this.client.channels.cache.has(d.channel_id)) return;
+      try {
+        const channel = await this.client.channels.fetch(d.channel_id);
+        if (!channel) return;
+        const msg = await channel.messages.fetch(d.id);
+        await handleDiscordMessage(msg);
+      } catch (err) {
+        process.stderr.write(`discord: raw DM fallback failed: ${err}\n`);
+      }
     });
 
     // Interactive-menu button clicks: custom_id `choice:N`. A click is routed
@@ -295,6 +362,8 @@ export class DiscordModule implements ChannelModule {
             messageId: interaction.message?.id ?? '',
             isDM,
             isThread,
+            // A button click is an explicit interaction — never mention-gated.
+            mentionsBot: true,
           };
           const access = loadAccessFn();
           const result = gate(access, context, saveAccessFn, () => randomBytes(3).toString('hex'));
@@ -331,6 +400,8 @@ export class DiscordModule implements ChannelModule {
           messageId: interaction.message?.id ?? '',
           isDM,
           isThread,
+          // A button click is an explicit interaction — never mention-gated.
+          mentionsBot: true,
         };
         const access = loadAccessFn();
         const result = gate(access, context, saveAccessFn, () => randomBytes(3).toString('hex'));