Free, open-source macOS cleaner. CleanMyMac alternative with zero telemetry. Native SwiftUI, scheduled auto-cleaning, Xcode/Homebrew/system cache cleanup. MIT licensed.
Swift cache-cleanercleanmymaccleanupdisk-cleanerdisk-spacehomebrewmac-utilitymacosmacos-appmacos-cleanermacosxnativeossosxprivacyswiftswiftuisystem-cleanerxcode-cleaner
fix(xcode): manage the MobileBuildMCP state directory too
momenbaselc34aeea63364
diff --git a/PureMac/Logic/Utilities/XcodeBuildMCPDerivedDataSupport.swift b/PureMac/Logic/Utilities/XcodeBuildMCPDerivedDataSupport.swiftindex 55088d5..46d7b81 100644--- a/PureMac/Logic/Utilities/XcodeBuildMCPDerivedDataSupport.swift+++ b/PureMac/Logic/Utilities/XcodeBuildMCPDerivedDataSupport.swift@@ -15,6 +15,9 @@ enum XcodeBuildMCPDerivedDataSupport {/// Scheduled cleanup only considers build data that has been unused for a/// full week. Manual cleanup remains available for any discovered item.static let scheduledCleanupAge: TimeInterval = 7 * 24 * 60 * 60+ /// XcodeBuildMCP 2.7.1 was renamed MobileBuildMCP and moved its state+ /// directory without migrating the old one. Both roots share one layout.+ static let managedDirectoryNames = ["XcodeBuildMCP", "MobileBuildMCP"]struct LifecycleLock {fileprivate let directory: URL@@ -25,34 +28,39 @@ enum XcodeBuildMCPDerivedDataSupport {homeDirectory.resolvingSymlinksInPath().standardizedFileURL}+ static func managedRoots(+ homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser+ ) -> [URL] {+ let home = canonicalHomeDirectory(homeDirectory)+ return managedDirectoryNames.map {+ home.appendingPathComponent("Library/Developer/\($0)", isDirectory: true)+ }+ }++ /// The managed root that contains `path`, if any.static func managedRoot(+ containing path: String,homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser- ) -> URL {- canonicalHomeDirectory(homeDirectory)- .appendingPathComponent("Library/Developer/XcodeBuildMCP", isDirectory: true)+ ) -> URL? {+ let normalized = (path as NSString).standardizingPath+ return managedRoots(homeDirectory: homeDirectory).first { root in+ normalized == root.path || normalized.hasPrefix(root.path + "/")+ }}static func isManagedDerivedDataPath(_ path: String,homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser) -> Bool {- let normalized = (path as NSString).standardizingPath- let root = managedRoot(homeDirectory: homeDirectory).path+ guard let root = managedRoot(containing: path, homeDirectory: homeDirectory) else {+ return false+ }// XcodeBuildMCP before v2.5 used one shared DerivedData directory.- if normalized == (root as NSString).appendingPathComponent("DerivedData") {+ if (path as NSString).standardizingPath == root.appendingPathComponent("DerivedData").path {return true}-- let workspacesRoot = (root as NSString).appendingPathComponent("workspaces")- let prefix = workspacesRoot + "/"- guard normalized.hasPrefix(prefix) else { return false }-- let relative = String(normalized.dropFirst(prefix.count))- let components = relative.split(separator: "/", omittingEmptySubsequences: false)- return components.count == 2- && !components[0].isEmpty- && components[1] == "DerivedData"+ return workspaceKey(forManagedDerivedDataPath: path, homeDirectory: homeDirectory) != nil}/// Returns whether a managed DerivedData item may participate in scheduled@@ -85,10 +93,11 @@ enum XcodeBuildMCPDerivedDataSupport {forManagedDerivedDataPath path: String,homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser) -> String? {+ guard let root = managedRoot(containing: path, homeDirectory: homeDirectory) else {+ return nil+ }let normalized = (path as NSString).standardizingPath- let workspacesRoot = managedRoot(homeDirectory: homeDirectory)- .appendingPathComponent("workspaces", isDirectory: true)- .path + "/"+ let workspacesRoot = root.appendingPathComponent("workspaces", isDirectory: true).path + "/"guard normalized.hasPrefix(workspacesRoot) else { return nil }let relative = String(normalized.dropFirst(workspacesRoot.count))let components = relative.split(separator: "/", omittingEmptySubsequences: false)@@ -108,16 +117,13 @@ enum XcodeBuildMCPDerivedDataSupport {now: Date = Date(),isProcessAlive: (Int32) -> Bool = isProcessAlive) -> Bool {- guard let workspaceKey = workspaceKey(+ guard let lockDir = lifecycleLockDirectory(forManagedDerivedDataPath: path,homeDirectory: homeDirectory) else {return false}- let lockDir = managedRoot(homeDirectory: homeDirectory)- .appendingPathComponent("workspaces/\(workspaceKey)/locks/\(lifecycleLockDirectoryName)", isDirectory: true)-var isDirectory: ObjCBool = falseguard fileManager.fileExists(atPath: lockDir.path, isDirectory: &isDirectory),isDirectory.boolValue else {@@ -158,18 +164,13 @@ enum XcodeBuildMCPDerivedDataSupport {homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser,fileManager: FileManager = .default) -> LifecycleLock? {- guard let workspaceKey = workspaceKey(+ guard let lockDirectory = lifecycleLockDirectory(forManagedDerivedDataPath: path,homeDirectory: homeDirectory) else {return nil}- let lockDirectory = managedRoot(homeDirectory: homeDirectory)- .appendingPathComponent(- "workspaces/\(workspaceKey)/locks/\(lifecycleLockDirectoryName)",- isDirectory: true- )do {try fileManager.createDirectory(at: lockDirectory.deletingLastPathComponent(),@@ -221,33 +222,34 @@ enum XcodeBuildMCPDerivedDataSupport {homeDirectory: URL,fileManager: FileManager = .default) -> [(name: String, url: URL)] {- let root = managedRoot(homeDirectory: homeDirectory)- guard isRealDirectory(root, fileManager: fileManager) else { return [] }-var results: [(name: String, url: URL)] = []- let legacyDerivedData = root.appendingPathComponent("DerivedData", isDirectory: true)- if isRealDirectory(legacyDerivedData, fileManager: fileManager) {- results.append((name: "XcodeBuildMCP: Legacy DerivedData", url: legacyDerivedData))- }+ for root in managedRoots(homeDirectory: homeDirectory)+ where isRealDirectory(root, fileManager: fileManager) {+ let tool = root.lastPathComponent+ let legacyDerivedData = root.appendingPathComponent("DerivedData", isDirectory: true)+ if isRealDirectory(legacyDerivedData, fileManager: fileManager) {+ results.append((name: "\(tool): Legacy DerivedData", url: legacyDerivedData))+ }- let workspacesRoot = root.appendingPathComponent("workspaces", isDirectory: true)- guard isRealDirectory(workspacesRoot, fileManager: fileManager),- let workspaces = try? fileManager.contentsOfDirectory(- at: workspacesRoot,- includingPropertiesForKeys: nil,- options: [.skipsHiddenFiles]- ) else {- return results- }+ let workspacesRoot = root.appendingPathComponent("workspaces", isDirectory: true)+ guard isRealDirectory(workspacesRoot, fileManager: fileManager),+ let workspaces = try? fileManager.contentsOfDirectory(+ at: workspacesRoot,+ includingPropertiesForKeys: nil,+ options: [.skipsHiddenFiles]+ ) else {+ continue+ }- for workspace in workspaces where isRealDirectory(workspace, fileManager: fileManager) {- let derivedData = workspace.appendingPathComponent("DerivedData", isDirectory: true)- guard isRealDirectory(derivedData, fileManager: fileManager) else { continue }- results.append((- name: "XcodeBuildMCP: \(displayName(forWorkspaceKey: workspace.lastPathComponent))",- url: derivedData- ))+ for workspace in workspaces where isRealDirectory(workspace, fileManager: fileManager) {+ let derivedData = workspace.appendingPathComponent("DerivedData", isDirectory: true)+ guard isRealDirectory(derivedData, fileManager: fileManager) else { continue }+ results.append((+ name: "\(tool): \(displayName(forWorkspaceKey: workspace.lastPathComponent))",+ url: derivedData+ ))+ }}return results@@ -296,6 +298,23 @@ enum XcodeBuildMCPDerivedDataSupport {if kill(pid, 0) == 0 { return true }return errno == EPERM}++ private static func lifecycleLockDirectory(+ forManagedDerivedDataPath path: String,+ homeDirectory: URL+ ) -> URL? {+ guard let root = managedRoot(containing: path, homeDirectory: homeDirectory),+ let workspaceKey = workspaceKey(+ forManagedDerivedDataPath: path,+ homeDirectory: homeDirectory+ ) else {+ return nil+ }+ return root.appendingPathComponent(+ "workspaces/\(workspaceKey)/locks/\(lifecycleLockDirectoryName)",+ isDirectory: true+ )+ }}typealias XcodeBuildMCPStorage = XcodeBuildMCPDerivedDataSupportdiff --git a/PureMacTests/AppStateTests.swift b/PureMacTests/AppStateTests.swiftindex 0642648..ec41a85 100644--- a/PureMacTests/AppStateTests.swift+++ b/PureMacTests/AppStateTests.swift@@ -116,11 +116,12 @@ final class AppStateTests: XCTestCase {XCTAssertEqual(state.scanState, .completed)}- func testManagedDerivedDataRequiresManualSelectionEvenForScheduledCleanup() {+ func testManagedDerivedDataRequiresManualSelectionEvenForScheduledCleanup() throws {let state = AppState(performStartupTasks: false)+ let managedRoot = try XCTUnwrap(XcodeBuildMCPDerivedDataSupport.managedRoots().first)let item = CleanableItem(name: "XcodeBuildMCP: Fixture",- path: XcodeBuildMCPDerivedDataSupport.managedRoot()+ path: managedRoot.appendingPathComponent("workspaces/Fixture-\(UUID().uuidString)/DerivedData").path,size: 4_096,category: .xcodeJunk,diff --git a/PureMacTests/XcodeBuildMCPDerivedDataSupportTests.swift b/PureMacTests/XcodeBuildMCPDerivedDataSupportTests.swiftindex 8f65620..d9c0768 100644--- a/PureMacTests/XcodeBuildMCPDerivedDataSupportTests.swift+++ b/PureMacTests/XcodeBuildMCPDerivedDataSupportTests.swift@@ -3,18 +3,26 @@ import XCTestfinal class XcodeBuildMCPDerivedDataSupportTests: XCTestCase {func testXcodeJunkIncludesManagedDerivedDataForEachWorkspace() async throws {+ try await assertXcodeJunkIncludesManagedDerivedDataForEachWorkspace(tool: "XcodeBuildMCP")+ }++ func testXcodeJunkIncludesMobileBuildMCPDerivedDataForEachWorkspace() async throws {+ try await assertXcodeJunkIncludesManagedDerivedDataForEachWorkspace(tool: "MobileBuildMCP")+ }++ private func assertXcodeJunkIncludesManagedDerivedDataForEachWorkspace(tool: String) async throws {let fileManager = FileManager.defaultlet temporaryHome = fileManager.temporaryDirectory.appendingPathComponent("PureMac-XcodeBuildMCP-\(UUID().uuidString)", isDirectory: true)defer { try? fileManager.removeItem(at: temporaryHome) }let workspaceRoot = temporaryHome- .appendingPathComponent("Library/Developer/XcodeBuildMCP/workspaces/PureMac-59316969cafe", isDirectory: true)+ .appendingPathComponent("Library/Developer/\(tool)/workspaces/PureMac-59316969cafe", isDirectory: true)let derivedData = workspaceRoot.appendingPathComponent("DerivedData", isDirectory: true)let logs = workspaceRoot.appendingPathComponent("logs", isDirectory: true)let outsideDirectory = temporaryHome.appendingPathComponent("outside", isDirectory: true)let symlinkedDerivedData = temporaryHome- .appendingPathComponent("Library/Developer/XcodeBuildMCP/workspaces/Symlinked-111111111111/DerivedData")+ .appendingPathComponent("Library/Developer/\(tool)/workspaces/Symlinked-111111111111/DerivedData")try fileManager.createDirectory(at: derivedData, withIntermediateDirectories: true)try fileManager.createDirectory(at: logs, withIntermediateDirectories: true)try fileManager.createDirectory(@@ -40,7 +48,7 @@ final class XcodeBuildMCPDerivedDataSupportTests: XCTestCase {},"Expected \(expectedPath); scanned: \(result.items.map(\.path))")- XCTAssertEqual(item.name, "XcodeBuildMCP: PureMac")+ XCTAssertEqual(item.name, "\(tool): PureMac")XCTAssertFalse(item.isSelected)XCTAssertFalse(result.items.contains { $0.path == logs.path })XCTAssertFalse(result.items.contains { $0.path == symlinkedDerivedData.path })@@ -129,13 +137,21 @@ final class XcodeBuildMCPDerivedDataSupportTests: XCTestCase {}func testCleaningManagedDerivedDataLeavesWorkspaceStateIntact() async throws {+ try await assertCleaningManagedDerivedDataLeavesWorkspaceStateIntact(tool: "XcodeBuildMCP")+ }++ func testCleaningMobileBuildMCPDerivedDataLeavesWorkspaceStateIntact() async throws {+ try await assertCleaningManagedDerivedDataLeavesWorkspaceStateIntact(tool: "MobileBuildMCP")+ }++ private func assertCleaningManagedDerivedDataLeavesWorkspaceStateIntact(tool: String) async throws {let fileManager = FileManager.defaultlet temporaryHome = fileManager.temporaryDirectory.appendingPathComponent("PureMac-XcodeBuildMCP-Clean-\(UUID().uuidString)", isDirectory: true)defer { try? fileManager.removeItem(at: temporaryHome) }let workspaceRoot = temporaryHome- .appendingPathComponent("Library/Developer/XcodeBuildMCP/workspaces/PureMac-59316969cafe", isDirectory: true)+ .appendingPathComponent("Library/Developer/\(tool)/workspaces/PureMac-59316969cafe", isDirectory: true)let derivedData = workspaceRoot.appendingPathComponent("DerivedData", isDirectory: true)let preservedDirectories = ["logs", "state", "locks", "result-bundles", "test-products"].map {workspaceRoot.appendingPathComponent($0, isDirectory: true)@@ -150,7 +166,7 @@ final class XcodeBuildMCPDerivedDataSupportTests: XCTestCase {.write(to: derivedData.appendingPathComponent("build-product"))let scan = await ScanEngine(homeDirectory: temporaryHome).scanCategory(.xcodeJunk)- let item = try XCTUnwrap(scan.items.first { $0.name == "XcodeBuildMCP: PureMac" })+ let item = try XCTUnwrap(scan.items.first { $0.name == "\(tool): PureMac" })let result = await CleaningEngine(homeDirectory: temporaryHome).cleanItems([item]) { _ in }@@ -196,6 +212,14 @@ final class XcodeBuildMCPDerivedDataSupportTests: XCTestCase {"\(managedRoot)-backup/workspaces/PureMac-59316969cafe/DerivedData",homeDirectory: home))+ XCTAssertTrue(XcodeBuildMCPDerivedDataSupport.isManagedDerivedDataPath(+ "/Users/tester/Library/Developer/MobileBuildMCP/workspaces/PureMac-59316969cafe/DerivedData",+ homeDirectory: home+ ))+ XCTAssertFalse(XcodeBuildMCPDerivedDataSupport.isManagedDerivedDataPath(+ "/Users/tester/Library/Developer/MobileBuildMCP/workspaces/PureMac-59316969cafe/logs",+ homeDirectory: home+ ))}func testSymlinkedHomeScanOutputCanStillBeCleaned() async throws {@@ -284,13 +308,21 @@ final class XcodeBuildMCPDerivedDataSupportTests: XCTestCase {}func testCleaningSkipsDerivedDataWhenLifecycleLockIsHeld() async throws {+ try await assertCleaningSkipsDerivedDataWhenLifecycleLockIsHeld(tool: "XcodeBuildMCP")+ }++ func testCleaningSkipsMobileBuildMCPDerivedDataWhenLifecycleLockIsHeld() async throws {+ try await assertCleaningSkipsDerivedDataWhenLifecycleLockIsHeld(tool: "MobileBuildMCP")+ }++ private func assertCleaningSkipsDerivedDataWhenLifecycleLockIsHeld(tool: String) async throws {let fileManager = FileManager.defaultlet temporaryHome = fileManager.temporaryDirectory.appendingPathComponent("PureMac-XcodeBuildMCP-Lock-\(UUID().uuidString)", isDirectory: true)defer { try? fileManager.removeItem(at: temporaryHome) }let workspaceRoot = temporaryHome- .appendingPathComponent("Library/Developer/XcodeBuildMCP/workspaces/PureMac-59316969cafe", isDirectory: true)+ .appendingPathComponent("Library/Developer/\(tool)/workspaces/PureMac-59316969cafe", isDirectory: true)let derivedData = workspaceRoot.appendingPathComponent("DerivedData", isDirectory: true)let lockDir = workspaceRoot.appendingPathComponent("locks/filesystem-lifecycle.lock", isDirectory: true)@@ -311,7 +343,7 @@ final class XcodeBuildMCPDerivedDataSupportTests: XCTestCase {try ownerData.write(to: lockDir.appendingPathComponent("owner.json"))let item = CleanableItem(- name: "XcodeBuildMCP: PureMac",+ name: "\(tool): PureMac",path: derivedData.path,size: 4_096,category: .xcodeJunk,diff --git a/README.md b/README.mdindex 71ad209..62e2588 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 (never auto-selected; selected items must be older than 7 days and unlocked for scheduled cleanup; Trash-only)+- **Xcode Junk** - DerivedData, Archives, simulator caches, downloaded simulator runtimes (deleted via `simctl runtime delete`; never auto-selected), and XcodeBuildMCP or MobileBuildMCP DerivedData (never auto-selected, so scheduled cleanup leaves it alone; manual cleanup moves it to the Trash while holding the tool's storage lock, which does not detect a running build)- **Brew Cache** - Homebrew download caches within approved cache locations- **Node Cache** - npm, yarn classic, pnpm content-addressable store- **Docker Cache** - images, containers, build cache