From 38e46e149d6ca8716045e22dd2fbff8dbfd79dc3 Mon Sep 17 00:00:00 2001
From: Jinjing <6427696+AmethystLiang@users.noreply.github.com>
Date: Wed, 29 Jul 2026 17:11:50 -0700
Subject: [PATCH] Fix stale closure in kanban area-selection and card-drag
 handlers

- Refresh area selection measurements on pointer up to avoid stale cache
- Read worktree IDs ref directly in drag handler to close stale closure
---
 .../components/sidebar/use-workspace-kanban-area-selection.ts  | 3 ++-
 .../sidebar/use-workspace-kanban-card-pointer-drag.ts          | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/components/sidebar/use-workspace-kanban-area-selection.ts b/src/renderer/src/components/sidebar/use-workspace-kanban-area-selection.ts
index 8ddaf9116b9..36f4d5af69c 100644
--- a/src/renderer/src/components/sidebar/use-workspace-kanban-area-selection.ts
+++ b/src/renderer/src/components/sidebar/use-workspace-kanban-area-selection.ts
@@ -249,6 +249,7 @@ export function useWorkspaceKanbanAreaSelection({
         window.cancelAnimationFrame(state.scrollFrameId)
         state.scrollFrameId = null
       }
+      refreshAreaSelectionMeasurements()
       flushAreaSelectionDrag()
       if (shouldCommitWorkspaceKanbanAreaSelection(state)) {
         updateSelectionForAreaRef.current(
@@ -262,7 +263,7 @@ export function useWorkspaceKanbanAreaSelection({
       dragRef.current = null
       setOverlayRect(overlayRef.current, null)
     },
-    [flushAreaSelectionDrag, overlayRef]
+    [flushAreaSelectionDrag, overlayRef, refreshAreaSelectionMeasurements]
   )
 
   const handleAreaSelectionPointerDown = useCallback(
diff --git a/src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.ts b/src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.ts
index 5375041d125..19a67a31663 100644
--- a/src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.ts
+++ b/src/renderer/src/components/sidebar/use-workspace-kanban-card-pointer-drag.ts
@@ -298,10 +298,9 @@ export function useWorkspaceKanbanCardPointerDrag({
         return
       }
 
-      const selectedIds = selectedWorktreeIdsRef.current
       const selectedWorktrees = selectedWorktreesRef.current
       const worktreeIds =
-        selectedIds.has(worktreeId) && selectedWorktrees.length > 1
+        selectedWorktreeIdsRef.current.has(worktreeId) && selectedWorktrees.length > 1
           ? selectedWorktrees.map((worktree) => worktree.id)
           : [worktreeId]
       dragRef.current = {