Restore sidebar grouping with sidebar tabs

Author: nicosuave

macos/Sources/Features/Worktrunk/WorktrunkSidebarView.swift

@@ -59,16 +59,14 @@ struct WorktrunkSidebarView: View {
 
                 Spacer(minLength: 0)
 
-                if !sidebarTabsEnabled {
-                    Button {
-                        toggleSidebarListMode()
-                    } label: {
-                        Image(systemName: store.sidebarListMode == .flatWorktrees ? "list.bullet.indent" : "list.bullet")
-                            .foregroundStyle(.secondary)
-                    }
-                    .buttonStyle(.plain)
-                    .help(store.sidebarListMode == .flatWorktrees ? "Switch to nested list" : "Switch to flat list")
+                Button {
+                    toggleSidebarListMode()
+                } label: {
+                    Image(systemName: store.sidebarListMode == .flatWorktrees ? "list.bullet.indent" : "list.bullet")
+                        .foregroundStyle(.secondary)
                 }
+                .buttonStyle(.plain)
+                .help(store.sidebarListMode == .flatWorktrees ? "Switch to nested list" : "Switch to flat list")
 
                 Menu {
                     ForEach(WorktreeSortOrder.allCases, id: \.self) { order in
@@ -187,15 +185,7 @@ struct WorktrunkSidebarView: View {
         .onChange(of: store.sidebarListMode) { _ in
             clearSelectionIfMainInFlatMode()
         }
-        .onChange(of: sidebarTabsEnabled) { enabled in
-            if enabled {
-                forceFlatModeIfNeeded()
-            }
-        }
         .onAppear {
-            if sidebarTabsEnabled {
-                forceFlatModeIfNeeded()
-            }
             if store.sidebarListMode == .nestedByRepo, sidebarState.expandedRepoIDs.isEmpty {
                 sidebarState.applyExpandedRepoIDs(
                     Set(store.sidebarSnapshot.repositories.map(\.id)),
@@ -297,7 +287,7 @@ struct WorktrunkSidebarView: View {
             if store.sidebarListMode == .flatWorktrees {
                 flatWorktreeList(snapshot: snapshot, excludingWorktreePaths: topWorktreePaths)
             } else {
-                nestedRepoList(snapshot: snapshot)
+                nestedRepoList(snapshot: snapshot, excludingWorktreePaths: topWorktreePaths)
             }
         }
         .background(SidebarListScrollFinder(preserver: sidebarScrollPreserver))
@@ -321,16 +311,6 @@ struct WorktrunkSidebarView: View {
         return nil
     }
 
-    private func forceFlatModeIfNeeded() {
-        if store.sidebarListMode != .flatWorktrees {
-            store.sidebarListMode = .flatWorktrees
-        }
-        if store.worktreeSortOrder != .recentActivity {
-            store.worktreeSortOrder = .recentActivity
-        }
-        clearSelectionIfMainInFlatMode()
-    }
-
     @ViewBuilder
     private func sidebarTabsList(
         snapshot: WorktrunkStore.SidebarSnapshot,
@@ -419,7 +399,10 @@ struct WorktrunkSidebarView: View {
     }
 
     @ViewBuilder
-    private func nestedRepoList(snapshot: WorktrunkStore.SidebarSnapshot) -> some View {
+    private func nestedRepoList(
+        snapshot: WorktrunkStore.SidebarSnapshot,
+        excludingWorktreePaths: Set<String>
+    ) -> some View {
         ForEach(snapshot.repositories) { repo in
             DisclosureGroup(
                 isExpanded: Binding(
@@ -449,7 +432,9 @@ struct WorktrunkSidebarView: View {
                 }
                 .help("Create worktree")
 
-                let worktrees = snapshot.worktreesByRepositoryID[repo.id] ?? []
+                let worktrees = (snapshot.worktreesByRepositoryID[repo.id] ?? []).filter { wt in
+                    !excludingWorktreePaths.contains(standardizedPath(wt.path))
+                }
                 if worktrees.isEmpty {
                     Text("No worktrees")
                         .foregroundStyle(.secondary)