Launcher fix (#6)

* fix.hy3试图修复中

* Resolve dev paths and fix splash UI thread

Compute a solutionRoot and expand development search paths (LanMountainDesktop and dev-test) in DeploymentLocator, add logging when scanning/finding hosts, and return distinct full paths. Ensure backward-compatible path checks. Fix cross-thread UI calls: invoke splashWindow.DismissAsync on the UI thread in LauncherFlowCoordinator, and make SplashWindow.DismissAsync ensure it runs on the UI thread before closing (simplified Close call). These changes improve development host discovery and prevent UI-thread access issues during shutdown.

* Add configurable data location (portable/system)

Introduce support for choosing and resolving the application's data root (system user dir vs. portable app folder). Adds DataLocationConfig model, DataLocationResolver (load/save/resolve/migrate), a UI prompt (DataLocationPromptWindow) and an OOBE step (DataLocationOobeStep) to let users pick and optionally migrate existing data. Wire the chosen data root into the launcher flow and host launch plan (forwarded via --data-root and LMD_DATA_ROOT), and add AppDataPathProvider to let runtime services read the effective data root (initialized in Program.Main). Update various services (logging, settings, DB, plugin/market, startup registry, etc.) to use the new provider/resolver and register the config type in the JSON context. This enables portable installs, safe migration, and runtime overrides via CLI or environment variable.

* Add dev/debug startup flow and launch profiles

Handle design-time initialization and add a developer debug startup path: App now skips normal startup when in design mode and shows a DevDebugWindow when running in debug (unless a preview or apply-update command). CommandContext.IsDebugMode is extended to include DOTNET_ENVIRONMENT=Development via a new IsDevelopmentEnvironment helper. Program.Main and BuildAvaloniaApp are made public to aid tooling. Added multiple launchSettings profiles for debug and preview commands that set DOTNET_ENVIRONMENT=Development to simplify IDE debugging and UI previewing.

* Simplify splash to fade; add themed about banners

Simplify splash startup visuals by removing the multi-mode/slide behavior and always using a fade animation. Update App to create SplashWindow without a StartupVisualMode parameter and remove related fields, layout configuration, slide animation, and easing helpers from SplashWindow. Clean up unused using. Replace the single about_banner asset with theme-aware variants (about_banner_dark.png and about_banner_light.png), delete the old about_banner.png, and update AboutSettingsPage to use a DynamicResource ImageBrush (AboutBannerBrush) that selects the appropriate banner per theme.

* Use AppJsonContext for startup state serialization

Switch serialization to the source-generated System.Text.Json context: add JsonSerializable(typeof(StartupAttemptRecord)) to AppJsonContext and replace the previous JsonSerializerOptions-based Serialize/Deserialize calls with AppJsonContext.Default.StartupAttemptRecord. Also remove the now-unused SerializerOptions field. Additionally, update .gitignore to exclude /test-aot-publish.

* Add OOBE redesign, theme & data location support

Introduce a redesigned OOBE flow and data-location/theme support across the launcher. Adds a new ThemeService for applying light/dark and accent colors; integrates FluentIcons.Avalonia package for icons. Overhauls OobeWindow (UX animations, typing effect, multi-step theme and data-location pages, Monet options, and final welcome step) and its code-behind to handle step navigation, accent selection, and data-location resolution. Adds DataLocation UI and handlers (DataLocationPromptWindow changes, DataLocation resolver usage) and wires a DevDebug UI for toggling/opening the data-location page. UpdateEngineService now resolves the launcher root via DataLocationResolver. Misc: update various view models, localization entries and remove TrimmerRoots.xml.

* Refactor data location paths and add background service

Refactor DataLocationResolver to centralize data path resolution (ResolveLauncherDataPath, ResolveDesktopDataPath, ResolveConfigPath, ResolveLauncherLogsPath, ResolveLauncherStatePath) and replace usages of the previous ".launcher" layout with a "Launcher" folder. Update API: LoadConfig/SaveConfig reorganized and ApplyLocationChoice now accepts an optional custom path and migration flag; migration logic updated accordingly. Update dependent services and views (Logger, DeploymentLocator, UpdateEngineService, OobeStateService, StartupAttemptRegistry, LauncherDebugSettingsStore, OobeWindow) to use the new resolver APIs and paths. Add LauncherBackgroundService to load/validate/cache a custom splash background image and wire it into SplashWindow (AXAML/Axaml.cs) with UI placeholders and overlay. Misc: minor cleanup of Oobe/Splash XAML and related code adjustments and logging improvements.

LanMountainDesktop.Launcher/Services/DataLocationOobeStep.cs

@@ -0,0 +1,67 @@
+using Avalonia.Threading;
+using LanMountainDesktop.Launcher.Models;
+using LanMountainDesktop.Launcher.Views;
+
+namespace LanMountainDesktop.Launcher.Services;
+
+internal sealed class DataLocationOobeStep : IOobeStep
+{
+    private readonly DataLocationResolver _resolver;
+
+    public DataLocationOobeStep(DataLocationResolver resolver)
+    {
+        _resolver = resolver;
+    }
+
+    public async Task RunAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+
+        var existingConfig = _resolver.LoadConfig();
+        if (existingConfig is not null)
+        {
+            Logger.Info("DataLocation OOBE step skipped: config already exists.");
+            return;
+        }
+
+        DataLocationPromptWindow? window = null;
+        await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            window = new DataLocationPromptWindow(_resolver);
+            window.Show();
+        });
+
+        if (window is null)
+        {
+            Logger.Warn("DataLocation OOBE step failed: window could not be created.");
+            return;
+        }
+
+        try
+        {
+            var result = await window.WaitForChoiceAsync().ConfigureAwait(false);
+            if (result is null)
+            {
+                Logger.Info("DataLocation OOBE step: user cancelled or closed window. Using default system location.");
+                _resolver.ApplyLocationChoice(DataLocationMode.System, null, false);
+            }
+            else
+            {
+                var success = _resolver.ApplyLocationChoice(result.SelectedMode, null, result.MigrateExistingData);
+                Logger.Info(
+                    $"DataLocation OOBE step: user selected '{result.SelectedMode}'. " +
+                    $"Migrate={result.MigrateExistingData}; Success={success}.");
+            }
+        }
+        finally
+        {
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                if (window.IsVisible)
+                {
+                    window.Close();
+                }
+            });
+        }
+    }
+}

LanMountainDesktop.Launcher/Services/DataLocationResolver.cs

@@ -0,0 +1,270 @@
+using System.Text.Json;
+using LanMountainDesktop.Launcher.Models;
+
+namespace LanMountainDesktop.Launcher.Services;
+
+internal sealed class DataLocationResolver
+{
+    private const string ConfigFileName = "data-location.config.json";
+    private const string LauncherFolderName = "Launcher";
+    private const string DesktopFolderName = "Desktop";
+
+    private readonly string _appRoot;
+    private readonly string _defaultSystemDataPath;
+
+    public DataLocationResolver(string appRoot)
+    {
+        _appRoot = Path.GetFullPath(appRoot);
+        _defaultSystemDataPath = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            "LanMountainDesktop");
+    }
+
+    public string AppRoot => _appRoot;
+
+    /// <summary>
+    /// 默认系统数据路径（用户目录）
+    /// </summary>
+    public string DefaultSystemDataPath => _defaultSystemDataPath;
+
+    /// <summary>
+    /// 默认便携模式数据路径（应用目录下的 AppData）
+    /// </summary>
+    public string DefaultPortableDataPath => Path.Combine(_appRoot, "AppData");
+
+    /// <summary>
+    /// 检查是否允许便携模式（应用目录是否可写）
+    /// </summary>
+    public bool IsPortableModeAllowed()
+    {
+        try
+        {
+            var testFile = Path.Combine(_appRoot, $".write-test-{Guid.NewGuid():N}.tmp");
+            File.WriteAllText(testFile, string.Empty);
+            File.Delete(testFile);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// 解析数据根目录（用户选择的位置）
+    /// </summary>
+    public string ResolveDataRoot()
+    {
+        var config = LoadConfig();
+        if (config is null)
+        {
+            return _defaultSystemDataPath;
+        }
+
+        if (string.Equals(config.DataLocationMode, "Portable", StringComparison.OrdinalIgnoreCase))
+        {
+            var portablePath = !string.IsNullOrWhiteSpace(config.PortableDataPath)
+                ? config.PortableDataPath
+                : _defaultSystemDataPath;
+            return Path.GetFullPath(portablePath);
+        }
+
+        return !string.IsNullOrWhiteSpace(config.SystemDataPath)
+            ? Path.GetFullPath(config.SystemDataPath)
+            : _defaultSystemDataPath;
+    }
+
+    /// <summary>
+    /// 启动器数据目录（日志、配置、状态等）
+    /// </summary>
+    public string ResolveLauncherDataPath()
+    {
+        return Path.Combine(ResolveDataRoot(), LauncherFolderName);
+    }
+
+    /// <summary>
+    /// 桌面应用数据目录（组件、设置、插件等）
+    /// </summary>
+    public string ResolveDesktopDataPath()
+    {
+        return Path.Combine(ResolveDataRoot(), DesktopFolderName);
+    }
+
+    /// <summary>
+    /// 数据位置配置文件路径（保存在 Launcher 目录下）
+    /// </summary>
+    public string ResolveConfigPath()
+    {
+        return Path.Combine(ResolveLauncherDataPath(), ConfigFileName);
+    }
+
+    /// <summary>
+    /// 启动器日志目录
+    /// </summary>
+    public string ResolveLauncherLogsPath()
+    {
+        return Path.Combine(ResolveLauncherDataPath(), "logs");
+    }
+
+    /// <summary>
+    /// 启动器状态目录
+    /// </summary>
+    public string ResolveLauncherStatePath()
+    {
+        return Path.Combine(ResolveLauncherDataPath(), "state");
+    }
+
+    public DataLocationMode ResolveMode()
+    {
+        var config = LoadConfig();
+        if (config is null)
+        {
+            return DataLocationMode.System;
+        }
+
+        return string.Equals(config.DataLocationMode, "Portable", StringComparison.OrdinalIgnoreCase)
+            ? DataLocationMode.Portable
+            : DataLocationMode.System;
+    }
+
+    public DataLocationConfig? LoadConfig()
+    {
+        try
+        {
+            var configPath = ResolveConfigPath();
+            if (!File.Exists(configPath))
+            {
+                return null;
+            }
+
+            var json = File.ReadAllText(configPath);
+            return JsonSerializer.Deserialize(json, AppJsonContext.Default.DataLocationConfig);
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Failed to load data location config. Error='{ex.Message}'.");
+            return null;
+        }
+    }
+
+    public bool SaveConfig(DataLocationConfig config)
+    {
+        try
+        {
+            var launcherPath = ResolveLauncherDataPath();
+            Directory.CreateDirectory(launcherPath);
+
+            var configPath = ResolveConfigPath();
+            var json = JsonSerializer.Serialize(config, AppJsonContext.Default.DataLocationConfig);
+            File.WriteAllText(configPath, json);
+            return true;
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Failed to save data location config. Error='{ex.Message}'.");
+            return false;
+        }
+    }
+
+    public bool ApplyLocationChoice(DataLocationMode mode, string? customPath = null, bool migrateExistingData = false)
+    {
+        var targetDataRoot = mode == DataLocationMode.Portable && !string.IsNullOrWhiteSpace(customPath)
+            ? Path.GetFullPath(customPath)
+            : _defaultSystemDataPath;
+
+        var config = new DataLocationConfig
+        {
+            DataLocationMode = mode.ToString(),
+            SystemDataPath = _defaultSystemDataPath,
+            PortableDataPath = mode == DataLocationMode.Portable ? targetDataRoot : null
+        };
+
+        // 先创建目录结构
+        try
+        {
+            Directory.CreateDirectory(ResolveLauncherDataPath());
+            Directory.CreateDirectory(ResolveDesktopDataPath());
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Failed to create data directories. Error='{ex.Message}'.");
+            return false;
+        }
+
+        // 保存配置
+        if (!SaveConfig(config))
+        {
+            return false;
+        }
+
+        if (migrateExistingData && mode == DataLocationMode.Portable)
+        {
+            MigrateSystemDataToPortable(targetDataRoot);
+        }
+
+        return true;
+    }
+
+    public bool HasExistingSystemData()
+    {
+        var desktopPath = Path.Combine(_defaultSystemDataPath, DesktopFolderName);
+        if (!Directory.Exists(desktopPath))
+        {
+            return false;
+        }
+
+        var markerFiles = new[]
+        {
+            Path.Combine(desktopPath, "settings.json"),
+            Path.Combine(desktopPath, "component-state.db"),
+            Path.Combine(desktopPath, "app.db")
+        };
+
+        return markerFiles.Any(File.Exists);
+    }
+
+    private void MigrateSystemDataToPortable(string targetDataRoot)
+    {
+        if (!HasExistingSystemData())
+        {
+            return;
+        }
+
+        var sourceDesktopPath = Path.Combine(_defaultSystemDataPath, DesktopFolderName);
+        var targetDesktopPath = Path.Combine(targetDataRoot, DesktopFolderName);
+
+        try
+        {
+            Directory.CreateDirectory(targetDesktopPath);
+
+            // 迁移桌面数据
+            if (Directory.Exists(sourceDesktopPath))
+            {
+                CopyDirectory(sourceDesktopPath, targetDesktopPath);
+            }
+
+            Logger.Info($"Data migration completed. Target='{targetDataRoot}'.");
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Data migration failed. Target='{targetDataRoot}'. Error='{ex.Message}'.");
+        }
+    }
+
+    private static void CopyDirectory(string sourceDir, string destDir)
+    {
+        Directory.CreateDirectory(destDir);
+
+        foreach (var file in Directory.GetFiles(sourceDir))
+        {
+            var destFile = Path.Combine(destDir, Path.GetFileName(file));
+            File.Copy(file, destFile, overwrite: true);
+        }
+
+        foreach (var subDir in Directory.GetDirectories(sourceDir))
+        {
+            var destSubDir = Path.Combine(destDir, Path.GetFileName(subDir));
+            CopyDirectory(subDir, destSubDir);
+        }
+    }
+}

LanMountainDesktop.Launcher/Services/DeploymentLocator.cs

@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Text.Json;
 using LanMountainDesktop.Launcher.Models;
 using LanMountainDesktop.Shared.Contracts.Launcher;
@@ -360,51 +360,59 @@ internal sealed class DeploymentLocator
     /// </summary>
     private static string? ScanDevelopmentPaths(string executable)
     {
+        var solutionRoot = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "..", "..", "..", ".."));
+        
         var possiblePaths = new[]
         {
-            // 浠?Launcher 椤圭洰杩愯
+            // 标准开发路径：解决方案根目录下的 LanMountainDesktop 项目
+            Path.Combine(solutionRoot, "LanMountainDesktop", "bin", "Debug", "net10.0", executable),
+            Path.Combine(solutionRoot, "LanMountainDesktop", "bin", "Release", "net10.0", executable),
+            
+            // 向后兼容
             Path.Combine(AppContext.BaseDirectory, "..", "..", "LanMountainDesktop", "bin", "Debug", "net10.0", executable),
             Path.Combine(AppContext.BaseDirectory, "..", "..", "LanMountainDesktop", "bin", "Release", "net10.0", executable),
             
-            // 浠庤В鍐虫柟妗堟牴鐩綍杩愯
-            Path.Combine(AppContext.BaseDirectory, "..", "LanMountainDesktop", "bin", "Debug", "net10.0", executable),
-            Path.Combine(AppContext.BaseDirectory, "..", "LanMountainDesktop", "bin", "Release", "net10.0", executable),
-            
-            // dev-test 鐩綍
-            Path.Combine(AppContext.BaseDirectory, "..", "dev-test", "app-1.0.0-dev", executable),
+            // dev-test 目录
+            Path.Combine(solutionRoot, "dev-test", "app-1.0.0-dev", executable),
         };
 
         foreach (var path in possiblePaths.Select(Path.GetFullPath).Distinct())
         {
+            Logger.Info($"Scanning development path: {path}");
             if (File.Exists(path))
             {
+                Logger.Info($"Found host at: {path}");
                 return path;
             }
         }
 
         return null;
-    }
-
+     }
+    
     /// <summary>
-    /// 鑾峰彇寮€鍙戠幆澧冨彲鑳界殑涓荤▼搴忚矾寰?    /// </summary>
+    /// 鑾峰彇寮€鍙戞ā寮忥細鏌ユ壘涓荤▼搴忚経
+    /// </summary>
     private static IEnumerable<string> GetDevelopmentPaths(string executable)
     {
         var launcherDir = AppContext.BaseDirectory;
         
+        // 计算解决方案根目录：从 LanMountainDesktop.Launcher\bin\Debug\net10.0\ 向上4级
+        var solutionRoot = Path.GetFullPath(Path.Combine(launcherDir, "..", "..", "..", ".."));
+        
         var possiblePaths = new[]
         {
-            // 浠?Launcher 椤圭洰杩愯锛?.\LanMountainDesktop\bin\Debug\net10.0\LanMountainDesktop.exe
+            // 标准开发路径：解决方案根目录下的 LanMountainDesktop 项目
+            Path.Combine(solutionRoot, "LanMountainDesktop", "bin", "Debug", "net10.0", executable),
+            Path.Combine(solutionRoot, "LanMountainDesktop", "bin", "Release", "net10.0", executable),
+            
+            // 向后兼容：如果 Launcher 在特殊目录结构中
             Path.Combine(launcherDir, "..", "..", "LanMountainDesktop", "bin", "Debug", "net10.0", executable),
             Path.Combine(launcherDir, "..", "..", "LanMountainDesktop", "bin", "Release", "net10.0", executable),
             
-            // 浠庤В鍐虫柟妗堟牴鐩綍杩愯锛歀anMountainDesktop\bin\Debug\net10.0\LanMountainDesktop.exe
-            Path.Combine(launcherDir, "..", "LanMountainDesktop", "bin", "Debug", "net10.0", executable),
-            Path.Combine(launcherDir, "..", "LanMountainDesktop", "bin", "Release", "net10.0", executable),
-            
-            // 浠?dev-test 鐩綍杩愯
-            Path.Combine(launcherDir, "..", "dev-test", "app-1.0.0-dev", executable),
+            // dev-test 目录
+            Path.Combine(solutionRoot, "dev-test", "app-1.0.0-dev", executable),
         };
-
+        
         return possiblePaths.Select(Path.GetFullPath).Distinct();
     }
 
@@ -489,7 +497,8 @@ internal sealed class DeploymentLocator
             }
 
             // 3. 淇濈暀鏈夊揩鐓х殑鐗堟湰锛堢敤浜庡洖婊氾級
-            var snapshotDir = Path.Combine(_appRoot, ".launcher", "snapshots");
+            var resolver = new DataLocationResolver(_appRoot);
+            var snapshotDir = Path.Combine(resolver.ResolveLauncherDataPath(), "snapshots");
             if (Directory.Exists(snapshotDir))
             {
                 try

LanMountainDesktop.Launcher/Services/HostLaunchPlan.cs

@@ -12,10 +12,12 @@ internal sealed record HostLaunchPlan(
 
 internal static class HostLaunchPlanBuilder
 {
+    public const string DataRootOptionName = "data-root";
+
     private static readonly string[] LauncherOnlyOptions =
     [
         "debug", "show-loading-details", "plugins-dir", "source", "result",
-        "app-root",
+        "app-root", DataRootOptionName,
         LauncherIpcConstants.LauncherPidEnvVar,
         LauncherIpcConstants.PackageRootEnvVar,
         LauncherIpcConstants.VersionEnvVar,
@@ -25,7 +27,8 @@ internal static class HostLaunchPlanBuilder
     public static HostLaunchPlan Build(
         CommandContext context,
         DeploymentLocator deploymentLocator,
-        HostResolutionResult resolution)
+        HostResolutionResult resolution,
+        string? dataRoot = null)
     {
         ArgumentNullException.ThrowIfNull(context);
         ArgumentNullException.ThrowIfNull(deploymentLocator);
@@ -39,7 +42,7 @@ internal static class HostLaunchPlanBuilder
         var hostPath = Path.GetFullPath(resolution.ResolvedHostPath);
         var packageRoot = ResolvePackageRoot(hostPath, resolution.AppRoot, resolution.ResolutionSource);
         var versionInfo = deploymentLocator.GetVersionInfo();
-        var arguments = BuildForwardedArguments(context, packageRoot, versionInfo);
+        var arguments = BuildForwardedArguments(context, packageRoot, versionInfo, dataRoot);
         var environment = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
         {
             [LauncherIpcConstants.LauncherPidEnvVar] = Environment.ProcessId.ToString(),
@@ -48,6 +51,11 @@ internal static class HostLaunchPlanBuilder
             [LauncherIpcConstants.CodenameEnvVar] = versionInfo.Codename
         };
 
+        if (!string.IsNullOrWhiteSpace(dataRoot))
+        {
+            environment["LMD_DATA_ROOT"] = dataRoot;
+        }
+
         return new HostLaunchPlan(
             hostPath,
             packageRoot,
@@ -92,7 +100,8 @@ internal static class HostLaunchPlanBuilder
     private static IReadOnlyList<string> BuildForwardedArguments(
         CommandContext context,
         string packageRoot,
-        AppVersionInfo versionInfo)
+        AppVersionInfo versionInfo,
+        string? dataRoot = null)
     {
         var arguments = new List<string>();
 
@@ -144,6 +153,11 @@ internal static class HostLaunchPlanBuilder
         arguments.Add($"--{LauncherIpcConstants.VersionEnvVar}={versionInfo.Version}");
         arguments.Add($"--{LauncherIpcConstants.CodenameEnvVar}={versionInfo.Codename}");
 
+        if (!string.IsNullOrWhiteSpace(dataRoot))
+        {
+            arguments.Add($"--{DataRootOptionName}={dataRoot}");
+        }
+
         return arguments;
     }
 

LanMountainDesktop.Launcher/Services/LauncherBackgroundService.cs

@@ -0,0 +1,174 @@
+using Avalonia.Media.Imaging;
+
+namespace LanMountainDesktop.Launcher.Services;
+
+/// <summary>
+/// 启动器背景图片服务
+/// </summary>
+internal static class LauncherBackgroundService
+{
+    private const string PictureFileName = "Launcher Picture";
+    private const long MaxFileSize = 10 * 1024 * 1024; // 10MB
+    private const double WindowAspectRatio = 7.0 / 5.0; // 700:500
+    private const double AspectRatioTolerance = 0.15; // 15% 误差
+
+    private static Bitmap? _cachedBitmap;
+    private static string? _cachedPath;
+
+    /// <summary>
+    /// 背景图片信息
+    /// </summary>
+    public record BackgroundImageInfo
+    {
+        public required bool Exists { get; init; }
+        public required bool IsValid { get; init; }
+        public string? FilePath { get; init; }
+        public Bitmap? Bitmap { get; init; }
+        public int Width { get; init; }
+        public int Height { get; init; }
+        public double AspectRatio { get; init; }
+        public string? ErrorMessage { get; init; }
+    }
+
+    /// <summary>
+    /// 加载背景图片
+    /// </summary>
+    public static BackgroundImageInfo LoadBackgroundImage()
+    {
+        try
+        {
+            var resolver = new DataLocationResolver(AppContext.BaseDirectory);
+            var launcherPath = resolver.ResolveLauncherDataPath();
+
+            // 查找图片文件
+            var imagePath = FindImageFile(launcherPath);
+            if (imagePath == null)
+            {
+                return new BackgroundImageInfo
+                {
+                    Exists = false,
+                    IsValid = false,
+                    ErrorMessage = "未找到背景图片文件"
+                };
+            }
+
+            // 检查文件大小
+            var fileInfo = new FileInfo(imagePath);
+            if (fileInfo.Length > MaxFileSize)
+            {
+                return new BackgroundImageInfo
+                {
+                    Exists = true,
+                    IsValid = false,
+                    FilePath = imagePath,
+                    ErrorMessage = $"图片文件过大 ({fileInfo.Length / 1024 / 1024}MB > 10MB)"
+                };
+            }
+
+            // 使用缓存
+            if (_cachedBitmap != null && _cachedPath == imagePath)
+            {
+                return new BackgroundImageInfo
+                {
+                    Exists = true,
+                    IsValid = true,
+                    FilePath = imagePath,
+                    Bitmap = _cachedBitmap,
+                    Width = _cachedBitmap.PixelSize.Width,
+                    Height = _cachedBitmap.PixelSize.Height,
+                    AspectRatio = (double)_cachedBitmap.PixelSize.Width / _cachedBitmap.PixelSize.Height
+                };
+            }
+
+            // 加载图片
+            var bitmap = new Bitmap(imagePath);
+            var width = bitmap.PixelSize.Width;
+            var height = bitmap.PixelSize.Height;
+            var aspectRatio = (double)width / height;
+
+            // 校验比例
+            var ratioDiff = Math.Abs(aspectRatio - WindowAspectRatio) / WindowAspectRatio;
+            if (ratioDiff > AspectRatioTolerance)
+            {
+                bitmap.Dispose();
+                return new BackgroundImageInfo
+                {
+                    Exists = true,
+                    IsValid = false,
+                    FilePath = imagePath,
+                    Width = width,
+                    Height = height,
+                    AspectRatio = aspectRatio,
+                    ErrorMessage = $"图片比例不符合要求 ({aspectRatio:F2}，需要接近 {WindowAspectRatio:F2})"
+                };
+            }
+
+            // 缓存图片
+            _cachedBitmap = bitmap;
+            _cachedPath = imagePath;
+
+            Logger.Info($"[LauncherBackground] 背景图片加载成功: {imagePath} ({width}x{height}, 比例: {aspectRatio:F2})");
+
+            return new BackgroundImageInfo
+            {
+                Exists = true,
+                IsValid = true,
+                FilePath = imagePath,
+                Bitmap = bitmap,
+                Width = width,
+                Height = height,
+                AspectRatio = aspectRatio
+            };
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"[LauncherBackground] 加载背景图片失败: {ex.Message}");
+            return new BackgroundImageInfo
+            {
+                Exists = false,
+                IsValid = false,
+                ErrorMessage = $"加载失败: {ex.Message}"
+            };
+        }
+    }
+
+    /// <summary>
+    /// 查找图片文件
+    /// </summary>
+    private static string? FindImageFile(string directory)
+    {
+        var extensions = new[] { ".png", ".jpg", ".jpeg", ".bmp", ".gif", ".webp" };
+
+        foreach (var ext in extensions)
+        {
+            var path = Path.Combine(directory, PictureFileName + ext);
+            if (File.Exists(path))
+            {
+                return path;
+            }
+        }
+
+        // 也尝试不带扩展名的匹配（如果文件本身就有扩展名）
+        var files = Directory.GetFiles(directory, PictureFileName + ".*");
+        foreach (var file in files)
+        {
+            var ext = Path.GetExtension(file).ToLowerInvariant();
+            if (extensions.Contains(ext))
+            {
+                return file;
+            }
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// 清除缓存
+    /// </summary>
+    public static void ClearCache()
+    {
+        _cachedBitmap?.Dispose();
+        _cachedBitmap = null;
+        _cachedPath = null;
+    }
+}

LanMountainDesktop.Launcher/Services/LauncherDebugSettingsStore.cs

@@ -100,12 +100,22 @@ internal static class LauncherDebugSettingsStore
 
     private static string ResolveConfigBaseDirectory()
     {
+        try
+        {
+            var appRoot = Commands.ResolveAppRoot(CommandContext.FromArgs([]));
+            var resolver = new DataLocationResolver(appRoot);
+            return resolver.ResolveLauncherDataPath();
+        }
+        catch
+        {
+        }
+
         try
         {
             var appData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
             if (!string.IsNullOrWhiteSpace(appData))
             {
-                return Path.Combine(appData, "LanMountainDesktop", ".launcher");
+                return Path.Combine(appData, "LanMountainDesktop", "Launcher");
             }
         }
         catch
@@ -114,11 +124,11 @@ internal static class LauncherDebugSettingsStore
 
         try
         {
-            return Path.Combine(AppContext.BaseDirectory, ".launcher");
+            return Path.Combine(AppContext.BaseDirectory, "Launcher");
         }
         catch
         {
-            return Path.Combine(Directory.GetCurrentDirectory(), ".launcher");
+            return Path.Combine(Directory.GetCurrentDirectory(), "Launcher");
         }
     }
 }

LanMountainDesktop.Launcher/Services/LauncherFlowCoordinator.cs

@@ -23,6 +23,7 @@ internal sealed class LauncherFlowCoordinator
     private readonly PluginInstallerService _pluginInstallerService;
     private readonly StartupAttemptRegistry _startupAttemptRegistry;
     private readonly LauncherCoordinatorIpcServer? _coordinatorIpcServer;
+    private readonly DataLocationResolver _dataLocationResolver;
     private readonly IReadOnlyList<IOobeStep> _oobeSteps;
 
     public LauncherFlowCoordinator(
@@ -41,7 +42,12 @@ internal sealed class LauncherFlowCoordinator
         _pluginInstallerService = pluginInstallerService;
         _startupAttemptRegistry = startupAttemptRegistry ?? new StartupAttemptRegistry();
         _coordinatorIpcServer = coordinatorIpcServer;
-        _oobeSteps = [new WelcomeOobeStep(_oobeStateService, _context)];
+        _dataLocationResolver = new DataLocationResolver(deploymentLocator.GetAppRoot());
+        _oobeSteps =
+        [
+            new WelcomeOobeStep(_oobeStateService, _context),
+            new DataLocationOobeStep(_dataLocationResolver)
+        ];
     }
 
     public static string ResolveSuccessPolicyKey(CommandContext context)
@@ -270,7 +276,18 @@ internal sealed class LauncherFlowCoordinator
                 var updateResult = await _updateEngine.ApplyPendingUpdateAsync().ConfigureAwait(false);
                 if (!updateResult.Success)
                 {
-                    return WithAdditionalDetails(updateResult, launcherContextDetails);
+                    Logger.Warn($"Update apply failed, will try to launch existing version. Error='{updateResult.Message}'.");
+                    reporter.Report("update", "Update failed, launching existing version...");
+                    // Clean up corrupted update files to prevent repeated failures
+                    try
+                    {
+                        _updateEngine.CleanupIncomingArtifacts();
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.Warn($"Failed to cleanup update artifacts after failed update: {ex.Message}");
+                    }
+                    // Continue to launch existing version instead of aborting
                 }
 
                 reporter.Report("plugins", "Applying plugin upgrades...");
@@ -278,7 +295,8 @@ internal sealed class LauncherFlowCoordinator
                 var queueResult = new PluginUpgradeQueueService(_pluginInstallerService).ApplyPendingUpgrades(pluginsDir);
                 if (!queueResult.Success)
                 {
-                    return WithAdditionalDetails(queueResult, launcherContextDetails);
+                    Logger.Warn($"Plugin upgrade failed, continuing startup. Error='{queueResult.Message}'.");
+                    reporter.Report("plugins", "Plugin upgrade failed, continuing...");
                 }
 
                 if (oobeDecision.ShouldShowOobe)
@@ -943,7 +961,7 @@ internal sealed class LauncherFlowCoordinator
     {
         try
         {
-            await splashWindow.DismissAsync().ConfigureAwait(false);
+            await Dispatcher.UIThread.InvokeAsync(() => splashWindow.DismissAsync());
         }
         catch (Exception ex)
         {
@@ -1013,7 +1031,8 @@ internal sealed class LauncherFlowCoordinator
         bool forceDirectMode,
         string? retryTag)
     {
-        var plan = HostLaunchPlanBuilder.Build(_context, _deploymentLocator, resolution);
+        var dataRoot = _dataLocationResolver.ResolveDataRoot();
+        var plan = HostLaunchPlanBuilder.Build(_context, _deploymentLocator, resolution, dataRoot);
         var hostPath = plan.HostPath;
         if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
         {

LanMountainDesktop.Launcher/Services/Logger.cs

@@ -53,12 +53,22 @@ internal static class Logger
     /// </summary>
     private static string? GetLogDirectory()
     {
+        try
+        {
+            var appRoot = Commands.ResolveAppRoot(CommandContext.FromArgs([]));
+            var resolver = new DataLocationResolver(appRoot);
+            return resolver.ResolveLauncherLogsPath();
+        }
+        catch
+        {
+        }
+
         try
         {
             var appData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
             if (!string.IsNullOrEmpty(appData))
             {
-                return Path.Combine(appData, "LanMountainDesktop", ".launcher", "logs");
+                return Path.Combine(appData, "LanMountainDesktop", "Launcher", "logs");
             }
         }
         catch
@@ -68,7 +78,7 @@ internal static class Logger
         try
         {
             var launcherDir = AppContext.BaseDirectory;
-            return Path.Combine(launcherDir, ".launcher", "logs");
+            return Path.Combine(launcherDir, "Launcher", "logs");
         }
         catch
         {

LanMountainDesktop.Launcher/Services/OobeStateService.cs

@@ -21,9 +21,9 @@ internal sealed class OobeStateService
         _executionSnapshot = executionSnapshot ?? LauncherExecutionContext.Capture();
 
         var stateRoot = string.IsNullOrWhiteSpace(stateRootOverride)
-            ? GetDefaultStateRoot()
+            ? ResolveStateRoot(appRoot)
             : Path.GetFullPath(stateRootOverride);
-        _stateDirectory = Path.Combine(stateRoot, ".launcher", "state");
+        _stateDirectory = Path.Combine(stateRoot, "Launcher", "state");
         _statePath = Path.Combine(_stateDirectory, "oobe-state.json");
         _legacyMarkerPath = Path.Combine(_stateDirectory, "first_run_completed");
     }
@@ -208,14 +208,22 @@ internal sealed class OobeStateService
         };
     }
 
-    private static string GetDefaultStateRoot()
+    private static string ResolveStateRoot(string appRoot)
     {
-        var appData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-        if (string.IsNullOrWhiteSpace(appData))
+        try
         {
-            throw new InvalidOperationException("LocalApplicationData is unavailable.");
+            var resolver = new DataLocationResolver(appRoot);
+            return resolver.ResolveDataRoot();
         }
+        catch
+        {
+            var appData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            if (string.IsNullOrWhiteSpace(appData))
+            {
+                throw new InvalidOperationException("LocalApplicationData is unavailable.");
+            }
 
-        return Path.Combine(appData, "LanMountainDesktop");
+            return Path.Combine(appData, "LanMountainDesktop");
+        }
     }
 }

LanMountainDesktop.Launcher/Services/PluginInstallerService.cs

@@ -63,13 +63,28 @@ internal sealed class PluginInstallerService
             return null;
         }
 
-        var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-        if (string.IsNullOrWhiteSpace(localAppData))
+        string? allowedRoot = null;
+        try
+        {
+            var appRoot = Commands.ResolveAppRoot(CommandContext.FromArgs([]));
+            var resolver = new DataLocationResolver(appRoot);
+            allowedRoot = EnsureTrailingSeparator(resolver.ResolveDataRoot());
+        }
+        catch
         {
-            return null;
         }
 
-        var allowedRoot = EnsureTrailingSeparator(Path.Combine(Path.GetFullPath(localAppData), "LanMountainDesktop"));
+        if (string.IsNullOrWhiteSpace(allowedRoot))
+        {
+            var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            if (string.IsNullOrWhiteSpace(localAppData))
+            {
+                return null;
+            }
+
+            allowedRoot = EnsureTrailingSeparator(Path.Combine(Path.GetFullPath(localAppData), "LanMountainDesktop"));
+        }
+
         var normalizedPluginsDirectory = EnsureTrailingSeparator(Path.GetFullPath(pluginsDirectory));
         if (normalizedPluginsDirectory.StartsWith(allowedRoot, StringComparison.OrdinalIgnoreCase))
         {

LanMountainDesktop.Launcher/Services/StartupAttemptRegistry.cs

@@ -10,25 +10,35 @@ namespace LanMountainDesktop.Launcher.Services;
 internal sealed class StartupAttemptRegistry
 {
     private static readonly TimeSpan CoordinatorHeartbeatTimeout = TimeSpan.FromSeconds(10);
-    private static readonly JsonSerializerOptions SerializerOptions = new()
-    {
-        WriteIndented = true
-    };
 
     private readonly string _statePath;
     private readonly string _mutexName;
     private string? _ownedAttemptId;
 
     public StartupAttemptRegistry()
-        : this(Path.Combine(
-            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-            "LanMountainDesktop",
-            ".launcher",
-            "state",
-            "startup-attempt.json"))
+        : this(ResolveDefaultStatePath())
     {
     }
 
+    private static string ResolveDefaultStatePath()
+    {
+        try
+        {
+            var appRoot = Commands.ResolveAppRoot(CommandContext.FromArgs([]));
+            var resolver = new DataLocationResolver(appRoot);
+            return Path.Combine(resolver.ResolveLauncherStatePath(), "startup-attempt.json");
+        }
+        catch
+        {
+            return Path.Combine(
+                Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                "LanMountainDesktop",
+                "Launcher",
+                "state",
+                "startup-attempt.json");
+        }
+    }
+
     internal StartupAttemptRegistry(string statePath)
     {
         _statePath = statePath;
@@ -415,7 +425,7 @@ internal sealed class StartupAttemptRegistry
         try
         {
             var json = File.ReadAllText(_statePath);
-            return JsonSerializer.Deserialize<StartupAttemptRecord>(json, SerializerOptions);
+            return JsonSerializer.Deserialize(json, AppJsonContext.Default.StartupAttemptRecord);
         }
         catch
         {
@@ -431,7 +441,7 @@ internal sealed class StartupAttemptRegistry
             Directory.CreateDirectory(directory);
         }
 
-        File.WriteAllText(_statePath, JsonSerializer.Serialize(record, SerializerOptions));
+        File.WriteAllText(_statePath, JsonSerializer.Serialize(record, AppJsonContext.Default.StartupAttemptRecord));
     }
 
     private static bool IsAttachable(StartupAttemptRecord record)

LanMountainDesktop.Launcher/Services/ThemeService.cs

@@ -0,0 +1,68 @@
+using Avalonia;
+using Avalonia.Styling;
+using FluentAvalonia.Styling;
+
+namespace LanMountainDesktop.Launcher.Services;
+
+/// <summary>
+/// 主题服务，管理启动器的主题设置
+/// </summary>
+public static class ThemeService
+{
+    private static ThemeVariant _currentTheme = ThemeVariant.Light;
+    private static string _accentColor = "#0078D4";
+
+    /// <summary>
+    /// 获取当前主题
+    /// </summary>
+    public static ThemeVariant CurrentTheme => _currentTheme;
+
+    /// <summary>
+    /// 获取当前主题色
+    /// </summary>
+    public static string AccentColor => _accentColor;
+
+    /// <summary>
+    /// 应用主题设置
+    /// </summary>
+    public static void ApplyTheme(ThemeMode mode, string accentColor)
+    {
+        _currentTheme = mode switch
+        {
+            ThemeMode.Dark => ThemeVariant.Dark,
+            _ => ThemeVariant.Light
+        };
+        _accentColor = accentColor;
+
+        // 应用到当前应用程序
+        if (Application.Current is { } app)
+        {
+            app.RequestedThemeVariant = _currentTheme;
+        }
+    }
+
+    /// <summary>
+    /// 应用浅色主题
+    /// </summary>
+    public static void ApplyLightTheme(string accentColor)
+    {
+        ApplyTheme(ThemeMode.Light, accentColor);
+    }
+
+    /// <summary>
+    /// 应用深色主题
+    /// </summary>
+    public static void ApplyDarkTheme(string accentColor)
+    {
+        ApplyTheme(ThemeMode.Dark, accentColor);
+    }
+}
+
+/// <summary>
+/// 主题模式
+/// </summary>
+public enum ThemeMode
+{
+    Light,
+    Dark
+}

LanMountainDesktop.Launcher/Services/UpdateEngineService.cs

@@ -7,7 +7,6 @@ namespace LanMountainDesktop.Launcher.Services;
 
 internal sealed class UpdateEngineService
 {
-    private const string LauncherDirectoryName = ".launcher";
     private const string UpdateDirectoryName = "update";
     private const string IncomingDirectoryName = "incoming";
     private const string SnapshotsDirectoryName = "snapshots";
@@ -30,7 +29,8 @@ internal sealed class UpdateEngineService
     {
         _deploymentLocator = deploymentLocator;
         _appRoot = deploymentLocator.GetAppRoot();
-        _launcherRoot = Path.Combine(_appRoot, LauncherDirectoryName);
+        var resolver = new DataLocationResolver(_appRoot);
+        _launcherRoot = resolver.ResolveLauncherDataPath();
         _incomingRoot = Path.Combine(_launcherRoot, UpdateDirectoryName, IncomingDirectoryName);
         _snapshotsRoot = Path.Combine(_launcherRoot, SnapshotsDirectoryName);
     }
@@ -1458,7 +1458,7 @@ internal sealed class UpdateEngineService
         }
     }
 
-    private void CleanupIncomingArtifacts()
+    internal void CleanupIncomingArtifacts()
     {
         foreach (var path in new[]
                  {