fix(desktop): retain automatic mentions only in threads

desktop/src/features/channels/ui/ChannelPane.tsx

@@ -754,7 +754,6 @@ export const ChannelPane = React.memo(function ChannelPane({
                   ) : null}
                   <ComposerDockBackdrop gutterClassName="inset-x-5" />
                   <MessageComposer
-                    audienceContext={{ type: "channel" }}
                     channelId={activeChannel?.id ?? null}
                     channelName={activeChannel?.name ?? "channel"}
                     channelType={activeChannel?.channelType ?? null}

desktop/src/features/home/ui/InboxDetailPane.tsx

@@ -495,6 +495,10 @@ function InboxMessageDetailPane({
       : null;
   const isThreadContext =
     !isDirectMessage && hasInboxThreadContext(item, messages);
+  const threadRootTags = isThreadContext
+    ? (displayMessages.find((message) => message.id === item.conversationId)
+        ?.tags ?? [])
+    : [];
   const contextLabel = isThreadContext
     ? isDirectMessage
       ? `Thread with ${item.senderLabel}`
@@ -804,7 +808,14 @@ function InboxMessageDetailPane({
           />
           <div className="pointer-events-auto">
             <MessageComposer
-              audienceContext={isDirectMessage ? null : { type: "thread" }}
+              audienceContext={
+                isDirectMessage
+                  ? null
+                  : {
+                      type: "thread",
+                      rootTags: threadRootTags,
+                    }
+              }
               channelId={item.item.channelId}
               channelName={item.channelLabel ?? "channel"}
               channelType={composerChannelType}

desktop/src/features/messages/lib/persistentAgentAudience.test.mjs

@@ -219,6 +219,21 @@ test("explicitly excluded agents are not auto-promoted again", async () => {
   assert.deepEqual(currentAudiences(store), { [scope]: [agentA] });
 });
 
+test("initialization preserves exclusions across thread remounts", async () => {
+  const store = await loadStore(14);
+  const scope = `${ownerA}:channel-a:thread-a`;
+
+  store.initializePersistentAgentAudience(scope, [agentA]);
+  assert.deepEqual(currentAudiences(store), { [scope]: [agentA] });
+
+  store.excludePersistentAgentAudienceMember(scope, agentA);
+  store.initializePersistentAgentAudience(scope, [agentA]);
+  assert.deepEqual(currentAudiences(store), { [scope]: [] });
+
+  store.addPersistentAgentAudienceMember(scope, agentA);
+  assert.deepEqual(currentAudiences(store), { [scope]: [agentA] });
+});
+
 test("explicit re-selection reinstates an excluded agent", async () => {
   const store = await loadStore(13);
   const scope = `${ownerA}:channel-a:channel`;

desktop/src/features/messages/lib/persistentAgentAudience.ts

@@ -160,6 +160,23 @@ export function removePersistentAgentAudienceMembersIfUnchanged({
   return true;
 }
 
+export function initializePersistentAgentAudience(
+  scope: string,
+  pubkeys: Iterable<string>,
+): void {
+  if (!scope) return;
+  const excluded = excludedPubkeysByScope.get(scope);
+  const initialPubkeys = normalizePubkeys(pubkeys).filter(
+    (pubkey) =>
+      !(audiences[scope] ?? []).includes(pubkey) && !excluded?.has(pubkey),
+  );
+  if (initialPubkeys.length === 0) return;
+  setPersistentAgentAudience(scope, [
+    ...(audiences[scope] ?? []),
+    ...initialPubkeys,
+  ]);
+}
+
 export function addPersistentAgentAudienceMember(
   scope: string,
   pubkey: string,

desktop/src/features/messages/ui/ComposerAddressControls.test.mjs

@@ -72,7 +72,7 @@ test("mention control expands with automatically mentioned agents", async () =>
   const avatar = view.getByTestId("composer-address-lock-agent-pubkey");
   assert.ok(avatar);
   const manage = view.getByRole("button", {
-    name: "Manage automatic agent mentions",
+    name: "Manage mentions",
   });
   assert.match(manage.className, /(?:^|\s)-ml-2(?:\s|$)/);
   assert.match(manage.className, /(?:^|\s)pl-2(?:\s|$)/);
@@ -82,18 +82,18 @@ test("mention control expands with automatically mentioned agents", async () =>
     /(?:^|\s)pr-1\.5(?:\s|$)/,
   );
   assert.match(
-    view.getByRole("button", { name: "Manage automatic agent mentions" })
-      .parentElement?.className ?? "",
+    view.getByRole("button", { name: "Manage mentions" }).parentElement
+      ?.className ?? "",
     /(?:^|\s)bg-primary\/15(?:\s|$)/,
   );
   assert.match(
-    view.getByRole("button", { name: "Manage automatic agent mentions" })
-      .parentElement?.className ?? "",
+    view.getByRole("button", { name: "Manage mentions" }).parentElement
+      ?.className ?? "",
     /(?:^|\s)text-primary(?:\s|$)/,
   );
   assert.doesNotMatch(
-    view.getByRole("button", { name: "Manage automatic agent mentions" })
-      .parentElement?.className ?? "",
+    view.getByRole("button", { name: "Manage mentions" }).parentElement
+      ?.className ?? "",
     /(?:^|\s)bg-accent\/70(?:\s|$)/,
   );
   assert.doesNotMatch(
@@ -110,7 +110,13 @@ test("mention control expands with automatically mentioned agents", async () =>
       /scale\(0.8\)/,
     );
   }
-  const remove = view.getByTestId("composer-address-lock-remove-agent-pubkey");
+  const remove = view.getByRole("button", {
+    name: "Don't automatically mention Agent Ada in this thread",
+  });
+  assert.equal(
+    remove.getAttribute("aria-label")?.includes("conversation"),
+    false,
+  );
   const removeChrome = remove.querySelector("span.absolute");
   assert.match(
     removeChrome?.className ?? "",

desktop/src/features/messages/ui/ComposerAddressControls.tsx

@@ -180,11 +180,7 @@ export function ComposerMentionButton({
           <Tooltip disableHoverableContent>
             <TooltipTrigger asChild>
               <button
-                aria-label={
-                  hasAgents
-                    ? "Manage automatic agent mentions"
-                    : "Mention someone"
-                }
+                aria-label={hasAgents ? "Manage mentions" : "Mention someone"}
                 className={cn(
                   "flex h-8 items-center justify-center rounded-lg focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",
                   showActiveChrome
@@ -205,9 +201,7 @@ export function ComposerMentionButton({
               </button>
             </TooltipTrigger>
             <TooltipContent>
-              {hasAgents
-                ? "Manage automatic agent mentions"
-                : "Mention someone"}
+              {hasAgents ? "Manage mentions" : "Mention someone"}
             </TooltipContent>
           </Tooltip>
           <AnimatePresence
@@ -234,7 +228,7 @@ export function ComposerMentionButton({
                     <Tooltip disableHoverableContent key={agent.pubkey}>
                       <TooltipTrigger asChild>
                         <motion.button
-                          aria-label={`Don't automatically mention ${agent.displayName} in this conversation`}
+                          aria-label={`Don't automatically mention ${agent.displayName} in this thread`}
                           animate={{ opacity: 1, scale: 1 }}
                           className="group/address relative rounded-full focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring"
                           data-testid={`composer-address-lock-remove-${agent.pubkey}`}
@@ -276,7 +270,7 @@ export function ComposerMentionButton({
                       </TooltipTrigger>
                       <TooltipContent>
                         Don't automatically mention {agent.displayName} in this
-                        conversation
+                        thread
                       </TooltipContent>
                     </Tooltip>
                   ))}