0.5.14

二次启动拦截，统一了生命进程API

LanMountainDesktop/App.axaml.cs

@@ -12,6 +12,7 @@ using LanMountainDesktop.Services;
 using LanMountainDesktop.ViewModels;
 using LanMountainDesktop.Views;
 using AvaloniaWebView;
+using LanMountainDesktop.PluginSdk;
 
 namespace LanMountainDesktop;
 
@@ -19,12 +20,19 @@ public partial class App : Application
 {
     private readonly AppSettingsService _appSettingsService = new();
     private readonly LocalizationService _localizationService = new();
+    private readonly IHostApplicationLifecycle _hostApplicationLifecycle = new HostApplicationLifecycleService();
+    private bool _exitCleanupCompleted;
 
     private SettingsWindow? _traySettingsWindow;
     private TrayIcons? _trayIcons;
     private PluginRuntimeService? _pluginRuntimeService;
 
+    internal static SingleInstanceService? CurrentSingleInstanceService { get; set; }
+    internal static IHostApplicationLifecycle? CurrentHostApplicationLifecycle =>
+        (Current as App)?._hostApplicationLifecycle;
+
     public PluginRuntimeService? PluginRuntimeService => _pluginRuntimeService;
+    public IHostApplicationLifecycle HostApplicationLifecycle => _hostApplicationLifecycle;
 
     public override void Initialize()
     {
@@ -51,14 +59,14 @@ public partial class App : Application
             desktop.Exit += (_, _) =>
             {
                 AppLogger.Info("App", "Desktop lifetime exit triggered.");
-                AppSettingsService.SettingsSaved -= OnAppSettingsSaved;
-                DisposeTrayIcon();
+                PerformExitCleanup();
             };
             desktop.MainWindow = new MainWindow
             {
                 DataContext = new MainWindowViewModel(),
             };
             AppLogger.Info("App", $"Main window created. LogFile={AppLogger.LogFilePath}");
+            CurrentSingleInstanceService?.StartActivationListener(ActivateMainWindow);
         }
 
         base.OnFrameworkInitializationCompleted();
@@ -66,12 +74,9 @@ public partial class App : Application
 
     private void OnTrayExitClick(object? sender, EventArgs e)
     {
-        DisposeTrayIcon();
-
-        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-        {
-            desktop.Shutdown();
-        }
+        _ = _hostApplicationLifecycle.TryExit(new HostApplicationLifecycleRequest(
+            Source: "TrayMenu",
+            Reason: "User selected Exit App from the tray menu."));
     }
 
     private void OnTraySettingsClick(object? sender, EventArgs e)
@@ -114,18 +119,9 @@ public partial class App : Application
 
     private void OnTrayRestartClick(object? sender, EventArgs e)
     {
-        AppRestartService.TryRestartApplication();
-    }
-
-    private void OnAppSettingsSaved(string _)
-    {
-        Dispatcher.UIThread.Post(() =>
-        {
-            if (_trayIcons is not null)
-            {
-                InitializeTrayIcon();
-            }
-        }, DispatcherPriority.Background);
+        _ = _hostApplicationLifecycle.TryRestart(new HostApplicationLifecycleRequest(
+            Source: "TrayMenu",
+            Reason: "User selected Restart App from the tray menu."));
     }
 
     private void DisableAvaloniaDataAnnotationValidation()
@@ -246,6 +242,95 @@ public partial class App : Application
         _trayIcons = null;
     }
 
+    private void ActivateMainWindow()
+    {
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
+            {
+                return;
+            }
+
+            if (desktop.MainWindow is not Window mainWindow)
+            {
+                return;
+            }
+
+            try
+            {
+                if (!mainWindow.IsVisible)
+                {
+                    mainWindow.Show();
+                }
+
+                if (mainWindow.WindowState == WindowState.Minimized)
+                {
+                    mainWindow.WindowState = WindowState.Normal;
+                }
+
+                mainWindow.Activate();
+                mainWindow.Topmost = true;
+                mainWindow.Topmost = false;
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Warn("SingleInstance", "Failed to activate the existing main window.", ex);
+            }
+        }, DispatcherPriority.Send);
+    }
+
+    private void OnAppSettingsSaved(string _)
+    {
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (_trayIcons is not null)
+            {
+                InitializeTrayIcon();
+            }
+        }, DispatcherPriority.Background);
+    }
+
+    private void PerformExitCleanup()
+    {
+        if (_exitCleanupCompleted)
+        {
+            return;
+        }
+
+        _exitCleanupCompleted = true;
+        AppSettingsService.SettingsSaved -= OnAppSettingsSaved;
+
+        try
+        {
+            _traySettingsWindow?.Close();
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("App", "Failed to close tray-opened settings window during shutdown.", ex);
+        }
+        finally
+        {
+            _traySettingsWindow = null;
+        }
+
+        try
+        {
+            _pluginRuntimeService?.Dispose();
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("PluginRuntime", "Failed to dispose plugin runtime during shutdown.", ex);
+        }
+        finally
+        {
+            _pluginRuntimeService = null;
+        }
+
+        AudioRecorderServiceFactory.DisposeSharedServices();
+        StudyAnalyticsServiceFactory.DisposeSharedService();
+        DisposeTrayIcon();
+    }
+
     private string L(string key, string fallback)
     {
         var snapshot = _appSettingsService.Load();

LanMountainDesktop/Localization/en-US.json

@@ -251,6 +251,7 @@
     "settings.update.status_launching_installer":  "Download complete. Launching installer...",
     "settings.update.status_installer_missing":  "Installer file was not found after download.",
     "settings.update.status_installer_started":  "Installer started. The app will close for update.",
+    "settings.update.status_elevation_cancelled":  "Administrator permission was not granted. Update was cancelled.",
     "settings.update.status_launch_failed_format":  "Failed to start installer: {0}",
     "settings.about.title":  "About",
     "settings.about.version_format":  "Version: {0}",

LanMountainDesktop/Localization/zh-CN.json

@@ -251,6 +251,7 @@
     "settings.update.status_launching_installer":  "下载完成，正在启动安装程序...",
     "settings.update.status_installer_missing":  "下载后未找到安装包文件。",
     "settings.update.status_installer_started":  "安装程序已启动，应用将关闭进行更新。",
+    "settings.update.status_elevation_cancelled":  "未授予管理员权限，更新已取消。",
     "settings.update.status_launch_failed_format":  "启动安装程序失败：{0}",
     "settings.about.title":  "关于",
     "settings.about.version_format":  "版本号: {0}",

LanMountainDesktop/Program.cs

@@ -17,6 +17,15 @@ sealed class Program
         AppLogger.Initialize();
         RegisterGlobalExceptionLogging();
 
+        using var singleInstance = SingleInstanceService.CreateDefault();
+        if (!singleInstance.IsPrimaryInstance)
+        {
+            AppLogger.Warn("Startup", "A secondary launch was blocked because another instance is already running.");
+            var notified = singleInstance.TryNotifyPrimaryInstance(TimeSpan.FromSeconds(2));
+            ShowAlreadyRunningNotice(notified);
+            return;
+        }
+
         var diagnostics = StartupDiagnosticsService.Run(args);
         StartupDiagnosticsService.ShowLegacyExecutableWarningIfNeeded(diagnostics);
 
@@ -24,6 +33,7 @@ sealed class Program
         {
             var renderMode = LoadConfiguredRenderMode();
             AppLogger.Info("Startup", $"Resolved render mode '{renderMode}'.");
+            App.CurrentSingleInstanceService = singleInstance;
             BuildAvaloniaApp(renderMode).StartWithClassicDesktopLifetime(args);
             AppLogger.Info("Startup", "Application exited normally.");
         }
@@ -32,6 +42,10 @@ sealed class Program
             AppLogger.Critical("Startup", "Application terminated during startup.", ex);
             throw;
         }
+        finally
+        {
+            App.CurrentSingleInstanceService = null;
+        }
     }
 
     // Avalonia configuration, don't remove; also used by visual designer.
@@ -71,6 +85,16 @@ sealed class Program
         }
     }
 
+    private static void ShowAlreadyRunningNotice(bool notifiedPrimaryInstance)
+    {
+        const string caption = "LanMountainDesktop";
+        var message = notifiedPrimaryInstance
+            ? "应用已打开，不需要多开了。\r\n\r\n已为你切换到正在运行的阑山桌面。"
+            : "应用已打开，不需要多开了。\r\n\r\n请切换到正在运行的阑山桌面。";
+
+        WindowsNativeDialogService.ShowInformation(caption, message);
+    }
+
     private static void RegisterGlobalExceptionLogging()
     {
         AppDomain.CurrentDomain.UnhandledException += (_, eventArgs) =>

LanMountainDesktop/Services/AppRestartService.cs

@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
+using LanMountainDesktop.PluginSdk;
 
 namespace LanMountainDesktop.Services;
 
@@ -12,17 +11,9 @@ public static class AppRestartService
 {
     public static bool TryRestartApplication()
     {
-        if (!TryRestartCurrentProcess())
-        {
-            return false;
-        }
-
-        if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-        {
-            desktop.Shutdown();
-        }
-
-        return true;
+        return App.CurrentHostApplicationLifecycle?.TryRestart(new HostApplicationLifecycleRequest(
+            Source: nameof(AppRestartService),
+            Reason: "Legacy restart entry point invoked.")) == true;
     }
 
     public static bool TryRestartCurrentProcess()

LanMountainDesktop/Services/HostApplicationLifecycleService.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Diagnostics;
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Threading;
+using LanMountainDesktop.PluginSdk;
+
+namespace LanMountainDesktop.Services;
+
+public sealed class HostApplicationLifecycleService : IHostApplicationLifecycle
+{
+    public bool TryExit(HostApplicationLifecycleRequest? request = null)
+    {
+        try
+        {
+            AppLogger.Info(
+                "HostLifecycle",
+                $"Exit requested. Source='{request?.Source ?? "Unknown"}'; Reason='{request?.Reason ?? string.Empty}'.");
+
+            if (Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
+            {
+                AppLogger.Warn("HostLifecycle", "Exit request ignored because desktop lifetime is unavailable.");
+                return false;
+            }
+
+            if (Dispatcher.UIThread.CheckAccess())
+            {
+                desktop.Shutdown();
+            }
+            else
+            {
+                Dispatcher.UIThread.Post(() => desktop.Shutdown(), DispatcherPriority.Send);
+            }
+
+            return true;
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("HostLifecycle", "Failed to exit the application.", ex);
+            return false;
+        }
+    }
+
+    public bool TryRestart(HostApplicationLifecycleRequest? request = null)
+    {
+        try
+        {
+            var startInfo = AppRestartService.CreateRestartStartInfo();
+            if (startInfo is null)
+            {
+                AppLogger.Warn(
+                    "HostLifecycle",
+                    $"Restart request rejected because restart start info could not be resolved. Source='{request?.Source ?? "Unknown"}'.");
+                return false;
+            }
+
+            Process.Start(startInfo);
+            var exitRequest = request is null
+                ? new HostApplicationLifecycleRequest(Reason: "Restart accepted.")
+                : request with
+                {
+                    Reason = string.IsNullOrWhiteSpace(request.Reason)
+                        ? "Restart accepted."
+                        : request.Reason
+                };
+
+            return TryExit(exitRequest);
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("HostLifecycle", "Failed to restart the application.", ex);
+            return false;
+        }
+    }
+}

LanMountainDesktop/Services/IAudioRecorderService.cs

@@ -80,6 +80,19 @@ public static class AudioRecorderServiceFactory
     {
         return CreateRecorder();
     }
+
+    public static void DisposeSharedServices()
+    {
+        if (SharedRecorderService.IsValueCreated)
+        {
+            SharedRecorderService.Value.Dispose();
+        }
+
+        if (SharedStudyMonitoringService.IsValueCreated)
+        {
+            SharedStudyMonitoringService.Value.Dispose();
+        }
+    }
 }
 
 internal sealed class NoOpAudioRecorderService(string reason) : IAudioRecorderService

LanMountainDesktop/Services/SingleInstanceService.cs

@@ -0,0 +1,151 @@
+using System;
+using System.IO.Pipes;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace LanMountainDesktop.Services;
+
+public sealed class SingleInstanceService : IDisposable
+{
+    private readonly Mutex _mutex;
+    private readonly string _pipeName;
+    private readonly CancellationTokenSource _listenCts = new();
+    private bool _ownsMutex;
+    private bool _disposed;
+    private Task? _listenTask;
+
+    private SingleInstanceService(string mutexName, string pipeName)
+    {
+        _mutex = new Mutex(initiallyOwned: false, mutexName);
+        _pipeName = pipeName;
+        try
+        {
+            _ownsMutex = _mutex.WaitOne(TimeSpan.Zero, exitContext: false);
+        }
+        catch (AbandonedMutexException)
+        {
+            _ownsMutex = true;
+        }
+    }
+
+    public bool IsPrimaryInstance => _ownsMutex;
+
+    public static SingleInstanceService CreateDefault()
+    {
+        const string appId = "LanMountainDesktop";
+        var userName = Environment.UserName;
+        var scopeSeed = $"{appId}:{userName}";
+        var scopeHash = Convert.ToHexString(SHA256.HashData(Encoding.UTF8.GetBytes(scopeSeed)));
+        var suffix = scopeHash[..16];
+        var mutexName = OperatingSystem.IsWindows()
+            ? $"Local\\{appId}.SingleInstance.{suffix}"
+            : $"{appId}.SingleInstance.{suffix}";
+        return new SingleInstanceService(
+            mutexName,
+            $"{appId}.Activate.{suffix}");
+    }
+
+    public void StartActivationListener(Action onActivationRequested)
+    {
+        ArgumentNullException.ThrowIfNull(onActivationRequested);
+
+        if (!_ownsMutex || _disposed || _listenTask is not null)
+        {
+            return;
+        }
+
+        _listenTask = Task.Run(() => ListenForActivationAsync(onActivationRequested, _listenCts.Token));
+    }
+
+    public bool TryNotifyPrimaryInstance(TimeSpan timeout)
+    {
+        if (_ownsMutex || _disposed)
+        {
+            return false;
+        }
+
+        try
+        {
+            using var client = new NamedPipeClientStream(
+                serverName: ".",
+                pipeName: _pipeName,
+                direction: PipeDirection.Out,
+                options: PipeOptions.Asynchronous);
+
+            client.Connect((int)Math.Max(1, timeout.TotalMilliseconds));
+            client.WriteByte(1);
+            client.Flush();
+            return true;
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("SingleInstance", "Failed to notify the primary instance.", ex);
+            return false;
+        }
+    }
+
+    public void Dispose()
+    {
+        if (_disposed)
+        {
+            return;
+        }
+
+        _disposed = true;
+        _listenCts.Cancel();
+        try
+        {
+            _listenTask?.Wait(TimeSpan.FromSeconds(1));
+        }
+        catch
+        {
+            // Ignore listener shutdown races during process exit.
+        }
+
+        _listenCts.Dispose();
+        if (_ownsMutex)
+        {
+            try
+            {
+                _mutex.ReleaseMutex();
+            }
+            catch (ApplicationException)
+            {
+                // Ownership may already be lost during shutdown.
+            }
+        }
+
+        _mutex.Dispose();
+    }
+
+    private async Task ListenForActivationAsync(Action onActivationRequested, CancellationToken cancellationToken)
+    {
+        while (!cancellationToken.IsCancellationRequested)
+        {
+            try
+            {
+                using var server = new NamedPipeServerStream(
+                    _pipeName,
+                    PipeDirection.In,
+                    1,
+                    PipeTransmissionMode.Byte,
+                    PipeOptions.Asynchronous);
+
+                await server.WaitForConnectionAsync(cancellationToken).ConfigureAwait(false);
+                await server.ReadAsync(new byte[1], cancellationToken).ConfigureAwait(false);
+                onActivationRequested();
+            }
+            catch (OperationCanceledException)
+            {
+                break;
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Warn("SingleInstance", "Activation listener failed.", ex);
+                await Task.Delay(TimeSpan.FromMilliseconds(250), cancellationToken).ConfigureAwait(false);
+            }
+        }
+    }
+}

LanMountainDesktop/Services/StudyAnalyticsService.cs

@@ -16,6 +16,14 @@ public static class StudyAnalyticsServiceFactory
     {
         return SharedService.Value;
     }
+
+    public static void DisposeSharedService()
+    {
+        if (SharedService.IsValueCreated)
+        {
+            SharedService.Value.Dispose();
+        }
+    }
 }
 
 public sealed class StudyAnalyticsService : IStudyAnalyticsService
@@ -446,6 +454,7 @@ public sealed class StudyAnalyticsService : IStudyAnalyticsService
             _disposed = true;
             StopTimerLocked();
             _samplingTimer.Dispose();
+            _audioRecorderService.Dispose();
         }
     }
 
@@ -759,4 +768,3 @@ public sealed class StudyAnalyticsService : IStudyAnalyticsService
         _lastSessionReport = null;
     }
 }
-

LanMountainDesktop/Services/WindowsNativeDialogService.cs

@@ -6,9 +6,20 @@ namespace LanMountainDesktop.Services;
 internal static class WindowsNativeDialogService
 {
     private const uint Ok = 0x00000000;
+    private const uint IconInformation = 0x00000040;
     private const uint IconWarning = 0x00000030;
 
+    public static void ShowInformation(string caption, string message)
+    {
+        Show(caption, message, Ok | IconInformation, "NativeDialog");
+    }
+
     public static void ShowWarning(string caption, string message)
+    {
+        Show(caption, message, Ok | IconWarning, "StartupDiagnostics");
+    }
+
+    private static void Show(string caption, string message, uint type, string logCategory)
     {
         if (!OperatingSystem.IsWindows())
         {
@@ -17,11 +28,11 @@ internal static class WindowsNativeDialogService
 
         try
         {
-            _ = MessageBoxW(IntPtr.Zero, message, caption, Ok | IconWarning);
+            _ = MessageBoxW(IntPtr.Zero, message, caption, type);
         }
         catch (Exception ex)
         {
-            AppLogger.Warn("StartupDiagnostics", "Failed to show legacy executable warning dialog.", ex);
+            AppLogger.Warn(logCategory, "Failed to show native dialog.", ex);
         }
     }
 

LanMountainDesktop/Views/MainWindow.RestartPrompt.cs

@@ -2,6 +2,7 @@ using System.Threading.Tasks;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
+using LanMountainDesktop.PluginSdk;
 using LanMountainDesktop.Services;
 
 namespace LanMountainDesktop.Views;
@@ -77,7 +78,9 @@ public partial class MainWindow
             var result = await dialog.ShowAsync(this);
             if (result == ContentDialogResult.Primary)
             {
-                if (!AppRestartService.TryRestartApplication())
+                if (App.CurrentHostApplicationLifecycle?.TryRestart(new HostApplicationLifecycleRequest(
+                        Source: nameof(MainWindow),
+                        Reason: "User confirmed a pending restart prompt.")) != true)
                 {
                     UpdatePendingRestartDock();
                 }

LanMountainDesktop/Views/MainWindow.Update.cs

@@ -1,11 +1,12 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Threading;
 using LanMountainDesktop.Models;
+using LanMountainDesktop.PluginSdk;
 using LanMountainDesktop.Services;
 
 namespace LanMountainDesktop.Views;
@@ -357,7 +358,8 @@ public partial class MainWindow
             {
                 FileName = installerPath,
                 WorkingDirectory = Path.GetDirectoryName(installerPath) ?? Environment.CurrentDirectory,
-                UseShellExecute = true
+                UseShellExecute = true,
+                Verb = "runas"
             });
 
             _updateStatusText = L(
@@ -365,7 +367,16 @@ public partial class MainWindow
                 "Installer started. The app will close for update.");
             UpdateUpdatePanelState();
 
-            Dispatcher.UIThread.Post(Close, DispatcherPriority.Background);
+            _ = App.CurrentHostApplicationLifecycle?.TryExit(new HostApplicationLifecycleRequest(
+                Source: nameof(MainWindow),
+                Reason: "Update installer started successfully."));
+        }
+        catch (Win32Exception ex) when (ex.NativeErrorCode == 1223)
+        {
+            _updateStatusText = L(
+                "settings.update.status_elevation_cancelled",
+                "Administrator permission was not granted. Update was cancelled.");
+            UpdateUpdatePanelState();
         }
         catch (Exception ex)
         {

LanMountainDesktop/Views/SettingsWindow.RestartPrompt.cs

@@ -2,6 +2,7 @@ using System.Threading.Tasks;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
+using LanMountainDesktop.PluginSdk;
 using LanMountainDesktop.Services;
 
 namespace LanMountainDesktop.Views;
@@ -77,7 +78,9 @@ public partial class SettingsWindow
             var result = await dialog.ShowAsync(this);
             if (result == ContentDialogResult.Primary)
             {
-                if (!AppRestartService.TryRestartApplication())
+                if (App.CurrentHostApplicationLifecycle?.TryRestart(new HostApplicationLifecycleRequest(
+                        Source: nameof(SettingsWindow),
+                        Reason: "User confirmed a pending restart prompt from settings.")) != true)
                 {
                     UpdatePendingRestartDock();
                 }

LanMountainDesktop/Views/SettingsWindow.Update.cs

@@ -1,13 +1,12 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Interactivity;
-using Avalonia.Threading;
 using LanMountainDesktop.Models;
+using LanMountainDesktop.PluginSdk;
 using LanMountainDesktop.Services;
 
 namespace LanMountainDesktop.Views;
@@ -250,23 +249,23 @@ public partial class SettingsWindow
             {
                 FileName = installerPath,
                 WorkingDirectory = Path.GetDirectoryName(installerPath) ?? Environment.CurrentDirectory,
-                UseShellExecute = true
+                UseShellExecute = true,
+                Verb = "runas"
             });
 
             _updateStatusText = L("settings.update.status_installer_started", "Installer started. The app will close for update.");
             UpdateUpdatePanelState();
 
-            Dispatcher.UIThread.Post(() =>
-            {
-                if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-                {
-                    desktop.Shutdown();
-                }
-                else
-                {
-                    Close();
-                }
-            }, DispatcherPriority.Background);
+            _ = App.CurrentHostApplicationLifecycle?.TryExit(new HostApplicationLifecycleRequest(
+                Source: nameof(SettingsWindow),
+                Reason: "Update installer started successfully from settings."));
+        }
+        catch (Win32Exception ex) when (ex.NativeErrorCode == 1223)
+        {
+            _updateStatusText = L(
+                "settings.update.status_elevation_cancelled",
+                "Administrator permission was not granted. Update was cancelled.");
+            UpdateUpdatePanelState();
         }
         catch (Exception ex)
         {

LanMountainDesktop/installer/LanMountainDesktop.iss

@@ -38,6 +38,8 @@ OutputBaseFilename={#MyAppName}-Setup-{#MyAppVersion}-{#MyAppArch}
 Compression=lzma2/ultra64
 SolidCompression=yes
 WizardStyle=modern
+; Leave PrivilegesRequiredOverridesAllowed unset so users cannot downgrade
+; installation mode via dialog or /ALLUSERS /CURRENTUSER command-line switches.
 PrivilegesRequired=admin
 CloseApplications=yes
 CloseApplicationsFilter={#MyAppExeName}

LanMountainDesktop/plugins/PluginRuntimeService.cs

@@ -21,6 +21,7 @@ public sealed class PluginRuntimeService : IDisposable
 
     private readonly PluginLoader _loader;
     private readonly AppSettingsService _appSettingsService = new();
+    private readonly IHostApplicationLifecycle _applicationLifecycle = new HostApplicationLifecycleService();
     private readonly IServiceProvider _hostServices;
     private readonly IPluginPackageManager _packageManager;
     private readonly List<LoadedPlugin> _loadedPlugins = [];
@@ -34,7 +35,7 @@ public sealed class PluginRuntimeService : IDisposable
     {
         PluginsDirectory = Path.Combine(AppContext.BaseDirectory, "Extensions", "Plugins");
         _packageManager = new PluginRuntimePackageManager(this);
-        _hostServices = new PluginHostServiceProvider(_packageManager);
+        _hostServices = new PluginHostServiceProvider(_packageManager, _applicationLifecycle);
         _loader = new PluginLoader(CreateOptions());
     }
 
@@ -679,17 +680,29 @@ public sealed class PluginRuntimeService : IDisposable
     private sealed class PluginHostServiceProvider : IServiceProvider
     {
         private readonly IPluginPackageManager _packageManager;
+        private readonly IHostApplicationLifecycle _applicationLifecycle;
 
-        public PluginHostServiceProvider(IPluginPackageManager packageManager)
+        public PluginHostServiceProvider(
+            IPluginPackageManager packageManager,
+            IHostApplicationLifecycle applicationLifecycle)
         {
             _packageManager = packageManager;
+            _applicationLifecycle = applicationLifecycle;
         }
 
         public object? GetService(Type serviceType)
         {
-            return serviceType == typeof(IPluginPackageManager)
-                ? _packageManager
-                : null;
+            if (serviceType == typeof(IPluginPackageManager))
+            {
+                return _packageManager;
+            }
+
+            if (serviceType == typeof(IHostApplicationLifecycle))
+            {
+                return _applicationLifecycle;
+            }
+
+            return null;
         }
     }