fix.修复合并产生的问题。

# Conflicts:
#	LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj

.gitignore

@@ -514,3 +514,4 @@ nul
 /*.AppImage
 /velopack-output-local-verify
 /velopack-output-local
+/test-aot-publish

.kilo/package-lock.json

@@ -0,0 +1,376 @@
+{
+  "name": ".kilo",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "@kilocode/plugin": "7.2.20"
+      }
+    },
+    "node_modules/@kilocode/plugin": {
+      "version": "7.2.20",
+      "resolved": "https://registry.npmjs.org/@kilocode/plugin/-/plugin-7.2.20.tgz",
+      "integrity": "sha512-M5lMc58Mu9j1zveH+E3ZUKRHefzh+acNAqHGSG3TuF6K2l16KrZlCl38CZlgj2R5Qgaig6Jec/F2p9Rbn3BhCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@kilocode/sdk": "7.2.20",
+        "effect": "4.0.0-beta.48",
+        "zod": "4.1.8"
+      },
+      "peerDependencies": {
+        "@opentui/core": ">=0.1.99",
+        "@opentui/solid": ">=0.1.99"
+      },
+      "peerDependenciesMeta": {
+        "@opentui/core": {
+          "optional": true
+        },
+        "@opentui/solid": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@kilocode/sdk": {
+      "version": "7.2.20",
+      "resolved": "https://registry.npmjs.org/@kilocode/sdk/-/sdk-7.2.20.tgz",
+      "integrity": "sha512-KUpu1fyzcAyZWpiv//834zGLN+PYzIH65crs15VTtUJ9CDvGqcj08EM0XlkF9jMuGQAjHjfRbvCfml3+YO31+Q==",
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "7.0.6"
+      }
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
+      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
+      "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
+      "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
+      "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
+      "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
+      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@standard-schema/spec": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
+      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
+      "license": "MIT"
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/effect": {
+      "version": "4.0.0-beta.48",
+      "resolved": "https://registry.npmjs.org/effect/-/effect-4.0.0-beta.48.tgz",
+      "integrity": "sha512-MMAM/ZabuNdNmgXiin+BAanQXK7qM8mlt7nfXDoJ/Gn9V8i89JlCq+2N0AiWmqFLXjGLA0u3FjiOjSOYQk5uMw==",
+      "license": "MIT",
+      "dependencies": {
+        "@standard-schema/spec": "^1.1.0",
+        "fast-check": "^4.6.0",
+        "find-my-way-ts": "^0.1.6",
+        "ini": "^6.0.0",
+        "kubernetes-types": "^1.30.0",
+        "msgpackr": "^1.11.9",
+        "multipasta": "^0.2.7",
+        "toml": "^4.1.1",
+        "uuid": "^13.0.0",
+        "yaml": "^2.8.3"
+      }
+    },
+    "node_modules/fast-check": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/fast-check/-/fast-check-4.7.0.tgz",
+      "integrity": "sha512-NsZRtqvSSoCP0HbNjUD+r1JH8zqZalyp6gLY9e7OYs7NK9b6AHOs2baBFeBG7bVNsuoukh89x2Yg3rPsul8ziQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "pure-rand": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=12.17.0"
+      }
+    },
+    "node_modules/find-my-way-ts": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/find-my-way-ts/-/find-my-way-ts-0.1.6.tgz",
+      "integrity": "sha512-a85L9ZoXtNAey3Y6Z+eBWW658kO/MwR7zIafkIUPUMf3isZG0NCs2pjW2wtjxAKuJPxMAsHUIP4ZPGv0o5gyTA==",
+      "license": "MIT"
+    },
+    "node_modules/ini": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-6.0.0.tgz",
+      "integrity": "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ==",
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "license": "ISC"
+    },
+    "node_modules/kubernetes-types": {
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/kubernetes-types/-/kubernetes-types-1.30.0.tgz",
+      "integrity": "sha512-Dew1okvhM/SQcIa2rcgujNndZwU8VnSapDgdxlYoB84ZlpAD43U6KLAFqYo17ykSFGHNPrg0qry0bP+GJd9v7Q==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/msgpackr": {
+      "version": "1.11.10",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.10.tgz",
+      "integrity": "sha512-iCZNq+HszvF+fC3anCm4nBmWEnbeIAfpDs6IStAEKhQ2YSgkjzVG2FF9XJqwwQh5bH3N9OUTUt4QwVN6MLMLtA==",
+      "license": "MIT",
+      "optionalDependencies": {
+        "msgpackr-extract": "^3.0.2"
+      }
+    },
+    "node_modules/msgpackr-extract": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz",
+      "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "node-gyp-build-optional-packages": "5.2.2"
+      },
+      "bin": {
+        "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
+      },
+      "optionalDependencies": {
+        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3"
+      }
+    },
+    "node_modules/multipasta": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/multipasta/-/multipasta-0.2.7.tgz",
+      "integrity": "sha512-KPA58d68KgGil15oDqXjkUBEBYc00XvbPj5/X+dyzeo/lWm9Nc25pQRlf1D+gv4OpK7NM0J1odrbu9JNNGvynA==",
+      "license": "MIT"
+    },
+    "node_modules/node-gyp-build-optional-packages": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
+      "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.1"
+      },
+      "bin": {
+        "node-gyp-build-optional-packages": "bin.js",
+        "node-gyp-build-optional-packages-optional": "optional.js",
+        "node-gyp-build-optional-packages-test": "build-test.js"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pure-rand": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-8.4.0.tgz",
+      "integrity": "sha512-IoM8YF/jY0hiugFo/wOWqfmarlE6J0wc6fDK1PhftMk7MGhVZl88sZimmqBBFomLOCSmcCCpsfj7wXASCpvK9A==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/toml": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/toml/-/toml-4.1.1.tgz",
+      "integrity": "sha512-EBJnVBr3dTXdA89WVFoAIPUqkBjxPMwRqsfuo1r240tKFHXv3zgca4+NJib/h6TyvGF7vOawz0jGuryJCdNHrw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.0.tgz",
+      "integrity": "sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist-node/bin/uuid"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/yaml": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
+      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/eemeli"
+      }
+    },
+    "node_modules/zod": {
+      "version": "4.1.8",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    }
+  }
+}

.kilo/plans/1776989126427-witty-island.md

@@ -0,0 +1,171 @@
+# LanMountainDesktop 启动器无法启动应用 - 问题分析与修复计划
+
+## 1. 项目架构概述
+
+LanMountainDesktop 采用**双进程架构**：
+- **Launcher** (`LanMountainDesktop.Launcher`) - 启动器，负责版本管理、更新、启动主程序
+- **Host** (`LanMountainDesktop`) - 主应用宿主
+
+### 启动流程
+1. 用户启动 `LanMountainDesktop.Launcher.exe`
+2. Launcher 扫描 `app-*` 目录，选择最佳版本
+3. 检查并应用待处理的更新
+4. 处理插件升级队列
+5. 启动主程序 `app-{version}/LanMountainDesktop.exe`
+6. 通过 IPC 监控主程序启动进度
+
+## 2. 问题分析
+
+### 2.1 核心问题：主机可执行文件找不到
+
+根据代码分析（`DeploymentLocator.cs`），启动器通过以下顺序查找主机可执行文件：
+
+1. **显式 app-root**（如果通过命令行指定）
+2. **已发布部署**（查找 `app-*` 目录）
+3. **可移植主机**（直接在应用根目录）
+4. **调试主机**（开发模式，查找构建输出路径）
+5. **旧版回退路径**
+
+**当前状态检查**：
+- ❌ 未找到 `app-*` 目录（生产部署结构不存在）
+- ❌ 未找到 `bin/Debug/**/*.exe`（项目未构建或构建输出不存在）
+
+### 2.2 可能的启动失败原因
+
+| 问题 | 描述 | 优先级 |
+|------|------|--------|
+| **项目未构建** | LanMountainDesktop 主程序未编译，没有可执行文件 | P0 |
+| **部署结构缺失** | 生产模式下缺少 `app-*` 目录结构 | P0 |
+| **开发模式路径问题** | 调试模式下路径计算错误或构建输出不在预期位置 | P1 |
+| **.NET 版本问题** | 项目使用 .NET 10.0，运行环境可能缺少对应运行时 | P1 |
+| **更新应用失败** | `ApplyPendingUpdateAsync` 失败导致无法完成部署 | P2 |
+| **IPC 连接超时** | 主程序启动后未及时建立 IPC 连接，导致启动器超时 | P2 |
+
+### 2.3 关键代码位置
+
+- **主机查找逻辑**: `LanMountainDesktop.Launcher/Services/DeploymentLocator.cs`
+  - `FindCurrentDeploymentDirectory()` - 查找 app-* 目录
+  - `ResolveHostExecutable()` - 解析主机路径
+  
+- **启动协调逻辑**: `LanMountainDesktop.Launcher/Services/LauncherFlowCoordinator.cs`
+  - `RunAsync()` - 主启动流程
+  - `LaunchHostWithIpcAsync()` - 启动主机进程
+  
+- **更新引擎**: `LanMountainDesktop.Launcher/Services/UpdateEngineService.cs`
+  - `ApplyPendingUpdateAsync()` - 应用待处理的更新
+
+## 3. 诊断步骤
+
+### 步骤 1：检查构建状态
+```bash
+dotnet --info
+dotnet build LanMountainDesktop.slnx -c Debug
+```
+
+### 步骤 2：验证主机可执行文件是否存在
+检查以下路径是否存在 `LanMountainDesktop.exe`：
+- `LanMountainDesktop/bin/Debug/net10.0/`
+- `LanMountainDesktop/bin/Release/net10.0/`
+
+### 步骤 3：测试直接运行主程序（跳过 Launcher）
+```bash
+dotnet run --project LanMountainDesktop/LanMountainDesktop.csproj
+```
+
+### 步骤 4：检查 Launcher 启动日志
+在开发模式下运行 Launcher 并查看控制台输出：
+```bash
+dotnet run --project LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj -- launch
+```
+
+## 4. 修复计划
+
+### 方案 A：构建并配置开发环境（推荐）
+
+**适用场景**：开发或调试环境
+
+1. **构建整个解决方案**
+   ```bash
+   dotnet restore
+   dotnet build LanMountainDesktop.slnx -c Debug
+   ```
+
+2. **验证构建输出**
+   - 确认 `LanMountainDesktop/bin/Debug/net10.0/LanMountainDesktop.exe` 存在
+   - 确认 `LanMountainDesktop.Launcher/bin/Debug/net10.0/LanMountainDesktop.Launcher.exe` 存在
+
+3. **测试 Launcher 启动**
+   ```bash
+   dotnet run --project LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj -- launch
+   ```
+
+4. **如果路径查找失败，检查 `DeploymentLocator.cs` 中的开发路径**
+   - 当前逻辑（第 366-375 行）查找：
+     - `../LanMountainDesktop/bin/Debug/net10.0/LanMountainDesktop.exe`
+     - `../LanMountainDesktop/bin/Release/net10.0/LanMountainDesktop.exe`
+   - 确认这些路径与实际的构建输出路径匹配
+
+### 方案 B：创建生产部署结构
+
+**适用场景**：生产环境或模拟生产环境
+
+1. **发布主程序**
+   ```bash
+   dotnet publish LanMountainDesktop/LanMountainDesktop.csproj -c Release -o app-1.0.0
+   ```
+
+2. **创建 .current 标记文件**
+   ```bash
+   echo. > app-1.0.0/.current
+   ```
+
+3. **从 Launcher 启动**
+   - Launcher 应该能找到 `app-1.0.0/LanMountainDesktop.exe`
+
+### 方案 C：修复潜在的代码问题
+
+如果上述方案无法解决问题，可能需要修复代码：
+
+#### C1. 增强错误处理和日志
+在 `DeploymentLocator.cs` 中添加更详细的日志输出，帮助诊断路径查找失败的原因。
+
+#### C2. 检查更新逻辑
+如果 `ApplyPendingUpdateAsync` 失败，可能导致启动中止。检查 `.launcher/update/incoming/` 目录是否有残留的更新文件。
+
+#### C3. 调整超时设置
+如果主程序启动较慢，可以适当增加 `LauncherFlowCoordinator.cs` 中的超时时间：
+- `StartupSoftTimeout` (当前 10 秒)
+- `StartupHardTimeout` (当前 30 秒)
+
+## 5. 建议执行顺序
+
+1. ✅ **首先执行方案 A 的步骤 1-2**（构建项目）
+2. ✅ **执行诊断步骤 3**（测试直接运行主程序）
+3. ✅ **执行诊断步骤 4**（查看 Launcher 启动日志）
+4. 根据日志输出决定后续操作：
+   - 如果显示 "host executable was not found" → 检查路径配置
+   - 如果显示 "update apply failed" → 清理更新缓存
+   - 如果主程序启动后超时 → 检查 IPC 连接或增加超时
+
+## 6. 验证方法
+
+修复后，通过以下方式验证：
+
+```bash
+# 开发模式启动
+dotnet run --project LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj -- launch
+
+# 或直接运行 Launcher 可执行文件
+# (需要先构建 Launcher)
+```
+
+启动后应该看到：
+1. Splash 窗口显示
+2. 主程序桌面窗口出现
+3. Launcher 自动退出（或最小化到托盘）
+
+## 7. 注意事项
+
+- 项目使用 .NET 10.0（`global.json` 指定版本 10.0.103）
+- 确保开发环境已安装对应的 .NET SDK
+- 如果修改了 `DeploymentLocator.cs` 的路径查找逻辑，需要同步更新文档 `docs/DEVELOPMENT.md`

.trae/documents/avalonia12-migration-plan.md

@@ -0,0 +1,106 @@
+# Avalonia 12 迁移计划
+
+## 当前状态
+
+项目已完成以下迁移准备：
+
+* `Directory.Packages.props` 中 Avalonia 包已升级到 `12.0.1`
+
+* `FluentAvaloniaUI` 已升级到 `3.0.0-preview1`
+
+* `Avalonia.Diagnostics` 已替换为 `AvaloniaUI.DiagnosticsSupport`
+
+* `Avalonia.Controls.WebView` 已升级到 `12.0.0`
+
+* `ClassIsland.Markdown.Avalonia` 已升级到 `12.0.0`
+
+## 构建错误清单（26 errors）
+
+### 1. 窗口装饰 API 移除（8 errors）
+
+**文件**：`LanMountainDesktop/Views/SettingsWindow.axaml.cs`（4 errors）
+
+* `ExtendClientAreaChromeHints` 不存在（line 166, 179）
+
+* `SystemDecorations` 已过时，需改用 `WindowDecorations`（line 168, 177）
+
+**文件**：`LanMountainDesktop/Views/ComponentEditorWindow.axaml.cs`（4 errors）
+
+* `ExtendClientAreaChromeHints` 不存在（line 63, 72）
+
+* `SystemDecorations` 已过时，需改用 `WindowDecorations`（line 65, 70）
+
+**AXAML 文件**：13 个文件使用 `SystemDecorations` 属性（编译警告）
+
+### 2. 变量/字段未找到（8 errors）
+
+**文件**：`LanMountainDesktop/Views/MainWindow.ComponentSystem.cs`
+
+* `centerLeft` 不存在（line 759, 766, 778）
+
+* `positions` 不存在（line 1266）
+
+**文件**：`LanMountainDesktop/Views/MainWindow.DesktopPaging.cs`
+
+* `child` 不存在（line 312）
+
+* `_isThreeFingerOrRightDragSwipeActive` 不存在（line 517, 828, 847, 850）
+
+### 3. API 变更（3 errors）
+
+**文件**：`LanMountainDesktop/App.axaml.cs`
+
+* `BindingPlugins` 不可访问（line 532, 537）
+
+**文件**：`LanMountainDesktop/Views/Components/DesktopComponentFailureView.cs`
+
+* `IClipboard.SetTextAsync` 不存在（line 187）
+
+**文件**：`LanMountainDesktop/Services/MonetColorService.cs`
+
+* `Bitmap.CopyPixels` 参数不匹配（line 91）
+
+### 4. 第三方库变更（1 error）
+
+**文件**：`LanMountainDesktop/Views/SettingsWindow.axaml.cs`
+
+* `FluentIcons.Avalonia.SymbolIconSource` 不存在（line 215）
+
+### 5. 过时属性警告（需同步修复）
+
+* `TextBox.Watermark` → `PlaceholderText`（7 处 .cs + 7 处 .axaml）
+
+## 迁移步骤
+
+### Phase 1: 修复窗口装饰 API（高优先级）
+
+1. 重写 `SettingsWindow.ApplyChromeMode()` 使用 Avalonia 12 新 API
+2. 重写 `ComponentEditorWindow.ApplyChromeMode()` 使用 Avalonia 12 新 API
+3. 批量替换所有 `.axaml` 中的 `SystemDecorations` → `WindowDecorations`
+
+### Phase 2: 修复 MainWindow 编译错误（高优先级）
+
+1. 检查 `MainWindow.ComponentSystem.cs` 中 `centerLeft` 和 `positions` 的作用域问题
+2. 检查 `MainWindow.DesktopPaging.cs` 中 `child` 和 `_isThreeFingerOrRightDragSwipeActive` 的作用域问题
+3. 确认这些变量是否被意外删除或重命名
+
+### Phase 3: 修复 Avalonia 12 API 变更（中优先级）
+
+1. `App.axaml.cs`: 替换 `BindingPlugins.DataValidators` 的访问方式
+2. `DesktopComponentFailureView.cs`: 使用新的剪贴板 API
+3. `MonetColorService.cs`: 更新 `Bitmap.CopyPixels` 调用签名
+
+### Phase 4: 修复第三方库变更（中优先级）
+
+1. `SettingsWindow.axaml.cs`: 替换 `FluentIcons.Avalonia.SymbolIconSource` 为 v3 等效 API
+
+### Phase 5: 清理过时属性（低优先级）
+
+1. 批量替换 `Watermark` → `PlaceholderText`（所有 .cs 和 .axaml）
+
+## 验证步骤
+
+* 每阶段修复后运行 `dotnet build LanMountainDesktop.slnx -c Debug`
+
+* 最终运行 `dotnet test LanMountainDesktop.slnx -c Debug`
+

.trae/specs/avalonia-12-migration/checklist.md

@@ -0,0 +1,21 @@
+# Checklist
+
+- [x] `Directory.Packages.props` contains the Avalonia 12 dependency baseline.
+- [x] Main host references `Avalonia.Controls.WebView`.
+- [x] Source no longer references `WebView.Avalonia`, `AvaloniaWebView`, or `.UseDesktopWebView()`.
+- [x] `BrowserWidget` uses `NativeWebView.Source`, `Navigate`, `Refresh()`, `NavigationStarted`, and `EnvironmentRequested`.
+- [x] WebView blanking navigates to `about:blank`.
+- [x] Plugin SDK package version is `5.0.0`.
+- [x] `PluginSdkInfo.ApiVersion` is `5.0.0`.
+- [x] Plugin template package version default is `5.0.0`.
+- [x] Plugin template manifest `apiVersion` is `5.0.0`.
+- [x] Launcher data location config resolution cannot recurse through `ResolveDataRoot()`.
+- [x] `OobeStateServiceTests` pass.
+- [x] `dotnet build LanMountainDesktop.slnx -c Debug` has 0 errors.
+- [x] `dotnet test LanMountainDesktop.slnx -c Debug` completes without a test host stack overflow.
+- [ ] Windows host smoke test completed.
+- [ ] Windows Launcher smoke test completed.
+- [ ] Settings window FluentAvalonia 3 smoke test completed.
+- [ ] Component editor Material smoke test completed.
+- [ ] BrowserWidget navigation/refresh/page activation smoke test completed.
+- [ ] WebView2 missing-runtime diagnostic smoke test completed.

.trae/specs/avalonia-12-migration/spec.md

@@ -0,0 +1,49 @@
+# Avalonia 12 Full Stack Migration
+
+## Summary
+
+LanMountainDesktop has moved its desktop stack to the Avalonia 12 baseline. The migration covers the main host, Launcher, Plugin SDK, plugin runtime loading policy, official WebView usage, ClassIsland Markdown, FluentAvalonia, FluentIcons, and Material-related dependencies.
+
+## Requirements
+
+### Requirement: Centralized Avalonia 12 dependency baseline
+
+The solution SHALL use central package management for direct Avalonia-facing projects and keep the core UI dependency baseline on Avalonia `12.0.1`.
+
+Required package baseline:
+
+- `Avalonia*` `12.0.1`
+- `Avalonia.Controls.WebView` `12.0.0`
+- `ClassIsland.Markdown.Avalonia` `12.0.0`
+- `FluentAvaloniaUI` `3.0.0-preview1`
+- `FluentIcons.Avalonia` `2.1.325`
+- `Material.Avalonia` `3.16.0`
+- `Material.Icons.Avalonia` `3.0.2`
+
+### Requirement: Official WebView
+
+The host SHALL use `Avalonia.Controls.NativeWebView` for the browser widget and SHALL NOT reference `WebView.Avalonia`, `AvaloniaWebView`, or `.UseDesktopWebView()`.
+
+Windows WebView2 user data configuration SHALL be supplied through `EnvironmentRequested` using `WindowsWebView2EnvironmentRequestedEventArgs.UserDataFolder`.
+
+### Requirement: Plugin SDK v5
+
+The Plugin SDK API baseline SHALL be `5.0.0`. SDK v4 plugins are treated as incompatible until rebuilt.
+
+The SDK SHALL keep the existing public UI extension shape, including `SettingsPageBase` and Avalonia `Control` based desktop components.
+
+### Requirement: Launcher data location stability
+
+Launcher data location configuration SHALL be read from a fixed bootstrap Launcher data directory so resolving the selected data root cannot recursively require resolving itself.
+
+### Requirement: OOBE state compatibility
+
+The Launcher SHALL read current OOBE state from the resolved `Launcher/state` directory and SHALL continue to migrate the legacy `.launcher/state/first_run_completed` marker.
+
+## Acceptance
+
+- `dotnet build LanMountainDesktop.slnx -c Debug` completes with 0 errors.
+- `OobeStateServiceTests` pass.
+- Full `dotnet test LanMountainDesktop.slnx -c Debug` no longer aborts from `DataLocationResolver` recursion.
+- Plugin template defaults to SDK package version `5.0.0` and manifest `apiVersion` `5.0.0`.
+- Current developer documentation points to SDK v5 and Avalonia 12.

.trae/specs/avalonia-12-migration/tasks.md

@@ -0,0 +1,18 @@
+# Tasks
+
+- [x] Centralize Avalonia 12 package versions in `Directory.Packages.props`.
+- [x] Move the host, Launcher, Plugin SDK, DesktopHost, Shared.Contracts, and Avalonia-facing projects onto central package versions.
+- [x] Replace third-party `WebView.Avalonia` usage with official `NativeWebView`.
+- [x] Configure WebView2 user data through `EnvironmentRequested`.
+- [x] Move FluentAvalonia usages to the FA3 control names and package baseline.
+- [x] Move FluentIcons usage to `FluentIcons.Avalonia` and remove the old `.Fluent` package.
+- [x] Update Plugin SDK package version and API baseline to `5.0.0`.
+- [x] Update plugin runtime shared assembly policy for Avalonia 12 / FluentAvalonia / FluentIcons / Material.
+- [x] Fix Avalonia 12 compile breaks in window chrome, binding plugin access, clipboard, bitmap copy, and icon source usage.
+- [x] Fix Launcher data location recursion by using a fixed bootstrap config path.
+- [x] Fix OOBE state tests and legacy marker compatibility.
+- [x] Update PluginTemplate defaults to SDK v5.
+- [x] Add SDK v5 migration documentation.
+- [x] Update current docs from SDK v4 / Avalonia 11 examples to SDK v5 / Avalonia 12.
+- [x] Run full solution tests and record any remaining non-upgrade failures.
+- [ ] Perform Windows manual smoke test for host, Launcher, settings, component editor, BrowserWidget, and WebView2 missing-runtime handling.

.trae/specs/launcher-shell-hardening/launcher-coordinator-addendum.md

@@ -0,0 +1,29 @@
+# Launcher Coordinator And Always-On Tray Addendum
+
+## Launcher-to-launcher coordination
+
+- Launcher reserves startup ownership in `%LocalAppData%\LanMountainDesktop\.launcher\state\startup-attempt.json` before it starts the host process.
+- The reserved record includes `CoordinatorPid`, `CoordinatorPipeName`, `HeartbeatAtUtc`, `PublicIpcConnected`, `ShellStatus`, and `ReservedBeforeHostStart`.
+- Only the active coordinator may call `Process.Start()` for the host. Secondary Launchers attach to the coordinator pipe and request desktop activation or status.
+- If the coordinator heartbeat is newer than `10s` and the coordinator pid is alive, a new Launcher must not take over.
+- If the coordinator is stale, the next Launcher may take over the same pending attempt instead of creating a second host attempt.
+- Normal launches probe Host Public IPC first. If a host is already running, Launcher activates that instance and exits without starting another host.
+
+## Finer shell status
+
+- Public shell IPC exposes `GetShellStatusAsync()`, `ActivateMainWindowWithStatusAsync()`, `EnsureTrayReadyAsync()`, and `EnsureTaskbarEntryAsync()`.
+- `PublicShellStatus` separates process, shell state, main-window visibility, tray health, taskbar-entry health, and Public IPC readiness.
+- Launcher success/failure details must include coordinator pid, attempt id, host pid, Public IPC status, tray state, and taskbar usability when available.
+
+## Always-on tray and taskbar repair
+
+- The tray icon and menu are mandatory application-liveness indicators and are not controlled by user settings.
+- Tray watchdog starts during shell initialization and keeps running until application exit.
+- `ShowInTaskbar=true` means hidden/background states prefer `MinimizedToTaskbar`; it never disables the tray.
+- `ShowInTaskbar=false` is the only mode that may enter pure `TrayOnly`, and only after `TrayReady`.
+- When taskbar entry is requested but missing, shell repair recreates or shows the main window minimized with `ShowInTaskbar=true` while keeping the tray visible.
+
+## Regression coverage
+
+- Unit tests cover active coordinator rejection, stale heartbeat takeover, and host-pid assignment after a reserved attempt.
+- Manual QA still needs multi-process Launcher concurrency and real tray loss simulation on Windows.

.trae/specs/launcher-shell-hardening/startup-visuals-addendum.md

@@ -0,0 +1,37 @@
+# Launcher Slow-Startup And Startup Visual Addendum
+
+## New startup timing contract
+
+- `30s` is a soft timeout, not a failure threshold.
+- After `30s`, if the desktop process is still alive or Public IPC is connected, Launcher must stay in a waiting state and must not start another host process.
+- `120s` is the hard timeout.
+- Before returning `desktop_not_visible`, Launcher must attempt one foreground recovery through `ActivateMainWindowAsync()`.
+
+## Startup attempt de-duplication
+
+- Launcher persists the current startup attempt in `%LocalAppData%\LanMountainDesktop\.launcher\state\startup-attempt.json`.
+- A second Launcher process must attach to a live pending attempt instead of calling `Process.Start()` again.
+- Closing the splash window does not cancel startup; it transitions the attempt into detached waiting and preserves recovery state for the next Launcher run.
+
+## Startup visual modes
+
+- `EnableSlideTransition = true` forces `StartupVisualMode.SlideSplash` and automatically disables fade.
+- `EnableSlideTransition = false && EnableFadeTransition = false` resolves to `StartupVisualMode.StaticSplash`.
+- `EnableSlideTransition = false && EnableFadeTransition = true` resolves to `StartupVisualMode.Fade`.
+
+## UX safeguards
+
+- If the host process is still alive at failure time, the failure dialog must prefer:
+  - `Activate`
+  - `Wait`
+  - `Open Logs`
+  - `Exit`
+- Retry is only valid when Launcher is not about to create a duplicate desktop process.
+
+## Launcher coordinator guard
+
+- Startup attempts are now reserved before host launch, so concurrent Launchers cannot all reach `Process.Start()`.
+- A live coordinator is identified by `CoordinatorPid`, `CoordinatorPipeName`, and a heartbeat newer than `10s`.
+- Secondary Launchers send `activate-desktop` or `attach` to the coordinator pipe and then exit with the coordinator status.
+- If Host Public IPC is already available during a normal launch, Launcher activates the existing desktop and does not start a new host process.
+- Public shell status now reports tray readiness and taskbar-entry usability separately, allowing Launcher to distinguish "running but hidden" from "not recoverable".

.trae/specs/launcher-shell-hardening/tray-menu-shutdown-addendum.md

@@ -0,0 +1,17 @@
+# Tray Menu Shutdown Addendum
+
+## Requirements
+
+- Tray menu `Exit App` must commit an irreversible host shutdown request.
+- Once shutdown is committed, tray menu actions must not reopen the desktop, settings window, or component library.
+- Shutdown cleanup must release Public IPC, plugin runtime, tray icon, fused desktop edit UI, telemetry resources, and the single-instance lock before the forced-exit deadline.
+- Forced process termination must be scheduled when the shutdown request is accepted, not only after Avalonia lifetime exit.
+- Restart must preserve `RestartRequested` intent and must not route through an exit path that overwrites it.
+- Fused desktop component library menu activation must reuse the existing library window and must exit edit mode if opening fails.
+
+## Acceptance
+
+- Selecting `Exit App` from the tray leaves no background host process and allows a later Launcher start to acquire the single-instance lock.
+- Selecting `Restart App` starts the Launcher or upgrade helper once, then shuts down the old host as a restart.
+- Repeated tray clicks during shutdown are ignored and logged.
+- Repeated component-library clicks focus the existing window instead of opening duplicates.

AGENTS.md

@@ -74,7 +74,7 @@ dotnet test LanMountainDesktop.slnx -c Debug
 - SDK 公共 API 以 `LanMountainDesktop.PluginSdk/` 为准
 - 共享契约以 `LanMountainDesktop.Shared.Contracts/` 为准
 - market 数据来源默认是兄弟仓库 `..\\LanAirApp`
-- 迁移或 breaking change 优先同步 `docs/PLUGIN_SDK_V4_MIGRATION.md`
+- 迁移或 breaking change 优先同步 `docs/PLUGIN_SDK_V5_MIGRATION.md`
 
 ### 设置与主题
 
@@ -91,6 +91,6 @@ dotnet test LanMountainDesktop.slnx -c Debug
 - 视觉规范：`docs/VISUAL_SPEC.md`
 - 圆角规范：`docs/CORNER_RADIUS_SPEC.md`
 - 生态边界：`docs/ECOSYSTEM_BOUNDARIES.md`
-- SDK v4 迁移：`docs/PLUGIN_SDK_V4_MIGRATION.md`
+- SDK v5 迁移：`docs/PLUGIN_SDK_V5_MIGRATION.md`
 
 如果多个文档都提到同一件事，以 `docs/ai/DOC_SOURCES.md` 列出的权威来源为准。

Directory.Packages.props

@@ -0,0 +1,42 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Avalonia" Version="12.0.1" />
+    <PackageVersion Include="Avalonia.Controls.WebView" Version="12.0.0" />
+    <PackageVersion Include="Avalonia.Desktop" Version="12.0.1" />
+    <PackageVersion Include="Avalonia.Fonts.Inter" Version="12.0.1" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="12.0.1" />
+    <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.1" />
+    <PackageVersion Include="ClassIsland.Markdown.Avalonia" Version="12.0.0" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.1" />
+    <PackageVersion Include="dotnetCampus.Ipc" Version="2.0.0-alpha434" />
+    <PackageVersion Include="DotNetCampus.AvaloniaInkCanvas" Version="1.0.1" />
+    <PackageVersion Include="Downloader" Version="4.1.1" />
+    <PackageVersion Include="FluentAvaloniaUI" Version="3.0.0-preview1" />
+    <PackageVersion Include="FluentIcons.Avalonia" Version="2.1.325" />
+    <PackageVersion Include="Material.Avalonia" Version="3.16.0" />
+    <PackageVersion Include="MaterialColorUtilities" Version="0.3.0" />
+    <PackageVersion Include="Material.Icons.Avalonia" Version="3.0.2" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="MudTools.OfficeInterop" Version="2.0.8" />
+    <PackageVersion Include="MudTools.OfficeInterop.Excel" Version="2.0.8" />
+    <PackageVersion Include="MudTools.OfficeInterop.PowerPoint" Version="2.0.8" />
+    <PackageVersion Include="MudTools.OfficeInterop.Word" Version="2.0.8" />
+    <PackageVersion Include="PortAudioSharp2" Version="1.0.6" />
+    <PackageVersion Include="PostHog" Version="2.4.0" />
+    <PackageVersion Include="Sentry" Version="4.0.0" />
+    <PackageVersion Include="System.Drawing.Common" Version="10.0.0" />
+    <PackageVersion Include="System.Runtime.WindowsRuntime" Version="4.7.0" />
+    <PackageVersion Include="Tmds.DBus.Protocol" Version="0.92.0" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="YamlDotNet" Version="16.3.0" />
+    <PackageVersion Include="log4net" Version="3.3.0" />
+  </ItemGroup>
+</Project>

LanMountainDesktop.DesktopHost/LanMountainDesktop.DesktopHost.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.12" />
+    <PackageReference Include="Avalonia" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LanMountainDesktop.PluginSdk\LanMountainDesktop.PluginSdk.csproj" />

LanMountainDesktop.Launcher/App.axaml.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
@@ -5,7 +6,11 @@ using Avalonia.Markup.Xaml;
 using Avalonia.Threading;
 using LanMountainDesktop.Launcher.Models;
 using LanMountainDesktop.Launcher.Services;
+using LanMountainDesktop.Launcher.Services.Ipc;
 using LanMountainDesktop.Launcher.Views;
+using LanMountainDesktop.Shared.Contracts.Launcher;
+using LanMountainDesktop.Shared.IPC;
+using LanMountainDesktop.Shared.IPC.Abstractions.Services;
 
 namespace LanMountainDesktop.Launcher;
 
@@ -13,6 +18,12 @@ public partial class App : Application
 {
     public override void Initialize()
     {
+        if (Design.IsDesignMode)
+        {
+            AvaloniaXamlLoader.Load(this);
+            return;
+        }
+
         Logger.Initialize();
         var context = LauncherRuntimeContext.Current;
         var execution = LauncherExecutionContext.Capture();
@@ -27,6 +38,12 @@ public partial class App : Application
 
     public override void OnFrameworkInitializationCompleted()
     {
+        if (Design.IsDesignMode)
+        {
+            base.OnFrameworkInitializationCompleted();
+            return;
+        }
+
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
             desktop.ShutdownMode = ShutdownMode.OnExplicitShutdown;
@@ -44,6 +61,18 @@ public partial class App : Application
                 return;
             }
 
+            // 调试模式：只显示 DevDebugWindow，不走正常启动流程
+            // 避免启动主程序后 Launcher 自动退出，导致开发者无法预览 UI
+            if (context.IsDebugMode && !context.IsPreviewCommand &&
+                !string.Equals(context.Command, "apply-update", StringComparison.OrdinalIgnoreCase))
+            {
+                Logger.Info("Debug mode active — showing DevDebugWindow instead of normal launch flow.");
+                var devDebugWindow = new DevDebugWindow();
+                devDebugWindow.Show();
+                base.OnFrameworkInitializationCompleted();
+                return;
+            }
+
             if (string.Equals(context.Command, "apply-update", StringComparison.OrdinalIgnoreCase))
             {
                 var updateWindow = new UpdateWindow();
@@ -52,7 +81,7 @@ public partial class App : Application
             }
             else
             {
-                var splashWindow = new SplashWindow();
+                var splashWindow = CreateSplashWindow();
                 splashWindow.Show();
                 _ = RunCoordinatorWithSplashAsync(desktop, context, splashWindow);
             }
@@ -68,7 +97,7 @@ public partial class App : Application
             case "preview-splash":
             {
                 Logger.Info("Preview command: splash.");
-                var splashWindow = new SplashWindow();
+                var splashWindow = CreateSplashWindow();
                 splashWindow.SetDebugMode(true);
                 splashWindow.Show();
                 _ = SimulateSplashPreviewAsync(desktop, splashWindow);
@@ -112,6 +141,27 @@ public partial class App : Application
         }
     }
 
+    private static SplashWindow CreateSplashWindow()
+    {
+        var window = new SplashWindow();
+        TrySetSplashVersionInfo(window, LauncherRuntimeContext.Current);
+        return window;
+    }
+
+    private static void TrySetSplashVersionInfo(SplashWindow window, CommandContext context)
+    {
+        try
+        {
+            var appRoot = Commands.ResolveAppRoot(context);
+            var versionInfo = new DeploymentLocator(appRoot).GetVersionInfo();
+            window.SetVersionInfo(versionInfo.Version, versionInfo.Codename);
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Failed to set splash version info before coordinator start: {ex.Message}");
+        }
+    }
+
     private async Task SimulateSplashPreviewAsync(IClassicDesktopStyleApplicationLifetime desktop, SplashWindow window)
     {
         var stages = new[] { "initializing", "update", "plugins", "launch", "ready" };
@@ -172,53 +222,330 @@ public partial class App : Application
         SplashWindow splashWindow)
     {
         LauncherResult result;
+        SplashWindow? currentSplashWindow = splashWindow;
+        var appRoot = Commands.ResolveAppRoot(context);
+        var startupAttemptRegistry = new StartupAttemptRegistry();
+        var coordinatorPipeName = LauncherCoordinatorIpcServer.CreatePipeName();
+        var successPolicy = LauncherFlowCoordinator.ResolveSuccessPolicyKey(context);
 
-        try
+        if (!startupAttemptRegistry.TryReserveCoordinator(
+                context.LaunchSource,
+                successPolicy,
+                coordinatorPipeName,
+                out var reservedAttempt,
+                out var activeCoordinatorAttempt))
         {
-            var appRoot = Commands.ResolveAppRoot(context);
-            Logger.Info(
-                $"Coordinator start. Command='{context.Command}'; AppRoot='{appRoot}'; " +
-                $"IsDebugMode={context.IsDebugMode}; LaunchSource='{context.LaunchSource}'; " +
-                $"ResultPath='{context.GetOption("result") ?? "<none>"}'.");
-
-            var deploymentLocator = new DeploymentLocator(appRoot);
-            var coordinator = new LauncherFlowCoordinator(
+            result = await AttachToExistingCoordinatorAsync(
                 context,
-                deploymentLocator,
-                new OobeStateService(appRoot),
-                new UpdateEngineService(deploymentLocator),
-                new PluginInstallerService());
+                currentSplashWindow,
+                activeCoordinatorAttempt).ConfigureAwait(false);
 
-            result = await coordinator.RunAsync(splashWindow).ConfigureAwait(false);
+            Logger.Info($"Secondary launcher completed. Success={result.Success}; Code='{result.Code}'.");
+            await WriteLauncherResultAsync(context, result).ConfigureAwait(false);
+
+            Environment.ExitCode = result.Success ? 0 : 1;
+            await Dispatcher.UIThread.InvokeAsync(() => desktop.Shutdown(Environment.ExitCode), DispatcherPriority.Background);
+            return;
         }
-        catch (Exception ex)
+
+        using var coordinatorServer = new LauncherCoordinatorIpcServer(
+            coordinatorPipeName,
+            BuildCoordinatorStatusFromAttempt(reservedAttempt),
+            HandleCoordinatorRequestAsync,
+            startupAttemptRegistry.UpdateOwnedCoordinatorHeartbeat);
+        coordinatorServer.Start();
+
+        while (true)
         {
-            Logger.Error("Coordinator threw an unhandled exception.", ex);
-            result = new LauncherResult
+            try
             {
-                Success = false,
-                Stage = "launch",
-                Code = "exception",
-                Message = $"Launcher failed: {ex.Message}",
-                ErrorMessage = ex.ToString()
-            };
+                Logger.Info(
+                    $"Coordinator start. Command='{context.Command}'; AppRoot='{appRoot}'; " +
+                    $"IsDebugMode={context.IsDebugMode}; LaunchSource='{context.LaunchSource}'; " +
+                    $"ResultPath='{context.GetOption("result") ?? "<none>"}'.");
+
+                var deploymentLocator = new DeploymentLocator(appRoot);
+                var coordinator = new LauncherFlowCoordinator(
+                    context,
+                    deploymentLocator,
+                    new OobeStateService(appRoot),
+                    new UpdateEngineService(deploymentLocator),
+                    new PluginInstallerService(),
+                    startupAttemptRegistry,
+                    coordinatorServer);
+
+                result = await coordinator.RunAsync(currentSplashWindow).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                Logger.Error("Coordinator threw an unhandled exception.", ex);
+                result = new LauncherResult
+                {
+                    Success = false,
+                    Stage = "launch",
+                    Code = "exception",
+                    Message = $"Launcher failed: {ex.Message}",
+                    ErrorMessage = ex.ToString()
+                };
+            }
+
+            if (result.Success ||
+                result.Code == "host_not_found" ||
+                (!string.Equals(result.Stage, "launch", StringComparison.OrdinalIgnoreCase) &&
+                 !string.Equals(result.Stage, "launchHost", StringComparison.OrdinalIgnoreCase)))
+            {
+                break;
+            }
+
+            var failureAction = await ShowFailureWindowAsync(result).ConfigureAwait(false);
+            if (failureAction == ErrorWindowResult.Exit)
+            {
+                break;
+            }
+
+            if (failureAction == ErrorWindowResult.ActivateExisting &&
+                await TryActivateExistingInstanceAsync().ConfigureAwait(false))
+            {
+                result = new LauncherResult
+                {
+                    Success = true,
+                    Stage = "launch",
+                    Code = "activation_requested",
+                    Message = "Launcher activated the existing desktop instance.",
+                    Details = result.Details
+                };
+                break;
+            }
+
+            currentSplashWindow = CreateSplashWindow();
+            currentSplashWindow.Show();
         }
 
         Logger.Info($"Coordinator completed. Success={result.Success}; Stage='{result.Stage}'; Code='{result.Code}'.");
         await WriteLauncherResultAsync(context, result).ConfigureAwait(false);
 
-        if (!result.Success &&
-            result.Code is not "host_not_found" &&
-            (string.Equals(result.Stage, "launch", StringComparison.OrdinalIgnoreCase) ||
-             string.Equals(result.Stage, "launchHost", StringComparison.OrdinalIgnoreCase)))
-        {
-            await ShowFailureWindowAsync(result).ConfigureAwait(false);
-        }
-
         Environment.ExitCode = result.Success ? 0 : 1;
         await Dispatcher.UIThread.InvokeAsync(() => desktop.Shutdown(Environment.ExitCode), DispatcherPriority.Background);
     }
 
+    private static async Task<LauncherResult> AttachToExistingCoordinatorAsync(
+        CommandContext context,
+        SplashWindow? splashWindow,
+        StartupAttemptRecord? activeCoordinatorAttempt)
+    {
+        var reporter = splashWindow as ISplashStageReporter;
+        reporter?.Report("activation", "Connecting to the active launcher...");
+
+        if (activeCoordinatorAttempt is not null &&
+            !string.IsNullOrWhiteSpace(activeCoordinatorAttempt.CoordinatorPipeName))
+        {
+            var command = string.Equals(context.LaunchSource, "restart", StringComparison.OrdinalIgnoreCase)
+                ? LauncherCoordinatorCommands.Attach
+                : LauncherCoordinatorCommands.ActivateDesktop;
+            var request = new LauncherCoordinatorRequest
+            {
+                Command = command,
+                LaunchSource = context.LaunchSource,
+                SuccessPolicy = LauncherFlowCoordinator.ResolveSuccessPolicyKey(context)
+            };
+
+            var response = await new LauncherCoordinatorIpcClient()
+                .SendAsync(activeCoordinatorAttempt.CoordinatorPipeName, request, TimeSpan.FromSeconds(2))
+                .ConfigureAwait(false);
+
+            if (response is not null)
+            {
+                reporter?.Report("activation", response.Message);
+                await DismissSplashIfNeededAsync(splashWindow).ConfigureAwait(false);
+                var success = response.Accepted ||
+                              IsRecoverableActivationFailure(response.ActivationResult, response.Status);
+                return new LauncherResult
+                {
+                    Success = success,
+                    Stage = "launch",
+                    Code = success && !response.Accepted ? "attached_to_launcher_coordinator" : response.Code,
+                    Message = success && !response.Accepted
+                        ? "Attached to the active Launcher coordinator; desktop startup is still in progress."
+                        : response.Message,
+                    Details = BuildCoordinatorResultDetails(response.Status, response.ActivationResult)
+                };
+            }
+        }
+
+        var activation = await TryActivateExistingInstanceWithStatusAsync(TimeSpan.FromSeconds(2)).ConfigureAwait(false);
+        if (activation is not null)
+        {
+            reporter?.Report("activation", activation.Message);
+            await DismissSplashIfNeededAsync(splashWindow).ConfigureAwait(false);
+            var success = activation.Accepted || IsRecoverableActivationFailure(activation, null);
+            return new LauncherResult
+            {
+                Success = success,
+                Stage = "launch",
+                Code = activation.Accepted
+                    ? "existing_host_activated"
+                    : success
+                        ? "existing_host_startup_pending"
+                        : "existing_host_activation_failed",
+                Message = success && !activation.Accepted
+                    ? "Existing desktop process is still starting; Launcher attached without starting another process."
+                    : activation.Message,
+                Details = BuildCoordinatorResultDetails(null, activation)
+            };
+        }
+
+        await DismissSplashIfNeededAsync(splashWindow).ConfigureAwait(false);
+        return new LauncherResult
+        {
+            Success = false,
+            Stage = "launch",
+            Code = "launcher_coordinator_unavailable",
+            Message = "Another Launcher is coordinating startup, but it did not respond in time.",
+            Details = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                ["activeCoordinatorPid"] = activeCoordinatorAttempt?.CoordinatorPid.ToString() ?? string.Empty,
+                ["activeCoordinatorPipeName"] = activeCoordinatorAttempt?.CoordinatorPipeName ?? string.Empty,
+                ["activeAttemptId"] = activeCoordinatorAttempt?.AttemptId ?? string.Empty,
+                ["activeHostPid"] = activeCoordinatorAttempt?.HostPid.ToString() ?? string.Empty
+            }
+        };
+    }
+
+    private static async Task<LauncherCoordinatorResponse> HandleCoordinatorRequestAsync(
+        LauncherCoordinatorRequest request,
+        LauncherCoordinatorStatus status)
+    {
+        if (string.Equals(request.Command, LauncherCoordinatorCommands.ActivateDesktop, StringComparison.OrdinalIgnoreCase))
+        {
+            var activation = await TryActivateExistingInstanceWithStatusAsync(TimeSpan.FromSeconds(2)).ConfigureAwait(false);
+            if (activation is not null)
+            {
+                if (!activation.Accepted && IsRecoverableActivationFailure(activation, status))
+                {
+                    return new LauncherCoordinatorResponse
+                    {
+                        Accepted = true,
+                        Code = "attached_to_launcher_coordinator",
+                        Message = "Attached to the active Launcher coordinator; desktop startup is still in progress.",
+                        Status = status,
+                        ActivationResult = activation
+                    };
+                }
+
+                return new LauncherCoordinatorResponse
+                {
+                    Accepted = activation.Accepted,
+                    Code = activation.Accepted ? "existing_host_activated" : "existing_host_activation_failed",
+                    Message = activation.Message,
+                    Status = status,
+                    ActivationResult = activation
+                };
+            }
+
+            return new LauncherCoordinatorResponse
+            {
+                Accepted = true,
+                Code = "attached_to_launcher_coordinator",
+                Message = "Attached to the active Launcher coordinator; desktop startup is still in progress.",
+                Status = status
+            };
+        }
+
+        return new LauncherCoordinatorResponse
+        {
+            Accepted = true,
+            Code = "attached_to_launcher_coordinator",
+            Message = "Attached to the active Launcher coordinator.",
+            Status = status
+        };
+    }
+
+    private static LauncherCoordinatorStatus BuildCoordinatorStatusFromAttempt(StartupAttemptRecord attempt)
+    {
+        return new LauncherCoordinatorStatus
+        {
+            AttemptId = attempt.AttemptId,
+            CoordinatorPid = Environment.ProcessId,
+            HostPid = attempt.HostPid,
+            HostProcessAlive = TryGetLiveProcess(attempt.HostPid),
+            LaunchSource = attempt.LaunchSource,
+            SuccessPolicy = attempt.SuccessPolicy,
+            LastObservedStage = attempt.LastObservedStage,
+            LastObservedMessage = attempt.LastObservedMessage,
+            PublicIpcConnected = attempt.PublicIpcConnected || attempt.IpcConnected,
+            State = attempt.State.ToString(),
+            SoftTimeoutShown = attempt.State is StartupAttemptState.SoftTimeout or StartupAttemptState.DetachedWaiting,
+            Completed = attempt.State is StartupAttemptState.Succeeded or StartupAttemptState.Failed,
+            Succeeded = attempt.State == StartupAttemptState.Succeeded,
+            UpdatedAtUtc = attempt.UpdatedAtUtc
+        };
+    }
+
+    private static bool IsRecoverableActivationFailure(
+        PublicShellActivationResult? activation,
+        LauncherCoordinatorStatus? status)
+    {
+        if (activation is { Accepted: true })
+        {
+            return false;
+        }
+
+        if (status is { Completed: false, HostProcessAlive: true })
+        {
+            return true;
+        }
+
+        var shellStatus = activation?.Status;
+        if (shellStatus is null || !shellStatus.PublicIpcReady)
+        {
+            return false;
+        }
+
+        return !shellStatus.MainWindowOpened ||
+               !shellStatus.DesktopVisible ||
+               string.Equals(activation?.Code, "shell_not_ready", StringComparison.OrdinalIgnoreCase) ||
+               string.Equals(activation?.Code, "startup_pending", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static Dictionary<string, string> BuildCoordinatorResultDetails(
+        LauncherCoordinatorStatus? status,
+        PublicShellActivationResult? activation)
+    {
+        var details = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+        {
+            ["coordinatorPid"] = status?.CoordinatorPid.ToString() ?? string.Empty,
+            ["coordinatorAttemptId"] = status?.AttemptId ?? string.Empty,
+            ["hostPid"] = status?.HostPid.ToString() ?? activation?.Status.ProcessId.ToString() ?? string.Empty,
+            ["hostProcessAlive"] = status?.HostProcessAlive.ToString() ?? string.Empty,
+            ["publicIpcConnected"] = (status?.PublicIpcConnected ?? activation is not null).ToString(),
+            ["startupStage"] = status?.LastObservedStage.ToString() ?? string.Empty,
+            ["startupState"] = status?.State ?? string.Empty,
+            ["activationAccepted"] = activation?.Accepted.ToString() ?? string.Empty,
+            ["shellState"] = activation?.Status.ShellState ?? status?.ShellStatus?.ShellState ?? string.Empty,
+            ["trayState"] = activation?.Status.Tray.State ?? status?.ShellStatus?.Tray.State ?? string.Empty,
+            ["taskbarUsable"] = activation?.Status.Taskbar.IsUsable.ToString() ?? status?.ShellStatus?.Taskbar.IsUsable.ToString() ?? string.Empty
+        };
+
+        return details;
+    }
+
+    private static async Task DismissSplashIfNeededAsync(SplashWindow? splashWindow)
+    {
+        if (splashWindow is null)
+        {
+            return;
+        }
+
+        try
+        {
+            await splashWindow.DismissAsync().ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Failed to dismiss splash after coordinator attach: {ex.Message}");
+        }
+    }
+
     private static async Task WriteLauncherResultAsync(CommandContext context, LauncherResult result)
     {
         var resultPath = context.GetOption("result");
@@ -238,15 +565,31 @@ public partial class App : Application
         }
     }
 
-    private static async Task ShowFailureWindowAsync(LauncherResult result)
+    private static async Task<ErrorWindowResult> ShowFailureWindowAsync(LauncherResult result)
     {
         ErrorWindow? errorWindow = null;
+        var hostProcessAlive = result.Details.TryGetValue("hostProcessAlive", out var hostProcessAliveText) &&
+                               bool.TryParse(hostProcessAliveText, out var hostProcessAliveValue) &&
+                               hostProcessAliveValue;
+        var hostPid = result.Details.TryGetValue("hostPid", out var hostPidText) &&
+                      int.TryParse(hostPidText, out var parsedPid)
+            ? parsedPid
+            : (int?)null;
 
         await Dispatcher.UIThread.InvokeAsync(() =>
         {
             try
             {
                 errorWindow = new ErrorWindow();
+                if (hostProcessAlive)
+                {
+                    errorWindow.ConfigureForRunningHostFailure(hostPid);
+                }
+                else
+                {
+                    errorWindow.ConfigureForGenericFailure(allowRetry: true);
+                }
+
                 errorWindow.SetErrorMessage(
                     $"Failed to start LanMountainDesktop.\n\nStage: {result.Stage}\nCode: {result.Code}\n\n{result.Message}");
                 errorWindow.Show();
@@ -259,16 +602,76 @@ public partial class App : Application
 
         if (errorWindow is null)
         {
-            return;
+            return ErrorWindowResult.Exit;
         }
 
         try
         {
-            await errorWindow.WaitForChoiceAsync().ConfigureAwait(false);
+            return await errorWindow.WaitForChoiceAsync().ConfigureAwait(false);
         }
         catch (Exception ex)
         {
             Logger.Error("Failure window closed unexpectedly.", ex);
+            return ErrorWindowResult.Exit;
+        }
+    }
+
+    private static async Task<bool> TryActivateExistingInstanceAsync()
+    {
+        var activation = await TryActivateExistingInstanceWithStatusAsync(TimeSpan.FromSeconds(5)).ConfigureAwait(false);
+        return activation?.Accepted == true;
+    }
+
+    private static async Task<PublicShellActivationResult?> TryActivateExistingInstanceWithStatusAsync(TimeSpan timeout)
+    {
+        try
+        {
+            using var ipcClient = new LanMountainDesktopIpcClient();
+            var connectTask = ipcClient.ConnectAsync();
+            var completedTask = await Task.WhenAny(connectTask, Task.Delay(timeout)).ConfigureAwait(false);
+            if (completedTask != connectTask)
+            {
+                return null;
+            }
+
+            await connectTask.ConfigureAwait(false);
+            if (!ipcClient.IsConnected)
+            {
+                return null;
+            }
+
+            var shellProxy = ipcClient.CreateProxy<IPublicShellControlService>();
+            var activationTask = shellProxy.ActivateMainWindowWithStatusAsync();
+            completedTask = await Task.WhenAny(activationTask, Task.Delay(timeout)).ConfigureAwait(false);
+            if (completedTask != activationTask)
+            {
+                return null;
+            }
+
+            return await activationTask.ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Failed to activate the existing desktop instance: {ex.Message}");
+            return null;
+        }
+    }
+
+    private static bool TryGetLiveProcess(int processId)
+    {
+        if (processId <= 0)
+        {
+            return false;
+        }
+
+        try
+        {
+            using var process = Process.GetProcessById(processId);
+            return !process.HasExited;
+        }
+        catch
+        {
+            return false;
         }
     }
 

LanMountainDesktop.Launcher/AppJsonContext.cs

@@ -3,6 +3,7 @@ using System.Text.Json.Serialization;
 using LanMountainDesktop.Launcher.Models;
 using LanMountainDesktop.Launcher.Services;
 using LanMountainDesktop.Shared.Contracts.Launcher;
+using LanMountainDesktop.Shared.IPC.Abstractions.Services;
 
 namespace LanMountainDesktop.Launcher;
 
@@ -20,13 +21,24 @@ namespace LanMountainDesktop.Launcher;
 [JsonSerializable(typeof(SnapshotMetadata))]
 [JsonSerializable(typeof(AppVersionInfo))]
 [JsonSerializable(typeof(StartupProgressMessage))]
+[JsonSerializable(typeof(LauncherCoordinatorRequest))]
+[JsonSerializable(typeof(LauncherCoordinatorResponse))]
+[JsonSerializable(typeof(LauncherCoordinatorStatus))]
+[JsonSerializable(typeof(PublicShellStatus))]
+[JsonSerializable(typeof(PublicTrayStatus))]
+[JsonSerializable(typeof(PublicTaskbarStatus))]
+[JsonSerializable(typeof(PublicShellActivationResult))]
 [JsonSerializable(typeof(LauncherResult))]
 [JsonSerializable(typeof(HostDiscoveryConfig))]
 [JsonSerializable(typeof(PluginManifest))]
 [JsonSerializable(typeof(PendingUpgrade))]
 [JsonSerializable(typeof(List<PendingUpgrade>))]
 [JsonSerializable(typeof(OobeStateFile))]
+[JsonSerializable(typeof(DataLocationConfig))]
 [JsonSerializable(typeof(GitHubRelease))]
 [JsonSerializable(typeof(GitHubAsset))]
 [JsonSerializable(typeof(List<GitHubRelease>))]
+[JsonSerializable(typeof(StartupAttemptRecord))]
+[JsonSerializable(typeof(PrivacyConfig))]
+[JsonSerializable(typeof(PrivacyAgreementState))]
 internal sealed partial class AppJsonContext : JsonSerializerContext;

LanMountainDesktop.Launcher/CommandContext.cs

@@ -37,11 +37,25 @@ internal sealed class CommandContext
 
     /// <summary>
     /// 是否处于调试模式（从 Rider/VS 等 IDE 启动）
-    /// 仅当明确指定 --debug 参数或调试器附加时才启用
+    /// 当满足以下任一条件时启用：
+    /// 1. 明确指定 --debug 参数
+    /// 2. 调试器附加（Debugger.IsAttached）
+    /// 3. DOTNET_ENVIRONMENT 环境变量为 Development（IDE 调试启动时自动设置）
     /// </summary>
     public bool IsDebugMode =>
         Options.ContainsKey("debug") ||
-        System.Diagnostics.Debugger.IsAttached;
+        System.Diagnostics.Debugger.IsAttached ||
+        IsDevelopmentEnvironment;
+
+    /// <summary>
+    /// 是否为 Development 环境（DOTNET_ENVIRONMENT=Development）
+    /// Rider/VS 调试启动时会自动设置此环境变量
+    /// </summary>
+    public bool IsDevelopmentEnvironment =>
+        string.Equals(
+            System.Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT"),
+            "Development",
+            StringComparison.OrdinalIgnoreCase);
 
     public bool IsPreviewCommand =>
         Command.StartsWith("preview-", StringComparison.OrdinalIgnoreCase);

LanMountainDesktop.Launcher/LanMountainDesktop.Launcher.csproj

@@ -22,11 +22,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.12" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.12" />
-    <PackageReference Include="FluentAvaloniaUI" Version="2.5.0" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.12" />
-    <PackageReference Include="Tmds.DBus.Protocol" Version="0.92.0" />
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="FluentAvaloniaUI" />
+    <PackageReference Include="FluentIcons.Avalonia" />
+    <PackageReference Include="Avalonia.Fonts.Inter" />
+    <PackageReference Include="ClassIsland.Markdown.Avalonia" />
+    <PackageReference Include="CommunityToolkit.Mvvm" />
+    <PackageReference Include="Tmds.DBus.Protocol" />
   </ItemGroup>
 
   <!-- 资源文件 -->
@@ -35,6 +38,7 @@
     <None Include="Assets\public-key.pem" CopyToOutputDirectory="PreserveNewest" />
     <!-- Avalonia 资源文件 -->
     <AvaloniaResource Include="Assets\logo.ico" />
+    <AvaloniaResource Include="..\LanMountainDesktop\Assets\logo_nightly.png" Link="Assets\logo_nightly.png" />
   </ItemGroup>
 
   <Target Name="CopyPublicKeyToLauncherDir" AfterTargets="Build">

LanMountainDesktop.Launcher/Models/DataLocationModels.cs

@@ -0,0 +1,23 @@
+namespace LanMountainDesktop.Launcher.Models;
+
+internal enum DataLocationMode
+{
+    System,
+    Portable
+}
+
+internal sealed class DataLocationConfig
+{
+    public string DataLocationMode { get; set; } = "System";
+
+    public string? SystemDataPath { get; set; }
+
+    public string? PortableDataPath { get; set; }
+}
+
+internal sealed class DataLocationPromptResult
+{
+    public DataLocationMode SelectedMode { get; init; }
+
+    public bool MigrateExistingData { get; init; }
+}

LanMountainDesktop.Launcher/Models/LauncherCoordinatorMessages.cs

@@ -0,0 +1,96 @@
+using System.Text.Json.Serialization;
+using LanMountainDesktop.Shared.Contracts.Launcher;
+using LanMountainDesktop.Shared.IPC.Abstractions.Services;
+
+namespace LanMountainDesktop.Launcher.Models;
+
+internal static class LauncherCoordinatorCommands
+{
+    public const string Attach = "attach";
+    public const string ActivateDesktop = "activate-desktop";
+    public const string GetStatus = "get-status";
+}
+
+internal sealed class LauncherCoordinatorRequest
+{
+    [JsonPropertyName("requestId")]
+    public string RequestId { get; init; } = Guid.NewGuid().ToString("N");
+
+    [JsonPropertyName("command")]
+    public string Command { get; init; } = LauncherCoordinatorCommands.Attach;
+
+    [JsonPropertyName("launcherPid")]
+    public int LauncherPid { get; init; } = Environment.ProcessId;
+
+    [JsonPropertyName("launchSource")]
+    public string LaunchSource { get; init; } = string.Empty;
+
+    [JsonPropertyName("successPolicy")]
+    public string SuccessPolicy { get; init; } = string.Empty;
+}
+
+internal sealed class LauncherCoordinatorResponse
+{
+    [JsonPropertyName("accepted")]
+    public bool Accepted { get; init; }
+
+    [JsonPropertyName("code")]
+    public string Code { get; init; } = string.Empty;
+
+    [JsonPropertyName("message")]
+    public string Message { get; init; } = string.Empty;
+
+    [JsonPropertyName("status")]
+    public LauncherCoordinatorStatus? Status { get; init; }
+
+    [JsonPropertyName("activationResult")]
+    public PublicShellActivationResult? ActivationResult { get; init; }
+}
+
+internal sealed class LauncherCoordinatorStatus
+{
+    [JsonPropertyName("attemptId")]
+    public string AttemptId { get; init; } = string.Empty;
+
+    [JsonPropertyName("coordinatorPid")]
+    public int CoordinatorPid { get; init; } = Environment.ProcessId;
+
+    [JsonPropertyName("hostPid")]
+    public int HostPid { get; init; }
+
+    [JsonPropertyName("hostProcessAlive")]
+    public bool HostProcessAlive { get; init; }
+
+    [JsonPropertyName("launchSource")]
+    public string LaunchSource { get; init; } = string.Empty;
+
+    [JsonPropertyName("successPolicy")]
+    public string SuccessPolicy { get; init; } = string.Empty;
+
+    [JsonPropertyName("lastObservedStage")]
+    public StartupStage LastObservedStage { get; init; } = StartupStage.Initializing;
+
+    [JsonPropertyName("lastObservedMessage")]
+    public string LastObservedMessage { get; init; } = string.Empty;
+
+    [JsonPropertyName("publicIpcConnected")]
+    public bool PublicIpcConnected { get; init; }
+
+    [JsonPropertyName("state")]
+    public string State { get; init; } = string.Empty;
+
+    [JsonPropertyName("softTimeoutShown")]
+    public bool SoftTimeoutShown { get; init; }
+
+    [JsonPropertyName("completed")]
+    public bool Completed { get; init; }
+
+    [JsonPropertyName("succeeded")]
+    public bool Succeeded { get; init; }
+
+    [JsonPropertyName("shellStatus")]
+    public PublicShellStatus? ShellStatus { get; init; }
+
+    [JsonPropertyName("updatedAtUtc")]
+    public DateTimeOffset UpdatedAtUtc { get; init; } = DateTimeOffset.UtcNow;
+}

LanMountainDesktop.Launcher/Models/PrivacyAgreementState.cs

@@ -0,0 +1,42 @@
+namespace LanMountainDesktop.Launcher.Models;
+
+/// <summary>
+/// 隐私协议同意状态模型（带防篡改保护）
+/// </summary>
+public class PrivacyAgreementState
+{
+    /// <summary>
+    /// 用户是否同意隐私协议
+    /// </summary>
+    public bool IsAgreed { get; set; } = false;
+
+    /// <summary>
+    /// 同意时间（UTC）
+    /// </summary>
+    public DateTime AgreedAtUtc { get; set; }
+
+    /// <summary>
+    /// 同意的协议版本
+    /// </summary>
+    public string AgreementVersion { get; set; } = "1.0";
+
+    /// <summary>
+    /// 用户标识（匿名）
+    /// </summary>
+    public string UserId { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 设备标识
+    /// </summary>
+    public string DeviceId { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 数据完整性校验哈希（HMAC-SHA256）
+    /// </summary>
+    public string IntegrityHash { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 用于生成哈希的随机盐值
+    /// </summary>
+    public string Salt { get; set; } = string.Empty;
+}

LanMountainDesktop.Launcher/Models/PrivacyConfig.cs

@@ -0,0 +1,22 @@
+namespace LanMountainDesktop.Launcher.Models;
+
+/// <summary>
+/// 隐私配置模型
+/// </summary>
+public class PrivacyConfig
+{
+    /// <summary>
+    /// 是否启用崩溃报告遥测
+    /// </summary>
+    public bool CrashTelemetryEnabled { get; set; } = true;
+
+    /// <summary>
+    /// 是否启用使用统计遥测
+    /// </summary>
+    public bool UsageTelemetryEnabled { get; set; } = true;
+
+    /// <summary>
+    /// 隐私追踪 ID
+    /// </summary>
+    public string TelemetryId { get; set; } = string.Empty;
+}

LanMountainDesktop.Launcher/Models/StartupAttemptRecord.cs

@@ -0,0 +1,65 @@
+using System.Text.Json.Serialization;
+using LanMountainDesktop.Shared.Contracts.Launcher;
+
+namespace LanMountainDesktop.Launcher.Models;
+
+internal enum StartupAttemptState
+{
+    Pending,
+    SoftTimeout,
+    DetachedWaiting,
+    Succeeded,
+    Failed,
+    WaitingForShell
+}
+
+internal sealed class StartupAttemptRecord
+{
+    [JsonPropertyName("attemptId")]
+    public string AttemptId { get; set; } = Guid.NewGuid().ToString("N");
+
+    [JsonPropertyName("hostPid")]
+    public int HostPid { get; set; }
+
+    [JsonPropertyName("coordinatorPid")]
+    public int CoordinatorPid { get; set; }
+
+    [JsonPropertyName("coordinatorPipeName")]
+    public string CoordinatorPipeName { get; set; } = string.Empty;
+
+    [JsonPropertyName("startedAtUtc")]
+    public DateTimeOffset StartedAtUtc { get; set; } = DateTimeOffset.UtcNow;
+
+    [JsonPropertyName("updatedAtUtc")]
+    public DateTimeOffset UpdatedAtUtc { get; set; } = DateTimeOffset.UtcNow;
+
+    [JsonPropertyName("heartbeatAtUtc")]
+    public DateTimeOffset HeartbeatAtUtc { get; set; } = DateTimeOffset.UtcNow;
+
+    [JsonPropertyName("launchSource")]
+    public string LaunchSource { get; set; } = string.Empty;
+
+    [JsonPropertyName("successPolicy")]
+    public string SuccessPolicy { get; set; } = string.Empty;
+
+    [JsonPropertyName("lastObservedStage")]
+    public StartupStage LastObservedStage { get; set; } = StartupStage.Initializing;
+
+    [JsonPropertyName("lastObservedMessage")]
+    public string LastObservedMessage { get; set; } = string.Empty;
+
+    [JsonPropertyName("ipcConnected")]
+    public bool IpcConnected { get; set; }
+
+    [JsonPropertyName("publicIpcConnected")]
+    public bool PublicIpcConnected { get; set; }
+
+    [JsonPropertyName("shellStatus")]
+    public string ShellStatus { get; set; } = string.Empty;
+
+    [JsonPropertyName("reservedBeforeHostStart")]
+    public bool ReservedBeforeHostStart { get; set; }
+
+    [JsonPropertyName("state")]
+    public StartupAttemptState State { get; set; } = StartupAttemptState.Pending;
+}

LanMountainDesktop.Launcher/Program.cs

@@ -4,10 +4,10 @@ using LanMountainDesktop.Launcher.Services;
 
 namespace LanMountainDesktop.Launcher;
 
-internal static class Program
+public static class Program
 {
     [STAThread]
-    private static async Task<int> Main(string[] args)
+    public static async Task<int> Main(string[] args)
     {
         var commandContext = CommandContext.FromArgs(args);
         var execution = LauncherExecutionContext.Capture();
@@ -66,7 +66,7 @@ internal static class Program
         }
     }
 
-    private static AppBuilder BuildAvaloniaApp()
+    public static AppBuilder BuildAvaloniaApp()
     {
         return AppBuilder.Configure<App>()
             .UsePlatformDetect()

LanMountainDesktop.Launcher/Properties/launchSettings.json

@@ -1,6 +1,14 @@
 {
   "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
+    "Launcher (Debug Mode)": {
+      "commandName": "Project",
+      "commandLineArgs": "launch --debug",
+      "workingDirectory": "$(SolutionDir)",
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      }
+    },
     "Launcher (Launch Mode)": {
       "commandName": "Project",
       "commandLineArgs": "launch",
@@ -9,6 +17,46 @@
         "DOTNET_ENVIRONMENT": "Development"
       }
     },
+    "Launcher (Preview Debug Window)": {
+      "commandName": "Project",
+      "commandLineArgs": "preview-debug",
+      "workingDirectory": "$(SolutionDir)",
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      }
+    },
+    "Launcher (Preview Splash)": {
+      "commandName": "Project",
+      "commandLineArgs": "preview-splash",
+      "workingDirectory": "$(SolutionDir)",
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      }
+    },
+    "Launcher (Preview Error)": {
+      "commandName": "Project",
+      "commandLineArgs": "preview-error",
+      "workingDirectory": "$(SolutionDir)",
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      }
+    },
+    "Launcher (Preview Update)": {
+      "commandName": "Project",
+      "commandLineArgs": "preview-update",
+      "workingDirectory": "$(SolutionDir)",
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      }
+    },
+    "Launcher (Preview OOBE)": {
+      "commandName": "Project",
+      "commandLineArgs": "preview-oobe",
+      "workingDirectory": "$(SolutionDir)",
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      }
+    },
     "Launcher (Update Check)": {
       "commandName": "Project",
       "commandLineArgs": "update check",

LanMountainDesktop.Launcher/Services/Commands.cs

@@ -166,7 +166,10 @@ internal static class Commands
             return Path.GetFullPath(configured);
         }
 
-        var baseDir = AppContext.BaseDirectory;
+        var launcherDir = Path.GetDirectoryName(Environment.ProcessPath);
+        var baseDir = Path.GetFullPath(!string.IsNullOrWhiteSpace(launcherDir)
+            ? launcherDir
+            : AppContext.BaseDirectory);
         
         // 发布版结构：Launcher 和 app-* 目录在同一目录
         // 检查当前目录是否有 app-* 子目录（发布版）

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,283 @@
+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");
+
+    private string ResolveBootstrapLauncherDataPath()
+    {
+        return Path.Combine(_defaultSystemDataPath, LauncherFolderName);
+    }
+
+    /// <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();
+        return ResolveDataRoot(config);
+    }
+
+    private string ResolveDataRoot(DataLocationConfig? config)
+    {
+        if (config is null)
+        {
+            return _defaultSystemDataPath;
+        }
+
+        if (string.Equals(config.DataLocationMode, "Portable", StringComparison.OrdinalIgnoreCase))
+        {
+            var portablePath = !string.IsNullOrWhiteSpace(config.PortableDataPath)
+                ? config.PortableDataPath
+                : DefaultPortableDataPath;
+            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(ResolveBootstrapLauncherDataPath(), 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
+        {
+            // 配置文件必须位于默认系统数据路径下的 Launcher 目录中
+            // 避免循环依赖：不能调用 ResolveConfigPath() -> ResolveLauncherDataPath() -> ResolveDataRoot() -> LoadConfig()
+            var configPath = Path.Combine(_defaultSystemDataPath, LauncherFolderName, ConfigFileName);
+            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 = ResolveBootstrapLauncherDataPath();
+            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
+        {
+            var resolvedDataRoot = ResolveDataRoot(config);
+            Directory.CreateDirectory(Path.Combine(resolvedDataRoot, LauncherFolderName));
+            Directory.CreateDirectory(Path.Combine(resolvedDataRoot, DesktopFolderName));
+        }
+        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;
@@ -204,12 +204,16 @@ internal sealed class DeploymentLocator
             var savedCustomPath = Views.ErrorWindow.GetSavedCustomHostPath();
             if (!string.IsNullOrWhiteSpace(savedCustomPath))
             {
-                var fullSavedPath = Path.GetFullPath(savedCustomPath);
-                searchedPaths.Add(fullSavedPath);
-                if (File.Exists(fullSavedPath))
+                if (TryNormalizeSavedDebugPath(savedCustomPath, out var fullSavedPath))
                 {
-                    source = "debug_saved_custom_path";
-                    return fullSavedPath;
+                    searchedPaths.Add(fullSavedPath);
+                    if (File.Exists(fullSavedPath))
+                    {
+                        source = "debug_saved_custom_path";
+                        return fullSavedPath;
+                    }
+
+                    Logger.Warn($"Saved launcher debug host path is invalid; falling back to development paths. Path='{fullSavedPath}'.");
                 }
             }
         }
@@ -229,6 +233,21 @@ internal sealed class DeploymentLocator
         return null;
     }
 
+    private static bool TryNormalizeSavedDebugPath(string savedPath, out string fullSavedPath)
+    {
+        try
+        {
+            fullSavedPath = Path.GetFullPath(savedPath);
+            return true;
+        }
+        catch (Exception ex)
+        {
+            fullSavedPath = string.Empty;
+            Logger.Warn($"Saved launcher debug host path is invalid and cannot be normalized; falling back to development paths. Path='{savedPath}'; Error='{ex.Message}'.");
+            return false;
+        }
+    }
+
     private static string? FindBestDeploymentHost(
         string root,
         string executable,
@@ -303,9 +322,17 @@ internal sealed class DeploymentLocator
         if (Views.ErrorWindow.CheckDevModeEnabled())
         {
             var savedCustomPath = Views.ErrorWindow.GetSavedCustomHostPath();
-            if (!string.IsNullOrWhiteSpace(savedCustomPath) && File.Exists(savedCustomPath))
+            if (!string.IsNullOrWhiteSpace(savedCustomPath))
             {
-                return savedCustomPath;
+                if (TryNormalizeSavedDebugPath(savedCustomPath, out var fullSavedPath) &&
+                    File.Exists(fullSavedPath))
+                {
+                    return fullSavedPath;
+                }
+                else if (!string.IsNullOrWhiteSpace(fullSavedPath))
+                {
+                    Logger.Warn($"Saved launcher debug host path is invalid; falling back to development paths. Path='{fullSavedPath}'.");
+                }
             }
 
             var devPath = ScanDevelopmentPaths(executable);
@@ -333,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();
     }
 
@@ -462,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/FlexibleHostLocator.cs

@@ -560,6 +560,11 @@ namespace LanMountainDesktop.Launcher.Services;
             }
         }
 
+        if (string.Equals(source, "saved dev mode path", StringComparison.OrdinalIgnoreCase))
+        {
+            Logger.Warn($"Saved launcher debug host path is invalid; continuing host discovery. Path='{path}'.");
+        }
+
         return null;
     }
 

LanMountainDesktop.Launcher/Services/HostLaunchPlan.cs

@@ -0,0 +1,213 @@
+using LanMountainDesktop.Shared.Contracts.Launcher;
+
+namespace LanMountainDesktop.Launcher.Services;
+
+internal sealed record HostLaunchPlan(
+    string HostPath,
+    string PackageRoot,
+    string WorkingDirectory,
+    IReadOnlyList<string> Arguments,
+    IReadOnlyDictionary<string, string> EnvironmentVariables,
+    AppVersionInfo VersionInfo);
+
+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", DataRootOptionName,
+        LauncherIpcConstants.LauncherPidEnvVar,
+        LauncherIpcConstants.PackageRootEnvVar,
+        LauncherIpcConstants.VersionEnvVar,
+        LauncherIpcConstants.CodenameEnvVar
+    ];
+
+    public static HostLaunchPlan Build(
+        CommandContext context,
+        DeploymentLocator deploymentLocator,
+        HostResolutionResult resolution,
+        string? dataRoot = null)
+    {
+        ArgumentNullException.ThrowIfNull(context);
+        ArgumentNullException.ThrowIfNull(deploymentLocator);
+        ArgumentNullException.ThrowIfNull(resolution);
+
+        if (string.IsNullOrWhiteSpace(resolution.ResolvedHostPath))
+        {
+            throw new InvalidOperationException("Host path must be resolved before building a launch plan.");
+        }
+
+        var hostPath = Path.GetFullPath(resolution.ResolvedHostPath);
+        var packageRoot = ResolvePackageRoot(hostPath, resolution.AppRoot, resolution.ResolutionSource);
+        var versionInfo = deploymentLocator.GetVersionInfo();
+        var arguments = BuildForwardedArguments(context, packageRoot, versionInfo, dataRoot);
+        var environment = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+        {
+            [LauncherIpcConstants.LauncherPidEnvVar] = Environment.ProcessId.ToString(),
+            [LauncherIpcConstants.PackageRootEnvVar] = packageRoot,
+            [LauncherIpcConstants.VersionEnvVar] = versionInfo.Version,
+            [LauncherIpcConstants.CodenameEnvVar] = versionInfo.Codename
+        };
+
+        if (!string.IsNullOrWhiteSpace(dataRoot))
+        {
+            environment["LMD_DATA_ROOT"] = dataRoot;
+        }
+
+        return new HostLaunchPlan(
+            hostPath,
+            packageRoot,
+            Directory.Exists(packageRoot)
+                ? packageRoot
+                : Path.GetDirectoryName(hostPath) ?? AppContext.BaseDirectory,
+            arguments,
+            environment,
+            versionInfo);
+    }
+
+    public static string FormatArgumentsForLog(IReadOnlyList<string> arguments)
+    {
+        return string.Join(" ", arguments.Select(QuoteArgument));
+    }
+
+    private static string ResolvePackageRoot(string hostPath, string appRoot, string? resolutionSource)
+    {
+        var fullAppRoot = string.IsNullOrWhiteSpace(appRoot)
+            ? AppContext.BaseDirectory
+            : Path.GetFullPath(appRoot);
+
+        var hostDirectory = Path.GetDirectoryName(hostPath);
+        if (hostDirectory is not null &&
+            Directory.Exists(fullAppRoot) &&
+            IsAppDeploymentDirectory(hostDirectory) &&
+            IsParentOf(fullAppRoot, hostDirectory))
+        {
+            return fullAppRoot;
+        }
+
+        if (string.Equals(resolutionSource, "published_deployment", StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(resolutionSource, "explicit_app_root_deployment", StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(resolutionSource, "legacy_fallback", StringComparison.OrdinalIgnoreCase))
+        {
+            return fullAppRoot;
+        }
+
+        return hostDirectory ?? fullAppRoot;
+    }
+
+    private static IReadOnlyList<string> BuildForwardedArguments(
+        CommandContext context,
+        string packageRoot,
+        AppVersionInfo versionInfo,
+        string? dataRoot = null)
+    {
+        var arguments = new List<string>();
+
+        for (var index = 0; index < context.RawArgs.Count; index++)
+        {
+            var arg = context.RawArgs[index];
+
+            if (index == 0 &&
+                !arg.StartsWith("--", StringComparison.Ordinal) &&
+                string.Equals(arg, context.Command, StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            if (index == 1 &&
+                !arg.StartsWith("--", StringComparison.Ordinal) &&
+                string.Equals(arg, context.SubCommand, StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            if (arg.StartsWith("--", StringComparison.Ordinal))
+            {
+                var key = arg[2..];
+                var equalsIndex = key.IndexOf('=');
+                if (equalsIndex >= 0)
+                {
+                    key = key[..equalsIndex];
+                }
+
+                if (LauncherOnlyOptions.Contains(key, StringComparer.OrdinalIgnoreCase))
+                {
+                    if (equalsIndex < 0 &&
+                        index + 1 < context.RawArgs.Count &&
+                        !context.RawArgs[index + 1].StartsWith("--", StringComparison.Ordinal))
+                    {
+                        index++;
+                    }
+
+                    continue;
+                }
+            }
+
+            arguments.Add(arg);
+        }
+
+        arguments.Add($"--{LauncherIpcConstants.LauncherPidEnvVar}={Environment.ProcessId}");
+        arguments.Add($"--{LauncherIpcConstants.PackageRootEnvVar}={packageRoot}");
+        arguments.Add($"--{LauncherIpcConstants.VersionEnvVar}={versionInfo.Version}");
+        arguments.Add($"--{LauncherIpcConstants.CodenameEnvVar}={versionInfo.Codename}");
+
+        if (!string.IsNullOrWhiteSpace(dataRoot))
+        {
+            arguments.Add($"--{DataRootOptionName}={dataRoot}");
+        }
+
+        return arguments;
+    }
+
+    private static bool IsAppDeploymentDirectory(string path)
+    {
+        var fileName = Path.GetFileName(Path.TrimEndingDirectorySeparator(path));
+        return fileName.StartsWith("app-", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static bool IsParentOf(string parent, string child)
+    {
+        var parentPath = Path.GetFullPath(parent).TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+        var childPath = Path.GetFullPath(child).TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+        if (string.Equals(parentPath, childPath, StringComparison.OrdinalIgnoreCase))
+        {
+            return true;
+        }
+
+        return childPath.StartsWith(
+            parentPath + Path.DirectorySeparatorChar,
+            OperatingSystem.IsWindows() ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal);
+    }
+
+    private static string QuoteArgument(string value)
+    {
+        if (string.IsNullOrEmpty(value))
+        {
+            return "\"\"";
+        }
+
+        if (!value.Contains('"') && !value.Contains(' ') && !value.Contains('\t'))
+        {
+            return value;
+        }
+
+        var builder = new System.Text.StringBuilder();
+        builder.Append('"');
+        foreach (var ch in value)
+        {
+            if (ch == '"')
+            {
+                builder.Append("\\\"");
+            }
+            else
+            {
+                builder.Append(ch);
+            }
+        }
+
+        builder.Append('"');
+        return builder.ToString();
+    }
+}

LanMountainDesktop.Launcher/Services/Ipc/LauncherCoordinatorIpcClient.cs

@@ -0,0 +1,111 @@
+using System.IO.Pipes;
+using System.Text;
+using System.Text.Json;
+using LanMountainDesktop.Launcher.Models;
+
+namespace LanMountainDesktop.Launcher.Services.Ipc;
+
+internal sealed class LauncherCoordinatorIpcClient
+{
+    private const int LengthPrefixSize = 4;
+    private const int MaxPayloadLength = 1024 * 1024;
+
+    public async Task<LauncherCoordinatorResponse?> SendAsync(
+        string pipeName,
+        LauncherCoordinatorRequest request,
+        TimeSpan timeout)
+    {
+        if (string.IsNullOrWhiteSpace(pipeName))
+        {
+            return null;
+        }
+
+        using var timeoutCts = new CancellationTokenSource(timeout);
+        try
+        {
+            await using var client = new NamedPipeClientStream(
+                ".",
+                pipeName,
+                PipeDirection.InOut,
+                PipeOptions.Asynchronous);
+
+            await client.ConnectAsync(timeoutCts.Token).ConfigureAwait(false);
+            await WriteRequestAsync(client, request, timeoutCts.Token).ConfigureAwait(false);
+            return await ReadResponseAsync(client, timeoutCts.Token).ConfigureAwait(false);
+        }
+        catch (OperationCanceledException)
+        {
+            return null;
+        }
+        catch (TimeoutException)
+        {
+            return null;
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Failed to send launcher coordinator IPC request: {ex.Message}");
+            return null;
+        }
+    }
+
+    private static async Task WriteRequestAsync(
+        Stream stream,
+        LauncherCoordinatorRequest request,
+        CancellationToken cancellationToken)
+    {
+        var json = JsonSerializer.Serialize(request, AppJsonContext.Default.LauncherCoordinatorRequest);
+        var payload = Encoding.UTF8.GetBytes(json);
+        await stream.WriteAsync(BitConverter.GetBytes(payload.Length), cancellationToken).ConfigureAwait(false);
+        await stream.WriteAsync(payload, cancellationToken).ConfigureAwait(false);
+        await stream.FlushAsync(cancellationToken).ConfigureAwait(false);
+    }
+
+    private static async Task<LauncherCoordinatorResponse?> ReadResponseAsync(
+        Stream stream,
+        CancellationToken cancellationToken)
+    {
+        var lengthBuffer = new byte[LengthPrefixSize];
+        if (!await ReadExactAsync(stream, lengthBuffer, cancellationToken).ConfigureAwait(false))
+        {
+            return null;
+        }
+
+        var payloadLength = BitConverter.ToInt32(lengthBuffer, 0);
+        if (payloadLength <= 0 || payloadLength > MaxPayloadLength)
+        {
+            return null;
+        }
+
+        var payload = new byte[payloadLength];
+        if (!await ReadExactAsync(stream, payload, cancellationToken).ConfigureAwait(false))
+        {
+            return null;
+        }
+
+        return JsonSerializer.Deserialize(
+            Encoding.UTF8.GetString(payload),
+            AppJsonContext.Default.LauncherCoordinatorResponse);
+    }
+
+    private static async Task<bool> ReadExactAsync(
+        Stream stream,
+        byte[] buffer,
+        CancellationToken cancellationToken)
+    {
+        var totalRead = 0;
+        while (totalRead < buffer.Length)
+        {
+            var read = await stream
+                .ReadAsync(buffer.AsMemory(totalRead, buffer.Length - totalRead), cancellationToken)
+                .ConfigureAwait(false);
+            if (read == 0)
+            {
+                return false;
+            }
+
+            totalRead += read;
+        }
+
+        return true;
+    }
+}

LanMountainDesktop.Launcher/Services/Ipc/LauncherCoordinatorIpcServer.cs

@@ -0,0 +1,235 @@
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
+using System.IO.Pipes;
+using LanMountainDesktop.Launcher.Models;
+
+namespace LanMountainDesktop.Launcher.Services.Ipc;
+
+internal sealed class LauncherCoordinatorIpcServer : IDisposable
+{
+    private const int LengthPrefixSize = 4;
+    private const int MaxPayloadLength = 1024 * 1024;
+    private readonly string _pipeName;
+    private readonly Func<LauncherCoordinatorRequest, LauncherCoordinatorStatus, Task<LauncherCoordinatorResponse>> _requestHandler;
+    private readonly Action<LauncherCoordinatorStatus> _heartbeatHandler;
+    private readonly CancellationTokenSource _cts = new();
+    private readonly object _statusGate = new();
+    private LauncherCoordinatorStatus _status;
+    private Task? _listenTask;
+    private Task? _heartbeatTask;
+
+    public LauncherCoordinatorIpcServer(
+        string pipeName,
+        LauncherCoordinatorStatus initialStatus,
+        Func<LauncherCoordinatorRequest, LauncherCoordinatorStatus, Task<LauncherCoordinatorResponse>> requestHandler,
+        Action<LauncherCoordinatorStatus> heartbeatHandler)
+    {
+        _pipeName = pipeName;
+        _status = initialStatus;
+        _requestHandler = requestHandler;
+        _heartbeatHandler = heartbeatHandler;
+    }
+
+    public static string CreatePipeName()
+    {
+        var seed = $"{Environment.UserName}:{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}";
+        var bytes = SHA256.HashData(Encoding.UTF8.GetBytes(seed.ToLowerInvariant()));
+        return $"LanMountainDesktop_Launcher_Coordinator_{Convert.ToHexString(bytes[..8])}";
+    }
+
+    public void Start()
+    {
+        _listenTask ??= Task.Run(ListenLoopAsync);
+        _heartbeatTask ??= Task.Run(HeartbeatLoopAsync);
+    }
+
+    public LauncherCoordinatorStatus GetStatus()
+    {
+        lock (_statusGate)
+        {
+            return _status;
+        }
+    }
+
+    public void UpdateStatus(LauncherCoordinatorStatus status)
+    {
+        lock (_statusGate)
+        {
+            _status = status;
+        }
+    }
+
+    public void Dispose()
+    {
+        _cts.Cancel();
+
+        try
+        {
+            _listenTask?.Wait(TimeSpan.FromSeconds(1));
+            _heartbeatTask?.Wait(TimeSpan.FromSeconds(1));
+        }
+        catch
+        {
+        }
+
+        _cts.Dispose();
+    }
+
+    private async Task ListenLoopAsync()
+    {
+        while (!_cts.IsCancellationRequested)
+        {
+            NamedPipeServerStream? server = null;
+            try
+            {
+                server = new NamedPipeServerStream(
+                    _pipeName,
+                    PipeDirection.InOut,
+                    8,
+                    PipeTransmissionMode.Byte,
+                    PipeOptions.Asynchronous);
+
+                await server.WaitForConnectionAsync(_cts.Token).ConfigureAwait(false);
+                var connectedServer = server;
+                _ = Task.Run(() => HandleConnectionAsync(connectedServer, _cts.Token), _cts.Token);
+                server = null;
+            }
+            catch (OperationCanceledException)
+            {
+                break;
+            }
+            catch (Exception ex)
+            {
+                Logger.Warn($"Launcher coordinator IPC listener failed: {ex.Message}");
+                try
+                {
+                    await Task.Delay(250, _cts.Token).ConfigureAwait(false);
+                }
+                catch (OperationCanceledException)
+                {
+                    break;
+                }
+            }
+            finally
+            {
+                server?.Dispose();
+            }
+        }
+    }
+
+    private async Task HeartbeatLoopAsync()
+    {
+        while (!_cts.IsCancellationRequested)
+        {
+            try
+            {
+                _heartbeatHandler(GetStatus());
+                await Task.Delay(TimeSpan.FromSeconds(2), _cts.Token).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                break;
+            }
+            catch (Exception ex)
+            {
+                Logger.Warn($"Launcher coordinator heartbeat failed: {ex.Message}");
+            }
+        }
+    }
+
+    private async Task HandleConnectionAsync(NamedPipeServerStream server, CancellationToken cancellationToken)
+    {
+        try
+        {
+            var request = await ReadRequestAsync(server, cancellationToken).ConfigureAwait(false);
+            var status = GetStatus();
+            var response = request is null
+                ? new LauncherCoordinatorResponse
+                {
+                    Accepted = false,
+                    Code = "invalid_request",
+                    Message = "Launcher coordinator request was invalid.",
+                    Status = status
+                }
+                : await _requestHandler(request, status).ConfigureAwait(false);
+
+            await WriteResponseAsync(server, response, cancellationToken).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Launcher coordinator IPC request failed: {ex.Message}");
+        }
+        finally
+        {
+            try
+            {
+                server.Dispose();
+            }
+            catch
+            {
+            }
+        }
+    }
+
+    private static async Task<LauncherCoordinatorRequest?> ReadRequestAsync(
+        Stream stream,
+        CancellationToken cancellationToken)
+    {
+        var lengthBuffer = new byte[LengthPrefixSize];
+        if (!await ReadExactAsync(stream, lengthBuffer, cancellationToken).ConfigureAwait(false))
+        {
+            return null;
+        }
+
+        var payloadLength = BitConverter.ToInt32(lengthBuffer, 0);
+        if (payloadLength <= 0 || payloadLength > MaxPayloadLength)
+        {
+            return null;
+        }
+
+        var payload = new byte[payloadLength];
+        if (!await ReadExactAsync(stream, payload, cancellationToken).ConfigureAwait(false))
+        {
+            return null;
+        }
+
+        return JsonSerializer.Deserialize(
+            Encoding.UTF8.GetString(payload),
+            AppJsonContext.Default.LauncherCoordinatorRequest);
+    }
+
+    private static async Task WriteResponseAsync(
+        Stream stream,
+        LauncherCoordinatorResponse response,
+        CancellationToken cancellationToken)
+    {
+        var json = JsonSerializer.Serialize(response, AppJsonContext.Default.LauncherCoordinatorResponse);
+        var payload = Encoding.UTF8.GetBytes(json);
+        await stream.WriteAsync(BitConverter.GetBytes(payload.Length), cancellationToken).ConfigureAwait(false);
+        await stream.WriteAsync(payload, cancellationToken).ConfigureAwait(false);
+        await stream.FlushAsync(cancellationToken).ConfigureAwait(false);
+    }
+
+    private static async Task<bool> ReadExactAsync(
+        Stream stream,
+        byte[] buffer,
+        CancellationToken cancellationToken)
+    {
+        var totalRead = 0;
+        while (totalRead < buffer.Length)
+        {
+            var read = await stream
+                .ReadAsync(buffer.AsMemory(totalRead, buffer.Length - totalRead), cancellationToken)
+                .ConfigureAwait(false);
+            if (read == 0)
+            {
+                return false;
+            }
+
+            totalRead += read;
+        }
+
+        return true;
+    }
+}

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

@@ -0,0 +1,134 @@
+namespace LanMountainDesktop.Launcher.Services;
+
+internal sealed record LauncherDebugSettings(bool DevModeEnabled, string? CustomHostPath);
+
+internal static class LauncherDebugSettingsStore
+{
+    private const string DevModeFileName = "dev-mode.flag";
+    private const string CustomHostPathFileName = "custom-host-path.txt";
+    private const string LegacyDevModeFileName = "devmode.config";
+    private const string LegacyCustomHostPathFileName = "custom-host-path.config";
+
+    internal static string? ConfigBaseDirectoryOverride { get; set; }
+
+    public static string ConfigBaseDirectory => ConfigBaseDirectoryOverride ?? ResolveConfigBaseDirectory();
+
+    public static LauncherDebugSettings Load()
+    {
+        return new LauncherDebugSettings(
+            LoadDevModeState(),
+            LoadCustomHostPath());
+    }
+
+    public static bool IsDevModeEnabled() => Load().DevModeEnabled;
+
+    public static string? GetSavedCustomHostPath() => Load().CustomHostPath;
+
+    public static void Save(LauncherDebugSettings settings)
+    {
+        try
+        {
+            Directory.CreateDirectory(ConfigBaseDirectory);
+            File.WriteAllText(GetPath(DevModeFileName), settings.DevModeEnabled.ToString());
+            File.WriteAllText(GetPath(CustomHostPathFileName), settings.CustomHostPath ?? string.Empty);
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Failed to save launcher debug settings: {ex.Message}");
+        }
+    }
+
+    public static void SaveDevModeState(bool enabled)
+    {
+        var current = Load();
+        Save(current with { DevModeEnabled = enabled });
+    }
+
+    public static void SaveCustomHostPath(string? customHostPath)
+    {
+        var current = Load();
+        Save(current with { CustomHostPath = customHostPath });
+    }
+
+    private static bool LoadDevModeState()
+    {
+        var newValue = TryReadText(GetPath(DevModeFileName));
+        if (!string.IsNullOrWhiteSpace(newValue))
+        {
+            return TryParseDevMode(newValue);
+        }
+
+        var legacyValue = TryReadText(GetPath(LegacyDevModeFileName));
+        return !string.IsNullOrWhiteSpace(legacyValue) && TryParseDevMode(legacyValue);
+    }
+
+    private static string? LoadCustomHostPath()
+    {
+        var newValue = TryReadText(GetPath(CustomHostPathFileName));
+        if (!string.IsNullOrWhiteSpace(newValue))
+        {
+            return newValue.Trim();
+        }
+
+        var legacyValue = TryReadText(GetPath(LegacyCustomHostPathFileName));
+        return string.IsNullOrWhiteSpace(legacyValue) ? null : legacyValue.Trim();
+    }
+
+    private static bool TryParseDevMode(string value)
+    {
+        var normalized = value.Trim();
+        return normalized == "1" ||
+               normalized.Equals("true", StringComparison.OrdinalIgnoreCase) ||
+               normalized.Equals("yes", StringComparison.OrdinalIgnoreCase) ||
+               normalized.Equals("on", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static string? TryReadText(string path)
+    {
+        try
+        {
+            return File.Exists(path) ? File.ReadAllText(path) : null;
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Failed to read launcher debug setting '{path}': {ex.Message}");
+            return null;
+        }
+    }
+
+    private static string GetPath(string fileName) => Path.Combine(ConfigBaseDirectory, fileName);
+
+    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");
+            }
+        }
+        catch
+        {
+        }
+
+        try
+        {
+            return Path.Combine(AppContext.BaseDirectory, "Launcher");
+        }
+        catch
+        {
+            return Path.Combine(Directory.GetCurrentDirectory(), "Launcher");
+        }
+    }
+}

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

@@ -9,6 +9,7 @@ internal sealed class OobeStateService
 
     private readonly string _stateDirectory;
     private readonly string _statePath;
+    private readonly string _legacyStatePath;
     private readonly string _legacyMarkerPath;
     private readonly LauncherExecutionSnapshot _executionSnapshot;
 
@@ -21,11 +22,17 @@ 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");
+
+        var legacyRoot = string.IsNullOrWhiteSpace(stateRootOverride)
+            ? Path.GetFullPath(appRoot)
+            : Path.GetFullPath(stateRootOverride);
+        var legacyStateDirectory = Path.Combine(legacyRoot, ".launcher", "state");
+        _legacyStatePath = Path.Combine(legacyStateDirectory, "oobe-state.json");
+        _legacyMarkerPath = Path.Combine(legacyStateDirectory, "first_run_completed");
     }
 
     public OobeLaunchDecision Evaluate(CommandContext context)
@@ -100,14 +107,12 @@ internal sealed class OobeStateService
             var migratedLegacyMarker = false;
             if (File.Exists(_statePath))
             {
-                using var stream = File.OpenRead(_statePath);
-                var state = JsonSerializer.Deserialize(stream, AppJsonContext.Default.OobeStateFile);
-                if (state is null || state.SchemaVersion <= 0 || string.IsNullOrWhiteSpace(state.CompletedAtUtc))
-                {
-                    return BuildUnavailableDecision(context, "OOBE state file is invalid.");
-                }
+                return EvaluateStateFile(context, _statePath, migratedLegacyState: false);
+            }
 
-                return BuildDecision(context, OobeStateStatus.Completed, shouldShowOobe: false, migratedLegacyMarker: false);
+            if (File.Exists(_legacyStatePath))
+            {
+                return EvaluateStateFile(context, _legacyStatePath, migratedLegacyState: false);
             }
 
             if (File.Exists(_legacyMarkerPath))
@@ -140,6 +145,18 @@ internal sealed class OobeStateService
         return result.Success;
     }
 
+    private OobeLaunchDecision EvaluateStateFile(CommandContext context, string statePath, bool migratedLegacyState)
+    {
+        using var stream = File.OpenRead(statePath);
+        var state = JsonSerializer.Deserialize(stream, AppJsonContext.Default.OobeStateFile);
+        if (state is null || state.SchemaVersion <= 0 || string.IsNullOrWhiteSpace(state.CompletedAtUtc))
+        {
+            return BuildUnavailableDecision(context, "OOBE state file is invalid.");
+        }
+
+        return BuildDecision(context, OobeStateStatus.Completed, shouldShowOobe: false, migratedLegacyMarker: migratedLegacyState);
+    }
+
     private void TryDeleteLegacyMarker()
     {
         try
@@ -208,14 +225,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/PrivacyAgreementService.cs

@@ -0,0 +1,245 @@
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
+using LanMountainDesktop.Launcher.Models;
+
+namespace LanMountainDesktop.Launcher.Services;
+
+/// <summary>
+/// 隐私协议同意状态管理服务（带防篡改保护）
+/// </summary>
+internal sealed class PrivacyAgreementService
+{
+    private readonly string _storagePath;
+    private readonly string _secretKey;
+    private const string ConfigFileName = "privacy-agreement.state.json";
+    private const string CurrentAgreementVersion = "1.0";
+
+    public PrivacyAgreementService(string launcherDataPath)
+    {
+        _storagePath = Path.Combine(launcherDataPath, ConfigFileName);
+        // 使用机器特定信息生成密钥，增加篡改难度
+        _secretKey = GenerateMachineSpecificKey();
+    }
+
+    /// <summary>
+    /// 检查用户是否已同意隐私协议
+    /// </summary>
+    public bool HasUserAgreed()
+    {
+        try
+        {
+            if (!File.Exists(_storagePath))
+            {
+                Logger.Info("[PrivacyAgreementService] 未找到隐私协议同意状态文件");
+                return false;
+            }
+
+            var json = File.ReadAllText(_storagePath);
+            var state = JsonSerializer.Deserialize(json, AppJsonContext.Default.PrivacyAgreementState);
+
+            if (state == null)
+            {
+                Logger.Warn("[PrivacyAgreementService] 无法解析隐私协议状态文件");
+                return false;
+            }
+
+            // 验证数据完整性
+            if (!VerifyIntegrity(state))
+            {
+                Logger.Warn("[PrivacyAgreementService] 隐私协议状态文件已被篡改！");
+                // 删除被篡改的文件
+                try
+                {
+                    File.Delete(_storagePath);
+                }
+                catch (Exception ex)
+                {
+                    Logger.Warn($"[PrivacyAgreementService] 删除被篡改文件失败: {ex.Message}");
+                }
+                return false;
+            }
+
+            // 检查协议版本是否匹配
+            if (state.AgreementVersion != CurrentAgreementVersion)
+            {
+                Logger.Info($"[PrivacyAgreementService] 隐私协议版本已更新: {state.AgreementVersion} -> {CurrentAgreementVersion}");
+                return false;
+            }
+
+            Logger.Info($"[PrivacyAgreementService] 用户已于 {state.AgreedAtUtc:yyyy-MM-dd HH:mm:ss} UTC 同意隐私协议");
+            return state.IsAgreed;
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"[PrivacyAgreementService] 检查同意状态时出错: {ex.Message}");
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// 保存用户同意隐私协议的状态
+    /// </summary>
+    public bool SaveAgreement(bool isAgreed, string userId, string deviceId)
+    {
+        try
+        {
+            // 确保目录存在
+            var directory = Path.GetDirectoryName(_storagePath);
+            if (!string.IsNullOrEmpty(directory) && !Directory.Exists(directory))
+            {
+                Directory.CreateDirectory(directory);
+            }
+
+            // 生成随机盐值
+            var salt = GenerateRandomSalt();
+
+            var state = new PrivacyAgreementState
+            {
+                IsAgreed = isAgreed,
+                AgreedAtUtc = DateTime.UtcNow,
+                AgreementVersion = CurrentAgreementVersion,
+                UserId = userId,
+                DeviceId = deviceId,
+                Salt = salt
+            };
+
+            // 计算完整性哈希
+            state.IntegrityHash = CalculateIntegrityHash(state);
+
+            // 保存到文件
+            var json = JsonSerializer.Serialize(state, AppJsonContext.Default.PrivacyAgreementState);
+            File.WriteAllText(_storagePath, json);
+
+            Logger.Info($"[PrivacyAgreementService] 隐私协议同意状态已保存: IsAgreed={isAgreed}");
+            return true;
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"[PrivacyAgreementService] 保存同意状态失败: {ex.Message}");
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// 获取当前的协议版本
+    /// </summary>
+    public string GetCurrentAgreementVersion() => CurrentAgreementVersion;
+
+    /// <summary>
+    /// 清除同意状态（用于测试或重置）
+    /// </summary>
+    public bool ClearAgreement()
+    {
+        try
+        {
+            if (File.Exists(_storagePath))
+            {
+                File.Delete(_storagePath);
+                Logger.Info("[PrivacyAgreementService] 隐私协议同意状态已清除");
+            }
+            return true;
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"[PrivacyAgreementService] 清除同意状态失败: {ex.Message}");
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// 生成机器特定的密钥
+    /// </summary>
+    private string GenerateMachineSpecificKey()
+    {
+        try
+        {
+            // 组合多个机器特定信息生成密钥
+            var machineName = Environment.MachineName;
+            var userName = Environment.UserName;
+            var osVersion = Environment.OSVersion.Version.ToString();
+            var processorCount = Environment.ProcessorCount.ToString();
+
+            // 使用硬件信息（如果可用）
+            var hardwareId = GetHardwareIdentifier();
+
+            var keyData = $"{machineName}:{userName}:{osVersion}:{processorCount}:{hardwareId}:LanMountainDesktop";
+
+            // 使用 SHA-256 生成固定长度的密钥
+            using var sha256 = SHA256.Create();
+            var hash = sha256.ComputeHash(Encoding.UTF8.GetBytes(keyData));
+            return Convert.ToHexString(hash);
+        }
+        catch
+        {
+            // 如果无法获取机器信息，使用备用密钥
+            return "LanMountainDesktop-Privacy-Agreement-Fallback-Key-2026";
+        }
+    }
+
+    /// <summary>
+    /// 获取硬件标识符
+    /// </summary>
+    private string GetHardwareIdentifier()
+    {
+        try
+        {
+            // 尝试使用系统目录创建时间作为硬件标识的一部分
+            var systemDir = Environment.SystemDirectory;
+            var dirInfo = new DirectoryInfo(systemDir);
+            return dirInfo.CreationTimeUtc.ToString("yyyyMMddHHmmss");
+        }
+        catch
+        {
+            return "Unknown";
+        }
+    }
+
+    /// <summary>
+    /// 生成随机盐值
+    /// </summary>
+    private string GenerateRandomSalt()
+    {
+        var saltBytes = new byte[32];
+        using var rng = RandomNumberGenerator.Create();
+        rng.GetBytes(saltBytes);
+        return Convert.ToHexString(saltBytes);
+    }
+
+    /// <summary>
+    /// 计算完整性哈希（HMAC-SHA256）
+    /// </summary>
+    private string CalculateIntegrityHash(PrivacyAgreementState state)
+    {
+        // 构建需要哈希的数据字符串
+        var dataToHash = $"{state.IsAgreed}:{state.AgreedAtUtc:o}:{state.AgreementVersion}:{state.UserId}:{state.DeviceId}:{state.Salt}";
+
+        // 使用 HMAC-SHA256 计算哈希
+        using var hmac = new HMACSHA256(Encoding.UTF8.GetBytes(_secretKey));
+        var hash = hmac.ComputeHash(Encoding.UTF8.GetBytes(dataToHash));
+        return Convert.ToHexString(hash);
+    }
+
+    /// <summary>
+    /// 验证数据完整性
+    /// </summary>
+    private bool VerifyIntegrity(PrivacyAgreementState state)
+    {
+        try
+        {
+            if (string.IsNullOrEmpty(state.IntegrityHash) || string.IsNullOrEmpty(state.Salt))
+            {
+                return false;
+            }
+
+            var expectedHash = CalculateIntegrityHash(state);
+            return CryptographicOperations.FixedTimeEquals(
+                Encoding.UTF8.GetBytes(state.IntegrityHash),
+                Encoding.UTF8.GetBytes(expectedHash));
+        }
+        catch
+        {
+            return false;
+        }
+    }
+}

LanMountainDesktop.Launcher/Services/StartupAttemptRegistry.cs

@@ -0,0 +1,550 @@
+using System.Diagnostics;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
+using LanMountainDesktop.Launcher.Models;
+using LanMountainDesktop.Shared.Contracts.Launcher;
+
+namespace LanMountainDesktop.Launcher.Services;
+
+internal sealed class StartupAttemptRegistry
+{
+    private static readonly TimeSpan CoordinatorHeartbeatTimeout = TimeSpan.FromSeconds(10);
+
+    private readonly string _statePath;
+    private readonly string _mutexName;
+    private string? _ownedAttemptId;
+
+    public StartupAttemptRegistry()
+        : 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;
+        _mutexName = $"LanMountainDesktop.Launcher.StartupAttempt.{ComputePathHash(statePath)}";
+    }
+
+    public StartupAttemptRecord StartOwnedAttempt(
+        int hostPid,
+        string launchSource,
+        string successPolicy,
+        StartupStage stage,
+        string? message)
+    {
+        var record = new StartupAttemptRecord
+        {
+            AttemptId = Guid.NewGuid().ToString("N"),
+            HostPid = hostPid,
+            CoordinatorPid = Environment.ProcessId,
+            LaunchSource = launchSource,
+            SuccessPolicy = successPolicy,
+            LastObservedStage = stage,
+            LastObservedMessage = message ?? string.Empty,
+            StartedAtUtc = DateTimeOffset.UtcNow,
+            UpdatedAtUtc = DateTimeOffset.UtcNow,
+            HeartbeatAtUtc = DateTimeOffset.UtcNow,
+            State = StartupAttemptState.Pending
+        };
+
+        ExecuteWithLock(() =>
+        {
+            SaveUnsafe(record);
+            _ownedAttemptId = record.AttemptId;
+        });
+
+        return Clone(record);
+    }
+
+    public bool TryReserveCoordinator(
+        string launchSource,
+        string successPolicy,
+        string coordinatorPipeName,
+        out StartupAttemptRecord reservedAttempt,
+        out StartupAttemptRecord? activeCoordinatorAttempt)
+    {
+        StartupAttemptRecord? reserved = null;
+        StartupAttemptRecord? active = null;
+
+        ExecuteWithLock(() =>
+        {
+            var existing = LoadUnsafe();
+            if (existing is not null && IsCoordinatorLive(existing))
+            {
+                active = Clone(existing);
+                return;
+            }
+
+            if (existing is not null && IsRecoverableCoordinatorAttempt(existing))
+            {
+                existing.CoordinatorPid = Environment.ProcessId;
+                existing.CoordinatorPipeName = coordinatorPipeName;
+                existing.HeartbeatAtUtc = DateTimeOffset.UtcNow;
+                existing.UpdatedAtUtc = DateTimeOffset.UtcNow;
+                if (existing.HostPid <= 0)
+                {
+                    existing.ReservedBeforeHostStart = true;
+                }
+
+                if (existing.State == StartupAttemptState.DetachedWaiting)
+                {
+                    existing.State = StartupAttemptState.SoftTimeout;
+                }
+
+                _ownedAttemptId = existing.AttemptId;
+                SaveUnsafe(existing);
+                reserved = Clone(existing);
+                return;
+            }
+
+            var now = DateTimeOffset.UtcNow;
+            var record = new StartupAttemptRecord
+            {
+                AttemptId = Guid.NewGuid().ToString("N"),
+                HostPid = 0,
+                CoordinatorPid = Environment.ProcessId,
+                CoordinatorPipeName = coordinatorPipeName,
+                LaunchSource = launchSource,
+                SuccessPolicy = successPolicy,
+                LastObservedStage = StartupStage.Initializing,
+                LastObservedMessage = "Launcher coordinator reserved startup ownership.",
+                StartedAtUtc = now,
+                UpdatedAtUtc = now,
+                HeartbeatAtUtc = now,
+                ReservedBeforeHostStart = true,
+                State = StartupAttemptState.Pending
+            };
+
+            _ownedAttemptId = record.AttemptId;
+            SaveUnsafe(record);
+            reserved = Clone(record);
+        });
+
+        reservedAttempt = reserved ?? new StartupAttemptRecord();
+        activeCoordinatorAttempt = active;
+        return reserved is not null;
+    }
+
+    public StartupAttemptRecord? GetOwnedAttempt()
+    {
+        StartupAttemptRecord? result = null;
+        if (string.IsNullOrWhiteSpace(_ownedAttemptId))
+        {
+            return null;
+        }
+
+        ExecuteWithLock(() =>
+        {
+            var record = LoadUnsafe();
+            if (record is not null && string.Equals(record.AttemptId, _ownedAttemptId, StringComparison.Ordinal))
+            {
+                result = Clone(record);
+            }
+        });
+
+        return result;
+    }
+
+    public StartupAttemptRecord? TryGetLiveCoordinatorAttempt()
+    {
+        StartupAttemptRecord? result = null;
+        ExecuteWithLock(() =>
+        {
+            var record = LoadUnsafe();
+            if (record is not null && IsCoordinatorLive(record))
+            {
+                result = Clone(record);
+            }
+        });
+
+        return result;
+    }
+
+    public StartupAttemptRecord? TryGetLatestAttempt()
+    {
+        StartupAttemptRecord? result = null;
+        ExecuteWithLock(() =>
+        {
+            var record = LoadUnsafe();
+            if (record is not null)
+            {
+                result = Clone(record);
+            }
+        });
+
+        return result;
+    }
+
+    public StartupAttemptRecord AssignOwnedHostProcess(
+        int hostPid,
+        StartupStage stage,
+        string? message)
+    {
+        StartupAttemptRecord? result = null;
+        UpdateOwned(record =>
+        {
+            record.HostPid = hostPid;
+            record.LastObservedStage = stage;
+            record.LastObservedMessage = message ?? record.LastObservedMessage;
+            record.ReservedBeforeHostStart = false;
+            result = Clone(record);
+        });
+
+        return result ?? StartOwnedAttempt(
+            hostPid,
+            string.Empty,
+            string.Empty,
+            stage,
+            message);
+    }
+
+    public bool AdoptAttempt(string attemptId)
+    {
+        if (string.IsNullOrWhiteSpace(attemptId))
+        {
+            return false;
+        }
+
+        var adopted = false;
+        ExecuteWithLock(() =>
+        {
+            var record = LoadUnsafe();
+            if (record is null || !string.Equals(record.AttemptId, attemptId, StringComparison.Ordinal))
+            {
+                return;
+            }
+
+            if (!IsAttachable(record))
+            {
+                return;
+            }
+
+            _ownedAttemptId = record.AttemptId;
+            if (record.State == StartupAttemptState.DetachedWaiting)
+            {
+                record.State = StartupAttemptState.SoftTimeout;
+            }
+
+            record.UpdatedAtUtc = DateTimeOffset.UtcNow;
+            SaveUnsafe(record);
+            adopted = true;
+        });
+
+        return adopted;
+    }
+
+    public StartupAttemptRecord? TryGetAttachableAttempt(string launchSource, string successPolicy)
+    {
+        StartupAttemptRecord? result = null;
+        ExecuteWithLock(() =>
+        {
+            var record = LoadUnsafe();
+            if (record is null ||
+                !IsAttachable(record) ||
+                !string.Equals(record.LaunchSource, launchSource, StringComparison.OrdinalIgnoreCase) ||
+                !string.Equals(record.SuccessPolicy, successPolicy, StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
+            result = Clone(record);
+        });
+
+        return result;
+    }
+
+    public void MarkOwnedIpcConnected()
+    {
+        UpdateOwned(record =>
+        {
+            record.IpcConnected = true;
+            record.PublicIpcConnected = true;
+        });
+    }
+
+    public void UpdateOwnedStage(StartupStage stage, string? message, bool ipcConnected)
+    {
+        UpdateOwned(record =>
+        {
+            record.LastObservedStage = stage;
+            record.LastObservedMessage = message ?? string.Empty;
+            if (ipcConnected)
+            {
+                record.IpcConnected = true;
+                record.PublicIpcConnected = true;
+            }
+        });
+    }
+
+    public void UpdateOwnedCoordinatorHeartbeat(LauncherCoordinatorStatus status)
+    {
+        UpdateOwned(record =>
+        {
+            record.CoordinatorPid = Environment.ProcessId;
+            record.HeartbeatAtUtc = DateTimeOffset.UtcNow;
+            record.LastObservedStage = status.LastObservedStage;
+            record.LastObservedMessage = status.LastObservedMessage;
+            record.IpcConnected = status.PublicIpcConnected;
+            record.PublicIpcConnected = status.PublicIpcConnected;
+            record.ShellStatus = status.ShellStatus?.ShellState ?? status.State;
+        });
+    }
+
+    public void MarkOwnedSoftTimeout(string? message)
+    {
+        UpdateOwned(record =>
+        {
+            record.State = StartupAttemptState.SoftTimeout;
+            record.LastObservedMessage = message ?? record.LastObservedMessage;
+        });
+    }
+
+    public void MarkOwnedWaitingForShell(string? message)
+    {
+        UpdateOwned(record =>
+        {
+            if (record.State is StartupAttemptState.Pending or StartupAttemptState.SoftTimeout or StartupAttemptState.DetachedWaiting)
+            {
+                record.State = StartupAttemptState.WaitingForShell;
+            }
+
+            record.LastObservedMessage = message ?? record.LastObservedMessage;
+        });
+    }
+
+    public void MarkOwnedDetachedWaiting()
+    {
+        UpdateOwned(record =>
+        {
+            if (record.State is StartupAttemptState.Pending or StartupAttemptState.SoftTimeout)
+            {
+                record.State = StartupAttemptState.DetachedWaiting;
+            }
+        });
+    }
+
+    public void MarkOwnedSucceeded(StartupStage stage, string? message)
+    {
+        UpdateOwned(record =>
+        {
+            record.State = StartupAttemptState.Succeeded;
+            record.LastObservedStage = stage;
+            record.LastObservedMessage = message ?? record.LastObservedMessage;
+        });
+    }
+
+    public void MarkOwnedFailed(StartupStage stage, string? message)
+    {
+        UpdateOwned(record =>
+        {
+            record.State = StartupAttemptState.Failed;
+            record.LastObservedStage = stage;
+            record.LastObservedMessage = message ?? record.LastObservedMessage;
+        });
+    }
+
+    private void UpdateOwned(Action<StartupAttemptRecord> update)
+    {
+        if (string.IsNullOrWhiteSpace(_ownedAttemptId))
+        {
+            return;
+        }
+
+        ExecuteWithLock(() =>
+        {
+            var record = LoadUnsafe();
+            if (record is null || !string.Equals(record.AttemptId, _ownedAttemptId, StringComparison.Ordinal))
+            {
+                return;
+            }
+
+            update(record);
+            record.UpdatedAtUtc = DateTimeOffset.UtcNow;
+            SaveUnsafe(record);
+        });
+    }
+
+    private void ExecuteWithLock(Action action)
+    {
+        using var mutex = new Mutex(false, _mutexName);
+        var hasHandle = false;
+        try
+        {
+            try
+            {
+                hasHandle = mutex.WaitOne(TimeSpan.FromSeconds(2));
+            }
+            catch (AbandonedMutexException)
+            {
+                hasHandle = true;
+            }
+
+            if (!hasHandle)
+            {
+                return;
+            }
+
+            action();
+        }
+        finally
+        {
+            if (hasHandle)
+            {
+                mutex.ReleaseMutex();
+            }
+        }
+    }
+
+    private StartupAttemptRecord? LoadUnsafe()
+    {
+        if (!File.Exists(_statePath))
+        {
+            return null;
+        }
+
+        try
+        {
+            var json = File.ReadAllText(_statePath);
+            return JsonSerializer.Deserialize(json, AppJsonContext.Default.StartupAttemptRecord);
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    private void SaveUnsafe(StartupAttemptRecord record)
+    {
+        var directory = Path.GetDirectoryName(_statePath);
+        if (!string.IsNullOrWhiteSpace(directory))
+        {
+            Directory.CreateDirectory(directory);
+        }
+
+        File.WriteAllText(_statePath, JsonSerializer.Serialize(record, AppJsonContext.Default.StartupAttemptRecord));
+    }
+
+    private static bool IsAttachable(StartupAttemptRecord record)
+    {
+        if (record.State is not (
+            StartupAttemptState.Pending or
+            StartupAttemptState.SoftTimeout or
+            StartupAttemptState.DetachedWaiting or
+            StartupAttemptState.WaitingForShell))
+        {
+            return false;
+        }
+
+        return TryGetLiveProcess(record.HostPid, out _);
+    }
+
+    private static bool IsRecoverableCoordinatorAttempt(StartupAttemptRecord record)
+    {
+        if (record.State is not (
+            StartupAttemptState.Pending or
+            StartupAttemptState.SoftTimeout or
+            StartupAttemptState.DetachedWaiting or
+            StartupAttemptState.WaitingForShell))
+        {
+            return false;
+        }
+
+        if (record.HostPid <= 0)
+        {
+            return true;
+        }
+
+        return TryGetLiveProcess(record.HostPid, out _);
+    }
+
+    private static bool IsCoordinatorLive(StartupAttemptRecord record)
+    {
+        if (record.State is not (
+            StartupAttemptState.Pending or
+            StartupAttemptState.SoftTimeout or
+            StartupAttemptState.DetachedWaiting or
+            StartupAttemptState.WaitingForShell))
+        {
+            return false;
+        }
+
+        if (record.CoordinatorPid <= 0 ||
+            string.IsNullOrWhiteSpace(record.CoordinatorPipeName) ||
+            DateTimeOffset.UtcNow - record.HeartbeatAtUtc > CoordinatorHeartbeatTimeout)
+        {
+            return false;
+        }
+
+        return TryGetLiveProcess(record.CoordinatorPid, out _);
+    }
+
+    private static bool TryGetLiveProcess(int processId, out Process? process)
+    {
+        process = null;
+        if (processId <= 0)
+        {
+            return false;
+        }
+
+        try
+        {
+            process = Process.GetProcessById(processId);
+            return !process.HasExited;
+        }
+        catch
+        {
+            process?.Dispose();
+            process = null;
+            return false;
+        }
+    }
+
+    private static string ComputePathHash(string statePath)
+    {
+        var bytes = SHA256.HashData(Encoding.UTF8.GetBytes(statePath.ToLowerInvariant()));
+        return Convert.ToHexString(bytes[..8]);
+    }
+
+    private static StartupAttemptRecord Clone(StartupAttemptRecord record)
+    {
+        return new StartupAttemptRecord
+        {
+            AttemptId = record.AttemptId,
+            HostPid = record.HostPid,
+            CoordinatorPid = record.CoordinatorPid,
+            CoordinatorPipeName = record.CoordinatorPipeName,
+            StartedAtUtc = record.StartedAtUtc,
+            UpdatedAtUtc = record.UpdatedAtUtc,
+            HeartbeatAtUtc = record.HeartbeatAtUtc,
+            LaunchSource = record.LaunchSource,
+            SuccessPolicy = record.SuccessPolicy,
+            LastObservedStage = record.LastObservedStage,
+            LastObservedMessage = record.LastObservedMessage,
+            IpcConnected = record.IpcConnected,
+            PublicIpcConnected = record.PublicIpcConnected,
+            ShellStatus = record.ShellStatus,
+            ReservedBeforeHostStart = record.ReservedBeforeHostStart,
+            State = record.State
+        };
+    }
+}

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[]
                  {

LanMountainDesktop.Launcher/ViewModels/DevDebugWindowViewModel.cs

@@ -13,6 +13,7 @@ public sealed class DevDebugWindowViewModel : INotifyPropertyChanged
     private bool _isErrorEnabled = true;
     private bool _isUpdateEnabled = true;
     private bool _isOobeEnabled = true;
+    private bool _isDataLocationEnabled = true;
     private string _statusMessage = "就绪";
 
     public event PropertyChangedEventHandler? PropertyChanged;
@@ -87,6 +88,23 @@ public sealed class DevDebugWindowViewModel : INotifyPropertyChanged
         }
     }
 
+    /// <summary>
+    /// 数据位置选择页面是否启用实际功能
+    /// </summary>
+    public bool IsDataLocationEnabled
+    {
+        get => _isDataLocationEnabled;
+        set
+        {
+            if (_isDataLocationEnabled != value)
+            {
+                _isDataLocationEnabled = value;
+                OnPropertyChanged();
+                UpdateStatus($"数据位置选择: {(value ? "功能模式" : "仅查看")}");
+            }
+        }
+    }
+
     #endregion
 
     #region 状态信息
@@ -131,6 +149,11 @@ public sealed class DevDebugWindowViewModel : INotifyPropertyChanged
     /// </summary>
     public ICommand OpenOobeCommand { get; }
 
+    /// <summary>
+    /// 打开数据位置选择页面命令
+    /// </summary>
+    public ICommand OpenDataLocationCommand { get; }
+
     /// <summary>
     /// 全部切换到查看模式命令
     /// </summary>
@@ -170,6 +193,11 @@ public sealed class DevDebugWindowViewModel : INotifyPropertyChanged
     /// </summary>
     public event EventHandler<OobeOpenEventArgs>? OpenOobeRequested;
 
+    /// <summary>
+    /// 请求打开数据位置选择页面
+    /// </summary>
+    public event EventHandler<DataLocationOpenEventArgs>? OpenDataLocationRequested;
+
     /// <summary>
     /// 请求关闭窗口
     /// </summary>
@@ -199,12 +227,18 @@ public sealed class DevDebugWindowViewModel : INotifyPropertyChanged
             OpenOobeRequested?.Invoke(this, new OobeOpenEventArgs(IsOobeEnabled));
         });
 
+        OpenDataLocationCommand = new RelayCommand(() =>
+        {
+            OpenDataLocationRequested?.Invoke(this, new DataLocationOpenEventArgs(IsDataLocationEnabled));
+        });
+
         SetAllViewOnlyCommand = new RelayCommand(() =>
         {
             IsSplashEnabled = false;
             IsErrorEnabled = false;
             IsUpdateEnabled = false;
             IsOobeEnabled = false;
+            IsDataLocationEnabled = false;
             UpdateStatus("全部页面已切换到查看模式");
         });
 
@@ -214,6 +248,7 @@ public sealed class DevDebugWindowViewModel : INotifyPropertyChanged
             IsErrorEnabled = true;
             IsUpdateEnabled = true;
             IsOobeEnabled = true;
+            IsDataLocationEnabled = true;
             UpdateStatus("全部页面已切换到功能模式");
         });
 
@@ -260,4 +295,10 @@ public class OobeOpenEventArgs : EventArgs
     public OobeOpenEventArgs(bool isFunctional) => IsFunctional = isFunctional;
 }
 
+public class DataLocationOpenEventArgs : EventArgs
+{
+    public bool IsFunctional { get; }
+    public DataLocationOpenEventArgs(bool isFunctional) => IsFunctional = isFunctional;
+}
+
 #endregion

LanMountainDesktop.Launcher/Views/DataLocationPromptWindow.axaml

@@ -0,0 +1,154 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:views="clr-namespace:LanMountainDesktop.Launcher.Views"
+        xmlns:fi="using:FluentIcons.Avalonia"
+        mc:Ignorable="d"
+        d:DesignWidth="520"
+        d:DesignHeight="480"
+        x:Class="LanMountainDesktop.Launcher.Views.DataLocationPromptWindow"
+        x:DataType="views:DataLocationPromptWindow"
+        Title="Choose Data Location"
+        Width="520"
+        Height="480"
+        CanResize="False"
+        WindowStartupLocation="CenterScreen"
+        Background="{DynamicResource SolidBackgroundFillColorBaseBrush}"
+        TransparencyLevelHint="None"
+        Icon="/Assets/logo.ico">
+  <Grid x:Name="ContentGrid"
+        Opacity="0">
+    <Grid.RenderTransform>
+      <TranslateTransform Y="24" />
+    </Grid.RenderTransform>
+    <Grid Margin="36" RowDefinitions="Auto,*,Auto">
+      <StackPanel Grid.Row="0" Spacing="8" Margin="0,0,0,20">
+        <TextBlock Text="Choose Data Location"
+                   FontSize="22"
+                   FontWeight="SemiBold"
+                   Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+        <TextBlock Text="Choose where launcher and desktop data should be stored. You can change this later in settings."
+                   FontSize="13"
+                   TextWrapping="Wrap"
+                   Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+      </StackPanel>
+
+      <StackPanel Grid.Row="1" Spacing="12">
+        <Border x:Name="AdminWarningBanner"
+                Background="{DynamicResource SystemFillColorCriticalBackgroundBrush}"
+                CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                Padding="12,10"
+                IsVisible="False">
+          <StackPanel Spacing="4">
+            <StackPanel Orientation="Horizontal" Spacing="6">
+              <fi:SymbolIcon Symbol="Important"
+                             FontSize="16"
+                             Foreground="{DynamicResource SystemFillColorCriticalBrush}" />
+              <TextBlock Text="App folder is not writable"
+                         FontWeight="SemiBold"
+                         FontSize="13"
+                         Foreground="{DynamicResource SystemFillColorCriticalBrush}" />
+            </StackPanel>
+            <TextBlock Text="The current install directory requires elevated permissions. Data will be stored in the system user profile instead."
+                       FontSize="12"
+                       TextWrapping="Wrap"
+                       Foreground="{DynamicResource SystemFillColorCriticalBrush}" />
+          </StackPanel>
+        </Border>
+
+        <Border x:Name="SystemOptionBorder"
+                Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                BorderThickness="2"
+                BorderBrush="{DynamicResource AccentFillColorDefaultBrush}"
+                Padding="16,14">
+          <Grid ColumnDefinitions="Auto,*">
+            <RadioButton x:Name="SystemRadio"
+                         Grid.Column="0"
+                         VerticalAlignment="Top"
+                         Margin="0,2,12,0"
+                         GroupName="DataLocation"
+                         IsChecked="True" />
+            <StackPanel Grid.Column="1" Spacing="4">
+              <TextBlock Text="Store in the system user profile (Recommended)"
+                         FontSize="14"
+                         FontWeight="SemiBold"
+                         Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+              <TextBlock Text="Data stays tied to the current Windows user and remains intact across app reinstalls and updates."
+                         FontSize="12"
+                         TextWrapping="Wrap"
+                         Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+              <TextBlock x:Name="SystemPathText"
+                         FontSize="11"
+                         TextWrapping="Wrap"
+                         Foreground="{DynamicResource TextFillColorTertiaryBrush}"
+                         Margin="0,4,0,0" />
+            </StackPanel>
+          </Grid>
+        </Border>
+
+        <Border x:Name="PortableOptionBorder"
+                Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                BorderThickness="1"
+                BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
+                Padding="16,14">
+          <Grid ColumnDefinitions="Auto,*">
+            <RadioButton x:Name="PortableRadio"
+                         Grid.Column="0"
+                         VerticalAlignment="Top"
+                         Margin="0,2,12,0"
+                         GroupName="DataLocation"
+                         IsEnabled="False" />
+            <StackPanel Grid.Column="1" Spacing="4">
+              <TextBlock Text="Store next to the app"
+                         FontSize="14"
+                         FontWeight="SemiBold"
+                         Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+              <TextBlock Text="Useful for portable installs. The whole app folder can be moved to another machine together with its data."
+                         FontSize="12"
+                         TextWrapping="Wrap"
+                         Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+              <TextBlock x:Name="PortablePathText"
+                         FontSize="11"
+                         TextWrapping="Wrap"
+                         Foreground="{DynamicResource TextFillColorTertiaryBrush}"
+                         Margin="0,4,0,0" />
+            </StackPanel>
+          </Grid>
+        </Border>
+
+        <Border x:Name="MigrationInfoBorder"
+                Background="{DynamicResource SystemFillColorSuccessBackgroundBrush}"
+                CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                Padding="12,10"
+                IsVisible="False">
+          <StackPanel Orientation="Horizontal" Spacing="6">
+            <fi:SymbolIcon Symbol="Info"
+                           FontSize="16"
+                           Foreground="{DynamicResource SystemFillColorSuccessBrush}" />
+            <TextBlock x:Name="MigrationInfoText"
+                       FontSize="12"
+                       TextWrapping="Wrap"
+                       Foreground="{DynamicResource SystemFillColorSuccessBrush}" />
+          </StackPanel>
+        </Border>
+      </StackPanel>
+
+      <StackPanel Grid.Row="2"
+                  Orientation="Horizontal"
+                  HorizontalAlignment="Right"
+                  Spacing="10"
+                  Margin="0,20,0,0">
+        <Button x:Name="CancelButton"
+                Content="Cancel"
+                Theme="{DynamicResource ButtonTheme}"
+                IsVisible="False" />
+        <Button x:Name="ConfirmButton"
+                Content="Confirm"
+                Theme="{DynamicResource AccentButtonTheme}" />
+      </StackPanel>
+    </Grid>
+  </Grid>
+</Window>

LanMountainDesktop.Launcher/Views/DataLocationPromptWindow.axaml.cs

@@ -0,0 +1,308 @@
+using Avalonia;
+using Avalonia.Animation;
+using Avalonia.Animation.Easings;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using Avalonia.Styling;
+using LanMountainDesktop.Launcher.Models;
+using LanMountainDesktop.Launcher.Services;
+
+namespace LanMountainDesktop.Launcher.Views;
+
+internal partial class DataLocationPromptWindow : Window
+{
+    private readonly TaskCompletionSource<DataLocationPromptResult?> _completionSource = new();
+    private readonly DataLocationResolver _resolver;
+    private bool _isTransitioning;
+
+    public DataLocationPromptWindow()
+    {
+        AvaloniaXamlLoader.Load(this);
+        Loaded += OnWindowLoaded;
+        Opened += OnWindowOpened;
+        _resolver = new DataLocationResolver(AppContext.BaseDirectory);
+    }
+
+    internal DataLocationPromptWindow(DataLocationResolver resolver)
+    {
+        AvaloniaXamlLoader.Load(this);
+        Loaded += OnWindowLoaded;
+        Opened += OnWindowOpened;
+        _resolver = resolver;
+    }
+
+    private void OnWindowLoaded(object? sender, RoutedEventArgs e)
+    {
+        BindControls();
+        UpdateUiState();
+    }
+
+    private void BindControls()
+    {
+        var systemRadio = this.FindControl<RadioButton>("SystemRadio");
+        var portableRadio = this.FindControl<RadioButton>("PortableRadio");
+        var confirmButton = this.FindControl<Button>("ConfirmButton");
+        var cancelButton = this.FindControl<Button>("CancelButton");
+
+        if (systemRadio is not null)
+        {
+            systemRadio.IsCheckedChanged += OnSelectionChanged;
+        }
+
+        if (portableRadio is not null)
+        {
+            portableRadio.IsCheckedChanged += OnSelectionChanged;
+        }
+
+        if (confirmButton is not null)
+        {
+            confirmButton.Click += OnConfirmClick;
+        }
+
+        if (cancelButton is not null)
+        {
+            cancelButton.Click += OnCancelClick;
+        }
+    }
+
+    private void UpdateUiState()
+    {
+        var systemPathText = this.FindControl<TextBlock>("SystemPathText");
+        var portablePathText = this.FindControl<TextBlock>("PortablePathText");
+        var adminWarningBanner = this.FindControl<Border>("AdminWarningBanner");
+        var portableRadio = this.FindControl<RadioButton>("PortableRadio");
+        var migrationInfoBorder = this.FindControl<Border>("MigrationInfoBorder");
+        var migrationInfoText = this.FindControl<TextBlock>("MigrationInfoText");
+
+        if (systemPathText is not null)
+        {
+            systemPathText.Text = _resolver.DefaultSystemDataPath;
+        }
+
+        if (portablePathText is not null)
+        {
+            portablePathText.Text = _resolver.DefaultPortableDataPath;
+        }
+
+        var portableAllowed = _resolver.IsPortableModeAllowed();
+
+        if (adminWarningBanner is not null)
+        {
+            adminWarningBanner.IsVisible = !portableAllowed;
+        }
+
+        if (portableRadio is not null)
+        {
+            portableRadio.IsEnabled = portableAllowed;
+        }
+
+        var hasExistingData = _resolver.HasExistingSystemData();
+        if (migrationInfoBorder is not null)
+        {
+            migrationInfoBorder.IsVisible = hasExistingData;
+        }
+
+        if (migrationInfoText is not null && hasExistingData)
+        {
+            migrationInfoText.Text = "Existing system data was detected. Choosing portable mode will migrate the current data automatically.";
+        }
+    }
+
+    private void OnSelectionChanged(object? sender, RoutedEventArgs e)
+    {
+        var systemRadio = this.FindControl<RadioButton>("SystemRadio");
+        var portableRadio = this.FindControl<RadioButton>("PortableRadio");
+        var systemBorder = this.FindControl<Border>("SystemOptionBorder");
+        var portableBorder = this.FindControl<Border>("PortableOptionBorder");
+
+        var isSystem = systemRadio?.IsChecked == true;
+        var isPortable = portableRadio?.IsChecked == true;
+
+        if (systemBorder is not null)
+        {
+            systemBorder.BorderBrush = isSystem
+                ? Application.Current?.FindResource("AccentFillColorDefaultBrush") as IBrush
+                : Application.Current?.FindResource("CardStrokeColorDefaultBrush") as IBrush;
+            systemBorder.BorderThickness = isSystem ? new Thickness(2) : new Thickness(1);
+        }
+
+        if (portableBorder is not null)
+        {
+            portableBorder.BorderBrush = isPortable
+                ? Application.Current?.FindResource("AccentFillColorDefaultBrush") as IBrush
+                : Application.Current?.FindResource("CardStrokeColorDefaultBrush") as IBrush;
+            portableBorder.BorderThickness = isPortable ? new Thickness(2) : new Thickness(1);
+        }
+    }
+
+    private async void OnConfirmClick(object? sender, RoutedEventArgs e)
+    {
+        if (_isTransitioning)
+        {
+            return;
+        }
+
+        _isTransitioning = true;
+
+        var portableRadio = this.FindControl<RadioButton>("PortableRadio");
+        var selectedMode = portableRadio?.IsChecked == true
+            ? DataLocationMode.Portable
+            : DataLocationMode.System;
+
+        var migrateExistingData = selectedMode == DataLocationMode.Portable && _resolver.HasExistingSystemData();
+
+        try
+        {
+            await PlayExitAnimationAsync();
+            _completionSource.TrySetResult(new DataLocationPromptResult
+            {
+                SelectedMode = selectedMode,
+                MigrateExistingData = migrateExistingData
+            });
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Error during data location prompt exit animation: {ex.Message}");
+            _completionSource.TrySetResult(new DataLocationPromptResult
+            {
+                SelectedMode = selectedMode,
+                MigrateExistingData = migrateExistingData
+            });
+        }
+    }
+
+    private async void OnCancelClick(object? sender, RoutedEventArgs e)
+    {
+        if (_isTransitioning)
+        {
+            return;
+        }
+
+        _isTransitioning = true;
+
+        try
+        {
+            await PlayExitAnimationAsync();
+            _completionSource.TrySetResult(null);
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Error during data location prompt cancel: {ex.Message}");
+            _completionSource.TrySetResult(null);
+        }
+    }
+
+    private async void OnWindowOpened(object? sender, EventArgs e)
+    {
+        await PlayEntranceAnimationAsync();
+    }
+
+    private async Task PlayEntranceAnimationAsync()
+    {
+        try
+        {
+            var contentGrid = this.FindControl<Grid>("ContentGrid");
+            if (contentGrid is null)
+            {
+                return;
+            }
+
+            var translateTransform = contentGrid.RenderTransform as TranslateTransform ?? new TranslateTransform();
+            contentGrid.RenderTransform = translateTransform;
+
+            contentGrid.Opacity = 0;
+            translateTransform.Y = 24;
+
+            var fadeInAnimation = new Animation
+            {
+                Duration = TimeSpan.FromMilliseconds(500),
+                Easing = new CubicEaseOut(),
+                FillMode = FillMode.Forward,
+                Children =
+                {
+                    new KeyFrame
+                    {
+                        Setters = { new Setter(OpacityProperty, 0.0) },
+                        KeyTime = TimeSpan.FromMilliseconds(0)
+                    },
+                    new KeyFrame
+                    {
+                        Setters = { new Setter(OpacityProperty, 1.0) },
+                        KeyTime = TimeSpan.FromMilliseconds(500)
+                    }
+                }
+            };
+
+            var slideUpAnimation = new Animation
+            {
+                Duration = TimeSpan.FromMilliseconds(500),
+                Easing = new CubicEaseOut(),
+                FillMode = FillMode.Forward,
+                Children =
+                {
+                    new KeyFrame
+                    {
+                        Setters = { new Setter(TranslateTransform.YProperty, 24.0) },
+                        KeyTime = TimeSpan.FromMilliseconds(0)
+                    },
+                    new KeyFrame
+                    {
+                        Setters = { new Setter(TranslateTransform.YProperty, 0.0) },
+                        KeyTime = TimeSpan.FromMilliseconds(500)
+                    }
+                }
+            };
+
+            await Task.WhenAll(
+                fadeInAnimation.RunAsync(contentGrid),
+                slideUpAnimation.RunAsync(translateTransform));
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Error playing data location prompt entrance animation: {ex.Message}");
+        }
+    }
+
+    private async Task PlayExitAnimationAsync()
+    {
+        try
+        {
+            var contentGrid = this.FindControl<Grid>("ContentGrid");
+            if (contentGrid is null)
+            {
+                await Task.Delay(150);
+                return;
+            }
+
+            var fadeOutAnimation = new Animation
+            {
+                Duration = TimeSpan.FromMilliseconds(200),
+                Easing = new CubicEaseIn(),
+                FillMode = FillMode.Forward,
+                Children =
+                {
+                    new KeyFrame
+                    {
+                        Setters = { new Setter(OpacityProperty, 1.0) },
+                        KeyTime = TimeSpan.FromMilliseconds(0)
+                    },
+                    new KeyFrame
+                    {
+                        Setters = { new Setter(OpacityProperty, 0.0) },
+                        KeyTime = TimeSpan.FromMilliseconds(200)
+                    }
+                }
+            };
+
+            await fadeOutAnimation.RunAsync(contentGrid);
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"Error playing data location prompt exit animation: {ex.Message}");
+        }
+    }
+
+    internal Task<DataLocationPromptResult?> WaitForChoiceAsync() => _completionSource.Task;
+}

LanMountainDesktop.Launcher/Views/DevDebugWindow.axaml

@@ -141,6 +141,32 @@
             </Grid>
           </Border>
 
+          <!-- 数据位置选择页面 -->
+          <Border Background="{DynamicResource SystemControlBackgroundAltMediumBrush}"
+                  CornerRadius="8"
+                  Padding="15">
+            <Grid ColumnDefinitions="*,Auto">
+              <StackPanel Grid.Column="0">
+                <TextBlock Text="📁 数据位置选择 (DataLocationPromptWindow)"
+                           FontWeight="SemiBold"
+                           FontSize="14" />
+                <TextBlock Text="选择数据保存位置"
+                           FontSize="11"
+                           Opacity="0.6"
+                           Margin="0,3,0,0" />
+              </StackPanel>
+              <StackPanel Grid.Column="1" Spacing="8">
+                <ToggleSwitch Content="启用功能"
+                              IsChecked="{Binding IsDataLocationEnabled}"
+                              OnContent="功能"
+                              OffContent="查看" />
+                <Button Content="打开"
+                        Command="{Binding OpenDataLocationCommand}"
+                        HorizontalAlignment="Right" />
+              </StackPanel>
+            </Grid>
+          </Border>
+
         </StackPanel>
       </ScrollViewer>
 

LanMountainDesktop.Launcher/Views/DevDebugWindow.axaml.cs

@@ -25,6 +25,7 @@ public partial class DevDebugWindow : Window
         _viewModel.OpenErrorRequested += OnOpenErrorRequested;
         _viewModel.OpenUpdateRequested += OnOpenUpdateRequested;
         _viewModel.OpenOobeRequested += OnOpenOobeRequested;
+        _viewModel.OpenDataLocationRequested += OnOpenDataLocationRequested;
         _viewModel.CloseRequested += OnCloseRequested;
     }
 
@@ -135,6 +136,17 @@ public partial class DevDebugWindow : Window
         }
     }
 
+    /// <summary>
+    /// 打开数据位置选择页面
+    /// </summary>
+    private void OnOpenDataLocationRequested(object? sender, DataLocationOpenEventArgs e)
+    {
+        var appRoot = AppDomain.CurrentDomain.BaseDirectory;
+        var resolver = new DataLocationResolver(appRoot);
+        var window = new DataLocationPromptWindow(resolver);
+        window.Show();
+    }
+
     /// <summary>
     /// 关闭窗口
     /// </summary>

LanMountainDesktop.Launcher/Views/ErrorDebugWindow.axaml.cs

@@ -5,52 +5,41 @@ using Avalonia.Platform.Storage;
 
 namespace LanMountainDesktop.Launcher.Views;
 
-/// <summary>
-/// 错误调试窗口 - 开发人员专用调试设置
-/// </summary>
 public partial class ErrorDebugWindow : Window
 {
     private string? _selectedHostPath;
-    private bool _isInitialized = false;
+    private bool _isInitialized;
 
-    /// <summary>
-    /// 是否启用了开发模式
-    /// </summary>
     public bool IsDevModeEnabled { get; private set; }
 
-    /// <summary>
-    /// 选择的主程序路径
-    /// </summary>
+    public bool WasAccepted { get; private set; }
+
     public string? SelectedHostPath => _selectedHostPath;
 
     public ErrorDebugWindow()
     {
         AvaloniaXamlLoader.Load(this);
-        
-        // 延迟到窗口加载完成后再初始化组件
-        this.Loaded += OnWindowLoaded;
+        Loaded += OnWindowLoaded;
     }
 
-    public ErrorDebugWindow(bool devModeEnabled, string? initialPath) : this()
+    public ErrorDebugWindow(bool devModeEnabled, string? initialPath)
+        : this()
     {
         IsDevModeEnabled = devModeEnabled;
         _selectedHostPath = initialPath;
     }
 
-    /// <summary>
-    /// 窗口加载完成事件
-    /// </summary>
     private void OnWindowLoaded(object? sender, RoutedEventArgs e)
     {
-        if (_isInitialized) return;
+        if (_isInitialized)
+        {
+            return;
+        }
+
         _isInitialized = true;
-        
-        Console.WriteLine("[ErrorDebugWindow] Window loaded, initializing components...");
         InitializeComponents();
-        
-        // 设置初始值（在视觉树准备好后）
-        var devModeToggle = this.FindControl<ToggleSwitch>("DevModeToggle");
-        if (devModeToggle is not null)
+
+        if (this.FindControl<ToggleSwitch>("DevModeToggle") is { } devModeToggle)
         {
             devModeToggle.IsChecked = IsDevModeEnabled;
         }
@@ -60,113 +49,72 @@ public partial class ErrorDebugWindow : Window
 
     private void InitializeComponents()
     {
-        // 开发模式开关
-        var devModeToggle = this.FindControl<ToggleSwitch>("DevModeToggle");
-        if (devModeToggle is not null)
+        if (this.FindControl<ToggleSwitch>("DevModeToggle") is { } devModeToggle)
         {
-            devModeToggle.IsCheckedChanged += (s, e) =>
+            devModeToggle.IsCheckedChanged += (_, _) =>
             {
                 IsDevModeEnabled = devModeToggle.IsChecked ?? false;
-                Console.WriteLine($"[ErrorDebugWindow] DevMode changed to: {IsDevModeEnabled}");
             };
-            Console.WriteLine("[ErrorDebugWindow] DevModeToggle event bound");
-        }
-        else
-        {
-            Console.Error.WriteLine("[ErrorDebugWindow] Failed to find DevModeToggle!");
         }
 
-        // 浏览按钮
-        var browseButton = this.FindControl<Button>("BrowseButton");
-        if (browseButton is not null)
+        if (this.FindControl<Button>("BrowseButton") is { } browseButton)
         {
             browseButton.Click += OnBrowseClick;
-            Console.WriteLine("[ErrorDebugWindow] BrowseButton event bound");
-        }
-        else
-        {
-            Console.Error.WriteLine("[ErrorDebugWindow] Failed to find BrowseButton!");
         }
 
-        // 确定按钮
-        var okButton = this.FindControl<Button>("OkButton");
-        if (okButton is not null)
+        if (this.FindControl<Button>("OkButton") is { } okButton)
         {
-            okButton.Click += (s, e) => Close();
-            Console.WriteLine("[ErrorDebugWindow] OkButton event bound");
-        }
-        else
-        {
-            Console.Error.WriteLine("[ErrorDebugWindow] Failed to find OkButton!");
-        }
-
-        // 取消按钮
-        var cancelButton = this.FindControl<Button>("CancelButton");
-        if (cancelButton is not null)
-        {
-            cancelButton.Click += (s, e) =>
+            okButton.Click += (_, _) =>
             {
-                // 取消时恢复原始状态
-                IsDevModeEnabled = false;
-                _selectedHostPath = null;
-                Console.WriteLine("[ErrorDebugWindow] Cancel clicked, resetting state");
+                WasAccepted = true;
                 Close();
             };
-            Console.WriteLine("[ErrorDebugWindow] CancelButton event bound");
         }
-        else
+
+        if (this.FindControl<Button>("CancelButton") is { } cancelButton)
         {
-            Console.Error.WriteLine("[ErrorDebugWindow] Failed to find CancelButton!");
+            cancelButton.Click += (_, _) => Close();
         }
-        
-        Console.WriteLine("[ErrorDebugWindow] Components initialization completed");
     }
 
-    /// <summary>
-    /// 浏览按钮点击
-    /// </summary>
     private async void OnBrowseClick(object? sender, RoutedEventArgs e)
     {
         var storageProvider = StorageProvider;
-        if (storageProvider is null) return;
+        if (storageProvider is null)
+        {
+            return;
+        }
 
         var options = new FilePickerOpenOptions
         {
-            Title = "选择阑山桌面主程序",
+            Title = "Select LanMountainDesktop host executable",
             AllowMultiple = false,
-            FileTypeFilter = new[]
-            {
-                new FilePickerFileType("可执行文件")
+            FileTypeFilter =
+            [
+                new FilePickerFileType("Executable")
                 {
                     Patterns = OperatingSystem.IsWindows()
-                        ? new[] { "*.exe" }
-                        : new[] { "*" }
+                        ? ["*.exe"]
+                        : ["*"]
                 }
-            }
+            ]
         };
 
         var result = await storageProvider.OpenFilePickerAsync(options);
-        if (result.Count > 0)
+        if (result.Count <= 0)
         {
-            _selectedHostPath = result[0].Path.LocalPath;
-            Console.WriteLine($"[ErrorDebugWindow] Selected host path: {_selectedHostPath}");
-            UpdatePathDisplay(_selectedHostPath);
+            return;
         }
+
+        _selectedHostPath = result[0].Path.LocalPath;
+        UpdatePathDisplay(_selectedHostPath);
     }
 
-    /// <summary>
-    /// 更新路径显示
-    /// </summary>
     private void UpdatePathDisplay(string? path)
     {
-        var pathTextBlock = this.FindControl<TextBlock>("PathTextBlock");
-        if (pathTextBlock is not null)
+        if (this.FindControl<TextBlock>("PathTextBlock") is { } pathTextBlock)
         {
-            pathTextBlock.Text = string.IsNullOrEmpty(path) ? "未选择" : path;
-        }
-        else
-        {
-            Console.Error.WriteLine("[ErrorDebugWindow] Failed to find PathTextBlock!");
+            pathTextBlock.Text = string.IsNullOrEmpty(path) ? "Not selected" : path;
         }
     }
 }

LanMountainDesktop.Launcher/Views/ErrorWindow.axaml

@@ -3,102 +3,96 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:views="clr-namespace:LanMountainDesktop.Launcher.Views"
-        xmlns:ui="using:FluentAvalonia.UI.Controls"
         mc:Ignorable="d"
-        d:DesignWidth="520"
-        d:DesignHeight="280"
         x:Class="LanMountainDesktop.Launcher.Views.ErrorWindow"
         x:DataType="views:ErrorWindow"
-        Title="阑山桌面"
-        Width="520"
-        Height="280"
+        Title="LanMountain Desktop"
+        Width="560"
+        Height="320"
         CanResize="False"
         WindowStartupLocation="CenterScreen"
-        Background="{DynamicResource SolidBackgroundFillColorBaseBrush}"
+        Background="#111318"
         TransparencyLevelHint="None"
         Icon="/Assets/logo.ico">
   <Design.DataContext>
     <views:ErrorWindow />
   </Design.DataContext>
 
-  <!-- Fluent Design 风格对话框布局 -->
   <Grid RowDefinitions="*,Auto">
-    <!-- 主内容区域：左侧图标 + 右侧文字 -->
-    <Grid Grid.Row="0" Margin="24,24,24,16" ColumnDefinitions="Auto,*">
-      
-      <!-- 左侧：错误图标（可点击进入调试模式） -->
+    <Grid Grid.Row="0"
+          Margin="24"
+          ColumnDefinitions="Auto,*">
       <Border x:Name="ErrorIconBorder"
               Grid.Column="0"
-              Width="48"
-              Height="48"
-              Margin="0,4,16,0"
-              Background="{DynamicResource SystemFillColorCriticalBackgroundBrush}"
-              CornerRadius="24"
+              Width="52"
+              Height="52"
+              Margin="0,4,18,0"
+              Background="#2B161A"
+              CornerRadius="26"
               VerticalAlignment="Top">
-        <TextBlock Text="&#xEA39;"
+        <TextBlock Text="!"
                    FontSize="24"
-                   FontFamily="{DynamicResource SymbolThemeFontFamily}"
-                   Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+                   FontWeight="Bold"
+                   Foreground="#FFB4AB"
                    HorizontalAlignment="Center"
-                   VerticalAlignment="Center"/>
+                   VerticalAlignment="Center" />
       </Border>
-      
-      <!-- 右侧：标题 + 内容 -->
-      <StackPanel Grid.Column="1" Spacing="8">
-        <!-- 标题 -->
+
+      <StackPanel Grid.Column="1"
+                  Spacing="10">
         <TextBlock x:Name="TitleText"
-                   Text="启动失败"
-                   FontSize="18"
+                   Text="Launcher could not confirm startup"
+                   FontSize="20"
                    FontWeight="SemiBold"
-                   Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                   TextWrapping="Wrap"/>
-        
-        <!-- 错误信息 -->
+                   Foreground="#F6F7FB"
+                   TextWrapping="Wrap" />
+
         <TextBlock x:Name="ErrorMessageText"
-                   Text="找不到阑山桌面应用程序。"
+                   Text="LanMountain Desktop did not reach the expected startup state."
                    FontSize="14"
-                   Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                   Foreground="#D2D7E1"
                    TextWrapping="Wrap"
-                   LineHeight="20"/>
-        
-        <!-- 建议信息 -->
+                   LineHeight="22" />
+
         <TextBlock x:Name="SuggestionText"
-                   Text="请确保应用程序已正确安装，或尝试重新安装。"
+                   Text="You can inspect logs, retry when the old process is gone, or reactivate the current instance."
                    FontSize="13"
-                   Foreground="{DynamicResource TextFillColorTertiaryBrush}"
+                   Foreground="#9BA5B7"
                    TextWrapping="Wrap"
-                   LineHeight="18"
-                   Margin="0,4,0,0"/>
+                   LineHeight="20" />
       </StackPanel>
     </Grid>
 
-    <!-- 底部：按钮区域 -->
     <Border Grid.Row="1"
-            Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
-            Padding="24,16">
-      <Grid ColumnDefinitions="*,Auto">
+            Padding="24,16"
+            Background="#171A21">
+      <Grid ColumnDefinitions="*,Auto,Auto,Auto"
+            ColumnSpacing="8">
         <Button x:Name="OpenLogButton"
                 Grid.Column="0"
-                Content="打开日志"
-                Width="100"
-                Height="32"
-                FontSize="13"
-                HorizontalAlignment="Left"/>
-        <StackPanel Grid.Column="1"
-                    Orientation="Horizontal" 
-                    Spacing="8">
-          <Button x:Name="ExitButton"
-                  Content="退出"
-                  Width="80"
-                  Height="32"
-                  FontSize="13"/>
-          <Button x:Name="RetryButton"
-                  Content="重试"
-                  Width="80"
-                  Height="32"
-                  FontSize="13"
-                  Theme="{DynamicResource AccentButtonTheme}"/>
-        </StackPanel>
+                Content="Open Logs"
+                MinWidth="108"
+                Height="34"
+                HorizontalAlignment="Left" />
+
+        <Button x:Name="SecondaryActionButton"
+                Grid.Column="1"
+                Content="Wait"
+                MinWidth="108"
+                Height="34"
+                IsVisible="False" />
+
+        <Button x:Name="ExitButton"
+                Grid.Column="2"
+                Content="Exit"
+                MinWidth="90"
+                Height="34" />
+
+        <Button x:Name="PrimaryActionButton"
+                Grid.Column="3"
+                Content="Retry"
+                MinWidth="108"
+                Height="34" />
       </Grid>
     </Border>
   </Grid>

LanMountainDesktop.Launcher/Views/ErrorWindow.axaml.cs

@@ -1,542 +1,314 @@
+using System.Diagnostics;
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
-using Avalonia.Platform.Storage;
 using LanMountainDesktop.Launcher.Services;
-using System.Diagnostics;
 
 namespace LanMountainDesktop.Launcher.Views;
 
-/// <summary>
-/// 错误窗口 - 显示启动失败信息，支持调试模式（隐藏入口）
-/// </summary>
 public partial class ErrorWindow : Window
 {
-    private readonly TaskCompletionSource<ErrorWindowResult> _completionSource = new();
-    private int _iconClickCount = 0;
     private const int DebugModeClickThreshold = 5;
-    private bool _isDebugMode = false;
-    private string? _customHostPath;
+
+    private readonly TaskCompletionSource<ErrorWindowResult> _completionSource = new(TaskCreationOptions.RunContinuationsAsynchronously);
+    private int _iconClickCount;
+    private bool _isDebugMode;
     private bool _devModeEnabled;
+    private string? _customHostPath;
+    private ErrorWindowResult _primaryAction = ErrorWindowResult.Retry;
+    private ErrorWindowResult? _secondaryAction;
 
     public ErrorWindow()
     {
         AvaloniaXamlLoader.Load(this);
 
-        // 先加载保存的状态
         _devModeEnabled = LoadDevModeStateInternal();
         _customHostPath = LoadCustomHostPathInternal();
 
-        // 延迟到窗口加载完成后再初始化组件，确保视觉树已准备好
-        this.Loaded += OnWindowLoaded;
-        this.Opened += OnWindowOpened;
+        Loaded += OnWindowLoaded;
+        Closed += (_, _) => _completionSource.TrySetResult(ErrorWindowResult.Exit);
+        ConfigureForGenericFailure(allowRetry: true);
     }
 
-    /// <summary>
-    /// 窗口加载完成事件 - 视觉树已准备好
-    /// </summary>
-    private void OnWindowLoaded(object? sender, RoutedEventArgs e)
-    {
-        Console.WriteLine("[ErrorWindow] Window loaded, initializing components...");
-        InitializeComponents();
-    }
-
-    /// <summary>
-    /// 窗口打开事件
-    /// </summary>
-    private void OnWindowOpened(object? sender, EventArgs e)
-    {
-        Console.WriteLine("[ErrorWindow] Window opened and visible");
-    }
-
-    private void InitializeComponents()
-    {
-        Console.WriteLine("[ErrorWindow] Initializing components...");
-        
-        // 错误图标点击事件（进入调试模式 - 隐藏功能）
-        var errorIconBorder = this.FindControl<Border>("ErrorIconBorder");
-        if (errorIconBorder is not null)
-        {
-            errorIconBorder.PointerPressed += OnErrorIconClick;
-            Console.WriteLine("[ErrorWindow] ErrorIconBorder event bound successfully");
-        }
-        else
-        {
-            Console.Error.WriteLine("[ErrorWindow] Failed to find ErrorIconBorder!");
-        }
-
-        // 按钮事件
-        var retryButton = this.FindControl<Button>("RetryButton");
-        var exitButton = this.FindControl<Button>("ExitButton");
-        var openLogButton = this.FindControl<Button>("OpenLogButton");
-
-        if (retryButton is not null)
-        {
-            retryButton.Click += OnRetryClick;
-            Console.WriteLine("[ErrorWindow] RetryButton event bound");
-        }
-        else
-        {
-            Console.Error.WriteLine("[ErrorWindow] Failed to find RetryButton!");
-        }
-
-        if (exitButton is not null)
-        {
-            exitButton.Click += OnExitClick;
-            Console.WriteLine("[ErrorWindow] ExitButton event bound");
-        }
-        else
-        {
-            Console.Error.WriteLine("[ErrorWindow] Failed to find ExitButton!");
-        }
-
-        if (openLogButton is not null)
-        {
-            openLogButton.Click += OnOpenLogClick;
-            Console.WriteLine("[ErrorWindow] OpenLogButton event bound");
-        }
-        else
-        {
-            Console.Error.WriteLine("[ErrorWindow] Failed to find OpenLogButton!");
-        }
-        
-        Console.WriteLine("[ErrorWindow] Components initialization completed");
-    }
-
-    /// <summary>
-    /// 设置错误消息
-    /// </summary>
     public void SetErrorMessage(string message)
     {
-        var errorText = this.FindControl<TextBlock>("ErrorMessageText");
-        if (errorText is not null)
+        if (this.FindControl<TextBlock>("ErrorMessageText") is { } errorText)
         {
             errorText.Text = message;
         }
     }
 
-    /// <summary>
-    /// 设置调试模式
-    /// </summary>
     public void SetDebugMode(bool isDebugMode)
     {
         _isDebugMode = isDebugMode;
-        var titleText = this.FindControl<TextBlock>("TitleText");
-        if (titleText is not null && isDebugMode)
+        if (isDebugMode && this.FindControl<TextBlock>("TitleText") is { } titleText)
         {
-            titleText.Text = "[调试模式] 错误页面";
+            titleText.Text = "[Debug] Launcher error";
         }
     }
 
-    /// <summary>
-    /// 获取用户选择的主程序路径
-    /// </summary>
-    public string? GetCustomHostPath() => _customHostPath;
-
-    /// <summary>
-    /// 是否启用了开发模式
-    /// </summary>
-    public bool IsDevModeEnabled() => _devModeEnabled;
-
-    /// <summary>
-    /// 等待用户选择
-    /// </summary>
-    public Task<ErrorWindowResult> WaitForChoiceAsync()
+    public void ConfigureForHostNotFound()
     {
-        return _completionSource.Task;
+        ApplyActionLayout(
+            title: "Launcher could not find the desktop executable",
+            suggestion: "Pick another executable in debug mode, inspect logs, or retry after fixing the deployment path.",
+            primaryLabel: "Retry",
+            primaryAction: ErrorWindowResult.Retry,
+            secondaryLabel: null,
+            secondaryAction: null);
     }
 
-    /// <summary>
-    /// 错误图标点击事件 - 连续点击 5 次进入调试模式（隐藏功能）
-    /// </summary>
-    private void OnErrorIconClick(object? sender, Avalonia.Input.PointerPressedEventArgs e)
+    public void ConfigureForGenericFailure(bool allowRetry)
+    {
+        ApplyActionLayout(
+            title: "Launcher could not confirm startup",
+            suggestion: allowRetry
+                ? "Inspect logs, then retry once the previous startup attempt has fully finished."
+                : "Inspect logs or exit. Launcher will avoid creating another desktop process while the old one is still running.",
+            primaryLabel: allowRetry ? "Retry" : "Activate",
+            primaryAction: allowRetry ? ErrorWindowResult.Retry : ErrorWindowResult.ActivateExisting,
+            secondaryLabel: allowRetry ? null : "Wait",
+            secondaryAction: allowRetry ? null : ErrorWindowResult.ContinueWaiting);
+    }
+
+    public void ConfigureForRunningHostFailure(int? hostPid)
+    {
+        var pidHint = hostPid is > 0 ? $" Current host PID: {hostPid}." : string.Empty;
+        ApplyActionLayout(
+            title: "Startup is still pending",
+            suggestion: $"The desktop process is still running, so Launcher will not start a second instance.{pidHint}",
+            primaryLabel: "Activate",
+            primaryAction: ErrorWindowResult.ActivateExisting,
+            secondaryLabel: "Wait",
+            secondaryAction: ErrorWindowResult.ContinueWaiting);
+    }
+
+    public string? GetCustomHostPath() => _customHostPath;
+
+    public bool IsDevModeEnabled() => _devModeEnabled;
+
+    public Task<ErrorWindowResult> WaitForChoiceAsync() => _completionSource.Task;
+
+    public static bool CheckDevModeEnabled() => LoadDevModeStateInternal();
+
+    public static string? GetSavedCustomHostPath() => LoadCustomHostPathInternal();
+
+    private void OnWindowLoaded(object? sender, RoutedEventArgs e)
+    {
+        if (this.FindControl<Border>("ErrorIconBorder") is { } errorIconBorder)
+        {
+            errorIconBorder.PointerPressed += OnErrorIconClick;
+        }
+
+        if (this.FindControl<Button>("PrimaryActionButton") is { } primaryActionButton)
+        {
+            primaryActionButton.Click += OnPrimaryActionClick;
+        }
+
+        if (this.FindControl<Button>("SecondaryActionButton") is { } secondaryActionButton)
+        {
+            secondaryActionButton.Click += OnSecondaryActionClick;
+        }
+
+        if (this.FindControl<Button>("ExitButton") is { } exitButton)
+        {
+            exitButton.Click += (_, _) => _completionSource.TrySetResult(ErrorWindowResult.Exit);
+        }
+
+        if (this.FindControl<Button>("OpenLogButton") is { } openLogButton)
+        {
+            openLogButton.Click += OnOpenLogClick;
+        }
+    }
+
+    private void ApplyActionLayout(
+        string title,
+        string suggestion,
+        string primaryLabel,
+        ErrorWindowResult primaryAction,
+        string? secondaryLabel,
+        ErrorWindowResult? secondaryAction)
+    {
+        _primaryAction = primaryAction;
+        _secondaryAction = secondaryAction;
+
+        if (this.FindControl<TextBlock>("TitleText") is { } titleText && !_isDebugMode)
+        {
+            titleText.Text = title;
+        }
+
+        if (this.FindControl<TextBlock>("SuggestionText") is { } suggestionText)
+        {
+            suggestionText.Text = suggestion;
+        }
+
+        if (this.FindControl<Button>("PrimaryActionButton") is { } primaryButton)
+        {
+            primaryButton.Content = primaryLabel;
+        }
+
+        if (this.FindControl<Button>("SecondaryActionButton") is { } secondaryButton)
+        {
+            secondaryButton.IsVisible = !string.IsNullOrWhiteSpace(secondaryLabel);
+            secondaryButton.Content = secondaryLabel ?? string.Empty;
+        }
+    }
+
+    private void OnPrimaryActionClick(object? sender, RoutedEventArgs e)
+    {
+        _completionSource.TrySetResult(_primaryAction);
+    }
+
+    private void OnSecondaryActionClick(object? sender, RoutedEventArgs e)
+    {
+        _completionSource.TrySetResult(_secondaryAction ?? ErrorWindowResult.Exit);
+    }
+
+    private void OnErrorIconClick(object? sender, PointerPressedEventArgs e)
     {
         _iconClickCount++;
-
         if (_iconClickCount >= DebugModeClickThreshold && !_isDebugMode)
         {
             EnterDebugMode();
         }
     }
 
-    /// <summary>
-    /// 进入调试模式 - 显示调试窗口
-    /// </summary>
     private async void EnterDebugMode()
     {
         _isDebugMode = true;
 
-        // 创建并显示调试窗口
         var debugWindow = new ErrorDebugWindow(_devModeEnabled, _customHostPath)
         {
             WindowStartupLocation = WindowStartupLocation.CenterOwner
         };
 
-        // 订阅调试窗口关闭事件
-        debugWindow.Closed += (s, e) =>
+        debugWindow.Closed += (_, _) =>
         {
-            // 更新状态
+            if (!debugWindow.WasAccepted)
+            {
+                _isDebugMode = false;
+                _iconClickCount = 0;
+                return;
+            }
+
             _devModeEnabled = debugWindow.IsDevModeEnabled;
             _customHostPath = debugWindow.SelectedHostPath;
 
-            // 保存开发模式状态和自定义路径
-            SaveDevModeStateInternal(_devModeEnabled);
-            SaveCustomHostPathInternal(_customHostPath);
-
-            // 如果启用了开发模式且没有选择路径，自动扫描
-            if (_devModeEnabled && string.IsNullOrEmpty(_customHostPath))
+            if (_devModeEnabled && string.IsNullOrWhiteSpace(_customHostPath))
             {
                 ScanDevPaths();
-                // 扫描到路径后也保存
-                if (!string.IsNullOrEmpty(_customHostPath))
-                {
-                    SaveCustomHostPathInternal(_customHostPath);
-                }
             }
+
+            LauncherDebugSettingsStore.Save(new LauncherDebugSettings(_devModeEnabled, _customHostPath));
+
+            _isDebugMode = false;
+            _iconClickCount = 0;
         };
 
         await debugWindow.ShowDialog(this);
     }
 
-    /// <summary>
-    /// 扫描开发路径
-    /// </summary>
-    private void ScanDevPaths()
-    {
-        var executable = OperatingSystem.IsWindows() ? "LanMountainDesktop.exe" : "LanMountainDesktop";
-        var possiblePaths = new[]
-        {
-            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),
-            Path.Combine(AppContext.BaseDirectory, "..", "dev-test", "app-1.0.0-dev", executable),
-        };
-
-        foreach (var path in possiblePaths.Select(Path.GetFullPath).Distinct())
-        {
-            if (File.Exists(path))
-            {
-                _customHostPath = path;
-                break;
-            }
-        }
-    }
-
-    /// <summary>
-    /// 获取配置存储的基础目录
-    /// </summary>
-    private static string GetConfigBaseDirectory()
-    {
-        try
-        {
-            // 优先使用 LocalApplicationData（用户状态）
-            var appData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-            if (!string.IsNullOrEmpty(appData))
-            {
-                var configDir = Path.Combine(appData, "LanMountainDesktop", ".launcher");
-                return configDir;
-            }
-        }
-        catch
-        {
-            // LocalApplicationData 不可用，回退到 Launcher 所在目录
-        }
-
-        // 回退方案：使用 Launcher 所在目录
-        try
-        {
-            var launcherDir = AppContext.BaseDirectory;
-            var configDir = Path.Combine(launcherDir, ".launcher");
-            return configDir;
-        }
-        catch
-        {
-            // 最后的兜底：使用当前目录
-            return Path.Combine(Directory.GetCurrentDirectory(), ".launcher");
-        }
-    }
-
-    /// <summary>
-    /// 确保配置目录存在
-    /// </summary>
-    private static bool EnsureConfigDirectory(string dirPath)
-    {
-        try
-        {
-            if (!Directory.Exists(dirPath))
-            {
-                Directory.CreateDirectory(dirPath);
-                Console.WriteLine($"[ErrorWindow] Created config directory: {dirPath}");
-            }
-            return true;
-        }
-        catch (Exception ex)
-        {
-            Console.Error.WriteLine($"[ErrorWindow] Failed to create config directory: {ex.Message}");
-            return false;
-        }
-    }
-
-    /// <summary>
-    /// 保存开发模式状态（内部方法）
-    /// </summary>
-    private static void SaveDevModeStateInternal(bool enabled)
-    {
-        try
-        {
-            var configDir = GetConfigBaseDirectory();
-            if (!EnsureConfigDirectory(configDir))
-            {
-                Console.Error.WriteLine("[ErrorWindow] Cannot save dev mode: config directory unavailable");
-                return;
-            }
-
-            var devModeFile = Path.Combine(configDir, "devmode.config");
-            File.WriteAllText(devModeFile, enabled ? "1" : "0");
-            Console.WriteLine($"[ErrorWindow] Dev mode state saved: {enabled}");
-        }
-        catch (Exception ex)
-        {
-            Console.Error.WriteLine($"[ErrorWindow] Failed to save dev mode state: {ex.Message}");
-        }
-    }
-
-    /// <summary>
-    /// 加载开发模式状态（内部方法）
-    /// </summary>
-    private static bool LoadDevModeStateInternal()
-    {
-        try
-        {
-            var configDir = GetConfigBaseDirectory();
-            var devModeFile = Path.Combine(configDir, "devmode.config");
-
-            if (File.Exists(devModeFile))
-            {
-                var content = File.ReadAllText(devModeFile).Trim();
-                var enabled = content == "1";
-                Console.WriteLine($"[ErrorWindow] Dev mode state loaded: {enabled}");
-                return enabled;
-            }
-        }
-        catch (Exception ex)
-        {
-            Console.Error.WriteLine($"[ErrorWindow] Failed to load dev mode state: {ex.Message}");
-        }
-        return false;
-    }
-
-    /// <summary>
-    /// 保存自定义主程序路径（内部方法）
-    /// </summary>
-    private static void SaveCustomHostPathInternal(string? path)
-    {
-        try
-        {
-            var configDir = GetConfigBaseDirectory();
-            if (!EnsureConfigDirectory(configDir))
-            {
-                Console.Error.WriteLine("[ErrorWindow] Cannot save custom path: config directory unavailable");
-                return;
-            }
-
-            var hostPathFile = Path.Combine(configDir, "custom-host-path.config");
-            File.WriteAllText(hostPathFile, path ?? string.Empty);
-            Console.WriteLine($"[ErrorWindow] Custom host path saved: {path}");
-        }
-        catch (Exception ex)
-        {
-            Console.Error.WriteLine($"[ErrorWindow] Failed to save custom host path: {ex.Message}");
-        }
-    }
-
-    /// <summary>
-    /// 加载自定义主程序路径（内部方法）
-    /// </summary>
-    private static string? LoadCustomHostPathInternal()
-    {
-        try
-        {
-            var configDir = GetConfigBaseDirectory();
-            var hostPathFile = Path.Combine(configDir, "custom-host-path.config");
-
-            if (File.Exists(hostPathFile))
-            {
-                var content = File.ReadAllText(hostPathFile).Trim();
-                // 验证路径是否仍然有效
-                if (!string.IsNullOrEmpty(content) && File.Exists(content))
-                {
-                    Console.WriteLine($"[ErrorWindow] Custom host path loaded: {content}");
-                    return content;
-                }
-
-                // 路径已失效，清理配置文件
-                if (!string.IsNullOrEmpty(content))
-                {
-                    Console.WriteLine($"[ErrorWindow] Custom host path is no longer valid: {content}");
-                    try
-                    {
-                        File.Delete(hostPathFile);
-                        Console.WriteLine("[ErrorWindow] Cleared invalid custom host path");
-                    }
-                    catch (Exception clearEx)
-                    {
-                        Console.Error.WriteLine($"[ErrorWindow] Failed to clear invalid host path: {clearEx.Message}");
-                    }
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            Console.Error.WriteLine($"[ErrorWindow] Failed to load custom host path: {ex.Message}");
-        }
-        return null;
-    }
-
-    /// <summary>
-    /// 检查是否启用了开发模式（静态方法，启动时调用）
-    /// </summary>
-    public static bool CheckDevModeEnabled()
-    {
-        return LoadDevModeStateInternal();
-    }
-
-    /// <summary>
-    /// 获取保存的自定义主程序路径（静态方法，启动时调用）
-    /// </summary>
-    public static string? GetSavedCustomHostPath()
-    {
-        return LoadCustomHostPathInternal();
-    }
-
-    private void OnRetryClick(object? sender, RoutedEventArgs e)
-    {
-        _completionSource.TrySetResult(ErrorWindowResult.Retry);
-    }
-
-    private void OnExitClick(object? sender, RoutedEventArgs e)
-    {
-        _completionSource.TrySetResult(ErrorWindowResult.Exit);
-    }
-
-    /// <summary>
-    /// 打开日志文件
-    /// </summary>
     private async void OnOpenLogClick(object? sender, RoutedEventArgs e)
     {
         try
         {
             var logFilePath = Logger.GetLogFilePath();
-
-            if (string.IsNullOrEmpty(logFilePath) || !File.Exists(logFilePath))
+            if (!string.IsNullOrWhiteSpace(logFilePath) && File.Exists(logFilePath))
             {
-                // 如果没有日志文件，打开日志目录
-                var logDir = Path.GetDirectoryName(logFilePath);
-                if (!string.IsNullOrEmpty(logDir) && Directory.Exists(logDir))
-                {
-                    OpenFolder(logDir);
-                }
-                else
-                {
-                    // 尝试打开配置目录
-                    var configDir = GetConfigBaseDirectory();
-                    if (Directory.Exists(configDir))
-                    {
-                        OpenFolder(configDir);
-                    }
-                    else
-                    {
-                        Console.WriteLine("[ErrorWindow] No log file or directory available");
-                    }
-                }
+                OpenPath(logFilePath);
                 return;
             }
 
-            Console.WriteLine($"[ErrorWindow] Opening log file: {logFilePath}");
-            OpenFile(logFilePath);
+            var logDirectory = !string.IsNullOrWhiteSpace(logFilePath)
+                ? Path.GetDirectoryName(logFilePath)
+                : null;
+            if (!string.IsNullOrWhiteSpace(logDirectory) && Directory.Exists(logDirectory))
+            {
+                OpenPath(logDirectory);
+                return;
+            }
+
+            var configDirectory = GetConfigBaseDirectory();
+            if (Directory.Exists(configDirectory))
+            {
+                OpenPath(configDirectory);
+            }
         }
         catch (Exception ex)
         {
-            Console.Error.WriteLine($"[ErrorWindow] Failed to open log: {ex.Message}");
+            Debug.WriteLine($"[ErrorWindow] Failed to open log path: {ex}");
+        }
+
+        await Task.CompletedTask;
+    }
+
+    private void ScanDevPaths()
+    {
+        var executable = OperatingSystem.IsWindows() ? "LanMountainDesktop.exe" : "LanMountainDesktop";
+        var candidatePaths = new[]
+        {
+            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)
+        };
+
+        foreach (var candidate in candidatePaths.Select(Path.GetFullPath).Distinct())
+        {
+            if (File.Exists(candidate))
+            {
+                _customHostPath = candidate;
+                break;
+            }
         }
     }
 
-    /// <summary>
-    /// 打开文件
-    /// </summary>
-    private static void OpenFile(string filePath)
+    private static void OpenPath(string path)
     {
-        try
+        if (OperatingSystem.IsWindows())
         {
-            if (OperatingSystem.IsWindows())
+            Process.Start(new ProcessStartInfo
             {
-                Process.Start(new ProcessStartInfo
-                {
-                    FileName = "explorer.exe",
-                    Arguments = $"\"{filePath}\"",
-                    UseShellExecute = true
-                });
-            }
-            else if (OperatingSystem.IsMacOS())
-            {
-                Process.Start("open", filePath);
-            }
-            else if (OperatingSystem.IsLinux())
-            {
-                Process.Start("xdg-open", filePath);
-            }
+                FileName = "explorer.exe",
+                Arguments = $"\"{path}\"",
+                UseShellExecute = true
+            });
+            return;
         }
-        catch (Exception ex)
+
+        if (OperatingSystem.IsMacOS())
         {
-            Console.Error.WriteLine($"[ErrorWindow] Failed to open file: {ex.Message}");
+            Process.Start("open", path);
+            return;
+        }
+
+        if (OperatingSystem.IsLinux())
+        {
+            Process.Start("xdg-open", path);
         }
     }
 
-    /// <summary>
-    /// 打开文件夹
-    /// </summary>
-    private static void OpenFolder(string folderPath)
+    private static string GetConfigBaseDirectory()
     {
-        try
-        {
-            if (OperatingSystem.IsWindows())
-            {
-                Process.Start(new ProcessStartInfo
-                {
-                    FileName = "explorer.exe",
-                    Arguments = $"\"{folderPath}\"",
-                    UseShellExecute = true
-                });
-            }
-            else if (OperatingSystem.IsMacOS())
-            {
-                Process.Start("open", folderPath);
-            }
-            else if (OperatingSystem.IsLinux())
-            {
-                Process.Start("xdg-open", folderPath);
-            }
-        }
-        catch (Exception ex)
-        {
-            Console.Error.WriteLine($"[ErrorWindow] Failed to open folder: {ex.Message}");
-        }
+        return LauncherDebugSettingsStore.ConfigBaseDirectory;
+    }
+
+    private static bool LoadDevModeStateInternal()
+    {
+        return LauncherDebugSettingsStore.IsDevModeEnabled();
+    }
+
+    private static string? LoadCustomHostPathInternal()
+    {
+        return LauncherDebugSettingsStore.GetSavedCustomHostPath();
     }
 }
 
-/// <summary>
-/// 错误窗口用户选择结果
-/// </summary>
 public enum ErrorWindowResult
 {
-    /// <summary>
-    /// 重试
-    /// </summary>
     Retry,
-
-    /// <summary>
-    /// 退出
-    /// </summary>
-    Exit
+    Exit,
+    ActivateExisting,
+    ContinueWaiting
 }

LanMountainDesktop.Launcher/Views/OobeWindow.axaml

@@ -4,14 +4,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:views="clr-namespace:LanMountainDesktop.Launcher.Views"
         xmlns:ui="using:FluentAvalonia.UI.Controls"
+        xmlns:fi="using:FluentIcons.Avalonia"
         mc:Ignorable="d"
-        d:DesignWidth="600"
-        d:DesignHeight="500"
+        d:DesignWidth="850"
+        d:DesignHeight="650"
         x:Class="LanMountainDesktop.Launcher.Views.OobeWindow"
         x:DataType="views:OobeWindow"
         Title="欢迎使用阑山桌面"
-        Width="600"
-        Height="500"
+        Width="850"
+        Height="650"
         CanResize="False"
         WindowStartupLocation="CenterScreen"
         Background="{DynamicResource SolidBackgroundFillColorBaseBrush}"
@@ -21,59 +22,759 @@
     <views:OobeWindow />
   </Design.DataContext>
 
-  <Grid x:Name="ContentGrid"
-        Opacity="0">
-    <Grid.RenderTransform>
-      <TranslateTransform Y="24" />
-    </Grid.RenderTransform>
-    <!-- 主内容区域 -->
-    <Grid Margin="48" RowDefinitions="*,Auto">
-      <!-- 中央内容区域 -->
-      <StackPanel Grid.Row="0" 
-                  VerticalAlignment="Center" 
-                  HorizontalAlignment="Center"
-                  Spacing="24">
-        
-        <!-- 顶部：完成状态勾号图标 -->
-        <Border Width="80"
-                Height="80"
-                Background="{DynamicResource SystemFillColorSuccessBackgroundBrush}"
-                CornerRadius="40"
-                HorizontalAlignment="Center">
-          <ui:SymbolIcon Symbol="Accept"
-                         FontSize="40"
-                         Foreground="{DynamicResource SystemFillColorSuccessBrush}"
-                         HorizontalAlignment="Center"
-                         VerticalAlignment="Center"/>
-        </Border>
-        
-        <!-- 中央：欢迎文字 -->
-        <StackPanel Spacing="8" HorizontalAlignment="Center">
-          <TextBlock Text="欢迎使用阑山桌面"
+  <Grid x:Name="ContentGrid">
+    <!-- 步骤 1: 打字机动画开场 -->
+    <Grid x:Name="TypingStep" Margin="60,80,60,60">
+      <!-- 主标题区域（左上角） -->
+      <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Spacing="16">
+        <!-- 打字机文本区域 -->
+        <StackPanel Orientation="Horizontal">
+          <TextBlock x:Name="TypingTextBlock"
                      FontSize="28"
                      FontWeight="SemiBold"
                      Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                     FontFamily="Consolas, Monaco, 'Courier New', monospace" />
+          <Border x:Name="CursorBorder"
+                  Width="3"
+                  Height="28"
+                  Background="{DynamicResource TextFillColorPrimaryBrush}"
+                  VerticalAlignment="Bottom"
+                  Margin="4,0,0,4">
+            <Border.Styles>
+              <Style Selector="Border">
+                <Style.Animations>
+                  <Animation Duration="0:0:0.8" IterationCount="INFINITE">
+                    <KeyFrame Cue="0%">
+                      <Setter Property="Opacity" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="50%">
+                      <Setter Property="Opacity" Value="1" />
+                    </KeyFrame>
+                    <KeyFrame Cue="51%">
+                      <Setter Property="Opacity" Value="0" />
+                    </KeyFrame>
+                    <KeyFrame Cue="100%">
+                      <Setter Property="Opacity" Value="0" />
+                    </KeyFrame>
+                  </Animation>
+                </Style.Animations>
+              </Style>
+            </Border.Styles>
+          </Border>
+        </StackPanel>
+
+        <!-- 副标题区域（流光渐变动画 + 打字机效果） -->
+        <StackPanel x:Name="SubtitlePanel" Opacity="0" IsVisible="False" Spacing="4">
+          <StackPanel Orientation="Horizontal">
+            <TextBlock x:Name="NextGenTextBlock"
+                       FontSize="48"
+                       FontWeight="Bold"
+                       FontFamily="Consolas, Monaco, 'Courier New', monospace">
+              <TextBlock.Foreground>
+                 <LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
+                   <GradientStop Offset="0.0" Color="#0078D4" />
+                   <GradientStop Offset="0.33" Color="#7B68EE" />
+                   <GradientStop Offset="0.66" Color="#FF8C00" />
+                   <GradientStop Offset="1.0" Color="#107C10" />
+                 </LinearGradientBrush>
+               </TextBlock.Foreground>
+            </TextBlock>            <Border x:Name="SubtitleCursorBorder"
+                    Width="4"
+                    Height="48"
+                    Background="{DynamicResource TextFillColorPrimaryBrush}"
+                    VerticalAlignment="Bottom"
+                    Margin="4,0,0,4"
+                    IsVisible="False">
+              <Border.Styles>
+                <Style Selector="Border">
+                  <Style.Animations>
+                    <Animation Duration="0:0:0.8" IterationCount="INFINITE">
+                      <KeyFrame Cue="0%">
+                        <Setter Property="Opacity" Value="1" />
+                      </KeyFrame>
+                      <KeyFrame Cue="50%">
+                        <Setter Property="Opacity" Value="1" />
+                      </KeyFrame>
+                      <KeyFrame Cue="51%">
+                        <Setter Property="Opacity" Value="0" />
+                      </KeyFrame>
+                      <KeyFrame Cue="100%">
+                        <Setter Property="Opacity" Value="0" />
+                      </KeyFrame>
+                    </Animation>
+                  </Style.Animations>
+                </Style>
+              </Border.Styles>
+            </Border>
+          </StackPanel>
+          <TextBlock x:Name="DashboardTextBlock"
+                     FontSize="48"
+                     FontWeight="Bold"
+                     FontFamily="Consolas, Monaco, 'Courier New', monospace"
+                     Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+        </StackPanel>
+      </StackPanel>
+
+      <!-- 按钮动画区域（左下角） -->
+      <Grid x:Name="ButtonAnimationArea"
+            Width="280"
+            Height="80"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Bottom"
+            Margin="0,0,0,40"
+            IsVisible="False">
+
+        <!-- 方框边框（由鼠标画出） -->
+        <Border x:Name="DrawnBorder"
+                Width="160"
+                Height="56"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Background="Transparent"
+                BorderBrush="{DynamicResource AccentFillColorDefaultBrush}"
+                BorderThickness="0"
+                CornerRadius="{DynamicResource DesignCornerRadiusMd}">
+        </Border>
+
+        <!-- 开始按钮（从方框中弹出） -->
+        <Button x:Name="StartButton"
+                Width="160"
+                Height="56"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Theme="{DynamicResource AccentButtonTheme}"
+                Opacity="0"
+                IsVisible="False"
+                RenderTransformOrigin="0.5,0.5">
+          <Button.RenderTransform>
+            <ScaleTransform ScaleX="0.1" ScaleY="0.1" />
+          </Button.RenderTransform>
+          <TextBlock Text="开始使用"
+                     FontSize="16"
+                     FontWeight="SemiBold" />
+        </Button>
+
+        <!-- 鼠标光标 -->
+        <Canvas x:Name="MouseCursor"
+                Width="24"
+                Height="24"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Margin="-50,-50,0,0"
+                IsVisible="False">
+          <Path Data="M0,0 L0,18 L4,14 L7,20 L10,19 L7,13 L12,13 Z"
+                Fill="{DynamicResource TextFillColorPrimaryBrush}"
+                Stroke="{DynamicResource SolidBackgroundFillColorBaseBrush}"
+                StrokeThickness="1" />
+        </Canvas>
+      </Grid>
+    </Grid>
+
+    <!-- 步骤 2: 主题选择页面 -->
+    <Grid x:Name="ThemeStep" Margin="48" RowDefinitions="Auto,*,Auto" IsVisible="False">
+      <StackPanel Grid.Row="0" Spacing="8" Margin="0,0,0,24">
+        <TextBlock Text="个性化你的桌面"
+                   FontSize="24"
+                   FontWeight="SemiBold"
+                   Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+        <TextBlock Text="选择你喜欢的主题样式，可随时在设置中更改"
+                   FontSize="13"
+                   Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+      </StackPanel>
+
+      <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
+        <StackPanel Spacing="20">
+          <!-- 浅色/深色模式选择 -->
+          <Border Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                  CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                  Padding="16">
+            <StackPanel Spacing="12">
+              <TextBlock Text="外观模式"
+                         FontSize="14"
+                         FontWeight="SemiBold"
+                         Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+              <Grid ColumnDefinitions="*,*" ColumnSpacing="12">
+                <Border x:Name="LightModeOption"
+                        Grid.Column="0"
+                        Background="{DynamicResource SolidBackgroundFillColorQuarternaryBrush}"
+                        CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                        BorderThickness="2"
+                        BorderBrush="{DynamicResource AccentFillColorDefaultBrush}"
+                        Padding="16"
+                        Cursor="Hand">
+                  <StackPanel Spacing="8" HorizontalAlignment="Center">
+                    <Border Width="48"
+                            Height="48"
+                            Background="#F3F3F3"
+                            CornerRadius="8"
+                            BorderBrush="#E0E0E0"
+                            BorderThickness="1">
+                      <fi:SymbolIcon Symbol="WeatherSunny"
+                                     FontSize="24"
+                                     Foreground="#5F5F5F"
+                                     HorizontalAlignment="Center"
+                                     VerticalAlignment="Center"/>
+                    </Border>
+                    <TextBlock Text="浅色模式"
+                               FontSize="13"
+                               HorizontalAlignment="Center"
+                               Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+                    <RadioButton x:Name="LightModeRadio"
+                                 GroupName="ThemeMode"
+                                 IsChecked="True"
+                                 HorizontalAlignment="Center" />
+                  </StackPanel>
+                </Border>
+
+                <Border x:Name="DarkModeOption"
+                        Grid.Column="1"
+                        Background="{DynamicResource SolidBackgroundFillColorQuarternaryBrush}"
+                        CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                        BorderThickness="1"
+                        BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
+                        Padding="16"
+                        Cursor="Hand">
+                  <StackPanel Spacing="8" HorizontalAlignment="Center">
+                    <Border Width="48"
+                            Height="48"
+                            Background="#1E1E1E"
+                            CornerRadius="8"
+                            BorderBrush="#333333"
+                            BorderThickness="1">
+                      <fi:SymbolIcon Symbol="WeatherMoon"
+                                     FontSize="24"
+                                     Foreground="#E0E0E0"
+                                     HorizontalAlignment="Center"
+                                     VerticalAlignment="Center"/>
+                    </Border>
+                    <TextBlock Text="深色模式"
+                               FontSize="13"
+                               HorizontalAlignment="Center"
+                               Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+                    <RadioButton x:Name="DarkModeRadio"
+                                 GroupName="ThemeMode"
+                                 HorizontalAlignment="Center" />
+                  </StackPanel>
+                </Border>
+              </Grid>
+            </StackPanel>
+          </Border>
+
+          <!-- 主题色选择 -->
+          <Border Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                  CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                  Padding="16">
+            <StackPanel Spacing="12">
+              <TextBlock Text="主题色"
+                         FontSize="14"
+                         FontWeight="SemiBold"
+                         Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+              <WrapPanel x:Name="AccentColorPanel" HorizontalAlignment="Left">
+                <!-- 预设颜色 -->
+                <Border x:Name="BlueColor"
+                        Width="40"
+                        Height="40"
+                        Background="#0078D4"
+                        CornerRadius="20"
+                        BorderThickness="3"
+                        BorderBrush="{DynamicResource AccentFillColorDefaultBrush}"
+                        Margin="0,0,12,12"
+                        Cursor="Hand">
+                  <Border.Styles>
+                    <Style Selector="Border:pointerover">
+                      <Setter Property="RenderTransform" Value="scale(1.1)" />
+                    </Style>
+                  </Border.Styles>
+                </Border>
+                <Border x:Name="PurpleColor"
+                        Width="40"
+                        Height="40"
+                        Background="#7B68EE"
+                        CornerRadius="20"
+                        BorderThickness="0"
+                        Margin="0,0,12,12"
+                        Cursor="Hand" />
+                <Border x:Name="GreenColor"
+                        Width="40"
+                        Height="40"
+                        Background="#107C10"
+                        CornerRadius="20"
+                        BorderThickness="0"
+                        Margin="0,0,12,12"
+                        Cursor="Hand" />
+                <Border x:Name="OrangeColor"
+                        Width="40"
+                        Height="40"
+                        Background="#D83B01"
+                        CornerRadius="20"
+                        BorderThickness="0"
+                        Margin="0,0,12,12"
+                        Cursor="Hand" />
+                <Border x:Name="PinkColor"
+                        Width="40"
+                        Height="40"
+                        Background="#E3008C"
+                        CornerRadius="20"
+                        BorderThickness="0"
+                        Margin="0,0,12,12"
+                        Cursor="Hand" />
+                <Border x:Name="TealColor"
+                        Width="40"
+                        Height="40"
+                        Background="#008080"
+                        CornerRadius="20"
+                        BorderThickness="0"
+                        Margin="0,0,12,12"
+                        Cursor="Hand" />
+              </WrapPanel>
+            </StackPanel>
+          </Border>
+
+          <!-- 莫奈取色来源 -->
+          <Border Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                  CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                  Padding="16">
+            <StackPanel Spacing="12">
+              <TextBlock Text="莫奈取色来源"
+                         FontSize="14"
+                         FontWeight="SemiBold"
+                         Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+              <TextBlock Text="从壁纸自动提取主题色，让界面与桌面完美融合"
+                         FontSize="12"
+                         Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+
+              <StackPanel Spacing="8">
+                <Border x:Name="MonetFromWallpaperOption"
+                        Background="{DynamicResource SolidBackgroundFillColorQuarternaryBrush}"
+                        CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                        BorderThickness="2"
+                        BorderBrush="{DynamicResource AccentFillColorDefaultBrush}"
+                        Padding="12"
+                        Cursor="Hand">
+                  <Grid ColumnDefinitions="Auto,*">
+                    <RadioButton x:Name="MonetFromWallpaperRadio"
+                                 Grid.Column="0"
+                                 GroupName="MonetSource"
+                                 IsChecked="True"
+                                 VerticalAlignment="Center"
+                                 Margin="0,0,12,0" />
+                    <StackPanel Grid.Column="1" Spacing="4">
+                      <TextBlock Text="从桌面壁纸取色"
+                                 FontSize="13"
+                                 FontWeight="SemiBold"
+                                 Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+                      <TextBlock Text="自动分析当前壁纸颜色生成主题"
+                                 FontSize="11"
+                                 Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+                    </StackPanel>
+                  </Grid>
+                </Border>
+
+                <Border x:Name="MonetFromCustomOption"
+                        Background="{DynamicResource SolidBackgroundFillColorQuarternaryBrush}"
+                        CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                        BorderThickness="1"
+                        BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
+                        Padding="12"
+                        Cursor="Hand">
+                  <Grid ColumnDefinitions="Auto,*">
+                    <RadioButton x:Name="MonetFromCustomRadio"
+                                 Grid.Column="0"
+                                 GroupName="MonetSource"
+                                 VerticalAlignment="Center"
+                                 Margin="0,0,12,0" />
+                    <StackPanel Grid.Column="1" Spacing="4">
+                      <TextBlock Text="自定义图片取色"
+                                 FontSize="13"
+                                 FontWeight="SemiBold"
+                                 Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+                      <TextBlock Text="选择一张图片作为取色来源"
+                                 FontSize="11"
+                                 Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+                    </StackPanel>
+                  </Grid>
+                </Border>
+
+                <Border x:Name="MonetDisabledOption"
+                        Background="{DynamicResource SolidBackgroundFillColorQuarternaryBrush}"
+                        CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                        BorderThickness="1"
+                        BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
+                        Padding="12"
+                        Cursor="Hand">
+                  <Grid ColumnDefinitions="Auto,*">
+                    <RadioButton x:Name="MonetDisabledRadio"
+                                 Grid.Column="0"
+                                 GroupName="MonetSource"
+                                 VerticalAlignment="Center"
+                                 Margin="0,0,12,0" />
+                    <StackPanel Grid.Column="1" Spacing="4">
+                      <TextBlock Text="不使用莫奈取色"
+                                 FontSize="13"
+                                 FontWeight="SemiBold"
+                                 Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+                      <TextBlock Text="使用固定的预设主题色"
+                                 FontSize="11"
+                                 Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+                    </StackPanel>
+                  </Grid>
+                </Border>
+              </StackPanel>
+            </StackPanel>
+          </Border>
+        </StackPanel>
+      </ScrollViewer>
+
+      <StackPanel Grid.Row="2"
+                  Orientation="Horizontal"
+                  HorizontalAlignment="Right"
+                  Spacing="12"
+                  Margin="0,24,0,0">
+        <Button x:Name="ThemeBackButton"
+                Content="返回"
+                Theme="{DynamicResource ButtonTheme}" />
+        <Button x:Name="ThemeNextButton"
+                Content="下一步"
+                Theme="{DynamicResource AccentButtonTheme}" />
+      </StackPanel>
+    </Grid>
+
+    <!-- 步骤 3: 数据位置选择页面 -->
+    <Grid x:Name="DataLocationStep" Margin="48" RowDefinitions="Auto,*,Auto" IsVisible="False">
+      <StackPanel Grid.Row="0" Spacing="8" Margin="0,0,0,32">
+        <TextBlock Text="选择数据保存位置"
+                   FontSize="28"
+                   FontWeight="SemiBold"
+                   Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+        <TextBlock Text="决定将应用数据保存在哪里，可随时在设置中更改"
+                   FontSize="14"
+                   Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+      </StackPanel>
+
+      <StackPanel Grid.Row="1" Spacing="20">
+        <Border x:Name="AdminWarningBanner"
+                Background="{DynamicResource SystemFillColorCriticalBackgroundBrush}"
+                CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                Padding="16,12"
+                IsVisible="False">
+          <StackPanel Spacing="6">
+            <StackPanel Orientation="Horizontal" Spacing="8">
+              <fi:SymbolIcon Symbol="ShieldError"
+                             FontSize="20"
+                             Foreground="{DynamicResource SystemFillColorCriticalBrush}" />
+              <TextBlock Text="无法保存到应用目录"
+                         FontWeight="SemiBold"
+                         FontSize="14"
+                         Foreground="{DynamicResource SystemFillColorCriticalBrush}" />
+            </StackPanel>
+            <TextBlock Text="当前安装目录需要管理员权限才能写入，数据将自动保存到系统用户目录。"
+                       FontSize="13"
+                       TextWrapping="Wrap"
+                       Foreground="{DynamicResource SystemFillColorCriticalBrush}" />
+          </StackPanel>
+        </Border>
+
+        <!-- 系统用户目录选项 -->
+        <Border x:Name="SystemOptionBorder"
+                Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                BorderThickness="2"
+                BorderBrush="{DynamicResource AccentFillColorDefaultBrush}"
+                Padding="20,18"
+                Cursor="Hand">
+          <Grid ColumnDefinitions="Auto,*">
+            <RadioButton x:Name="SystemRadio"
+                         Grid.Column="0"
+                         VerticalAlignment="Center"
+                         Margin="0,0,16,0"
+                         GroupName="DataLocation"
+                         IsChecked="True" />
+            <StackPanel Grid.Column="1" Spacing="8">
+               <StackPanel Orientation="Horizontal" Spacing="8">
+                 <fi:SymbolIcon Symbol="Folder"
+                                FontSize="24"
+                                Foreground="{DynamicResource AccentFillColorDefaultBrush}" />
+                 <TextBlock Text="保存在系统用户目录（推荐）"
+                            FontSize="16"
+                            FontWeight="SemiBold"
+                            Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+               </StackPanel>
+              <TextBlock Text="数据与当前 Windows 用户绑定，重装应用或更新后数据不会丢失。适合大多数用户。"
+                         FontSize="13"
+                         TextWrapping="Wrap"
+                         Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+              <Border Background="{DynamicResource SolidBackgroundFillColorQuarternaryBrush}"
+                      CornerRadius="{DynamicResource DesignCornerRadiusSm}"
+                      Padding="12,8"
+                      Margin="0,4,0,0">
+                <TextBlock x:Name="SystemPathText"
+                           FontSize="12"
+                           TextWrapping="Wrap"
+                           Foreground="{DynamicResource TextFillColorTertiaryBrush}"
+                           FontFamily="Consolas, Monaco, monospace" />
+              </Border>
+            </StackPanel>
+          </Grid>
+        </Border>
+
+        <!-- 便携模式选项 -->
+        <Border x:Name="PortableOptionBorder"
+                Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                BorderThickness="1"
+                BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
+                Padding="20,18"
+                Cursor="Hand">
+          <Grid ColumnDefinitions="Auto,*">
+            <RadioButton x:Name="PortableRadio"
+                         Grid.Column="0"
+                         VerticalAlignment="Center"
+                         Margin="0,0,16,0"
+                         GroupName="DataLocation"
+                         IsEnabled="False" />
+            <StackPanel Grid.Column="1" Spacing="8">
+               <StackPanel Orientation="Horizontal" Spacing="8">
+                 <fi:SymbolIcon Symbol="Save"
+                                FontSize="24"
+                                Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+                 <TextBlock Text="保存在应用安装目录（便携模式）"
+                            FontSize="16"
+                            FontWeight="SemiBold"
+                            Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+               </StackPanel>
+              <TextBlock Text="便于携带，可随应用文件夹整体移动到其他电脑。适合在多台电脑间使用或需要便携运行的场景。"
+                         FontSize="13"
+                         TextWrapping="Wrap"
+                         Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+              <Border Background="{DynamicResource SolidBackgroundFillColorQuarternaryBrush}"
+                      CornerRadius="{DynamicResource DesignCornerRadiusSm}"
+                      Padding="12,8"
+                      Margin="0,4,0,0">
+                <TextBlock x:Name="PortablePathText"
+                           FontSize="12"
+                           TextWrapping="Wrap"
+                           Foreground="{DynamicResource TextFillColorTertiaryBrush}"
+                           FontFamily="Consolas, Monaco, monospace" />
+              </Border>
+            </StackPanel>
+          </Grid>
+        </Border>
+
+        <!-- 数据迁移提示 -->
+        <Border x:Name="MigrationInfoBorder"
+                Background="{DynamicResource SystemFillColorSuccessBackgroundBrush}"
+                CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                Padding="16,12"
+                IsVisible="False">
+          <StackPanel Orientation="Horizontal" Spacing="8">
+            <fi:SymbolIcon Symbol="Checkmark"
+                            FontSize="20"
+                            Foreground="{DynamicResource SystemFillColorSuccessBrush}" />
+            <TextBlock x:Name="MigrationInfoText"
+                       FontSize="13"
+                       TextWrapping="Wrap"
+                       Foreground="{DynamicResource SystemFillColorSuccessBrush}" />
+          </StackPanel>
+        </Border>
+      </StackPanel>
+
+      <StackPanel Grid.Row="2"
+                  Orientation="Horizontal"
+                  HorizontalAlignment="Right"
+                  Spacing="12"
+                  Margin="0,32,0,0">
+        <Button x:Name="DataLocationBackButton"
+                Content="返回"
+                Theme="{DynamicResource ButtonTheme}"
+                Width="100"
+                Height="36" />
+        <Button x:Name="DataLocationNextButton"
+                Content="下一步"
+                Theme="{DynamicResource AccentButtonTheme}"
+                Width="100"
+                Height="36" />
+      </StackPanel>
+    </Grid>
+
+    <!-- 步骤 4: 信息与隐私页面 -->
+    <Grid x:Name="PrivacyStep" Margin="48" RowDefinitions="Auto,*,Auto" IsVisible="False">
+      <StackPanel Grid.Row="0" Spacing="8" Margin="0,0,0,24">
+        <TextBlock Text="信息与隐私"
+                   FontSize="24"
+                   FontWeight="SemiBold"
+                   Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+        <TextBlock Text="选择是否参与遥测计划，查看隐私政策"
+                   FontSize="13"
+                   Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+      </StackPanel>
+
+      <StackPanel Grid.Row="1" Spacing="16">
+        <!-- 崩溃报告 -->
+        <Border Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                Padding="16">
+          <Grid ColumnDefinitions="*,Auto">
+            <StackPanel Grid.Column="0" Spacing="4">
+              <TextBlock Text="发送匿名崩溃报告"
+                         FontSize="14"
+                         FontWeight="SemiBold"
+                         Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+              <TextBlock Text="帮助改进应用稳定性，不包含个人身份信息"
+                         FontSize="12"
+                         TextWrapping="Wrap"
+                         Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+            </StackPanel>
+            <ToggleSwitch x:Name="CrashTelemetryToggle"
+                          Grid.Column="1"
+                          IsChecked="False"
+                          IsEnabled="False"
+                          VerticalAlignment="Center" />
+          </Grid>
+        </Border>
+
+        <!-- 使用统计 -->
+        <Border Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                Padding="16">
+          <Grid ColumnDefinitions="*,Auto">
+            <StackPanel Grid.Column="0" Spacing="4">
+              <TextBlock Text="发送匿名使用统计"
+                         FontSize="14"
+                         FontWeight="SemiBold"
+                         Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+              <TextBlock Text="帮助了解功能使用情况，优化产品体验"
+                         FontSize="12"
+                         TextWrapping="Wrap"
+                         Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+            </StackPanel>
+            <ToggleSwitch x:Name="UsageTelemetryToggle"
+                          Grid.Column="1"
+                          IsChecked="False"
+                          IsEnabled="False"
+                          VerticalAlignment="Center" />
+          </Grid>
+        </Border>
+
+        <!-- 隐私追踪 ID -->
+        <Border Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                Padding="16">
+          <StackPanel Spacing="8">
+            <TextBlock Text="隐私追踪 ID"
+                       FontSize="14"
+                       FontWeight="SemiBold"
+                       Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+            <TextBlock Text="此 ID 用于匿名标识您的设备，不包含任何个人信息"
+                       FontSize="12"
+                       TextWrapping="Wrap"
+                       Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+            <TextBox x:Name="TelemetryIdTextBox"
+                     Text=""
+                     IsReadOnly="True"
+                     FontFamily="Consolas, Monaco, monospace"
+                     FontSize="12"
+                     HorizontalAlignment="Stretch" />
+          </StackPanel>
+        </Border>
+
+        <!-- 隐私协议同意区域 -->
+        <Border Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                CornerRadius="{DynamicResource DesignCornerRadiusMd}"
+                Padding="16"
+                Margin="0,8,0,0">
+          <StackPanel Spacing="12">
+            <!-- 复选框和协议文本 -->
+            <StackPanel Orientation="Horizontal" Spacing="8">
+              <CheckBox x:Name="PrivacyAgreementCheckBox"
+                        VerticalAlignment="Center" />
+              <StackPanel Orientation="Horizontal" Spacing="4" VerticalAlignment="Center">
+                <TextBlock Text="同意"
+                           FontSize="13"
+                           VerticalAlignment="Center"
+                           Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+                <Button x:Name="ViewPrivacyPolicyButton"
+                        Content="《阑山桌面遥测隐私数据收集协议》"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Padding="0"
+                        FontSize="13"
+                        Foreground="{DynamicResource SystemAccentColor}">
+                  <Button.Styles>
+                    <Style Selector="Button:pointerover /template/ ContentPresenter">
+                      <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemAccentColorDark1}" />
+                    </Style>
+                  </Button.Styles>
+                </Button>
+              </StackPanel>
+            </StackPanel>
+
+            <!-- 提示文本 -->
+            <TextBlock Text="您必须阅读并同意隐私协议后，才能开启遥测功能。遥测数据仅用于改进应用稳定性和优化产品体验，不包含任何个人身份信息。"
+                       FontSize="12"
+                       TextWrapping="Wrap"
+                       Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+          </StackPanel>
+        </Border>
+      </StackPanel>
+
+      <StackPanel Grid.Row="2"
+                  Orientation="Horizontal"
+                  HorizontalAlignment="Right"
+                  Spacing="12"
+                  Margin="0,24,0,0">
+        <Button x:Name="PrivacyBackButton"
+                Content="返回"
+                Theme="{DynamicResource ButtonTheme}" />
+        <Button x:Name="PrivacyNextButton"
+                Content="下一步"
+                Theme="{DynamicResource AccentButtonTheme}" />
+      </StackPanel>
+    </Grid>
+
+    <!-- 步骤 5: 欢迎完成页面 -->
+    <Grid x:Name="WelcomeStep" Margin="48" RowDefinitions="*,Auto" IsVisible="False">
+      <StackPanel Grid.Row="0"
+                  VerticalAlignment="Center"
+                  HorizontalAlignment="Center"
+                  Spacing="32">
+
+        <Border Width="96"
+                Height="96"
+                Background="{DynamicResource SystemFillColorSuccessBackgroundBrush}"
+                CornerRadius="48"
+                HorizontalAlignment="Center">
+          <PathIcon Data="M9,16.17 L4.83,12 L3.41,13.41 L9,19 L21,7 L19.59,5.59 Z"
+                    Width="48"
+                    Height="48"
+                    Foreground="{DynamicResource SystemFillColorSuccessBrush}"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"/>
+        </Border>
+
+        <StackPanel Spacing="12" HorizontalAlignment="Center">
+          <TextBlock Text="欢迎使用阑山桌面"
+                     FontSize="32"
+                     FontWeight="SemiBold"
+                     Foreground="{DynamicResource TextFillColorPrimaryBrush}"
                      HorizontalAlignment="Center" />
           <TextBlock Text="你的桌面，不止一面"
-                     FontSize="14"
+                     FontSize="16"
                      Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                      HorizontalAlignment="Center" />
         </StackPanel>
-        
       </StackPanel>
 
-      <!-- 底部：圆形开始按钮 -->
       <Button Grid.Row="1"
               x:Name="EnterButton"
               HorizontalAlignment="Center"
               Width="56"
               Height="56"
-              Margin="0,0,0,16"
+              Margin="0,0,0,24"
               Theme="{DynamicResource AccentButtonTheme}"
               CornerRadius="28">
-        <ui:SymbolIcon Symbol="Forward"
+        <fi:SymbolIcon Symbol="ArrowRight"
                        FontSize="24"
-                       Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"/>
+                       Foreground="{DynamicResource TextFillColorPrimaryBrush}"/>
       </Button>
     </Grid>
   </Grid>

LanMountainDesktop.Launcher/Views/OobeWindow.axaml.cs

@@ -1,182 +1,858 @@
 using Avalonia;
 using Avalonia.Animation;
-using Avalonia.Animation.Easings;
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.Media;
-using Avalonia.Styling;
+using Avalonia.Threading;
+using LanMountainDesktop.Launcher.Models;
+using LanMountainDesktop.Launcher.Services;
 
 namespace LanMountainDesktop.Launcher.Views;
 
 public partial class OobeWindow : Window
 {
+    private const int AnimationDurationMs = 300;
+    private const int TypingDelayMs = 100;
+
     private readonly TaskCompletionSource<bool> _completionSource = new();
+    private readonly DataLocationResolver _resolver;
     private bool _isTransitioning;
+    private bool _isDebugMode;
+    private int _currentStep = 1;
+    
+    // 数据位置选择
+    private DataLocationMode _selectedDataLocationMode = DataLocationMode.System;
+    private bool _migrateExistingData;
+    
+    // 主题选择
+    private Services.ThemeMode _selectedThemeMode = Services.ThemeMode.Light;
+    private string _selectedAccentColor = "#0078D4";
+    private MonetSource _selectedMonetSource = MonetSource.Wallpaper;
 
     public OobeWindow()
     {
         AvaloniaXamlLoader.Load(this);
         Loaded += OnWindowLoaded;
         Opened += OnWindowOpened;
+
+        var appRoot = AppDomain.CurrentDomain.BaseDirectory;
+        _resolver = new DataLocationResolver(appRoot);
     }
 
+    public void SetDebugMode(bool isDebugMode)
+    {
+        _isDebugMode = isDebugMode;
+    }
+
+    public Task WaitForEnterAsync() => _completionSource.Task;
+
     private void OnWindowLoaded(object? sender, RoutedEventArgs e)
     {
-        Console.WriteLine("[OobeWindow] Window loaded, initializing components...");
+        InitializeDataLocationStep();
+        InitializePrivacySettings();
+        SetupEventHandlers();
+    }
 
-        var enterButton = this.FindControl<Button>("EnterButton");
-        if (enterButton is not null)
+    private void SetupEventHandlers()
+    {
+        // 步骤 1: 开始按钮
+        if (this.FindControl<Button>("StartButton") is { } startButton)
+        {
+            startButton.Click += OnStartButtonClick;
+        }
+
+        // 步骤 2: 主题选择页面
+        if (this.FindControl<Button>("ThemeBackButton") is { } themeBackButton)
+        {
+            themeBackButton.Click += OnThemeBackClick;
+        }
+
+        if (this.FindControl<Button>("ThemeNextButton") is { } themeNextButton)
+        {
+            themeNextButton.Click += OnThemeNextClick;
+        }
+
+        // 浅色/深色模式选择
+        if (this.FindControl<Border>("LightModeOption") is { } lightModeOption)
+        {
+            lightModeOption.PointerPressed += (s, e) => SelectThemeMode(Services.ThemeMode.Light);
+        }
+
+        if (this.FindControl<Border>("DarkModeOption") is { } darkModeOption)
+        {
+            darkModeOption.PointerPressed += (s, e) => SelectThemeMode(Services.ThemeMode.Dark);
+        }
+
+        if (this.FindControl<RadioButton>("LightModeRadio") is { } lightModeRadio)
+        {
+            lightModeRadio.IsCheckedChanged += (s, e) =>
+            {
+                if (lightModeRadio.IsChecked == true) SelectThemeMode(Services.ThemeMode.Light);
+            };
+        }
+
+        if (this.FindControl<RadioButton>("DarkModeRadio") is { } darkModeRadio)
+        {
+            darkModeRadio.IsCheckedChanged += (s, e) =>
+            {
+                if (darkModeRadio.IsChecked == true) SelectThemeMode(Services.ThemeMode.Dark);
+            };
+        }
+
+        // 主题色选择
+        SetupAccentColorHandlers();
+
+        // 莫奈取色来源选择
+        if (this.FindControl<Border>("MonetFromWallpaperOption") is { } monetWallpaperOption)
+        {
+            monetWallpaperOption.PointerPressed += (s, e) => SelectMonetSource(MonetSource.Wallpaper);
+        }
+
+        if (this.FindControl<Border>("MonetFromCustomOption") is { } monetCustomOption)
+        {
+            monetCustomOption.PointerPressed += (s, e) => SelectMonetSource(MonetSource.Custom);
+        }
+
+        if (this.FindControl<Border>("MonetDisabledOption") is { } monetDisabledOption)
+        {
+            monetDisabledOption.PointerPressed += (s, e) => SelectMonetSource(MonetSource.Disabled);
+        }
+
+        if (this.FindControl<RadioButton>("MonetFromWallpaperRadio") is { } monetWallpaperRadio)
+        {
+            monetWallpaperRadio.IsCheckedChanged += (s, e) =>
+            {
+                if (monetWallpaperRadio.IsChecked == true) SelectMonetSource(MonetSource.Wallpaper);
+            };
+        }
+
+        if (this.FindControl<RadioButton>("MonetFromCustomRadio") is { } monetCustomRadio)
+        {
+            monetCustomRadio.IsCheckedChanged += (s, e) =>
+            {
+                if (monetCustomRadio.IsChecked == true) SelectMonetSource(MonetSource.Custom);
+            };
+        }
+
+        if (this.FindControl<RadioButton>("MonetDisabledRadio") is { } monetDisabledRadio)
+        {
+            monetDisabledRadio.IsCheckedChanged += (s, e) =>
+            {
+                if (monetDisabledRadio.IsChecked == true) SelectMonetSource(MonetSource.Disabled);
+            };
+        }
+
+        // 步骤 3: 数据位置选择页面
+        if (this.FindControl<Button>("DataLocationBackButton") is { } dataLocationBackButton)
+        {
+            dataLocationBackButton.Click += OnDataLocationBackClick;
+        }
+
+        if (this.FindControl<Button>("DataLocationNextButton") is { } dataLocationNextButton)
+        {
+            dataLocationNextButton.Click += OnDataLocationNextClick;
+        }
+
+        if (this.FindControl<Border>("SystemOptionBorder") is { } systemOption)
+        {
+            systemOption.PointerPressed += (s, e) => SelectDataLocationMode(DataLocationMode.System);
+        }
+
+        if (this.FindControl<Border>("PortableOptionBorder") is { } portableOption)
+        {
+            portableOption.PointerPressed += (s, e) => SelectDataLocationMode(DataLocationMode.Portable);
+        }
+
+        if (this.FindControl<RadioButton>("SystemRadio") is { } systemRadio)
+        {
+            systemRadio.IsCheckedChanged += (s, e) =>
+            {
+                if (systemRadio.IsChecked == true) SelectDataLocationMode(DataLocationMode.System);
+            };
+        }
+
+        if (this.FindControl<RadioButton>("PortableRadio") is { } portableRadio)
+        {
+            portableRadio.IsCheckedChanged += (s, e) =>
+            {
+                if (portableRadio.IsChecked == true) SelectDataLocationMode(DataLocationMode.Portable);
+            };
+        }
+
+        // 步骤 4: 隐私设置页面
+        if (this.FindControl<Button>("PrivacyBackButton") is { } privacyBackButton)
+        {
+            privacyBackButton.Click += OnPrivacyBackClick;
+        }
+
+        if (this.FindControl<Button>("PrivacyNextButton") is { } privacyNextButton)
+        {
+            privacyNextButton.Click += OnPrivacyNextClick;
+        }
+
+        if (this.FindControl<Button>("ViewPrivacyPolicyButton") is { } viewPrivacyPolicyButton)
+        {
+            viewPrivacyPolicyButton.Click += OnViewPrivacyPolicyClick;
+        }
+
+        // 隐私协议复选框 - 控制遥测开关
+        if (this.FindControl<CheckBox>("PrivacyAgreementCheckBox") is { } privacyCheckBox)
+        {
+            privacyCheckBox.IsCheckedChanged += OnPrivacyAgreementChanged;
+        }
+
+        // 步骤 5: 欢迎完成页面
+        if (this.FindControl<Button>("EnterButton") is { } enterButton)
         {
             enterButton.Click += OnEnterClick;
-            Console.WriteLine("[OobeWindow] EnterButton event bound successfully");
         }
-        else
+    }
+
+    private void SetupAccentColorHandlers()
+    {
+        var colorMap = new Dictionary<string, string>
         {
-            Console.Error.WriteLine("[OobeWindow] Failed to find EnterButton!");
+            { "BlueColor", "#0078D4" },
+            { "PurpleColor", "#7B68EE" },
+            { "GreenColor", "#107C10" },
+            { "OrangeColor", "#D83B01" },
+            { "PinkColor", "#E3008C" },
+            { "TealColor", "#008080" }
+        };
+
+        foreach (var (name, color) in colorMap)
+        {
+            if (this.FindControl<Border>(name) is { } colorBorder)
+            {
+                colorBorder.PointerPressed += (s, e) => SelectAccentColor(name, color);
+            }
         }
     }
 
     private async void OnWindowOpened(object? sender, EventArgs e)
     {
-        Console.WriteLine("[OobeWindow] Window opened, playing entrance animation...");
-        await PlayEntranceAnimationAsync();
+        await PlayTypingAnimationAsync();
     }
 
-    private async Task PlayEntranceAnimationAsync()
+    private async Task PlayTypingAnimationAsync()
     {
-        try
+        var typingTextBlock = this.FindControl<TextBlock>("TypingTextBlock");
+        var cursorBorder = this.FindControl<Border>("CursorBorder");
+        var subtitlePanel = this.FindControl<StackPanel>("SubtitlePanel");
+        var buttonAnimationArea = this.FindControl<Grid>("ButtonAnimationArea");
+        var startButton = this.FindControl<Button>("StartButton");
+        var mouseCursor = this.FindControl<Canvas>("MouseCursor");
+
+        if (typingTextBlock == null || cursorBorder == null) return;
+
+        // 打字机效果：阑山桌面 LanMountain Desktop（在同一行）
+        var fullText = "阑山桌面 LanMountain Desktop";
+        for (int i = 0; i <= fullText.Length; i++)
         {
-            var contentGrid = this.FindControl<Grid>("ContentGrid");
-            if (contentGrid is null)
-            {
-                return;
-            }
-
-            var translateTransform = contentGrid.RenderTransform as TranslateTransform ?? new TranslateTransform();
-            contentGrid.RenderTransform = translateTransform;
-
-            var offset = ResolveEntranceOffset();
-            contentGrid.Opacity = 0;
-            translateTransform.Y = offset;
-
-            var fadeInAnimation = new Animation
-            {
-                Duration = TimeSpan.FromMilliseconds(600),
-                Easing = new CubicEaseOut(),
-                Children =
-                {
-                    new KeyFrame
-                    {
-                        Setters = { new Setter(OpacityProperty, 0.0) },
-                        KeyTime = TimeSpan.FromMilliseconds(0)
-                    },
-                    new KeyFrame
-                    {
-                        Setters = { new Setter(OpacityProperty, 1.0) },
-                        KeyTime = TimeSpan.FromMilliseconds(600)
-                    }
-                }
-            };
-
-            var slideUpAnimation = new Animation
-            {
-                Duration = TimeSpan.FromMilliseconds(600),
-                Easing = new CubicEaseOut(),
-                Children =
-                {
-                    new KeyFrame
-                    {
-                        Setters = { new Setter(TranslateTransform.YProperty, offset) },
-                        KeyTime = TimeSpan.FromMilliseconds(0)
-                    },
-                    new KeyFrame
-                    {
-                        Setters = { new Setter(TranslateTransform.YProperty, 0.0) },
-                        KeyTime = TimeSpan.FromMilliseconds(600)
-                    }
-                }
-            };
-
-            await Task.WhenAll(
-                fadeInAnimation.RunAsync(contentGrid),
-                slideUpAnimation.RunAsync(translateTransform));
-
-            Console.WriteLine("[OobeWindow] Entrance animation completed");
+            typingTextBlock.Text = fullText.Substring(0, i);
+            await Task.Delay(TypingDelayMs);
         }
-        catch (Exception ex)
+
+        // 停顿一下
+        await Task.Delay(500);
+
+        // 隐藏光标
+        cursorBorder.IsVisible = false;
+
+        // 显示副标题（打字机效果：下一代 互动信息看板）
+        if (subtitlePanel != null)
         {
-            Console.Error.WriteLine($"[OobeWindow] Error playing entrance animation: {ex.Message}");
+            subtitlePanel.IsVisible = true;
+            subtitlePanel.Opacity = 1;
+            await PlaySubtitleTypingAnimationAsync();
+        }
+
+        // 停顿一下再显示按钮
+        await Task.Delay(400);
+
+        // 显示按钮动画区域
+        if (buttonAnimationArea != null)
+        {
+            buttonAnimationArea.IsVisible = true;
+        }
+
+        // 鼠标拖拽按钮入场
+        if (mouseCursor != null && startButton != null)
+        {
+            await AnimateMouseDragButtonAsync(mouseCursor, startButton);
         }
     }
 
-    public Task WaitForEnterAsync() => _completionSource.Task;
+    private async Task AnimateMouseDragButtonAsync(Canvas mouseCursor, Button button)
+    {
+        // 初始处于画面外部的 X 坐标
+        var startX = -400.0;
+        var endX = 0.0;
+        
+        button.IsVisible = true;
+        button.Opacity = 1;
+        button.RenderTransform = new TranslateTransform(startX, 0);
+        
+        // 鼠标位于按钮上，比如偏移 (100, 30) 的位置
+        var mouseOffsetX = 100.0;
+        var mouseOffsetY = 30.0;
+        mouseCursor.Margin = new Thickness(startX + mouseOffsetX, mouseOffsetY, 0, 0);
+        mouseCursor.IsVisible = true;
+        
+        await Task.Delay(300);
+
+        var duration = 800;
+        var steps = 40;
+        var delay = duration / steps;
+
+        for (int i = 0; i <= steps; i++)
+        {
+            var progress = (double)i / steps;
+            var eased = EaseOutBack(progress); // 使用 EaseOutBack 营造“拖拽到位”的清脆回弹感
+
+            var currentX = startX + (endX - startX) * eased;
+
+            button.RenderTransform = new TranslateTransform(currentX, 0);
+            mouseCursor.Margin = new Thickness(currentX + mouseOffsetX, mouseOffsetY, 0, 0);
+
+            await Task.Delay(delay);
+        }
+        
+        await Task.Delay(200);
+
+        // 隐藏鼠标光标
+        await AnimateOpacityAsync(mouseCursor, 1, 0, 200);
+        mouseCursor.IsVisible = false;
+    }
+
+    private async Task PlaySubtitleTypingAnimationAsync()
+    {
+        var nextGenTextBlock = this.FindControl<TextBlock>("NextGenTextBlock");
+        var dashboardTextBlock = this.FindControl<TextBlock>("DashboardTextBlock");
+        var subtitleCursorBorder = this.FindControl<Border>("SubtitleCursorBorder");
+
+        if (nextGenTextBlock == null || dashboardTextBlock == null) return;
+
+        // 获取渐变画刷
+        var gradientBrush = nextGenTextBlock.Foreground as LinearGradientBrush;
+
+        // 启动渐变色流动动画
+        if (gradientBrush != null)
+        {
+            _ = AnimateGradientFlowAsync(gradientBrush);
+        }
+
+        // 显示光标
+        if (subtitleCursorBorder != null)
+        {
+            subtitleCursorBorder.IsVisible = true;
+        }
+
+        // 打字机效果：下一代
+        var nextGenText = "下一代";
+        for (int i = 0; i <= nextGenText.Length; i++)
+        {
+            nextGenTextBlock.Text = nextGenText.Substring(0, i);
+            await Task.Delay(TypingDelayMs);
+        }
+
+        // 停顿一下
+        await Task.Delay(200);
+
+        // 换行，光标移到第二行
+        if (subtitleCursorBorder != null)
+        {
+            subtitleCursorBorder.IsVisible = false;
+        }
+
+        // 打字机效果：互动信息看板
+        var dashboardText = "互动信息看板";
+        for (int i = 0; i <= dashboardText.Length; i++)
+        {
+            dashboardTextBlock.Text = dashboardText.Substring(0, i);
+            await Task.Delay(TypingDelayMs);
+        }
+
+        // 停顿一下后隐藏光标
+        await Task.Delay(300);
+    }
+
+    private async Task AnimateGradientFlowAsync(LinearGradientBrush? gradientBrush)
+    {
+        if (gradientBrush == null) return;
+
+        var stops = gradientBrush.GradientStops;
+        if (stops.Count < 2) return;
+
+        // 获取原有的所有颜色
+        var colors = new System.Collections.Generic.List<Color>();
+        foreach (var stop in stops)
+        {
+            colors.Add(stop.Color);
+        }
+        
+        // 为了实现无缝循环流动，把第一个颜色追加到最后
+        colors.Add(colors[0]);
+
+        // 重新分配 GradientStops
+        stops.Clear();
+        for (int i = 0; i < colors.Count; i++)
+        {
+            stops.Add(new GradientStop(colors[i], (double)i / (colors.Count - 1)));
+        }
+
+        // 设置铺展模式，超出范围时重复
+        gradientBrush.SpreadMethod = GradientSpreadMethod.Repeat;
+
+        double offset = 0;
+
+        while (true)
+        {
+            offset -= 0.005; // 每次流动一小步，负数表示向右流动
+            if (offset <= -1.0) offset = 0;
+
+            // 让渐变保持水平方向，但位置不断偏移，形成河流般的流动效果
+            gradientBrush.StartPoint = new RelativePoint(offset, 0, RelativeUnit.Relative);
+            gradientBrush.EndPoint = new RelativePoint(offset + 1, 0, RelativeUnit.Relative);
+
+            await Task.Delay(16); // 约60帧
+        }
+    }
+
+    private async void OnStartButtonClick(object? sender, RoutedEventArgs e)
+    {
+        if (_isTransitioning) return;
+        await NavigateToStep(2);
+    }
+
+    // 主题选择页面按钮
+    private async void OnThemeBackClick(object? sender, RoutedEventArgs e)
+    {
+        if (_isTransitioning) return;
+        await NavigateToStep(1);
+    }
+
+    private async void OnThemeNextClick(object? sender, RoutedEventArgs e)
+    {
+        if (_isTransitioning) return;
+        await NavigateToStep(3);
+    }
+
+    // 数据位置选择页面按钮
+    private async void OnDataLocationBackClick(object? sender, RoutedEventArgs e)
+    {
+        if (_isTransitioning) return;
+        await NavigateToStep(2);
+    }
+
+    private async void OnDataLocationNextClick(object? sender, RoutedEventArgs e)
+    {
+        if (_isTransitioning) return;
+
+        // 应用数据位置选择
+        if (!_isDebugMode)
+        {
+            _resolver.ApplyLocationChoice(_selectedDataLocationMode, null, _migrateExistingData);
+        }
+
+        await NavigateToStep(4);
+    }
+
+    // 隐私设置页面按钮
+    private async void OnPrivacyBackClick(object? sender, RoutedEventArgs e)
+    {
+        if (_isTransitioning) return;
+        await NavigateToStep(3);
+    }
+
+    private async void OnPrivacyNextClick(object? sender, RoutedEventArgs e)
+    {
+        if (_isTransitioning) return;
+
+        // 保存隐私设置
+        SavePrivacySettings();
+
+        await NavigateToStep(5);
+    }
+
+    private void OnViewPrivacyPolicyClick(object? sender, RoutedEventArgs e)
+    {
+        // 打开隐私政策窗口
+        var privacyWindow = new PrivacyPolicyWindow
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterOwner
+        };
+        privacyWindow.ShowDialog(this);
+    }
+
+    private void OnPrivacyAgreementChanged(object? sender, RoutedEventArgs e)
+    {
+        // 根据复选框状态控制遥测开关
+        if (this.FindControl<CheckBox>("PrivacyAgreementCheckBox") is { } checkBox &&
+            this.FindControl<ToggleSwitch>("CrashTelemetryToggle") is { } crashToggle &&
+            this.FindControl<ToggleSwitch>("UsageTelemetryToggle") is { } usageToggle)
+        {
+            var isAgreed = checkBox.IsChecked == true;
+
+            // 如果用户不同意协议，禁用遥测开关并关闭它们
+            crashToggle.IsEnabled = isAgreed;
+            usageToggle.IsEnabled = isAgreed;
+
+            if (!isAgreed)
+            {
+                crashToggle.IsChecked = false;
+                usageToggle.IsChecked = false;
+            }
+            else
+            {
+                // 用户同意协议后，默认开启遥测（用户可以在开关中手动关闭）
+                crashToggle.IsChecked = true;
+                usageToggle.IsChecked = true;
+            }
+        }
+    }
 
     private async void OnEnterClick(object? sender, RoutedEventArgs e)
     {
-        if (_isTransitioning)
-        {
-            return;
-        }
-
+        if (_isTransitioning) return;
         _isTransitioning = true;
-        Console.WriteLine("[OobeWindow] Enter button clicked, starting transition...");
 
         try
         {
             await PlayExitAnimationAsync();
             _completionSource.TrySetResult(true);
+            Close();
         }
         catch (Exception ex)
         {
-            Console.Error.WriteLine($"[OobeWindow] Error during transition: {ex.Message}");
+            Console.Error.WriteLine($"[OobeWindow] Error: {ex.Message}");
             _completionSource.TrySetResult(true);
+            Close();
         }
     }
 
+    private void InitializeDataLocationStep()
+    {
+        if (this.FindControl<TextBlock>("SystemPathText") is { } systemPathText)
+        {
+            systemPathText.Text = _resolver.DefaultSystemDataPath;
+        }
+
+        if (this.FindControl<TextBlock>("PortablePathText") is { } portablePathText)
+        {
+            portablePathText.Text = _resolver.DefaultPortableDataPath;
+        }
+
+        var canWriteToAppRoot = _resolver.IsPortableModeAllowed();
+        if (this.FindControl<RadioButton>("PortableRadio") is { } portableRadio)
+        {
+            portableRadio.IsEnabled = canWriteToAppRoot;
+        }
+
+        if (!canWriteToAppRoot)
+        {
+            if (this.FindControl<Border>("AdminWarningBanner") is { } warningBanner)
+            {
+                warningBanner.IsVisible = true;
+            }
+        }
+
+        if (_resolver.HasExistingSystemData())
+        {
+            _migrateExistingData = true;
+            if (this.FindControl<Border>("MigrationInfoBorder") is { } migrationInfo)
+            {
+                migrationInfo.IsVisible = true;
+            }
+            if (this.FindControl<TextBlock>("MigrationInfoText") is { } migrationText)
+            {
+                migrationText.Text = "检测到现有数据，选择便携模式时将自动迁移。";
+            }
+        }
+    }
+
+    private void SelectDataLocationMode(DataLocationMode mode)
+    {
+        _selectedDataLocationMode = mode;
+
+        if (this.FindControl<RadioButton>("SystemRadio") is { } systemRadio)
+        {
+            systemRadio.IsChecked = mode == DataLocationMode.System;
+        }
+
+        if (this.FindControl<RadioButton>("PortableRadio") is { } portableRadio)
+        {
+            portableRadio.IsChecked = mode == DataLocationMode.Portable;
+        }
+
+        if (this.FindControl<Border>("SystemOptionBorder") is { } systemBorder)
+        {
+            systemBorder.BorderBrush = mode == DataLocationMode.System
+                ? Application.Current?.Resources["AccentFillColorDefaultBrush"] as IBrush
+                : Application.Current?.Resources["CardStrokeColorDefaultBrush"] as IBrush;
+            systemBorder.BorderThickness = mode == DataLocationMode.System
+                ? new Thickness(2)
+                : new Thickness(1);
+        }
+
+        if (this.FindControl<Border>("PortableOptionBorder") is { } portableBorder)
+        {
+            portableBorder.BorderBrush = mode == DataLocationMode.Portable
+                ? Application.Current?.Resources["AccentFillColorDefaultBrush"] as IBrush
+                : Application.Current?.Resources["CardStrokeColorDefaultBrush"] as IBrush;
+            portableBorder.BorderThickness = mode == DataLocationMode.Portable
+                ? new Thickness(2)
+                : new Thickness(1);
+        }
+    }
+
+    // 主题选择方法
+    private void SelectThemeMode(Services.ThemeMode mode)
+    {
+        _selectedThemeMode = mode;
+
+        // 立即应用主题到启动器
+        ThemeService.ApplyTheme(mode, _selectedAccentColor);
+
+        if (this.FindControl<RadioButton>("LightModeRadio") is { } lightModeRadio)
+        {
+            lightModeRadio.IsChecked = mode == Services.ThemeMode.Light;
+        }
+
+        if (this.FindControl<RadioButton>("DarkModeRadio") is { } darkModeRadio)
+        {
+            darkModeRadio.IsChecked = mode == Services.ThemeMode.Dark;
+        }
+
+        if (this.FindControl<Border>("LightModeOption") is { } lightModeOption)
+        {
+            lightModeOption.BorderBrush = mode == Services.ThemeMode.Light
+                ? Application.Current?.Resources["AccentFillColorDefaultBrush"] as IBrush
+                : Application.Current?.Resources["CardStrokeColorDefaultBrush"] as IBrush;
+            lightModeOption.BorderThickness = mode == Services.ThemeMode.Light
+                ? new Thickness(2)
+                : new Thickness(1);
+        }
+
+        if (this.FindControl<Border>("DarkModeOption") is { } darkModeOption)
+        {
+            darkModeOption.BorderBrush = mode == Services.ThemeMode.Dark
+                ? Application.Current?.Resources["AccentFillColorDefaultBrush"] as IBrush
+                : Application.Current?.Resources["CardStrokeColorDefaultBrush"] as IBrush;
+            darkModeOption.BorderThickness = mode == Services.ThemeMode.Dark
+                ? new Thickness(2)
+                : new Thickness(1);
+        }
+    }
+
+    private void SelectAccentColor(string colorName, string colorValue)
+    {
+        _selectedAccentColor = colorValue;
+
+        // 更新所有颜色圆圈边框
+        var colorBorders = new[] { "BlueColor", "PurpleColor", "GreenColor", "OrangeColor", "PinkColor", "TealColor" };
+        foreach (var name in colorBorders)
+        {
+            if (this.FindControl<Border>(name) is { } border)
+            {
+                var isSelected = name == colorName;
+                border.BorderBrush = isSelected
+                    ? Application.Current?.Resources["TextFillColorPrimaryBrush"] as IBrush
+                    : null;
+                border.BorderThickness = isSelected ? new Thickness(3) : new Thickness(0);
+            }
+        }
+    }
+
+    private void SelectMonetSource(MonetSource source)
+    {
+        _selectedMonetSource = source;
+
+        if (this.FindControl<RadioButton>("MonetFromWallpaperRadio") is { } wallpaperRadio)
+        {
+            wallpaperRadio.IsChecked = source == MonetSource.Wallpaper;
+        }
+
+        if (this.FindControl<RadioButton>("MonetFromCustomRadio") is { } customRadio)
+        {
+            customRadio.IsChecked = source == MonetSource.Custom;
+        }
+
+        if (this.FindControl<RadioButton>("MonetDisabledRadio") is { } disabledRadio)
+        {
+            disabledRadio.IsChecked = source == MonetSource.Disabled;
+        }
+
+        UpdateMonetOptionBorder("MonetFromWallpaperOption", source == MonetSource.Wallpaper);
+        UpdateMonetOptionBorder("MonetFromCustomOption", source == MonetSource.Custom);
+        UpdateMonetOptionBorder("MonetDisabledOption", source == MonetSource.Disabled);
+    }
+
+    private void UpdateMonetOptionBorder(string borderName, bool isSelected)
+    {
+        if (this.FindControl<Border>(borderName) is { } border)
+        {
+            border.BorderBrush = isSelected
+                ? Application.Current?.Resources["AccentFillColorDefaultBrush"] as IBrush
+                : Application.Current?.Resources["CardStrokeColorDefaultBrush"] as IBrush;
+            border.BorderThickness = isSelected ? new Thickness(2) : new Thickness(1);
+        }
+    }
+
+    private async Task NavigateToStep(int step)
+    {
+        if (_isTransitioning || step == _currentStep) return;
+        _isTransitioning = true;
+
+        // 获取当前步骤的控件
+        Grid? currentStepControl = _currentStep switch
+        {
+            1 => this.FindControl<Grid>("TypingStep"),
+            2 => this.FindControl<Grid>("ThemeStep"),
+            3 => this.FindControl<Grid>("DataLocationStep"),
+            4 => this.FindControl<Grid>("PrivacyStep"),
+            5 => this.FindControl<Grid>("WelcomeStep"),
+            _ => null
+        };
+
+        // 获取目标步骤的控件
+        Grid? nextStepControl = step switch
+        {
+            1 => this.FindControl<Grid>("TypingStep"),
+            2 => this.FindControl<Grid>("ThemeStep"),
+            3 => this.FindControl<Grid>("DataLocationStep"),
+            4 => this.FindControl<Grid>("PrivacyStep"),
+            5 => this.FindControl<Grid>("WelcomeStep"),
+            _ => null
+        };
+
+        if (currentStepControl == null || nextStepControl == null)
+        {
+            _isTransitioning = false;
+            return;
+        }
+
+        await AnimateOpacityAsync(currentStepControl, 1, 0, AnimationDurationMs);
+        currentStepControl.IsVisible = false;
+
+        nextStepControl.IsVisible = true;
+        nextStepControl.Opacity = 0;
+        await AnimateOpacityAsync(nextStepControl, 0, 1, AnimationDurationMs);
+
+        _currentStep = step;
+        _isTransitioning = false;
+    }
+
     private async Task PlayExitAnimationAsync()
+    {
+        var contentGrid = this.FindControl<Grid>("ContentGrid");
+        if (contentGrid != null)
+        {
+            await AnimateOpacityAsync(contentGrid, 1, 0, AnimationDurationMs);
+        }
+    }
+
+    private static async Task AnimateOpacityAsync(Control element, double from, double to, int durationMs)
+    {
+        var steps = 20;
+        var delay = durationMs / steps;
+
+        for (int i = 0; i <= steps; i++)
+        {
+            var progress = (double)i / steps;
+            var eased = EaseOutCubic(progress);
+            element.Opacity = from + (to - from) * eased;
+            await Task.Delay(delay);
+        }
+    }
+
+    private static double EaseOutCubic(double t) => 1 - Math.Pow(1 - t, 3);
+    private static double EaseOutQuad(double t) => 1 - Math.Pow(1 - t, 2);
+    private static double EaseOutBack(double t)
+    {
+        const double c1 = 1.70158;
+        const double c3 = c1 + 1;
+        var t1 = t - 1;
+        return 1 + c3 * Math.Pow(t1, 3) + c1 * Math.Pow(t1, 2);
+    }
+
+    private void InitializePrivacySettings()
+    {
+        // 生成隐私追踪 ID
+        var telemetryId = Guid.NewGuid().ToString("N");
+        if (this.FindControl<TextBox>("TelemetryIdTextBox") is { } telemetryIdTextBox)
+        {
+            telemetryIdTextBox.Text = telemetryId;
+        }
+    }
+
+    private void SavePrivacySettings()
     {
         try
         {
-            var contentGrid = this.FindControl<Grid>("ContentGrid");
-            if (contentGrid is null)
-            {
-                await Task.Delay(200);
-                return;
-            }
+            var crashTelemetryEnabled = this.FindControl<ToggleSwitch>("CrashTelemetryToggle")?.IsChecked ?? true;
+            var usageTelemetryEnabled = this.FindControl<ToggleSwitch>("UsageTelemetryToggle")?.IsChecked ?? true;
+            var telemetryId = this.FindControl<TextBox>("TelemetryIdTextBox")?.Text ?? Guid.NewGuid().ToString("N");
 
-            var fadeOutAnimation = new Animation
+            // 保存到启动器配置
+            var privacyConfig = new PrivacyConfig
             {
-                Duration = TimeSpan.FromMilliseconds(200),
-                Easing = new CubicEaseIn(),
-                Children =
-                {
-                    new KeyFrame
-                    {
-                        Setters = { new Setter(OpacityProperty, 1.0) },
-                        KeyTime = TimeSpan.FromMilliseconds(0)
-                    },
-                    new KeyFrame
-                    {
-                        Setters = { new Setter(OpacityProperty, 0.0) },
-                        KeyTime = TimeSpan.FromMilliseconds(200)
-                    }
-                }
+                CrashTelemetryEnabled = crashTelemetryEnabled,
+                UsageTelemetryEnabled = usageTelemetryEnabled,
+                TelemetryId = telemetryId
             };
 
-            await fadeOutAnimation.RunAsync(contentGrid);
-            Console.WriteLine("[OobeWindow] Exit animation completed");
+            var configPath = Path.Combine(_resolver.ResolveLauncherDataPath(), "privacy-config.json");
+            var json = System.Text.Json.JsonSerializer.Serialize(privacyConfig, AppJsonContext.Default.PrivacyConfig);
+            File.WriteAllText(configPath, json);
+
+            // 保存隐私协议同意状态（带防篡改保护）
+            var agreementService = new PrivacyAgreementService(_resolver.ResolveLauncherDataPath());
+            var isAgreed = this.FindControl<CheckBox>("PrivacyAgreementCheckBox")?.IsChecked ?? false;
+
+            // 生成用户ID和设备ID
+            var userId = telemetryId;
+            var deviceId = GetDeviceIdentifier();
+
+            agreementService.SaveAgreement(isAgreed, userId, deviceId);
+
+            Logger.Info($"[OobeWindow] 隐私设置已保存: Crash={crashTelemetryEnabled}, Usage={usageTelemetryEnabled}, Agreement={isAgreed}");
         }
         catch (Exception ex)
         {
-            Console.Error.WriteLine($"[OobeWindow] Error playing exit animation: {ex.Message}");
+            Logger.Warn($"[OobeWindow] 保存隐私设置失败: {ex.Message}");
         }
     }
 
-    private double ResolveEntranceOffset()
+    /// <summary>
+    /// 获取设备标识符
+    /// </summary>
+    private string GetDeviceIdentifier()
     {
-        var boundsHeight = Bounds.Height > 0 ? Bounds.Height : Height;
-        var scaledOffset = boundsHeight * 0.05;
-        return Math.Clamp(scaledOffset, 20, 48);
+        try
+        {
+            // 使用机器名和用户名的组合作为设备标识
+            var machineName = Environment.MachineName;
+            var userName = Environment.UserName;
+
+            using var sha256 = System.Security.Cryptography.SHA256.Create();
+            var hash = sha256.ComputeHash(System.Text.Encoding.UTF8.GetBytes($"{machineName}:{userName}"));
+            return Convert.ToHexString(hash).Substring(0, 16);
+        }
+        catch
+        {
+            return "UnknownDevice";
+        }
     }
+
+}
+
+// 枚举定义（使用 Services 命名空间中的 ThemeMode）
+public enum MonetSource
+{
+    Wallpaper,
+    Custom,
+    Disabled
 }

LanMountainDesktop.Launcher/Views/PrivacyPolicyWindow.axaml

@@ -0,0 +1,63 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:md="clr-namespace:Markdown.Avalonia;assembly=Markdown.Avalonia"
+        xmlns:views="clr-namespace:LanMountainDesktop.Launcher.Views"
+        mc:Ignorable="d"
+        x:Class="LanMountainDesktop.Launcher.Views.PrivacyPolicyWindow"
+        x:DataType="views:PrivacyPolicyViewModel"
+        Title="阑山桌面遥测隐私数据收集协议"
+        Width="800"
+        Height="600"
+        MinWidth="600"
+        MinHeight="400"
+        WindowStartupLocation="CenterOwner"
+        Background="{DynamicResource SolidBackgroundFillColorBaseBrush}"
+        TransparencyLevelHint="None"
+        Icon="/Assets/logo.ico">
+
+  <Grid RowDefinitions="Auto,*,Auto">
+    <!-- 标题栏 -->
+    <Border Grid.Row="0"
+            Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+            BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
+            BorderThickness="0,0,0,1"
+            Padding="24,16">
+      <StackPanel Spacing="4">
+        <TextBlock Text="阑山桌面遥测隐私数据收集协议"
+                   FontSize="20"
+                   FontWeight="SemiBold"
+                   Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+        <TextBlock Text="请仔细阅读以下协议内容，了解我们如何收集、使用和保护您的数据"
+                   FontSize="13"
+                   Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
+      </StackPanel>
+    </Border>
+
+    <!-- Markdown 内容区域 -->
+    <Border Grid.Row="1"
+            Margin="24,16"
+            Background="{DynamicResource SolidBackgroundFillColorBaseBrush}">
+      <md:MarkdownScrollViewer x:Name="MarkdownViewer"
+                               Markdown="{Binding PrivacyPolicyMarkdown}"
+                               HorizontalAlignment="Stretch" />
+    </Border>
+
+    <!-- 底部按钮 -->
+    <Border Grid.Row="2"
+            Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+            BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
+            BorderThickness="0,1,0,0"
+            Padding="24,16">
+      <StackPanel Orientation="Horizontal"
+                  HorizontalAlignment="Right"
+                  Spacing="12">
+        <Button x:Name="CloseButton"
+                Content="关闭"
+                Theme="{DynamicResource AccentButtonTheme}"
+                Width="100" />
+      </StackPanel>
+    </Border>
+  </Grid>
+</Window>

LanMountainDesktop.Launcher/Views/PrivacyPolicyWindow.axaml.cs

@@ -0,0 +1,121 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace LanMountainDesktop.Launcher.Views;
+
+public partial class PrivacyPolicyWindow : Window
+{
+    private readonly PrivacyPolicyViewModel _viewModel;
+
+    public PrivacyPolicyWindow()
+    {
+        InitializeComponent();
+        _viewModel = new PrivacyPolicyViewModel();
+        DataContext = _viewModel;
+
+        // 加载隐私政策内容
+        LoadPrivacyPolicy();
+
+        // 绑定关闭按钮事件
+        if (this.FindControl<Button>("CloseButton") is { } closeButton)
+        {
+            closeButton.Click += OnCloseClick;
+        }
+    }
+
+    private void OnCloseClick(object? sender, RoutedEventArgs e)
+    {
+        Close();
+    }
+
+    private void LoadPrivacyPolicy()
+    {
+        // 默认隐私政策内容（Markdown 格式）
+        _viewModel.PrivacyPolicyMarkdown = @"# 阑山桌面遥测隐私数据收集协议
+
+## 1. 概述
+
+欢迎使用阑山桌面！本协议旨在向您说明我们在应用运行过程中收集哪些数据、如何使用这些数据以及如何保护您的隐私。
+
+## 2. 我们收集的数据
+
+### 2.1 崩溃报告（可选）
+
+当应用发生崩溃时，我们可能会收集以下信息：
+
+- **崩溃类型**：应用程序崩溃、无响应等异常情况的类型
+- **错误堆栈**：导致崩溃的代码路径（不包含文件内容或个人数据）
+- **设备信息**：操作系统版本、应用版本、.NET 运行时版本
+- **匿名设备标识符**：一个随机生成的唯一标识符，用于统计崩溃频率
+
+**注意**：崩溃报告不包含您的个人文件、桌面组件内容、浏览历史或任何可识别个人身份的信息。
+
+### 2.2 使用统计（可选）
+
+如果您启用了使用统计，我们可能会收集：
+
+- **功能使用频率**：各功能模块的使用次数（如设置打开次数、组件添加次数）
+- **性能指标**：应用启动时间、内存占用范围等性能数据
+- **匿名设备标识符**：用于统计独立用户数量
+
+**注意**：使用统计不包含您的组件配置、个人设置或任何敏感信息。
+
+## 3. 我们不收集的数据
+
+我们明确**不会**收集以下信息：
+
+- ❌ 您的姓名、邮箱、电话号码等个人身份信息
+- ❌ 您的桌面截图或壁纸内容
+- ❌ 您添加的组件的具体内容或配置详情
+- ❌ 您的文件系统浏览记录
+- ❌ 您的网络活动或浏览历史
+- ❌ 您的精确地理位置信息
+
+## 4. 数据用途
+
+我们收集的数据仅用于以下目的：
+
+1. **改进应用稳定性**：通过分析崩溃报告，修复程序缺陷
+2. **优化产品体验**：了解功能使用情况，优先改进常用功能
+3. **性能优化**：识别性能瓶颈，提升应用运行效率
+
+## 5. 数据存储与保护
+
+- 所有数据通过**加密传输**（HTTPS）发送到我们的服务器
+- 数据存储在安全的服务器环境中，访问受到严格控制
+- 匿名设备标识符仅用于统计目的，无法关联到您的真实身份
+- 我们**不会**将数据出售或共享给任何第三方用于商业目的
+
+## 6. 您的控制权
+
+您拥有以下权利：
+
+- **随时开启或关闭**：您可以在 OOBE 向导或设置中随时更改遥测选项
+- **数据删除**：如果您希望删除已收集的数据，请联系我们的支持团队
+- **知情权**：您有权了解我们收集了哪些数据（通过本协议）
+
+## 7. 协议更新
+
+我们可能会不时更新本协议。重大变更时，我们会在应用内通知您。继续使用本应用即表示您同意修订后的协议。
+
+## 8. 联系我们
+
+如果您对本协议有任何疑问，请通过以下方式联系我们：
+
+- 项目主页：https://github.com/LanMountain/LanMountainDesktop
+- 问题反馈：在 GitHub 仓库提交 Issue
+
+---
+
+**最后更新日期**：2026年4月26日
+
+感谢您信任并使用阑山桌面！";
+    }
+}
+
+public partial class PrivacyPolicyViewModel : ObservableObject
+{
+    [ObservableProperty]
+    private string _privacyPolicyMarkdown = string.Empty;
+}

LanMountainDesktop.Launcher/Views/SplashWindow.axaml

@@ -3,85 +3,82 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:views="clr-namespace:LanMountainDesktop.Launcher.Views"
-        xmlns:ui="using:FluentAvalonia.UI.Controls"
         mc:Ignorable="d"
-        d:DesignWidth="480"
-        d:DesignHeight="320"
         x:Class="LanMountainDesktop.Launcher.Views.SplashWindow"
         x:DataType="views:SplashWindow"
         Title="LanMountain Desktop"
         Width="480"
         Height="320"
         CanResize="False"
+        ShowInTaskbar="False"
         WindowStartupLocation="CenterScreen"
-        SystemDecorations="None"
-        Background="{DynamicResource SolidBackgroundFillColorBaseBrush}"
+        WindowDecorations="None"
+        Background="#0B0B0B"
         TransparencyLevelHint="None"
         Icon="/Assets/logo.ico">
   <Design.DataContext>
     <views:SplashWindow />
   </Design.DataContext>
 
-  <Grid>
-    <!-- 左上角：应用名称 -->
-    <TextBlock x:Name="AppNameText"
-               Text="LanMountain Desktop"
-               FontSize="24"
-               FontWeight="SemiBold"
-               VerticalAlignment="Top"
-               HorizontalAlignment="Left"
-               Margin="24,24,0,0"
-               Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
+  <Grid RowDefinitions="*,Auto">
+    <!-- 背景图片 -->
+    <Image x:Name="BackgroundImage"
+           Grid.RowSpan="2"
+           Stretch="UniformToFill"
+           IsVisible="False"
+           Opacity="0"/>
 
-    <!-- 底部区域：进度条和状态 -->
-    <Grid VerticalAlignment="Bottom" Margin="24,0,24,24">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto"/>
-        <RowDefinition Height="Auto"/>
-      </Grid.RowDefinitions>
-      
-      <!-- 第一行：左下角版本信息，右下角阶段文字 -->
-      <Grid Grid.Row="0" Margin="0,0,0,8">
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="*"/>
-          <ColumnDefinition Width="Auto"/>
-        </Grid.ColumnDefinitions>
-        
-        <!-- 左下角：版本和开发代号 - 可点击打开开发者界面（隐藏功能） -->
-        <Border x:Name="VersionTextBorder"
-                Grid.Column="0"
-                Background="Transparent"
-                Cursor="Hand"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Bottom">
-          <TextBlock x:Name="VersionText"
-                     FontSize="11"
-                     Foreground="{DynamicResource TextFillColorSecondaryBrush}"
-                     Opacity="0.8"
-                     Text="1.0.0 (Administrate)" />
-        </Border>
-        
-        <!-- 右下角：阶段文字 -->
-        <TextBlock x:Name="StatusText"
-                   Grid.Column="1"
-                   FontSize="11"
-                   Foreground="{DynamicResource TextFillColorSecondaryBrush}"
-                   HorizontalAlignment="Right"
-                   VerticalAlignment="Bottom"
-                   Opacity="0.8"
-                   Text="Initializing..." />
-      </Grid>
-      
-      <!-- 底部：进度条 -->
-      <ProgressBar x:Name="ProgressIndicator"
-                   Grid.Row="1"
-                   Minimum="0"
-                   Maximum="100"
-                   Value="0"
-                   Height="4"
-                   IsIndeterminate="False"
-                   Foreground="{DynamicResource AccentFillColorDefaultBrush}"
-                   Background="{DynamicResource ControlStrokeColorDefaultBrush}" />
+    <!-- 半透明遮罩层 -->
+    <Border x:Name="BackgroundOverlay"
+            Grid.RowSpan="2"
+            Background="#0B0B0B"
+            Opacity="0.85"/>
+
+    <Grid Grid.Row="0"
+          Margin="24">
+      <TextBlock x:Name="AppNameText"
+                 Text="LanMountain Desktop"
+                 FontSize="24"
+                 FontWeight="SemiBold"
+                 VerticalAlignment="Top"
+                 HorizontalAlignment="Left"
+                 Foreground="#F6F7FB" />
     </Grid>
+
+    <Border Grid.Row="1"
+            Padding="24,18,24,24"
+            Background="Transparent">
+      <Grid RowDefinitions="Auto,Auto"
+            RowSpacing="10">
+        <Grid ColumnDefinitions="*,Auto">
+          <Border x:Name="VersionTextBorder"
+                  Background="Transparent"
+                  Cursor="Hand"
+                  HorizontalAlignment="Left">
+            <TextBlock x:Name="VersionText"
+                       FontSize="11"
+                       Foreground="#B9C0CC"
+                       Text="0.0.0-dev (Administrate)" />
+          </Border>
+
+          <TextBlock x:Name="StatusText"
+                     Grid.Column="1"
+                     FontSize="11"
+                     Foreground="#B9C0CC"
+                     HorizontalAlignment="Right"
+                     Text="Initializing..." />
+        </Grid>
+
+        <ProgressBar x:Name="ProgressIndicator"
+                     Grid.Row="1"
+                     Minimum="0"
+                     Maximum="100"
+                     Value="0"
+                     Height="4"
+                     IsIndeterminate="False"
+                     Foreground="#F6F7FB"
+                     Background="#2C313D" />
+      </Grid>
+    </Border>
   </Grid>
 </Window>

LanMountainDesktop.Launcher/Views/SplashWindow.axaml.cs

@@ -1,88 +1,228 @@
+using System.Diagnostics;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media;
 using Avalonia.Threading;
 using LanMountainDesktop.Launcher.Services;
 
 namespace LanMountainDesktop.Launcher.Views;
 
-/// <summary>
-/// 启动画面窗口 - 简洁设计
-/// </summary>
 public partial class SplashWindow : Window, ISplashStageReporter
 {
-    private int _versionTextClickCount = 0;
     private const int DebugModeClickThreshold = 5;
-    private bool _isDebugModeOpened = false;
+    private static readonly TimeSpan FadeAnimationDuration = TimeSpan.FromMilliseconds(160);
+
+    private int _versionTextClickCount;
+    private bool _isDebugModeOpened;
+    private bool _isOpened;
+    private bool _dismissed;
 
     public SplashWindow()
     {
         AvaloniaXamlLoader.Load(this);
-        
-        // 延迟到窗口加载完成后再绑定事件
-        this.Loaded += OnWindowLoaded;
+        Loaded += OnWindowLoaded;
+        Opened += OnWindowOpened;
     }
 
-    /// <summary>
-    /// 窗口加载完成事件
-    /// </summary>
     private void OnWindowLoaded(object? sender, RoutedEventArgs e)
     {
-        Console.WriteLine("[SplashWindow] Window loaded, binding events...");
-        
-        // 绑定版本文本点击事件（隐藏功能：点击5次打开开发者界面）
-        var versionTextBorder = this.FindControl<Border>("VersionTextBorder");
-        if (versionTextBorder is not null)
+        InitializeBackgroundImage();
+
+        if (this.FindControl<Border>("VersionTextBorder") is { } versionBorder)
         {
-            versionTextBorder.PointerPressed += OnVersionTextClick;
-            Console.WriteLine("[SplashWindow] VersionTextBorder click event bound");
-        }
-        else
-        {
-            Console.Error.WriteLine("[SplashWindow] Failed to find VersionTextBorder!");
+            versionBorder.PointerPressed += OnVersionTextClick;
         }
     }
 
-    /// <summary>
-    /// 版本文本点击事件 - 连续点击5次打开开发者界面（隐藏功能）
-    /// </summary>
+    private void InitializeBackgroundImage()
+    {
+        try
+        {
+            var imageInfo = LauncherBackgroundService.LoadBackgroundImage();
+            if (imageInfo is { IsValid: true, Bitmap: not null })
+            {
+                if (this.FindControl<Image>("BackgroundImage") is { } backgroundImage)
+                {
+                    backgroundImage.Source = imageInfo.Bitmap;
+                    backgroundImage.IsVisible = true;
+                    backgroundImage.Opacity = 1;
+                }
+                Logger.Info("[SplashWindow] 背景图片加载成功");
+            }
+            else if (imageInfo is { Exists: true, IsValid: false })
+            {
+                Logger.Warn($"[SplashWindow] 背景图片校验失败: {imageInfo.ErrorMessage}");
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.Warn($"[SplashWindow] 加载背景图片失败: {ex.Message}");
+        }
+    }
+
+    private async void OnWindowOpened(object? sender, EventArgs e)
+    {
+        if (_isOpened)
+        {
+            return;
+        }
+
+        _isOpened = true;
+
+        Opacity = 0d;
+        await AnimateOpacityAsync(0d, 1d, FadeAnimationDuration).ConfigureAwait(false);
+    }
+
+    public async Task DismissAsync()
+    {
+        if (_dismissed)
+        {
+            return;
+        }
+
+        _dismissed = true;
+
+        if (!Dispatcher.UIThread.CheckAccess())
+        {
+            await Dispatcher.UIThread.InvokeAsync(async () => await DismissAsync());
+            return;
+        }
+
+        await AnimateOpacityAsync(Opacity, 0d, FadeAnimationDuration).ConfigureAwait(false);
+        Close();
+    }
+
+    public void Report(string stage, string message)
+    {
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (this.FindControl<TextBlock>("StatusText") is { } statusText)
+            {
+                statusText.Text = message;
+            }
+
+            if (this.FindControl<ProgressBar>("ProgressIndicator") is { } progressIndicator)
+            {
+                var progress = ResolveProgress(stage);
+                if (progress > 0)
+                {
+                    progressIndicator.IsIndeterminate = false;
+                    progressIndicator.Value = progress;
+                }
+                else
+                {
+                    progressIndicator.IsIndeterminate = true;
+                }
+            }
+        });
+    }
+
+    public void ReportStage(string stage, int progress)
+    {
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (this.FindControl<TextBlock>("StatusText") is { } statusText)
+            {
+                statusText.Text = stage;
+            }
+
+            if (this.FindControl<ProgressBar>("ProgressIndicator") is { } progressIndicator)
+            {
+                progressIndicator.IsIndeterminate = false;
+                progressIndicator.Value = Math.Clamp(progress, 0, 100);
+            }
+        });
+    }
+
+    public void UpdateProgress(int percent, string? message = null)
+    {
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (!string.IsNullOrWhiteSpace(message) &&
+                this.FindControl<TextBlock>("StatusText") is { } statusText)
+            {
+                statusText.Text = message;
+            }
+
+            if (this.FindControl<ProgressBar>("ProgressIndicator") is { } progressIndicator)
+            {
+                progressIndicator.IsIndeterminate = false;
+                progressIndicator.Value = Math.Clamp(percent, 0, 100);
+            }
+        });
+    }
+
+    public void UpdateStatus(string message)
+    {
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (this.FindControl<TextBlock>("StatusText") is { } statusText)
+            {
+                statusText.Text = message;
+            }
+        });
+    }
+
+    public void SetVersionInfo(string version, string codename)
+    {
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (this.FindControl<TextBlock>("VersionText") is { } versionText)
+            {
+                versionText.Text = $"{version} ({codename})";
+            }
+        });
+    }
+
+    public void SetDebugMode(bool isDebugMode)
+    {
+        if (!isDebugMode)
+        {
+            return;
+        }
+
+        UpdateStatus("[Debug Mode] Splash Preview");
+    }
+
     private void OnVersionTextClick(object? sender, PointerPressedEventArgs e)
     {
-        if (_isDebugModeOpened) return;
-        
-        _versionTextClickCount++;
-        Console.WriteLine($"[SplashWindow] Version text clicked {_versionTextClickCount}/{DebugModeClickThreshold}");
+        if (_isDebugModeOpened)
+        {
+            return;
+        }
 
+        _versionTextClickCount++;
         if (_versionTextClickCount >= DebugModeClickThreshold)
         {
             OpenDebugWindow();
         }
     }
 
-    /// <summary>
-    /// 打开开发者调试窗口
-    /// </summary>
     private async void OpenDebugWindow()
     {
         _isDebugModeOpened = true;
-        Console.WriteLine("[SplashWindow] Opening debug window...");
 
         try
         {
-            // 加载保存的状态
-            var devModeEnabled = ErrorWindow.CheckDevModeEnabled();
-            var customHostPath = ErrorWindow.GetSavedCustomHostPath();
-
-            var debugWindow = new ErrorDebugWindow(devModeEnabled, customHostPath)
+            var debugWindow = new ErrorDebugWindow(
+                ErrorWindow.CheckDevModeEnabled(),
+                ErrorWindow.GetSavedCustomHostPath())
             {
-                WindowStartupLocation = WindowStartupLocation.CenterScreen
+                WindowStartupLocation = WindowStartupLocation.CenterOwner
             };
 
-            // 订阅窗口关闭事件以保存状态
-            debugWindow.Closed += (s, e) =>
+            debugWindow.Closed += (_, _) =>
             {
-                Console.WriteLine("[SplashWindow] Debug window closed");
+                if (debugWindow.WasAccepted)
+                {
+                    LauncherDebugSettingsStore.Save(new LauncherDebugSettings(
+                        debugWindow.IsDevModeEnabled,
+                        debugWindow.SelectedHostPath));
+                }
+
                 _isDebugModeOpened = false;
                 _versionTextClickCount = 0;
             };
@@ -91,160 +231,59 @@ public partial class SplashWindow : Window, ISplashStageReporter
         }
         catch (Exception ex)
         {
-            Console.Error.WriteLine($"[SplashWindow] Error opening debug window: {ex.Message}");
+            Debug.WriteLine($"[SplashWindow] Failed to open debug window: {ex}");
             _isDebugModeOpened = false;
             _versionTextClickCount = 0;
         }
     }
 
-    /// <summary>
-    /// 更新进度和状态
-    /// </summary>
-    public void Report(string stage, string message)
+    private async Task AnimateOpacityAsync(double from, double to, TimeSpan duration)
     {
-        Dispatcher.UIThread.Post(() =>
+        await AnimateAsync(progress =>
         {
-            var statusText = this.FindControl<TextBlock>("StatusText");
-            var progressIndicator = this.FindControl<ProgressBar>("ProgressIndicator");
-            
-            if (statusText is null || progressIndicator is null)
-            {
-                Console.Error.WriteLine($"[SplashWindow] Controls not found: StatusText={statusText != null}, ProgressIndicator={progressIndicator != null}");
-                return;
-            }
-
-            // 更新状态文本
-            statusText.Text = message;
-
-            // 根据阶段更新进度
-            var progress = ResolveProgress(stage);
-            if (progress > 0)
-            {
-                progressIndicator.IsIndeterminate = false;
-                progressIndicator.Value = progress;
-            }
-            else
-            {
-                progressIndicator.IsIndeterminate = true;
-            }
-        });
+            Opacity = from + ((to - from) * progress);
+        }, duration, EaseOutCubic).ConfigureAwait(false);
     }
 
-    /// <summary>
-    /// 更新进度（0-100）
-    /// </summary>
-    public void UpdateProgress(int percent, string? message = null)
+    private async Task AnimateAsync(Action<double> update, TimeSpan duration, Func<double, double> easing)
     {
-        Dispatcher.UIThread.Post(() =>
+        if (duration <= TimeSpan.Zero)
         {
-            var statusText = this.FindControl<TextBlock>("StatusText");
-            var progressIndicator = this.FindControl<ProgressBar>("ProgressIndicator");
-            
-            if (statusText is null || progressIndicator is null)
-            {
-                Console.Error.WriteLine($"[SplashWindow] Controls not found in UpdateProgress");
-                return;
-            }
+            await Dispatcher.UIThread.InvokeAsync(() => update(1d));
+            return;
+        }
 
-            if (!string.IsNullOrEmpty(message))
-            {
-                statusText.Text = message;
-            }
+        var stopwatch = Stopwatch.StartNew();
+        while (stopwatch.Elapsed < duration)
+        {
+            var raw = stopwatch.Elapsed.TotalMilliseconds / duration.TotalMilliseconds;
+            var progress = easing(Math.Clamp(raw, 0d, 1d));
+            await Dispatcher.UIThread.InvokeAsync(() => update(progress));
+            await Task.Delay(16).ConfigureAwait(false);
+        }
 
-            progressIndicator.IsIndeterminate = false;
-            progressIndicator.Value = Math.Clamp(percent, 0, 100);
-        });
+        await Dispatcher.UIThread.InvokeAsync(() => update(1d));
     }
 
-    /// <summary>
-    /// 更新状态文本
-    /// </summary>
-    public void UpdateStatus(string message)
-    {
-        Dispatcher.UIThread.Post(() =>
-        {
-            var statusText = this.FindControl<TextBlock>("StatusText");
-            if (statusText is null)
-            {
-                Console.Error.WriteLine($"[SplashWindow] StatusText not found in UpdateStatus");
-                return;
-            }
-            statusText.Text = message;
-        });
-    }
-
-    /// <summary>
-    /// 报告阶段和进度（0-100）
-    /// </summary>
-    public void ReportStage(string stage, int progress)
-    {
-        Dispatcher.UIThread.Post(() =>
-        {
-            var statusText = this.FindControl<TextBlock>("StatusText");
-            var progressIndicator = this.FindControl<ProgressBar>("ProgressIndicator");
-            
-            if (statusText is null || progressIndicator is null)
-            {
-                Console.Error.WriteLine($"[SplashWindow] Controls not found in ReportStage");
-                return;
-            }
-
-            statusText.Text = stage;
-            progressIndicator.IsIndeterminate = false;
-            progressIndicator.Value = Math.Clamp(progress, 0, 100);
-        });
-    }
-
-    /// <summary>
-    /// 设置版本和开发代号
-    /// </summary>
-    public void SetVersionInfo(string version, string codename)
-    {
-        Dispatcher.UIThread.Post(() =>
-        {
-            var versionText = this.FindControl<TextBlock>("VersionText");
-            if (versionText is null)
-            {
-                Console.Error.WriteLine($"[SplashWindow] VersionText not found in SetVersionInfo");
-                return;
-            }
-            versionText.Text = $"{version} ({codename})";
-        });
-    }
-
-    /// <summary>
-    /// 设置调试模式
-    /// </summary>
-    public void SetDebugMode(bool isDebugMode)
-    {
-        Dispatcher.UIThread.Post(() =>
-        {
-            var statusText = this.FindControl<TextBlock>("StatusText");
-            if (statusText is null)
-            {
-                Console.Error.WriteLine($"[SplashWindow] StatusText not found in SetDebugMode");
-                return;
-            }
-            if (isDebugMode)
-            {
-                statusText.Text = "[Debug Mode] Splash Preview";
-            }
-        });
-    }
-
-    /// <summary>
-    /// 根据阶段名称解析进度值
-    /// </summary>
     private static int ResolveProgress(string stage)
     {
         return stage.ToLowerInvariant() switch
         {
             "initializing" => 10,
+            "settings" => 25,
             "update" => 30,
             "plugins" => 50,
-            "launch" => 70,
+            "ui" => 65,
+            "shell" => 80,
+            "activation" => 90,
             "ready" => 100,
             _ => 0
         };
     }
+
+    private static double EaseOutCubic(double value)
+    {
+        var inverse = 1d - value;
+        return 1d - (inverse * inverse * inverse);
+    }
 }

LanMountainDesktop.Launcher/Views/UpdateWindow.axaml

@@ -13,7 +13,7 @@
         Height="320"
         CanResize="False"
         WindowStartupLocation="CenterScreen"
-        SystemDecorations="None"
+        WindowDecorations="None"
         Background="{DynamicResource SolidBackgroundFillColorBaseBrush}"
         TransparencyLevelHint="None"
         Icon="/Assets/logo.ico">

LanMountainDesktop.PluginIsolation.Contracts/LanMountainDesktop.PluginIsolation.Contracts.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>1.0.0</Version>
+    <Version>5.0.0</Version>
     <PackageId>LanMountainDesktop.PluginIsolation.Contracts</PackageId>
     <IsPackable>true</IsPackable>
     <Authors>LanMountainDesktop</Authors>

LanMountainDesktop.PluginIsolation.Ipc/LanMountainDesktop.PluginIsolation.Ipc.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>1.0.0</Version>
+    <Version>5.0.0</Version>
     <PackageId>LanMountainDesktop.PluginIsolation.Ipc</PackageId>
     <IsPackable>true</IsPackable>
     <Authors>LanMountainDesktop</Authors>
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="dotnetCampus.Ipc" Version="2.0.0-alpha434" />
+    <PackageReference Include="dotnetCampus.Ipc" />
     <ProjectReference Include="..\LanMountainDesktop.PluginIsolation.Contracts\LanMountainDesktop.PluginIsolation.Contracts.csproj" />
   </ItemGroup>
 

LanMountainDesktop.PluginSdk/LanMountainDesktop.PluginSdk.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>4.0.2</Version>
+    <Version>5.0.0</Version>
     <PackageId>LanMountainDesktop.PluginSdk</PackageId>
     <IsPackable>true</IsPackable>
     <Authors>LanMountainDesktop</Authors>
@@ -19,13 +19,12 @@
 
   <ItemGroup>
     <Compile Remove="_build_verify_*\**\*.cs" />
-    <PackageReference Include="Avalonia" Version="11.3.12" />
-    <PackageReference Include="FluentAvaloniaUI" Version="2.5.0" ExcludeAssets="runtime" />
-    <PackageReference Include="FluentIcons.Avalonia" Version="2.0.320" ExcludeAssets="runtime" />
-    <PackageReference Include="FluentIcons.Avalonia.Fluent" Version="2.0.320" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
-    <PackageReference Include="dotnetCampus.Ipc" Version="2.0.0-alpha434" />
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="FluentAvaloniaUI" ExcludeAssets="runtime" />
+    <PackageReference Include="FluentIcons.Avalonia" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
+    <PackageReference Include="dotnetCampus.Ipc" />
     <ProjectReference Include="..\LanMountainDesktop.PluginIsolation.Contracts\LanMountainDesktop.PluginIsolation.Contracts.csproj" />
     <ProjectReference Include="..\LanMountainDesktop.Shared.Contracts\LanMountainDesktop.Shared.Contracts.csproj" />
     <ProjectReference Include="..\LanMountainDesktop.Shared.IPC\LanMountainDesktop.Shared.IPC.csproj" />

LanMountainDesktop.PluginSdk/PluginSdkInfo.cs

@@ -2,7 +2,7 @@ namespace LanMountainDesktop.PluginSdk;
 
 public static class PluginSdkInfo
 {
-    public const string ApiVersion = "4.0.2";
+    public const string ApiVersion = "5.0.0";
     public const string ManifestFileName = "plugin.json";
     public const string PackageFileExtension = ".laapp";
     public const string DataDirectoryName = "Data";

LanMountainDesktop.PluginSdk/README.md

@@ -16,7 +16,7 @@ Official SDK package for LanMountainDesktop plugins.
 
 ```xml
 <ItemGroup>
-  <PackageReference Include="LanMountainDesktop.PluginSdk" Version="4.0.1" />
+  <PackageReference Include="LanMountainDesktop.PluginSdk" Version="5.0.0" />
 </ItemGroup>
 ```
 

LanMountainDesktop.PluginTemplate/content/.template.config/template.json

@@ -47,7 +47,7 @@
     "pluginSdkVersion": {
       "type": "parameter",
       "datatype": "text",
-      "defaultValue": "4.0.2",
+      "defaultValue": "5.0.0",
       "description": "LanMountainDesktop.PluginSdk package version.",
       "replaces": "__PLUGIN_SDK_VERSION__"
     }

LanMountainDesktop.PluginTemplate/content/plugin.json

@@ -4,7 +4,7 @@
   "description": "__PLUGIN_DESCRIPTION__",
   "author": "__PLUGIN_AUTHOR__",
   "version": "1.0.0",
-  "apiVersion": "4.0.2",
+  "apiVersion": "5.0.0",
   "entranceAssembly": "LanMountainDesktop.PluginTemplate.dll",
   "sharedContracts": [],
   "runtime": {

LanMountainDesktop.Shared.Contracts/LanMountainDesktop.Shared.Contracts.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>0.0.0-dev</Version>
+    <Version>5.0.0</Version>
     <PackageId>LanMountainDesktop.Shared.Contracts</PackageId>
     <IsPackable>true</IsPackable>
     <Authors>LanMountainDesktop</Authors>
@@ -17,7 +17,7 @@
     <Copyright>Copyright (c) LanMountainDesktop Contributors</Copyright>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.12" />
+    <PackageReference Include="Avalonia" />
   </ItemGroup>
   <ItemGroup>
     <None Include="README.md" Pack="true" PackagePath="\" />

LanMountainDesktop.Shared.Contracts/Launcher/AppVersionProvider.cs

@@ -108,7 +108,9 @@ public static class AppVersionProvider
             return fallback;
         }
 
-        var normalized = rawValue.Split('+', 2, StringSplitOptions.TrimEntries)[0].Trim();
+        var normalized = TrimSurroundingQuotes(rawValue)
+            .Split('+', 2, StringSplitOptions.TrimEntries)[0]
+            .Trim();
         return string.IsNullOrWhiteSpace(normalized)
             ? fallback
             : normalized;
@@ -116,9 +118,10 @@ public static class AppVersionProvider
 
     public static string NormalizeCodename(string? rawValue, string fallback = DefaultCodename)
     {
-        return string.IsNullOrWhiteSpace(rawValue)
+        var normalized = TrimSurroundingQuotes(rawValue);
+        return string.IsNullOrWhiteSpace(normalized)
             ? fallback
-            : rawValue.Trim();
+            : normalized;
     }
 
     private static AppVersionInfo OverrideMissingParts(
@@ -158,17 +161,24 @@ public static class AppVersionProvider
 
         try
         {
-            var json = File.ReadAllText(versionFilePath);
-            var parsedInfo = JsonSerializer.Deserialize<AppVersionInfo>(json);
-            if (parsedInfo is null || string.IsNullOrWhiteSpace(parsedInfo.Version))
+            using var document = JsonDocument.Parse(File.ReadAllText(versionFilePath));
+            var root = document.RootElement;
+            if (root.ValueKind != JsonValueKind.Object)
             {
                 return false;
             }
 
+            var version = ReadStringProperty(root, nameof(AppVersionInfo.Version));
+            if (string.IsNullOrWhiteSpace(version))
+            {
+                return false;
+            }
+
+            var codename = ReadStringProperty(root, nameof(AppVersionInfo.Codename));
             info = new AppVersionInfo
             {
-                Version = NormalizeVersionText(parsedInfo.Version),
-                Codename = NormalizeCodename(parsedInfo.Codename)
+                Version = NormalizeVersionText(version),
+                Codename = NormalizeCodename(codename)
             };
             return true;
         }
@@ -359,4 +369,43 @@ public static class AppVersionProvider
             return null;
         }
     }
+
+    private static string? ReadStringProperty(JsonElement root, string propertyName)
+    {
+        foreach (var property in root.EnumerateObject())
+        {
+            if (string.Equals(property.Name, propertyName, StringComparison.OrdinalIgnoreCase) &&
+                property.Value.ValueKind == JsonValueKind.String)
+            {
+                return property.Value.GetString();
+            }
+        }
+
+        return null;
+    }
+
+    private static string TrimSurroundingQuotes(string? rawValue)
+    {
+        if (string.IsNullOrWhiteSpace(rawValue))
+        {
+            return string.Empty;
+        }
+
+        var normalized = rawValue.Trim();
+        while (normalized.Length >= 2)
+        {
+            var first = normalized[0];
+            var last = normalized[^1];
+            if ((first == '\'' && last == '\'') ||
+                (first == '"' && last == '"'))
+            {
+                normalized = normalized[1..^1].Trim();
+                continue;
+            }
+
+            break;
+        }
+
+        return normalized;
+    }
 }

LanMountainDesktop.Shared.Contracts/Launcher/LoadingState.cs

@@ -1,231 +1,85 @@
 namespace LanMountainDesktop.Shared.Contracts.Launcher;
 
-/// <summary>
-/// 加载项类型
-/// </summary>
 public enum LoadingItemType
 {
-    /// <summary>
-    /// 系统初始化
-    /// </summary>
     System,
-    
-    /// <summary>
-    /// 设置加载
-    /// </summary>
     Settings,
-    
-    /// <summary>
-    /// 插件
-    /// </summary>
     Plugin,
-    
-    /// <summary>
-    /// 组件
-    /// </summary>
     Component,
-    
-    /// <summary>
-    /// 资源
-    /// </summary>
     Resource,
-    
-    /// <summary>
-    /// 数据
-    /// </summary>
     Data,
-    
-    /// <summary>
-    /// 网络请求
-    /// </summary>
     Network,
-    
-    /// <summary>
-    /// 其他
-    /// </summary>
     Other
 }
 
-/// <summary>
-/// 加载状态
-/// </summary>
 public enum LoadingState
 {
-    /// <summary>
-    /// 等待中
-    /// </summary>
     Pending,
-    
-    /// <summary>
-    /// 进行中
-    /// </summary>
     InProgress,
-    
-    /// <summary>
-    /// 已完成
-    /// </summary>
     Completed,
-    
-    /// <summary>
-    /// 失败
-    /// </summary>
+    Delayed,
     Failed,
-    
-    /// <summary>
-    /// 已取消
-    /// </summary>
     Cancelled,
-    
-    /// <summary>
-    /// 超时
-    /// </summary>
     Timeout
 }
 
-/// <summary>
-/// 加载项信息
-/// </summary>
 public record LoadingItem
 {
-    /// <summary>
-    /// 加载项唯一标识
-    /// </summary>
     public required string Id { get; init; }
-    
-    /// <summary>
-    /// 加载项类型
-    /// </summary>
+
     public LoadingItemType Type { get; init; }
-    
-    /// <summary>
-    /// 加载项名称
-    /// </summary>
+
     public required string Name { get; init; }
-    
-    /// <summary>
-    /// 加载项描述
-    /// </summary>
+
     public string? Description { get; init; }
-    
-    /// <summary>
-    /// 当前状态
-    /// </summary>
+
     public LoadingState State { get; init; }
-    
-    /// <summary>
-    /// 进度百分比 (0-100)
-    /// </summary>
+
     public int ProgressPercent { get; init; }
-    
-    /// <summary>
-    /// 状态消息
-    /// </summary>
+
     public string? Message { get; init; }
-    
-    /// <summary>
-    /// 错误信息（当 State 为 Failed 时）
-    /// </summary>
+
     public string? ErrorMessage { get; init; }
-    
-    /// <summary>
-    /// 开始时间
-    /// </summary>
+
     public DateTimeOffset? StartTime { get; init; }
-    
-    /// <summary>
-    /// 结束时间
-    /// </summary>
+
     public DateTimeOffset? EndTime { get; init; }
-    
-    /// <summary>
-    /// 预计剩余时间（秒）
-    /// </summary>
+
     public int? EstimatedRemainingSeconds { get; init; }
-    
-    /// <summary>
-    /// 子加载项
-    /// </summary>
+
     public List<LoadingItem>? Children { get; init; }
-    
-    /// <summary>
-    /// 额外数据
-    /// </summary>
+
     public Dictionary<string, string>? Metadata { get; init; }
-    
-    /// <summary>
-    /// 时间戳
-    /// </summary>
+
     public DateTimeOffset Timestamp { get; init; } = DateTimeOffset.UtcNow;
 }
 
-/// <summary>
-/// 加载状态更新消息
-/// </summary>
 public record LoadingStateMessage
 {
-    /// <summary>
-    /// 当前启动阶段
-    /// </summary>
     public StartupStage Stage { get; init; }
-    
-    /// <summary>
-    /// 整体进度百分比 (0-100)
-    /// </summary>
+
     public int OverallProgressPercent { get; init; }
-    
-    /// <summary>
-    /// 当前活动的加载项
-    /// </summary>
+
     public List<LoadingItem> ActiveItems { get; init; } = new();
-    
-    /// <summary>
-    /// 已完成的加载项数量
-    /// </summary>
+
     public int CompletedCount { get; init; }
-    
-    /// <summary>
-    /// 总加载项数量
-    /// </summary>
+
     public int TotalCount { get; init; }
-    
-    /// <summary>
-    /// 状态消息
-    /// </summary>
+
     public string? Message { get; init; }
-    
-    /// <summary>
-    /// 是否有错误
-    /// </summary>
+
     public bool HasErrors { get; init; }
-    
-    /// <summary>
-    /// 错误消息列表
-    /// </summary>
+
     public List<string>? ErrorMessages { get; init; }
-    
-    /// <summary>
-    /// 时间戳
-    /// </summary>
+
     public DateTimeOffset Timestamp { get; init; } = DateTimeOffset.UtcNow;
 }
 
-/// <summary>
-/// 详细的加载进度消息（用于实时更新）
-/// </summary>
 public record DetailedProgressMessage : StartupProgressMessage
 {
-    /// <summary>
-    /// 当前加载项
-    /// </summary>
     public LoadingItem? CurrentItem { get; init; }
-    
-    /// <summary>
-    /// 所有加载项
-    /// </summary>
+
     public List<LoadingItem>? AllItems { get; init; }
-    
-    /// <summary>
-    /// 是否为主要更新
-    /// </summary>
+
     public bool IsMajorUpdate { get; init; }
 }

LanMountainDesktop.Shared.Contracts/Launcher/StartupVisualPreferences.cs

@@ -0,0 +1,91 @@
+using System.Text.Json;
+
+namespace LanMountainDesktop.Shared.Contracts.Launcher;
+
+public enum StartupVisualMode
+{
+    Fade,
+    StaticSplash,
+    SlideSplash
+}
+
+public readonly record struct StartupVisualPreferences(
+    bool EnableFadeTransition,
+    bool EnableSlideTransition)
+{
+    public static StartupVisualPreferences Default => new(true, false);
+
+    public StartupVisualPreferences Normalize()
+    {
+        if (EnableSlideTransition)
+        {
+            return new StartupVisualPreferences(false, true);
+        }
+
+        return new StartupVisualPreferences(EnableFadeTransition, false);
+    }
+
+    public StartupVisualMode Mode => Normalize() switch
+    {
+        { EnableSlideTransition: true } => StartupVisualMode.SlideSplash,
+        { EnableFadeTransition: false } => StartupVisualMode.StaticSplash,
+        _ => StartupVisualMode.Fade
+    };
+}
+
+public static class StartupVisualPreferencesResolver
+{
+    public static StartupVisualPreferences Resolve(string? settingsPath = null)
+    {
+        var resolvedPath = string.IsNullOrWhiteSpace(settingsPath)
+            ? GetDefaultSettingsPath()
+            : settingsPath!;
+
+        if (!File.Exists(resolvedPath))
+        {
+            return StartupVisualPreferences.Default;
+        }
+
+        try
+        {
+            using var stream = File.OpenRead(resolvedPath);
+            using var document = JsonDocument.Parse(stream);
+            var root = document.RootElement;
+
+            var enableFade = TryGetBoolean(root, "enableFadeTransition") ?? true;
+            var enableSlide = TryGetBoolean(root, "enableSlideTransition") ?? false;
+            return FromFlags(enableFade, enableSlide);
+        }
+        catch
+        {
+            return StartupVisualPreferences.Default;
+        }
+    }
+
+    public static StartupVisualPreferences FromFlags(bool enableFadeTransition, bool enableSlideTransition)
+    {
+        return new StartupVisualPreferences(enableFadeTransition, enableSlideTransition).Normalize();
+    }
+
+    public static string GetDefaultSettingsPath()
+    {
+        var appData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+        return Path.Combine(appData, "LanMountainDesktop", "settings.json");
+    }
+
+    private static bool? TryGetBoolean(JsonElement root, string propertyName)
+    {
+        if (!root.TryGetProperty(propertyName, out var property))
+        {
+            return null;
+        }
+
+        return property.ValueKind switch
+        {
+            JsonValueKind.True => true,
+            JsonValueKind.False => false,
+            JsonValueKind.String when bool.TryParse(property.GetString(), out var value) => value,
+            _ => null
+        };
+    }
+}

LanMountainDesktop.Shared.IPC/Abstractions/Services/IPublicShellControlService.cs

@@ -5,8 +5,16 @@ namespace LanMountainDesktop.Shared.IPC.Abstractions.Services;
 [IpcPublic(IgnoresIpcException = true)]
 public interface IPublicShellControlService
 {
+    Task<PublicShellStatus> GetShellStatusAsync();
+
     Task<bool> ActivateMainWindowAsync();
 
+    Task<PublicShellActivationResult> ActivateMainWindowWithStatusAsync();
+
+    Task<PublicTrayStatus> EnsureTrayReadyAsync();
+
+    Task<PublicTaskbarStatus> EnsureTaskbarEntryAsync();
+
     Task<bool> OpenSettingsAsync(string? pageTag = null);
 
     Task<bool> RestartAsync();

LanMountainDesktop.Shared.IPC/Abstractions/Services/PublicShellStatus.cs

@@ -0,0 +1,36 @@
+namespace LanMountainDesktop.Shared.IPC.Abstractions.Services;
+
+public sealed record PublicShellStatus(
+    int ProcessId,
+    DateTimeOffset StartedAtUtc,
+    string LaunchSource,
+    string ShellState,
+    bool MainWindowCreated,
+    bool MainWindowVisible,
+    bool MainWindowOpened,
+    bool DesktopVisible,
+    bool PublicIpcReady,
+    PublicTrayStatus Tray,
+    PublicTaskbarStatus Taskbar);
+
+public sealed record PublicTrayStatus(
+    string State,
+    bool IsReady,
+    bool HasIcon,
+    bool HasMenu,
+    bool IsVisible,
+    int ConsecutiveRecoveryFailures);
+
+public sealed record PublicTaskbarStatus(
+    bool RequestedBySettings,
+    bool MainWindowExists,
+    bool MainWindowShowInTaskbar,
+    bool MainWindowVisible,
+    bool MainWindowMinimized,
+    bool IsUsable);
+
+public sealed record PublicShellActivationResult(
+    bool Accepted,
+    string Code,
+    string Message,
+    PublicShellStatus Status);

LanMountainDesktop.Shared.IPC/LanMountainDesktop.Shared.IPC.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>1.0.0</Version>
+    <Version>5.0.0</Version>
     <PackageId>LanMountainDesktop.Shared.IPC</PackageId>
     <IsPackable>true</IsPackable>
     <Authors>LanMountainDesktop</Authors>
@@ -17,8 +17,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="dotnetCampus.Ipc" Version="2.0.0-alpha434" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
+    <PackageReference Include="dotnetCampus.Ipc" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <ProjectReference Include="..\LanMountainDesktop.Shared.Contracts\LanMountainDesktop.Shared.Contracts.csproj" />
   </ItemGroup>
 

LanMountainDesktop.Tests/AppVersionProviderTests.cs

@@ -0,0 +1,83 @@
+using LanMountainDesktop.Shared.Contracts.Launcher;
+using Xunit;
+
+namespace LanMountainDesktop.Tests;
+
+public sealed class AppVersionProviderTests
+{
+    [Fact]
+    public void ResolveFromPackageRoot_WhenVersionJsonExists_UsesVersionFile()
+    {
+        using var temp = TemporaryPackage.Create();
+        temp.CreateDeployment("app-0.8.5.7", """
+        {"Version":"0.8.5.7","Codename":"Administrate"}
+        """);
+
+        var info = AppVersionProvider.ResolveFromPackageRoot(temp.Root, "LanMountainDesktop.exe");
+
+        Assert.Equal("0.8.5.7", info.Version);
+        Assert.Equal("Administrate", info.Codename);
+    }
+
+    [Fact]
+    public void ResolveFromPackageRoot_WhenVersionJsonIsMissing_FallsBackToDeploymentDirectory()
+    {
+        using var temp = TemporaryPackage.Create();
+        temp.CreateDeployment("app-0.8.5.7");
+
+        var info = AppVersionProvider.ResolveFromPackageRoot(temp.Root, "LanMountainDesktop.exe");
+
+        Assert.Equal("0.8.5.7", info.Version);
+    }
+
+    [Fact]
+    public void ResolveFromPackageRoot_WhenVersionJsonContainsQuotedValues_NormalizesValues()
+    {
+        using var temp = TemporaryPackage.Create();
+        temp.CreateDeployment("app-1.2.3", """
+        {"Version":"'1.2.3'","Codename":"'Administrate'"}
+        """);
+
+        var info = AppVersionProvider.ResolveFromPackageRoot(temp.Root, "LanMountainDesktop.exe");
+
+        Assert.Equal("1.2.3", info.Version);
+        Assert.Equal("Administrate", info.Codename);
+    }
+
+    private sealed class TemporaryPackage : IDisposable
+    {
+        private TemporaryPackage(string root)
+        {
+            Root = root;
+        }
+
+        public string Root { get; }
+
+        public static TemporaryPackage Create()
+        {
+            var root = Path.Combine(Path.GetTempPath(), "LanMountainDesktop.VersionTests", Guid.NewGuid().ToString("N"));
+            Directory.CreateDirectory(root);
+            return new TemporaryPackage(root);
+        }
+
+        public void CreateDeployment(string name, string? versionJson = null)
+        {
+            var deployment = Path.Combine(Root, name);
+            Directory.CreateDirectory(deployment);
+            File.WriteAllText(Path.Combine(deployment, "LanMountainDesktop.exe"), string.Empty);
+            File.WriteAllText(Path.Combine(deployment, ".current"), string.Empty);
+            if (versionJson is not null)
+            {
+                File.WriteAllText(Path.Combine(deployment, "version.json"), versionJson);
+            }
+        }
+
+        public void Dispose()
+        {
+            if (Directory.Exists(Root))
+            {
+                Directory.Delete(Root, recursive: true);
+            }
+        }
+    }
+}

LanMountainDesktop.Tests/ComponentSettingsServiceTests.cs

@@ -1,4 +1,3 @@
-using System.Text.Json;
 using LanMountainDesktop.Models;
 using LanMountainDesktop.Services;
 using Xunit;
@@ -34,10 +33,14 @@ public sealed class ComponentSettingsServiceTests
         Assert.Equal("Sweep", snapshot.DesktopClockSecondHandMode);
         Assert.Single(snapshot.ImportedClassSchedules);
 
-        using var document = JsonDocument.Parse(File.ReadAllText(sandbox.SettingsPath));
-        Assert.True(document.RootElement.TryGetProperty("defaultSettings", out var defaultSettings));
-        Assert.Equal("Sweep", defaultSettings.GetProperty("desktopClockSecondHandMode").GetString());
-        Assert.False(document.RootElement.TryGetProperty("DesktopClockSecondHandMode", out _));
+        Assert.True(File.Exists(sandbox.DatabasePath));
+        Assert.False(File.Exists(sandbox.SettingsPath));
+        Assert.True(File.Exists(sandbox.SettingsBackupPath));
+
+        ComponentSettingsService.ResetCacheForTests();
+        var reloadedService = sandbox.CreateService();
+        var reloaded = reloadedService.Load();
+        Assert.Equal("Sweep", reloaded.DesktopClockSecondHandMode);
     }
 
     [Fact]
@@ -72,11 +75,16 @@ public sealed class ComponentSettingsServiceTests
         Assert.Equal("Sweep", snapshot.DesktopClockSecondHandMode);
         Assert.True(pluginSettings.SampleFlag);
 
-        using var document = JsonDocument.Parse(File.ReadAllText(sandbox.SettingsPath));
-        Assert.True(document.RootElement.TryGetProperty("instanceSettings", out var instanceSettings));
-        Assert.True(instanceSettings.TryGetProperty("DesktopClock::clock-2x2", out var clockSettings));
-        Assert.Equal("Sweep", clockSettings.GetProperty("desktopClockSecondHandMode").GetString());
-        Assert.False(document.RootElement.TryGetProperty("InstanceSettings", out _));
+        Assert.True(File.Exists(sandbox.DatabasePath));
+        Assert.False(File.Exists(sandbox.SettingsPath));
+        Assert.True(File.Exists(sandbox.SettingsBackupPath));
+
+        ComponentSettingsService.ResetCacheForTests();
+        var reloadedService = sandbox.CreateService();
+        var reloadedSnapshot = reloadedService.LoadForComponent("DesktopClock", "clock-2x2");
+        var reloadedPluginSettings = reloadedService.LoadPluginSettings<SamplePluginSettings>("DesktopClock", "clock-2x2");
+        Assert.Equal("Sweep", reloadedSnapshot.DesktopClockSecondHandMode);
+        Assert.True(reloadedPluginSettings.SampleFlag);
     }
 
     [Fact]
@@ -132,12 +140,7 @@ public sealed class ComponentSettingsServiceTests
         Assert.True(pluginSettings.SampleFlag);
         Assert.Equal("schedule-settings", pluginSettings.Title);
 
-        using var document = JsonDocument.Parse(File.ReadAllText(sandbox.SettingsPath));
-        Assert.True(document.RootElement.TryGetProperty("instanceSettings", out var instanceSettings));
-        Assert.True(instanceSettings.TryGetProperty("DesktopClock::clock-2x2", out _));
-        Assert.True(instanceSettings.TryGetProperty("DesktopClassSchedule::class-schedule-2x2", out _));
-        Assert.True(document.RootElement.TryGetProperty("pluginSettings", out var pluginSettingsNode));
-        Assert.True(pluginSettingsNode.TryGetProperty("DesktopClassSchedule::class-schedule-2x2", out _));
+        Assert.True(File.Exists(sandbox.DatabasePath));
     }
 
     private sealed class ComponentSettingsSandbox : IDisposable
@@ -155,6 +158,10 @@ public sealed class ComponentSettingsServiceTests
 
         public string SettingsPath => Path.Combine(_directoryPath, "component-settings.json");
 
+        public string SettingsBackupPath => $"{SettingsPath}.migrated.bak";
+
+        public string DatabasePath => Path.Combine(_directoryPath, "component-state.db");
+
         public ComponentSettingsService CreateService()
         {
             return new ComponentSettingsService(_directoryPath);

LanMountainDesktop.Tests/DeploymentLocatorTests.cs

@@ -0,0 +1,43 @@
+using LanMountainDesktop.Launcher;
+using LanMountainDesktop.Launcher.Services;
+using Xunit;
+
+namespace LanMountainDesktop.Tests;
+
+[Collection("LauncherDebugSettingsStore")]
+public sealed class DeploymentLocatorTests : IDisposable
+{
+    private readonly string _appRoot;
+    private readonly string _configRoot;
+
+    public DeploymentLocatorTests()
+    {
+        var testRoot = Path.Combine(Path.GetTempPath(), "LanMountainDesktop.DeploymentLocatorTests", Guid.NewGuid().ToString("N"));
+        _appRoot = Path.Combine(testRoot, "app-root");
+        _configRoot = Path.Combine(testRoot, "config");
+        Directory.CreateDirectory(_appRoot);
+        Directory.CreateDirectory(_configRoot);
+        LauncherDebugSettingsStore.ConfigBaseDirectoryOverride = _configRoot;
+    }
+
+    [Fact]
+    public void ResolveHostExecutable_WhenSavedDebugPathIsMalformed_DoesNotThrow()
+    {
+        LauncherDebugSettingsStore.Save(new LauncherDebugSettings(true, "bad\0path"));
+
+        var locator = new DeploymentLocator(_appRoot);
+        var result = locator.ResolveHostExecutable(CommandContext.FromArgs(["launch", "--debug"]));
+
+        Assert.NotEqual("debug_saved_custom_path", result.ResolutionSource);
+    }
+
+    public void Dispose()
+    {
+        LauncherDebugSettingsStore.ConfigBaseDirectoryOverride = null;
+        var testRoot = Directory.GetParent(_appRoot)?.FullName;
+        if (!string.IsNullOrWhiteSpace(testRoot) && Directory.Exists(testRoot))
+        {
+            Directory.Delete(testRoot, recursive: true);
+        }
+    }
+}

LanMountainDesktop.Tests/HostLaunchPlanBuilderTests.cs

@@ -0,0 +1,100 @@
+using LanMountainDesktop.Launcher;
+using LanMountainDesktop.Launcher.Services;
+using LanMountainDesktop.Shared.Contracts.Launcher;
+using Xunit;
+
+namespace LanMountainDesktop.Tests;
+
+public sealed class HostLaunchPlanBuilderTests : IDisposable
+{
+    private readonly string _testRoot;
+
+    public HostLaunchPlanBuilderTests()
+    {
+        _testRoot = Path.Combine(
+            Path.GetTempPath(),
+            "LanMountainDesktop.HostLaunchPlanTests",
+            Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(_testRoot);
+    }
+
+    [Fact]
+    public void Build_UsesPackageRootAsWorkingDirectory_ForPublishedDeployment()
+    {
+        var packageRoot = Path.Combine(_testRoot, "package-root");
+        var deployment = CreateDeployment(packageRoot, "app-0.8.5.7");
+        var resultPath = Path.Combine(_testRoot, "launcher-result.json");
+        var context = CommandContext.FromArgs(
+        [
+            "launch",
+            "--app-root", packageRoot,
+            "--result", resultPath,
+            "--launch-source", "postinstall",
+            "--custom-host-arg", "custom-value"
+        ]);
+        var locator = new DeploymentLocator(packageRoot);
+        var resolution = locator.ResolveHostExecutable(context);
+
+        var plan = HostLaunchPlanBuilder.Build(context, locator, resolution);
+
+        Assert.Equal(Path.GetFullPath(packageRoot), plan.PackageRoot);
+        Assert.Equal(Path.GetFullPath(packageRoot), plan.WorkingDirectory);
+        Assert.Equal(Path.Combine(deployment, GetExecutableName()), plan.HostPath);
+        Assert.Contains("--launch-source", plan.Arguments);
+        Assert.Contains("postinstall", plan.Arguments);
+        Assert.Contains("--custom-host-arg", plan.Arguments);
+        Assert.Contains("custom-value", plan.Arguments);
+        Assert.DoesNotContain("--app-root", plan.Arguments);
+        Assert.DoesNotContain(packageRoot, plan.Arguments);
+        Assert.DoesNotContain("--result", plan.Arguments);
+        Assert.DoesNotContain(resultPath, plan.Arguments);
+        Assert.Contains($"--{LauncherIpcConstants.PackageRootEnvVar}={Path.GetFullPath(packageRoot)}", plan.Arguments);
+    }
+
+    [Fact]
+    public void Build_KeepsPathsWithSpacesAsSingleArgumentListTokens()
+    {
+        var packageRoot = Path.Combine(_testRoot, "package root with spaces");
+        CreateDeployment(packageRoot, "app-0.8.5.7");
+        var context = CommandContext.FromArgs(["launch", "--app-root", packageRoot]);
+        var locator = new DeploymentLocator(packageRoot);
+        var resolution = locator.ResolveHostExecutable(context);
+
+        var plan = HostLaunchPlanBuilder.Build(context, locator, resolution);
+
+        var packageRootArgument = $"--{LauncherIpcConstants.PackageRootEnvVar}={Path.GetFullPath(packageRoot)}";
+        Assert.Contains(packageRootArgument, plan.Arguments);
+        Assert.Equal(Path.GetFullPath(packageRoot), plan.EnvironmentVariables[LauncherIpcConstants.PackageRootEnvVar]);
+        Assert.DoesNotContain(plan.Arguments, argument => argument.StartsWith("\"", StringComparison.Ordinal));
+        Assert.Equal(Path.GetFullPath(packageRoot), plan.WorkingDirectory);
+    }
+
+    private static string CreateDeployment(string packageRoot, string deploymentName)
+    {
+        var deployment = Path.Combine(packageRoot, deploymentName);
+        Directory.CreateDirectory(deployment);
+        File.WriteAllText(Path.Combine(deployment, GetExecutableName()), string.Empty);
+        File.WriteAllText(Path.Combine(deployment, ".current"), string.Empty);
+        File.WriteAllText(
+            Path.Combine(deployment, "version.json"),
+            """
+            {"Version":"0.8.5.7","Codename":"Administrate"}
+            """);
+        return deployment;
+    }
+
+    private static string GetExecutableName()
+    {
+        return OperatingSystem.IsWindows()
+            ? "LanMountainDesktop.exe"
+            : "LanMountainDesktop";
+    }
+
+    public void Dispose()
+    {
+        if (Directory.Exists(_testRoot))
+        {
+            Directory.Delete(_testRoot, recursive: true);
+        }
+    }
+}

LanMountainDesktop.Tests/HostShutdownGateTests.cs

@@ -0,0 +1,48 @@
+using LanMountainDesktop.Services;
+using Xunit;
+
+namespace LanMountainDesktop.Tests;
+
+public sealed class HostShutdownGateTests
+{
+    [Fact]
+    public void Submit_WhenFirstExitRequest_AcceptsAndRecordsExit()
+    {
+        var gate = new HostShutdownGate();
+
+        var submission = gate.Submit(HostShutdownMode.Exit);
+
+        Assert.True(submission.Accepted);
+        Assert.True(submission.IsFirstSubmission);
+        Assert.Equal(HostShutdownMode.Exit, submission.EffectiveMode);
+        Assert.True(gate.IsShutdownRequested);
+        Assert.Equal(HostShutdownMode.Exit, gate.EffectiveMode);
+    }
+
+    [Fact]
+    public void Submit_WhenDuplicateSameMode_AcceptsButDoesNotExecuteAgain()
+    {
+        var gate = new HostShutdownGate();
+        gate.Submit(HostShutdownMode.Exit);
+
+        var duplicate = gate.Submit(HostShutdownMode.Exit);
+
+        Assert.True(duplicate.Accepted);
+        Assert.False(duplicate.IsFirstSubmission);
+        Assert.Equal(HostShutdownMode.Exit, duplicate.EffectiveMode);
+    }
+
+    [Fact]
+    public void Submit_WhenExitArrivesAfterRestart_DoesNotOverwriteRestart()
+    {
+        var gate = new HostShutdownGate();
+        gate.Submit(HostShutdownMode.Restart);
+
+        var conflictingExit = gate.Submit(HostShutdownMode.Exit);
+
+        Assert.False(conflictingExit.Accepted);
+        Assert.False(conflictingExit.IsFirstSubmission);
+        Assert.Equal(HostShutdownMode.Restart, conflictingExit.EffectiveMode);
+        Assert.Equal(HostShutdownMode.Restart, gate.EffectiveMode);
+    }
+}

LanMountainDesktop.Tests/LanMountainDesktop.Tests.csproj

@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

LanMountainDesktop.Tests/LauncherCoordinatorRegistryTests.cs

@@ -0,0 +1,126 @@
+using System.Text.Json.Nodes;
+using LanMountainDesktop.Launcher.Models;
+using LanMountainDesktop.Launcher.Services;
+using LanMountainDesktop.Shared.Contracts.Launcher;
+using Xunit;
+
+namespace LanMountainDesktop.Tests;
+
+public sealed class LauncherCoordinatorRegistryTests
+{
+    [Fact]
+    public void TryReserveCoordinator_WhenActiveCoordinatorExists_ReturnsActiveAttempt()
+    {
+        using var temp = TemporaryAttemptState.Create();
+        var firstRegistry = new StartupAttemptRegistry(temp.StatePath);
+        var secondRegistry = new StartupAttemptRegistry(temp.StatePath);
+
+        Assert.True(firstRegistry.TryReserveCoordinator(
+            "normal",
+            "Foreground",
+            "pipe-a",
+            out var firstAttempt,
+            out var firstActive));
+        Assert.Null(firstActive);
+
+        Assert.False(secondRegistry.TryReserveCoordinator(
+            "normal",
+            "Foreground",
+            "pipe-b",
+            out _,
+            out var secondActive));
+
+        Assert.NotNull(secondActive);
+        Assert.Equal(firstAttempt.AttemptId, secondActive.AttemptId);
+        Assert.Equal("pipe-a", secondActive.CoordinatorPipeName);
+        Assert.Equal(Environment.ProcessId, secondActive.CoordinatorPid);
+    }
+
+    [Fact]
+    public void TryReserveCoordinator_WhenHeartbeatIsStale_TakesOverAttempt()
+    {
+        using var temp = TemporaryAttemptState.Create();
+        var firstRegistry = new StartupAttemptRegistry(temp.StatePath);
+        var secondRegistry = new StartupAttemptRegistry(temp.StatePath);
+
+        Assert.True(firstRegistry.TryReserveCoordinator(
+            "normal",
+            "Foreground",
+            "pipe-a",
+            out var firstAttempt,
+            out _));
+        temp.SetHeartbeat(DateTimeOffset.UtcNow.AddSeconds(-30));
+
+        Assert.True(secondRegistry.TryReserveCoordinator(
+            "normal",
+            "Foreground",
+            "pipe-b",
+            out var reservedAttempt,
+            out var activeAttempt));
+
+        Assert.Null(activeAttempt);
+        Assert.Equal(firstAttempt.AttemptId, reservedAttempt.AttemptId);
+        Assert.Equal("pipe-b", reservedAttempt.CoordinatorPipeName);
+    }
+
+    [Fact]
+    public void AssignOwnedHostProcess_ClearsReservedBeforeHostStart()
+    {
+        using var temp = TemporaryAttemptState.Create();
+        var registry = new StartupAttemptRegistry(temp.StatePath);
+
+        Assert.True(registry.TryReserveCoordinator(
+            "normal",
+            "Foreground",
+            "pipe-a",
+            out var reservedAttempt,
+            out _));
+        Assert.True(reservedAttempt.ReservedBeforeHostStart);
+
+        var assignedAttempt = registry.AssignOwnedHostProcess(
+            Environment.ProcessId,
+            StartupStage.Initializing,
+            "host assigned");
+
+        Assert.Equal(Environment.ProcessId, assignedAttempt.HostPid);
+        Assert.False(assignedAttempt.ReservedBeforeHostStart);
+    }
+
+    private sealed class TemporaryAttemptState : IDisposable
+    {
+        private TemporaryAttemptState(string directory)
+        {
+            Directory = directory;
+            StatePath = Path.Combine(directory, "startup-attempt.json");
+        }
+
+        public string Directory { get; }
+
+        public string StatePath { get; }
+
+        public static TemporaryAttemptState Create()
+        {
+            var directory = Path.Combine(
+                Path.GetTempPath(),
+                "LanMountainDesktop.LauncherCoordinatorTests",
+                Guid.NewGuid().ToString("N"));
+            System.IO.Directory.CreateDirectory(directory);
+            return new TemporaryAttemptState(directory);
+        }
+
+        public void SetHeartbeat(DateTimeOffset heartbeatAtUtc)
+        {
+            var node = JsonNode.Parse(File.ReadAllText(StatePath))!.AsObject();
+            node["heartbeatAtUtc"] = heartbeatAtUtc.ToString("O");
+            File.WriteAllText(StatePath, node.ToJsonString());
+        }
+
+        public void Dispose()
+        {
+            if (System.IO.Directory.Exists(Directory))
+            {
+                System.IO.Directory.Delete(Directory, recursive: true);
+            }
+        }
+    }
+}

LanMountainDesktop.Tests/LauncherDebugSettingsStoreTests.cs

@@ -0,0 +1,50 @@
+using LanMountainDesktop.Launcher.Services;
+using Xunit;
+
+namespace LanMountainDesktop.Tests;
+
+[Collection("LauncherDebugSettingsStore")]
+public sealed class LauncherDebugSettingsStoreTests : IDisposable
+{
+    private readonly string _tempDirectory;
+
+    public LauncherDebugSettingsStoreTests()
+    {
+        _tempDirectory = Path.Combine(Path.GetTempPath(), "LanMountainDesktop.DebugSettingsTests", Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(_tempDirectory);
+        LauncherDebugSettingsStore.ConfigBaseDirectoryOverride = _tempDirectory;
+    }
+
+    [Fact]
+    public void Load_WhenOnlyLegacyFilesExist_ReadsLegacySettings()
+    {
+        var customPath = Path.Combine(_tempDirectory, "legacy-host.exe");
+        File.WriteAllText(Path.Combine(_tempDirectory, "devmode.config"), "1");
+        File.WriteAllText(Path.Combine(_tempDirectory, "custom-host-path.config"), customPath);
+
+        var settings = LauncherDebugSettingsStore.Load();
+
+        Assert.True(settings.DevModeEnabled);
+        Assert.Equal(customPath, settings.CustomHostPath);
+    }
+
+    [Fact]
+    public void Save_WritesNewSettingsFiles()
+    {
+        var customPath = Path.Combine(_tempDirectory, "host.exe");
+
+        LauncherDebugSettingsStore.Save(new LauncherDebugSettings(true, customPath));
+
+        Assert.Equal("True", File.ReadAllText(Path.Combine(_tempDirectory, "dev-mode.flag")).Trim());
+        Assert.Equal(customPath, File.ReadAllText(Path.Combine(_tempDirectory, "custom-host-path.txt")).Trim());
+    }
+
+    public void Dispose()
+    {
+        LauncherDebugSettingsStore.ConfigBaseDirectoryOverride = null;
+        if (Directory.Exists(_tempDirectory))
+        {
+            Directory.Delete(_tempDirectory, recursive: true);
+        }
+    }
+}

LanMountainDesktop.Tests/OobeStateServiceTests.cs

@@ -118,7 +118,7 @@ public sealed class OobeStateServiceTests : IDisposable
             executionSnapshot: executionSnapshot ?? new LauncherExecutionSnapshot(false, "tester", "S-1-5-test"));
     }
 
-    private string GetStatePath() => Path.Combine(_tempRoot, ".launcher", "state", "oobe-state.json");
+    private string GetStatePath() => Path.Combine(_tempRoot, "Launcher", "state", "oobe-state.json");
 
     private string GetLegacyMarkerPath() => Path.Combine(_tempRoot, ".launcher", "state", "first_run_completed");
 }

LanMountainDesktop.Tests/StartupVisualPreferencesTests.cs

@@ -0,0 +1,57 @@
+using LanMountainDesktop.Shared.Contracts.Launcher;
+using Xunit;
+
+namespace LanMountainDesktop.Tests;
+
+public sealed class StartupVisualPreferencesTests
+{
+    [Fact]
+    public void FromFlags_WhenSlideEnabled_DisablesFadeAndUsesSlideMode()
+    {
+        var preferences = StartupVisualPreferencesResolver.FromFlags(
+            enableFadeTransition: true,
+            enableSlideTransition: true);
+
+        Assert.False(preferences.EnableFadeTransition);
+        Assert.True(preferences.EnableSlideTransition);
+        Assert.Equal(StartupVisualMode.SlideSplash, preferences.Mode);
+    }
+
+    [Fact]
+    public void FromFlags_WhenFadeDisabledAndSlideDisabled_UsesStaticSplashMode()
+    {
+        var preferences = StartupVisualPreferencesResolver.FromFlags(
+            enableFadeTransition: false,
+            enableSlideTransition: false);
+
+        Assert.False(preferences.EnableFadeTransition);
+        Assert.False(preferences.EnableSlideTransition);
+        Assert.Equal(StartupVisualMode.StaticSplash, preferences.Mode);
+    }
+
+    [Fact]
+    public void Resolve_WhenFadeSettingMissing_DefaultsToFadeEnabled()
+    {
+        var tempDirectory = Path.Combine(Path.GetTempPath(), "LanMountainDesktop.StartupVisualTests", Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(tempDirectory);
+        var settingsPath = Path.Combine(tempDirectory, "settings.json");
+        File.WriteAllText(settingsPath, """
+        {
+          "enableSlideTransition": false
+        }
+        """);
+
+        try
+        {
+            var preferences = StartupVisualPreferencesResolver.Resolve(settingsPath);
+
+            Assert.True(preferences.EnableFadeTransition);
+            Assert.False(preferences.EnableSlideTransition);
+            Assert.Equal(StartupVisualMode.Fade, preferences.Mode);
+        }
+        finally
+        {
+            Directory.Delete(tempDirectory, recursive: true);
+        }
+    }
+}

LanMountainDesktop/App.axaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -14,7 +14,6 @@ using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.Threading;
-using AvaloniaWebView;
 using LanMountainDesktop.ComponentSystem;
 using LanMountainDesktop.DesktopHost;
 using LanMountainDesktop.Models;
@@ -56,6 +55,7 @@ public partial class App : Application
     private readonly LocalizationService _localizationService = new();
     private readonly FontFamilyService _fontFamilyService = new();
     private readonly IHostApplicationLifecycle _hostApplicationLifecycle = new HostApplicationLifecycleService();
+    private readonly HostShutdownGate _shutdownGate = new();
     private readonly IDetachedComponentLibraryWindowService _detachedComponentLibraryWindowService = new DetachedComponentLibraryWindowService();
     private readonly ILocationService _locationService = HostLocationServiceProvider.GetOrCreate();
     private readonly DateTimeOffset _startupAt = DateTimeOffset.UtcNow;
@@ -71,17 +71,19 @@ public partial class App : Application
     private ShutdownIntent _shutdownIntent;
 
     private DesktopTrayService? _desktopTrayService;
+    private DispatcherTimer? _shellRecoveryTimer;
     private PluginRuntimeService? _pluginRuntimeService;
     private MainWindow? _mainWindow;
     private TransparentOverlayWindow? _transparentOverlayWindow;
+    private FusedDesktopComponentLibraryWindow? _fusedComponentLibraryWindow;
     private bool _mainWindowClosed;
-    private bool _uiUnhandledExceptionHooked;
     private DesktopShellHost? _desktopShellHost;
     private PublicIpcHostService? _publicIpcHostService;
     private LoadingStateManager? _loadingStateManager;
     private LoadingStateReporter? _loadingStateReporter;
     private bool _singleInstanceReleased;
     private int _forcedExitScheduled;
+    private volatile bool _desktopShellInitializationStarted;
     private bool _mainWindowOpened;
     private bool _trayInitialized;
     private readonly object _launcherProgressLock = new();
@@ -106,6 +108,7 @@ public partial class App : Application
     public IHostApplicationLifecycle HostApplicationLifecycle => _hostApplicationLifecycle;
     internal ISettingsWindowService? SettingsWindowService => _settingsWindowService;
     internal INotificationService? NotificationService => _notificationService;
+    internal bool IsShutdownInProgress => _shutdownGate.IsShutdownRequested || _shutdownIntent != ShutdownIntent.None;
     internal RestartPresentationMode GetCurrentRestartPresentationMode()
     {
         return _desktopShellState switch
@@ -118,6 +121,14 @@ public partial class App : Application
 
     internal void OpenIndependentSettingsModule(string source, string? pageTag = null)
     {
+        if (IsShutdownInProgress)
+        {
+            AppLogger.Info(
+                "SettingsFacade",
+                $"Settings open ignored because shutdown is in progress. Source='{source}'; PageTag='{pageTag ?? "<default>"}'.");
+            return;
+        }
+
         EnsureSettingsWindowService();
         AppLogger.Info(
             "SettingsFacade",
@@ -137,6 +148,37 @@ public partial class App : Application
 
         _settingsFacade.Settings.Changed += OnSettingsChanged;
         _appearanceThemeService.Changed += OnAppearanceThemeChanged;
+
+        // 监听系统主题变化
+        PropertyChanged += OnAppPropertyChanged;
+    }
+
+    private void OnAppPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+    {
+        if (e.Property == ActualThemeVariantProperty)
+        {
+            // 系统主题变化时，检查是否需要更新
+            var themeMode = _settingsFacade.Settings.LoadSnapshot<AppSettingsSnapshot>(SettingsScope.App).ThemeMode;
+            if (string.Equals(themeMode, ThemeAppearanceValues.ThemeModeFollowSystem, StringComparison.OrdinalIgnoreCase))
+            {
+                var newThemeVariant = (ThemeVariant?)e.NewValue;
+                var isDark = newThemeVariant == ThemeVariant.Dark;
+
+                // 同步到设置
+                var currentThemeState = _settingsFacade.Theme.Get();
+                if (currentThemeState.IsNightMode != isDark)
+                {
+                    _settingsFacade.Theme.Save(currentThemeState with { IsNightMode = isDark });
+                }
+
+                // 应用主题
+                Dispatcher.UIThread.Post(() =>
+                {
+                    ApplyThemeFromSettings();
+                    RefreshTrayIconContent();
+                }, DispatcherPriority.Background);
+            }
+        }
     }
 
     public override void Initialize()
@@ -150,8 +192,6 @@ public partial class App : Application
             return;
         }
 
-        ConfigureWebViewUserDataFolder();
-        AvaloniaWebViewBuilder.Initialize(default);
         ApplyThemeFromSettings();
         ApplyCurrentCultureFromSettings();
         EnsureSettingsWindowService();
@@ -168,10 +208,10 @@ public partial class App : Application
         }
 
         AppLogger.Info("App", "Framework initialization completed.");
-        
-        RegisterUiUnhandledExceptionGuard();
+
         LinuxDesktopEntryInstaller.EnsureInstalled();
         InitializePublicIpc();
+        CurrentSingleInstanceService?.StartActivationListener(ActivateMainWindow);
         _ = InitializeLauncherIpcAsync();
         DesktopBootstrap.InitializeApplication(this, InitializeDesktopShell);
 
@@ -312,6 +352,7 @@ public partial class App : Application
 
     private void InitializeDesktopShell()
     {
+        _desktopShellInitializationStarted = true;
         _desktopShellHost ??= new DesktopShellHost(
             InitializePluginRuntime,
             InitializeTrayIcon,
@@ -347,11 +388,23 @@ public partial class App : Application
 
     private void OnTrayShowDesktopClick(object? sender, EventArgs e)
     {
+        if (IsShutdownInProgress)
+        {
+            AppLogger.Info("DesktopShell", "Tray Open Desktop ignored because shutdown is in progress.");
+            return;
+        }
+
         RestoreOrCreateMainWindow(showSingleInstanceNotice: false, source: "TrayMenu");
     }
 
     private void OnTrayRestartClick(object? sender, EventArgs e)
     {
+        if (IsShutdownInProgress)
+        {
+            AppLogger.Info("HostLifecycle", "Tray Restart ignored because shutdown is already in progress.");
+            return;
+        }
+
         _ = _hostApplicationLifecycle.TryRestart(new HostApplicationLifecycleRequest(
             Source: "TrayMenu",
             Reason: "User selected Restart App from the tray menu."));
@@ -361,6 +414,13 @@ public partial class App : Application
     {
         _ = sender;
         _ = e;
+
+        if (IsShutdownInProgress)
+        {
+            AppLogger.Info("SettingsFacade", "Tray Settings ignored because shutdown is in progress.");
+            return;
+        }
+
         OpenIndependentSettingsModule("TrayMenu");
     }
 
@@ -368,28 +428,52 @@ public partial class App : Application
     {
         _ = sender;
         _ = e;
+
+        if (IsShutdownInProgress)
+        {
+            AppLogger.Info("FusedDesktop", "Tray Component Library ignored because shutdown is in progress.");
+            return;
+        }
         
         if (!OperatingSystem.IsWindows())
         {
             AppLogger.Warn("FusedDesktop", "Fused desktop is only supported on Windows.");
             return;
         }
-
-        FusedDesktopManagerServiceFactory.GetOrCreate().EnterEditMode();
-        
-        // 纭繚閫忔槑瑕嗙洊灞傜獥鍙ｅ瓨鍦ㄥ苟鏄剧ず
-        EnsureTransparentOverlayWindow();
         
         Dispatcher.UIThread.Post(() =>
         {
+            if (IsShutdownInProgress)
+            {
+                AppLogger.Info("FusedDesktop", "Deferred Component Library open ignored because shutdown is in progress.");
+                return;
+            }
+
             try
             {
+                if (_fusedComponentLibraryWindow is { } existingWindow)
+                {
+                    if (!existingWindow.IsVisible)
+                    {
+                        existingWindow.Show();
+                    }
+
+                    existingWindow.Activate();
+                    return;
+                }
+
+                var fusedDesktopManager = FusedDesktopManagerServiceFactory.GetOrCreate();
+                fusedDesktopManager.EnterEditMode();
+
+                // 纭繚閫忔槑瑕嗙洊灞傜獥鍙ｅ瓨鍦ㄥ苟鏄剧ず
+                EnsureTransparentOverlayWindow();
                 if (_transparentOverlayWindow is not null && !_transparentOverlayWindow.IsVisible)
                 {
                     _transparentOverlayWindow.Show();
                 }
                 
                 var window = new FusedDesktopComponentLibraryWindow();
+                _fusedComponentLibraryWindow = window;
                 
                 if (_transparentOverlayWindow is not null)
                 {
@@ -405,7 +489,11 @@ public partial class App : Application
                     }
                     
                     // 璁╃鐞嗗櫒鏍规嵁宸插瓨鍌ㄧ殑鏈€鏂板揩鐓ч噸寤虹敓鎴愭墍鏈夊疄浣撳皬缁勪欢
-                    FusedDesktopManagerServiceFactory.GetOrCreate().ExitEditMode();
+                    fusedDesktopManager.ExitEditMode();
+                    if (ReferenceEquals(_fusedComponentLibraryWindow, s))
+                    {
+                        _fusedComponentLibraryWindow = null;
+                    }
                 };
 
                 window.Show();
@@ -414,49 +502,33 @@ public partial class App : Application
             catch (Exception ex)
             {
                 AppLogger.Warn("FusedDesktop", "Failed to open fused desktop component library.", ex);
+                try
+                {
+                    _transparentOverlayWindow?.SaveLayoutAndHide();
+                }
+                catch (Exception overlayEx)
+                {
+                    AppLogger.Warn("FusedDesktop", "Failed to hide fused desktop overlay after library open failure.", overlayEx);
+                }
+
+                try
+                {
+                    FusedDesktopManagerServiceFactory.GetOrCreate().ExitEditMode();
+                }
+                catch (Exception exitEx)
+                {
+                    AppLogger.Warn("FusedDesktop", "Failed to exit edit mode after library open failure.", exitEx);
+                }
+
+                _fusedComponentLibraryWindow = null;
             }
         }, DispatcherPriority.Send);
     }
 
     private void DisableAvaloniaDataAnnotationValidation()
     {
-        // Get an array of plugins to remove
-        var dataValidationPluginsToRemove =
-            BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();
-
-        // remove each entry found
-        foreach (var plugin in dataValidationPluginsToRemove)
-        {
-            BindingPlugins.DataValidators.Remove(plugin);
-        }
-    }
-
-    private static void ConfigureWebViewUserDataFolder()
-    {
-        if (!OperatingSystem.IsWindows())
-        {
-            return;
-        }
-
-        const string userDataFolderEnvVar = "WEBVIEW2_USER_DATA_FOLDER";
-        try
-        {
-            if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable(userDataFolderEnvVar)))
-            {
-                return;
-            }
-
-            var userDataFolder = WebView2RuntimeProbe.ResolveUserDataFolder();
-            Environment.SetEnvironmentVariable(
-                userDataFolderEnvVar,
-                userDataFolder,
-                EnvironmentVariableTarget.Process);
-        }
-        catch (Exception ex)
-        {
-            // Keep startup resilient if user profile folders are unavailable.
-            AppLogger.Warn("WebView2", "Failed to configure WebView2 user data folder.", ex);
-        }
+        // Avalonia 12 中 BindingPlugins 已移除，数据验证插件不再需要手动禁用
+        // 编译型绑定默认开启，数据注解验证行为已改变
     }
 
     private void InitializePluginRuntime()
@@ -478,6 +550,7 @@ public partial class App : Application
     private void InitializeTrayIcon()
     {
         EnsureDesktopTrayService();
+        _desktopTrayService?.StartWatchdog();
         _trayInitialized = _desktopTrayService?.EnsureReady("Startup") == true;
         if (_trayInitialized)
         {
@@ -525,14 +598,67 @@ public partial class App : Application
             OnTrayRestartClick,
             OnTrayExitClick);
         _desktopTrayService.StateChanged += OnTrayAvailabilityStateChanged;
+        _desktopTrayService.StartWatchdog();
+        EnsureShellRecoveryWatchdog();
+    }
+
+    private void EnsureShellRecoveryWatchdog()
+    {
+        _shellRecoveryTimer ??= new DispatcherTimer(
+            TimeSpan.FromSeconds(10),
+            DispatcherPriority.Background,
+            OnShellRecoveryWatchdogTick);
+
+        if (!_shellRecoveryTimer.IsEnabled)
+        {
+            _shellRecoveryTimer.Start();
+        }
+    }
+
+    private void StopShellRecoveryWatchdog()
+    {
+        if (_shellRecoveryTimer?.IsEnabled == true)
+        {
+            _shellRecoveryTimer.Stop();
+        }
+    }
+
+    private void OnShellRecoveryWatchdogTick(object? sender, EventArgs e)
+    {
+        _ = sender;
+        _ = e;
+
+        if (_shutdownIntent != ShutdownIntent.None)
+        {
+            return;
+        }
+
+        EnsureTrayReady("ShellRecoveryWatchdog");
+
+        if (!ShouldShowMainWindowInTaskbar())
+        {
+            return;
+        }
+
+        if (_desktopShellState != DesktopShellState.ForegroundDesktop)
+        {
+            EnsureTaskbarEntry("ShellRecoveryWatchdog");
+            return;
+        }
+
+        if (_mainWindow is not null && _mainWindow.IsVisible && !_mainWindow.ShowInTaskbar)
+        {
+            _mainWindow.ShowInTaskbar = true;
+        }
     }
 
     private bool EnsureTrayReady(string reason)
     {
         EnsureDesktopTrayService();
+        var wasReady = _trayInitialized;
         var ready = _desktopTrayService?.EnsureReady(reason) == true;
         _trayInitialized = ready;
-        if (ready)
+        if (ready && !wasReady)
         {
             ReportStartupProgress(StartupStage.TrayReady, 75, "Tray ready.");
         }
@@ -544,9 +670,25 @@ public partial class App : Application
     {
         _trayInitialized = state == TrayAvailabilityState.Ready;
 
-        if (state == TrayAvailabilityState.Failed && _desktopShellState == DesktopShellState.TrayOnly)
+        if (state != TrayAvailabilityState.Failed)
+        {
+            return;
+        }
+
+        if (_desktopShellState == DesktopShellState.TrayOnly)
         {
             RestoreOrCreateMainWindow(showSingleInstanceNotice: false, source: "TrayAvailabilityFailed");
+            return;
+        }
+
+        var foregroundVisible = _mainWindow?.IsVisible == true &&
+                                _mainWindow.WindowState != WindowState.Minimized;
+        var taskbarUsable = BuildPublicTaskbarStatus().IsUsable;
+        if (!foregroundVisible &&
+            !taskbarUsable &&
+            (_desktopTrayService?.ConsecutiveRecoveryFailures ?? 0) >= 3)
+        {
+            RestoreOrCreateMainWindow(showSingleInstanceNotice: false, source: "TrayAvailabilityRepeatedFailure");
         }
     }
 
@@ -611,9 +753,30 @@ public partial class App : Application
     private void ApplyThemeFromSettings()
     {
         var snapshot = _appearanceThemeService.GetCurrent();
-        RequestedThemeVariant = snapshot.IsNightMode
-            ? ThemeVariant.Dark
-            : ThemeVariant.Light;
+        var themeMode = _settingsFacade.Settings.LoadSnapshot<AppSettingsSnapshot>(SettingsScope.App).ThemeMode;
+
+        // 处理跟随系统主题模式
+        if (string.Equals(themeMode, ThemeAppearanceValues.ThemeModeFollowSystem, StringComparison.OrdinalIgnoreCase))
+        {
+            // 使用 Avalonia 的系统主题检测
+            var systemTheme = ActualThemeVariant;
+            RequestedThemeVariant = systemTheme;
+
+            // 同步 IsNightMode 到设置
+            var isSystemDark = systemTheme == ThemeVariant.Dark;
+            var currentThemeState = _settingsFacade.Theme.Get();
+            if (currentThemeState.IsNightMode != isSystemDark)
+            {
+                _settingsFacade.Theme.Save(currentThemeState with { IsNightMode = isSystemDark });
+            }
+        }
+        else
+        {
+            RequestedThemeVariant = snapshot.IsNightMode
+                ? ThemeVariant.Dark
+                : ThemeVariant.Light;
+        }
+
         ApplyAdaptiveThemeResources();
     }
 
@@ -653,10 +816,16 @@ public partial class App : Application
         Resources["AppFontFamily"] = fontFamily;
     }
 
-    private void ActivateMainWindow()
+    internal void ActivateMainWindow()
     {
         AppLogger.Info("SingleInstance", $"Activation callback received. Pid={Environment.ProcessId}.");
 
+        if (!_desktopShellInitializationStarted && _mainWindow is null)
+        {
+            AppLogger.Info("SingleInstance", "Activation acknowledged while desktop shell is still initializing.");
+            return;
+        }
+
         try
         {
             var restored = Dispatcher.UIThread.CheckAccess()
@@ -667,7 +836,8 @@ public partial class App : Application
 
             if (!restored)
             {
-                throw new InvalidOperationException("Main window restore failed in activation callback.");
+                AppLogger.Warn("SingleInstance", "Activation callback could not restore the main window yet.");
+                return;
             }
 
             AppLogger.Info("SingleInstance", "Activation callback completed successfully.");
@@ -675,12 +845,17 @@ public partial class App : Application
         catch (Exception ex)
         {
             AppLogger.Warn("SingleInstance", "Activation callback failed while restoring the desktop shell.", ex);
-            throw;
         }
     }
 
     private void RestoreOrCreateMainWindow(bool showSingleInstanceNotice, string source)
     {
+        if (IsShutdownInProgress)
+        {
+            AppLogger.Info("DesktopShell", $"Restore ignored because shutdown is in progress. Source='{source}'.");
+            return;
+        }
+
         Dispatcher.UIThread.Post(() =>
         {
             _ = RestoreOrCreateMainWindowCore(showSingleInstanceNotice, source);
@@ -689,6 +864,12 @@ public partial class App : Application
 
     private bool RestoreOrCreateMainWindowCore(bool showSingleInstanceNotice, string source)
     {
+        if (IsShutdownInProgress)
+        {
+            AppLogger.Info("DesktopShell", $"Restore skipped because shutdown is in progress. Source='{source}'.");
+            return false;
+        }
+
         if (ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
         {
             AppLogger.Warn("DesktopShell", $"Restore skipped because desktop lifetime is unavailable. Source='{source}'.");
@@ -719,7 +900,10 @@ public partial class App : Application
                 mainWindow.WindowState = WindowState.Normal;
             }
 
-            if (mainWindow.WindowState != WindowState.FullScreen)
+            mainWindow.EnsureForegroundWindowLayout();
+
+            if (mainWindow.ShouldUseFullscreenWindow() &&
+                mainWindow.WindowState != WindowState.FullScreen)
             {
                 mainWindow.WindowState = WindowState.FullScreen;
             }
@@ -733,7 +917,6 @@ public partial class App : Application
                 mainWindow.PlayEnterAnimation();
             }, DispatcherPriority.Background);
 
-            _desktopTrayService?.StopWatchdog();
             SetDesktopShellState(DesktopShellState.ForegroundDesktop, $"Restore:{source}");
             AppLogger.Info(
                 "DesktopShell",
@@ -765,6 +948,62 @@ public partial class App : Application
         }
     }
 
+    internal bool TrySubmitShutdown(HostShutdownMode mode, HostApplicationLifecycleRequest? request)
+    {
+        if (ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
+        {
+            AppLogger.Warn(
+                "HostLifecycle",
+                $"Shutdown request ignored because desktop lifetime is unavailable. Mode='{mode}'; Source='{request?.Source ?? "Unknown"}'.");
+            return false;
+        }
+
+        return Dispatcher.UIThread.CheckAccess()
+            ? TrySubmitShutdownCore(mode, request, desktop)
+            : Dispatcher.UIThread.InvokeAsync(
+                () => TrySubmitShutdownCore(mode, request, desktop),
+                DispatcherPriority.Send).GetAwaiter().GetResult();
+    }
+
+    private bool TrySubmitShutdownCore(
+        HostShutdownMode mode,
+        HostApplicationLifecycleRequest? request,
+        IClassicDesktopStyleApplicationLifetime desktop)
+    {
+        var source = request?.Source ?? "Unknown";
+        var submission = _shutdownGate.Submit(mode);
+        if (!submission.IsFirstSubmission)
+        {
+            AppLogger.Warn(
+                "HostLifecycle",
+                $"Shutdown request ignored because shutdown is already in progress. Requested='{submission.RequestedMode}'; Effective='{submission.EffectiveMode}'; Source='{source}'.");
+            return submission.Accepted;
+        }
+
+        _shutdownIntent = mode == HostShutdownMode.Restart
+            ? ShutdownIntent.RestartRequested
+            : ShutdownIntent.ExitRequested;
+        AppLogger.Info(
+            "DesktopShell",
+            $"Shutdown committed. Intent='{_shutdownIntent}'; Source='{source}'; Reason='{request?.Reason ?? string.Empty}'; CurrentShellState='{_desktopShellState}'.");
+
+        ScheduleForcedProcessTermination($"ShutdownRequest:{source}");
+        StopShellRecoveryWatchdog();
+        PerformExitCleanup();
+        ReleaseSingleInstanceAfterExit($"ShutdownRequest:{source}");
+
+        try
+        {
+            desktop.Shutdown();
+            return true;
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("HostLifecycle", $"Desktop lifetime shutdown failed. Source='{source}'.", ex);
+            return true;
+        }
+    }
+
     internal void PrepareForShutdown(bool isRestart, string source)
     {
         void Mark()
@@ -827,6 +1066,7 @@ public partial class App : Application
             var themeChanged =
                 refreshAll ||
                 changedKeys.Contains(nameof(AppSettingsSnapshot.IsNightMode), StringComparer.OrdinalIgnoreCase) ||
+                changedKeys.Contains(nameof(AppSettingsSnapshot.ThemeMode), StringComparer.OrdinalIgnoreCase) ||
                 changedKeys.Contains(nameof(AppSettingsSnapshot.UseSystemChrome), StringComparer.OrdinalIgnoreCase) ||
                 changedKeys.Contains(nameof(AppSettingsSnapshot.CornerRadiusStyle), StringComparer.OrdinalIgnoreCase) ||
                 (string.Equals(liveAppearance.ThemeColorMode, ThemeAppearanceValues.ColorModeSeedMonet, StringComparison.OrdinalIgnoreCase) &&
@@ -861,6 +1101,23 @@ public partial class App : Application
             {
                 RefreshFusedDesktopMenuItemVisibility();
             }
+
+            var showInTaskbarChanged =
+                refreshAll ||
+                changedKeys.Contains(nameof(AppSettingsSnapshot.ShowInTaskbar), StringComparer.OrdinalIgnoreCase);
+
+            if (showInTaskbarChanged)
+            {
+                EnsureTrayReady("SettingsChanged");
+                if (ShouldShowMainWindowInTaskbar())
+                {
+                    EnsureTaskbarEntry("SettingsChanged");
+                }
+                else if (_mainWindow is not null && _mainWindow.IsVisible)
+                {
+                    _mainWindow.ShowInTaskbar = false;
+                }
+            }
         }, DispatcherPriority.Background);
     }
 
@@ -881,43 +1138,6 @@ public partial class App : Application
         _appearanceThemeService.ApplyThemeResources(Resources);
     }
 
-    private void RegisterUiUnhandledExceptionGuard()
-    {
-        if (_uiUnhandledExceptionHooked)
-        {
-            return;
-        }
-
-        Dispatcher.UIThread.UnhandledException += OnUiThreadUnhandledException;
-        _uiUnhandledExceptionHooked = true;
-    }
-
-    private void OnUiThreadUnhandledException(object? sender, DispatcherUnhandledExceptionEventArgs e)
-    {
-        if (!IsKnownWebViewStartupException(e.Exception))
-        {
-            return;
-        }
-
-        e.Handled = true;
-        AppLogger.Warn(
-            "WebView2",
-            "Suppressed a known WebView startup exception from AvaloniaWebView.Navigate to keep the host process alive.",
-            e.Exception);
-    }
-
-    private static bool IsKnownWebViewStartupException(Exception exception)
-    {
-        if (exception is not NullReferenceException)
-        {
-            return false;
-        }
-
-        var stackTrace = exception.StackTrace ?? string.Empty;
-        return stackTrace.Contains("AvaloniaWebView.WebView.Navigate", StringComparison.Ordinal) &&
-               stackTrace.Contains("AvaloniaWebView.WebView.OnAttachedToVisualTree", StringComparison.Ordinal);
-    }
-
     private void ReleaseSingleInstanceAfterExit(string source)
     {
         if (_singleInstanceReleased)
@@ -977,6 +1197,7 @@ public partial class App : Application
         }
 
         _exitCleanupCompleted = true;
+        StopShellRecoveryWatchdog();
         _settingsFacade.Settings.Changed -= OnSettingsChanged;
         _appearanceThemeService.Changed -= OnAppearanceThemeChanged;
 
@@ -1032,6 +1253,30 @@ public partial class App : Application
             disposableRegistry.Dispose();
         }
 
+        if (_fusedComponentLibraryWindow is not null)
+        {
+            try
+            {
+                _fusedComponentLibraryWindow.Close();
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Warn("FusedDesktop", "Failed to close fused desktop component library during shutdown.", ex);
+            }
+            finally
+            {
+                _fusedComponentLibraryWindow = null;
+                try
+                {
+                    FusedDesktopManagerServiceFactory.GetOrCreate().ExitEditMode();
+                }
+                catch (Exception ex)
+                {
+                    AppLogger.Warn("FusedDesktop", "Failed to exit fused desktop edit mode during shutdown.", ex);
+                }
+            }
+        }
+
         if (_transparentOverlayWindow is not null)
         {
             try
@@ -1155,7 +1400,6 @@ public partial class App : Application
             case RestartPresentationMode.Minimized:
                 mainWindow.ShowInTaskbar = true;
                 mainWindow.WindowState = WindowState.Minimized;
-                _desktopTrayService?.StopWatchdog();
                 SetDesktopShellState(DesktopShellState.MinimizedToTaskbar, "StartupRestartPresentation");
                 ReportStartupProgressSync(StartupStage.BackgroundReady, 95, "Background ready.");
                 return true;
@@ -1297,6 +1541,24 @@ public partial class App : Application
     {
         try
         {
+            if (ShouldShowMainWindowInTaskbar())
+            {
+                EnsureTrayReady($"TaskbarBackground:{source}");
+                mainWindow.ShowInTaskbar = true;
+                if (!mainWindow.IsVisible)
+                {
+                    mainWindow.Show();
+                }
+
+                mainWindow.WindowState = WindowState.Minimized;
+                SetDesktopShellState(DesktopShellState.MinimizedToTaskbar, source);
+                ReportStartupProgress(StartupStage.BackgroundReady, 95, "Background ready via taskbar.");
+                AppLogger.Info(
+                    "DesktopShell",
+                    $"Main window minimized to taskbar because taskbar entry is enabled. Source='{source}'.");
+                return;
+            }
+
             if (!EnsureTrayReady($"HideToTray:{source}"))
             {
                 RecoverFromTrayUnavailable(mainWindow, source);
@@ -1305,7 +1567,6 @@ public partial class App : Application
 
             mainWindow.ShowInTaskbar = false;
             mainWindow.Hide();
-            _desktopTrayService?.StartWatchdog();
             SetDesktopShellState(DesktopShellState.TrayOnly, source);
             ReportStartupProgress(StartupStage.BackgroundReady, 95, "Background ready.");
             AppLogger.Info(
@@ -1342,7 +1603,6 @@ public partial class App : Application
             }
 
             mainWindow.WindowState = WindowState.Minimized;
-            _desktopTrayService?.StopWatchdog();
             SetDesktopShellState(DesktopShellState.MinimizedToTaskbar, $"TrayFallbackTaskbar:{source}");
             ReportStartupProgress(StartupStage.BackgroundReady, 95, "Background ready via taskbar fallback.");
             return;
@@ -1359,7 +1619,10 @@ public partial class App : Application
             mainWindow.WindowState = WindowState.Normal;
         }
 
-        if (mainWindow.WindowState != WindowState.FullScreen)
+        mainWindow.EnsureForegroundWindowLayout();
+
+        if (mainWindow.ShouldUseFullscreenWindow() &&
+            mainWindow.WindowState != WindowState.FullScreen)
         {
             mainWindow.WindowState = WindowState.FullScreen;
         }
@@ -1367,7 +1630,6 @@ public partial class App : Application
         mainWindow.Activate();
         mainWindow.Topmost = true;
         mainWindow.Topmost = false;
-        _desktopTrayService?.StopWatchdog();
         SetDesktopShellState(DesktopShellState.ForegroundDesktop, $"TrayFallbackForeground:{source}");
         ReportStartupProgress(StartupStage.DesktopVisible, 100, "Desktop restored because tray was unavailable.");
     }
@@ -1377,6 +1639,54 @@ public partial class App : Application
         return _settingsFacade.Settings.LoadSnapshot<AppSettingsSnapshot>(SettingsScope.App).ShowInTaskbar;
     }
 
+    private bool EnsureTaskbarEntry(string source)
+    {
+        if (IsShutdownInProgress)
+        {
+            AppLogger.Info("DesktopShell", $"Taskbar repair skipped because shutdown is in progress. Source='{source}'.");
+            return false;
+        }
+
+        if (!ShouldShowMainWindowInTaskbar())
+        {
+            return false;
+        }
+
+        if (ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
+        {
+            AppLogger.Warn("DesktopShell", $"Taskbar repair skipped because desktop lifetime is unavailable. Source='{source}'.");
+            return false;
+        }
+
+        try
+        {
+            var mainWindow = GetOrCreateMainWindow(desktop, $"TaskbarRepair:{source}");
+            mainWindow.ShowInTaskbar = true;
+
+            if (!mainWindow.IsVisible)
+            {
+                mainWindow.Show();
+            }
+
+            if (_desktopShellState != DesktopShellState.ForegroundDesktop)
+            {
+                mainWindow.WindowState = WindowState.Minimized;
+                SetDesktopShellState(DesktopShellState.MinimizedToTaskbar, $"TaskbarRepair:{source}");
+                ReportStartupProgress(StartupStage.BackgroundReady, 95, "Background ready via taskbar repair.");
+            }
+
+            AppLogger.Info(
+                "DesktopShell",
+                $"Taskbar entry ensured. Source='{source}'; IsVisible={mainWindow.IsVisible}; ShowInTaskbar={mainWindow.ShowInTaskbar}; WindowState='{mainWindow.WindowState}'.");
+            return true;
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("DesktopShell", $"Failed to ensure taskbar entry. Source='{source}'.", ex);
+            return false;
+        }
+    }
+
     private void SetDesktopShellState(DesktopShellState state, string source)
     {
         if (_desktopShellState == state)
@@ -1428,7 +1738,100 @@ public partial class App : Application
 
     internal bool TryActivateMainWindowFromExternalIpc(string source)
     {
-        return RestoreOrCreateMainWindowCore(showSingleInstanceNotice: false, source);
+        return TryActivateMainWindowWithStatusFromExternalIpc(source).Accepted;
+    }
+
+    internal PublicShellActivationResult TryActivateMainWindowWithStatusFromExternalIpc(string source)
+    {
+        if (!_desktopShellInitializationStarted && _mainWindow is null)
+        {
+            return new PublicShellActivationResult(
+                false,
+                "startup_pending",
+                "Desktop process is running, but the shell has not started yet.",
+                GetPublicShellStatus());
+        }
+
+        var restored = RestoreOrCreateMainWindowCore(showSingleInstanceNotice: false, source);
+        var status = GetPublicShellStatus();
+        if (restored)
+        {
+            return new PublicShellActivationResult(true, "activated", "Desktop window activation was requested.", status);
+        }
+
+        if (IsShutdownInProgress)
+        {
+            return new PublicShellActivationResult(false, "shutdown_in_progress", "Desktop is shutting down.", status);
+        }
+
+        var code = status.PublicIpcReady && (!status.MainWindowCreated || !status.MainWindowOpened)
+            ? "startup_pending"
+            : status.PublicIpcReady && !status.DesktopVisible
+                ? "shell_not_ready"
+                : "activation_failed";
+        var message = code switch
+        {
+            "startup_pending" => "Desktop process is running, but the shell is still creating the main window.",
+            "shell_not_ready" => "Desktop process is running, but the shell is not ready for activation yet.",
+            _ => "Desktop window activation failed."
+        };
+        return new PublicShellActivationResult(false, code, message, status);
+    }
+
+    internal PublicTrayStatus EnsureTrayReadyFromExternalIpc(string source)
+    {
+        EnsureTrayReady($"ExternalIpc:{source}");
+        return BuildPublicTrayStatus();
+    }
+
+    internal PublicTaskbarStatus EnsureTaskbarEntryFromExternalIpc(string source)
+    {
+        EnsureTaskbarEntry($"ExternalIpc:{source}");
+        return BuildPublicTaskbarStatus();
+    }
+
+    internal PublicShellStatus GetPublicShellStatus()
+    {
+        return new PublicShellStatus(
+            Environment.ProcessId,
+            _startupAt,
+            _launchSource,
+            _desktopShellState.ToString(),
+            _mainWindow is not null && !_mainWindowClosed,
+            _mainWindow?.IsVisible == true,
+            _mainWindowOpened,
+            _mainWindow?.IsVisible == true && _mainWindow.WindowState != WindowState.Minimized,
+            _publicIpcHostService is not null,
+            BuildPublicTrayStatus(),
+            BuildPublicTaskbarStatus());
+    }
+
+    private PublicTrayStatus BuildPublicTrayStatus()
+    {
+        return new PublicTrayStatus(
+            _desktopTrayService?.State.ToString() ?? TrayAvailabilityState.Unavailable.ToString(),
+            _desktopTrayService?.IsReady == true,
+            _desktopTrayService?.HasIcon == true,
+            _desktopTrayService?.HasMenu == true,
+            _desktopTrayService?.IsVisible == true,
+            _desktopTrayService?.ConsecutiveRecoveryFailures ?? 0);
+    }
+
+    private PublicTaskbarStatus BuildPublicTaskbarStatus()
+    {
+        var requested = ShouldShowMainWindowInTaskbar();
+        var mainWindowExists = _mainWindow is not null && !_mainWindowClosed;
+        var showInTaskbar = _mainWindow?.ShowInTaskbar == true;
+        var visible = _mainWindow?.IsVisible == true;
+        var minimized = _mainWindow?.WindowState == WindowState.Minimized;
+
+        return new PublicTaskbarStatus(
+            requested,
+            mainWindowExists,
+            showInTaskbar,
+            visible,
+            minimized,
+            requested && mainWindowExists && showInTaskbar && visible);
     }
 
     private void InitializePublicIpc()
@@ -1479,4 +1882,3 @@ public partial class App : Application
     }
 }
 
-

LanMountainDesktop/Controls/SettingsOptionCard.axaml.cs

@@ -108,7 +108,7 @@ public partial class SettingsOptionCard : UserControl
             "Info" => Symbol.Info,
             "ArrowSync" => Symbol.ArrowSync,
             "Alert" => Symbol.Alert,
-            "Bell" => Symbol.Alert,  // Bell也映射到Alert图标
+            "Bell" => Symbol.AlertOn,
             _ => Symbol.Settings
         };
     }

LanMountainDesktop/Controls/SettingsSectionCard.axaml.cs

@@ -92,6 +92,7 @@ public partial class SettingsSectionCard : UserControl
             "PuzzlePiece" => Symbol.PuzzlePiece,
             "Info" => Symbol.Info,
             "ArrowSync" => Symbol.ArrowSync,
+            "Bell" => Symbol.AlertOn,
             _ => Symbol.Settings
         };
     }

LanMountainDesktop/LanMountainDesktop.csproj

@@ -41,44 +41,42 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.12" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.12" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.12" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.12" />
-    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.12">
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Controls.WebView" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Avalonia.Fonts.Inter" />
+    <!--Condition below is needed to remove developer tools support from build output in Release configuration.-->
+    <PackageReference Include="AvaloniaUI.DiagnosticsSupport">
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
-    <PackageReference Include="DotNetCampus.AvaloniaInkCanvas" Version="1.0.1" />
-    <PackageReference Include="Downloader" Version="4.1.1" />
-    <PackageReference Include="FluentAvaloniaUI" Version="2.5.0" />
-    <PackageReference Include="FluentIcons.Avalonia" Version="2.0.320" />
-    <PackageReference Include="FluentIcons.Avalonia.Fluent" Version="2.0.320" />
-    <PackageReference Include="Material.Avalonia" Version="3.13.4" />
-    <PackageReference Include="Material.Icons.Avalonia" Version="2.4.1" />
-    <PackageReference Include="ClassIsland.Markdown.Avalonia" Version="11.0.3.4" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.0" />
-    <PackageReference Include="MudTools.OfficeInterop" Version="2.0.8" />
-    <PackageReference Include="MudTools.OfficeInterop.Word" Version="2.0.8" />
-    <PackageReference Include="MudTools.OfficeInterop.Excel" Version="2.0.8" />
-    <PackageReference Include="MudTools.OfficeInterop.PowerPoint" Version="2.0.8" />
+    <PackageReference Include="CommunityToolkit.Mvvm" />
+    <PackageReference Include="DotNetCampus.AvaloniaInkCanvas" />
+    <PackageReference Include="Downloader" />
+    <PackageReference Include="FluentAvaloniaUI" />
+    <PackageReference Include="FluentIcons.Avalonia" />
+    <PackageReference Include="Material.Avalonia" />
+    <PackageReference Include="Material.Icons.Avalonia" />
+    <PackageReference Include="ClassIsland.Markdown.Avalonia" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
+    <PackageReference Include="Microsoft.Data.Sqlite" />
+    <PackageReference Include="MudTools.OfficeInterop" />
+    <PackageReference Include="MudTools.OfficeInterop.Word" />
+    <PackageReference Include="MudTools.OfficeInterop.Excel" />
+    <PackageReference Include="MudTools.OfficeInterop.PowerPoint" />
 
-    <PackageReference Include="PortAudioSharp2" Version="1.0.6" />
-    <PackageReference Include="MaterialColorUtilities" Version="0.3.0" />
-    <PackageReference Include="PostHog" Version="2.4.0" />
-    <PackageReference Include="Sentry" Version="4.0.0" />
-    <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.7.0" />
-    <PackageReference Include="System.Drawing.Common" Version="10.0.0" />
+    <PackageReference Include="PortAudioSharp2" />
+    <PackageReference Include="MaterialColorUtilities" />
+    <PackageReference Include="PostHog" />
+    <PackageReference Include="Sentry" />
+    <PackageReference Include="System.Runtime.WindowsRuntime" />
+    <PackageReference Include="System.Drawing.Common" />
 
-    <PackageReference Include="WebView.Avalonia" Version="11.0.0.1" />
-    <PackageReference Include="WebView.Avalonia.Desktop" Version="11.0.0.1" />
-    <PackageReference Include="YamlDotNet" Version="16.3.0" />
-    <PackageReference Include="Tmds.DBus.Protocol" Version="0.92.0" />
-    <PackageReference Include="log4net" Version="3.3.0" />
+    <PackageReference Include="YamlDotNet" />
+    <PackageReference Include="Tmds.DBus.Protocol" />
+    <PackageReference Include="log4net" />
   </ItemGroup>
 
   <!-- Launcher 构建目标已移除 - Launcher 现在是独立应用，由 CI/CD 单独构建 -->
@@ -90,8 +88,8 @@
       <AppVersion>$(Version)</AppVersion>
       <AppCodename>Administrate</AppCodename>
     </PropertyGroup>
-    <Exec Command="powershell -ExecutionPolicy Bypass -File $(MSBuildProjectDirectory)\..\scripts\Generate-VersionFile.ps1 -OutputPath '$(VersionFilePath)' -Version '$(AppVersion)' -Codename '$(AppCodename)'" Condition="'$(OS)' == 'Windows_NT'" />
-    <Exec Command="pwsh -ExecutionPolicy Bypass -File $(MSBuildProjectDirectory)\..\scripts\Generate-VersionFile.ps1 -OutputPath '$(VersionFilePath)' -Version '$(AppVersion)' -Codename '$(AppCodename)'" Condition="'$(OS)' != 'Windows_NT'" />
+    <Exec Command="powershell -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\..\scripts\Generate-VersionFile.ps1&quot; -OutputPath &quot;$(VersionFilePath)&quot; -Version &quot;$(AppVersion)&quot; -Codename &quot;$(AppCodename)&quot;" Condition="'$(OS)' == 'Windows_NT'" />
+    <Exec Command="pwsh -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\..\scripts\Generate-VersionFile.ps1&quot; -OutputPath &quot;$(VersionFilePath)&quot; -Version &quot;$(AppVersion)&quot; -Codename &quot;$(AppCodename)&quot;" Condition="'$(OS)' != 'Windows_NT'" />
   </Target>
 
   <!-- 发布时也生成版本信息文件 -->
@@ -101,7 +99,7 @@
       <AppVersion>$(Version)</AppVersion>
       <AppCodename>Administrate</AppCodename>
     </PropertyGroup>
-    <Exec Command="powershell -ExecutionPolicy Bypass -File $(MSBuildProjectDirectory)\..\scripts\Generate-VersionFile.ps1 -OutputPath '$(VersionFilePath)' -Version '$(AppVersion)' -Codename '$(AppCodename)'" Condition="'$(OS)' == 'Windows_NT'" />
-    <Exec Command="pwsh -ExecutionPolicy Bypass -File $(MSBuildProjectDirectory)\..\scripts\Generate-VersionFile.ps1 -OutputPath '$(VersionFilePath)' -Version '$(AppVersion)' -Codename '$(AppCodename)'" Condition="'$(OS)' != 'Windows_NT'" />
+    <Exec Command="powershell -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\..\scripts\Generate-VersionFile.ps1&quot; -OutputPath &quot;$(VersionFilePath)&quot; -Version &quot;$(AppVersion)&quot; -Codename &quot;$(AppCodename)&quot;" Condition="'$(OS)' == 'Windows_NT'" />
+    <Exec Command="pwsh -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\..\scripts\Generate-VersionFile.ps1&quot; -OutputPath &quot;$(VersionFilePath)&quot; -Version &quot;$(AppVersion)&quot; -Codename &quot;$(AppCodename)&quot;" Condition="'$(OS)' != 'Windows_NT'" />
   </Target>
 </Project>

LanMountainDesktop/Localization/en-US.json

@@ -349,6 +349,11 @@
     "settings.appearance.title":  "Appearance",
     "settings.appearance.description":  "Adjust theme source, system material, and window chrome.",
     "settings.appearance.theme_header":  "Theme",
+    "settings.appearance.theme_mode_label":  "Theme mode",
+    "settings.appearance.theme_mode_desc":  "Choose light, dark, or follow system theme.",
+    "settings.appearance.theme_mode.light":  "Light",
+    "settings.appearance.theme_mode.dark":  "Dark",
+    "settings.appearance.theme_mode.follow_system":  "Follow system",
     "settings.color.enable_night_mode_toggle":  "Enable night mode",
     "settings.color.use_system_chrome_toggle":  "Use system window chrome",
     "settings.color.theme_color_label":  "Theme accent color",

LanMountainDesktop/Localization/ja-JP.json

@@ -292,6 +292,11 @@
     "settings.appearance.title":  "外観",
     "settings.appearance.description":  "テーマソース、システムマテリアル、ウィンドウクロームを調整します。",
     "settings.appearance.theme_header":  "テーマ",
+    "settings.appearance.theme_mode_label":  "テーマモード",
+    "settings.appearance.theme_mode_desc":  "ライト、ダーク、またはシステムに従うを選択してください。",
+    "settings.appearance.theme_mode.light":  "ライト",
+    "settings.appearance.theme_mode.dark":  "ダーク",
+    "settings.appearance.theme_mode.follow_system":  "システムに従う",
     "settings.color.enable_night_mode_toggle":  "夜モードを有効にする",
     "settings.color.use_system_chrome_toggle":  "システムのウィンドウクロームを使用",
     "settings.color.theme_color_label":  "テーマのアクセントカラー",

LanMountainDesktop/Localization/ko-KR.json

@@ -338,6 +338,11 @@
     "settings.appearance.title":  "외관",
     "settings.appearance.description":  "테마 소스, 시스템 소재 및 창 외관을 조정합니다.",
     "settings.appearance.theme_header":  "테마",
+    "settings.appearance.theme_mode_label":  "테마 모드",
+    "settings.appearance.theme_mode_desc":  "라이트, 다크 또는 시스템 설정 따르기를 선택하세요.",
+    "settings.appearance.theme_mode.light":  "라이트",
+    "settings.appearance.theme_mode.dark":  "다크",
+    "settings.appearance.theme_mode.follow_system":  "시스템 설정 따르기",
     "settings.color.enable_night_mode_toggle":  "야간 모드 활성화",
     "settings.color.use_system_chrome_toggle":  "시스템 창 제목 표시줄 사용",
     "settings.color.theme_color_label":  "테마 강조 색상",

LanMountainDesktop/Localization/zh-CN.json

@@ -344,6 +344,11 @@
     "settings.appearance.title":  "外观",
     "settings.appearance.description":  "调整主题来源、系统材质与窗口外观。",
     "settings.appearance.theme_header":  "主题",
+    "settings.appearance.theme_mode_label":  "主题模式",
+    "settings.appearance.theme_mode_desc":  "选择日间、夜间或跟随系统主题。",
+    "settings.appearance.theme_mode.light":  "日间",
+    "settings.appearance.theme_mode.dark":  "夜间",
+    "settings.appearance.theme_mode.follow_system":  "跟随系统",
     "settings.color.enable_night_mode_toggle":  "启用夜间模式",
     "settings.color.use_system_chrome_toggle":  "使用系统窗口标题栏",
     "settings.color.theme_color_label":  "主题强调色",

LanMountainDesktop/Models/AppSettingsSnapshot.cs

@@ -27,6 +27,8 @@ public sealed class AppSettingsSnapshot
 
     public string? SelectedWallpaperSeed { get; set; }
 
+    public string ThemeMode { get; set; } = "light";
+
     public string? WallpaperPath { get; set; }
 
     public string WallpaperType { get; set; } = "Image";
@@ -152,6 +154,8 @@ public sealed class AppSettingsSnapshot
 
     public bool EnableThreeFingerSwipe { get; set; } = false;
 
+    public bool EnableFadeTransition { get; set; } = true;
+
     public bool EnableSlideTransition { get; set; } = false;
 
     public bool ShowInTaskbar { get; set; } = false;

LanMountainDesktop/Program.cs

@@ -3,7 +3,6 @@ using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia;
-using Avalonia.WebView.Desktop;
 using LanMountainDesktop.DesktopHost;
 using LanMountainDesktop.Models;
 using LanMountainDesktop.Plugins;
@@ -22,6 +21,7 @@ public sealed class Program
     public static void Main(string[] args)
     {
         AppLogger.Initialize();
+        AppDataPathProvider.Initialize(args);
         DevPluginOptions.Parse(args);
         RegisterGlobalExceptionLogging();
         var restartParentProcessId = LauncherRuntimeMetadata.GetRestartParentProcessId(args);
@@ -77,6 +77,16 @@ public sealed class Program
             StartupRenderMode = renderMode;
             AppLogger.Info("Startup", $"Resolved render mode '{renderMode}'.");
             App.CurrentSingleInstanceService = singleInstance;
+            singleInstance.StartActivationListener(() =>
+            {
+                if (Avalonia.Application.Current is App app)
+                {
+                    app.ActivateMainWindow();
+                    return;
+                }
+
+                AppLogger.Info("SingleInstance", "Activation acknowledged before Avalonia App was ready.");
+            });
             BuildAvaloniaApp(renderMode).StartWithClassicDesktopLifetime(args);
             AppLogger.Info("Startup", "Application exited normally.");
         }
@@ -100,7 +110,6 @@ public sealed class Program
     {
         var builder = AppBuilder.Configure<App>()
             .UsePlatformDetect()
-            .UseDesktopWebView()
             .WithInterFont()
             .LogToTrace();
 

LanMountainDesktop/Services/AppDataPathProvider.cs

@@ -0,0 +1,66 @@
+namespace LanMountainDesktop.Services;
+
+public static class AppDataPathProvider
+{
+    private static string? _overriddenDataRoot;
+
+    public static void Initialize(string[] args)
+    {
+        var dataRoot = ResolveDataRootFromArgs(args);
+        if (!string.IsNullOrWhiteSpace(dataRoot))
+        {
+            _overriddenDataRoot = Path.GetFullPath(dataRoot);
+            AppLogger.Info("AppDataPath", $"Data root overridden by launcher: '{_overriddenDataRoot}'.");
+        }
+        else
+        {
+            var envDataRoot = Environment.GetEnvironmentVariable("LMD_DATA_ROOT");
+            if (!string.IsNullOrWhiteSpace(envDataRoot))
+            {
+                _overriddenDataRoot = Path.GetFullPath(envDataRoot);
+                AppLogger.Info("AppDataPath", $"Data root overridden by environment variable: '{_overriddenDataRoot}'.");
+            }
+        }
+    }
+
+    public static string GetDataRoot()
+    {
+        if (!string.IsNullOrWhiteSpace(_overriddenDataRoot))
+        {
+            return _overriddenDataRoot;
+        }
+
+        return Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            "LanMountainDesktop");
+    }
+
+    public static string GetSettingsDirectory()
+    {
+        return GetDataRoot();
+    }
+
+    public static string GetPluginMarketDirectory()
+    {
+        return Path.Combine(GetDataRoot(), "PluginMarket");
+    }
+
+    public static string GetWallpapersDirectory()
+    {
+        return Path.Combine(GetDataRoot(), "Wallpapers");
+    }
+
+    private static string? ResolveDataRootFromArgs(string[] args)
+    {
+        const string prefix = "--data-root=";
+        foreach (var arg in args)
+        {
+            if (arg.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+            {
+                return arg[prefix.Length..];
+            }
+        }
+
+        return null;
+    }
+}

LanMountainDesktop/Services/AppDatabaseService.cs

@@ -24,8 +24,7 @@ public sealed class AppDatabaseService
 
     public AppDatabaseService()
     {
-        var appData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-        var dataDirectory = Path.Combine(appData, "LanMountainDesktop");
+        var dataDirectory = AppDataPathProvider.GetDataRoot();
         _databasePath = Path.Combine(dataDirectory, "app.db");
     }
 

LanMountainDesktop/Services/AppSettingsService.cs

@@ -27,8 +27,7 @@ public sealed class AppSettingsService
 
     public AppSettingsService()
     {
-        var appData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-        var settingsDirectory = Path.Combine(appData, "LanMountainDesktop");
+        var settingsDirectory = AppDataPathProvider.GetSettingsDirectory();
         _settingsPath = Path.Combine(settingsDirectory, "settings.json");
     }
 

LanMountainDesktop/Services/DesktopTrayService.cs

@@ -34,6 +34,7 @@ internal sealed class DesktopTrayService : IDisposable
     private NativeMenuItem? _restartMenuItem;
     private NativeMenuItem? _exitMenuItem;
     private int _consecutiveRecoveryFailures;
+    private bool _disposed;
 
     public DesktopTrayService(
         Application application,
@@ -63,6 +64,14 @@ internal sealed class DesktopTrayService : IDisposable
 
     public bool IsReady => State == TrayAvailabilityState.Ready;
 
+    public bool HasIcon => _trayIcon?.Icon is not null;
+
+    public bool HasMenu => _trayIcon?.Menu is not null;
+
+    public bool IsVisible => _trayIcon?.IsVisible == true;
+
+    public int ConsecutiveRecoveryFailures => _consecutiveRecoveryFailures;
+
     public event Action<TrayAvailabilityState>? StateChanged;
 
     public bool EnsureReady(string reason)
@@ -105,6 +114,7 @@ internal sealed class DesktopTrayService : IDisposable
 
     public void Dispose()
     {
+        _disposed = true;
         StopWatchdog();
 
         try
@@ -118,6 +128,27 @@ internal sealed class DesktopTrayService : IDisposable
         {
         }
 
+        try
+        {
+            TrayIcon.SetIcons(_application, []);
+        }
+        catch
+        {
+        }
+
+        try
+        {
+            if (_trayIcon is IDisposable disposable)
+            {
+                disposable.Dispose();
+            }
+        }
+        catch
+        {
+        }
+
+        _trayIcon = null;
+
         SetState(TrayAvailabilityState.Unavailable, "Dispose");
     }
 
@@ -126,7 +157,7 @@ internal sealed class DesktopTrayService : IDisposable
         _ = sender;
         _ = e;
 
-        if (State == TrayAvailabilityState.Unavailable || State == TrayAvailabilityState.Failed)
+        if (_disposed || State == TrayAvailabilityState.Unavailable)
         {
             return;
         }
@@ -256,6 +287,11 @@ internal sealed class DesktopTrayService : IDisposable
     {
         if (State == state)
         {
+            if (state == TrayAvailabilityState.Failed)
+            {
+                StateChanged?.Invoke(state);
+            }
+
             return;
         }
 

LanMountainDesktop/Services/ExternalIpc/PublicShellControlService.cs

@@ -7,6 +7,15 @@ namespace LanMountainDesktop.Services.ExternalIpc;
 
 internal sealed class PublicShellControlService : IPublicShellControlService
 {
+    public Task<PublicShellStatus> GetShellStatusAsync()
+    {
+        return Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            return (Application.Current as App)?.GetPublicShellStatus()
+                ?? CreateUnavailableStatus();
+        }).GetTask();
+    }
+
     public Task<bool> ActivateMainWindowAsync()
     {
         return Dispatcher.UIThread.InvokeAsync(() =>
@@ -15,6 +24,37 @@ internal sealed class PublicShellControlService : IPublicShellControlService
         }).GetTask();
     }
 
+    public Task<PublicShellActivationResult> ActivateMainWindowWithStatusAsync()
+    {
+        return Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            return (Application.Current as App)?.TryActivateMainWindowWithStatusFromExternalIpc("PublicIpc")
+                ?? new PublicShellActivationResult(
+                    false,
+                    "app_unavailable",
+                    "Application instance is not available.",
+                    CreateUnavailableStatus());
+        }).GetTask();
+    }
+
+    public Task<PublicTrayStatus> EnsureTrayReadyAsync()
+    {
+        return Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            return (Application.Current as App)?.EnsureTrayReadyFromExternalIpc("PublicIpc")
+                ?? new PublicTrayStatus("Unavailable", false, false, false, false, 0);
+        }).GetTask();
+    }
+
+    public Task<PublicTaskbarStatus> EnsureTaskbarEntryAsync()
+    {
+        return Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            return (Application.Current as App)?.EnsureTaskbarEntryFromExternalIpc("PublicIpc")
+                ?? new PublicTaskbarStatus(false, false, false, false, false, false);
+        }).GetTask();
+    }
+
     public Task<bool> OpenSettingsAsync(string? pageTag = null)
     {
         return Dispatcher.UIThread.InvokeAsync(() =>
@@ -44,4 +84,20 @@ internal sealed class PublicShellControlService : IPublicShellControlService
             Source: "PublicIpc",
             Reason: "External IPC requested exit.")) == true);
     }
+
+    private static PublicShellStatus CreateUnavailableStatus()
+    {
+        return new PublicShellStatus(
+            Environment.ProcessId,
+            DateTimeOffset.UtcNow,
+            "unknown",
+            "Unavailable",
+            false,
+            false,
+            false,
+            false,
+            false,
+            new PublicTrayStatus("Unavailable", false, false, false, false, 0),
+            new PublicTaskbarStatus(false, false, false, false, false, false));
+    }
 }

LanMountainDesktop/Services/HostApplicationLifecycleService.cs

@@ -23,23 +23,13 @@ public sealed class HostApplicationLifecycleService : IHostApplicationLifecycle
                 $"Exit requested. Source='{request?.Source ?? "Unknown"}'; Reason='{request?.Reason ?? string.Empty}'.");
 
             app = Application.Current as App;
-            if (app?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
+            if (app is null || app.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime)
             {
                 AppLogger.Warn("HostLifecycle", "Exit request ignored because desktop lifetime is unavailable.");
                 return false;
             }
 
-            app.PrepareForShutdown(isRestart: false, request?.Source ?? "Unknown");
-            if (Dispatcher.UIThread.CheckAccess())
-            {
-                desktop.Shutdown();
-            }
-            else
-            {
-                Dispatcher.UIThread.Post(() => desktop.Shutdown(), DispatcherPriority.Send);
-            }
-
-            return true;
+            return app.TrySubmitShutdown(HostShutdownMode.Exit, request);
         }
         catch (Exception ex)
         {
@@ -55,6 +45,13 @@ public sealed class HostApplicationLifecycleService : IHostApplicationLifecycle
         try
         {
             app = Application.Current as App;
+            if (app?.IsShutdownInProgress == true)
+            {
+                AppLogger.Warn(
+                    "HostLifecycle",
+                    $"Restart request ignored because shutdown is already in progress. Source='{request?.Source ?? "Unknown"}'.");
+                return false;
+            }
 
             if (HasPendingPluginUpgrades())
             {
@@ -123,10 +120,7 @@ public sealed class HostApplicationLifecycleService : IHostApplicationLifecycle
         AppLogger.Info("HostLifecycle", $"Starting upgrade helper: {helperStartInfo.FileName} {helperStartInfo.Arguments}");
 
         Process.Start(helperStartInfo);
-
-        app?.PrepareForShutdown(isRestart: true, request?.Source ?? "Unknown");
-
-        return TryExit(request);
+        return app?.TrySubmitShutdown(HostShutdownMode.Restart, request) == true;
     }
 
     private bool TryRestartDirectly(HostApplicationLifecycleRequest? request)
@@ -143,8 +137,7 @@ public sealed class HostApplicationLifecycleService : IHostApplicationLifecycle
         }
 
         Process.Start(startInfo);
-        app?.PrepareForShutdown(isRestart: true, request?.Source ?? "Unknown");
-        var exitRequest = request is null
+        var shutdownRequest = request is null
             ? new HostApplicationLifecycleRequest(Reason: "Restart accepted.")
             : request with
             {
@@ -153,7 +146,7 @@ public sealed class HostApplicationLifecycleService : IHostApplicationLifecycle
                     : request.Reason
             };
 
-        return TryExit(exitRequest);
+        return app?.TrySubmitShutdown(HostShutdownMode.Restart, shutdownRequest) == true;
     }
 
     private static string ResolveUpgradeHelperPath()