Merge pull request #19 from sidequery/nicosuave/sidebar-grouping

Restore sidebar grouping when sidebar tabs is enabled

Author: nicosuave

macos/Sources/Features/Terminal/TerminalController.swift

@@ -23,23 +23,33 @@ final class WorktrunkSidebarState: ObservableObject {
         self.selection = selection
     }
 
-    func applyExpandedRepoIDs(_ next: Set<UUID>, listMode: WorktrunkSidebarListMode) {
+    func applyExpandedRepoIDs(
+        _ next: Set<UUID>,
+        listMode: WorktrunkSidebarListMode,
+        alwaysVisibleWorktreePaths: Set<String> = []
+    ) {
         guard next != expandedRepoIDs else { return }
         expandedRepoIDs = next
         pruneSelectionForVisibility(
             listMode: listMode,
             expandedRepoIDs: next,
-            expandedWorktreePaths: expandedWorktreePaths
+            expandedWorktreePaths: expandedWorktreePaths,
+            alwaysVisibleWorktreePaths: alwaysVisibleWorktreePaths
         )
     }
 
-    func applyExpandedWorktreePaths(_ next: Set<String>, listMode: WorktrunkSidebarListMode) {
+    func applyExpandedWorktreePaths(
+        _ next: Set<String>,
+        listMode: WorktrunkSidebarListMode,
+        alwaysVisibleWorktreePaths: Set<String> = []
+    ) {
         guard next != expandedWorktreePaths else { return }
         expandedWorktreePaths = next
         pruneSelectionForVisibility(
             listMode: listMode,
             expandedRepoIDs: expandedRepoIDs,
-            expandedWorktreePaths: next
+            expandedWorktreePaths: next,
+            alwaysVisibleWorktreePaths: alwaysVisibleWorktreePaths
         )
     }
 
@@ -115,18 +125,23 @@ final class WorktrunkSidebarState: ObservableObject {
     private func pruneSelectionForVisibility(
         listMode: WorktrunkSidebarListMode,
         expandedRepoIDs: Set<UUID>,
-        expandedWorktreePaths: Set<String>
+        expandedWorktreePaths: Set<String>,
+        alwaysVisibleWorktreePaths: Set<String>
     ) {
         guard let selection else { return }
         switch selection {
         case .repo:
             return
-        case .worktree(let repoID, _):
-            if listMode == .nestedByRepo, !expandedRepoIDs.contains(repoID) {
+        case .worktree(let repoID, let path):
+            if listMode == .nestedByRepo,
+               !expandedRepoIDs.contains(repoID),
+               !alwaysVisibleWorktreePaths.contains(path) {
                 self.selection = .repo(id: repoID)
             }
         case .session(_, let repoID, let worktreePath):
-            if listMode == .nestedByRepo, !expandedRepoIDs.contains(repoID) {
+            if listMode == .nestedByRepo,
+               !expandedRepoIDs.contains(repoID),
+               !alwaysVisibleWorktreePaths.contains(worktreePath) {
                 self.selection = .repo(id: repoID)
                 return
             }
@@ -1599,6 +1614,12 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         (NSApp.delegate as? AppDelegate)?.worktrunkStore.sidebarListMode ?? .flatWorktrees
     }
 
+    private func currentWorktrunkAlwaysVisibleWorktreePaths() -> Set<String> {
+        guard WorktrunkPreferences.sidebarTabsEnabled else { return [] }
+        guard currentWorktrunkSidebarListMode() == .nestedByRepo else { return [] }
+        return Set(openTabsModel.tabs.compactMap(\.worktreeRootPath).map(Self.standardizedPath))
+    }
+
     private func applySyncedWorktrunkSidebarVisibility(_ visibility: NavigationSplitViewVisibility) {
         guard worktrunkSidebarState.columnVisibility != visibility else { return }
         worktrunkSidebarState.isApplyingRemoteUpdate = true
@@ -1618,7 +1639,11 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
             worktrunkSidebarSyncApplyingRemoteUpdate = false
             worktrunkSidebarState.isApplyingRemoteUpdate = false
         }
-        worktrunkSidebarState.applyExpandedRepoIDs(expandedRepoIDs, listMode: currentWorktrunkSidebarListMode())
+        worktrunkSidebarState.applyExpandedRepoIDs(
+            expandedRepoIDs,
+            listMode: currentWorktrunkSidebarListMode(),
+            alwaysVisibleWorktreePaths: currentWorktrunkAlwaysVisibleWorktreePaths()
+        )
     }
 
     private func applySyncedWorktrunkSidebarExpandedWorktreePaths(_ expandedWorktreePaths: Set<String>) {
@@ -1631,7 +1656,8 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         }
         worktrunkSidebarState.applyExpandedWorktreePaths(
             expandedWorktreePaths,
-            listMode: currentWorktrunkSidebarListMode()
+            listMode: currentWorktrunkSidebarListMode(),
+            alwaysVisibleWorktreePaths: currentWorktrunkAlwaysVisibleWorktreePaths()
         )
     }
 

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,19 +185,12 @@ 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)),
-                    listMode: store.sidebarListMode
+                    listMode: store.sidebarListMode,
+                    alwaysVisibleWorktreePaths: currentAlwaysVisibleWorktreePaths()
                 )
             }
             clearSelectionIfMainInFlatMode()
@@ -297,7 +288,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,14 +312,11 @@ struct WorktrunkSidebarView: View {
         return nil
     }
 
-    private func forceFlatModeIfNeeded() {
-        if store.sidebarListMode != .flatWorktrees {
-            store.sidebarListMode = .flatWorktrees
-        }
-        if store.worktreeSortOrder != .recentActivity {
-            store.worktreeSortOrder = .recentActivity
-        }
-        clearSelectionIfMainInFlatMode()
+    private func currentAlwaysVisibleWorktreePaths() -> Set<String> {
+        guard sidebarTabsEnabled else { return [] }
+        guard store.sidebarListMode == .nestedByRepo else { return [] }
+        let tabRoots = Set(openTabsModel.tabs.compactMap(\.worktreeRootPath).map(standardizedPath))
+        return tabRoots.intersection(store.sidebarWorktreePaths)
     }
 
     @ViewBuilder
@@ -347,6 +335,7 @@ struct WorktrunkSidebarView: View {
                 return (key, item.tab.windowNumber)
             }
         )
+        let alwaysVisibleWorktreePaths = Set(windowNumberByWorktreePath.keys)
         let moveBeforePreservingScroll: (Int, Int) -> Void = { moving, target in
             let scrollY = sidebarScrollPreserver.captureScrollY()
             moveNativeTabBefore(moving, target)
@@ -379,6 +368,7 @@ struct WorktrunkSidebarView: View {
                 openWorktreeAgent: openWorktreeAgent,
                 defaultAction: defaultAction,
                 availableAgents: availableAgents,
+                alwaysVisibleWorktreePaths: alwaysVisibleWorktreePaths,
                   focusNativeTab: focusNativeTab,
                   moveBefore: moveBeforePreservingScroll,
                   moveAfter: moveAfterPreservingScroll,
@@ -419,7 +409,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(
@@ -431,7 +424,11 @@ struct WorktrunkSidebarView: View {
                         } else {
                             next.remove(repo.id)
                         }
-                        sidebarState.applyExpandedRepoIDs(next, listMode: store.sidebarListMode)
+                        sidebarState.applyExpandedRepoIDs(
+                            next,
+                            listMode: store.sidebarListMode,
+                            alwaysVisibleWorktreePaths: excludingWorktreePaths
+                        )
                     }
                 )
             ) {
@@ -449,7 +446,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)
@@ -601,7 +600,11 @@ struct WorktrunkSidebarView: View {
                     } else {
                         next.remove(wt.path)
                     }
-                    sidebarState.applyExpandedWorktreePaths(next, listMode: store.sidebarListMode)
+                    sidebarState.applyExpandedWorktreePaths(
+                        next,
+                        listMode: store.sidebarListMode,
+                        alwaysVisibleWorktreePaths: currentAlwaysVisibleWorktreePaths()
+                    )
                 }
             )
         ) {
@@ -867,6 +870,7 @@ private struct WorktreeTabDisclosureGroup: View {
     let openWorktreeAgent: (String, WorktrunkAgent) -> Void
     let defaultAction: WorktrunkDefaultAction
     let availableAgents: [WorktrunkAgent]
+    let alwaysVisibleWorktreePaths: Set<String>
     let focusNativeTab: (Int) -> Void
     let moveBefore: (Int, Int) -> Void
     let moveAfter: (Int, Int) -> Void
@@ -883,7 +887,11 @@ private struct WorktreeTabDisclosureGroup: View {
                     } else {
                         next.remove(worktree.path)
                     }
-                    sidebarState.applyExpandedWorktreePaths(next, listMode: store.sidebarListMode)
+                    sidebarState.applyExpandedWorktreePaths(
+                        next,
+                        listMode: store.sidebarListMode,
+                        alwaysVisibleWorktreePaths: alwaysVisibleWorktreePaths
+                    )
                 }
             )
         ) {