feat: Add sidebar visibility toggles for Tags and Worktrees

Persist the new settings in user defaults, cloud settings documents, and the settings snapshot with sync conflict display and reset defaults.

Author: Tranthanh98

macgit/App/AppState.swift

@@ -26,6 +26,8 @@ final class AppState: ObservableObject {
     private static let showWorkspaceReflogKey = "showWorkspaceReflog"
     private static let showWorkspacePullRequestsKey = "showWorkspacePullRequests"
     private static let showWorkspaceGitLFSKey = "showWorkspaceGitLFS"
+    private static let showTagsKey = "showTags"
+    private static let showWorktreesKey = "showWorktrees"
     private static let showSubmodulesKey = "showSubmodules"
     private static let showSubtreesKey = "showSubtrees"
     private static let showHeaderBranchButtonKey = "showHeaderBranchButton"
@@ -99,6 +101,22 @@ final class AppState: ObservableObject {
             }
         }
     }
+    @Published var showTags: Bool {
+        didSet {
+            userDefaults.set(showTags, forKey: Self.showTagsKey)
+            if !isApplyingSnapshot {
+                currentSettingsSnapshot = snapshot
+            }
+        }
+    }
+    @Published var showWorktrees: Bool {
+        didSet {
+            userDefaults.set(showWorktrees, forKey: Self.showWorktreesKey)
+            if !isApplyingSnapshot {
+                currentSettingsSnapshot = snapshot
+            }
+        }
+    }
     @Published var showSubmodules: Bool {
         didSet {
             userDefaults.set(showSubmodules, forKey: Self.showSubmodulesKey)
@@ -262,6 +280,8 @@ final class AppState: ObservableObject {
         let showWorkspaceReflog = userDefaults.object(forKey: Self.showWorkspaceReflogKey) as? Bool ?? true
         let showWorkspacePullRequests = userDefaults.object(forKey: Self.showWorkspacePullRequestsKey) as? Bool ?? true
         let showWorkspaceGitLFS = userDefaults.object(forKey: Self.showWorkspaceGitLFSKey) as? Bool ?? true
+        let showTags = userDefaults.object(forKey: Self.showTagsKey) as? Bool ?? true
+        let showWorktrees = userDefaults.object(forKey: Self.showWorktreesKey) as? Bool ?? true
         let showSubmodules = userDefaults.object(forKey: Self.showSubmodulesKey) as? Bool ?? false
         let showSubtrees = userDefaults.object(forKey: Self.showSubtreesKey) as? Bool ?? false
         let showHeaderBranchButton = userDefaults.object(forKey: Self.showHeaderBranchButtonKey) as? Bool ?? true
@@ -294,6 +314,8 @@ final class AppState: ObservableObject {
             showWorkspaceReflog: showWorkspaceReflog,
             showWorkspacePullRequests: showWorkspacePullRequests,
             showWorkspaceGitLFS: showWorkspaceGitLFS,
+            showTags: showTags,
+            showWorktrees: showWorktrees,
             showSubmodules: showSubmodules,
             showSubtrees: showSubtrees,
             showHeaderBranchButton: showHeaderBranchButton,
@@ -317,6 +339,8 @@ final class AppState: ObservableObject {
         self.showWorkspaceReflog = showWorkspaceReflog
         self.showWorkspacePullRequests = showWorkspacePullRequests
         self.showWorkspaceGitLFS = showWorkspaceGitLFS
+        self.showTags = showTags
+        self.showWorktrees = showWorktrees
         self.showSubmodules = showSubmodules
         self.showSubtrees = showSubtrees
         self.showHeaderBranchButton = showHeaderBranchButton
@@ -347,6 +371,8 @@ final class AppState: ObservableObject {
             showWorkspaceReflog: showWorkspaceReflog,
             showWorkspacePullRequests: showWorkspacePullRequests,
             showWorkspaceGitLFS: showWorkspaceGitLFS,
+            showTags: showTags,
+            showWorktrees: showWorktrees,
             showSubmodules: showSubmodules,
             showSubtrees: showSubtrees,
             showHeaderBranchButton: showHeaderBranchButton,
@@ -375,6 +401,8 @@ final class AppState: ObservableObject {
         showWorkspaceReflog = snapshot.showWorkspaceReflog
         showWorkspacePullRequests = snapshot.showWorkspacePullRequests
         showWorkspaceGitLFS = snapshot.showWorkspaceGitLFS
+        showTags = snapshot.showTags
+        showWorktrees = snapshot.showWorktrees
         showSubmodules = snapshot.showSubmodules
         showSubtrees = snapshot.showSubtrees
         showHeaderBranchButton = snapshot.showHeaderBranchButton

macgit/Models/AppSettingsSnapshot.swift

@@ -26,6 +26,8 @@ struct AppSettingsSnapshot: Codable, Equatable, Sendable {
     var showWorkspaceReflog: Bool
     var showWorkspacePullRequests: Bool
     var showWorkspaceGitLFS: Bool
+    var showTags: Bool
+    var showWorktrees: Bool
     var showSubmodules: Bool
     var showSubtrees: Bool
     var showHeaderBranchButton: Bool
@@ -49,6 +51,8 @@ struct AppSettingsSnapshot: Codable, Equatable, Sendable {
         showWorkspaceReflog: Bool = true,
         showWorkspacePullRequests: Bool = true,
         showWorkspaceGitLFS: Bool = true,
+        showTags: Bool = true,
+        showWorktrees: Bool = true,
         showSubmodules: Bool,
         showSubtrees: Bool,
         showHeaderBranchButton: Bool = true,
@@ -72,6 +76,8 @@ struct AppSettingsSnapshot: Codable, Equatable, Sendable {
         self.showWorkspaceReflog = showWorkspaceReflog
         self.showWorkspacePullRequests = showWorkspacePullRequests
         self.showWorkspaceGitLFS = showWorkspaceGitLFS
+        self.showTags = showTags
+        self.showWorktrees = showWorktrees
         self.showSubmodules = showSubmodules
         self.showSubtrees = showSubtrees
         self.showHeaderBranchButton = showHeaderBranchButton
@@ -98,6 +104,8 @@ struct AppSettingsSnapshot: Codable, Equatable, Sendable {
         showWorkspaceReflog = try container.decodeIfPresent(Bool.self, forKey: .showWorkspaceReflog) ?? true
         showWorkspacePullRequests = try container.decodeIfPresent(Bool.self, forKey: .showWorkspacePullRequests) ?? true
         showWorkspaceGitLFS = try container.decodeIfPresent(Bool.self, forKey: .showWorkspaceGitLFS) ?? true
+        showTags = try container.decodeIfPresent(Bool.self, forKey: .showTags) ?? true
+        showWorktrees = try container.decodeIfPresent(Bool.self, forKey: .showWorktrees) ?? true
         showSubmodules = try container.decode(Bool.self, forKey: .showSubmodules)
         showSubtrees = try container.decode(Bool.self, forKey: .showSubtrees)
         showHeaderBranchButton = try container.decode(Bool.self, forKey: .showHeaderBranchButton)

macgit/Services/FirestoreSettingsStore.swift

@@ -32,6 +32,8 @@ enum CloudSettingsDocument {
             "showWorkspaceReflog": snapshot.showWorkspaceReflog,
             "showWorkspacePullRequests": snapshot.showWorkspacePullRequests,
             "showWorkspaceGitLFS": snapshot.showWorkspaceGitLFS,
+            "showTags": snapshot.showTags,
+            "showWorktrees": snapshot.showWorktrees,
             "showSubmodules": snapshot.showSubmodules,
             "showSubtrees": snapshot.showSubtrees,
             "showHeaderBranchButton": snapshot.showHeaderBranchButton,
@@ -81,6 +83,8 @@ enum CloudSettingsDocument {
             showWorkspaceReflog: data["showWorkspaceReflog"] as? Bool ?? true,
             showWorkspacePullRequests: data["showWorkspacePullRequests"] as? Bool ?? true,
             showWorkspaceGitLFS: data["showWorkspaceGitLFS"] as? Bool ?? true,
+            showTags: data["showTags"] as? Bool ?? true,
+            showWorktrees: data["showWorktrees"] as? Bool ?? true,
             showSubmodules: showSubmodules,
             showSubtrees: showSubtrees,
             showHeaderBranchButton: data["showHeaderBranchButton"] as? Bool ?? true,

macgit/Views/Account/ManageAccountSheet.swift

@@ -221,6 +221,8 @@ struct SettingsSyncConflictSheet: View {
                 settingRow("Workspace: Pull Requests", enabled: snapshot.showWorkspacePullRequests)
                 settingRow("Workspace: Git LFS", enabled: snapshot.showWorkspaceGitLFS)
                 settingRow("Workspace: Git Flow", enabled: snapshot.showGitFlow)
+                settingRow("Tags section", enabled: snapshot.showTags)
+                settingRow("Worktrees section", enabled: snapshot.showWorktrees)
                 settingRow("Submodules", enabled: snapshot.showSubmodules)
                 settingRow("Subtrees", enabled: snapshot.showSubtrees)
                 settingRow("Header: Branch", enabled: snapshot.showHeaderBranchButton)

macgit/Views/Common/GeneralSettingsView.swift

@@ -34,6 +34,18 @@ struct GeneralSettingsView: View {
             }
 
             Section {
+                SettingsToggleRow(
+                    title: "Show Tags",
+                    detail: "Include tags as a dedicated section in the repository sidebar.",
+                    isOn: $appState.showTags
+                )
+
+                SettingsToggleRow(
+                    title: "Show Worktrees",
+                    detail: "Include worktrees as a dedicated section in the repository sidebar.",
+                    isOn: $appState.showWorktrees
+                )
+
                 SettingsToggleRow(
                     title: "Show Git Flow",
                     detail: "Include Git Flow in the Workspace section of the repository sidebar.",
@@ -128,6 +140,8 @@ struct GeneralSettingsView: View {
         appState.showWorkspaceReflog = true
         appState.showWorkspacePullRequests = true
         appState.showWorkspaceGitLFS = true
+        appState.showTags = true
+        appState.showWorktrees = true
         appState.showSubmodules = false
         appState.showSubtrees = false
         appState.historyIncludeRemotes = false

macgit/Views/MainWindow/SidebarView.swift

@@ -756,6 +756,12 @@ struct SidebarView: View {
     private var sidebarContextMenu: some View {
         sidebarCreationMenu
         Divider()
+        Toggle(isOn: $appState.showTags) {
+            Label("Show Tags", systemImage: "tag")
+        }
+        Toggle(isOn: $appState.showWorktrees) {
+            Label("Show Worktrees", systemImage: "rectangle.3.group")
+        }
         Toggle(isOn: $appState.showSubmodules) {
             Label("Show Submodules", systemImage: "folder.badge.gearshape")
         }
@@ -802,25 +808,29 @@ struct SidebarView: View {
             actions: branchSectionActions
         )
 
-        SidebarWorktreesSection(
-            currentRepositoryURL: repositoryURL,
-            entries: worktreeEntries,
-            isExpanded: sectionStates.worktreesExpanded,
-            isLoading: isLoadingWorktrees,
-            onOpenInNewWindow: onRequestOpenWorktree,
-            actions: worktreeSectionActions
-        )
+        if appState.showWorktrees {
+            SidebarWorktreesSection(
+                currentRepositoryURL: repositoryURL,
+                entries: worktreeEntries,
+                isExpanded: sectionStates.worktreesExpanded,
+                isLoading: isLoadingWorktrees,
+                onOpenInNewWindow: onRequestOpenWorktree,
+                actions: worktreeSectionActions
+            )
+        }
 
-        SidebarTagsSection(
-            rows: visibleTagRows,
-            isExpanded: sectionStates.tagsExpanded,
-            isLoading: isLoadingTags,
-            expandedFolders: expandedTagFolders,
-            remoteNames: remoteNames,
-            isHeaderDropTargeted: activeDropTarget == .tagsHeader,
-            activeDropLabel: activeDropTarget == .tagsHeader ? activeDropLabel : nil,
-            actions: tagSectionActions
-        )
+        if appState.showTags {
+            SidebarTagsSection(
+                rows: visibleTagRows,
+                isExpanded: sectionStates.tagsExpanded,
+                isLoading: isLoadingTags,
+                expandedFolders: expandedTagFolders,
+                remoteNames: remoteNames,
+                isHeaderDropTargeted: activeDropTarget == .tagsHeader,
+                activeDropLabel: activeDropTarget == .tagsHeader ? activeDropLabel : nil,
+                actions: tagSectionActions
+            )
+        }
 
         SidebarRemotesSection(
             rows: visibleRemoteRows,

macgitTests/AppSettingsSnapshotTests.swift

@@ -29,6 +29,8 @@ final class AppSettingsSnapshotTests: XCTestCase {
             showWorkspaceReflog: false,
             showWorkspacePullRequests: true,
             showWorkspaceGitLFS: false,
+            showTags: false,
+            showWorktrees: true,
             showSubmodules: true,
             showSubtrees: true,
             showHeaderBranchButton: false,
@@ -61,6 +63,8 @@ final class AppSettingsSnapshotTests: XCTestCase {
                 "showWorkspaceReflog",
                 "showWorkspacePullRequests",
                 "showWorkspaceGitLFS",
+                "showTags",
+                "showWorktrees",
                 "showSubmodules",
                 "showSubtrees",
                 "showHeaderBranchButton",
@@ -124,6 +128,28 @@ final class AppSettingsSnapshotTests: XCTestCase {
         XCTAssertTrue(decoded.showWorkspaceGitLFS)
     }
 
+    func testSnapshotDecodingDefaultsMissingTagsAndWorktreesVisibilityToTrue() throws {
+        let snapshot = AppSettingsSnapshot(
+            showToolbarButtonText: true,
+            showTags: false,
+            showWorktrees: false,
+            showSubmodules: false,
+            showSubtrees: false
+        )
+        let encoded = try JSONEncoder().encode(snapshot)
+        var object = try XCTUnwrap(JSONSerialization.jsonObject(with: encoded) as? [String: Any])
+        object.removeValue(forKey: "showTags")
+        object.removeValue(forKey: "showWorktrees")
+
+        let decoded = try JSONDecoder().decode(
+            AppSettingsSnapshot.self,
+            from: JSONSerialization.data(withJSONObject: object)
+        )
+
+        XCTAssertTrue(decoded.showTags)
+        XCTAssertTrue(decoded.showWorktrees)
+    }
+
     func testAppStateApplyChangesOnlyApprovedSettings() {
         let suiteName = "AppSettingsSnapshotTests.\(UUID().uuidString)"
         let defaults = UserDefaults(suiteName: suiteName)!
@@ -219,6 +245,25 @@ final class AppSettingsSnapshotTests: XCTestCase {
         XCTAssertFalse(reloaded.snapshot.showWorkspaceGitLFS)
     }
 
+    func testTagsAndWorktreesVisibilityDefaultsOnAndPersistsLocally() {
+        let suiteName = "AppSettingsSnapshotTests.\(UUID().uuidString)"
+        let defaults = UserDefaults(suiteName: suiteName)!
+        defer { defaults.removePersistentDomain(forName: suiteName) }
+
+        let state = AppState(userDefaults: defaults)
+        XCTAssertTrue(state.showTags)
+        XCTAssertTrue(state.showWorktrees)
+
+        state.showTags = false
+        state.showWorktrees = false
+
+        let reloaded = AppState(userDefaults: defaults)
+        XCTAssertFalse(reloaded.showTags)
+        XCTAssertFalse(reloaded.showWorktrees)
+        XCTAssertFalse(reloaded.snapshot.showTags)
+        XCTAssertFalse(reloaded.snapshot.showWorktrees)
+    }
+
     func testSearchFilterIsDeviceLocalAndPersisted() {
         let suiteName = "AppSettingsSnapshotTests.\(UUID().uuidString)"
         let defaults = UserDefaults(suiteName: suiteName)!

macgitTests/CloudSettingsDocumentTests.swift

@@ -28,6 +28,8 @@ final class CloudSettingsDocumentTests: XCTestCase {
         showWorkspaceReflog: false,
         showWorkspacePullRequests: true,
         showWorkspaceGitLFS: false,
+        showTags: false,
+        showWorktrees: true,
         showSubmodules: true,
         showSubtrees: false,
         showHeaderBranchButton: true,
@@ -60,6 +62,8 @@ final class CloudSettingsDocumentTests: XCTestCase {
                 "showWorkspaceReflog",
                 "showWorkspacePullRequests",
                 "showWorkspaceGitLFS",
+                "showTags",
+                "showWorktrees",
                 "showSubmodules",
                 "showSubtrees",
                 "showHeaderBranchButton",
@@ -85,6 +89,8 @@ final class CloudSettingsDocumentTests: XCTestCase {
         XCTAssertEqual(document["showWorkspaceReflog"] as? Bool, false)
         XCTAssertEqual(document["showWorkspacePullRequests"] as? Bool, true)
         XCTAssertEqual(document["showWorkspaceGitLFS"] as? Bool, false)
+        XCTAssertEqual(document["showTags"] as? Bool, false)
+        XCTAssertEqual(document["showWorktrees"] as? Bool, true)
         XCTAssertEqual(document["showSubmodules"] as? Bool, true)
         XCTAssertEqual(document["showSubtrees"] as? Bool, false)
         XCTAssertEqual(document["showHeaderBranchButton"] as? Bool, true)
@@ -142,6 +148,17 @@ final class CloudSettingsDocumentTests: XCTestCase {
         XCTAssertTrue(decoded.showWorkspaceGitLFS)
     }
 
+    func testDecodingDefaultsMissingTagsAndWorktreesVisibilityToTrue() throws {
+        var document = validDocument()
+        document.removeValue(forKey: "showTags")
+        document.removeValue(forKey: "showWorktrees")
+
+        let decoded = try CloudSettingsDocument.decode(document)
+
+        XCTAssertTrue(decoded.showTags)
+        XCTAssertTrue(decoded.showWorktrees)
+    }
+
     func testDecodingDefaultsMissingHistoryFilterSettings() throws {
         var document = validDocument()
         document.removeValue(forKey: "historyBranchFilter")