Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.
Swift cache-cleanercleanerclideveloper-toolsdisk-cleanupdisk-spaceduplicate-finderhomebrewliquid-glassmac-cleanermacosmacos-appmacos-golden-gatemacos-tahoemacos-tweaksswiftswiftuiterminal-themesuninstalluninstaller
List the folders a gone app's product file named in Orphaned Files
Țugui Dragoșf8424dcd9beb
diff --git a/Packages/PeelCore/Sources/PeelCore/Apps/AppMemory.swift b/Packages/PeelCore/Sources/PeelCore/Apps/AppMemory.swiftindex a03b3782..43bee084 100644--- a/Packages/PeelCore/Sources/PeelCore/Apps/AppMemory.swift+++ b/Packages/PeelCore/Sources/PeelCore/Apps/AppMemory.swift@@ -10,6 +10,8 @@ public struct RememberedApp: Sendable, Hashable, Codable, Identifiable {public let lastSeen: Date/// Where it was the last time Peel saw it, which is worth showing when its files turn up later.public let lastPath: String+ /// The folders its own product file named for its data (`InstalledApp.productFolders`).+ public var productFolders: [ProductFolder]? = nilpublic var id: String { bundleIdentifier }}@@ -71,7 +73,8 @@ public struct AppMemory: Sendable {name: app.name,teamIdentifier: app.teamIdentifier,lastSeen: now,- lastPath: PathPattern.comparablePath(of: app.url)+ lastPath: PathPattern.comparablePath(of: app.url),+ productFolders: app.productFolders.isEmpty ? nil : app.productFolders)}diff --git a/Packages/PeelCore/Sources/PeelCore/Apps/ProductFolders.swift b/Packages/PeelCore/Sources/PeelCore/Apps/ProductFolders.swiftindex a741a49c..248aa1b0 100644--- a/Packages/PeelCore/Sources/PeelCore/Apps/ProductFolders.swift+++ b/Packages/PeelCore/Sources/PeelCore/Apps/ProductFolders.swift@@ -1,7 +1,8 @@import Foundation+internal import PeelPrivileged/// A folder an app's own product file names for its data, given from the home.-public struct ProductFolder: Sendable, Hashable {+public struct ProductFolder: Sendable, Hashable, Codable {/// Such as `.vscode-insiders` or `Library/Caches/JetBrains/IdeaIC2025.2`.public let path: String/// What the app writes inside once it has run, without which the folder is not taken as the app's. Nil for a@@ -21,6 +22,11 @@ public struct ProductFolder: Sendable, Hashable {let folder = URL(filePath: home, directoryHint: .isDirectory).appending(path: path)guard PathPattern.comparablePath(of: url).lowercased() == PathPattern.comparablePath(of: folder).lowercased()else { return false }+ return holdsProof(at: url)+ }++ /// Whether the folder at `url` holds its proof.+ func holdsProof(at url: URL) -> Bool {guard let proof else { return true }var info = stat()return lstat(url.appending(path: proof).path(percentEncoded: false), &info) == 0@@ -46,6 +52,17 @@ enum ProductFolders {jetBrainsFolders(in: json(at: url.appending(path: jetBrainsFile))) + vsCodeFolders(in: vsCodeProduct(of: url))}+ /// Whether `folder`, read back from a file, is one these rules would name.+ static func believes(_ folder: ProductFolder) -> Bool {+ let names = PathComponents.of(folder.path)+ let named = switch names.count {+ case 4: jetBrainsFolders(in: ["productVendor": names[2], "dataDirectoryName": names[3]])+ case 1: vsCodeFolders(in: ["dataFolderName": names[0], "sharedDataFolderName": names[0]])+ default: [ProductFolder]()+ }+ return named.contains(folder)+ }+static func vsCodeProduct(of app: URL) -> [String: Any]? {json(at: app.appending(path: vsCodeFile))}diff --git a/Packages/PeelCore/Sources/PeelCore/Orphans/Orphan.swift b/Packages/PeelCore/Sources/PeelCore/Orphans/Orphan.swiftindex 14aea984..71166692 100644--- a/Packages/PeelCore/Sources/PeelCore/Orphans/Orphan.swift+++ b/Packages/PeelCore/Sources/PeelCore/Orphans/Orphan.swift@@ -18,6 +18,8 @@ public struct OrphanItem: Sendable, Hashable, Identifiable {/// For a copy macOS keeps of a system extension, the path of the app its record says it was installed for, when/// that app is gone.public var installedFor: String?+ /// For a folder the gone app's own product file named for its data, that folder.+ public var productFolder: ProductFolder?/// Why the item cannot be selected at all: `RemovalGuard` or the helper would refuse it.public var leftAlone: HoldBack? {diff --git a/Packages/PeelCore/Sources/PeelCore/Orphans/OrphanScanner.swift b/Packages/PeelCore/Sources/PeelCore/Orphans/OrphanScanner.swiftindex 9d896d87..d9938b03 100644--- a/Packages/PeelCore/Sources/PeelCore/Orphans/OrphanScanner.swift+++ b/Packages/PeelCore/Sources/PeelCore/Orphans/OrphanScanner.swift@@ -83,6 +83,7 @@ public struct OrphanScanner: Sendable {gone.map { ($0.name.lowercased(), $0.bundleIdentifier) },uniquingKeysWith: { first, _ in first })+ let goneFolders = GoneFolders(gone, installedApps: installedApps, home: environment.homeDirectory)let results = await withTaskGroup(of: (location: SearchLocation, result: LocationResult).self) { group inlet home = environment.homeDirectory.path(percentEncoded: false)@@ -93,8 +94,8 @@ public struct OrphanScanner: Sendable {_ = group.addTaskUnlessCancelled { [exclusions, nestedFolderLimit, walk] in(location, await Self.scan(location, ownership: ownership, jobs: jobs, goneBundles: goneBundles, goneApps: goneApps,- goneNames: goneNames, home: home, exclusions: exclusions, nestedFolderLimit: nestedFolderLimit,- walk: walk+ goneNames: goneNames, goneFolders: goneFolders, home: home, exclusions: exclusions,+ nestedFolderLimit: nestedFolderLimit, walk: walk))}}@@ -213,9 +214,12 @@ public struct OrphanScanner: Sendable {)let jobs = BackgroundItemOwnership(installedApps: installedApps + systemApps).knowingJobs(in: launchdFolders)let folders = manifestFolders+ let goneFolders = GoneFolders(gone, installedApps: installedApps, home: environment.homeDirectory)var kept: [OrphanItem] = []for item in items where !Self.servesAProgram(item.url, in: folders) {- let isStillOrphaned = if let app = item.namedAfter {+ let isStillOrphaned = if item.productFolder != nil {+ Self.goneApp(owningFolder: item.url, kind: item.kind, among: goneFolders, ownership: ownership) != nil+ } else if let app = item.namedAfter {await Self.goneApp(named: item.url,kind: item.kind,@@ -386,6 +390,19 @@ public struct OrphanScanner: Sendable {return identifier}+ /// The gone app whose own product file named `url` for its data, while no installed app has a claim on it.+ static func goneApp(+ owningFolder url: URL,+ kind: SearchLocation.Kind,+ among folders: GoneFolders,+ ownership: AppOwnership+ ) -> (identifier: String, folder: ProductFolder)? {+ guard let named = folders.at(url),+ !ownership.isClaimed(fileName: url.lastPathComponent, kind: kind, identifier: named.identifier)+ else { return nil }+ return named+ }+/// The places where an app keeps a folder under its own name, such as `Caches/Figma`, and nothing it keeps/// there is the person's own work.static let namedPlaces: Set<SearchLocation.Kind> = [@@ -430,8 +447,9 @@ public struct OrphanScanner: Sendable {private struct Candidate {let url: URLlet identifier: String- let namedAfter: String?+ var namedAfter: String? = nillet parent: ParentAccess+ var folder: ProductFolder? = nil}private static func scan(@@ -441,6 +459,7 @@ public struct OrphanScanner: Sendable {goneBundles: [String: String],goneApps: [String],goneNames: [String: String],+ goneFolders: GoneFolders,home: String,exclusions: Exclusions,nestedFolderLimit: Int,@@ -467,6 +486,11 @@ public struct OrphanScanner: Sendable {guard isAFileAFolderOrALink(url), !FileAccess.cannotBeRemoved(url) else { continue }// What the guard refuses outright is never listed, whether an installed app claims it or not.guard !ProtectedData.refuses(url.path(percentEncoded: false), home: home) else { continue }+ if let named = goneApp(owningFolder: url, kind: location.kind, among: goneFolders, ownership: ownership) {+ let identifier = named.identifier+ candidates.append(Candidate(url: url, identifier: identifier, parent: parent, folder: named.folder))+ continue+ }var namedAfter: String?var identifier = await orphanIdentifier(of: url,@@ -496,10 +520,13 @@ public struct OrphanScanner: Sendable {guard isAFileAFolderOrALink(url), !ProtectedData.refuses(url.path(percentEncoded: false), home: home),!exclusions.excludes(url)else { return .pass }+ if let named = goneApp(owningFolder: url, kind: location.kind, among: goneFolders, ownership: ownership) {+ return .take(Candidate(url: url, identifier: named.identifier, parent: parent, folder: named.folder))+ }if let identifier = await orphanIdentifier(of: url, kind: location.kind, ownership: ownership, jobs: jobs, cameWithOneOf: goneApps) {- return .take(Candidate(url: url, identifier: identifier, namedAfter: nil, parent: parent))+ return .take(Candidate(url: url, identifier: identifier, parent: parent))}return canLookInside && url.isRealFolder ? .lookInside : .pass}@@ -526,6 +553,8 @@ public struct OrphanScanner: Sendable {.holdsWorkKeptInACache} else if let keptOnlyHere = KeptOnlyHere.reason(for: path, home: home) {keptOnlyHere+ } else if candidate.folder?.holdsWork(at: url) == true {+ .holdsWorkMadeWithTheApp} else if location.kind == .logs, CrashReport.isOne(url) {.crashReport} else {@@ -541,7 +570,8 @@ public struct OrphanScanner: Sendable {requiresPrivileges: candidate.parent.requiresPrivileges(toRemove: url),heldBack: heldBack,namedAfter: candidate.namedAfter,- holdsDamagedSettings: location.kind == .preferences && PreferenceFile.isDamaged(url)+ holdsDamagedSettings: location.kind == .preferences && PreferenceFile.isDamaged(url),+ productFolder: candidate.folder)found.append((candidate.identifier, item))}@@ -552,3 +582,32 @@ public struct OrphanScanner: Sendable {)}}++/// The folders the product files of apps Peel saw go named for their data, by where they are. A folder an installed+/// app's product file names too is left out.+struct GoneFolders: Sendable {+ private let byPath: [String: (identifier: String, folder: ProductFolder)]+ private let names: Set<String>++ init(_ gone: [RememberedApp], installedApps: [InstalledApp], home: URL) {+ let named = Set(installedApps.flatMap(\.productFolders).map { $0.path.lowercased() })+ var byPath: [String: (identifier: String, folder: ProductFolder)] = [:]+ for app in gone {+ for folder in app.productFolders ?? []+ where ProductFolders.believes(folder) && !named.contains(folder.path.lowercased()) {+ let path = PathPattern.comparablePath(of: home.appending(path: folder.path)).lowercased()+ byPath[path] = byPath[path] ?? (app.bundleIdentifier, folder)+ }+ }+ self.byPath = byPath+ names = Set(byPath.keys.compactMap { PathComponents.of($0).last })+ }++ /// The gone app whose folder `url` is, while it holds what that app writes there.+ func at(_ url: URL) -> (identifier: String, folder: ProductFolder)? {+ guard !names.isEmpty, names.contains(url.lastPathComponent.lowercased()),+ let named = byPath[PathPattern.comparablePath(of: url).lowercased()], named.folder.holdsProof(at: url)+ else { return nil }+ return named+ }+}diff --git a/Packages/PeelCore/Tests/PeelCoreTests/AppMemoryTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/AppMemoryTests.swiftindex fc80b94e..e5abad3d 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/AppMemoryTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/AppMemoryTests.swift@@ -89,6 +89,22 @@ struct AppMemoryTests {#expect(gone.stillInstalled() == nil)}+ @Test func keepsTheFoldersAnAppsProductFileNames() async throws {+ let directory = try TemporaryDirectory()+ let memory = AppMemory(url: directory.url.appending(path: "apps.json"))+ let folders = ProductFolders.vsCodeFolders(in: ["dataFolderName": ".example-editor"])+ let editor = InstalledApp(+ url: URL(filePath: "/Applications/Example Editor.app", directoryHint: .isDirectory),+ bundleIdentifier: "org.example.editor", name: "Example Editor", productFolders: folders+ )++ _ = await memory.remember([editor, app("Bear", "net.shinyfrog.bear")])+ let read = await memory.load()++ #expect(read.first { $0.bundleIdentifier == "org.example.editor" }?.productFolders == folders)+ #expect(read.first { $0.bundleIdentifier == "net.shinyfrog.bear" }?.productFolders == nil)+ }+@Test func survivesBeingWrittenAndReadBack() async throws {let directory = try TemporaryDirectory()let memory = AppMemory(url: directory.url.appending(path: "nested/apps.json"))diff --git a/Packages/PeelCore/Tests/PeelCoreTests/OrphanScannerTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/OrphanScannerTests.swiftindex 78c5dcc2..bf6f46f6 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/OrphanScannerTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/OrphanScannerTests.swift@@ -130,6 +130,56 @@ struct OrphanScannerTests {#expect(confidence(other)?.reasons.contains(.installedForAnAppThatIsGone(name: "Kept")) == false)}+ @Test func listsTheFoldersAGoneAppsProductFileNamed() async throws {+ let directory = try TemporaryDirectory()+ try directory.file("home/.example-editor/argv.json")+ try directory.file("home/Library/Application Support/ExampleVendor/ExampleIDE2025.2/scratches/scratch.txt")+ try directory.file("home/Library/Caches/ExampleVendor/ExampleIDE2025.2/index/a", bytes: 64)+ try directory.file("home/.unproved-editor/settings.json")+ try directory.file("home/.kept-editor/argv.json")+ try directory.file("home/.config/settings.json")+ let gone = { (identifier: String, folders: [ProductFolder]) in+ RememberedApp(+ bundleIdentifier: identifier, name: identifier, teamIdentifier: nil, lastSeen: .now,+ lastPath: "/Applications/\(identifier).app", productFolders: folders+ )+ }+ let editors = { (name: String) in ProductFolders.vsCodeFolders(in: ["dataFolderName": name]) }+ let editor = gone("org.example.editor", editors(".example-editor") + editors(".unproved-editor")+ + [ProductFolder(path: ".config", proof: nil)])+ let ide = gone("org.example.ide", ProductFolders.jetBrainsFolders(in: [+ "productVendor": "ExampleVendor", "dataDirectoryName": "ExampleIDE2025.2",+ ]))+ let old = gone("org.example.oldeditor", editors(".kept-editor"))+ let kept = InstalledApp(+ url: URL(filePath: "/Applications/Kept Editor.app"), bundleIdentifier: "org.example.kepteditor",+ name: "Kept Editor", productFolders: editors(".kept-editor")+ )+ let scanner = scanner(in: directory)++ let scan = await scanner.scan(installedApps: installed + [kept], remembered: [editor, ide, old])+ let listed = Dictionary(+ scan.groups.flatMap { group in group.items.map { ($0.url.lastPathComponent, (group.identifier, $0)) } },+ uniquingKeysWith: { first, _ in first }+ )+ let settings = scan.groups.flatMap(\.items).first { $0.url.path(percentEncoded: false).contains("Support/ExampleVendor") }++ #expect(listed[".example-editor"]?.0 == "org.example.editor")+ #expect(Set(scan.groups.filter { $0.identifier == "org.example.ide" }.flatMap(\.items).map(\.kind))+ == [.applicationSupport, .caches])+ #expect(settings?.heldBack == .holdsWorkMadeWithTheApp)+ for name in [".unproved-editor", ".kept-editor", ".config"] {+ #expect(listed[name] == nil, "\(name)")+ }+ let item = try #require(listed[".example-editor"]?.1)+ let back = InstalledApp(+ url: URL(filePath: "/Applications/Back.app"), bundleIdentifier: "org.example.back", name: "Back",+ productFolders: editors(".example-editor")+ )+ #expect(await scanner.stillOrphaned([item], installedApps: installed, remembered: [editor]).count == 1)+ #expect(await scanner.stillOrphaned([item], installedApps: installed + [back], remembered: [editor]).isEmpty)+ }+@Test func listsAFileTwoPlacesReachOnce() async throws {let directory = try TemporaryDirectory()let recents = "home/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments"diff --git a/Packages/PeelCore/Tests/PeelCoreTests/ProductFoldersTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/ProductFoldersTests.swiftindex da11b987..a14d5f4a 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/ProductFoldersTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/ProductFoldersTests.swift@@ -31,6 +31,17 @@ struct ProductFoldersTests {#expect(ProductFolders.of(appAt: try directory.directory("Applications/Plain.app")).isEmpty)}+ @Test func believesAFolderReadBackOnlyAsTheRulesNameIt() {+ let ide = ProductFolders.jetBrainsFolders(in: ["productVendor": "ExampleVendor", "dataDirectoryName": "ExampleIDE2025.2"])+ let editor = ProductFolders.vsCodeFolders(in: ["dataFolderName": ".example-editor"])++ #expect((ide + editor).allSatisfy(ProductFolders.believes))+ #expect(!ProductFolders.believes(ProductFolder(path: ide[0].path, proof: nil)))+ #expect(!ProductFolders.believes(ProductFolder(path: ".example-editor", proof: nil)))+ #expect(!ProductFolders.believes(ProductFolder(path: "Documents", proof: nil)))+ #expect(!ProductFolders.believes(ProductFolder(path: "Library/Caches/ExampleVendor/Chrome", proof: nil)))+ }+@Test func believesOnlyTheNamesTheToolsWrite() {let ide = { (vendor: String, name: String) inProductFolders.jetBrainsFolders(in: ["productVendor": vendor, "dataDirectoryName": name])