From c1bc5dcdb3e3095df2b8b3e47fe675e89e49db70 Mon Sep 17 00:00:00 2001
From: Taylor Ho <taylorkmho@gmail.com>
Date: Wed, 20 May 2026 08:25:53 -0700
Subject: [PATCH] Revert "Move Add agent button to sit immediately left of
 settings gear"

This reverts commit bde1fc270ffb9e988407e8f0f4e159418483f35b.
---
 .../channels/ui/ChannelMembersBar.tsx         | 38 +++++++++----------
 .../channels/ui/QuickAddAgentPopover.tsx      |  7 +---
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/desktop/src/features/channels/ui/ChannelMembersBar.tsx b/desktop/src/features/channels/ui/ChannelMembersBar.tsx
index d29465fa06..8017924c31 100644
--- a/desktop/src/features/channels/ui/ChannelMembersBar.tsx
+++ b/desktop/src/features/channels/ui/ChannelMembersBar.tsx
@@ -89,6 +89,25 @@ export function ChannelMembersBar({
   return (
     <React.Fragment>
       <div className="flex items-center gap-1">
+        <QuickAddAgentPopover
+          channelId={channel.id}
+          open={isQuickAddOpen}
+          onOpenChange={setIsQuickAddOpen}
+          onMoreOptions={() => setIsAddBotOpen(true)}
+        >
+          <Button
+            aria-label="Add agent"
+            className="h-7 w-7 rounded-full"
+            data-testid="channel-add-bot-trigger"
+            disabled={!canAddAgents}
+            size="icon"
+            type="button"
+            variant="outline"
+          >
+            <Plus className="h-3 w-3" />
+          </Button>
+        </QuickAddAgentPopover>
+
         <HuddleIndicator
           className="h-7 w-7"
           channelId={channel.id}
@@ -119,25 +138,6 @@ export function ChannelMembersBar({
           </span>
         </Button>
 
-        <QuickAddAgentPopover
-          channelId={channel.id}
-          open={isQuickAddOpen}
-          onOpenChange={setIsQuickAddOpen}
-          onMoreOptions={() => setIsAddBotOpen(true)}
-        >
-          <Button
-            aria-label="Add agent"
-            className="h-7 w-7 rounded-full"
-            data-testid="channel-add-bot-trigger"
-            disabled={!canAddAgents}
-            size="icon"
-            type="button"
-            variant="outline"
-          >
-            <Plus className="h-3 w-3" />
-          </Button>
-        </QuickAddAgentPopover>
-
         <Button
           aria-label="Manage channel"
           className="h-7 w-7 rounded-full"
diff --git a/desktop/src/features/channels/ui/QuickAddAgentPopover.tsx b/desktop/src/features/channels/ui/QuickAddAgentPopover.tsx
index 7baca150aa..b3ffbe4a7b 100644
--- a/desktop/src/features/channels/ui/QuickAddAgentPopover.tsx
+++ b/desktop/src/features/channels/ui/QuickAddAgentPopover.tsx
@@ -304,7 +304,6 @@ export function QuickAddAgentPopover({
       <PopoverContent align="end" className="w-72 p-0" sideOffset={6}>
         <div
           className="flex max-h-80 flex-col"
-          role="menu"
           onKeyDown={(e) => {
             const container = e.currentTarget;
             const buttons = Array.from(
@@ -345,11 +344,7 @@ export function QuickAddAgentPopover({
                 No agents available.
               </div>
             ) : (
-              <div
-                aria-label="Available agents"
-                className="py-1"
-                role="listbox"
-              >
+              <div aria-label="Available agents" className="py-1" role="listbox">
                 {items.map((item) => {
                   const itemKey = getItemKey(item);
                   const isInChannel = item.kind === "running-in-channel";