From 7d73aea4158b3eeb66a9b3a2f5e07ff228b7eefe Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Mon, 9 Nov 2026 05:14:13 -0800 Subject: [PATCH] fix(tabs): keep removed worktrees' group entries deleted on removal The second emptied-group collapse in removeWorktreeLayout also visited removed worktrees and wrote their deleted groupsByWorktree entry back as an empty list, a delete-then-set the seam read as a reordered full resync. It now visits only surviving workspaces, so removal stays addressed. Co-Authored-By: Claude Opus 5.5 (1M context) --- .../src/store/slices/tabs/worktree-layout-lifecycle.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/renderer/src/store/slices/tabs/worktree-layout-lifecycle.ts b/src/renderer/src/store/slices/tabs/worktree-layout-lifecycle.ts index b39f40d8b86..9319e3b3fa5 100644 --- a/src/renderer/src/store/slices/tabs/worktree-layout-lifecycle.ts +++ b/src/renderer/src/store/slices/tabs/worktree-layout-lifecycle.ts @@ -168,7 +168,12 @@ export function removeWorktreeLayout( : groups ) } - collapseEmptiedKeptGroups(s.groupsByWorktree, drafts, affectedWorkspaces) + // Removed worktrees' entries stay deleted; collapsing them would write an empty group list back. + collapseEmptiedKeptGroups( + s.groupsByWorktree, + drafts, + new Set([...affectedWorkspaces].filter((id) => !worktreeIds.has(id))) + ) const recentEditors = Object.fromEntries( Object.entries(omitByWorktree(s.recentlyClosedEditorTabsByWorktree)).map(([id, rows]) => [ id,