Dev/release 2.1.0

.github/workflows/build.yml

@@ -3,11 +3,11 @@ name: Build macOS App
 on:
   push:
     branches:
-      - relese
+      - release
 
   pull_request:
     branches:
-      - relese
+      - release
 
 jobs:
   build:
@@ -19,10 +19,47 @@ jobs:
       - name: Show Xcode version
         run: xcodebuild -version
 
-      - name: Build
+      - name: Optional path catalog check
+        run: |
+          if [[ -f MacOSCleaner/Resources/engine_paths.json && -f MacOSCleaner/Resources/ui_metadata.json ]]; then
+            python3 scripts/validate_engine_paths.py
+            swift scripts/generate_cleanup_paths.swift --check
+          else
+            echo "Optional catalog SoT not present — skipping pack check"
+          fi
+
+      - name: Install XcodeGen
+        run: brew install xcodegen
+
+      - name: Check XcodeGen drift
+        working-directory: MacOSCleaner
+        run: |
+          xcodegen
+          git -C .. diff --exit-code -- MacOSCleaner/MacOSCleaner.xcodeproj
+
+      - name: Isolated test suite (pass 1)
+        run: |
+          xcodebuild \
+            -project MacOSCleaner/MacOSCleaner.xcodeproj \
+            -scheme MacOSCleaner \
+            -destination 'platform=macOS' \
+            -derivedDataPath "$RUNNER_TEMP/MacOSCleaner-Test-1" \
+            test
+
+      - name: Isolated test suite (pass 2)
+        run: |
+          xcodebuild \
+            -project MacOSCleaner/MacOSCleaner.xcodeproj \
+            -scheme MacOSCleaner \
+            -destination 'platform=macOS' \
+            -derivedDataPath "$RUNNER_TEMP/MacOSCleaner-Test-2" \
+            test
+
+      - name: Release build
         run: |
           xcodebuild \
             -project MacOSCleaner/MacOSCleaner.xcodeproj \
             -scheme MacOSCleaner \
             -configuration Release \
+            -derivedDataPath "$RUNNER_TEMP/MacOSCleaner-Release" \
             build

.gitignore

@@ -120,3 +120,10 @@ xcuserdata/
 opencode.json
 .agents
 problematic_apps/
+implementation_plan.md
+
+# Protected Engine Catalogs (Local only)
+engine_paths.json
+ui_metadata.json
+MacOSCleaner/Resources/Assets.xcassets/PrivateCleanupCatalog.dataset/
+MacOSCleaner/.require-private-catalog

LICENSE

@@ -19,6 +19,17 @@ downloads, or distribution for payment), a product or service whose value
 derives, entirely or substantially, from the functionality of the Software or
 a derivative work.
 
+----------------------------------------------------------------------
+TRADEMARK & BRANDING RESTRICTIONS
+----------------------------------------------------------------------
+
+This license does not grant permission to use the trade names, trademarks,
+service marks, application icons, logo graphics, or product names of the
+Licensor (including "MacOSCleaner", "MacOS Cleaner", and associated artwork),
+except as strictly required for reasonable and customary use in describing
+the origin of the work. Any redistribution, derivative work, or modified
+version MUST remove or replace all official project branding, names, and icons.
+
 ----------------------------------------------------------------------
 GNU GENERAL PUBLIC LICENSE
 Version 3, 29 June 2007

MacOSCleaner/App/MacOSCleanerApp.swift

@@ -36,8 +36,11 @@ struct MacOSCleanerApp: App {
         let engine = CleanupEngine(commandRunner: commandRunner)
         self.cleanupViewModel = CleanupViewModel(engine: engine, journal: journal, settings: appSettings)
 
-        // Preload Launch Services cache
-        Task { await LSRegisterCache().warmup() }
+        // Preload Launch Services cache and register AppShortcuts
+        Task {
+            await LSRegisterCache().warmup()
+            MacOSCleanerShortcuts.updateAppShortcutParameters()
+        }
     }
 
     private static func installCrashHandlers() {
@@ -67,7 +70,7 @@ struct MacOSCleanerApp: App {
     }
 
     var body: some Scene {
-        WindowGroup {
+        WindowGroup("MacOS Cleaner") {
             RootView(
                 cleanupViewModel: cleanupViewModel,
                 journal: journal,
@@ -79,6 +82,7 @@ struct MacOSCleanerApp: App {
                 availableUpdate = await updateChecker.checkForUpdate()
             }
         }
+        .windowResizability(.contentMinSize)
         .commands {
             CommandGroup(replacing: .appInfo) {
                 Button("about_title".localized) {

MacOSCleaner/App/RootView.swift

@@ -5,10 +5,7 @@ import SwiftUI
 
 
 struct RootView: View {
-    @State private var selectedItem: NavigationItem? = .dashboard
-    /// Keep the sidebar visible; hiding `.windowToolbar` on Dashboard used to
-    /// collapse NavigationSplitView to detail-only on macOS 26+.
-    @State private var columnVisibility: NavigationSplitViewVisibility = .all
+    @State private var selectedItem: NavigationItem = .dashboard
     let cleanupViewModel: CleanupViewModel
     let journal: TransactionJournal
     let appSettings: AppSettings
@@ -17,41 +14,27 @@ struct RootView: View {
 
     var body: some View {
         ZStack {
-            NavigationSplitView(columnVisibility: $columnVisibility) {
-                List(selection: $selectedItem) {
-                    ForEach(SidebarSection.all) { section in
-                        Section {
-                            ForEach(section.items) { item in
-                                Label(item.localizedTitle, systemImage: item.systemImage)
-                                    .tag(item)
-                            }
-                        } header: {
-                            if let titleKey = section.titleKey {
-                                Text(titleKey.localized)
-                            }
+            VStack(spacing: 0) {
+                topNavigationBar
+
+                contentView(for: selectedItem)
+                    .navigationTitle("MacOS Cleaner")
+                    .navigationSubtitle(selectedItem.localizedSubtitle ?? "")
+                    .toolbar {
+                        ToolbarItem(placement: .automatic) {
+                            Spacer()
                         }
                     }
-                }
-                .listStyle(.sidebar)
-                .navigationTitle("app_title".localized)
-                .navigationSplitViewColumnWidth(min: 200, ideal: 240, max: 280)
-            } detail: {
-                Group {
-                    if let selectedItem {
-                        contentView(for: selectedItem)
-                            .modifier(ScreenNavigationTitleModifier(item: selectedItem))
-                    } else {
-                        Text("sidebar_select_item".localized)
-                            .foregroundColor(.secondary)
-                    }
-                }
-                .scrollEdgeEffectStyle(.hard, for: .top)
-                .frame(minWidth: 800, minHeight: 600)
+                    .frame(maxWidth: .infinity, maxHeight: .infinity)
+                    // Recreate screen content so every `.localized` string / glass layer
+                    // matches the selected language (prevents stale RU labels in EN/FR/…).
+                    .id(appSettings.language)
             }
-            .navigationSplitViewStyle(.balanced)
 
             GlassOverlayView(manager: GlassOverlayManager.shared)
         }
+        .frame(minWidth: 1024, minHeight: 680)
+        .environment(\.locale, appSettings.language.locale)
         .sheet(isPresented: $permissionsManager.showGuidance) {
             PermissionsView(permissionsManager: permissionsManager)
         }
@@ -64,6 +47,81 @@ struct RootView: View {
         }
     }
 
+    // MARK: - Navigation Groups
+    private let navGroups: [[NavigationItem]] = [
+        [.dashboard],
+        [.cleanup, .diskSpace, .duplicates, .uninstaller],
+        [.processes, .startupServices],
+        [.settings]
+    ]
+
+    private var topNavigationBar: some View {
+        HStack(spacing: 0) {
+            ForEach(navGroups.indices, id: \.self) { groupIndex in
+                let group = navGroups[groupIndex]
+
+                HStack(spacing: 2) {
+                    ForEach(group, id: \.self) { item in
+                        navButton(for: item)
+                    }
+                }
+
+                if groupIndex < navGroups.count - 1 {
+                    Divider()
+                        .frame(height: 18)
+                        .opacity(0.4)
+                        .padding(.horizontal, 4)
+                }
+            }
+        }
+        .padding(.horizontal, 4)
+        .padding(.vertical, 3)
+        .glassEffect(Glass.regular, in: RoundedRectangle(cornerRadius: 12))
+        .id(appSettings.language)
+        .frame(maxWidth: .infinity)
+        .padding(.horizontal, 12)
+        .padding(.top, 4)
+        .padding(.bottom, 6)
+    }
+
+    @ViewBuilder
+    private func navButton(for item: NavigationItem) -> some View {
+        let isSelected = selectedItem == item
+        Button {
+            withAnimation(.spring(response: 0.28, dampingFraction: 0.8)) {
+                selectedItem = item
+            }
+        } label: {
+            HStack(spacing: 6) {
+                Image(systemName: item.systemImage)
+                    .font(.system(size: 15, weight: .medium))
+                    .frame(width: 22, height: 22)
+                // Compact on all locales: label only for the selected item.
+                if isSelected {
+                    Text(item.localizedTitle)
+                        .font(.system(size: 12, weight: .medium))
+                        .lineLimit(1)
+                        .fixedSize(horizontal: true, vertical: false)
+                }
+            }
+            .padding(.horizontal, isSelected ? 10 : 9)
+            .padding(.vertical, 6)
+            .frame(minWidth: isSelected ? nil : 40, minHeight: 32)
+            .contentShape(Rectangle())
+            .foregroundStyle(isSelected ? Color.white : Color.primary.opacity(0.6))
+            .background {
+                if isSelected {
+                    Capsule()
+                        .fill(Color.accentColor)
+                        .glassEffect(Glass.regular.tint(Color.accentColor).interactive(), in: Capsule())
+                }
+            }
+        }
+        .buttonStyle(.plain)
+        .help(item.localizedTitle)
+    }
+
+
     @ViewBuilder
     private func contentView(for item: NavigationItem) -> some View {
         switch item {
@@ -73,6 +131,8 @@ struct RootView: View {
             CleanupView(viewModel: cleanupViewModel)
         case .diskSpace:
             DiskAnalyzerView(settings: appSettings)
+        case .duplicates:
+            DuplicatesView()
         case .processes:
             ProcessesView(settings: appSettings)
         case .startupServices:
@@ -94,22 +154,7 @@ struct RootView: View {
     }
 }
 
-private struct ScreenNavigationTitleModifier: ViewModifier {
-    let item: NavigationItem
 
-    func body(content: Content) -> some View {
-        if item == .dashboard {
-            // Keep the window toolbar (sidebar toggle lives there). Only drop the
-            // detail title so Dashboard stays chrome-light without collapsing the split.
-            content
-                .navigationTitle("")
-                .toolbar(removing: .title)
-        } else {
-            content
-                .navigationTitle(item.localizedTitle)
-        }
-    }
-}
 
 #Preview {
     let journal = TransactionJournal()

MacOSCleaner/Domains/Cleanup/CleanupCategory+FixtureMapping.swift

@@ -70,6 +70,7 @@ extension CleanupCategory {
             labels.insert("Orphaned files")
         case .largeFiles:
             labels.insert("Large files")
+            labels.insert("Large Files")
         case .dynamicCacheDiscovery:
             labels.formUnion(["Dynamic cache discovery", "Auto-cleanable", "Review manually"])
         case .timeMachineSnapshots:
@@ -127,6 +128,10 @@ extension CleanupCategory {
             labels.insert("Garmin / Fitbit")
         case .oldBackups:
             labels.insert("Old Backups")
+        case .aiModels:
+            labels.insert("AI Models")
+        case .installerPackages:
+            labels.insert("Installer Packages")
         case .dnsFlush:
             labels.insert("DNS Cache")
         case .fontCache: