From 73ff6e43dd7c6331ce550d9c3acbe7104862bead Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Tue, 19 May 2026 14:00:37 -0700
Subject: [PATCH] fix: close workspace hovercard on context menu (#2347)

---
 .../sidebar/WorkspaceKanbanCard.tsx           | 48 +++++++++++++++++--
 .../sidebar/WorktreeContextMenu.tsx           | 31 ++++++++----
 .../workspace-kanban-details-hover.test.ts    | 28 +++++++++++
 .../sidebar/workspace-kanban-details-hover.ts |  9 ++++
 4 files changed, 102 insertions(+), 14 deletions(-)
 create mode 100644 src/renderer/src/components/sidebar/workspace-kanban-details-hover.test.ts
 create mode 100644 src/renderer/src/components/sidebar/workspace-kanban-details-hover.ts

diff --git a/src/renderer/src/components/sidebar/WorkspaceKanbanCard.tsx b/src/renderer/src/components/sidebar/WorkspaceKanbanCard.tsx
index 63997f67d..6588adc45 100644
--- a/src/renderer/src/components/sidebar/WorkspaceKanbanCard.tsx
+++ b/src/renderer/src/components/sidebar/WorkspaceKanbanCard.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react'
+import React, { useCallback, useMemo, useRef, useState } from 'react'
 import { Pin } from 'lucide-react'
 import { useAppStore } from '@/store'
 import { Badge } from '@/components/ui/badge'
@@ -10,6 +10,7 @@ import type { Repo, Worktree } from '../../../../shared/types'
 import WorktreeCard from './WorktreeCard'
 import { WorktreeActivityStatusIndicator } from './WorktreeActivityStatusIndicator'
 import WorktreeContextMenu from './WorktreeContextMenu'
+import { getWorkspaceKanbanDetailsHoverOpenState } from './workspace-kanban-details-hover'
 import { writeWorkspaceDragData } from './workspace-status'
 
 type WorkspaceKanbanCardProps = {
@@ -106,6 +107,8 @@ function WorkspaceKanbanCompactCard({
 }: Omit<WorkspaceKanbanCardProps, 'compact'>): React.JSX.Element {
   const deleteState = useAppStore((s) => s.deleteStateByWorktreeId[worktree.id])
   const isDeleting = deleteState?.isDeleting ?? false
+  const [detailsOpen, setDetailsOpen] = useState(false)
+  const contextMenuOpenRef = useRef(false)
   const contextWorktrees = useMemo(
     () =>
       isSelected && selectedWorktrees && selectedWorktrees.length > 0
@@ -150,13 +153,45 @@ function WorkspaceKanbanCompactCard({
     [contextWorktrees, isDeleting, isSelected, worktree.id]
   )
 
+  const handleDetailsOpenChange = useCallback((requestedOpen: boolean) => {
+    setDetailsOpen(
+      getWorkspaceKanbanDetailsHoverOpenState({
+        contextMenuOpen: contextMenuOpenRef.current,
+        requestedOpen
+      })
+    )
+  }, [])
+
+  const handleContextMenuOpenChange = useCallback((open: boolean) => {
+    contextMenuOpenRef.current = open
+    if (open) {
+      // Why: the preview sits beside the compact card, so it should disappear
+      // as soon as the card's context menu becomes the active surface.
+      setDetailsOpen(false)
+    }
+  }, [])
+
+  const handleContextMenuSelect = useCallback(
+    (event: React.MouseEvent<HTMLElement>) => {
+      setDetailsOpen(false)
+      return onContextMenuSelect(event, worktree)
+    },
+    [onContextMenuSelect, worktree]
+  )
+
   return (
     <WorktreeContextMenu
       worktree={worktree}
       selectedWorktrees={contextWorktrees}
-      onContextMenuSelect={(event) => onContextMenuSelect(event, worktree)}
+      onContextMenuSelect={handleContextMenuSelect}
+      onOpenChange={handleContextMenuOpenChange}
     >
-      <HoverCard openDelay={450} closeDelay={100}>
+      <HoverCard
+        open={detailsOpen}
+        onOpenChange={handleDetailsOpenChange}
+        openDelay={450}
+        closeDelay={100}
+      >
         <HoverCardTrigger asChild>
           <button
             type="button"
@@ -209,7 +244,12 @@ function WorkspaceKanbanCompactCard({
             ) : null}
           </button>
         </HoverCardTrigger>
-        <HoverCardContent side="right" align="start" sideOffset={8} className="w-72 p-1.5">
+        <HoverCardContent
+          side="right"
+          align="start"
+          sideOffset={8}
+          className="w-72 p-1.5 data-[state=closed]:hidden"
+        >
           <WorktreeCard
             worktree={worktree}
             repo={repo}
diff --git a/src/renderer/src/components/sidebar/WorktreeContextMenu.tsx b/src/renderer/src/components/sidebar/WorktreeContextMenu.tsx
index 9b60f30ff..9e7746b75 100644
--- a/src/renderer/src/components/sidebar/WorktreeContextMenu.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeContextMenu.tsx
@@ -46,6 +46,7 @@ type Props = {
   contentClassName?: string
   selectedWorktrees?: readonly Worktree[]
   onContextMenuSelect?: (event: React.MouseEvent<HTMLElement>) => readonly Worktree[]
+  onOpenChange?: (open: boolean) => void
 }
 
 const CLOSE_ALL_CONTEXT_MENUS_EVENT = 'orca-close-all-context-menus'
@@ -154,7 +155,8 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
   children,
   contentClassName,
   selectedWorktrees = [worktree],
-  onContextMenuSelect
+  onContextMenuSelect,
+  onOpenChange
 }: Props) {
   const updateWorktreeMeta = useAppStore((s) => s.updateWorktreeMeta)
   const workspaceStatuses = useAppStore((s) => s.workspaceStatuses)
@@ -225,11 +227,19 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
   const validParentWorktreeId = lineageInfo.state === 'valid' ? lineageInfo.parent.id : null
   const hasAnyContextLineage = activeContextWorktrees.some((item) => worktreeLineageById[item.id])
 
+  const setMenuOpenState = useCallback(
+    (open: boolean) => {
+      setMenuOpen(open)
+      onOpenChange?.(open)
+    },
+    [onOpenChange]
+  )
+
   useEffect(() => {
-    const closeMenu = (): void => setMenuOpen(false)
+    const closeMenu = (): void => setMenuOpenState(false)
     window.addEventListener(CLOSE_ALL_CONTEXT_MENUS_EVENT, closeMenu)
     return () => window.removeEventListener(CLOSE_ALL_CONTEXT_MENUS_EVENT, closeMenu)
-  }, [])
+  }, [setMenuOpenState])
 
   const handleCopyPath = useCallback(() => {
     window.api.ui.writeClipboardText(worktree.path)
@@ -245,7 +255,7 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
 
   const handleAssignWorkspaceStatus = useCallback(
     (status: string) => {
-      setMenuOpen(false)
+      setMenuOpenState(false)
       void Promise.all(
         activeContextWorktrees.map((item) =>
           getWorkspaceStatus(item, workspaceStatuses) === status
@@ -254,7 +264,7 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
         )
       )
     },
-    [activeContextWorktrees, updateWorktreeMeta, workspaceStatuses]
+    [activeContextWorktrees, setMenuOpenState, updateWorktreeMeta, workspaceStatuses]
   )
 
   const handleRename = useCallback(() => {
@@ -277,14 +287,14 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
 
   const handleCloseTerminals = useCallback(() => {
     const worktreeIds = sleepableWorktrees.map((item) => item.id)
-    setMenuOpen(false)
+    setMenuOpenState(false)
     // Why: Sleep can remount the sidebar when it clears the active workspace.
     // Let Radix finish closing the menu first so its focus/portal teardown
     // cannot scroll the virtualized list during that remount.
     window.setTimeout(() => {
       void runSleepWorktrees(worktreeIds)
     }, 50)
-  }, [sleepableWorktrees])
+  }, [setMenuOpenState, sleepableWorktrees])
 
   const handleDelete = useCallback(() => {
     // Folder mode handled inline because it routes to a different modal;
@@ -293,7 +303,7 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
     scopeRef.current
       ?.closest('[data-worktree-sidebar]')
       ?.dispatchEvent(new Event(VIRTUALIZED_SCROLL_ANCHOR_RECORD_EVENT))
-    setMenuOpen(false)
+    setMenuOpenState(false)
     // Why: Delete can remove the active row and remount the sidebar. Run it
     // after menu close for the same reason as Sleep above.
     window.setTimeout(() => {
@@ -325,6 +335,7 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
     isFolder,
     isMultiContext,
     openModal,
+    setMenuOpenState,
     worktree.displayName,
     worktree.id,
     worktree.repoId
@@ -389,14 +400,14 @@ const WorktreeContextMenu = React.memo(function WorktreeContextMenu({
         setContextWorktrees(onContextMenuSelect?.(event) ?? selectedWorktrees)
         const bounds = event.currentTarget.getBoundingClientRect()
         setMenuPoint({ x: event.clientX - bounds.left, y: event.clientY - bounds.top })
-        setMenuOpen(true)
+        setMenuOpenState(true)
       }}
       onClickCapture={(event) => {
         suppressOpeningPointerEvent(event)
       }}
     >
       {children}
-      <DropdownMenu open={menuOpen} onOpenChange={setMenuOpen} modal={false}>
+      <DropdownMenu open={menuOpen} onOpenChange={setMenuOpenState} modal={false}>
         <DropdownMenuTrigger asChild>
           <button
             aria-hidden
diff --git a/src/renderer/src/components/sidebar/workspace-kanban-details-hover.test.ts b/src/renderer/src/components/sidebar/workspace-kanban-details-hover.test.ts
new file mode 100644
index 000000000..7623be74f
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-kanban-details-hover.test.ts
@@ -0,0 +1,28 @@
+import { describe, expect, it } from 'vitest'
+import { getWorkspaceKanbanDetailsHoverOpenState } from './workspace-kanban-details-hover'
+
+describe('getWorkspaceKanbanDetailsHoverOpenState', () => {
+  it('keeps the details hover closed while the context menu is open', () => {
+    expect(
+      getWorkspaceKanbanDetailsHoverOpenState({
+        contextMenuOpen: true,
+        requestedOpen: true
+      })
+    ).toBe(false)
+  })
+
+  it('follows hover requests when the context menu is closed', () => {
+    expect(
+      getWorkspaceKanbanDetailsHoverOpenState({
+        contextMenuOpen: false,
+        requestedOpen: true
+      })
+    ).toBe(true)
+    expect(
+      getWorkspaceKanbanDetailsHoverOpenState({
+        contextMenuOpen: false,
+        requestedOpen: false
+      })
+    ).toBe(false)
+  })
+})
diff --git a/src/renderer/src/components/sidebar/workspace-kanban-details-hover.ts b/src/renderer/src/components/sidebar/workspace-kanban-details-hover.ts
new file mode 100644
index 000000000..0e55884b8
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-kanban-details-hover.ts
@@ -0,0 +1,9 @@
+export function getWorkspaceKanbanDetailsHoverOpenState({
+  contextMenuOpen,
+  requestedOpen
+}: {
+  contextMenuOpen: boolean
+  requestedOpen: boolean
+}): boolean {
+  return contextMenuOpen ? false : requestedOpen
+}