From ba47789b70fbb9318aaadc794127a69aeb925840 Mon Sep 17 00:00:00 2001
From: Benedikt Schackenberg
 <6381261+BenediktSchackenberg@users.noreply.github.com>
Date: Thu, 19 Mar 2026 20:43:17 +0000
Subject: [PATCH] fix: fall back to applicationId when fetchUser fails instead
 of aborting

Transient REST/proxy failures no longer take down the whole Discord channel.
applicationId is the same snowflake as the bot user id, so mention gating
and self-message filtering remain intact. This also avoids leaving orphaned
gateway connections from pre-lifecycle throws.
---
 extensions/discord/src/monitor/provider.ts | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/extensions/discord/src/monitor/provider.ts b/extensions/discord/src/monitor/provider.ts
index cba7bb0b2d5..7e342d39692 100644
--- a/extensions/discord/src/monitor/provider.ts
+++ b/extensions/discord/src/monitor/provider.ts
@@ -880,14 +880,19 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
         gateway: lifecycleGateway,
         details: String(err),
       });
-      // Fail-fast: without botUserId, mention gating is bypassed (all guild
-      // messages pass through), self-message filtering is disabled (risk of
-      // self-reply loops), and reply detection is broken. Let auto-restart
-      // retry instead of running in a degraded state. See #42219.
-      throw new Error(`discord: cannot start without bot identity: ${String(err)}`, { cause: err });
+      // Transient REST/proxy failures should not take down the whole channel.
+      // applicationId is the same snowflake as the bot user id and was already
+      // resolved above (with a token-decoding fallback), so we can use it for
+      // mention gating and self-message filtering. botUserName is only used for
+      // logging and is non-critical.
+      botUserId = applicationId;
+      runtime.warn?.(
+        `discord: using applicationId as botUserId fallback (fetchUser failed: ${String(err)})`,
+      );
     }
     if (!botUserId) {
-      // fetchUser succeeded but returned no id — equally unsafe to continue.
+      // fetchUser succeeded but returned no id and applicationId is also missing —
+      // this should not happen in practice.
       throw new Error("discord: fetchUser('@me') returned no user id");
     }