From 053722a92a81661852fd62fd9da831962c85791d Mon Sep 17 00:00:00 2001
From: Andrew <andrew@johnson5.net>
Date: Thu, 6 Aug 2026 09:10:51 -0400
Subject: [PATCH 1/3] fix(web): make sidebar project actions reachable by
 keyboard and screen reader

The per-project actions button in the 'Filter threads by project' menu
was nested inside a menuitemradio, where ARIA menus cannot focus it:
arrow keys move between items, Enter activates the radio, and screen
readers flatten the button's label into the item's accessible name.
Project settings (remove, rename, grouping) were mouse-only.

Open project actions from a contextmenu event on the menu item itself,
so Shift+F10 and the Context Menu key work the same way they already do
on thread rows. The ellipsis button stays as a mouse-only affordance,
hidden from assistive tech so item names announce cleanly.

Fixes the remaining half of #1399.
---
 apps/web/src/components/SidebarV2.tsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/components/SidebarV2.tsx b/apps/web/src/components/SidebarV2.tsx
index 1444d72e60c..b278686eadd 100644
--- a/apps/web/src/components/SidebarV2.tsx
+++ b/apps/web/src/components/SidebarV2.tsx
@@ -1587,7 +1587,7 @@ export default function SidebarV2() {
   );
 
   const handleProjectActions = useCallback(
-    (event: ReactMouseEvent<HTMLButtonElement>, projectGroup: SidebarProjectSnapshot) => {
+    (event: ReactMouseEvent<HTMLElement>, projectGroup: SidebarProjectSnapshot) => {
       event.preventDefault();
       event.stopPropagation();
       setProjectScopeMenuOpen(false);
@@ -2829,6 +2829,9 @@ export default function SidebarV2() {
                             value={scopeKey}
                             closeOnClick
                             className="h-8 min-h-8 px-1 py-0 text-sm font-medium [&>span:last-child]:flex [&>span:last-child]:min-w-0 [&>span:last-child]:items-center [&>span:last-child]:gap-2"
+                            onContextMenu={(event) => {
+                              void handleProjectActions(event, project);
+                            }}
                           >
                             <ProjectFavicon
                               environmentId={project.environmentId}
@@ -2836,9 +2839,13 @@ export default function SidebarV2() {
                               className="size-4 shrink-0"
                             />
                             <span className="min-w-0 truncate text-sm">{project.displayName}</span>
+                            {/* Mouse-only affordance: hidden from AT because interactive children
+                                are invalid inside menuitemradio and pollute its accessible name.
+                                Keyboard/AT path is Shift+F10 (contextmenu) on the item itself. */}
                             <button
                               type="button"
-                              aria-label={`Project actions for ${project.displayName}`}
+                              tabIndex={-1}
+                              aria-hidden="true"
                               title={`Project actions for ${project.displayName}`}
                               className="ml-auto inline-flex size-6 shrink-0 cursor-pointer items-center justify-center rounded-md text-muted-foreground/55 outline-none transition-colors hover:bg-accent hover:text-foreground focus-visible:bg-accent focus-visible:text-foreground focus-visible:ring-2 focus-visible:ring-ring"
                               onPointerDown={(event) => event.stopPropagation()}

From ac834d8cfe2aa5eb84b0362d07a937122f168c76 Mon Sep 17 00:00:00 2001
From: Andrew <andrew@johnson5.net>
Date: Thu, 6 Aug 2026 09:54:29 -0400
Subject: [PATCH 2/3] fix(web): suppress scope change when project actions open
 via ctrl+click

On macOS, Ctrl+click fires contextmenu and Safari also fires a
follow-up click on the same element. That click could activate the
radio item and change the project filter underneath the settings
dialog. stopPropagation on contextmenu cannot block the separate click
event, so briefly suppress scope changes after project actions open.
---
 apps/web/src/components/SidebarV2.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/components/SidebarV2.tsx b/apps/web/src/components/SidebarV2.tsx
index b278686eadd..771a857d231 100644
--- a/apps/web/src/components/SidebarV2.tsx
+++ b/apps/web/src/components/SidebarV2.tsx
@@ -1586,10 +1586,16 @@ export default function SidebarV2() {
     [projectGroupingSettings.sidebarProjectGroupingOverrides, updateSettings],
   );
 
+  // On macOS, Ctrl+click fires contextmenu and Safari then also fires click on
+  // the same element, which would activate the radio item and change the scope
+  // underneath the settings dialog. stopPropagation on contextmenu cannot block
+  // that separate click, so scope changes are suppressed briefly instead.
+  const projectActionsInvokedAtRef = useRef(0);
   const handleProjectActions = useCallback(
     (event: ReactMouseEvent<HTMLElement>, projectGroup: SidebarProjectSnapshot) => {
       event.preventDefault();
       event.stopPropagation();
+      projectActionsInvokedAtRef.current = Date.now();
       setProjectScopeMenuOpen(false);
       window.requestAnimationFrame(() => setProjectActionsTarget(projectGroup));
     },
@@ -2809,9 +2815,10 @@ export default function SidebarV2() {
                   <MenuPopup align="start" className="w-(--anchor-width)">
                     <MenuRadioGroup
                       value={projectScopeKey ?? "all"}
-                      onValueChange={(value) =>
-                        setProjectScopeKey(value === "all" ? null : (value as string))
-                      }
+                      onValueChange={(value) => {
+                        if (Date.now() - projectActionsInvokedAtRef.current < 500) return;
+                        setProjectScopeKey(value === "all" ? null : (value as string));
+                      }}
                     >
                       <MenuRadioItem
                         value="all"

From 28b51a860ec57189d2964eeace404a961515e258 Mon Sep 17 00:00:00 2001
From: Andrew <andrew@johnson5.net>
Date: Thu, 6 Aug 2026 10:01:37 -0400
Subject: [PATCH 3/3] fix(web): replace timed scope-change guard with one-shot
 flag

The 500ms suppression window could in principle swallow a legitimate
filter selection. Suppress exactly one scope change instead, clearing
the flag whenever the menu reopens: a real selection always starts by
reopening the menu, so only the Safari ghost click after Ctrl+click can
ever be suppressed.
---
 apps/web/src/components/SidebarV2.tsx | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/components/SidebarV2.tsx b/apps/web/src/components/SidebarV2.tsx
index 771a857d231..e0452b1c87d 100644
--- a/apps/web/src/components/SidebarV2.tsx
+++ b/apps/web/src/components/SidebarV2.tsx
@@ -1589,13 +1589,15 @@ export default function SidebarV2() {
   // On macOS, Ctrl+click fires contextmenu and Safari then also fires click on
   // the same element, which would activate the radio item and change the scope
   // underneath the settings dialog. stopPropagation on contextmenu cannot block
-  // that separate click, so scope changes are suppressed briefly instead.
-  const projectActionsInvokedAtRef = useRef(0);
+  // that separate click, so the next scope change is suppressed instead. The
+  // flag clears when the menu reopens, and a real selection always starts by
+  // reopening the menu, so it can never swallow one.
+  const suppressNextScopeChangeRef = useRef(false);
   const handleProjectActions = useCallback(
     (event: ReactMouseEvent<HTMLElement>, projectGroup: SidebarProjectSnapshot) => {
       event.preventDefault();
       event.stopPropagation();
-      projectActionsInvokedAtRef.current = Date.now();
+      suppressNextScopeChangeRef.current = true;
       setProjectScopeMenuOpen(false);
       window.requestAnimationFrame(() => setProjectActionsTarget(projectGroup));
     },
@@ -2789,7 +2791,13 @@ export default function SidebarV2() {
             </div>
             {projectGroups.length > 0 ? (
               <div className="flex items-center gap-1">
-                <Menu open={projectScopeMenuOpen} onOpenChange={setProjectScopeMenuOpen}>
+                <Menu
+                  open={projectScopeMenuOpen}
+                  onOpenChange={(open) => {
+                    if (open) suppressNextScopeChangeRef.current = false;
+                    setProjectScopeMenuOpen(open);
+                  }}
+                >
                   <MenuTrigger
                     render={
                       <SidebarMenuButton
@@ -2816,7 +2824,10 @@ export default function SidebarV2() {
                     <MenuRadioGroup
                       value={projectScopeKey ?? "all"}
                       onValueChange={(value) => {
-                        if (Date.now() - projectActionsInvokedAtRef.current < 500) return;
+                        if (suppressNextScopeChangeRef.current) {
+                          suppressNextScopeChangeRef.current = false;
+                          return;
+                        }
                         setProjectScopeKey(value === "all" ? null : (value as string));
                       }}
                     >