Skip to content

Free, open-source macOS cleaner. CleanMyMac alternative with zero telemetry. Native SwiftUI, scheduled auto-cleaning, Xcode/Homebrew/system cache cleanup. MIT licensed.

fix(xcode): require manual selection for MCP DerivedData

Лукьянов Михаил Владимирович7410b1a974d7
diff --git a/PureMac/Services/ScanEngine.swift b/PureMac/Services/ScanEngine.swift
index d99b992..d70133b 100644
--- a/PureMac/Services/ScanEngine.swift
+++ b/PureMac/Services/ScanEngine.swift
@@ -483,9 +483,8 @@ actor ScanEngine {
}
}
- // XcodeBuildMCP DerivedData follows ordinary Xcode DerivedData
- // selection semantics. Scheduled cleanup applies an additional age and
- // lifecycle-lock guard in AppState before including these rows.
+ // XcodeBuildMCP DerivedData requires explicit user selection.
+ // Scheduled cleanup also applies age and lifecycle-lock guards.
let homeURL = URL(fileURLWithPath: home, isDirectory: true)
for discovered in XcodeBuildMCPDerivedDataSupport.discoverDerivedDataDirectories(
homeDirectory: homeURL,
@@ -495,7 +494,7 @@ actor ScanEngine {
name: discovered.name,
path: discovered.url.path,
category: .xcodeJunk,
- isSelected: true
+ isSelected: false
) {
items.append(item)
}
diff --git a/PureMac/ViewModels/AppState.swift b/PureMac/ViewModels/AppState.swift
index c9e626e..736f51d 100644
--- a/PureMac/ViewModels/AppState.swift
+++ b/PureMac/ViewModels/AppState.swift
@@ -931,12 +931,13 @@ final class AppState: ObservableObject {
let itemsToClean = allResults.flatMap { $0.items }.filter { item in
guard itemIDs?.contains(item.id) ?? true else { return false }
+ guard isItemSelected(item) else { return false }
if scheduled && XcodeBuildMCPDerivedDataSupport.isManagedDerivedDataPath(item.path) {
// Scheduled XcodeBuildMCP cleanup is intentionally stricter
// than ordinary Xcode Junk: only old, unlocked rows qualify.
return XcodeBuildMCPDerivedDataSupport.isEligibleForScheduledAutoClean(item)
}
- return isItemSelected(item)
+ return true
}
guard !itemsToClean.isEmpty else { return }
let generation = UUID()
diff --git a/PureMacTests/AppStateTests.swift b/PureMacTests/AppStateTests.swift
index db8fab0..c2ce09c 100644
--- a/PureMacTests/AppStateTests.swift
+++ b/PureMacTests/AppStateTests.swift
@@ -116,6 +116,35 @@ final class AppStateTests: XCTestCase {
XCTAssertEqual(state.scanState, .completed)
}
+ func testManagedDerivedDataRequiresManualSelectionEvenForScheduledCleanup() {
+ let state = AppState(performStartupTasks: false)
+ let item = CleanableItem(
+ name: "XcodeBuildMCP: Fixture",
+ path: XcodeBuildMCPDerivedDataSupport.managedRoot()
+ .appendingPathComponent("workspaces/Fixture-\(UUID().uuidString)/DerivedData").path,
+ size: 4_096,
+ category: .xcodeJunk,
+ isSelected: false,
+ lastModified: .distantPast
+ )
+ state.categoryResults[.xcodeJunk] = CategoryResult(category: .xcodeJunk, items: [item], totalSize: item.size)
+ state.scanState = .completed
+
+ XCTAssertFalse(state.isItemSelected(item))
+ XCTAssertEqual(state.totalSelectedSize, 0)
+ state.cleanAll()
+ XCTAssertEqual(state.scanState, .completed)
+ state.cleanAll(scheduled: true)
+ XCTAssertEqual(state.scanState, .completed)
+ XCTAssertEqual(state.categoryResults[.xcodeJunk]?.items.map(\.id), [item.id])
+
+ state.toggleItem(item)
+ XCTAssertTrue(state.isItemSelected(item))
+ XCTAssertEqual(state.totalSelectedSize, item.size)
+ state.toggleItem(item)
+ XCTAssertFalse(state.isItemSelected(item))
+ }
+
func testScheduledScanWaitsForActiveOperations() {
let state = AppState(performStartupTasks: false)
state.scanState = .cleaning(progress: 0.2)
@@ -201,7 +230,7 @@ final class XcodeBuildMCPStorageTests: XCTestCase {
"Expected \(expectedPath); scanned: \(result.items.map(\.path))"
)
XCTAssertEqual(item.name, "XcodeBuildMCP: PureMac")
- XCTAssertTrue(item.isSelected)
+ XCTAssertFalse(item.isSelected)
XCTAssertFalse(result.items.contains { $0.path == logs.path })
XCTAssertFalse(result.items.contains { $0.path == symlinkedDerivedData.path })
}
@@ -285,7 +314,7 @@ final class XcodeBuildMCPStorageTests: XCTestCase {
})
XCTAssertEqual(item.name, "XcodeBuildMCP: Legacy DerivedData")
- XCTAssertTrue(item.isSelected)
+ XCTAssertFalse(item.isSelected)
}
func testCleaningManagedDerivedDataLeavesWorkspaceStateIntact() async throws {
diff --git a/README.md b/README.md
index 5700045..71ad209 100644
--- a/README.md
+++ b/README.md
@@ -143,7 +143,7 @@ Smart Scan checks each category in sequence and reports progress as files are fo
- **Mail Files** - downloaded mail attachments
- **Trash Bins** - empties all bins, including external volumes
- **Large & Old Files** - >100 MB or older than 1 year (never auto-selected)
-- **Xcode Junk** - DerivedData, Archives, simulator caches, downloaded simulator runtimes (deleted via `simctl runtime delete`; never auto-selected), and XcodeBuildMCP DerivedData (scheduled only when older than 7 days and unlocked; Trash-only)
+- **Xcode Junk** - DerivedData, Archives, simulator caches, downloaded simulator runtimes (deleted via `simctl runtime delete`; never auto-selected), and XcodeBuildMCP DerivedData (never auto-selected; selected items must be older than 7 days and unlocked for scheduled cleanup; Trash-only)
- **Brew Cache** - Homebrew download caches within approved cache locations
- **Node Cache** - npm, yarn classic, pnpm content-addressable store
- **Docker Cache** - images, containers, build cache