From 6f3733d43b4296b228f06874d10d22a7bb9a3c73 Mon Sep 17 00:00:00 2001
From: Taylor Ho <taylorkmho@gmail.com>
Date: Thu, 11 Jun 2026 09:21:07 -0700
Subject: [PATCH] fix(desktop): let channel members bypass mention agent gate
 (#965)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 desktop/src/features/messages/lib/useMentions.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/desktop/src/features/messages/lib/useMentions.ts b/desktop/src/features/messages/lib/useMentions.ts
index 945ff33824..ab0f9c3704 100644
--- a/desktop/src/features/messages/lib/useMentions.ts
+++ b/desktop/src/features/messages/lib/useMentions.ts
@@ -209,7 +209,11 @@ export function useMentions(
       if (isArchivedDiscovery(pubkey)) {
         return;
       }
-      if (candidate.isAgent && !mentionableAgentPubkeys.has(pubkey)) {
+      if (
+        candidate.isAgent &&
+        !candidate.isMember &&
+        !mentionableAgentPubkeys.has(pubkey)
+      ) {
         return;
       }