From f6b3c5d004efdd617f44167ee8ccbdd8eb9a1e2f Mon Sep 17 00:00:00 2001
From: Taylor Ho <taylorkmho@gmail.com>
Date: Wed, 20 May 2026 08:29:18 -0700
Subject: [PATCH] Move Add agent trigger to Members sidebar header row
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a compact '+' icon button immediately left of the ellipsis (⋯)
bulk-actions menu in the Bots section header of the Members side pane.
Remove the old full-width 'Add agent' button from below the bots list.

The trigger opens the same QuickAddAgentPopover as before — just in a
more discoverable, compact location matching the ⋯ button style.
---
 .../features/channels/ui/MembersSidebar.tsx   | 79 +++++++++----------
 .../ui/MembersSidebarAgentControls.tsx        |  2 +-
 2 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/desktop/src/features/channels/ui/MembersSidebar.tsx b/desktop/src/features/channels/ui/MembersSidebar.tsx
index f3fa835926..22c052620d 100644
--- a/desktop/src/features/channels/ui/MembersSidebar.tsx
+++ b/desktop/src/features/channels/ui/MembersSidebar.tsx
@@ -281,23 +281,45 @@ export function MembersSidebar({
                 <span className="rounded-full bg-muted px-2 py-0.5 text-[11px] font-medium text-muted-foreground">
                   {bots.length}
                 </span>
-                {hasControllableManagedBots ? (
-                  <MembersSidebarAgentControls
-                    canBulkRemove={hasRemovableManagedBots}
-                    canBulkRespawn={hasControllableManagedBots}
-                    canBulkStop={hasStoppableManagedBots}
-                    disabled={isActionPending || isArchived}
-                    onRemoveAll={() => {
-                      void handleRemoveAll();
-                    }}
-                    onRespawnAll={() => {
-                      void handleRespawnAll();
-                    }}
-                    onStopAll={() => {
-                      void handleStopAll();
-                    }}
-                  />
-                ) : null}
+                <div className="ml-auto flex items-center gap-0.5">
+                  {canAddAgents ? (
+                    <QuickAddAgentPopover
+                      channelId={channelId}
+                      open={isSidebarQuickAddOpen}
+                      onOpenChange={setIsSidebarQuickAddOpen}
+                      onMoreOptions={() => {
+                        setIsSidebarQuickAddOpen(false);
+                        onOpenAddBotDialog?.();
+                      }}
+                    >
+                      <button
+                        aria-label="Add agent to channel"
+                        className="flex h-7 w-7 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+                        data-testid="sidebar-add-agent-trigger"
+                        type="button"
+                      >
+                        <Plus className="h-4 w-4" />
+                      </button>
+                    </QuickAddAgentPopover>
+                  ) : null}
+                  {hasControllableManagedBots ? (
+                    <MembersSidebarAgentControls
+                      canBulkRemove={hasRemovableManagedBots}
+                      canBulkRespawn={hasControllableManagedBots}
+                      canBulkStop={hasStoppableManagedBots}
+                      disabled={isActionPending || isArchived}
+                      onRemoveAll={() => {
+                        void handleRemoveAll();
+                      }}
+                      onRespawnAll={() => {
+                        void handleRespawnAll();
+                      }}
+                      onStopAll={() => {
+                        void handleStopAll();
+                      }}
+                    />
+                  ) : null}
+                </div>
               </div>
               <div className="space-y-2" data-testid="members-sidebar-bots">
                 {bots.length > 0 ? (
@@ -310,29 +332,6 @@ export function MembersSidebar({
                   </p>
                 )}
               </div>
-              {canAddAgents ? (
-                <QuickAddAgentPopover
-                  channelId={channelId}
-                  open={isSidebarQuickAddOpen}
-                  onOpenChange={setIsSidebarQuickAddOpen}
-                  onMoreOptions={() => {
-                    setIsSidebarQuickAddOpen(false);
-                    onOpenAddBotDialog?.();
-                  }}
-                >
-                  <Button
-                    aria-label="Add agent to channel"
-                    className="mt-2 h-8 w-full justify-start gap-2 text-xs text-muted-foreground"
-                    data-testid="sidebar-add-agent-trigger"
-                    size="sm"
-                    type="button"
-                    variant="ghost"
-                  >
-                    <Plus className="h-3.5 w-3.5" />
-                    Add agent
-                  </Button>
-                </QuickAddAgentPopover>
-              ) : null}
             </section>
 
             {changeRoleError ? (
diff --git a/desktop/src/features/channels/ui/MembersSidebarAgentControls.tsx b/desktop/src/features/channels/ui/MembersSidebarAgentControls.tsx
index 303f6748ac..6aa925dc1d 100644
--- a/desktop/src/features/channels/ui/MembersSidebarAgentControls.tsx
+++ b/desktop/src/features/channels/ui/MembersSidebarAgentControls.tsx
@@ -31,7 +31,7 @@ export function MembersSidebarAgentControls({
     <DropdownMenu modal={false}>
       <DropdownMenuTrigger asChild>
         <button
-          className="ml-auto flex h-7 w-7 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+          className="flex h-7 w-7 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
           data-testid="members-sidebar-agent-controls"
           type="button"
         >