feat: configurable uninstall timeout (30min default), winget JSON parsing, orphaned Package Cache scanner, USB device history cleaner

Author: SysAdminDoc

src/DeepPurge.Cli/Program.cs

@@ -164,9 +164,12 @@ private static async Task<int> CmdCleanAsync(ParsedArgs a, CancellationToken ct)
 
     private static async Task<int> CmdUninstallAsync(ParsedArgs a, CancellationToken ct)
     {
-        if (a.Positional.Count == 0) return Fail("usage: deeppurgecli uninstall <name-or-id> [--silent]");
+        if (a.Positional.Count == 0) return Fail("usage: deeppurgecli uninstall <name-or-id> [--silent] [--timeout <minutes>]");
         bool silent = a.HasFlag("silent");
         var nameArg = a.Positional[0];
+        var timeoutStr = a.GetOption("timeout");
+        if (timeoutStr != null && int.TryParse(timeoutStr, out var mins))
+            UninstallEngine.UninstallerTimeout = TimeSpan.FromMinutes(mins);
 
         var items = await Task.Run(() => InstalledProgramScanner.GetAllInstalledPrograms(), ct);
         var match = items.FirstOrDefault(p =>
@@ -570,7 +573,7 @@ public sealed class ParsedArgs
     // when you add a new command that needs them.
     private static readonly HashSet<string> ValueOptions = new(StringComparer.OrdinalIgnoreCase)
     {
-        "name", "freq", "time", "day", "args", "export", "format", "program",
+        "name", "freq", "time", "day", "args", "export", "format", "program", "timeout",
     };
 
     public bool HasFlag(string name) => Flags.Contains(name);

src/DeepPurge.Core/FileSystem/JunkFilesCleaner.cs

@@ -67,6 +67,8 @@ public static List<JunkCategory> ScanForJunk()
             ScanLogFiles(), ScanCrashDumps(), ScanWerReports(),
             // Installer cache
             ScanInstallerCache(),
+            // Package Cache (orphaned installer caches)
+            ScanPackageCache(),
             // App-specific caches
             ScanAppCaches(),
             // Runtime caches
@@ -462,6 +464,44 @@ private static JunkCategory ScanInstallerCache()
         return cat;
     }
 
+    private static JunkCategory ScanPackageCache()
+    {
+        var cat = new JunkCategory
+        {
+            Name = "Orphaned Package Cache",
+            Description = "Installer caches for products that are no longer installed",
+            IsSelected = false,
+        };
+        var cacheRoot = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Package Cache");
+        if (!Directory.Exists(cacheRoot)) return cat;
+
+        var installed = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        try
+        {
+            foreach (var p in Registry.InstalledProgramScanner.GetAllInstalledPrograms())
+            {
+                if (!string.IsNullOrEmpty(p.RegistryKeyName)) installed.Add(p.RegistryKeyName);
+                if (!string.IsNullOrEmpty(p.DisplayName)) installed.Add(p.DisplayName);
+            }
+        }
+        catch { }
+
+        try
+        {
+            foreach (var dir in Directory.GetDirectories(cacheRoot))
+            {
+                var name = Path.GetFileName(dir);
+                if (installed.Any(i => name.Contains(i, StringComparison.OrdinalIgnoreCase))) continue;
+                var size = GetDirSize(dir);
+                if (size > 0)
+                    cat.Files.Add(new JunkFile { Path = dir, Size = size, IsDirectory = true });
+            }
+        }
+        catch { }
+        return cat;
+    }
+
     // ─── APP CACHES ───
     private static JunkCategory ScanAppCaches()
     {

src/DeepPurge.Core/Packages/PackageManagerScanner.cs

@@ -74,22 +74,46 @@ public static async Task EnrichAsync(
 
     public static List<WingetEntry> QueryWinget(CancellationToken ct = default)
     {
-        var result = new List<WingetEntry>();
-        string output;
         try
         {
-            output = RunProcess(
-                "winget.exe",
-                "list --disable-interactivity --accept-source-agreements",
-                ct);
+            var jsonOutput = RunProcess("winget.exe",
+                "list --disable-interactivity --accept-source-agreements --output json", ct);
+            if (!string.IsNullOrWhiteSpace(jsonOutput) && jsonOutput.TrimStart().StartsWith('['))
+                return ParseWingetJson(jsonOutput);
         }
-        catch
+        catch { }
+
+        try
         {
-            return result;
+            var tableOutput = RunProcess("winget.exe",
+                "list --disable-interactivity --accept-source-agreements", ct);
+            if (!string.IsNullOrWhiteSpace(tableOutput)) return ParseWingetTable(tableOutput);
         }
+        catch { }
+        return new();
+    }
 
-        if (string.IsNullOrWhiteSpace(output)) return result;
-        return ParseWingetTable(output);
+    internal static List<WingetEntry> ParseWingetJson(string json)
+    {
+        var entries = new List<WingetEntry>();
+        try
+        {
+            using var doc = System.Text.Json.JsonDocument.Parse(json);
+            foreach (var item in doc.RootElement.EnumerateArray())
+            {
+                var name = item.TryGetProperty("Name", out var n) ? n.GetString() ?? "" : "";
+                var id = item.TryGetProperty("Id", out var i) ? i.GetString() ?? "" : "";
+                var version = item.TryGetProperty("InstalledVersion", out var v)
+                    ? v.GetString() ?? ""
+                    : item.TryGetProperty("Version", out var v2) ? v2.GetString() ?? "" : "";
+                var available = item.TryGetProperty("AvailableVersion", out var a) ? a.GetString() ?? "" : "";
+                var source = item.TryGetProperty("Source", out var s) ? s.GetString() ?? "" : "";
+                if (name.Length > 0 && id.Length > 0)
+                    entries.Add(new WingetEntry(id, name, version, available, source));
+            }
+        }
+        catch { }
+        return entries;
     }
 
     /// <summary>

src/DeepPurge.Core/Privacy/EvidenceRemover.cs

@@ -66,6 +66,7 @@ public static List<TraceCategory> ScanAllTraces()
             ScanDeliveryOptimization(),
             ScanWindowsErrorReporting(),
             ScanFontCache(),
+            ScanUsbDeviceHistory(),
         };
         cats.RemoveAll(c => c.Items.Count == 0);
         return cats;
@@ -446,6 +447,49 @@ private static TraceCategory ScanFontCache()
         return cat;
     }
 
+    private static TraceCategory ScanUsbDeviceHistory()
+    {
+        var cat = new TraceCategory
+        {
+            Name = "USB Device History",
+            Description = "Registry records of previously connected USB devices, SetupAPI logs",
+        };
+
+        try
+        {
+            using var usbstorKey = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(
+                @"SYSTEM\CurrentControlSet\Enum\USBSTOR");
+            if (usbstorKey != null)
+            {
+                foreach (var deviceClass in usbstorKey.GetSubKeyNames())
+                {
+                    using var classKey = usbstorKey.OpenSubKey(deviceClass);
+                    if (classKey == null) continue;
+                    foreach (var serial in classKey.GetSubKeyNames())
+                    {
+                        cat.Items.Add(new TraceItem
+                        {
+                            Path = $@"HKLM\SYSTEM\CurrentControlSet\Enum\USBSTOR\{deviceClass}\{serial}",
+                            SizeBytes = 0,
+                            IsDirectory = false,
+                        });
+                    }
+                }
+            }
+        }
+        catch { }
+
+        var setupApiLog = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows),
+            "inf", "setupapi.dev.log");
+        AddFile(cat, setupApiLog);
+
+        var setupApiAppLog = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows),
+            "inf", "setupapi.app.log");
+        AddFile(cat, setupApiAppLog);
+
+        return cat;
+    }
+
     // ═══════════════════════════════════════════════════════
     //  Helpers
     // ═══════════════════════════════════════════════════════

src/DeepPurge.Core/Uninstall/UninstallEngine.cs

@@ -23,7 +23,7 @@ public class UninstallEngine
     private readonly BackupManager _backupManager = new();
 
     private static readonly HashSet<int> UninstallerSuccessCodes = new() { 0, 1641, 3010 };
-    private static readonly TimeSpan UninstallerTimeout = TimeSpan.FromMinutes(10);
+    public static TimeSpan UninstallerTimeout { get; set; } = TimeSpan.FromMinutes(30);
 
     public async Task<UninstallResult> UninstallAsync(InstalledProgram program, ScanMode scanMode,
         bool createRestorePoint = true, bool runBuiltInUninstaller = true, bool silent = false,