diff --git a/apps/app/src/components/plugin/PluginNavSidebarItems.test.tsx b/apps/app/src/components/plugin/PluginNavSidebarItems.test.tsx
index 41a6e06f51..58a8365a89 100644
--- a/apps/app/src/components/plugin/PluginNavSidebarItems.test.tsx
+++ b/apps/app/src/components/plugin/PluginNavSidebarItems.test.tsx
@@ -6,11 +6,13 @@ import {
   render,
   screen,
   waitFor,
+  within,
 } from "@testing-library/react";
 import { useEffect, type ComponentType } from "react";
 import { createStore, Provider } from "jotai";
 import { MemoryRouter, useLocation } from "react-router-dom";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { CompactViewportOverrideProvider } from "@bb/shared-ui/hooks/use-compact-viewport";
 import { AUTOMATIONS_PLUGIN_ID } from "@/lib/route-paths";
 import { SidebarProvider } from "@/components/ui/sidebar.js";
@@ -28,6 +30,54 @@ import {
   PluginNavSidebarItems,
 } from "./PluginNavSidebarItems";
 import { pluginNavPanelOrderAtom } from "./pluginNavSidebarAtoms";
+import { appToast } from "@/components/ui/app-toast";
+
+vi.mock("@/components/ui/app-toast", () => ({
+  appToast: {
+    dismiss: vi.fn(),
+    error: vi.fn(),
+    loading: vi.fn(),
+    message: vi.fn(),
+    success: vi.fn(),
+    warning: vi.fn(),
+  },
+}));
+
+function disabledPluginMutationResponse(id: string) {
+  return {
+    ok: true,
+    plugin: {
+      id,
+      source: `npm:${id}`,
+      rootDir: `/managed/plugins/${id}`,
+      version: "1.0.0",
+      provenance: "catalog",
+      isOrphanedBuiltin: false,
+      catalogEntryId: id,
+      publisherLabel: "BB Community",
+      sourceDisplay: `BB Community · ${id}`,
+      updateState: {},
+      enabled: false,
+      description: null,
+      name: id,
+      icon: "Puzzle",
+      iconUrl: null,
+      status: "disabled",
+      statusDetail: null,
+      handlerStats: { count: 0, totalMs: 0, maxMs: 0, errorCount: 0 },
+      services: [],
+      schedules: [],
+      cliCommand: null,
+      capabilities: [],
+      hasSettings: false,
+      app: { hasApp: true, bundle: null },
+      logoUrl: null,
+      logoDarkUrl: null,
+      providerIds: [],
+      icons: {},
+    },
+  };
+}
 
 function registrationSet(
   overrides: Partial<PluginRegistrationSet>,
@@ -74,27 +124,38 @@ function renderSidebarItems(
   options: {
     storedOrder?: string[];
     compactViewport?: boolean;
+    initialEntry?: string;
+    splitEnabled?: boolean;
   } = {},
 ) {
   const store = createStore();
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false } },
+  });
   // Seed the store rather than localStorage: the storage atom captured its
   // initial value when this module was imported, before the test could write.
   if (options.storedOrder) {
     store.set(pluginNavPanelOrderAtom, options.storedOrder);
   }
-  return render(
+  const view = render(
     <CompactViewportOverrideProvider
       isCompactViewport={options.compactViewport ?? false}
     >
-      <Provider store={store}>
-        <MemoryRouter initialEntries={["/"]}>
-          <SidebarProvider>
-            <PluginNavSidebarItems />
-          </SidebarProvider>
-        </MemoryRouter>
-      </Provider>
+      <QueryClientProvider client={queryClient}>
+        <Provider store={store}>
+          <MemoryRouter initialEntries={[options.initialEntry ?? "/"]}>
+            <SidebarProvider>
+              <PluginNavSidebarItems
+                splitEnabled={options.splitEnabled ?? false}
+              />
+              <LocationPath />
+            </SidebarProvider>
+          </MemoryRouter>
+        </Provider>
+      </QueryClientProvider>
     </CompactViewportOverrideProvider>,
   );
+  return { ...view, queryClient };
 }
 
 function panelRowNames(labels: readonly string[]): string[] {
@@ -106,6 +167,7 @@ function panelRowNames(labels: readonly string[]): string[] {
 }
 
 beforeEach(() => {
+  vi.clearAllMocks();
   window.localStorage.clear();
   resetAllCrashedPluginSlotsForTest();
   // React reports errors caught by the slot boundary; keep expected crashes
@@ -119,6 +181,7 @@ afterEach(() => {
   resetPluginSlotStoreForTest();
   resetAllCrashedPluginSlotsForTest();
   vi.restoreAllMocks();
+  vi.unstubAllGlobals();
   window.localStorage.clear();
 });
 
@@ -228,6 +291,135 @@ describe("PluginNavSidebarItems", () => {
     expect(unmounts).toBe(0);
   });
 
+  it("uses one complete icon-labelled menu for the options button and right-click", async () => {
+    registerPanel("docs", "Docs");
+    renderSidebarItems({
+      splitEnabled: true,
+    });
+
+    fireEvent.pointerDown(
+      screen.getByRole("button", { name: "Docs panel options" }),
+      { button: 0 },
+    );
+    const dropdownMenu = await screen.findByRole("menu");
+    const expected = [
+      ["Move to top", "ArrowUp"],
+      ["Move to overflow", "ArrowDown"],
+      ["Open in split", "Columns2"],
+      ["Detail page", "Info"],
+      ["Disable", "Pause"],
+    ] as const;
+    expect(
+      within(dropdownMenu)
+        .getAllByRole("menuitem")
+        .map((item) => item.textContent?.trim()),
+    ).toEqual(expected.map(([label]) => label));
+    for (const [label, icon] of expected) {
+      expect(
+        within(dropdownMenu)
+          .getByRole("menuitem", { name: label })
+          .querySelector(`[data-icon="${icon}"]`),
+      ).not.toBeNull();
+    }
+    fireEvent.keyDown(dropdownMenu, { key: "Escape" });
+    await waitFor(() => expect(screen.queryByRole("menu")).toBeNull());
+
+    fireEvent.contextMenu(screen.getByRole("button", { name: "Docs" }));
+    const contextMenu = await screen.findByRole("menu");
+    expect(
+      within(contextMenu)
+        .getAllByRole("menuitem")
+        .map((item) => item.textContent?.trim()),
+    ).toEqual(expected.map(([label]) => label));
+
+    expect(
+      screen.queryByRole("menuitem", { name: /uninstall|remove/i }),
+    ).toBeNull();
+  });
+
+  it("opens plugin details and omits split when the layout cannot split", async () => {
+    registerPanel("docs", "Docs");
+    renderSidebarItems();
+
+    fireEvent.pointerDown(
+      screen.getByRole("button", { name: "Docs panel options" }),
+      { button: 0 },
+    );
+    expect(
+      screen.queryByRole("menuitem", { name: "Open in split" }),
+    ).toBeNull();
+    fireEvent.click(
+      await screen.findByRole("menuitem", { name: "Detail page" }),
+    );
+    expect(screen.getByTestId("location-path").textContent).toBe(
+      "/extensions/plugins/docs",
+    );
+  });
+
+  it("disables a plugin, refreshes the plugin list, and leaves its active panel", async () => {
+    const fetchMock = vi.fn<typeof fetch>(
+      async () =>
+        new Response(JSON.stringify(disabledPluginMutationResponse("docs")), {
+          status: 200,
+          headers: { "content-type": "application/json" },
+        }),
+    );
+    vi.stubGlobal("fetch", fetchMock);
+    registerPanel("docs", "Docs");
+    const { queryClient } = renderSidebarItems({
+      initialEntry: "/plugins/docs/main",
+    });
+    const invalidateQueries = vi.spyOn(queryClient, "invalidateQueries");
+
+    fireEvent.pointerDown(
+      screen.getByRole("button", { name: "Docs panel options" }),
+      { button: 0 },
+    );
+    fireEvent.click(await screen.findByRole("menuitem", { name: "Disable" }));
+
+    await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(1));
+    const [input, init] = fetchMock.mock.calls[0] ?? [];
+    expect(String(input)).toBe("/api/v1/plugins/docs/disable");
+    expect(init).toMatchObject({ method: "POST", body: "{}" });
+    await waitFor(() =>
+      expect(screen.getByTestId("location-path").textContent).toBe(
+        "/extensions/plugins",
+      ),
+    );
+    expect(appToast.success).toHaveBeenCalledWith("Docs disabled");
+    expect(invalidateQueries).toHaveBeenCalled();
+  });
+
+  it("reports a disable failure without leaving the active panel", async () => {
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(
+        async () =>
+          new Response(JSON.stringify({ ok: false, error: "disable failed" }), {
+            status: 500,
+            headers: { "content-type": "application/json" },
+          }),
+      ),
+    );
+    registerPanel("docs", "Docs");
+    renderSidebarItems({ initialEntry: "/plugins/docs/main" });
+
+    fireEvent.pointerDown(
+      screen.getByRole("button", { name: "Docs panel options" }),
+      { button: 0 },
+    );
+    fireEvent.click(await screen.findByRole("menuitem", { name: "Disable" }));
+
+    await waitFor(() =>
+      expect(appToast.error).toHaveBeenCalledWith("Failed to disable Docs", {
+        description: "HTTP 500: disable failed",
+      }),
+    );
+    expect(screen.getByTestId("location-path").textContent).toBe(
+      "/plugins/docs/main",
+    );
+  });
+
   it("does not mount sidebar accessories on compact viewports", () => {
     let mounts = 0;
     registerPanel("tasks", "Tasks", () => {
diff --git a/apps/app/src/components/plugin/PluginNavSidebarItems.tsx b/apps/app/src/components/plugin/PluginNavSidebarItems.tsx
index 8c1301731c..81756ab225 100644
--- a/apps/app/src/components/plugin/PluginNavSidebarItems.tsx
+++ b/apps/app/src/components/plugin/PluginNavSidebarItems.tsx
@@ -11,6 +11,7 @@ import {
 import { useLocation, useNavigate } from "react-router-dom";
 import { useAtom } from "jotai";
 import { DndContext, type DragEndEvent } from "@dnd-kit/core";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import {
   SortableContext,
   verticalListSortingStrategy,
@@ -22,12 +23,14 @@ import {
   ContextMenu,
   ContextMenuContent,
   ContextMenuItem,
+  ContextMenuSeparator,
   ContextMenuTrigger,
 } from "@bb/shared-ui/context-menu";
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
+  DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@bb/shared-ui/dropdown-menu";
 import { COARSE_POINTER_ICON_SIZE_CLASS } from "@bb/shared-ui/coarse-pointer-sizing";
@@ -37,7 +40,10 @@ import { PluginSlotMount } from "@/components/plugin/PluginSlotMount";
 import { PROJECT_LIST_ACTION_BUTTON_CLASS } from "@/components/sidebar/ProjectList";
 import {
   AUTOMATIONS_PLUGIN_ID,
+  getPluginDetailRoutePath,
   getPluginPanelRoutePath,
+  getPluginPanelRoutePluginId,
+  getPluginsRoutePath,
 } from "@/lib/route-paths";
 import {
   usePluginNavPanelChrome,
@@ -59,6 +65,9 @@ import {
 import { useSidebarSortable } from "@/components/sidebar/sortableMotion";
 import { useSidebarReorderDnd } from "@/components/sidebar/useSidebarReorderDnd";
 import type { SidebarSortableDragBindings } from "@/components/sidebar/sortableMotion";
+import { appToast } from "@/components/ui/app-toast";
+import { invalidatePluginList } from "@/hooks/cache-owners/plugin-cache-owner";
+import { setPluginEnabled } from "@/hooks/queries/plugin-settings-queries";
 import { pluginNavPanelOrderAtom } from "./pluginNavSidebarAtoms";
 import {
   arrangePluginNavPanels,
@@ -132,8 +141,27 @@ function PluginNavSidebarItemList({
   splitEnabled?: boolean;
 }) {
   const location = useLocation();
+  const navigate = useNavigate();
+  const queryClient = useQueryClient();
   const [storedOrder, setStoredOrder] = useAtom(pluginNavPanelOrderAtom);
   const [isOverflowOpen, setIsOverflowOpen] = useState(false);
+  const disable = useMutation({
+    mutationFn: (row: SidebarNavRow) =>
+      setPluginEnabled(fetch, row.pluginId, false),
+    onSuccess: (_result, row) => {
+      appToast.success(`${row.title} disabled`);
+      if (getPluginPanelRoutePluginId(location.pathname) === row.pluginId) {
+        onNavigate?.();
+        void navigate(getPluginsRoutePath());
+      }
+    },
+    onError: (error, row) => {
+      appToast.error(`Failed to disable ${row.title}`, {
+        description: error instanceof Error ? error.message : String(error),
+      });
+    },
+    onSettled: () => invalidatePluginList({ queryClient }),
+  });
   const traditionalStoredOrder = useMemo(
     () =>
       storedOrder.filter((key) => !key.startsWith(`${AUTOMATIONS_PLUGIN_ID}/`)),
@@ -214,6 +242,8 @@ function PluginNavSidebarItemList({
     orderedKeys,
     onMoveToTop: handleMoveToTop,
     onMoveToOverflow: handleMoveToOverflow,
+    disablePending: disable.isPending,
+    onDisable: (row: SidebarNavRow) => disable.mutate(row),
   };
 
   return (
@@ -326,6 +356,8 @@ interface SidebarNavRowItemProps {
   orderedKeys: readonly string[];
   onMoveToTop: (key: string) => void;
   onMoveToOverflow: (key: string) => void;
+  disablePending: boolean;
+  onDisable: (row: SidebarNavRow) => void;
   dragBindings?: SidebarSortableDragBindings;
   rowRef?: (element: HTMLElement | null) => void;
   rowStyle?: CSSProperties;
@@ -343,30 +375,118 @@ function SidebarNavRowItem({
 
 type PluginNavRowMenuSurface = "context" | "dropdown";
 
-function PluginNavRowPositionMenuItems({
+function PluginNavRowMenuItem({
+  children,
+  disabled = false,
+  icon,
+  onSelect,
+  surface,
+}: {
+  children: ReactNode;
+  disabled?: boolean;
+  icon: "ArrowDown" | "ArrowUp" | "Columns2" | "Info" | "Pause";
+  onSelect: () => void;
+  surface: PluginNavRowMenuSurface;
+}) {
+  const content = (
+    <>
+      <Icon name={icon} aria-hidden="true" />
+      {children}
+    </>
+  );
+  if (surface === "context") {
+    return (
+      <ContextMenuItem disabled={disabled} onSelect={onSelect}>
+        {content}
+      </ContextMenuItem>
+    );
+  }
+  return (
+    <DropdownMenuItem disabled={disabled} onSelect={onSelect}>
+      {content}
+    </DropdownMenuItem>
+  );
+}
+
+function PluginNavRowMenuSeparator({
+  surface,
+}: {
+  surface: PluginNavRowMenuSurface;
+}) {
+  return surface === "context" ? (
+    <ContextMenuSeparator />
+  ) : (
+    <DropdownMenuSeparator />
+  );
+}
+
+function PluginNavRowMenuItems({
   canMoveToTop,
   canMoveToOverflow,
+  canOpenInSplit,
+  disablePending,
+  onDisable,
+  onOpenInSplit,
+  onOpenDetails,
   onMoveToTop,
   onMoveToOverflow,
   surface,
 }: {
   canMoveToTop: boolean;
   canMoveToOverflow: boolean;
+  canOpenInSplit: boolean;
+  disablePending: boolean;
+  onDisable: () => void;
+  onOpenInSplit: () => void;
+  onOpenDetails: () => void;
   onMoveToTop: () => void;
   onMoveToOverflow: () => void;
   surface: PluginNavRowMenuSurface;
 }) {
-  const Item = surface === "context" ? ContextMenuItem : DropdownMenuItem;
   return (
     <>
-      <Item disabled={!canMoveToTop} onSelect={onMoveToTop}>
-        <Icon name="ArrowUp" aria-hidden="true" />
+      <PluginNavRowMenuItem
+        surface={surface}
+        icon="ArrowUp"
+        disabled={!canMoveToTop}
+        onSelect={onMoveToTop}
+      >
         Move to top
-      </Item>
-      <Item disabled={!canMoveToOverflow} onSelect={onMoveToOverflow}>
-        <Icon name="ArrowDown" aria-hidden="true" />
+      </PluginNavRowMenuItem>
+      <PluginNavRowMenuItem
+        surface={surface}
+        icon="ArrowDown"
+        disabled={!canMoveToOverflow}
+        onSelect={onMoveToOverflow}
+      >
         Move to overflow
-      </Item>
+      </PluginNavRowMenuItem>
+      <PluginNavRowMenuSeparator surface={surface} />
+      {canOpenInSplit ? (
+        <PluginNavRowMenuItem
+          surface={surface}
+          icon="Columns2"
+          onSelect={onOpenInSplit}
+        >
+          Open in split
+        </PluginNavRowMenuItem>
+      ) : null}
+      <PluginNavRowMenuItem
+        surface={surface}
+        icon="Info"
+        onSelect={onOpenDetails}
+      >
+        Detail page
+      </PluginNavRowMenuItem>
+      <PluginNavRowMenuSeparator surface={surface} />
+      <PluginNavRowMenuItem
+        surface={surface}
+        icon="Pause"
+        disabled={disablePending}
+        onSelect={onDisable}
+      >
+        Disable
+      </PluginNavRowMenuItem>
     </>
   );
 }
@@ -466,6 +586,7 @@ function PluginNavSidebarItem({
   row,
   pathname,
   onNavigate,
+  onDisable,
   splitEnabled,
   ...props
 }: Omit<SidebarNavRowItemProps, "row"> & {
@@ -516,6 +637,12 @@ function PluginNavSidebarItem({
       // Split-drag initiator; engages only when the pointer leaves the
       // sidebar, so it coexists with the dnd-kit reorder listeners.
       onPointerDown={onPointerDown}
+      onOpenInSplit={splitEnabled ? openInSplit : undefined}
+      onOpenDetails={() => {
+        onNavigate?.();
+        void navigate(getPluginDetailRoutePath({ pluginId: chrome.pluginId }));
+      }}
+      onDisable={() => onDisable(row)}
       onSelect={(event) => {
         onNavigate?.();
         if (event.metaKey || event.ctrlKey) {
@@ -535,6 +662,10 @@ interface SidebarNavRowChromeProps {
   isActive: boolean;
   onSelect: (event: ReactMouseEvent<HTMLButtonElement>) => void;
   onPointerDown?: PointerEventHandler<HTMLElement>;
+  onOpenInSplit?: () => void;
+  onOpenDetails: () => void;
+  onDisable: () => void;
+  disablePending: boolean;
   splitMiniMap?: MiniMapSlot[] | null;
   accessory?: ReactNode;
   orderedKeys: readonly string[];
@@ -545,7 +676,7 @@ interface SidebarNavRowChromeProps {
   rowStyle?: CSSProperties;
 }
 
-/** Shared chrome for every sidebar nav row: button, hide menus, drag handle. */
+/** Shared chrome for every sidebar nav row: button, action menus, drag handle. */
 function SidebarNavRowChrome({
   rowKey,
   title,
@@ -553,6 +684,10 @@ function SidebarNavRowChrome({
   isActive,
   onSelect,
   onPointerDown,
+  onOpenInSplit,
+  onOpenDetails,
+  onDisable,
+  disablePending,
   splitMiniMap = null,
   accessory,
   orderedKeys,
@@ -569,8 +704,8 @@ function SidebarNavRowChrome({
   const { onKeyDown: _keyboardDragActivator, ...pointerDragListeners } =
     dragBindings?.listeners ?? {};
   const rowIndex = orderedKeys.indexOf(rowKey);
-  const positionItems = (surface: PluginNavRowMenuSurface): ReactNode => (
-    <PluginNavRowPositionMenuItems
+  const menuItems = (surface: PluginNavRowMenuSurface): ReactNode => (
+    <PluginNavRowMenuItems
       surface={surface}
       canMoveToTop={rowIndex > 0}
       canMoveToOverflow={
@@ -578,6 +713,11 @@ function SidebarNavRowChrome({
         rowIndex >= 0 &&
         rowIndex < PLUGIN_NAV_VISIBLE_LIMIT
       }
+      canOpenInSplit={onOpenInSplit !== undefined}
+      disablePending={disablePending}
+      onDisable={onDisable}
+      onOpenInSplit={() => onOpenInSplit?.()}
+      onOpenDetails={onOpenDetails}
       onMoveToTop={() => onMoveToTop(rowKey)}
       onMoveToOverflow={() => onMoveToOverflow(rowKey)}
     />
@@ -673,14 +813,14 @@ function SidebarNavRowChrome({
                 </Button>
               </DropdownMenuTrigger>
               <DropdownMenuContent align="end">
-                {positionItems("dropdown")}
+                {menuItems("dropdown")}
               </DropdownMenuContent>
             </DropdownMenu>
           </div>
         </div>
       </ContextMenuTrigger>
       <ContextMenuContent aria-label={`${title} panel options`}>
-        {positionItems("context")}
+        {menuItems("context")}
       </ContextMenuContent>
     </ContextMenu>
   );
diff --git a/apps/app/src/components/plugin/plugin-slot-mounts.test.tsx b/apps/app/src/components/plugin/plugin-slot-mounts.test.tsx
index 02764f698f..4c1c9592bc 100644
--- a/apps/app/src/components/plugin/plugin-slot-mounts.test.tsx
+++ b/apps/app/src/components/plugin/plugin-slot-mounts.test.tsx
@@ -1,7 +1,13 @@
 // @vitest-environment jsdom
 
 import { MemoryRouter, Route, Routes, useNavigate } from "react-router-dom";
-import { useLayoutEffect, useMemo, useRef, useState } from "react";
+import {
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+  type ReactNode,
+} from "react";
 import {
   act,
   cleanup,
@@ -10,6 +16,7 @@ import {
   screen,
 } from "@testing-library/react";
 import { createStore, Provider } from "jotai";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { PERSONAL_PROJECT_ID } from "@bb/domain";
 import type {
@@ -1258,6 +1265,15 @@ describe("useComposer", () => {
 });
 
 describe("PluginNavSidebarItems + PluginPanelView", () => {
+  function renderPluginNav(ui: ReactNode) {
+    const queryClient = new QueryClient({
+      defaultOptions: { queries: { retry: false } },
+    });
+    return render(
+      <QueryClientProvider client={queryClient}>{ui}</QueryClientProvider>,
+    );
+  }
+
   function Board() {
     return <div>board panel body</div>;
   }
@@ -1282,7 +1298,7 @@ describe("PluginNavSidebarItems + PluginPanelView", () => {
   it("keeps built-in Automations out of the traditional plugin nav list", () => {
     registerAutomationsPanel();
 
-    render(
+    renderPluginNav(
       <MemoryRouter>
         <PluginNavSidebarItems />
       </MemoryRouter>,
@@ -1306,7 +1322,7 @@ describe("PluginNavSidebarItems + PluginPanelView", () => {
         ],
       }),
     );
-    render(
+    renderPluginNav(
       <MemoryRouter initialEntries={["/"]}>
         <PluginNavSidebarItems />
         <Routes>
@@ -1426,7 +1442,7 @@ describe("PluginNavSidebarItems + PluginPanelView", () => {
       },
     });
 
-    render(
+    renderPluginNav(
       <Provider store={store}>
         <MemoryRouter initialEntries={["/"]}>
           <PluginNavSidebarItems splitEnabled />
@@ -1456,7 +1472,7 @@ describe("PluginNavSidebarItems + PluginPanelView", () => {
         ],
       }),
     );
-    render(
+    renderPluginNav(
       <MemoryRouter
         initialEntries={[
           "/plugins/simple-notes/simple-notes/bb-plugin-marketplaces-and-compatible-updates.md",
@@ -1484,7 +1500,7 @@ describe("PluginNavSidebarItems + PluginPanelView", () => {
         icon: "columns",
       },
     ]);
-    render(
+    renderPluginNav(
       <MemoryRouter>
         <PluginNavSidebarItems />
       </MemoryRouter>,
@@ -1525,7 +1541,7 @@ describe("PluginNavSidebarItems + PluginPanelView", () => {
         icon: "columns",
       },
     ]);
-    render(
+    renderPluginNav(
       <MemoryRouter>
         <PluginNavSidebarItems />
       </MemoryRouter>,
diff --git a/apps/app/src/components/sidebar/ProjectListSectionHeader.test.tsx b/apps/app/src/components/sidebar/ProjectListSectionHeader.test.tsx
index 60c4707ddf..e5a2b66cd5 100644
--- a/apps/app/src/components/sidebar/ProjectListSectionHeader.test.tsx
+++ b/apps/app/src/components/sidebar/ProjectListSectionHeader.test.tsx
@@ -123,10 +123,11 @@ describe("TopLevelSidebarSection", () => {
     ).not.toBeNull();
   });
 
-  it("renders the disclosure after the section label without a leading icon", () => {
+  it("keeps the disclosure in the fixed final slot after section actions", () => {
     const result = render(
       <TopLevelSidebarSection
         label="Pinned"
+        actions={<button type="button">Section action</button>}
         collapseControl={{ isCollapsed: false, onToggleCollapsed: vi.fn() }}
       >
         <div>Pinned thread</div>
@@ -138,12 +139,27 @@ describe("TopLevelSidebarSection", () => {
     });
     const icon = result.container.querySelector('[data-icon="Pin"]');
     const label = screen.getByTitle("Pinned");
+    const caretSlot = disclosure.closest("[data-sidebar-collapse-caret-slot]");
+    const row = caretSlot?.parentElement;
+    const trailingControls = row?.querySelector(
+      "[data-sidebar-collapsible-trailing-controls]",
+    );
 
     expect(icon).toBeNull();
     expect(
       label.compareDocumentPosition(disclosure) &
         Node.DOCUMENT_POSITION_FOLLOWING,
     ).not.toBe(0);
+    expect(disclosure.classList.contains("text-subtle-foreground/75")).toBe(
+      true,
+    );
+    expect(disclosure.classList.contains("text-subtle-foreground")).toBe(false);
+    expect(
+      disclosure.classList.contains("hover:text-sidebar-accent-foreground"),
+    ).toBe(true);
+    expect(caretSlot?.classList.contains("w-6")).toBe(true);
+    expect(row?.lastElementChild).toBe(caretSlot);
+    expect(trailingControls?.nextElementSibling).toBe(caretSlot);
   });
 
   it("rolls a hidden split thread up to a collapsed top-level section", () => {
diff --git a/apps/app/src/components/sidebar/ProjectRow.interactions.test.tsx b/apps/app/src/components/sidebar/ProjectRow.interactions.test.tsx
index 09e37a21c0..db50319db8 100644
--- a/apps/app/src/components/sidebar/ProjectRow.interactions.test.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.interactions.test.tsx
@@ -208,7 +208,7 @@ describe("ProjectRow interactions", () => {
   });
 
   it("shows generic runtime activity before a named workflow rollup", () => {
-    renderProjectRow(
+    const result = renderProjectRow(
       vi.fn(),
       {
         status: "ready",
@@ -252,6 +252,22 @@ describe("ProjectRow interactions", () => {
     ).not.toBeNull();
     expect(screen.getByLabelText("Thread working")).not.toBeNull();
     expect(screen.queryByLabelText("Workflow running")).toBeNull();
+    const folderIcon = result.container.querySelector(
+      '[data-icon="FolderGit"]',
+    );
+    const folderIconContainer = folderIcon?.parentElement;
+    expect(folderIconContainer).not.toBeNull();
+    expect(
+      folderIconContainer?.classList.contains("text-subtle-foreground/75"),
+    ).toBe(true);
+    expect(
+      folderIconContainer?.classList.contains("text-subtle-foreground"),
+    ).toBe(false);
+    expect(
+      folderIconContainer?.nextElementSibling?.classList.contains(
+        "text-subtle-foreground/80",
+      ),
+    ).toBe(true);
   });
 
   it("shows a working draft before named work for a collapsed environment", () => {
@@ -514,6 +530,19 @@ describe("ProjectRow interactions", () => {
       ],
     });
 
+    const disclosure = screen.getByRole("button", {
+      name: "Collapse Feature workspace threads",
+    });
+    const caretSlot = disclosure.closest("[data-sidebar-collapse-caret-slot]");
+    const row = caretSlot?.parentElement;
+    const trailingControls = row?.querySelector(
+      "[data-sidebar-collapsible-trailing-controls]",
+    );
+
+    expect(caretSlot?.classList.contains("w-6")).toBe(true);
+    expect(row?.lastElementChild).toBe(caretSlot);
+    expect(trailingControls?.nextElementSibling).toBe(caretSlot);
+
     fireEvent.pointerDown(
       screen.getByRole("button", { name: "Worktree actions" }),
       { button: 0 },
diff --git a/apps/app/src/components/sidebar/ProjectRow.tsx b/apps/app/src/components/sidebar/ProjectRow.tsx
index ff7f202d2c..f280c5bca1 100644
--- a/apps/app/src/components/sidebar/ProjectRow.tsx
+++ b/apps/app/src/components/sidebar/ProjectRow.tsx
@@ -56,6 +56,8 @@ import {
   COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
 } from "@bb/shared-ui/coarse-pointer-sizing";
 import {
+  SIDEBAR_COLLAPSIBLE_TRAILING_CONTROLS_CLASS,
+  SIDEBAR_COLLAPSE_CARET_SLOT_CLASS,
   SIDEBAR_HOVER_ACTIONS_CLASS,
   SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
   SIDEBAR_HOVER_ACTIONS_GAP_CLASS,
@@ -960,7 +962,7 @@ function EnvironmentThreadGroupHeader({
       )}
       <span
         className={cn(
-          "pointer-events-none relative z-10 inline-flex shrink-0 items-center justify-center text-subtle-foreground",
+          "pointer-events-none relative z-10 inline-flex shrink-0 items-center justify-center text-subtle-foreground/75",
           COARSE_POINTER_GLYPH_BOX_CLASS,
         )}
         aria-hidden="true"
@@ -971,20 +973,15 @@ function EnvironmentThreadGroupHeader({
           aria-hidden="true"
         />
       </span>
-      <span className="pointer-events-none relative z-10 flex min-w-0 flex-1 items-center gap-1.5 text-left text-subtle-foreground/80">
+      <span className="pointer-events-none relative z-10 flex min-w-0 flex-1 items-center text-left text-subtle-foreground/80">
         <span className="min-w-0 truncate">
           <span>{displayName}</span>
         </span>
-        <SidebarChildToggleChevron
-          isCollapsed={isCollapsed}
-          expandLabel={`Expand ${displayName} threads`}
-          collapseLabel={`Collapse ${displayName} threads`}
-          onToggle={() => onToggleCollapsed(environmentId)}
-          revealOnHover
-        />
       </span>
       <span
+        data-sidebar-collapsible-trailing-controls=""
         className={cn(
+          SIDEBAR_COLLAPSIBLE_TRAILING_CONTROLS_CLASS,
           "relative z-10 shrink-0",
           COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
         )}
@@ -1016,6 +1013,18 @@ function EnvironmentThreadGroupHeader({
           />
         </div>
       </span>
+      <span
+        data-sidebar-collapse-caret-slot=""
+        className={SIDEBAR_COLLAPSE_CARET_SLOT_CLASS}
+      >
+        <SidebarChildToggleChevron
+          isCollapsed={isCollapsed}
+          expandLabel={`Expand ${displayName} threads`}
+          collapseLabel={`Collapse ${displayName} threads`}
+          onToggle={() => onToggleCollapsed(environmentId)}
+          revealOnHover
+        />
+      </span>
     </>
   );
 
diff --git a/apps/app/src/components/sidebar/SidebarChildToggleChevron.tsx b/apps/app/src/components/sidebar/SidebarChildToggleChevron.tsx
index 029aa74659..00d58206ba 100644
--- a/apps/app/src/components/sidebar/SidebarChildToggleChevron.tsx
+++ b/apps/app/src/components/sidebar/SidebarChildToggleChevron.tsx
@@ -24,6 +24,7 @@ export function SidebarChildToggleChevron({
   return (
     <button
       type="button"
+      data-sidebar-collapse-caret=""
       aria-expanded={!isCollapsed}
       aria-label={isCollapsed ? expandLabel : collapseLabel}
       data-sidebar-hover-actions-mobile={
@@ -36,7 +37,7 @@ export function SidebarChildToggleChevron({
       }}
       className={cn(
         revealOnHover ? SIDEBAR_HOVER_ACTIONS_CLASS : "pointer-events-auto",
-        "relative z-10 inline-flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-md text-subtle-foreground outline-none ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2",
+        "relative z-10 inline-flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-md text-subtle-foreground/75 outline-none ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2",
         LIST_HOVER_TRANSITION,
       )}
     >
diff --git a/apps/app/src/components/sidebar/SidebarSectionRow.test.tsx b/apps/app/src/components/sidebar/SidebarSectionRow.test.tsx
index f5b78514e2..8883a233fb 100644
--- a/apps/app/src/components/sidebar/SidebarSectionRow.test.tsx
+++ b/apps/app/src/components/sidebar/SidebarSectionRow.test.tsx
@@ -20,7 +20,7 @@ afterEach(() => {
 });
 
 describe("SidebarSectionRow", () => {
-  it("renders the section name before the disclosure without a sidebar icon", () => {
+  it("keeps the disclosure in the fixed final slot after section actions", () => {
     const result = render(
       <SidebarSectionRow
         name="Nested work"
@@ -29,6 +29,7 @@ describe("SidebarSectionRow", () => {
         activity={NO_COLLAPSED_CHILD_ACTIVITY}
         isCollapsed={false}
         onToggleCollapsed={vi.fn()}
+        onRename={vi.fn()}
       />,
     );
 
@@ -38,6 +39,10 @@ describe("SidebarSectionRow", () => {
     const icon = result.container.querySelector('[data-icon="ListView"]');
     const label = screen.getByText("Nested work");
     const row = label.parentElement?.parentElement as HTMLElement | null;
+    const caretSlot = disclosure.closest("[data-sidebar-collapse-caret-slot]");
+    const trailingControls = row?.querySelector(
+      "[data-sidebar-collapsible-trailing-controls]",
+    );
 
     expect(icon).toBeNull();
     expect(
@@ -45,6 +50,9 @@ describe("SidebarSectionRow", () => {
         Node.DOCUMENT_POSITION_FOLLOWING,
     ).not.toBe(0);
     expect(row?.style.paddingLeft).toBe("32px");
+    expect(caretSlot?.classList.contains("w-6")).toBe(true);
+    expect(row?.lastElementChild).toBe(caretSlot);
+    expect(trailingControls?.nextElementSibling).toBe(caretSlot);
   });
 
   it("rolls hidden split threads up to the collapsed section row", () => {
diff --git a/apps/app/src/components/sidebar/SidebarSectionRow.tsx b/apps/app/src/components/sidebar/SidebarSectionRow.tsx
index 5e70ab20ac..d9f7c6e7e4 100644
--- a/apps/app/src/components/sidebar/SidebarSectionRow.tsx
+++ b/apps/app/src/components/sidebar/SidebarSectionRow.tsx
@@ -23,6 +23,8 @@ import {
 } from "@bb/shared-ui/coarse-pointer-sizing";
 import { LIST_HOVER_TRANSITION } from "@bb/shared-ui/motion";
 import {
+  SIDEBAR_COLLAPSIBLE_TRAILING_CONTROLS_CLASS,
+  SIDEBAR_COLLAPSE_CARET_SLOT_CLASS,
   SIDEBAR_HOVER_ACTIONS_CLASS,
   SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
   SIDEBAR_HOVER_ACTIONS_GAP_CLASS,
@@ -162,35 +164,31 @@ function SidebarSectionRowComponent({
         onClick={onToggleCollapsed}
         className="absolute inset-0 rounded-md outline-none ring-sidebar-ring focus-visible:ring-2"
       />
-      <span className="relative z-10 flex min-w-0 flex-1 items-center gap-1 text-left">
+      <span className="relative z-10 flex min-w-0 flex-1 items-center text-left">
         <span className="min-w-0 truncate">{name}</span>
-        <SidebarChildToggleChevron
-          isCollapsed={isCollapsed}
-          expandLabel={`Expand ${label} section`}
-          collapseLabel={`Collapse ${label} section`}
-          onToggle={onToggleCollapsed}
-        />
       </span>
-      {showRollupIndicator ? (
-        <span
-          data-sidebar-collapsed-activity-edge=""
-          data-sidebar-hover-actions-open={isActionsOpen ? "true" : undefined}
-          className={cn(
-            "pointer-events-none absolute right-0 top-1/2 z-20 inline-flex -translate-y-1/2 items-center text-subtle-foreground max-md:pointer-coarse:hidden",
-            hasActions && SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
-          )}
-        >
-          {renderRollupIndicator()}
-        </span>
-      ) : null}
       <span
+        data-sidebar-collapsible-trailing-controls=""
         className={cn(
+          SIDEBAR_COLLAPSIBLE_TRAILING_CONTROLS_CLASS,
           "relative z-10 shrink-0",
           hasActions
             ? "inline-flex items-center"
             : COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
         )}
       >
+        {showRollupIndicator ? (
+          <span
+            data-sidebar-collapsed-activity-edge=""
+            data-sidebar-hover-actions-open={isActionsOpen ? "true" : undefined}
+            className={cn(
+              "pointer-events-none absolute inset-0 inline-flex items-center justify-end text-subtle-foreground max-md:pointer-coarse:hidden",
+              hasActions && SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
+            )}
+          >
+            {renderRollupIndicator()}
+          </span>
+        ) : null}
         {hasActions ? (
           <span
             data-sidebar-hover-actions-open={isActionsOpen ? "true" : undefined}
@@ -277,6 +275,17 @@ function SidebarSectionRowComponent({
           </span>
         ) : null}
       </span>
+      <span
+        data-sidebar-collapse-caret-slot=""
+        className={SIDEBAR_COLLAPSE_CARET_SLOT_CLASS}
+      >
+        <SidebarChildToggleChevron
+          isCollapsed={isCollapsed}
+          expandLabel={`Expand ${label} section`}
+          collapseLabel={`Collapse ${label} section`}
+          onToggle={onToggleCollapsed}
+        />
+      </span>
     </>
   );
 
diff --git a/apps/app/src/components/sidebar/ThreadRow.test.tsx b/apps/app/src/components/sidebar/ThreadRow.test.tsx
index d8dce3c9fd..08c296cf84 100644
--- a/apps/app/src/components/sidebar/ThreadRow.test.tsx
+++ b/apps/app/src/components/sidebar/ThreadRow.test.tsx
@@ -770,6 +770,8 @@ describe("ThreadRow", () => {
     );
     expect(marker?.getAttribute("aria-label")).toBe("In project Web App");
     expect(marker?.querySelector('[data-icon="FolderExport"]')).not.toBeNull();
+    expect(marker?.classList.contains("text-muted-foreground/75")).toBe(true);
+    expect(marker?.classList.contains("text-muted-foreground")).toBe(false);
     // The marker hugs the title; it never sits in the trailing status slot.
     expect(
       marker?.closest("[data-sidebar-thread-trailing-indicator]"),
@@ -908,11 +910,31 @@ describe("ThreadRow", () => {
       },
     });
 
+    const disclosure = screen.getByRole("button", {
+      name: "Collapse Parent thread threads",
+    });
+    expect(disclosure.getAttribute("data-sidebar-hover-actions-mobile")).toBe(
+      "always",
+    );
+    expect(disclosure.classList.contains("text-subtle-foreground/75")).toBe(
+      true,
+    );
+    expect(disclosure.classList.contains("text-subtle-foreground")).toBe(false);
     expect(
-      screen
-        .getByRole("button", { name: "Collapse Parent thread threads" })
-        .getAttribute("data-sidebar-hover-actions-mobile"),
-    ).toBe("always");
+      disclosure.classList.contains("hover:text-sidebar-accent-foreground"),
+    ).toBe(true);
+    const caretSlot = disclosure.closest("[data-sidebar-collapse-caret-slot]");
+    const row = caretSlot?.parentElement;
+    const titleRegion = screen
+      .getByTitle("Parent thread")
+      .closest(".bb-sidebar-collapsible-hover-actions-inset");
+
+    expect(caretSlot?.classList.contains("w-6")).toBe(true);
+    expect(row?.lastElementChild).toBe(caretSlot);
+    expect(titleRegion).not.toBeNull();
+    expect(
+      titleRegion?.classList.contains("bb-sidebar-hover-actions-inset"),
+    ).toBe(false);
   });
 
   it("shows its Command shortcut in place of an active indicator", () => {
diff --git a/apps/app/src/components/sidebar/ThreadRow.tsx b/apps/app/src/components/sidebar/ThreadRow.tsx
index c29e30a7b2..20e3c9f8e1 100644
--- a/apps/app/src/components/sidebar/ThreadRow.tsx
+++ b/apps/app/src/components/sidebar/ThreadRow.tsx
@@ -31,6 +31,8 @@ import {
   COARSE_POINTER_ROW_HEIGHT_CLASS,
 } from "@bb/shared-ui/coarse-pointer-sizing";
 import {
+  SIDEBAR_COLLAPSIBLE_HOVER_ACTIONS_INSET_CLASS,
+  SIDEBAR_COLLAPSE_CARET_SLOT_CLASS,
   SIDEBAR_HOVER_ACTIONS_CLASS,
   SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
   SIDEBAR_HOVER_ACTIONS_INSET_CLASS,
@@ -725,7 +727,10 @@ function ThreadRowComponent({
           "flex min-w-0 flex-1 items-center gap-1.5",
           // The hover actions overlay grows leftward past the trailing slot;
           // this reserves room so the title never runs under the extra button.
-          !shortcut && SIDEBAR_HOVER_ACTIONS_INSET_CLASS,
+          !shortcut &&
+            (parentOptions && hasChildren
+              ? SIDEBAR_COLLAPSIBLE_HOVER_ACTIONS_INSET_CLASS
+              : SIDEBAR_HOVER_ACTIONS_INSET_CLASS),
         )}
       >
         {isEditing ? (
@@ -751,7 +756,7 @@ function ThreadRowComponent({
                 // Sits above the row's full-size link so it can take hover;
                 // nudged 1px down so the glyph reads centered on the text.
                 // A click still opens the thread by forwarding to the link.
-                className="relative top-px z-10 flex shrink-0 items-center text-muted-foreground"
+                className="relative top-px z-10 flex shrink-0 items-center text-muted-foreground/75"
                 onClick={(event) => {
                   event.preventDefault();
                   event.stopPropagation();
@@ -764,15 +769,6 @@ function ThreadRowComponent({
             <TooltipContent side="top">{crossProjectLabel}</TooltipContent>
           </Tooltip>
         ) : null}
-        {parentOptions && hasChildren ? (
-          <SidebarChildToggleChevron
-            isCollapsed={isParentCollapsed}
-            expandLabel={`Expand ${labelTitle} threads`}
-            collapseLabel={`Collapse ${labelTitle} threads`}
-            onToggle={() => parentOptions.onToggleCollapsed(thread.id)}
-            revealOnHover
-          />
-        ) : null}
       </span>
       <span className="flex shrink-0 items-center gap-0.5">
         {shortcut ? (
@@ -860,6 +856,20 @@ function ThreadRowComponent({
           </span>
         )}
       </span>
+      {parentOptions && hasChildren ? (
+        <span
+          data-sidebar-collapse-caret-slot=""
+          className={SIDEBAR_COLLAPSE_CARET_SLOT_CLASS}
+        >
+          <SidebarChildToggleChevron
+            isCollapsed={isParentCollapsed}
+            expandLabel={`Expand ${labelTitle} threads`}
+            collapseLabel={`Collapse ${labelTitle} threads`}
+            onToggle={() => parentOptions.onToggleCollapsed(thread.id)}
+            revealOnHover
+          />
+        </span>
+      ) : null}
     </>
   );
 
diff --git a/apps/app/src/components/sidebar/TopLevelSidebarSection.tsx b/apps/app/src/components/sidebar/TopLevelSidebarSection.tsx
index c9125e34b6..13a55cdfa5 100644
--- a/apps/app/src/components/sidebar/TopLevelSidebarSection.tsx
+++ b/apps/app/src/components/sidebar/TopLevelSidebarSection.tsx
@@ -16,6 +16,8 @@ import {
   SidebarStickyTier,
 } from "@/components/ui/sidebar.js";
 import {
+  SIDEBAR_COLLAPSIBLE_TRAILING_CONTROLS_CLASS,
+  SIDEBAR_COLLAPSE_CARET_SLOT_CLASS,
   SIDEBAR_HOVER_ACTIONS_CLASS,
   SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
   SIDEBAR_HOVER_ACTIONS_GAP_CLASS,
@@ -35,7 +37,6 @@ import {
   type ThreadSplitIndicatorTarget,
 } from "./paneContentSplitIndicator";
 import { SplitPaneMiniMap } from "./SplitPaneMiniMap";
-import { COARSE_POINTER_ROW_ACTION_SIZE_CLASS } from "@bb/shared-ui/coarse-pointer-sizing";
 import { usePluginThreadRowStatusForThreads } from "@/lib/plugin-thread-row-status";
 
 const EMPTY_SPLIT_INDICATOR_THREADS: readonly ThreadSplitIndicatorTarget[] = [];
@@ -149,13 +150,85 @@ export function TopLevelSidebarSection({
         {...dragBindings?.attributes}
         {...(dragBindings?.listeners ?? {})}
       >
-        <span className="relative z-10 flex min-w-0 flex-1 items-center gap-1 text-left">
+        <span className="relative z-10 flex min-w-0 flex-1 items-center text-left">
           <span className="min-w-0 truncate" title={label}>
             {label}
           </span>
-          {collapseControl ? (
+        </span>
+        {actions ||
+        (collapseControl?.isCollapsed &&
+          (collapsedSplitIndicator.miniMap !== null ||
+            collapsedActivity ||
+            pluginStatus)) ? (
+          <span
+            data-sidebar-collapsible-trailing-controls=""
+            className={cn(
+              SIDEBAR_COLLAPSIBLE_TRAILING_CONTROLS_CLASS,
+              "relative z-20 h-6",
+              !actions && "w-7",
+            )}
+            onClick={stopActionsClick}
+          >
+            {collapseControl?.isCollapsed &&
+            (collapsedSplitIndicator.miniMap !== null ||
+              collapsedActivity ||
+              pluginStatus) ? (
+              <span
+                data-sidebar-collapsed-activity-edge=""
+                data-sidebar-hover-actions-open={
+                  actionsOpen ? "true" : undefined
+                }
+                className={cn(
+                  "pointer-events-none absolute inset-0 z-20 inline-flex items-center justify-end text-subtle-foreground max-md:pointer-coarse:relative max-md:pointer-coarse:inset-auto max-md:pointer-coarse:shrink-0 max-md:pointer-coarse:justify-center",
+                  actions && SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
+                )}
+              >
+                {collapsedSplitIndicator.miniMap ? (
+                  <SplitPaneMiniMap
+                    slots={collapsedSplitIndicator.miniMap}
+                    label={`${label} — contains a thread open in split`}
+                    isWorking={
+                      collapsedActivity?.working ||
+                      pluginStatus?.tone === "running"
+                    }
+                  />
+                ) : collapsedActivity || pluginStatus ? (
+                  <CollapsedThreadStatusGlyph
+                    activity={collapsedActivity ?? NO_COLLAPSED_CHILD_ACTIVITY}
+                    pluginStatus={pluginStatus}
+                  />
+                ) : null}
+              </span>
+            ) : null}
+            {actions ? (
+              <span
+                data-sidebar-hover-actions-open={
+                  actionsOpen ? "true" : undefined
+                }
+                data-sidebar-hover-actions-mobile={
+                  actionsMobileAlways
+                    ? SIDEBAR_HOVER_ACTIONS_MOBILE_ALWAYS_VALUE
+                    : undefined
+                }
+                className={cn(
+                  "inline-flex shrink-0 items-center",
+                  SIDEBAR_HOVER_ACTIONS_GAP_CLASS,
+                  !actionsAlwaysVisible && SIDEBAR_HOVER_ACTIONS_CLASS,
+                )}
+              >
+                {actions}
+              </span>
+            ) : null}
+          </span>
+        ) : null}
+        {collapseControl ? (
+          <span
+            data-sidebar-collapse-caret-slot=""
+            className={SIDEBAR_COLLAPSE_CARET_SLOT_CLASS}
+          >
             <button
               type="button"
+              data-sidebar-collapse-caret=""
               aria-expanded={!collapseControl.isCollapsed}
               data-sidebar-hover-actions-mobile={
                 SIDEBAR_HOVER_ACTIONS_MOBILE_ALWAYS_VALUE
@@ -167,7 +240,7 @@ export function TopLevelSidebarSection({
               }
               className={cn(
                 !collapseControl.isCollapsed && SIDEBAR_HOVER_ACTIONS_CLASS,
-                "relative z-20 inline-flex size-6 shrink-0 cursor-pointer items-center justify-center rounded-md text-subtle-foreground outline-none ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2",
+                "relative z-20 inline-flex size-6 shrink-0 cursor-pointer items-center justify-center rounded-md text-subtle-foreground/75 outline-none ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2",
                 LIST_HOVER_TRANSITION,
               )}
               onClick={handleCollapseControlClick}
@@ -183,57 +256,6 @@ export function TopLevelSidebarSection({
                 aria-hidden="true"
               />
             </button>
-          ) : null}
-        </span>
-        {collapseControl?.isCollapsed &&
-        (collapsedSplitIndicator.miniMap !== null ||
-          collapsedActivity ||
-          pluginStatus) ? (
-          <span
-            data-sidebar-collapsed-activity-edge=""
-            data-sidebar-hover-actions-open={actionsOpen ? "true" : undefined}
-            className={cn(
-              "pointer-events-none absolute right-0 top-1/2 z-20 inline-flex -translate-y-1/2 items-center justify-center text-subtle-foreground max-md:pointer-coarse:relative max-md:pointer-coarse:right-auto max-md:pointer-coarse:top-auto max-md:pointer-coarse:shrink-0 max-md:pointer-coarse:translate-y-0",
-              COARSE_POINTER_ROW_ACTION_SIZE_CLASS,
-              actions && SIDEBAR_HOVER_ACTIONS_FADE_CLASS,
-            )}
-          >
-            {collapsedSplitIndicator.miniMap ? (
-              <SplitPaneMiniMap
-                slots={collapsedSplitIndicator.miniMap}
-                label={`${label} — contains a thread open in split`}
-                isWorking={
-                  collapsedActivity?.working || pluginStatus?.tone === "running"
-                }
-              />
-            ) : collapsedActivity || pluginStatus ? (
-              <CollapsedThreadStatusGlyph
-                activity={collapsedActivity ?? NO_COLLAPSED_CHILD_ACTIVITY}
-                pluginStatus={pluginStatus}
-              />
-            ) : null}
-          </span>
-        ) : null}
-        {actions ? (
-          <span
-            className="relative z-20 inline-flex h-6 shrink-0 items-center"
-            onClick={stopActionsClick}
-          >
-            <span
-              data-sidebar-hover-actions-open={actionsOpen ? "true" : undefined}
-              data-sidebar-hover-actions-mobile={
-                actionsMobileAlways
-                  ? SIDEBAR_HOVER_ACTIONS_MOBILE_ALWAYS_VALUE
-                  : undefined
-              }
-              className={cn(
-                "inline-flex shrink-0 items-center",
-                SIDEBAR_HOVER_ACTIONS_GAP_CLASS,
-                !actionsAlwaysVisible && SIDEBAR_HOVER_ACTIONS_CLASS,
-              )}
-            >
-              {actions}
-            </span>
           </span>
         ) : null}
       </SidebarStickyTier>
diff --git a/apps/app/src/components/tools/PluginDetail.tsx b/apps/app/src/components/tools/PluginDetail.tsx
index 3ed0a5ebee..20ce626b2a 100644
--- a/apps/app/src/components/tools/PluginDetail.tsx
+++ b/apps/app/src/components/tools/PluginDetail.tsx
@@ -59,6 +59,10 @@ import {
 } from "@/lib/plugin-frontend";
 import { usePluginSlots } from "@/lib/plugin-slots";
 import { useClipboardCopy } from "@/lib/clipboard";
+import {
+  pluginIsLocalSource,
+  pluginRemovalLabel,
+} from "@/lib/plugin-removal";
 
 /**
  * Passive publisher shown beside an installed plugin's name: `BB Official` for
@@ -71,26 +75,6 @@ export function PluginProvenancePill({ plugin }: { plugin: PluginListItem }) {
   return label === null ? null : <ProvenancePill label={label} />;
 }
 
-export function pluginIsLocalSource(plugin: PluginListItem): boolean {
-  return plugin.source.startsWith("path:");
-}
-
-export function pluginRemovalLabel(plugin: PluginListItem): string {
-  return pluginIsLocalSource(plugin) ? "Remove from bb" : "Uninstall";
-}
-
-/**
- * What a removal deletes, matching the server's `remove`: settings, secrets,
- * and schedules go with the registration on every source kind; only managed
- * git/npm files are deleted from disk. Moving a local plugin is an install of
- * the new path, which keeps that configuration.
- */
-export function pluginRemovalDescription(plugin: PluginListItem): string {
-  return pluginIsLocalSource(plugin)
-    ? `Remove "${plugin.id}" from bb and delete its settings, secrets, and schedules? Its source files stay on disk. To move it to another directory, install the new path instead; that keeps its settings.`
-    : `Uninstall "${plugin.id}" and delete its managed files, settings, secrets, and schedules?`;
-}
-
 function PluginPath({ path }: { path: string }) {
   const { copied, copy } = useClipboardCopy({
     text: path,
diff --git a/apps/app/src/components/ui/sidebar-hover-actions.ts b/apps/app/src/components/ui/sidebar-hover-actions.ts
index 54b2fb5fa3..0c59525bc7 100644
--- a/apps/app/src/components/ui/sidebar-hover-actions.ts
+++ b/apps/app/src/components/ui/sidebar-hover-actions.ts
@@ -4,10 +4,27 @@ export const SIDEBAR_HOVER_ACTIONS_CLASS = "bb-sidebar-hover-actions";
 
 export const SIDEBAR_HOVER_ACTIONS_GAP_CLASS = "gap-0.5";
 
+/**
+ * Stable trailing layout for rows that end in a collapse control. Status and
+ * action affordances occupy the preceding region; the caret always owns the
+ * final, fixed-width slot so revealing controls cannot move it.
+ */
+export const SIDEBAR_COLLAPSIBLE_TRAILING_CONTROLS_CLASS =
+  "bb-sidebar-collapsible-trailing-controls inline-flex shrink-0 items-center";
+
+export const SIDEBAR_COLLAPSE_CARET_SLOT_CLASS =
+  "bb-sidebar-collapse-caret-slot inline-flex h-full w-6 shrink-0 items-center justify-center";
+
+/**
+ * Parent thread titles permanently reserve the extra hover-action width that
+ * sits immediately before their fixed caret slot.
+ */
+export const SIDEBAR_COLLAPSIBLE_HOVER_ACTIONS_INSET_CLASS =
+  "bb-sidebar-collapsible-hover-actions-inset";
+
 /**
  * Row content that must give way when the hover actions overlay extends past
- * its rest slot. Reserves one extra action width while the row is hovered,
- * focused, or has an open menu.
+ * its rest slot. Non-collapsible rows keep the existing reveal-time inset.
  */
 export const SIDEBAR_HOVER_ACTIONS_INSET_CLASS =
   "bb-sidebar-hover-actions-inset";
diff --git a/apps/app/src/components/ui/theme.css b/apps/app/src/components/ui/theme.css
index b6f39ed6ea..520a1e8e1e 100644
--- a/apps/app/src/components/ui/theme.css
+++ b/apps/app/src/components/ui/theme.css
@@ -317,6 +317,13 @@
     padding-right: 1.5rem;
   }
 
+  /* A parent thread also owns the final caret slot, so its extra action width
+   * is present at rest. Hover changes only opacity; title and caret geometry
+   * stay fixed. */
+  .bb-sidebar-collapsible-hover-actions-inset {
+    padding-right: 1.5rem;
+  }
+
   .bb-sidebar-hover-actions-fade {
     opacity: 1;
     transition-property: opacity;
@@ -331,7 +338,8 @@
 
   @media (max-width: 767px) and (pointer: coarse) {
     /* The overlay is hidden on coarse phones, so no room is reserved. */
-    .bb-sidebar-hover-actions-row .bb-sidebar-hover-actions-inset {
+    .bb-sidebar-hover-actions-row .bb-sidebar-hover-actions-inset,
+    .bb-sidebar-hover-actions-row .bb-sidebar-collapsible-hover-actions-inset {
       padding-right: 0;
     }
 
diff --git a/apps/app/src/lib/plugin-removal.ts b/apps/app/src/lib/plugin-removal.ts
new file mode 100644
index 0000000000..70b0aae187
--- /dev/null
+++ b/apps/app/src/lib/plugin-removal.ts
@@ -0,0 +1,19 @@
+import type { PluginListItem } from "@/hooks/queries/plugin-settings-queries";
+
+export function pluginIsLocalSource(plugin: PluginListItem): boolean {
+  return plugin.source.startsWith("path:");
+}
+
+export function pluginRemovalLabel(plugin: PluginListItem): string {
+  return pluginIsLocalSource(plugin) ? "Remove from bb" : "Uninstall";
+}
+
+/**
+ * Describe the server's removal behavior without implying that a local
+ * plugin's source directory will be deleted.
+ */
+export function pluginRemovalDescription(plugin: PluginListItem): string {
+  return pluginIsLocalSource(plugin)
+    ? `Remove "${plugin.id}" from bb and delete its settings, secrets, and schedules? Its source files stay on disk. To move it to another directory, install the new path instead; that keeps its settings.`
+    : `Uninstall "${plugin.id}" and delete its managed files, settings, secrets, and schedules?`;
+}
diff --git a/apps/app/src/views/ToolsView.tsx b/apps/app/src/views/ToolsView.tsx
index 46325ddda4..8556b5f350 100644
--- a/apps/app/src/views/ToolsView.tsx
+++ b/apps/app/src/views/ToolsView.tsx
@@ -31,10 +31,12 @@ import {
   CatalogPluginDetailBanner,
   PluginDetail,
   PluginDetailBanners,
+} from "@/components/tools/PluginDetail";
+import {
   pluginIsLocalSource,
   pluginRemovalDescription,
   pluginRemovalLabel,
-} from "@/components/tools/PluginDetail";
+} from "@/lib/plugin-removal";
 import {
   usePluginCatalogSearch,
   type PluginCatalogSearchEntry,