加快安装完成后的安装包清理

- 将安装器完成页清理调度改为把当前安装包路径和已安装 CodexCliPlus.exe 路径传给清理器，避免按钮路径复制整个安装包。
- 精简 MicaSetup 清理模板，移除自复制和自清理入口，改为隐藏启动已安装应用的清理模式并继续校验目标为当前安装器。
- 在桌面应用启动入口新增安装包清理模式，先于常规桌面启动运行，等待安装器退出后删除安装包，失败时使用 MoveFileEx 延迟删除。
- 新增安装包清理模式测试，并更新安装器包装测试断言和伪模板以覆盖新调度路径。

Author: C4AL

build/micasetup/overrides/MicaSetup/Helper/Setup/InstallerSelfCleanupHelper.cs.template

@@ -1,44 +1,18 @@
-using MicaSetup.Natives;
 using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using System.Security.Cryptography;
 using System.Text;
-using System.Threading;
 
 namespace MicaSetup.Helper;
 
 public static class InstallerSelfCleanupHelper
 {
-    private const string SelfCleanupArgument = "codexcliplus-self-cleanup";
+    private const string InstallerCleanupArgument = "codexcliplus-installer-cleanup";
     private const string TargetArgument = "codexcliplus-cleanup-target";
     private const string ParentProcessArgument = "codexcliplus-cleanup-parent";
-    private const int DeleteRetryCount = 60;
-    private const int DeleteRetryDelayMilliseconds = 1000;
-    private const int ParentProcessWaitMilliseconds = 30000;
 
-    public static bool TryRunSelfCleanupMode()
-    {
-        string[] args = Environment.GetCommandLineArgs();
-        if (!HasArgument(args, SelfCleanupArgument))
-        {
-            return false;
-        }
-
-        try
-        {
-            RunSelfCleanup(args);
-        }
-        catch (Exception e)
-        {
-            Logger.Error("[InstallerCleanup] self cleanup failed:", e);
-        }
-
-        return true;
-    }
-
-    public static void ScheduleDelete(string installerPath)
+    public static void ScheduleDelete(string installerPath, string cleanupHelperPath)
     {
         string targetPath = NormalizeInstallerPath(installerPath);
         string currentExecutablePath = GetCurrentExecutablePath();
@@ -47,13 +21,13 @@ public static class InstallerSelfCleanupHelper
             throw new InvalidOperationException("[InstallerCleanup] delete target must be the running installer.");
         }
 
-        string helperPath = CreateHelperCopy(currentExecutablePath);
+        string helperPath = NormalizeCleanupHelperPath(cleanupHelperPath, targetPath);
         int parentProcessId = Process.GetCurrentProcess().Id;
         string arguments = string.Join(
             " ",
-            "/" + SelfCleanupArgument,
-            "/" + TargetArgument + "=" + EncodeArgument(targetPath),
-            "/" + ParentProcessArgument + "=" + parentProcessId.ToString(CultureInfo.InvariantCulture)
+            "--" + InstallerCleanupArgument,
+            "--" + TargetArgument + "=" + EncodeArgument(targetPath),
+            "--" + ParentProcessArgument + "=" + parentProcessId.ToString(CultureInfo.InvariantCulture)
         );
 
         using Process process = new()
@@ -71,36 +45,6 @@ public static class InstallerSelfCleanupHelper
         process.Start();
     }
 
-    private static void RunSelfCleanup(string[] args)
-    {
-        string? encodedTarget = GetArgumentValue(args, TargetArgument);
-        if (string.IsNullOrWhiteSpace(encodedTarget))
-        {
-            Logger.Warning("[InstallerCleanup] cleanup target argument is empty.");
-            return;
-        }
-
-        string targetPath = NormalizeInstallerPath(DecodeArgument(encodedTarget!));
-        string helperPath = GetCurrentExecutablePath();
-        if (string.Equals(targetPath, helperPath, StringComparison.OrdinalIgnoreCase))
-        {
-            Logger.Warning("[InstallerCleanup] refusing to delete cleanup helper itself as target.");
-            return;
-        }
-
-        int parentProcessId = ParseParentProcessId(GetArgumentValue(args, ParentProcessArgument));
-        WaitForParentProcess(parentProcessId);
-
-        if (!IsSameFileContent(helperPath, targetPath))
-        {
-            Logger.Warning($"[InstallerCleanup] target does not match cleanup helper copy: {targetPath}");
-            return;
-        }
-
-        TryDeleteInstaller(targetPath);
-        ScheduleHelperCleanupOnReboot(helperPath);
-    }
-
     private static string NormalizeInstallerPath(string installerPath)
     {
         if (string.IsNullOrWhiteSpace(installerPath))
@@ -117,135 +61,30 @@ public static class InstallerSelfCleanupHelper
         return fullPath;
     }
 
-    private static string CreateHelperCopy(string currentExecutablePath)
+    private static string NormalizeCleanupHelperPath(string cleanupHelperPath, string targetPath)
     {
-        string helperRoot = Path.Combine(
-            Path.GetTempPath(),
-            "CodexCliPlus",
-            "InstallerCleanup",
-            Guid.NewGuid().ToString("N")
-        );
-        Directory.CreateDirectory(helperRoot);
-
-        string helperPath = Path.Combine(helperRoot, "CodexCliPlus.InstallerCleanup.exe");
-        File.Copy(currentExecutablePath, helperPath, overwrite: false);
-        File.SetAttributes(helperPath, FileAttributes.Normal);
-        return helperPath;
-    }
-
-    private static void WaitForParentProcess(int parentProcessId)
-    {
-        if (parentProcessId <= 0)
+        if (string.IsNullOrWhiteSpace(cleanupHelperPath))
         {
-            return;
-        }
-
-        try
-        {
-            using Process parentProcess = Process.GetProcessById(parentProcessId);
-            parentProcess.WaitForExit(ParentProcessWaitMilliseconds);
-        }
-        catch (ArgumentException)
-        {
-        }
-        catch (Exception e)
-        {
-            Logger.Warning($"[InstallerCleanup] cannot wait for parent process: {e.Message}");
-        }
-
-        Thread.Sleep(DeleteRetryDelayMilliseconds);
-    }
-
-    private static void TryDeleteInstaller(string targetPath)
-    {
-        Exception? lastError = null;
-        for (int attempt = 1; attempt <= DeleteRetryCount; attempt++)
-        {
-            try
-            {
-                if (!File.Exists(targetPath))
-                {
-                    Logger.Information($"[InstallerCleanup] installer already deleted: {targetPath}");
-                    return;
-                }
-
-                File.SetAttributes(targetPath, FileAttributes.Normal);
-                File.Delete(targetPath);
-                if (!File.Exists(targetPath))
-                {
-                    Logger.Information($"[InstallerCleanup] deleted installer: {targetPath}");
-                    return;
-                }
-            }
-            catch (Exception e)
-            {
-                lastError = e;
-            }
-
-            Thread.Sleep(DeleteRetryDelayMilliseconds);
+            throw new ArgumentException("Cleanup helper path is empty.", nameof(cleanupHelperPath));
         }
 
-        Logger.Error($"[InstallerCleanup] installer delete failed: {targetPath}", lastError?.Message ?? string.Empty);
-        TryScheduleDeleteOnReboot(targetPath);
-    }
-
-    private static bool IsSameFileContent(string leftPath, string rightPath)
-    {
-        if (!File.Exists(leftPath) || !File.Exists(rightPath))
+        string fullPath = Path.GetFullPath(cleanupHelperPath);
+        if (!File.Exists(fullPath))
         {
-            return false;
+            throw new FileNotFoundException("[InstallerCleanup] cleanup helper is missing.", fullPath);
         }
 
-        FileInfo left = new(leftPath);
-        FileInfo right = new(rightPath);
-        if (left.Length != right.Length)
+        if (!string.Equals(Path.GetExtension(fullPath), ".exe", StringComparison.OrdinalIgnoreCase))
         {
-            return false;
+            throw new InvalidOperationException("[InstallerCleanup] cleanup helper must be an executable.");
         }
 
-        string leftHash = ComputeSha256(leftPath);
-        string rightHash = ComputeSha256(rightPath);
-        return string.Equals(leftHash, rightHash, StringComparison.Ordinal);
-    }
-
-    private static string ComputeSha256(string path)
-    {
-        using FileStream stream = new(
-            path,
-            FileMode.Open,
-            FileAccess.Read,
-            FileShare.ReadWrite | FileShare.Delete,
-            bufferSize: 1024 * 128,
-            FileOptions.SequentialScan
-        );
-        using SHA256 sha256 = SHA256.Create();
-        return Convert.ToBase64String(sha256.ComputeHash(stream));
-    }
-
-    private static void ScheduleHelperCleanupOnReboot(string helperPath)
-    {
-        TryScheduleDeleteOnReboot(helperPath);
-
-        string? helperDirectory = Path.GetDirectoryName(helperPath);
-        if (!string.IsNullOrWhiteSpace(helperDirectory))
+        if (string.Equals(fullPath, targetPath, StringComparison.OrdinalIgnoreCase))
         {
-            TryScheduleDeleteOnReboot(helperDirectory);
+            throw new InvalidOperationException("[InstallerCleanup] cleanup helper cannot be the installer target.");
         }
-    }
 
-    private static void TryScheduleDeleteOnReboot(string path)
-    {
-        try
-        {
-            if (File.Exists(path) || Directory.Exists(path))
-            {
-                _ = Kernel32.MoveFileEx(path, null!, MoveFileFlags.MOVEFILE_DELAY_UNTIL_REBOOT);
-            }
-        }
-        catch (Exception e)
-        {
-            Logger.Warning($"[InstallerCleanup] cannot schedule cleanup on reboot: {e.Message}");
-        }
+        return fullPath;
     }
 
     private static string GetCurrentExecutablePath()
@@ -267,58 +106,8 @@ public static class InstallerSelfCleanupHelper
         return Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AppDomain.CurrentDomain.FriendlyName));
     }
 
-    private static bool HasArgument(string[] args, string name)
-    {
-        string slashName = "/" + name;
-        string dashName = "-" + name;
-        foreach (string arg in args)
-        {
-            if (
-                string.Equals(arg, slashName, StringComparison.OrdinalIgnoreCase)
-                || string.Equals(arg, dashName, StringComparison.OrdinalIgnoreCase)
-            )
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private static string? GetArgumentValue(string[] args, string name)
-    {
-        string slashPrefix = "/" + name + "=";
-        string dashPrefix = "-" + name + "=";
-        foreach (string arg in args)
-        {
-            if (arg.StartsWith(slashPrefix, StringComparison.OrdinalIgnoreCase))
-            {
-                return arg.Substring(slashPrefix.Length);
-            }
-
-            if (arg.StartsWith(dashPrefix, StringComparison.OrdinalIgnoreCase))
-            {
-                return arg.Substring(dashPrefix.Length);
-            }
-        }
-
-        return null;
-    }
-
-    private static int ParseParentProcessId(string? value)
-    {
-        return int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out int processId)
-            ? processId
-            : 0;
-    }
-
     private static string EncodeArgument(string value)
     {
         return Convert.ToBase64String(Encoding.UTF8.GetBytes(value));
     }
-
-    private static string DecodeArgument(string value)
-    {
-        return Encoding.UTF8.GetString(Convert.FromBase64String(value));
-    }
 }

build/micasetup/overrides/MicaSetup/Program.cs.template

@@ -25,11 +25,6 @@ internal static class Program
     [STAThread]
     internal static void Main()
     {
-        if (InstallerSelfCleanupHelper.TryRunSelfCleanupMode())
-        {
-            return;
-        }
-
         Hosting.CreateBuilder()
             .UseLogger(false)
             .UseSingleInstance("BlackblockInc.CodexCliPlus.Setup")

build/micasetup/overrides/MicaSetup/ViewModels/Inst/FinishViewModel.cs.template

@@ -97,7 +97,7 @@ public partial class FinishViewModel : ObservableObject
                 return;
             }
 
-            InstallerSelfCleanupHelper.ScheduleDelete(currentFullPath);
+            InstallerSelfCleanupHelper.ScheduleDelete(currentFullPath, installedExecutablePath);
             installerDeleteScheduled = true;
             Logger.Information($"[InstallerCleanup] scheduled installer delete: {currentFullPath}");
         }

src/CodexCliPlus.App/App.xaml.cs

@@ -29,6 +29,12 @@ protected override void OnStartup(System.Windows.StartupEventArgs e)
     {
         base.OnStartup(e);
 
+        if (InstallerCleanupMode.TryRun(e.Args, out var installerCleanupExitCode))
+        {
+            Shutdown(installerCleanupExitCode);
+            return;
+        }
+
         var services = new ServiceCollection();
         services.AddCpadInfrastructure();
         services.AddSingleton<IBuildInfo, BuildInfo>();