From efb89d32436315dda732bca904d52266b3bea84d Mon Sep 17 00:00:00 2001
From: Paul Lizer <paullizer@microsoft.com>
Date: Thu, 5 Nov 2026 12:52:56 -0500
Subject: [PATCH] Fix V2 conversation menu layout and clipping

Flatten reuse actions below common conversation controls, separate destructive actions, and use viewport-aware portalled menus without scrolling the sidebar. Preserve keyboard, mobile, and permission behavior with focused regression coverage and versioned documentation.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 application/single_app/config.py              |   2 +-
 .../src/components/chat/ConversationRail.tsx  | 225 +++++++++--------
 .../v2_ui/src/components/ui/ActionPopover.tsx |  76 +++++-
 .../src/components/ui/dropdownPlacement.ts    |   7 +-
 application/v2_ui/src/styles/theme.css        |   5 +
 .../fixes/V2_CONVERSATION_MENU_LAYOUT_FIX.md  | 127 ++++++++++
 .../reference-and-send-conversations.md       |  15 +-
 docs/reference/chat-controls.md               |  12 +-
 .../test_v2_composer_picker_placement.py      |  50 ++--
 .../test_v2_sidebar_conversation_scroll.py    |  32 ++-
 ui_tests/test_v2_conversation_handoffs.py     |   6 +-
 ui_tests/test_v2_conversation_references.py   |  13 +-
 .../test_v2_sidebar_conversation_scroll.py    | 237 +++++++++++++++++-
 13 files changed, 646 insertions(+), 161 deletions(-)
 create mode 100644 docs/explanation/fixes/V2_CONVERSATION_MENU_LAYOUT_FIX.md

diff --git a/application/single_app/config.py b/application/single_app/config.py
index 6ce8c4d2a..3774a966a 100644
--- a/application/single_app/config.py
+++ b/application/single_app/config.py
@@ -103,7 +103,7 @@
 EXECUTOR_MAX_WORKERS = 30
 CHAT_STREAM_EXECUTOR_MAX_WORKERS = max(8, int(os.getenv('SIMPLECHAT_CHAT_STREAM_WORKERS', '32') or '32'))
 SESSION_TYPE = 'filesystem'
-VERSION = "0.261.405"
+VERSION = "0.261.406"
 IS_DEVELOPMENT = is_development_env_enabled()
 
 # Opt-out for deployments where App Service Easy Auth is active but the platform
diff --git a/application/v2_ui/src/components/chat/ConversationRail.tsx b/application/v2_ui/src/components/chat/ConversationRail.tsx
index 80a108248..a7b9194bd 100644
--- a/application/v2_ui/src/components/chat/ConversationRail.tsx
+++ b/application/v2_ui/src/components/chat/ConversationRail.tsx
@@ -16,7 +16,7 @@
 // it carries the navigation above out of view, and the search (with the bulk bar under it)
 // is held at the top of the rail's scroll region instead of scrolling away.
 
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';
 import { clsx } from 'clsx';
 import {
     Copy,
@@ -61,6 +61,7 @@ import {
     summarizeRemoval,
 } from '../../lib/conversationSelection';
 import { ConfirmDialog } from '../ui/ConfirmDialog';
+import { ActionPopover } from '../ui/ActionPopover';
 import { Skeleton } from '../ui/primitives';
 import { ConversationExportDialog } from './ConversationExportDialog';
 import { WorkflowRunningTag } from './WorkflowRunningTag';
@@ -196,6 +197,7 @@ function ConversationRow({
     conversation,
     selected,
     anySelected,
+    scrollRootRef,
     onExport,
     onRequestDelete,
     onSendToConversation,
@@ -203,6 +205,7 @@ function ConversationRow({
     conversation: Conversation;
     selected: boolean;
     anySelected: boolean;
+    scrollRootRef: RefObject<HTMLElement>;
     onExport: (conversationId: string) => void;
     onRequestDelete: (conversation: Conversation) => void;
     onSendToConversation: (source: ConversationSource) => void;
@@ -222,6 +225,12 @@ function ConversationRow({
     const [menuOpen, setMenuOpen] = useState(false);
     const [renaming, setRenaming] = useState(false);
     const [draftTitle, setDraftTitle] = useState(conversation.title);
+    const menuTriggerRef = useRef<HTMLButtonElement>(null);
+    const menuId = useId();
+    const closeMenu = useCallback((returnFocus: boolean) => {
+        setMenuOpen(false);
+        if (returnFocus) menuTriggerRef.current?.focus({ preventScroll: true });
+    }, []);
     const openPanel = useCollaborationStore((state) => state.openPanel);
     const currentUserId = useBootstrapStore((state) => state.data?.user?.id);
     const collaborationEnabled = useBootstrapStore((state) =>
@@ -242,6 +251,9 @@ function ConversationRow({
     // legible — and it matters more here than in a table, because a plain click clears the
     // selection, so the user has to be able to see there is one to lose.
     const showCheckbox = selected || anySelected;
+    const menuRowClass =
+        'flex w-full items-center gap-2 rounded-lg px-2.5 py-1.5 text-left text-sm font-normal disabled:cursor-not-allowed disabled:opacity-40';
+    const menuItemClass = clsx(menuRowClass, 'hover:bg-surface-2');
 
     const commitRename = () => {
         const trimmed = draftTitle.trim();
@@ -349,7 +361,10 @@ function ConversationRow({
 
             <button
                 type="button"
+                ref={menuTriggerRef}
                 aria-label={`Actions for ${conversation.title || 'conversation'}`}
+                aria-expanded={menuOpen}
+                aria-controls={menuOpen ? menuId : undefined}
                 onClick={() => setMenuOpen((open) => !open)}
                 className={clsx(
                     'absolute top-1.5 right-1 rounded-md p-1 text-text-3 transition-opacity',
@@ -361,127 +376,126 @@ function ConversationRow({
             </button>
 
             {menuOpen && (
-                <>
-                    {/* Click-away layer; keeps the menu dismissible without a global listener. */}
-                    <div
-                        className="fixed inset-0 z-40"
-                        aria-hidden="true"
-                        onClick={() => setMenuOpen(false)}
-                    />
-                    <div className="glass-modal absolute top-8 right-1 z-50 w-56 rounded-xl p-1">
-                        {privateEligible && (
-                            <div className="mb-1 border-b border-edge pb-1">
-                                <button
-                                    type="button"
-                                    onClick={(event) => event.stopPropagation()}
-                                    className="flex w-full items-center gap-2 rounded-lg px-2.5 py-1.5 text-left text-sm font-medium text-text-1 hover:bg-surface-2"
-                                >
-                                    <MessageSquare size={14} /> Reference Conversation
-                                </button>
-                                <button
-                                    type="button"
-                                    disabled={isActive || activeConversationKind === 'collaborative'}
-                                    onClick={() => {
-                                        setMenuOpen(false);
-                                        addComposerConversationReference(sourceDescriptor);
-                                    }}
-                                    className="flex w-full items-center gap-2 rounded-lg py-1.5 pr-2.5 pl-6 text-left text-xs text-text-2 hover:bg-surface-2 hover:text-text-1 disabled:cursor-not-allowed disabled:opacity-40"
-                                >
-                                    Use in current conversation
-                                </button>
-                                <button
-                                    type="button"
-                                    onClick={() => {
-                                        setMenuOpen(false);
-                                        const text = portableConversationReference(
-                                            { kind: 'conversation', id: conversation.id },
-                                            window.location.origin,
-                                        );
-                                        void navigator.clipboard?.writeText(text)
-                                            .then(() => toast.success('Copied conversation reference'))
-                                            .catch(() => { /* Clipboard access can be denied. */ });
-                                    }}
-                                    className="flex w-full items-center gap-2 rounded-lg py-1.5 pr-2.5 pl-6 text-left text-xs text-text-2 hover:bg-surface-2 hover:text-text-1"
-                                >
-                                    <Copy size={12} /> Copy reference
-                                </button>
-                                <button
-                                    type="button"
-                                    onClick={() => {
-                                        setMenuOpen(false);
-                                        onSendToConversation(sourceDescriptor);
-                                    }}
-                                    className="mt-0.5 flex w-full items-center gap-2 rounded-lg px-2.5 py-1.5 text-left text-sm text-text-1 hover:bg-surface-2"
-                                >
-                                    <Send size={14} /> Send To Conversation
-                                </button>
-                            </div>
-                        )}
+                <ActionPopover
+                    id={menuId}
+                    label={`Actions for ${conversation.title || 'conversation'}`}
+                    anchorRef={menuTriggerRef}
+                    onClose={closeMenu}
+                    placement="auto"
+                    boundaryRef={scrollRootRef}
+                    className="conversation-actions-popover w-56 text-text-1"
+                >
+                    <button
+                        type="button"
+                        onClick={() => {
+                            setMenuOpen(false);
+                            setRenaming(true);
+                        }}
+                        className={menuItemClass}
+                    >
+                        <Pencil size={14} /> Rename
+                    </button>
+                    {shareable && (
                         <button
                             type="button"
                             onClick={() => {
                                 setMenuOpen(false);
-                                setRenaming(true);
+                                // The panel loads its own copy of the membership into its
+                                // own slot. Loading it here as well would write the
+                                // conversation on screen's slot with a different
+                                // conversation's document.
+                                openPanel(
+                                    panelTargetForConversation(conversation.id, conversation),
+                                );
                             }}
-                            className="flex w-full items-center gap-2 rounded-lg px-2.5 py-1.5 text-sm text-text-1 hover:bg-surface-2"
+                            className={menuItemClass}
                         >
-                            <Pencil size={14} /> Rename
+                            <Users size={14} /> {shared ? 'People' : 'Share'}
                         </button>
-                        {shareable && (
+                    )}
+                    <button
+                        type="button"
+                        onClick={() => {
+                            setMenuOpen(false);
+                            void togglePinned(conversation.id);
+                        }}
+                        className={menuItemClass}
+                    >
+                        <Pin size={14} /> {conversation.is_pinned ? 'Unpin' : 'Pin'}
+                    </button>
+                    <button
+                        type="button"
+                        onClick={() => {
+                            setMenuOpen(false);
+                            void toggleHidden(conversation.id);
+                        }}
+                        className={menuItemClass}
+                    >
+                        <EyeOff size={14} /> Hide
+                    </button>
+                    <button
+                        type="button"
+                        onClick={() => {
+                            setMenuOpen(false);
+                            onExport(conversation.id);
+                        }}
+                        className={menuItemClass}
+                    >
+                        <Download size={14} /> Export
+                    </button>
+                    {privateEligible && (
+                        <div className="mt-1 border-t border-edge-strong pt-1">
+                            <button
+                                type="button"
+                                onClick={() => {
+                                    setMenuOpen(false);
+                                    onSendToConversation(sourceDescriptor);
+                                }}
+                                className={menuItemClass}
+                            >
+                                <Send size={14} /> Send to conversation
+                            </button>
                             <button
                                 type="button"
+                                disabled={isActive || activeConversationKind === 'collaborative'}
                                 onClick={() => {
                                     setMenuOpen(false);
-                                    // The panel loads its own copy of the membership into its
-                                    // own slot. Loading it here as well would write the
-                                    // conversation on screen's slot with a different
-                                    // conversation's document.
-                                    openPanel(
-                                        panelTargetForConversation(conversation.id, conversation),
+                                    addComposerConversationReference(sourceDescriptor);
+                                }}
+                                className={menuItemClass}
+                            >
+                                <MessageSquare size={14} /> Use in this chat
+                            </button>
+                            <button
+                                type="button"
+                                onClick={() => {
+                                    setMenuOpen(false);
+                                    const text = portableConversationReference(
+                                        { kind: 'conversation', id: conversation.id },
+                                        window.location.origin,
                                     );
+                                    if (!navigator.clipboard?.writeText) {
+                                        toast.error('Clipboard access is unavailable in this browser.');
+                                        return;
+                                    }
+                                    void navigator.clipboard.writeText(text)
+                                        .then(() => toast.success('Copied conversation reference'))
+                                        .catch(() => toast.error('Could not copy the reference. Check clipboard permissions and try again.'));
                                 }}
-                                className="flex w-full items-center gap-2 rounded-lg px-2.5 py-1.5 text-sm text-text-1 hover:bg-surface-2"
+                                className={menuItemClass}
                             >
-                                <Users size={14} /> {shared ? 'People' : 'Share'}
+                                <Copy size={14} /> Copy reference
                             </button>
-                        )}
-                        <button
-                            type="button"
-                            onClick={() => {
-                                setMenuOpen(false);
-                                void togglePinned(conversation.id);
-                            }}
-                            className="flex w-full items-center gap-2 rounded-lg px-2.5 py-1.5 text-sm text-text-1 hover:bg-surface-2"
-                        >
-                            <Pin size={14} /> {conversation.is_pinned ? 'Unpin' : 'Pin'}
-                        </button>
-                        <button
-                            type="button"
-                            onClick={() => {
-                                setMenuOpen(false);
-                                void toggleHidden(conversation.id);
-                            }}
-                            className="flex w-full items-center gap-2 rounded-lg px-2.5 py-1.5 text-sm text-text-1 hover:bg-surface-2"
-                        >
-                            <EyeOff size={14} /> Hide
-                        </button>
-                        <button
-                            type="button"
-                            onClick={() => {
-                                setMenuOpen(false);
-                                onExport(conversation.id);
-                            }}
-                            className="flex w-full items-center gap-2 rounded-lg px-2.5 py-1.5 text-sm text-text-1 hover:bg-surface-2"
-                        >
-                            <Download size={14} /> Export
-                        </button>
+                        </div>
+                    )}
+                    <div className="mt-2 border-t border-edge-strong pt-2">
                         <button
                             type="button"
                             onClick={() => {
                                 setMenuOpen(false);
                                 onRequestDelete(conversation);
                             }}
-                            className="flex w-full items-center gap-2 rounded-lg px-2.5 py-1.5 text-sm text-danger hover:bg-danger-soft"
+                            className={clsx(menuRowClass, 'text-danger hover:bg-danger-soft')}
                         >
                             {/* Named for what it will actually do, through the same helper
                                 the confirmation and the request use. Only an owner can
@@ -498,7 +512,7 @@ function ConversationRow({
                             )}
                         </button>
                     </div>
-                </>
+                </ActionPopover>
             )}
         </li>
     );
@@ -701,7 +715,8 @@ export function ConversationRail({
         const header = headerRef.current;
         const root = scrollRootRef.current;
         const target = event.target;
-        if (!header || !root || !(target instanceof HTMLElement) || !target.matches(':focus-visible')) {
+        if (!header || !root || !(target instanceof HTMLElement)
+            || !root.contains(target) || !target.matches(':focus-visible')) {
             return;
         }
         const covered = header.getBoundingClientRect().bottom - target.getBoundingClientRect().top;
@@ -748,7 +763,8 @@ export function ConversationRail({
                 // control that opened it — so without this guard, Escape would dismiss the
                 // dialog *and* clear the selection behind it, losing what the user was
                 // cancelling out of.
-                if (exportRequest || pendingRemoval || handoffSource) {
+                if (!(event.target instanceof Node) || !event.currentTarget.contains(event.target)
+                    || exportRequest || pendingRemoval || handoffSource) {
                     return;
                 }
                 if (event.key === 'Escape' && anySelected) {
@@ -909,6 +925,7 @@ export function ConversationRail({
                             conversation={conversation}
                             selected={selectedIdSet.has(conversation.id)}
                             anySelected={anySelected}
+                            scrollRootRef={scrollRootRef}
                             onExport={(id) => setExportRequest({ ids: [id], skipSelection: true })}
                             onRequestDelete={(target) =>
                                 setPendingRemoval({ conversations: [target], bulk: false })
diff --git a/application/v2_ui/src/components/ui/ActionPopover.tsx b/application/v2_ui/src/components/ui/ActionPopover.tsx
index eb212bd6b..76ba473d6 100644
--- a/application/v2_ui/src/components/ui/ActionPopover.tsx
+++ b/application/v2_ui/src/components/ui/ActionPopover.tsx
@@ -1,11 +1,14 @@
 // ActionPopover.tsx
-// A bounded overlay for header actions; its host stays outside clipped page panes.
+// A bounded action overlay; its host stays outside clipped page panes.
 
-import { useLayoutEffect, useRef, useState, type ReactNode, type RefObject } from 'react';
+import { useLayoutEffect, useRef, useState, type CSSProperties, type ReactNode, type RefObject } from 'react';
 import { createPortal } from 'react-dom';
+import { clsx } from 'clsx';
+import { dropdownPlacement } from './dropdownPlacement';
 
 export function ActionPopover({
     id, label, anchorRef, onClose, children, inline = false,
+    placement = 'below', boundaryRef, className,
 }: {
     id: string;
     label: string;
@@ -13,16 +16,53 @@ export function ActionPopover({
     onClose: (returnFocus: boolean) => void;
     children: ReactNode;
     inline?: boolean;
+    placement?: 'below' | 'auto';
+    boundaryRef?: RefObject<HTMLElement>;
+    className?: string;
 }) {
     const panelRef = useRef<HTMLDivElement>(null);
-    const [position, setPosition] = useState({ top: 0, left: 8, maxHeight: 320, width: 272 });
+    const [position, setPosition] = useState<CSSProperties>({
+        top: 0, left: 8, maxHeight: 320, width: placement === 'auto' ? undefined : 272,
+    });
 
     useLayoutEffect(() => {
         if (inline) return;
         const measure = () => {
             const anchor = anchorRef.current;
-            if (!anchor) return;
+            const panel = panelRef.current;
+            if (!anchor || !panel) return false;
             const rect = anchor.getBoundingClientRect();
+            if (placement === 'auto') {
+                const visual = window.visualViewport;
+                const viewport = {
+                    left: visual?.offsetLeft ?? 0,
+                    top: visual?.offsetTop ?? 0,
+                    width: visual?.width ?? window.innerWidth,
+                    height: visual?.height ?? window.innerHeight,
+                };
+                const boundary = boundaryRef?.current?.getBoundingClientRect();
+                if (!anchor.isConnected || !anchor.getClientRects().length
+                    || rect.bottom <= viewport.top || rect.top >= viewport.top + viewport.height
+                    || rect.right <= viewport.left || rect.left >= viewport.left + viewport.width
+                    || (boundary && (
+                        rect.bottom <= boundary.top || rect.top >= boundary.bottom
+                        || rect.right <= boundary.left || rect.left >= boundary.right
+                    ))) {
+                    onClose(false);
+                    return false;
+                }
+                const margin = Math.min(12, viewport.width / 2, viewport.height / 2);
+                const maxWidth = Math.max(0, viewport.width - margin * 2);
+                const placed = dropdownPlacement(rect, viewport, 'right', {
+                    width: Math.min(panel.getBoundingClientRect().width, maxWidth),
+                    height: panel.scrollHeight + panel.offsetHeight - panel.clientHeight,
+                });
+                setPosition({
+                    top: placed.top, left: placed.left, maxHeight: placed.maxHeight, maxWidth,
+                    transform: placed.up ? 'translateY(-100%)' : undefined,
+                });
+                return true;
+            }
             const width = Math.min(272, window.innerWidth - 16);
             const top = Math.min(rect.bottom + 8, window.innerHeight - 52);
             setPosition({
@@ -30,12 +70,13 @@ export function ActionPopover({
                 left: Math.max(8, Math.min(rect.right - width, window.innerWidth - width - 8)),
                 maxHeight: Math.max(44, window.innerHeight - top - 8),
             });
+            return true;
         };
-        measure();
+        if (!measure()) return;
         const first = Array.from(panelRef.current?.querySelectorAll<HTMLElement>(
             'button:not(:disabled), a[href]',
         ) ?? []).find((control) => control.getClientRects().length > 0);
-        (first ?? panelRef.current)?.focus();
+        (first ?? panelRef.current)?.focus({ preventScroll: placement === 'auto' });
         const outside = (event: PointerEvent) => {
             if (event.target instanceof Node &&
                 !panelRef.current?.contains(event.target) && !anchorRef.current?.contains(event.target)) {
@@ -52,19 +93,35 @@ export function ActionPopover({
         document.addEventListener('focusin', focusOutside);
         window.addEventListener('resize', measure);
         window.addEventListener('scroll', measure, true);
+        const observer = placement === 'auto' ? new ResizeObserver(measure) : null;
+        if (anchorRef.current) observer?.observe(anchorRef.current);
+        if (panelRef.current) observer?.observe(panelRef.current);
+        if (boundaryRef?.current) observer?.observe(boundaryRef.current);
+        if (placement === 'auto') {
+            window.visualViewport?.addEventListener('resize', measure);
+            window.visualViewport?.addEventListener('scroll', measure);
+        }
         return () => {
             document.removeEventListener('pointerdown', outside);
             document.removeEventListener('focusin', focusOutside);
             window.removeEventListener('resize', measure);
             window.removeEventListener('scroll', measure, true);
+            observer?.disconnect();
+            if (placement === 'auto') {
+                window.visualViewport?.removeEventListener('resize', measure);
+                window.visualViewport?.removeEventListener('scroll', measure);
+            }
         };
-    }, [anchorRef, onClose, inline]);
+    }, [anchorRef, onClose, inline, placement, boundaryRef]);
 
     if (inline) return <>{children}</>;
     return createPortal(
         <div ref={panelRef} id={id} role="group" aria-label={label} tabIndex={-1}
             style={position}
-            className="header-action-popover glass-modal fixed z-[100] overflow-y-auto rounded-xl p-1.5"
+            className={clsx(
+                'header-action-popover glass-modal fixed z-[100] overflow-y-auto rounded-xl p-1.5',
+                className,
+            )}
             onKeyDown={(event) => {
                 if (event.key === 'Escape') {
                     event.preventDefault();
@@ -86,7 +143,8 @@ export function ActionPopover({
                     const next = event.key === 'Home' ? 0 : event.key === 'End' ? controls.length - 1
                         : (current + (event.key === 'ArrowDown' ? 1 : -1) + controls.length) % controls.length;
                     event.preventDefault();
-                    controls[next]?.focus();
+                    controls[next]?.focus({ preventScroll: placement === 'auto' });
+                    if (placement === 'auto') controls[next]?.scrollIntoView({ block: 'nearest' });
                 }
             }}>
             {children}
diff --git a/application/v2_ui/src/components/ui/dropdownPlacement.ts b/application/v2_ui/src/components/ui/dropdownPlacement.ts
index 70cfa9dd3..e85bfef85 100644
--- a/application/v2_ui/src/components/ui/dropdownPlacement.ts
+++ b/application/v2_ui/src/components/ui/dropdownPlacement.ts
@@ -12,10 +12,11 @@ export function dropdownPlacement(
     trigger: { left: number; right: number; top: number; bottom: number },
     viewport: PickerViewport,
     align: 'left' | 'right',
+    menuSize = { width: 288, height: 320 },
 ) {
     const margin = Math.min(12, viewport.width / 2, viewport.height / 2);
     const gap = 8;
-    const width = Math.max(0, Math.min(288, viewport.width - margin * 2));
+    const width = Math.max(0, Math.min(menuSize.width, viewport.width - margin * 2));
     const left = Math.max(viewport.left + margin, Math.min(
         align === 'right' ? trigger.right - width : trigger.left,
         viewport.left + viewport.width - margin - width,
@@ -24,8 +25,8 @@ export function dropdownPlacement(
     const ceiling = viewport.top + margin;
     const below = Math.max(0, floor - trigger.bottom - gap);
     const above = Math.max(0, trigger.top - gap - ceiling);
-    const up = below < 320 && above > below;
-    const maxHeight = Math.min(320, up ? above : below, Math.max(0, floor - ceiling));
+    const up = below < menuSize.height && above > below;
+    const maxHeight = Math.min(menuSize.height, up ? above : below, Math.max(0, floor - ceiling));
     const anchor = up
         ? Math.max(ceiling, Math.min(floor, trigger.top - gap))
         : Math.max(ceiling, Math.min(floor, trigger.bottom + gap));
diff --git a/application/v2_ui/src/styles/theme.css b/application/v2_ui/src/styles/theme.css
index 4d80a24aa..413d0695c 100644
--- a/application/v2_ui/src/styles/theme.css
+++ b/application/v2_ui/src/styles/theme.css
@@ -63,6 +63,7 @@
 
     .mobile-navigation-controls button,
     #primary-navigation button,
+    .conversation-actions-popover button,
     #primary-navigation a,
     #workspace-section-navigation a,
     .chat-header-actions button,
@@ -166,6 +167,10 @@
     justify-content: flex-start;
 }
 
+.conversation-actions-popover svg {
+    flex-shrink: 0;
+}
+
 @media (max-height: 600px) {
     #primary-navigation [data-rail-scroll-region] {
         min-height: 0;
diff --git a/docs/explanation/fixes/V2_CONVERSATION_MENU_LAYOUT_FIX.md b/docs/explanation/fixes/V2_CONVERSATION_MENU_LAYOUT_FIX.md
new file mode 100644
index 000000000..9abf9ec01
--- /dev/null
+++ b/docs/explanation/fixes/V2_CONVERSATION_MENU_LAYOUT_FIX.md
@@ -0,0 +1,127 @@
+# V2 Conversation Menu Layout Fix (0.261.406)
+
+## Issue
+
+The React V2 conversation menu put reference and handoff actions ahead of common
+management actions. A bold, nonfunctional reference heading, indented child
+actions, and mixed text sizes made the menu unnecessarily wordy and inconsistent.
+Menus opened near the bottom of the conversation list could be clipped behind the
+sidebar footer.
+
+Fixed in version: **0.261.406**, recorded in
+`application/single_app/config.py`.
+
+## Root cause
+
+`ConversationRail.tsx` rendered the panel with absolute positioning below each row,
+inside the sidebar's scrolling region. That region clipped the panel, and the
+glass sidebar also established a containing block. Raising z-index or using fixed
+positioning inside that ancestor would not reliably free the menu.
+
+The reference block was rendered before Rename and used a separate heading,
+smaller child text, indentation, and an inconsistent copy icon size.
+
+## Technical details
+
+### Files modified
+
+| File | Change |
+| --- | --- |
+| `application/v2_ui/src/components/chat/ConversationRail.tsx` | Flat action order, concise labels, uniform rows, destructive-action separation, accessible triggers, and guards against portalled focus or shortcuts changing the sidebar behind the menu. |
+| `application/v2_ui/src/components/ui/ActionPopover.tsx` | Opt-in automatic placement for the conversation rail, reusing the existing body portal and dismissal/keyboard handling while preserving default header behavior. |
+| `application/v2_ui/src/components/ui/dropdownPlacement.ts` | Optional measured menu dimensions, with existing composer dimensions unchanged by default. |
+| `application/v2_ui/src/styles/theme.css` | Touch-sized menu controls outside the navigation DOM subtree and fixed-size icon alignment. |
+| `application/single_app/config.py` | Application patch version updated to 0.261.406. |
+| `functional_tests/test_v2_sidebar_conversation_scroll.py` | Portal/focus contracts and current desktop/mobile scroll-region expectations. |
+| `functional_tests/test_v2_composer_picker_placement.py` | Measured-height placement cases and viewport-boundary checks alongside unchanged composer defaults. |
+| `ui_tests/test_v2_sidebar_conversation_scroll.py` | Real-component menu order, geometry, hit-testing, keyboard, clipboard, and responsive regressions using production CSS. |
+| `ui_tests/test_v2_conversation_references.py` | Updated flat-menu labels and private-source exclusion checks. |
+| `ui_tests/test_v2_conversation_handoffs.py` | Updated menu label while retaining the existing handoff dialog and workflow. |
+| `docs/guides/reference-and-send-conversations.md` | Updated reference actions, menu placement guidance, and clipboard troubleshooting. |
+| `docs/reference/chat-controls.md` | Documented the flat reuse actions and conditional availability. |
+
+### Menu and behavior
+
+The menu order is Rename, Share, Pin, Hide, Export, then Send to conversation,
+Use in this chat, and Copy reference. Delete has a divider and extra space above
+it. Conditional People, Unpin, and Leave labels continue to reflect the existing
+conversation state and permissions.
+
+All action rows share normal-weight text, a consistent icon column, and the same
+padding. The redundant reference heading is removed. Copying still uses the
+existing portable reference format; an unavailable or denied clipboard now gives
+visible error feedback rather than failing silently.
+
+### Floating placement and focus
+
+The panel renders through the shared popover's portal into `document.body`, beyond
+the sidebar's clipping and glass containing block. The conversation menu opts
+into placement based on its actual rendered height, trigger position, and visual
+viewport. It opens below when there is room and above when the lower edge would
+otherwise be clipped. Width and height remain bounded by the visible viewport.
+An exceptionally small window may scroll the panel itself, not the conversation
+list.
+
+Resize and scroll updates keep the placement current; a trigger that leaves its
+visible boundary dismisses the menu. Outside interaction and Escape also dismiss
+it, and Escape restores trigger focus. Existing shared-popover keyboard navigation
+is retained. Portalled focus does not invoke sidebar row scrolling, and shortcuts
+inside the floating panel do not change the selection behind it.
+
+Mobile controls retain their touch targets even though the panel no longer lives
+under `#primary-navigation`. Existing header popovers retain their default
+positioning and sizing. No new browser library or external runtime asset is used.
+
+### Impact
+
+Only the React V2 conversation-row menu changes. Source eligibility, Share/People,
+Pin/Unpin, Delete/Leave permissions, confirmation dialogs, the reference format,
+composer attachment, export, and handoff review remain unchanged. The classic
+interface and bulk-action toolbar are not redesigned.
+
+## Validation
+
+The focused browser regressions use production AppShell, Sidebar,
+ConversationRail, stores, and CSS with stubbed HTTP. They check actual element
+bounds and hit targets rather than treating a larger z-index as proof of
+visibility. Desktop and phone layouts run in both themes; enlarged text and short
+windows verify that the menu remains reachable without scrolling the sidebar.
+
+### Test results
+
+| Command | Result |
+| --- | --- |
+| `npm --prefix .\application\v2_ui run typecheck` | Passed. |
+| `npm --prefix .\application\v2_ui run build -- --outDir ..\..\ui_tests\artifacts\orchestration-plan-editor` | Passed, with Vite's large-chunk size advisory. |
+| `python -m pytest .\functional_tests\test_v2_sidebar_conversation_scroll.py .\functional_tests\test_v2_composer_picker_placement.py .\functional_tests\test_v2_mobile_layout.py .\functional_tests\test_v2_conversation_multiselect.py .\functional_tests\test_v2_conversation_export.py -q --disable-warnings` | 47 passed. |
+| `python -O .\functional_tests\test_v2_composer_picker_placement.py` | Passed; the Node checks also execute under optimized Python. |
+| `python -m pytest .\ui_tests\test_v2_sidebar_conversation_scroll.py .\ui_tests\test_v2_conversation_references.py .\ui_tests\test_v2_conversation_handoffs.py -q --disable-warnings` | 24 passed. |
+| `python -m pytest .\ui_tests\test_v2_mobile_headers.py -k "loading_status or (explicit_actions and (320 or 393))" -q --disable-warnings` | 9 passed; existing shared header popovers retain their behavior. |
+| `python .\functional_tests\test_docs_app_surface_coverage.py` | 7 checks passed. |
+| `python .\functional_tests\test_docs_site_quality.py` | 6 checks passed. |
+
+The app-surface inventory was regenerated without a content change. The design
+detector returned no findings for the four changed UI targets.
+
+The browser suite writes desktop and phone menu screenshots in both themes under
+`ui_tests/artifacts/sidebar-conversation-scroll/`. It verifies that the complete
+menu fits near the bottom at ordinary desktop and phone sizes, each action is
+hit-testable, and keyboard navigation leaves the sidebar's scroll position
+unchanged. Short-window and enlarged-text cases confirm that Delete remains
+reachable by scrolling only the bounded menu.
+
+## Before and after
+
+| Before | After |
+| --- | --- |
+| Reference heading and indented actions precede Rename. | Management actions come first; concise reuse actions follow Export. |
+| Text weights, sizes, and icon alignment vary. | Every action has the same normal-weight text and alignment. |
+| Delete immediately follows Export. | Delete/Leave has clear destructive-action separation. |
+| Low menus can disappear behind the footer. | Portalled menus flip above the trigger and stay viewport-bounded. |
+| Keyboard focus in an overlay can be mistaken for sidebar-row focus. | Sidebar scrolling and selection shortcuts ignore portalled controls. |
+
+## Related documentation
+
+- [Reference and send between conversations](../../guides/reference-and-send-conversations.md)
+- [Chat interface controls](../../reference/chat-controls.md)
+- [V2 sidebar conversation scrolling](V2_SIDEBAR_CONVERSATION_SCROLL_FIX.md)
diff --git a/docs/guides/reference-and-send-conversations.md b/docs/guides/reference-and-send-conversations.md
index 328840a99..dc6cc2e18 100644
--- a/docs/guides/reference-and-send-conversations.md
+++ b/docs/guides/reference-and-send-conversations.md
@@ -4,7 +4,7 @@ title: "Reference and send between conversations"
 description: "Pull bounded evidence from another private conversation with ~ or delegate a queued AI task with Send To Conversation."
 section: "Guides"
 audience: user
-version: "0.261.381"
+version: "0.261.406"
 ---
 
 ## What this does
@@ -36,14 +36,17 @@ Long projects often work better as separate conversations: one thread for raw re
 1. In the V2 chat composer, orchestration plan editor **Ask AI**, or workflow **Ask AI**, type `~` at the start of the message or after a space.
 2. Type part of a conversation title, or switch to content search in the picker to match visible message text.
 3. Select the conversation from the list. SimpleChat inserts an inline `~[Conversation title]` token and adds a conversation pill above the composer.
-4. You can also open any private conversation's menu (`...`) in the left rail and choose **Reference Conversation**:
-   - **Use in current conversation** attaches that conversation as a pill in the open composer.
-   - **Copy reference** copies a portable reference that you can paste into another composer to attach the same conversation.
+4. You can also open an eligible private conversation's menu (`...`) in the left rail. Below **Export**, choose **Use in this chat** to attach that conversation as a pill in the open composer, or **Copy reference** to copy a portable reference for another composer.
 5. Send your message. SimpleChat retrieves bounded excerpts from the latest visible messages of each referenced conversation and cites the source conversation in the reply.
 
+The menu keeps management actions first and separates **Delete** from the reuse
+actions. It opens upward when needed to stay on screen. **Use in this chat** is
+disabled when the source is the conversation already open or the open destination
+is collaborative; copying a reference does not change the current draft.
+
 ## Send a task to another conversation
 
-1. In the conversation rail, open the actions menu (`...`) on the source conversation and select **Send To Conversation**.
+1. In the conversation rail, open the actions menu (`...`) on the source conversation and select **Send to conversation**, below **Export**.
 2. Choose the destination private conversation and write the instruction you want the destination conversation to run.
 3. Review the destination conversation's resolved model or agent and the bounded source preview.
 4. Select **Send and start AI**.
@@ -70,6 +73,8 @@ Long projects often work better as separate conversations: one thread for raw re
 | A conversation does not appear in the `~` menu | It is shared/collaborative, belongs to a group, or is the conversation currently open as the destination | Reference a different private personal conversation. |
 | Referenced evidence says coverage is partial | The source conversation has more than 200 visible messages or exceeds the per-turn excerpt budget | Narrow the question or reference specific messages/turns. |
 | A handoff stays in **Queued** status | The destination conversation is finishing an earlier turn or waiting on an approval card | Let the active turn finish or cancel the queued handoff from its status card. |
+| The whole actions menu cannot fit in a very short window | The available screen height is smaller than the menu | Scroll inside the menu to reach the remaining actions; the conversation list does not need to move. |
+| Copy reference reports a clipboard error | Clipboard access is unavailable or the browser denied permission | Check clipboard permissions and retry in a supported browser. |
 
 ## Related
 
diff --git a/docs/reference/chat-controls.md b/docs/reference/chat-controls.md
index 7040c17a8..52c982699 100644
--- a/docs/reference/chat-controls.md
+++ b/docs/reference/chat-controls.md
@@ -4,7 +4,7 @@ title: "Chat interface controls"
 description: "Reference for every documented control in the SimpleChat chat interface."
 section: "Reference"
 audience: user
-version: "0.261.398"
+version: "0.261.406"
 ---
 
 ## How to use this reference
@@ -31,11 +31,17 @@ evidence with `~` or delegated a follow-up AI turn with **Send To Conversation**
 Shared and group conversations are excluded so private thread content is not
 implicitly widened across audiences.
 
+The row menu layout was updated in **0.261.406**: management actions come first,
+reuse actions follow **Export**, and **Delete** or **Leave** has its own separation.
+All rows use the same text size and weight. Menus open above low rows when needed
+and float outside the scrolling sidebar.
+
 | V2 control | Purpose | Availability |
 | --- | --- | --- |
 | `~` conversation shortcut | Opens the private conversation picker in the V2 composer, plan editor Ask AI, and workflow Ask AI, inserting a `~[Title]` token backed by a conversation ID. | V2 chat composer and Ask AI editors |
-| Reference Conversation (`Use in current conversation` / `Copy reference`) | Attaches the selected private conversation to the active composer or copies a portable reference token for pasting into another composer. | Private conversation row menu in V2 |
-| Send To Conversation | Opens a review dialog that sends an instruction and bounded source reference to another private conversation and starts AI work there, queueing in FIFO order when the destination is busy. | Private conversation row menu in V2 |
+| Use in this chat | Attaches the selected private conversation to the active composer as a reference. Disabled for the currently open source or a collaborative destination. | Eligible private conversation row menu in V2, below Export |
+| Copy reference | Copies a portable reference token for pasting into another composer without changing the open draft. Clipboard failures display an error. | Eligible private conversation row menu in V2, below Export |
+| Send to conversation | Opens a review dialog that sends an instruction and bounded source reference to another private conversation and starts AI work there, queueing in FIFO order when the destination is busy. | Private conversation row menu in V2, below Export |
 | Cancel handoff | Stops a queued or in-flight handoff from its outgoing status card without removing existing destination history. | Outgoing handoff status card |
 
 See [Reference and send between conversations]({{ '/guides/reference-and-send-conversations/' | relative_url }})
diff --git a/functional_tests/test_v2_composer_picker_placement.py b/functional_tests/test_v2_composer_picker_placement.py
index 762b72807..829831716 100644
--- a/functional_tests/test_v2_composer_picker_placement.py
+++ b/functional_tests/test_v2_composer_picker_placement.py
@@ -1,8 +1,9 @@
 # test_v2_composer_picker_placement.py
 """
 Functional test for viewport-bounded floating composer pickers.
-Version: 0.261.327
+Version: 0.261.406
 Implemented in: 0.261.327
+Measured conversation menu sizing implemented in: 0.261.406
 
 Executes the production TypeScript placement helper through the installed esbuild.
 Node's explicit checks run identically under normal and optimized Python.
@@ -36,25 +37,34 @@ def test_floating_placement_bounds_and_visual_viewport_offsets():
 assert.equal(bottom.up, true);
 assert.equal(bottom.top, 692);
 assert.equal(bottom.maxHeight, 320);
-for (const width of [16, 24, 96, 320, 360, 393, 430, 1280]) {
-    for (const height of [16, 24, 96, 140, 320, 393, 740, 852]) {
-        for (const left of [0, 29]) {
-            for (const top of [0, 83]) {
-                const viewport = {left, top, width, height};
-                for (const fraction of [0, .1, .5, .9, 1]) {
-                    const trigger = {left: left + width * fraction, right: left + width * fraction + 90,
-                        top: top + height * fraction, bottom: top + height * fraction + 44};
-                    for (const align of ['left', 'right']) {
-                        const p = place(trigger, viewport, align);
-                        const margin = Math.min(12, width / 2, height / 2);
-                        assert.ok(p.width >= 0 && p.width <= 288);
-                        assert.ok(p.left >= left + margin);
-                        assert.ok(p.left + p.width <= left + width - margin + .001);
-                        assert.ok(p.maxHeight >= 0 && p.maxHeight <= 320);
-                        const ceiling = p.up ? p.top - p.maxHeight : p.top;
-                        const floor = p.up ? p.top : p.top + p.maxHeight;
-                        assert.ok(ceiling >= top + margin - .001, JSON.stringify({p, viewport, trigger}));
-                        assert.ok(floor <= top + height - margin + .001, JSON.stringify({p, viewport, trigger}));
+const shortMenu = place({left: 20, right: 100, top: 320, bottom: 364},
+    {left: 0, top: 0, width: 1280, height: 600}, 'right', {width: 224, height: 128});
+assert.equal(shortMenu.up, false, 'A menu that fits below should not flip unnecessarily');
+assert.equal(shortMenu.maxHeight, 128);
+const touchMenu = place({left: 20, right: 100, top: 20, bottom: 64},
+    {left: 0, top: 0, width: 393, height: 852}, 'right', {width: 224, height: 432});
+assert.equal(touchMenu.maxHeight, 432, 'Touch menus must not inherit the 320px composer ceiling');
+for (const menuSize of [undefined, {width: 224, height: 328}, {width: 448, height: 656}]) {
+    for (const width of [16, 24, 96, 320, 360, 393, 430, 1280]) {
+        for (const height of [16, 24, 96, 140, 320, 393, 740, 852]) {
+            for (const left of [0, 29]) {
+                for (const top of [0, 83]) {
+                    const viewport = {left, top, width, height};
+                    for (const fraction of [0, .1, .5, .9, 1]) {
+                        const trigger = {left: left + width * fraction, right: left + width * fraction + 90,
+                            top: top + height * fraction, bottom: top + height * fraction + 44};
+                        for (const align of ['left', 'right']) {
+                            const p = place(trigger, viewport, align, menuSize);
+                            const margin = Math.min(12, width / 2, height / 2);
+                            assert.ok(p.width >= 0 && p.width <= (menuSize?.width ?? 288));
+                            assert.ok(p.left >= left + margin);
+                            assert.ok(p.left + p.width <= left + width - margin + .001);
+                            assert.ok(p.maxHeight >= 0 && p.maxHeight <= (menuSize?.height ?? 320));
+                            const ceiling = p.up ? p.top - p.maxHeight : p.top;
+                            const floor = p.up ? p.top : p.top + p.maxHeight;
+                            assert.ok(ceiling >= top + margin - .001, JSON.stringify({p, viewport, trigger}));
+                            assert.ok(floor <= top + height - margin + .001, JSON.stringify({p, viewport, trigger}));
+                        }
                     }
                 }
             }
diff --git a/functional_tests/test_v2_sidebar_conversation_scroll.py b/functional_tests/test_v2_sidebar_conversation_scroll.py
index 5312c9386..25cd91844 100644
--- a/functional_tests/test_v2_sidebar_conversation_scroll.py
+++ b/functional_tests/test_v2_sidebar_conversation_scroll.py
@@ -3,8 +3,9 @@
 """
 Functional test for the V2 chat rail scrolling as one panel, and the workflow alert notice
 hanging from the bell.
-Version: 0.261.236
+Version: 0.261.406
 Implemented in: 0.261.236
+Conversation menu cleanup implemented in: 0.261.406
 
 On the V2 chat page the rail used to keep its whole height for the navigation and the
 administrator's link groups, and the conversation list scrolled in whatever was left. With a
@@ -75,8 +76,8 @@ def test_the_chat_rail_scrolls_as_one_panel():
     assert "const showConversations = onChatPage && !collapsed;" in body, (
         "The region scrolls exactly when the conversation list is drawn: the chat page, full rail"
     )
-    assert "className={clsx('flex-1', showConversations && 'min-h-0 overflow-y-auto')}" in body, (
-        "The region must fill the rail and scroll only while the conversation list is shown"
+    assert "className={clsx('flex-1', (showConversations || mobile) && 'min-h-0 overflow-y-auto')}" in body, (
+        "The region must fill the rail and scroll for conversations or the mobile navigation drawer"
     )
 
     start, footer, region = _scroll_region(body)
@@ -192,6 +193,9 @@ def test_rows_keep_clear_of_the_held_header():
     )
     assert "header.getBoundingClientRect().bottom - target.getBoundingClientRect().top" in body
     assert "root.scrollTop -= covered + FOCUS_CLEARANCE_PX;" in body
+    assert "!root.contains(target)" in body, (
+        "Portalled action controls are not sidebar rows and must not scroll the sidebar on focus"
+    )
 
     # Neither CSS mechanism does the job here, and one of them actively harms.
     assert "scroll-mt-" not in rail, (
@@ -207,6 +211,27 @@ def test_rows_keep_clear_of_the_held_header():
     return True
 
 
+def test_conversation_actions_escape_the_rail_and_keep_accessible_triggers():
+    """The row reuses the body popover, including a scroll boundary and mobile touch targets."""
+    rail = _read(RAIL_TSX)
+    popover = _read(V2_SRC / "components" / "ui" / "ActionPopover.tsx")
+    css = _read(V2_SRC / "styles" / "theme.css")
+
+    assert "<ActionPopover" in rail
+    assert 'placement="auto"' in rail and "boundaryRef={scrollRootRef}" in rail
+    assert "aria-expanded={menuOpen}" in rail and "aria-controls={menuOpen ? menuId : undefined}" in rail
+    assert "Reference Conversation" not in rail and "Use in current conversation" not in rail
+    assert "Use in this chat" in rail and "Send to conversation" in rail and "Copy reference" in rail
+    assert "createPortal" in popover and "document.body" in popover
+    assert "window.visualViewport" in popover and "new ResizeObserver(measure)" in popover
+    assert "panel.scrollHeight + panel.offsetHeight - panel.clientHeight" in popover
+    assert ".conversation-actions-popover button," in css
+    assert "event.currentTarget.contains(event.target)" in rail, (
+        "Portalled menu shortcuts must not change conversation selection behind the menu"
+    )
+    return True
+
+
 def test_the_workflow_alert_notice_hangs_from_the_bell():
     """My Workspace can scroll out of view now; the bell cannot."""
     print("Testing the alert notice anchor...")
@@ -322,6 +347,7 @@ def test_version_is_at_least_the_implementation_version():
         test_the_held_header_is_marked_without_rerendering_the_list,
         test_paging_and_the_marker_watch_the_rail_region,
         test_rows_keep_clear_of_the_held_header,
+        test_conversation_actions_escape_the_rail_and_keep_accessible_triggers,
         test_the_workflow_alert_notice_hangs_from_the_bell,
         test_an_alert_that_needs_acknowledgment_takes_a_row_under_the_bell,
         test_version_is_at_least_the_implementation_version,
diff --git a/ui_tests/test_v2_conversation_handoffs.py b/ui_tests/test_v2_conversation_handoffs.py
index 092a4650e..9e0ba4fbf 100644
--- a/ui_tests/test_v2_conversation_handoffs.py
+++ b/ui_tests/test_v2_conversation_handoffs.py
@@ -1,11 +1,11 @@
 # test_v2_conversation_handoffs.py
 """
 Browser regressions for V2 queued AI conversation handoffs (`Send To Conversation`).
-Version: 0.261.381
+Version: 0.261.406
 Implemented in: 0.261.381
 
 Covers:
-- Opening `Send To Conversation` from a private conversation's rail menu.
+- Opening `Send to conversation` from a private conversation's rail menu.
 - Selecting a private destination conversation, reviewing the destination model and bounded
   source preview, and submitting to `POST /api/conversation-handoffs`.
 - Rendering outgoing/incoming handoff status cards (`Queued`, `Running`, `Completed`, `Cancelled`)
@@ -276,7 +276,7 @@ def test_send_to_conversation_reviews_preview_queues_card_and_cancels(handoff_pa
     draft.fill("Keep this unsent draft intact.")
 
     page.get_by_role("button", name="Actions for Q4 Research Thread", exact=True).click()
-    page.get_by_role("button", name="Send To Conversation", exact=True).click()
+    page.get_by_role("button", name="Send to conversation", exact=True).click()
 
     dialog = page.get_by_role("dialog", name="Send To Conversation")
     expect(dialog).to_be_visible()
diff --git a/ui_tests/test_v2_conversation_references.py b/ui_tests/test_v2_conversation_references.py
index e186a3ed6..1ebc2c40c 100644
--- a/ui_tests/test_v2_conversation_references.py
+++ b/ui_tests/test_v2_conversation_references.py
@@ -1,7 +1,7 @@
 # test_v2_conversation_references.py
 """
 Browser regressions for V2 private conversation references (`~`), rail actions, and citations.
-Version: 0.261.381
+Version: 0.261.406
 Implemented in: 0.261.381
 
 Covers:
@@ -12,7 +12,7 @@
 - Sending chat and orchestration plan requests with `conversation_references` without implicitly
   enabling `hybrid_search` or adding conversation IDs to `selected_document_ids`.
 - Rendering referenced conversation pills on sent user messages and in reply `Show sources`.
-- Rail row menu `Reference Conversation` (`Use in current conversation` and `Copy reference`) on
+- Flat rail row actions (`Use in this chat` and `Copy reference`) on
   eligible private conversations only.
 
 Run: python .\\ui_tests\\test_v2_conversation_references.py
@@ -362,14 +362,15 @@ def test_rail_reference_action_and_portable_paste_resolve_before_attaching(ref_p
     page, api = ref_page
     mount_chat(page, orchestration=True)
 
-    # Shared conversations do not offer Reference Conversation.
+    # Shared conversations do not offer private reference actions.
     page.get_by_role("button", name="Actions for Shared Team Sync", exact=True).click()
-    expect(page.get_by_role("button", name="Reference Conversation")).to_have_count(0)
+    expect(page.get_by_role("button", name="Use in this chat", exact=True)).to_have_count(0)
+    expect(page.get_by_role("button", name="Copy reference", exact=True)).to_have_count(0)
     page.get_by_role("button", name="Actions for Shared Team Sync", exact=True).click()
 
-    # Active conversation disables "Use in current conversation".
+    # Active conversation disables "Use in this chat".
     page.get_by_role("button", name="Actions for Active Drafting Thread", exact=True).click()
-    expect(page.get_by_role("button", name="Use in current conversation", exact=True)).to_be_disabled()
+    expect(page.get_by_role("button", name="Use in this chat", exact=True)).to_be_disabled()
     page.get_by_role("button", name="Actions for Active Drafting Thread", exact=True).click()
 
     # Paste a portable conversation reference into the composer and verify resolution.
diff --git a/ui_tests/test_v2_sidebar_conversation_scroll.py b/ui_tests/test_v2_sidebar_conversation_scroll.py
index 476a6abb9..f8136f944 100644
--- a/ui_tests/test_v2_sidebar_conversation_scroll.py
+++ b/ui_tests/test_v2_sidebar_conversation_scroll.py
@@ -1,8 +1,9 @@
 # test_v2_sidebar_conversation_scroll.py
 """
 Browser regressions for the V2 chat rail scrolling as one panel.
-Version: 0.261.325
+Version: 0.261.406
 Implemented in: 0.261.236
+Conversation menu cleanup implemented in: 0.261.406
 
 On the chat page, the rail kept its whole height for the navigation and the administrator's
 link groups, and the conversation list scrolled in what was left: two rows in a 720px-tall
@@ -17,6 +18,8 @@
 search in both themes are written to ui_tests/artifacts/sidebar-conversation-scroll/.
 
 Local Chromium is the default; the shared connect_options fixture supports Azure Playwright.
+Conversation action regressions cover flat labels, viewport placement, focus isolation,
+clipboard feedback, private-source eligibility, and touch targets with production CSS.
 
 Build CSS with the existing V2 build, keeping outputs in UI test artifacts:
 npm --prefix .\\application\\v2_ui run build -- --outDir ..\\..\\ui_tests\\artifacts\\orchestration-plan-editor
@@ -201,6 +204,8 @@ def answer_open(self, route, method, path):
             route.fulfill(json={"approvals": []})
         elif method == "GET" and path == "/api/user/collaboration-suggestions":
             route.fulfill(json={"results": []})
+        elif method == "GET" and path == "/api/action-credentials/pending":
+            route.fulfill(json={"success": True, "requests": []})
         elif is_pending_actions_list(method, path):
             route.fulfill(json=pending_actions_payload())
         else:
@@ -248,7 +253,7 @@ def make(viewport=DESKTOP):
         assert not api.errors, f"Unexpected browser errors: {api.errors}"
 
 
-def mount(page, api, *, experience="ChatExperience", entry="/chat", rows=PAGE_SIZE, props=None):
+def mount(page, api, *, experience="ChatExperience", entry="/chat", rows=PAGE_SIZE, props=None, features=None):
     page.goto(editor_tests.ORIGIN + editor_tests.HARNESS)
     page.wait_for_function("() => Boolean(window.OrchHarness)")
     for url in api.assets:
@@ -259,7 +264,7 @@ def mount(page, api, *, experience="ChatExperience", entry="/chat", rows=PAGE_SI
             const H = window.OrchHarness;
             H.reset();
             H.stores.bootstrap.useBootstrapStore.setState({data: {
-                features: {}, settings: {},
+                features: spec.features, settings: {},
                 user: {id: 'tester', display_name: 'Riley Chen'},
                 branding: {app_title: 'Simple Chat'},
                 catalogs: {models: [], agents: [], prompts: []},
@@ -275,7 +280,7 @@ def mount(page, api, *, experience="ChatExperience", entry="/chat", rows=PAGE_SI
             }});
             H.mount('mount-a', spec.experience, spec.props, {initialEntries: [spec.entry]});
         }""",
-        {"experience": experience, "entry": entry, "props": props or {}},
+        {"experience": experience, "entry": entry, "props": props or {}, "features": features or {}},
     )
     if rows:
         expect(row_items(page)).to_have_count(rows)
@@ -555,3 +560,227 @@ def test_the_held_search_is_drawn_on_the_themes_solid_surface(open_page, theme):
 
     ARTIFACTS.mkdir(parents=True, exist_ok=True)
     page.locator("#primary-navigation").screenshot(path=str(ARTIFACTS / f"{theme}-held.png"))
+
+
+def visible_action(page, edge="bottom"):
+    """Find a fully visible trigger without asking Playwright to scroll it into view."""
+    return page.evaluate(
+        """(edge) => {
+            const region = document.querySelector('[data-rail-scroll-region]');
+            const bounds = region.getBoundingClientRect();
+            const floor = document.querySelector('[data-conversation-rail-header]').getBoundingClientRect().bottom;
+            const buttons = [...region.querySelectorAll('button[aria-label^="Actions for "]')]
+                .filter((button) => {
+                    const rect = button.getBoundingClientRect();
+                    return rect.top >= floor && rect.bottom <= bounds.bottom;
+                });
+            const button = edge === 'top' ? buttons[0] : buttons.at(-1);
+            if (!button) throw new Error('No fully visible conversation action trigger');
+            return {name: button.getAttribute('aria-label'), scrollTop: region.scrollTop};
+        }""",
+        edge,
+    )
+
+
+def menu_geometry(menu):
+    return menu.evaluate(
+        """(panel) => {
+            const box = (element) => {
+                const rect = element.getBoundingClientRect();
+                return {top: rect.top, bottom: rect.bottom, left: rect.left, right: rect.right,
+                    height: rect.height, width: rect.width};
+            };
+            const buttons = [...panel.querySelectorAll('button')].map((button) => {
+                const rect = button.getBoundingClientRect();
+                const text = [...button.childNodes].find((node) =>
+                    node.nodeType === Node.TEXT_NODE && node.textContent.trim());
+                const range = document.createRange();
+                range.selectNodeContents(text);
+                return {
+                    ...box(button), label: button.textContent.trim(), textLeft: range.getBoundingClientRect().left,
+                    font: getComputedStyle(button).fontSize, weight: getComputedStyle(button).fontWeight,
+                    color: getComputedStyle(button).color, icon: box(button.querySelector('svg')),
+                    hit: button.contains(document.elementFromPoint(rect.left + rect.width / 2, rect.top + rect.height / 2)),
+                };
+            });
+            return {box: box(panel), portalled: panel.parentElement === document.body, buttons,
+                scrollHeight: panel.scrollHeight, clientHeight: panel.clientHeight,
+                scrollTop: document.querySelector('[data-rail-scroll-region]').scrollTop,
+                viewport: {width: innerWidth, height: innerHeight}};
+        }"""
+    )
+
+
+def assert_menu_in_view(found):
+    box = found["box"]
+    assert box["left"] >= 11 and box["right"] <= found["viewport"]["width"] - 11, found
+    assert box["top"] >= 11 and box["bottom"] <= found["viewport"]["height"] - 11, found
+    assert found["portalled"], "The dropdown must escape the sidebar's clipping and containing block."
+
+
+@pytest.mark.parametrize("viewport", [DESKTOP, PHONE], ids=["desktop", "phone"])
+@pytest.mark.parametrize("theme", ["light", "dark"])
+def test_bottom_conversation_menu_is_flat_aligned_and_not_clipped(open_page, viewport, theme):
+    page, api = open_page(viewport)
+    mount(page, api, rows=0, features={"enable_collaborative_conversations": True})
+    if viewport == PHONE:
+        page.get_by_role("button", name="Open navigation", exact=True).click()
+    expect(row_items(page)).to_have_count(PAGE_SIZE)
+    if theme == "dark":
+        page.get_by_role("button", name="Switch to dark theme", exact=True).click()
+    wheel_rail(page, 900)
+    target = visible_action(page)
+    trigger = page.get_by_role("button", name=target["name"], exact=True)
+    trigger.click()
+    menu = page.get_by_role("group", name=target["name"], exact=True)
+    expect(menu).to_be_visible()
+    found = menu_geometry(menu)
+    assert_menu_in_view(found)
+    assert found["box"]["bottom"] <= trigger.bounding_box()["y"] - 7, found
+    assert found["scrollTop"] == target["scrollTop"], "Opening a low menu must not scroll the sidebar."
+    assert found["scrollHeight"] <= found["clientHeight"] + 1, "This viewport fits the full menu."
+    assert [button["label"] for button in found["buttons"]] == [
+        "Rename", "Share", "Pin", "Hide", "Export",
+        "Send to conversation", "Use in this chat", "Copy reference", "Delete",
+    ]
+    assert all(button["hit"] for button in found["buttons"]), "A menu action is covered by other content."
+    assert {button["weight"] for button in found["buttons"]} == {"400"}
+    assert len({button["font"] for button in found["buttons"]}) == 1
+    assert max(button["textLeft"] for button in found["buttons"]) - min(
+        button["textLeft"] for button in found["buttons"]
+    ) < 1
+    assert all(button["icon"]["width"] == 14 for button in found["buttons"])
+    assert found["buttons"][-1]["top"] - found["buttons"][-2]["bottom"] >= 12
+    assert found["buttons"][-1]["color"] != found["buttons"][0]["color"]
+    if viewport == PHONE:
+        assert all(button["height"] >= 44 for button in found["buttons"])
+
+    ARTIFACTS.mkdir(parents=True, exist_ok=True)
+    device = "phone" if viewport == PHONE else "desktop"
+    page.screenshot(path=str(ARTIFACTS / f"menu-{device}-{theme}.png"))
+    page.keyboard.press("End")
+    expect(menu.get_by_role("button", name="Delete", exact=True)).to_be_focused()
+    after_navigation = geometry(page)
+    assert after_navigation["region"]["scrollTop"] == target["scrollTop"]
+    page.keyboard.press("Escape")
+    expect(menu).to_have_count(0)
+    expect(trigger).to_be_focused()
+    if viewport == PHONE:
+        expect(search_box(page)).to_be_visible()
+
+
+def test_top_menu_opens_below_and_keyboard_does_not_change_selection_or_scroll(open_page):
+    page, api = open_page()
+    mount(page, api)
+    wheel_rail(page, 900)
+    target = visible_action(page, "top")
+    title = target["name"].removeprefix("Actions for ")
+    page.get_by_role("checkbox", name=f"Select {title}", exact=True).check()
+    target = visible_action(page, "top")
+    trigger = page.get_by_role("button", name=target["name"], exact=True)
+    trigger.focus()
+    trigger.press("Enter")
+    menu = page.get_by_role("group", name=target["name"], exact=True)
+    expect(menu.get_by_role("button", name="Rename", exact=True)).to_be_focused()
+    found = menu_geometry(menu)
+    assert_menu_in_view(found)
+    assert found["box"]["top"] >= trigger.bounding_box()["y"] + trigger.bounding_box()["height"] + 7
+    page.keyboard.press("Control+a")
+    expect(page.get_by_text("1 selected", exact=True)).to_be_visible()
+    page.keyboard.press("End")
+    page.keyboard.press("Home")
+    page.keyboard.press("ArrowDown")
+    expect(menu.get_by_role("button", name="Pin", exact=True)).to_be_focused()
+    after_navigation = geometry(page)
+    assert after_navigation["region"]["scrollTop"] == target["scrollTop"]
+    page.keyboard.press("Escape")
+    expect(trigger).to_be_focused()
+    expect(page.get_by_text("1 selected", exact=True)).to_be_visible()
+
+
+def test_switching_menus_outside_click_resize_and_anchor_scroll_dismissal(open_page):
+    page, api = open_page()
+    mount(page, api)
+    wheel_rail(page, 900)
+    bottom = visible_action(page)
+    top = visible_action(page, "top")
+    page.get_by_role("button", name=bottom["name"], exact=True).click()
+    page.get_by_role("button", name=top["name"], exact=True).click()
+    menu = page.locator(".conversation-actions-popover")
+    expect(menu).to_have_count(1)
+    expect(menu).to_have_attribute("aria-label", top["name"])
+    page.get_by_role("button", name="Switch to dark theme", exact=True).click()
+    expect(menu).to_have_count(0)
+    page.get_by_role("button", name=bottom["name"], exact=True).click()
+    page.set_viewport_size({"width": 1000, "height": 900})
+    expect(menu).to_be_visible()
+    assert_menu_in_view(menu_geometry(menu))
+    page.locator("[data-rail-scroll-region]").evaluate("(region) => { region.scrollTop = 0; }")
+    expect(menu).to_have_count(0)
+
+
+@pytest.mark.parametrize("large_text", [False, True], ids=["short-viewport", "large-text"])
+def test_constrained_menu_scrolls_itself_not_the_sidebar(open_page, large_text):
+    page, api = open_page(DESKTOP if large_text else {"width": 1280, "height": 380})
+    mount(page, api)
+    if large_text:
+        page.locator("html").evaluate("(root) => root.setAttribute('data-font-size', 'xl')")
+    wheel_rail(page, 1300)
+    target = visible_action(page)
+    page.get_by_role("button", name=target["name"], exact=True).click()
+    menu = page.get_by_role("group", name=target["name"], exact=True)
+    expect(menu).to_be_visible()
+    page.keyboard.press("End")
+    delete = menu.get_by_role("button", name="Delete", exact=True)
+    expect(delete).to_be_focused()
+    found = menu_geometry(menu)
+    assert_menu_in_view(found)
+    assert found["scrollHeight"] > found["clientHeight"]
+    assert found["buttons"][-1]["hit"], "Delete must be reachable inside the bounded menu."
+    assert found["scrollTop"] == target["scrollTop"], found
+    page.keyboard.press("Escape")
+
+
+def test_flat_reference_actions_copy_and_attach_the_same_private_source(open_page):
+    page, api = open_page()
+    mount(page, api)
+    page.evaluate(
+        """() => Object.defineProperty(navigator, 'clipboard', {configurable: true, value: {
+            writeText: async (text) => { window.copiedConversationReference = text; },
+        }})"""
+    )
+    wheel_rail(page, 900)
+    target = visible_action(page)
+    title = target["name"].removeprefix("Actions for ")
+    source = next(item for item in api.conversations if item["title"] == title)
+    trigger = page.get_by_role("button", name=target["name"], exact=True)
+    trigger.click()
+    page.get_by_role("button", name="Copy reference", exact=True).click()
+    copied = page.evaluate("() => window.copiedConversationReference")
+    assert copied == f"simplechat-conversation:v1:{editor_tests.ORIGIN}/v2/chat?conversationId={source['id']}"
+    expect(page.locator(".conversation-actions-popover")).to_have_count(0)
+    trigger.click()
+    page.get_by_role("button", name="Use in this chat", exact=True).click()
+    expect(page.get_by_role("button", name=f"Remove conversation {title}", exact=True)).to_be_visible()
+    expect(page.locator(".conversation-actions-popover")).to_have_count(0)
+
+
+@pytest.mark.parametrize("available", [False, True], ids=["unavailable", "denied"])
+def test_copy_reference_reports_clipboard_failure(open_page, available):
+    page, api = open_page()
+    mount(page, api)
+    page.evaluate(
+        """(available) => Object.defineProperty(navigator, 'clipboard', {configurable: true,
+            value: available ? {writeText: async () => { throw new DOMException('Denied', 'NotAllowedError'); }} : undefined,
+        })""",
+        available,
+    )
+    wheel_rail(page, 900)
+    target = visible_action(page)
+    page.get_by_role("button", name=target["name"], exact=True).click()
+    page.get_by_role("button", name="Copy reference", exact=True).click()
+    message = (
+        "Could not copy the reference. Check clipboard permissions and try again."
+        if available else "Clipboard access is unavailable in this browser."
+    )
+    expect(page.get_by_text(message, exact=True)).to_be_visible()