feat: Add workspace visibility settings for reflog, PRs, and Git LFS

Expose toggles in a new WorkspaceVisibilityPopover and persist them through AppState, settings snapshots, and Firestore cloud sync.

Author: Tranthanh98

macgit/App/AppState.swift

@@ -23,6 +23,9 @@ final class AppState: ObservableObject {
     private static let appearanceKey = "appearance"
     private static let showToolbarButtonTextKey = "showToolbarButtonText"
     private static let showGitFlowKey = "showGitFlow"
+    private static let showWorkspaceReflogKey = "showWorkspaceReflog"
+    private static let showWorkspacePullRequestsKey = "showWorkspacePullRequests"
+    private static let showWorkspaceGitLFSKey = "showWorkspaceGitLFS"
     private static let showSubmodulesKey = "showSubmodules"
     private static let showSubtreesKey = "showSubtrees"
     private static let showHeaderBranchButtonKey = "showHeaderBranchButton"
@@ -72,6 +75,30 @@ final class AppState: ObservableObject {
             }
         }
     }
+    @Published var showWorkspaceReflog: Bool {
+        didSet {
+            userDefaults.set(showWorkspaceReflog, forKey: Self.showWorkspaceReflogKey)
+            if !isApplyingSnapshot {
+                currentSettingsSnapshot = snapshot
+            }
+        }
+    }
+    @Published var showWorkspacePullRequests: Bool {
+        didSet {
+            userDefaults.set(showWorkspacePullRequests, forKey: Self.showWorkspacePullRequestsKey)
+            if !isApplyingSnapshot {
+                currentSettingsSnapshot = snapshot
+            }
+        }
+    }
+    @Published var showWorkspaceGitLFS: Bool {
+        didSet {
+            userDefaults.set(showWorkspaceGitLFS, forKey: Self.showWorkspaceGitLFSKey)
+            if !isApplyingSnapshot {
+                currentSettingsSnapshot = snapshot
+            }
+        }
+    }
     @Published var showSubmodules: Bool {
         didSet {
             userDefaults.set(showSubmodules, forKey: Self.showSubmodulesKey)
@@ -232,6 +259,9 @@ final class AppState: ObservableObject {
             .flatMap(AppAppearance.init(rawValue:)) ?? .system
         let showToolbarButtonText = userDefaults.object(forKey: Self.showToolbarButtonTextKey) as? Bool ?? true
         let showGitFlow = userDefaults.object(forKey: Self.showGitFlowKey) as? Bool ?? true
+        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 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
@@ -261,6 +291,9 @@ final class AppState: ObservableObject {
             appearance: appearance,
             showToolbarButtonText: showToolbarButtonText,
             showGitFlow: showGitFlow,
+            showWorkspaceReflog: showWorkspaceReflog,
+            showWorkspacePullRequests: showWorkspacePullRequests,
+            showWorkspaceGitLFS: showWorkspaceGitLFS,
             showSubmodules: showSubmodules,
             showSubtrees: showSubtrees,
             showHeaderBranchButton: showHeaderBranchButton,
@@ -281,6 +314,9 @@ final class AppState: ObservableObject {
         self.appearance = appearance
         self.showToolbarButtonText = showToolbarButtonText
         self.showGitFlow = showGitFlow
+        self.showWorkspaceReflog = showWorkspaceReflog
+        self.showWorkspacePullRequests = showWorkspacePullRequests
+        self.showWorkspaceGitLFS = showWorkspaceGitLFS
         self.showSubmodules = showSubmodules
         self.showSubtrees = showSubtrees
         self.showHeaderBranchButton = showHeaderBranchButton
@@ -308,6 +344,9 @@ final class AppState: ObservableObject {
             appearance: appearance,
             showToolbarButtonText: showToolbarButtonText,
             showGitFlow: showGitFlow,
+            showWorkspaceReflog: showWorkspaceReflog,
+            showWorkspacePullRequests: showWorkspacePullRequests,
+            showWorkspaceGitLFS: showWorkspaceGitLFS,
             showSubmodules: showSubmodules,
             showSubtrees: showSubtrees,
             showHeaderBranchButton: showHeaderBranchButton,
@@ -333,6 +372,9 @@ final class AppState: ObservableObject {
         appearance = snapshot.appearance
         showToolbarButtonText = snapshot.showToolbarButtonText
         showGitFlow = snapshot.showGitFlow
+        showWorkspaceReflog = snapshot.showWorkspaceReflog
+        showWorkspacePullRequests = snapshot.showWorkspacePullRequests
+        showWorkspaceGitLFS = snapshot.showWorkspaceGitLFS
         showSubmodules = snapshot.showSubmodules
         showSubtrees = snapshot.showSubtrees
         showHeaderBranchButton = snapshot.showHeaderBranchButton

macgit/Models/AppSettingsSnapshot.swift

@@ -23,6 +23,9 @@ struct AppSettingsSnapshot: Codable, Equatable, Sendable {
     var appearance: AppAppearance
     var showToolbarButtonText: Bool
     var showGitFlow: Bool
+    var showWorkspaceReflog: Bool
+    var showWorkspacePullRequests: Bool
+    var showWorkspaceGitLFS: Bool
     var showSubmodules: Bool
     var showSubtrees: Bool
     var showHeaderBranchButton: Bool
@@ -43,6 +46,9 @@ struct AppSettingsSnapshot: Codable, Equatable, Sendable {
         appearance: AppAppearance = .system,
         showToolbarButtonText: Bool,
         showGitFlow: Bool = true,
+        showWorkspaceReflog: Bool = true,
+        showWorkspacePullRequests: Bool = true,
+        showWorkspaceGitLFS: Bool = true,
         showSubmodules: Bool,
         showSubtrees: Bool,
         showHeaderBranchButton: Bool = true,
@@ -63,6 +69,9 @@ struct AppSettingsSnapshot: Codable, Equatable, Sendable {
         self.appearance = appearance
         self.showToolbarButtonText = showToolbarButtonText
         self.showGitFlow = showGitFlow
+        self.showWorkspaceReflog = showWorkspaceReflog
+        self.showWorkspacePullRequests = showWorkspacePullRequests
+        self.showWorkspaceGitLFS = showWorkspaceGitLFS
         self.showSubmodules = showSubmodules
         self.showSubtrees = showSubtrees
         self.showHeaderBranchButton = showHeaderBranchButton
@@ -86,6 +95,9 @@ struct AppSettingsSnapshot: Codable, Equatable, Sendable {
         appearance = try container.decode(AppAppearance.self, forKey: .appearance)
         showToolbarButtonText = try container.decode(Bool.self, forKey: .showToolbarButtonText)
         showGitFlow = try container.decodeIfPresent(Bool.self, forKey: .showGitFlow) ?? true
+        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
         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

@@ -29,6 +29,9 @@ enum CloudSettingsDocument {
             "appearance": snapshot.appearance.rawValue,
             "showToolbarButtonText": snapshot.showToolbarButtonText,
             "showGitFlow": snapshot.showGitFlow,
+            "showWorkspaceReflog": snapshot.showWorkspaceReflog,
+            "showWorkspacePullRequests": snapshot.showWorkspacePullRequests,
+            "showWorkspaceGitLFS": snapshot.showWorkspaceGitLFS,
             "showSubmodules": snapshot.showSubmodules,
             "showSubtrees": snapshot.showSubtrees,
             "showHeaderBranchButton": snapshot.showHeaderBranchButton,
@@ -75,6 +78,9 @@ enum CloudSettingsDocument {
             appearance: appearance,
             showToolbarButtonText: showToolbarButtonText,
             showGitFlow: data["showGitFlow"] as? Bool ?? true,
+            showWorkspaceReflog: data["showWorkspaceReflog"] as? Bool ?? true,
+            showWorkspacePullRequests: data["showWorkspacePullRequests"] as? Bool ?? true,
+            showWorkspaceGitLFS: data["showWorkspaceGitLFS"] as? Bool ?? true,
             showSubmodules: showSubmodules,
             showSubtrees: showSubtrees,
             showHeaderBranchButton: data["showHeaderBranchButton"] as? Bool ?? true,

macgit/Views/Account/ManageAccountSheet.swift

@@ -217,7 +217,10 @@ struct SettingsSyncConflictSheet: View {
             Grid(alignment: .leading, horizontalSpacing: 16, verticalSpacing: 8) {
                 settingValueRow("Appearance", value: snapshot.appearance.title)
                 settingRow("Toolbar button text", enabled: snapshot.showToolbarButtonText)
-                settingRow("Git Flow", enabled: snapshot.showGitFlow)
+                settingRow("Workspace: Reflog", enabled: snapshot.showWorkspaceReflog)
+                settingRow("Workspace: Pull Requests", enabled: snapshot.showWorkspacePullRequests)
+                settingRow("Workspace: Git LFS", enabled: snapshot.showWorkspaceGitLFS)
+                settingRow("Workspace: Git Flow", enabled: snapshot.showGitFlow)
                 settingRow("Submodules", enabled: snapshot.showSubmodules)
                 settingRow("Subtrees", enabled: snapshot.showSubtrees)
                 settingRow("Header: Branch", enabled: snapshot.showHeaderBranchButton)

macgit/Views/Common/GeneralSettingsView.swift

@@ -36,10 +36,28 @@ struct GeneralSettingsView: View {
             Section {
                 SettingsToggleRow(
                     title: "Show Git Flow",
-                    detail: "Include Git Flow workflow actions as a dedicated repository sidebar section.",
+                    detail: "Include Git Flow in the Workspace section of the repository sidebar.",
                     isOn: $appState.showGitFlow
                 )
 
+                SettingsToggleRow(
+                    title: "Show Reflog",
+                    detail: "Include Reflog in the Workspace section of the repository sidebar.",
+                    isOn: $appState.showWorkspaceReflog
+                )
+
+                SettingsToggleRow(
+                    title: "Show Pull Requests",
+                    detail: "Include Pull Requests in the Workspace section of the repository sidebar.",
+                    isOn: $appState.showWorkspacePullRequests
+                )
+
+                SettingsToggleRow(
+                    title: "Show Git LFS",
+                    detail: "Include Git LFS in the Workspace section of the repository sidebar.",
+                    isOn: $appState.showWorkspaceGitLFS
+                )
+
                 SettingsToggleRow(
                     title: "Show submodules",
                     detail: "Include Git submodules as a dedicated section in the repository sidebar.",
@@ -107,6 +125,9 @@ struct GeneralSettingsView: View {
     private func restoreDefaults() {
         appState.fitRepositoryWindowsToScreen = false
         appState.showGitFlow = true
+        appState.showWorkspaceReflog = true
+        appState.showWorkspacePullRequests = true
+        appState.showWorkspaceGitLFS = true
         appState.showSubmodules = false
         appState.showSubtrees = false
         appState.historyIncludeRemotes = false

macgit/Views/MainWindow/Sidebar/SidebarWorkspaceSection.swift

@@ -19,11 +19,12 @@
 import SwiftUI
 
 struct SidebarWorkspaceSection: View {
+    @ObservedObject var appState: AppState
     let onRequestSearch: () -> Void
     let onRequestCreatePullRequest: () -> Void
-    let showGitFlow: Bool
     let gitFlowCommandState: GitFlowCommandState
     let onGitFlowAction: (GitFlowMenuAction) -> Void
+    @State private var isShowingVisibilityPopover = false
 
     var body: some View {
         Section {
@@ -41,12 +42,25 @@ struct SidebarWorkspaceSection: View {
                 .accessibilityElement(children: .combine)
 
                 Spacer()
+
+                Button("Customize Workspace", systemImage: "line.3.horizontal.decrease.circle") {
+                    isShowingVisibilityPopover.toggle()
+                }
+                .labelStyle(.iconOnly)
+                .buttonStyle(.plain)
+                .foregroundStyle(.secondary)
+                .padding(.trailing, 8)
+                .help("Choose which Workspace items are shown")
+                .sidebarPointingHandCursor()
+                .popover(isPresented: $isShowingVisibilityPopover, arrowEdge: .trailing) {
+                    WorkspaceVisibilityPopover(appState: appState)
+                }
             }
             .padding(.vertical, 2)
             .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
 
             ForEach(SidebarSection.workspace.items) { item in
-                if item == .search {
+                if isVisible(item), item == .search {
                     Label(item.rawValue, systemImage: item.icon)
                         .padding(.leading, 6)
                         .frame(maxWidth: .infinity, alignment: .leading)
@@ -55,7 +69,7 @@ struct SidebarWorkspaceSection: View {
                             onRequestSearch()
                         }
                         .sidebarPointingHandCursor()
-                } else {
+                } else if isVisible(item) {
                     Label(item.rawValue, systemImage: item.icon)
                         .padding(.leading, 6)
                         .tag(SidebarSelection.item(item))
@@ -68,7 +82,7 @@ struct SidebarWorkspaceSection: View {
                 }
             }
 
-            if showGitFlow {
+            if appState.showGitFlow {
                 Label(SidebarItem.gitFlow.rawValue, systemImage: SidebarItem.gitFlow.icon)
                     .padding(.leading, 6)
                     .tag(SidebarSelection.item(.gitFlow))
@@ -86,4 +100,17 @@ struct SidebarWorkspaceSection: View {
             }
         }
     }
+
+    private func isVisible(_ item: SidebarItem) -> Bool {
+        switch item {
+        case .reflog:
+            appState.showWorkspaceReflog
+        case .pullRequests:
+            appState.showWorkspacePullRequests
+        case .gitLFS:
+            appState.showWorkspaceGitLFS
+        case .fileStatus, .history, .search, .gitFlow:
+            true
+        }
+    }
 }

macgit/Views/MainWindow/Sidebar/WorkspaceVisibilityPopover.swift

@@ -0,0 +1,37 @@
+//
+//  macgit (Commit+) - a macOS Git client built with Swift and SwiftUI.
+//  Copyright (C) 2026  Thanh Tran <trantienthanh2412@gmail.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU Affero General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Affero General Public License for more details.
+//
+//  You should have received a copy of the GNU Affero General Public License
+//  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+//
+
+import SwiftUI
+
+struct WorkspaceVisibilityPopover: View {
+    @ObservedObject var appState: AppState
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 10) {
+            Text("Show in Workspace")
+                .font(.headline)
+
+            Toggle("Reflog", isOn: $appState.showWorkspaceReflog)
+            Toggle("Pull Requests", isOn: $appState.showWorkspacePullRequests)
+            Toggle("Git LFS", isOn: $appState.showWorkspaceGitLFS)
+            Toggle("Git Flow", isOn: $appState.showGitFlow)
+        }
+        .padding()
+        .frame(minWidth: 190, alignment: .leading)
+    }
+}

macgit/Views/MainWindow/SidebarView.swift

@@ -767,9 +767,9 @@ struct SidebarView: View {
     @ViewBuilder
     private var sidebarRows: some View {
         SidebarWorkspaceSection(
+            appState: appState,
             onRequestSearch: onRequestSearch,
             onRequestCreatePullRequest: onRequestCreatePullRequestFromWorkspace,
-            showGitFlow: appState.showGitFlow,
             gitFlowCommandState: gitFlowCommandState,
             onGitFlowAction: performGitFlowAction
         )