fix(discord): PluralKit DM pairing identity + direct peer regex (#86332)

Sanjays2402 · Sanjays2402 · commit 9a602f7c9598 · 2026-05-25T01:36:18.000-07:00
Bug 1: resolveDiscordDmPreflightAccess passed the raw gateway author to handleDiscordDmCommandDecision while the access check used the resolved (PK-aware) sender identity. The two diverge for PluralKit users — the pairing record was keyed by the Discord user id while the ingress resolver looked it up by PK member UUID. Result: every inbound DM from a PK user triggered a fresh pairing challenge. Bug 2: extractDiscordSessionKind regex matched 'dm' but not 'direct', which is the canonical peer kind used for normalized DM session keys. No visible breakage today because all callers compare against 'dm', but a latent fragility for any future caller that distinguishes 'direct' from null. - Pass params.sender (resolved identity, includes PK UUID) to the pairing decision so the record key matches the lookup key. - Extend the kind regex to accept 'direct' and map it to 'dm'. Closes #86332
diff --git a/extensions/discord/src/approval-native.ts b/extensions/discord/src/approval-native.ts
@@ -36,11 +36,18 @@ function extractDiscordSessionKind(sessionKey?: string | null): "channel" | "gro
   if (!sessionKey) {
     return null;
   }
-  const match = sessionKey.match(/discord:(channel|group|dm):/);
+  // DM session keys use the `direct` peer kind in the normalized form
+  // (`agent:<id>:discord:direct:<userId>`); legacy keys may still use `dm`.
+  // Treat both as the same logical kind for downstream comparisons.
+  const match = sessionKey.match(/discord:(channel|group|dm|direct):/);
   if (!match) {
     return null;
   }
-  return match[1] as "channel" | "group" | "dm";
+  const raw = match[1];
+  if (raw === "direct") {
+    return "dm";
+  }
+  return raw as "channel" | "group" | "dm";
 }
 
 function normalizeDiscordOriginChannelId(value?: string | null): string | null {
diff --git a/extensions/discord/src/monitor/message-handler.dm-preflight.ts b/extensions/discord/src/monitor/message-handler.dm-preflight.ts
@@ -79,10 +79,15 @@ export async function resolveDiscordDmPreflightAccess(params: {
   await handleDiscordDmCommandDecision({
     senderAccess: dmAccess.senderAccess,
     accountId: params.resolvedAccountId,
+    // Use the resolved sender identity (e.g. PluralKit member UUID) here so
+    // the pairing record is keyed under the same stableId that
+    // resolveDiscordDmCommandAccess / createDiscordDmIngressSubject use on
+    // subsequent inbound messages. Previously this used the raw gateway
+    // author id, which only matched non-PK users.
     sender: {
-      id: params.author.id,
-      tag: formatDiscordUserTag(params.author),
-      name: params.author.username ?? undefined,
+      id: params.sender.id,
+      tag: params.sender.tag ?? formatDiscordUserTag(params.author),
+      name: params.sender.name ?? params.author.username ?? undefined,
     },
     onPairingCreated: async (code) => {
       logVerbose(
