0.6.0.1

应用遥测，插件市场

.github/FIX_REPORT.md

@@ -8,14 +8,14 @@ MSBUILD : error MSB1003: Specify a project or solution file.
 The current working directory does not contain a project or solution file.
 ```
 
-**原因**: 项目中缺少 `LanMountainDesktop.sln` 解决方案文件，但工作流尝试执行 `dotnet restore` 而没有指定项目。
+**原因**: 项目中缺少 `LanMountainDesktop.slnx` 解决方案文件，但工作流尝试执行 `dotnet restore` 而没有指定项目。
 
 ---
 
 ## 🔧 已采取的修复
 
-### 1. 创建解决方案文件
-✅ 创建了标准的 `LanMountainDesktop.sln` 文件，包含：
+### 1. 创建 `.slnx` 解决方案文件
+✅ 创建了标准的 `LanMountainDesktop.slnx` 文件，包含：
 - `LanMountainDesktop/LanMountainDesktop.csproj`
 
 ### 2. 验证本地构建工作
@@ -35,10 +35,10 @@ The current working directory does not contain a project or solution file.
 
 ## 📋 解决方案文件内容
 
-包含主桌面项目的标准 Visual Studio 解决方案格式：
+包含主桌面项目的标准 XML 解决方案格式：
 
 ```
-LanMountainDesktop.sln
+LanMountainDesktop.slnx
 └── LanMountainDesktop (Desktop UI - Avalonia)
 ```
 
@@ -50,10 +50,11 @@ LanMountainDesktop.sln
 
 ```bash
 # 1. 添加新创建的解决方案文件
-git add LanMountainDesktop.sln
+git add LanMountainDesktop.slnx
+git add global.json
 
 # 2. 提交
-git commit -m "Add solution file for desktop project"
+git commit -m "Migrate desktop solution to .slnx"
 
 # 3. 推送
 git push origin main
@@ -92,7 +93,7 @@ git push origin v1.0.1
 | `.github/workflows/code-quality.yml` | 代码质量检查 | ✅ 可用 |
 | `.github/workflows/release.yml` | 多平台发布 | ✅ 可用 |
 | `.github/workflows/issue-management.yml` | Issue自动管理 | ✅ 可用 |
-| `LanMountainDesktop.sln` | 解决方案文件 | ✅ 已修复 |
+| `LanMountainDesktop.slnx` | 解决方案文件 | ✅ 已修复 |
 
 ---
 

.github/README.md

@@ -36,9 +36,10 @@
 - 扩展契约与字段说明见组件系统文档：`LanMountainDesktop/ComponentSystem/README.md`。
 
 ## 当前状态
-- 项目包含桌面端与推荐后端两个子项目，并在同一 solution 中维护。
+- 项目包含桌面端与推荐后端两个子项目，并在同一 `LanMountainDesktop.slnx` 工作区中维护。
 - 配置默认写入本地：`%LOCALAPPDATA%\LanMountainDesktop\settings.json`。
 - 当前体验以 Windows 为主要目标平台。
+- SDK 版本由仓库根目录 `global.json` 锁定。
 
 ## 运行说明
 运行与环境准备已拆分到独立文档：[`run.md`](./run.md)

.github/workflows/build.yml

@@ -9,7 +9,7 @@ on:
 
 env:
   DOTNET_VERSION: '10.0.x'
-  Solution_Name: LanMountainDesktop.sln
+  Solution_Name: LanMountainDesktop.slnx
 
 jobs:
   build-windows:
@@ -71,10 +71,10 @@ jobs:
           dotnet-version: ${{ env.DOTNET_VERSION }}
 
       - name: Restore
-        run: dotnet restore
+        run: dotnet restore ${{ env.Solution_Name }}
 
       - name: Build
-        run: dotnet build --no-restore -c Release -v minimal
+        run: dotnet build ${{ env.Solution_Name }} --no-restore -c Release -v minimal
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -101,10 +101,10 @@ jobs:
           dotnet-version: ${{ env.DOTNET_VERSION }}
 
       - name: Restore
-        run: dotnet restore
+        run: dotnet restore ${{ env.Solution_Name }}
 
       - name: Build
-        run: dotnet build --no-restore -c Release -v minimal
+        run: dotnet build ${{ env.Solution_Name }} --no-restore -c Release -v minimal
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4

.github/workflows/code-quality.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   DOTNET_VERSION: '10.0.x'
-  Solution_Name: LanMountainDesktop.sln
+  Solution_Name: LanMountainDesktop.slnx
 
 jobs:
   analyze:

.github/workflows/release.yml

@@ -18,13 +18,15 @@ on:
 
 env:
   DOTNET_VERSION: '10.0.x'
-  Solution_Name: LanMountainDesktop.sln
+  Solution_Name: LanMountainDesktop.slnx
 
 jobs:
   prepare:
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.version.outputs.version }}
+      assembly_version: ${{ steps.version.outputs.assembly_version }}
+      informational_version: ${{ steps.version.outputs.informational_version }}
       tag: ${{ steps.version.outputs.tag }}
       checkout_ref: ${{ steps.version.outputs.checkout_ref }}
     
@@ -47,8 +49,15 @@ jobs:
             CHECKOUT_REF="${GITHUB_SHA}"
           fi
           VERSION="${TAG#v}"
+          IFS='.' read -r -a VERSION_PARTS <<< "${VERSION}"
+          while [ "${#VERSION_PARTS[@]}" -lt 4 ]; do
+            VERSION_PARTS+=("0")
+          done
+          ASSEMBLY_VERSION="${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.${VERSION_PARTS[2]}.${VERSION_PARTS[3]}"
           echo "tag=${TAG}" >> $GITHUB_OUTPUT
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "assembly_version=${ASSEMBLY_VERSION}" >> $GITHUB_OUTPUT
+          echo "informational_version=${VERSION}" >> $GITHUB_OUTPUT
           echo "checkout_ref=${CHECKOUT_REF}" >> $GITHUB_OUTPUT
 
   build-windows:
@@ -73,26 +82,16 @@ jobs:
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
 
-      - name: Update version in .csproj
-        run: |
-          $VERSION = "${{ needs.prepare.outputs.version }}"
-          $csprojFiles = @(
-            "LanMountainDesktop/LanMountainDesktop.csproj"
-          )
-          
-          foreach ($csprojPath in $csprojFiles) {
-            Write-Host "Updating version in $csprojPath to $VERSION"
-            $content = Get-Content $csprojPath -Raw
-            $content = $content -replace '<Version>.*?</Version>', "<Version>$VERSION</Version>"
-            Set-Content $csprojPath $content
-          }
-        shell: pwsh
-
       - name: Restore
         run: dotnet restore ${{ env.Solution_Name }}
 
       - name: Build
-        run: dotnet build ${{ env.Solution_Name }} -c Release --no-restore -v minimal
+        run: >
+          dotnet build ${{ env.Solution_Name }} -c Release --no-restore -v minimal
+          -p:Version=${{ needs.prepare.outputs.version }}
+          -p:AssemblyVersion=${{ needs.prepare.outputs.assembly_version }}
+          -p:FileVersion=${{ needs.prepare.outputs.assembly_version }}
+          -p:InformationalVersion=${{ needs.prepare.outputs.informational_version }}
 
       - name: Publish
         run: |
@@ -106,7 +105,11 @@ jobs:
             -p:DebugType=none `
             -p:DebugSymbols=false `
             -p:PublishTrimmed=false `
-            -p:PublishReadyToRun=false
+            -p:PublishReadyToRun=false `
+            -p:Version=${{ needs.prepare.outputs.version }} `
+            -p:AssemblyVersion=${{ needs.prepare.outputs.assembly_version }} `
+            -p:FileVersion=${{ needs.prepare.outputs.assembly_version }} `
+            -p:InformationalVersion=${{ needs.prepare.outputs.informational_version }}
         shell: pwsh
 
       - name: Install Inno Setup
@@ -242,17 +245,16 @@ jobs:
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
 
-      - name: Update version in .csproj
-        run: |
-          VERSION="${{ needs.prepare.outputs.version }}"
-          echo "Updating version in LanMountainDesktop.csproj to $VERSION"
-          sed -i "s/<Version>.*<\/Version>/<Version>$VERSION<\/Version>/" LanMountainDesktop/LanMountainDesktop.csproj
-
       - name: Restore
         run: dotnet restore ${{ env.Solution_Name }}
 
       - name: Build
-        run: dotnet build ${{ env.Solution_Name }} -c Release --no-restore -v minimal
+        run: >
+          dotnet build ${{ env.Solution_Name }} -c Release --no-restore -v minimal
+          -p:Version=${{ needs.prepare.outputs.version }}
+          -p:AssemblyVersion=${{ needs.prepare.outputs.assembly_version }}
+          -p:FileVersion=${{ needs.prepare.outputs.assembly_version }}
+          -p:InformationalVersion=${{ needs.prepare.outputs.informational_version }}
 
       - name: Publish
         run: |
@@ -266,7 +268,11 @@ jobs:
             -p:DebugType=none \
             -p:DebugSymbols=false \
             -p:PublishTrimmed=false \
-            -p:PublishReadyToRun=false
+            -p:PublishReadyToRun=false \
+            -p:Version=${{ needs.prepare.outputs.version }} \
+            -p:AssemblyVersion=${{ needs.prepare.outputs.assembly_version }} \
+            -p:FileVersion=${{ needs.prepare.outputs.assembly_version }} \
+            -p:InformationalVersion=${{ needs.prepare.outputs.informational_version }}
 
       - name: Package as DEB
         run: |
@@ -384,17 +390,16 @@ jobs:
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
 
-      - name: Update version in .csproj
-        run: |
-          VERSION="${{ needs.prepare.outputs.version }}"
-          echo "Updating version in LanMountainDesktop.csproj to $VERSION"
-          sed -i '' "s/<Version>.*<\/Version>/<Version>$VERSION<\/Version>/" LanMountainDesktop/LanMountainDesktop.csproj
-
       - name: Restore
         run: dotnet restore ${{ env.Solution_Name }}
 
       - name: Build
-        run: dotnet build ${{ env.Solution_Name }} -c Release --no-restore -v minimal
+        run: >
+          dotnet build ${{ env.Solution_Name }} -c Release --no-restore -v minimal
+          -p:Version=${{ needs.prepare.outputs.version }}
+          -p:AssemblyVersion=${{ needs.prepare.outputs.assembly_version }}
+          -p:FileVersion=${{ needs.prepare.outputs.assembly_version }}
+          -p:InformationalVersion=${{ needs.prepare.outputs.informational_version }}
 
       - name: Publish
         run: |
@@ -408,7 +413,11 @@ jobs:
             -p:DebugType=none \
             -p:DebugSymbols=false \
             -p:PublishTrimmed=false \
-            -p:PublishReadyToRun=false
+            -p:PublishReadyToRun=false \
+            -p:Version=${{ needs.prepare.outputs.version }} \
+            -p:AssemblyVersion=${{ needs.prepare.outputs.assembly_version }} \
+            -p:FileVersion=${{ needs.prepare.outputs.assembly_version }} \
+            -p:InformationalVersion=${{ needs.prepare.outputs.informational_version }}
 
       - name: Package as DMG
         run: |

.gitignore

@@ -492,3 +492,23 @@ nul
 /_build_verify_plugin_services
 /LanMountainDesktop.PluginSdk/_build_verify_*/
 /_build_obj
+
+# LanMountainDesktop local workspace files
+/.arts/
+/.knox/
+/.lingma/
+/.tmp/
+/publish-test/
+/validator-restore.log
+/temp_old_main.axaml
+/temp_old_main_utf8.axaml
+
+# LanMountainDesktop local packaging outputs
+/build-installer/
+/build-deb/
+/dmg-temp/
+/release-files/
+/LanMountainDesktop.app/
+/*.deb
+/*.dmg
+/*.AppImage

.trae/specs/settings-page-fluent-redesign/checklist.md

@@ -0,0 +1,32 @@
+# Checklist - 设置页面 Fluent 设计改造
+
+## Phase 1: 分析与准备
+
+- [ ] SettingsExpander 控件分析完成
+- [ ] 当前布局问题定位完成
+
+## Phase 2: 窗口布局调整
+
+- [ ] SettingsWindow 内容区域无额外 Border 包裹
+- [ ] 窗口整体视觉效果正常
+- [ ] 窗口圆角在不同模式下正确显示
+
+## Phase 3: 设置页面改造
+
+- [ ] AppearanceSettingsPage 无额外边框包裹
+- [ ] GeneralSettingsPage 无额外边框包裹
+- [ ] ComponentsSettingsPage 无额外边框包裹
+- [ ] PluginsSettingsPage 无额外边框包裹
+- [ ] AboutSettingsPage 无额外边框包裹
+
+## Phase 4: 视觉规范
+
+- [ ] 设置项间距统一
+- [ ] 圆角样式统一
+- [ ] 页面标题样式统一
+
+## 验证
+
+- [ ] 编译通过，无错误
+- [ ] 运行正常，设置页面可正常显示
+- [ ] 视觉效果符合 Fluent 设计风格

.trae/specs/settings-page-fluent-redesign/spec.md

@@ -0,0 +1,76 @@
+# 设置页面 Fluent 设计改造规格说明书
+
+## Why
+
+当前 LanMountainDesktop 设置页面存在以下问题：
+1. 右侧详细设置区域被额外边框包裹，未能实现 Fluent Avalonia 控件的完整填充效果
+2. 设置项未采用 Fluent 卡片设计风格，仍使用传统 Border + StackPanel 布局
+3. 与 ClassIsland 项目的视觉风格差异较大
+
+## What Changes
+
+- 移除页面内容区域的额外 Border 包裹，直接使用 ScrollViewer + StackPanel
+- 参考 ClassIsland 项目，引入 SettingsExpander 控件替代传统布局
+- 统一设置项的间距、圆角、字体等视觉规范
+- 修改窗口布局，移除内容区域的 glass-panel 样式
+
+## Impact
+
+### Affected specs
+- 设置页面 UI 布局规范
+- Fluent 设计风格适配
+
+### Affected code
+- `Views/SettingsPages/*.axaml` - 所有设置页面
+- `Views/SettingsWindow.axaml` - 设置窗口布局
+- `Styles/GlassModule.axaml` - 样式资源
+
+---
+
+## ADDED Requirements
+
+### Requirement: 设置页面 Fluent 卡片设计
+
+系统 SHALL 提供类似 ClassIsland 的 SettingsExpander 卡片式设置项。
+
+#### Scenario: 设置页面布局
+- **WHEN** 用户打开任意设置页面
+- **THEN** 页面使用 ScrollViewer 直接包裹内容，无额外 Border 包裹
+- **AND THEN** 设置项使用 SettingsExpander 或 Fluent 卡片样式
+
+### Requirement: 移除内容区域额外边框
+
+系统 SHALL 移除右侧内容区域的 glass-panel 边框包裹。
+
+#### Scenario: 内容区域无额外边框
+- **WHEN** 用户查看设置页面内容
+- **THEN** 内容直接显示在透明背景上，无额外边框包裹
+
+### Requirement: 设置项视觉规范
+
+系统 SHALL 统一设置项的视觉样式。
+
+#### Scenario: 设置项样式
+- **WHEN** 开发者创建新的设置项
+- **THEN** 使用统一的间距（Spacing）、圆角、字体大小
+- **AND THEN** 参考 ClassIsland 的 SettingsExpander 样式
+
+---
+
+## MODIFIED Requirements
+
+### Requirement: 设置页面布局结构
+
+**当前**: Border → ScrollViewer → Border → StackPanel → 内容
+
+**修改后**: ScrollViewer → StackPanel → 设置项（无额外 Border）
+
+---
+
+## REMOVED Requirements
+
+### Requirement: 传统 Border 包裹布局
+
+**Reason**: 实现 Fluent 设计风格，移除视觉噪音
+
+**Migration**: 将现有 Border 包裹改为直接内容布局

.trae/specs/settings-page-fluent-redesign/tasks.md

@@ -0,0 +1,51 @@
+# Tasks - 设置页面 Fluent 设计改造
+
+## Phase 1: 分析与准备
+
+- [ ] Task 1.1: 分析 ClassIsland SettingsExpander 控件实现
+  - [ ] 查看 ClassIsland.Core 中的 SettingsExpander 定义
+  - [ ] 分析样式模板和视觉效果
+  - [ ] 确定是否需要自定义控件或使用现有替代方案
+
+- [ ] Task 1.2: 分析当前设置页面布局问题
+  - [ ] 定位右侧内容区域的 Border 包裹代码
+  - [ ] 分析 glass-panel 样式对布局的影响
+
+## Phase 2: 窗口布局调整
+
+- [ ] Task 2.1: 修改 SettingsWindow.axaml 内容区域布局
+  - [ ] 移除 Frame 外部的 glass-panel Border
+  - [ ] 直接使用透明背景
+  - [ ] 验证窗口整体视觉效果
+
+## Phase 3: 设置页面改造
+
+- [ ] Task 3.1: 改造 AppearanceSettingsPage 页面
+  - [ ] 移除外部的 glass-panel Border
+  - [ ] 调整内容布局为直接填充
+  - [ ] 验证视觉效果
+
+- [ ] Task 3.2: 改造 GeneralSettingsPage 页面
+  - [ ] 移除外部的 glass-panel Border
+  - [ ] 调整内容布局
+
+- [ ] Task 3.3: 改造其他设置页面
+  - [ ] ComponentsSettingsPage
+  - [ ] PluginsSettingsPage
+  - [ ] AboutSettingsPage
+
+## Phase 4: 视觉规范统一
+
+- [ ] Task 4.1: 统一设置项间距和圆角
+  - [ ] 定义统一的 Spacing 值
+  - [ ] 统一圆角大小
+
+- [ ] Task 4.2: 优化页面标题区域样式
+  - [ ] 调整 Page Header 字体大小
+  - [ ] 优化 Description 样式
+
+## Task Dependencies
+- Task 1.2 依赖 Task 1.1
+- Task 2.1 依赖 Task 1.2
+- Task 3.x 依赖 Task 2.1
+- Task 4.x 依赖 Task 3.x

LanAirApp/README.md

@@ -1,21 +1,33 @@
-# LanAirApp
+# LanAirApp (Mirror)
 
 ## 中文
 
-`LanAirApp` 是阑山桌面插件生态的对外工作区。这个目录是宿主仓库中的镜像副本，权威版本以独立 `LanAirApp` 仓库为准。
+这里的 `LanAirApp/` 是放在宿主仓库里的镜像副本，只用于本地联调和工作区构建，不是插件市场或插件开发资料的最终权威来源。
 
-### 目录说明
+### 这份镜像的角色
 
-- `docs/`：插件开发与打包文档。
-- `samples/`：示例插件与参考项目。
-- `standards/`：插件清单和目录结构约定。
-- `tools/`：插件打包与辅助工具。
+- 提供本地工作区里的 `airappmarket` 索引副本
+- 提供插件文档、工具和样例镜像，便于和宿主一起联调
+- 不承担宿主运行时职责
 
-### 与宿主的关系
+### 权威来源
 
-- 宿主程序只连接独立 `LanAirApp` 仓库中的官方市场索引。
-- 每个插件项目应在仓库根目录提供 `.laapp` 和 `README.md`。
+- 插件市场与开发文档：独立 `LanAirApp` 仓库
+- 权威示例插件：独立 `LanMountainDesktop.SamplePlugin`
+- 本目录中的 `samples/LanMountainDesktop.SamplePlugin` 只是镜像模板副本
 
 ## English
 
-`LanAirApp` is the external-facing workspace for the LanMountainDesktop plugin ecosystem. This copy is only a mirror inside the host repository; the standalone `LanAirApp` repository remains the source of truth.
+This `LanAirApp/` directory is a mirror that lives inside the host repository. It exists for local workspace integration and build convenience only. It is not the final authority for the plugin market or developer-facing plugin materials.
+
+### Role of this mirror
+
+- keep a local copy of the `airappmarket` index for workspace integration
+- keep mirrored docs, tools, and sample templates for local development
+- avoid duplicating host runtime responsibilities
+
+### Sources of truth
+
+- Plugin market and developer docs: standalone `LanAirApp`
+- Authoritative sample plugin: standalone `LanMountainDesktop.SamplePlugin`
+- `samples/LanMountainDesktop.SamplePlugin` in this mirror is template/mirror content only

LanAirApp/samples/LanMountainDesktop.SamplePlugin/LanMountainDesktop.SamplePlugin.csproj

@@ -9,9 +9,9 @@
     <OutputPath>bin\$(Configuration)\$(TargetFramework)\content\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <PluginPackageOutputDirectory>..\..\..\LanMountainDesktop\bin\$(Configuration)\$(TargetFramework)\Extensions\Plugins\</PluginPackageOutputDirectory>
-    <PluginPackagePath>$(PluginPackageOutputDirectory)$(AssemblyName).laapp</PluginPackagePath>
-    <LegacyLoosePluginOutputDirectory>..\..\..\LanMountainDesktop\bin\$(Configuration)\$(TargetFramework)\Extensions\Plugins\SamplePlugin\</LegacyLoosePluginOutputDirectory>
+    <PluginPackageOutputDirectory>$(MSBuildThisFileDirectory)artifacts\Packages\</PluginPackageOutputDirectory>
+    <PluginPackagePath>$(PluginPackageOutputDirectory)$(AssemblyName).$(Version).laapp</PluginPackagePath>
+    <LegacyLoosePluginOutputDirectory>$(MSBuildThisFileDirectory)artifacts\Loose\</LegacyLoosePluginOutputDirectory>
   </PropertyGroup>
 
   <ItemGroup>

LanAirApp/samples/LanMountainDesktop.SamplePlugin/Localization/en-US.json

@@ -67,6 +67,11 @@
   "capability.message_bus.detail": "This sample plugin uses IPluginMessageBus to push clock ticks and state change notifications into plugin UI surfaces.",
   "capability.widget_context.title": "PluginDesktopComponentContext",
   "capability.widget_context.detail": "Widgets can read ComponentId, PlacementId, CellSize, and call GetService<T>() against the same plugin service container.",
+  "widget.close_desktop.display_name": "Close Desktop",
+  "widget.close_desktop.text": "Close Desktop",
+  "widget.close_desktop.hint": "Exit LanMountainDesktop on click",
+  "widget.close_desktop.unavailable": "Host lifecycle API is unavailable",
+  "widget.close_desktop.failed": "Host rejected the exit request",
   "widget.subtitle.preview": "Preview surface | placed: {0}",
   "widget.subtitle.placement": "Placement {0} | placed: {1}",
   "common.dev": "dev",

LanAirApp/samples/LanMountainDesktop.SamplePlugin/SamplePlugin.cs

@@ -43,37 +43,45 @@ public sealed class SamplePlugin : PluginBase, IDisposable
             File.AppendAllText(logPath, initMessage + Environment.NewLine);
             _stateService.MarkBackendReady(localizer.Format(
                 "status.backend.detail.log_written",
-                "初始化日志已写入：{0}",
+                "Initialization log written: {0}",
                 logPath));
         }
         catch (Exception ex)
         {
             _stateService.MarkBackendFaulted(localizer.Format(
                 "status.backend.detail.log_write_failed",
-                "初始化日志写入失败：{0}",
+                "Initialization log failed: {0}",
                 ex.Message));
             throw;
         }
 
         _clockService.Start();
 
-        context.RegisterSettingsPage(new PluginSettingsPageRegistration(
-            "status",
-            localizer.GetString("settings.page_title", "插件状态"),
-            () => new SamplePluginSettingsView(context)));
-
         context.RegisterDesktopComponent(new PluginDesktopComponentRegistration(
             "LanMountainDesktop.SamplePlugin.StatusClock",
-            localizer.GetString("widget.display_name", "示例插件状态时钟"),
+            localizer.GetString("widget.display_name", "Sample Plugin Status Clock"),
             widgetContext => new SamplePluginStatusClockWidget(widgetContext),
             iconKey: "PuzzlePiece",
-            category: localizer.GetString("widget.category", "插件"),
+            category: localizer.GetString("widget.category", "Plugins"),
             minWidthCells: 4,
             minHeightCells: 4,
             allowDesktopPlacement: true,
             allowStatusBarPlacement: false,
             resizeMode: PluginDesktopComponentResizeMode.Proportional,
             cornerRadiusResolver: cellSize => Math.Clamp(cellSize * 0.34, 18, 34)));
+
+        context.RegisterDesktopComponent(new PluginDesktopComponentRegistration(
+            "LanMountainDesktop.SamplePlugin.CloseDesktop",
+            localizer.GetString("widget.close_desktop.display_name", "Close Desktop"),
+            widgetContext => new SamplePluginCloseDesktopWidget(widgetContext),
+            iconKey: "DismissCircle",
+            category: localizer.GetString("widget.category", "Plugins"),
+            minWidthCells: 2,
+            minHeightCells: 1,
+            allowDesktopPlacement: true,
+            allowStatusBarPlacement: false,
+            resizeMode: PluginDesktopComponentResizeMode.Free,
+            cornerRadiusResolver: cellSize => Math.Clamp(cellSize * 0.28, 14, 22)));
     }
 
     public void Dispose()

LanAirApp/samples/LanMountainDesktop.SamplePlugin/SamplePluginCloseDesktopWidget.cs

@@ -0,0 +1,166 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+using LanMountainDesktop.PluginSdk;
+
+namespace LanMountainDesktop.SamplePlugin;
+
+internal sealed class SamplePluginCloseDesktopWidget : Border
+{
+    private readonly PluginLocalizer _localizer;
+    private readonly IHostApplicationLifecycle? _hostApplicationLifecycle;
+    private readonly TextBlock _titleTextBlock;
+    private readonly TextBlock _statusTextBlock;
+
+    public SamplePluginCloseDesktopWidget(PluginDesktopComponentContext context)
+    {
+        _localizer = PluginLocalizer.Create(context);
+        _hostApplicationLifecycle = context.GetService<IHostApplicationLifecycle>();
+
+        _titleTextBlock = new TextBlock
+        {
+            Text = T("widget.close_desktop.text", "关闭桌面"),
+            Foreground = Brushes.White,
+            FontWeight = FontWeight.SemiBold,
+            VerticalAlignment = VerticalAlignment.Center
+        };
+
+        _statusTextBlock = new TextBlock
+        {
+            Text = _hostApplicationLifecycle is null
+                ? T("widget.close_desktop.unavailable", "宿主未提供退出接口")
+                : T("widget.close_desktop.hint", "点击后退出阑山桌面"),
+            Foreground = new SolidColorBrush(Color.Parse("#FFD4E7F6")),
+            VerticalAlignment = VerticalAlignment.Center
+        };
+
+        var contentGrid = new Grid
+        {
+            ColumnDefinitions = new ColumnDefinitions("Auto,*"),
+            ColumnSpacing = 14,
+            VerticalAlignment = VerticalAlignment.Center,
+            Children =
+            {
+                CreateIconShell(),
+                new StackPanel
+                {
+                    Spacing = 2,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    Children =
+                    {
+                        _titleTextBlock,
+                        _statusTextBlock
+                    }
+                }
+            }
+        };
+
+        Grid.SetColumn(contentGrid.Children[1], 1);
+
+        var actionButton = new Button
+        {
+            HorizontalAlignment = HorizontalAlignment.Stretch,
+            VerticalAlignment = VerticalAlignment.Stretch,
+            HorizontalContentAlignment = HorizontalAlignment.Stretch,
+            VerticalContentAlignment = VerticalAlignment.Stretch,
+            Background = Brushes.Transparent,
+            BorderThickness = new Thickness(0),
+            Padding = new Thickness(0),
+            IsEnabled = _hostApplicationLifecycle is not null,
+            Content = contentGrid
+        };
+        actionButton.Click += OnButtonClick;
+
+        Background = new LinearGradientBrush
+        {
+            StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative),
+            EndPoint = new RelativePoint(1, 1, RelativeUnit.Relative),
+            GradientStops =
+            [
+                new GradientStop(Color.Parse("#FF0B1220"), 0),
+                new GradientStop(Color.Parse("#FF172554"), 0.55),
+                new GradientStop(Color.Parse("#FF7F1D1D"), 1)
+            ]
+        };
+        BorderBrush = new SolidColorBrush(Color.Parse("#66FB7185"));
+        BorderThickness = new Thickness(1);
+        CornerRadius = new CornerRadius(18);
+        Padding = new Thickness(14, 10);
+        Child = actionButton;
+
+        SizeChanged += OnSizeChanged;
+        ApplyScale();
+    }
+
+    private Border CreateIconShell()
+    {
+        return new Border
+        {
+            Width = 36,
+            Height = 36,
+            CornerRadius = new CornerRadius(999),
+            Background = new SolidColorBrush(Color.Parse("#33F87171")),
+            BorderBrush = new SolidColorBrush(Color.Parse("#88FCA5A5")),
+            BorderThickness = new Thickness(1),
+            VerticalAlignment = VerticalAlignment.Center,
+            Child = new TextBlock
+            {
+                Text = "⏻",
+                FontSize = 18,
+                Foreground = Brushes.White,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                TextAlignment = TextAlignment.Center
+            }
+        };
+    }
+
+    private void OnButtonClick(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+    {
+        if (_hostApplicationLifecycle?.TryExit(new HostApplicationLifecycleRequest(
+                Source: "SamplePlugin.CloseDesktopWidget",
+                Reason: "User invoked the sample plugin close-desktop widget.")) == true)
+        {
+            return;
+        }
+
+        _statusTextBlock.Text = T("widget.close_desktop.failed", "宿主未接受退出请求");
+    }
+
+    private void OnSizeChanged(object? sender, SizeChangedEventArgs e)
+    {
+        ApplyScale();
+    }
+
+    private void ApplyScale()
+    {
+        var basis = Bounds.Height > 1 ? Bounds.Height : 72;
+        Padding = new Thickness(Math.Clamp(basis * 0.18, 12, 18), Math.Clamp(basis * 0.14, 8, 14));
+        CornerRadius = new CornerRadius(Math.Clamp(basis * 0.32, 16, 24));
+
+        if (Child is not Button actionButton || actionButton.Content is not Grid contentGrid)
+        {
+            return;
+        }
+
+        if (contentGrid.Children[0] is Border iconShell)
+        {
+            var iconSize = Math.Clamp(basis * 0.58, 28, 40);
+            iconShell.Width = iconSize;
+            iconShell.Height = iconSize;
+            if (iconShell.Child is TextBlock iconText)
+            {
+                iconText.FontSize = Math.Clamp(iconSize * 0.5, 14, 20);
+            }
+        }
+
+        _titleTextBlock.FontSize = Math.Clamp(basis * 0.28, 14, 20);
+        _statusTextBlock.FontSize = Math.Clamp(basis * 0.18, 10, 13);
+    }
+
+    private string T(string key, string fallback)
+    {
+        return _localizer.GetString(key, fallback);
+    }
+}

LanMountainDesktop.PluginSdk/IComponentEditorHostContext.cs

@@ -0,0 +1,10 @@
+namespace LanMountainDesktop.PluginSdk;
+
+public interface IComponentEditorHostContext
+{
+    void RequestRefresh();
+
+    void CloseEditor();
+
+    void RequestRestart(string? reason = null);
+}

LanMountainDesktop.PluginSdk/IComponentSettingsAccessor.cs

@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public interface IComponentSettingsAccessor
+{
+    string ComponentId { get; }
+
+    string? PlacementId { get; }
+
+    T LoadSnapshot<T>() where T : new();
+
+    void SaveSnapshot<T>(T snapshot, IReadOnlyCollection<string>? changedKeys = null);
+
+    T LoadSection<T>(string sectionId) where T : new();
+
+    void SaveSection<T>(string sectionId, T section, IReadOnlyCollection<string>? changedKeys = null);
+
+    void DeleteSection(string sectionId);
+
+    T? GetValue<T>(string key);
+
+    void SetValue<T>(string key, T value, IReadOnlyCollection<string>? changedKeys = null);
+}

LanMountainDesktop.PluginSdk/IHostApplicationLifecycle.cs

@@ -0,0 +1,12 @@
+namespace LanMountainDesktop.PluginSdk;
+
+public sealed record HostApplicationLifecycleRequest(
+    string? Source = null,
+    string? Reason = null);
+
+public interface IHostApplicationLifecycle
+{
+    bool TryExit(HostApplicationLifecycleRequest? request = null);
+
+    bool TryRestart(HostApplicationLifecycleRequest? request = null);
+}

LanMountainDesktop.PluginSdk/IPlugin.cs

@@ -1,6 +1,9 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
 namespace LanMountainDesktop.PluginSdk;
 
 public interface IPlugin
 {
-    void Initialize(IPluginContext context);
+    void Initialize(HostBuilderContext context, IServiceCollection services);
 }

LanMountainDesktop.PluginSdk/IPluginContext.cs

@@ -1,27 +1,6 @@
-using System.Collections.Generic;
-
 namespace LanMountainDesktop.PluginSdk;
 
-public interface IPluginContext
+[Obsolete("Plugin API 3.0.0 uses IPluginRuntimeContext and IServiceCollection-based initialization.")]
+public interface IPluginContext : IPluginRuntimeContext
 {
-    PluginManifest Manifest { get; }
-
-    string PluginDirectory { get; }
-
-    string DataDirectory { get; }
-
-    IServiceProvider Services { get; }
-
-    IReadOnlyDictionary<string, object?> Properties { get; }
-
-    T? GetService<T>();
-
-    bool TryGetProperty<T>(string key, out T? value);
-
-    void RegisterService<TService>(TService service)
-        where TService : class;
-
-    void RegisterSettingsPage(PluginSettingsPageRegistration registration);
-
-    void RegisterDesktopComponent(PluginDesktopComponentRegistration registration);
 }

LanMountainDesktop.PluginSdk/IPluginExportRegistry.cs

@@ -0,0 +1,13 @@
+namespace LanMountainDesktop.PluginSdk;
+
+public interface IPluginExportRegistry
+{
+    IReadOnlyList<PluginServiceExportDescriptor> GetExports();
+
+    IReadOnlyList<PluginServiceExportDescriptor> GetExports(Type contractType);
+
+    PluginServiceExportDescriptor? GetExport(Type contractType, string providerPluginId);
+
+    TContract? GetExport<TContract>(string providerPluginId)
+        where TContract : class;
+}

LanMountainDesktop.PluginSdk/IPluginRuntimeContext.cs

@@ -0,0 +1,18 @@
+namespace LanMountainDesktop.PluginSdk;
+
+public interface IPluginRuntimeContext
+{
+    PluginManifest Manifest { get; }
+
+    string PluginDirectory { get; }
+
+    string DataDirectory { get; }
+
+    IServiceProvider Services { get; }
+
+    IReadOnlyDictionary<string, object?> Properties { get; }
+
+    T? GetService<T>();
+
+    bool TryGetProperty<T>(string key, out T? value);
+}

LanMountainDesktop.PluginSdk/IPluginSettingsService.cs

@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public interface IPluginSettingsService
+{
+    string PluginId { get; }
+
+    IComponentSettingsAccessor GetComponentAccessor(string componentId, string? placementId);
+
+    T LoadComponentSection<T>(string componentId, string? placementId, string sectionId) where T : new();
+
+    void SaveComponentSection<T>(
+        string componentId,
+        string? placementId,
+        string sectionId,
+        T section,
+        IReadOnlyCollection<string>? changedKeys = null);
+
+    void DeleteComponentSection(string componentId, string? placementId, string sectionId);
+}

LanMountainDesktop.PluginSdk/ISettingsCatalog.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public interface ISettingsCatalog
+{
+    IReadOnlyList<SettingsSectionDefinition> GetSections();
+
+    IReadOnlyList<SettingsSectionDefinition> GetSections(SettingsScope scope);
+}

LanMountainDesktop.PluginSdk/ISettingsPageHostContext.cs

@@ -0,0 +1,12 @@
+using Avalonia.Controls;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public interface ISettingsPageHostContext
+{
+    void OpenDrawer(Control content, string? title = null);
+
+    void CloseDrawer();
+
+    void RequestRestart(string? reason = null);
+}

LanMountainDesktop.PluginSdk/ISettingsService.cs

@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public interface ISettingsService
+{
+    event EventHandler<SettingsChangedEvent>? Changed;
+
+    T LoadSnapshot<T>(SettingsScope scope, string? subjectId = null, string? placementId = null) where T : new();
+
+    void SaveSnapshot<T>(
+        SettingsScope scope,
+        T snapshot,
+        string? subjectId = null,
+        string? placementId = null,
+        string? sectionId = null,
+        IReadOnlyCollection<string>? changedKeys = null);
+
+    T LoadSection<T>(
+        SettingsScope scope,
+        string subjectId,
+        string sectionId,
+        string? placementId = null) where T : new();
+
+    void SaveSection<T>(
+        SettingsScope scope,
+        string subjectId,
+        string sectionId,
+        T section,
+        string? placementId = null,
+        IReadOnlyCollection<string>? changedKeys = null);
+
+    void DeleteSection(
+        SettingsScope scope,
+        string subjectId,
+        string sectionId,
+        string? placementId = null);
+
+    T? GetValue<T>(
+        SettingsScope scope,
+        string key,
+        string? subjectId = null,
+        string? placementId = null,
+        string? sectionId = null);
+
+    void SetValue<T>(
+        SettingsScope scope,
+        string key,
+        T value,
+        string? subjectId = null,
+        string? placementId = null,
+        string? sectionId = null,
+        IReadOnlyCollection<string>? changedKeys = null);
+
+    IComponentSettingsAccessor GetComponentAccessor(string componentId, string? placementId);
+}

LanMountainDesktop.PluginSdk/LanMountainDesktop.PluginSdk.csproj

@@ -1,15 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>1.0.0</Version>
+    <Version>3.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Remove="_build_verify_*\**\*.cs" />
     <PackageReference Include="Avalonia" Version="11.3.12" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
   </ItemGroup>
 
 </Project>

LanMountainDesktop.PluginSdk/PluginBase.cs

@@ -1,8 +1,11 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
 namespace LanMountainDesktop.PluginSdk;
 
 public abstract class PluginBase : IPlugin
 {
-    public virtual void Initialize(IPluginContext context)
+    public virtual void Initialize(HostBuilderContext context, IServiceCollection services)
     {
     }
 }

LanMountainDesktop.PluginSdk/PluginDesktopComponentContext.cs

@@ -10,7 +10,8 @@ public sealed class PluginDesktopComponentContext
         IReadOnlyDictionary<string, object?> properties,
         string componentId,
         string? placementId,
-        double cellSize)
+        double cellSize,
+        IPluginSettingsService? pluginSettings = null)
     {
         ArgumentNullException.ThrowIfNull(manifest);
         ArgumentException.ThrowIfNullOrWhiteSpace(pluginDirectory);
@@ -27,6 +28,7 @@ public sealed class PluginDesktopComponentContext
         ComponentId = componentId.Trim();
         PlacementId = string.IsNullOrWhiteSpace(placementId) ? null : placementId.Trim();
         CellSize = Math.Max(1, cellSize);
+        PluginSettings = pluginSettings;
     }
 
     public PluginManifest Manifest { get; }
@@ -45,6 +47,8 @@ public sealed class PluginDesktopComponentContext
 
     public double CellSize { get; }
 
+    public IPluginSettingsService? PluginSettings { get; }
+
     public T? GetService<T>()
     {
         return (T?)Services.GetService(typeof(T));

LanMountainDesktop.PluginSdk/PluginDesktopComponentEditorContext.cs

@@ -0,0 +1,71 @@
+namespace LanMountainDesktop.PluginSdk;
+
+public sealed class PluginDesktopComponentEditorContext
+{
+    public PluginDesktopComponentEditorContext(
+        PluginManifest manifest,
+        string pluginDirectory,
+        string dataDirectory,
+        IServiceProvider services,
+        IReadOnlyDictionary<string, object?> properties,
+        string componentId,
+        string? placementId,
+        IPluginSettingsService? pluginSettings,
+        IComponentEditorHostContext hostContext)
+    {
+        ArgumentNullException.ThrowIfNull(manifest);
+        ArgumentException.ThrowIfNullOrWhiteSpace(pluginDirectory);
+        ArgumentException.ThrowIfNullOrWhiteSpace(dataDirectory);
+        ArgumentException.ThrowIfNullOrWhiteSpace(componentId);
+        ArgumentNullException.ThrowIfNull(services);
+        ArgumentNullException.ThrowIfNull(properties);
+        ArgumentNullException.ThrowIfNull(hostContext);
+
+        Manifest = manifest;
+        PluginDirectory = pluginDirectory;
+        DataDirectory = dataDirectory;
+        Services = services;
+        Properties = properties;
+        ComponentId = componentId.Trim();
+        PlacementId = string.IsNullOrWhiteSpace(placementId) ? null : placementId.Trim();
+        PluginSettings = pluginSettings;
+        HostContext = hostContext;
+    }
+
+    public PluginManifest Manifest { get; }
+
+    public string PluginDirectory { get; }
+
+    public string DataDirectory { get; }
+
+    public IServiceProvider Services { get; }
+
+    public IReadOnlyDictionary<string, object?> Properties { get; }
+
+    public string ComponentId { get; }
+
+    public string? PlacementId { get; }
+
+    public IPluginSettingsService? PluginSettings { get; }
+
+    public IComponentEditorHostContext HostContext { get; }
+
+    public T? GetService<T>()
+    {
+        return (T?)Services.GetService(typeof(T));
+    }
+
+    public bool TryGetProperty<T>(string key, out T? value)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(key);
+
+        if (Properties.TryGetValue(key, out var rawValue) && rawValue is T typedValue)
+        {
+            value = typedValue;
+            return true;
+        }
+
+        value = default;
+        return false;
+    }
+}

LanMountainDesktop.PluginSdk/PluginDesktopComponentEditorRegistration.cs

@@ -0,0 +1,77 @@
+using Avalonia.Controls;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public sealed class PluginDesktopComponentEditorRegistration
+{
+    public PluginDesktopComponentEditorRegistration(
+        string componentId,
+        Func<IServiceProvider, PluginDesktopComponentEditorContext, Control> editorFactory,
+        double preferredWidth = 720d,
+        double preferredHeight = 540d,
+        double minScale = 0.85d,
+        double maxScale = 1.45d)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(componentId);
+        ArgumentNullException.ThrowIfNull(editorFactory);
+
+        if (preferredWidth <= 0)
+        {
+            throw new ArgumentOutOfRangeException(nameof(preferredWidth));
+        }
+
+        if (preferredHeight <= 0)
+        {
+            throw new ArgumentOutOfRangeException(nameof(preferredHeight));
+        }
+
+        if (minScale <= 0)
+        {
+            throw new ArgumentOutOfRangeException(nameof(minScale));
+        }
+
+        if (maxScale < minScale)
+        {
+            throw new ArgumentOutOfRangeException(nameof(maxScale));
+        }
+
+        ComponentId = componentId.Trim();
+        EditorFactory = editorFactory;
+        PreferredWidth = preferredWidth;
+        PreferredHeight = preferredHeight;
+        MinScale = minScale;
+        MaxScale = maxScale;
+        AspectRatio = preferredWidth / preferredHeight;
+    }
+
+    public PluginDesktopComponentEditorRegistration(
+        string componentId,
+        Func<PluginDesktopComponentEditorContext, Control> editorFactory,
+        double preferredWidth = 720d,
+        double preferredHeight = 540d,
+        double minScale = 0.85d,
+        double maxScale = 1.45d)
+        : this(
+            componentId,
+            (_, context) => editorFactory(context),
+            preferredWidth,
+            preferredHeight,
+            minScale,
+            maxScale)
+    {
+    }
+
+    public string ComponentId { get; }
+
+    public Func<IServiceProvider, PluginDesktopComponentEditorContext, Control> EditorFactory { get; }
+
+    public double PreferredWidth { get; }
+
+    public double PreferredHeight { get; }
+
+    public double MinScale { get; }
+
+    public double MaxScale { get; }
+
+    public double AspectRatio { get; }
+}

LanMountainDesktop.PluginSdk/PluginDesktopComponentRegistration.cs

@@ -7,7 +7,7 @@ public sealed class PluginDesktopComponentRegistration
     public PluginDesktopComponentRegistration(
         string componentId,
         string displayName,
-        Func<PluginDesktopComponentContext, Control> controlFactory,
+        Func<IServiceProvider, PluginDesktopComponentContext, Control> controlFactory,
         string iconKey = "PuzzlePiece",
         string category = "Plugins",
         int minWidthCells = 2,
@@ -40,13 +40,42 @@ public sealed class PluginDesktopComponentRegistration
         CornerRadiusResolver = cornerRadiusResolver;
     }
 
+    public PluginDesktopComponentRegistration(
+        string componentId,
+        string displayName,
+        Func<PluginDesktopComponentContext, Control> controlFactory,
+        string iconKey = "PuzzlePiece",
+        string category = "Plugins",
+        int minWidthCells = 2,
+        int minHeightCells = 2,
+        bool allowDesktopPlacement = true,
+        bool allowStatusBarPlacement = false,
+        PluginDesktopComponentResizeMode resizeMode = PluginDesktopComponentResizeMode.Proportional,
+        string? displayNameLocalizationKey = null,
+        Func<double, double>? cornerRadiusResolver = null)
+        : this(
+            componentId,
+            displayName,
+            (_, context) => controlFactory(context),
+            iconKey,
+            category,
+            minWidthCells,
+            minHeightCells,
+            allowDesktopPlacement,
+            allowStatusBarPlacement,
+            resizeMode,
+            displayNameLocalizationKey,
+            cornerRadiusResolver)
+    {
+    }
+
     public string ComponentId { get; }
 
     public string DisplayName { get; }
 
     public string? DisplayNameLocalizationKey { get; }
 
-    public Func<PluginDesktopComponentContext, Control> ControlFactory { get; }
+    public Func<IServiceProvider, PluginDesktopComponentContext, Control> ControlFactory { get; }
 
     public string IconKey { get; }
 

LanMountainDesktop.PluginSdk/PluginLocalizer.cs

@@ -26,7 +26,7 @@ public sealed class PluginLocalizer
 
     public string LanguageCode { get; }
 
-    public static PluginLocalizer Create(IPluginContext context)
+    public static PluginLocalizer Create(IPluginRuntimeContext context)
     {
         ArgumentNullException.ThrowIfNull(context);
         return new PluginLocalizer(context.PluginDirectory, ResolveLanguageCode(context.Properties));

LanMountainDesktop.PluginSdk/PluginManifest.cs

@@ -9,7 +9,8 @@ public sealed record PluginManifest(
     string? Description = null,
     string? Author = null,
     string? Version = null,
-    string? ApiVersion = null)
+    string? ApiVersion = null,
+    IReadOnlyList<PluginSharedContractReference>? SharedContracts = null)
 {
     private static readonly JsonSerializerOptions SerializerOptions = new()
     {
@@ -57,6 +58,7 @@ public sealed record PluginManifest(
 
     private PluginManifest NormalizeAndValidate(string manifestPath)
     {
+        var normalizedSharedContracts = NormalizeSharedContracts(manifestPath, SharedContracts);
         var normalized = this with
         {
             Id = RequireValue(Id, nameof(Id), manifestPath),
@@ -65,7 +67,8 @@ public sealed record PluginManifest(
             Description = NormalizeOptionalValue(Description),
             Author = NormalizeOptionalValue(Author),
             Version = NormalizeOptionalValue(Version),
-            ApiVersion = NormalizeOptionalValue(ApiVersion) ?? PluginSdkInfo.ApiVersion
+            ApiVersion = NormalizeOptionalValue(ApiVersion) ?? PluginSdkInfo.ApiVersion,
+            SharedContracts = normalizedSharedContracts
         };
 
         if (!System.Version.TryParse(normalized.ApiVersion, out var requestedVersion))
@@ -82,7 +85,44 @@ public sealed record PluginManifest(
         if (requestedVersion.Major != currentVersion.Major)
         {
             throw new InvalidOperationException(
-                $"Plugin '{normalized.Id}' targets API version '{normalized.ApiVersion}', but the host provides '{PluginSdkInfo.ApiVersion}'.");
+                $"Plugin '{normalized.Id}' targets API version '{normalized.ApiVersion}' (major {requestedVersion.Major}), " +
+                $"but the host provides '{PluginSdkInfo.ApiVersion}' (major {currentVersion.Major}). " +
+                $"This host only supports v{currentVersion.Major}.x plugins. " +
+                $"Migrate the plugin to API {PluginSdkInfo.ApiVersion} and rebuild the package.");
+        }
+
+        return normalized;
+    }
+
+    private static IReadOnlyList<PluginSharedContractReference> NormalizeSharedContracts(
+        string manifestPath,
+        IReadOnlyList<PluginSharedContractReference>? sharedContracts)
+    {
+        if (sharedContracts is null || sharedContracts.Count == 0)
+        {
+            return Array.Empty<PluginSharedContractReference>();
+        }
+
+        var normalized = new List<PluginSharedContractReference>(sharedContracts.Count);
+        var seenIds = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+        foreach (var contract in sharedContracts)
+        {
+            if (contract is null)
+            {
+                throw new InvalidOperationException(
+                    $"Plugin manifest '{manifestPath}' contains a null shared contract declaration.");
+            }
+
+            var normalizedContract = contract.NormalizeAndValidate(manifestPath);
+            var contractKey = $"{normalizedContract.Id}@{normalizedContract.Version}";
+            if (!seenIds.Add(contractKey))
+            {
+                throw new InvalidOperationException(
+                    $"Plugin manifest '{manifestPath}' declares duplicate shared contract '{contractKey}'.");
+            }
+
+            normalized.Add(normalizedContract);
         }
 
         return normalized;

LanMountainDesktop.PluginSdk/PluginSdkInfo.cs

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

LanMountainDesktop.PluginSdk/PluginServiceCollectionExtensions.cs

@@ -0,0 +1,122 @@
+using Avalonia.Controls;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public static class PluginServiceCollectionExtensions
+{
+    public static IServiceCollection AddPluginSettingsSection(
+        this IServiceCollection services,
+        string id,
+        string titleLocalizationKey,
+        Action<PluginSettingsSectionBuilder> configure,
+        string? descriptionLocalizationKey = null,
+        string iconKey = "PuzzlePiece",
+        int sortOrder = 0)
+    {
+        ArgumentNullException.ThrowIfNull(services);
+        ArgumentNullException.ThrowIfNull(configure);
+
+        var builder = new PluginSettingsSectionBuilder(
+            id,
+            titleLocalizationKey,
+            descriptionLocalizationKey,
+            iconKey,
+            sortOrder);
+        configure(builder);
+        services.AddSingleton(builder.Build());
+        return services;
+    }
+
+    public static IServiceCollection AddPluginDesktopComponent<TControl>(
+        this IServiceCollection services,
+        string componentId,
+        string displayName,
+        string iconKey = "PuzzlePiece",
+        string category = "Plugins",
+        int minWidthCells = 2,
+        int minHeightCells = 2,
+        bool allowDesktopPlacement = true,
+        bool allowStatusBarPlacement = false,
+        PluginDesktopComponentResizeMode resizeMode = PluginDesktopComponentResizeMode.Proportional,
+        string? displayNameLocalizationKey = null,
+        Func<double, double>? cornerRadiusResolver = null)
+        where TControl : Control
+    {
+        ArgumentNullException.ThrowIfNull(services);
+
+        services.AddSingleton(new PluginDesktopComponentRegistration(
+            componentId,
+            displayName,
+            (provider, context) => ActivatorUtilities.CreateInstance<TControl>(provider, context),
+            iconKey,
+            category,
+            minWidthCells,
+            minHeightCells,
+            allowDesktopPlacement,
+            allowStatusBarPlacement,
+            resizeMode,
+            displayNameLocalizationKey,
+            cornerRadiusResolver));
+        return services;
+    }
+
+    public static IServiceCollection AddPluginDesktopComponentEditor<TControl>(
+        this IServiceCollection services,
+        string componentId,
+        double preferredWidth = 720d,
+        double preferredHeight = 540d,
+        double minScale = 0.85d,
+        double maxScale = 1.45d)
+        where TControl : Control
+    {
+        ArgumentNullException.ThrowIfNull(services);
+
+        services.AddSingleton(new PluginDesktopComponentEditorRegistration(
+            componentId,
+            (provider, context) => ActivatorUtilities.CreateInstance<TControl>(provider, context),
+            preferredWidth,
+            preferredHeight,
+            minScale,
+            maxScale));
+        return services;
+    }
+
+    public static IServiceCollection AddPluginExport<TContract, TImplementation>(this IServiceCollection services)
+        where TContract : class
+        where TImplementation : class, TContract
+    {
+        ArgumentNullException.ThrowIfNull(services);
+
+        EnsureSingletonRegistration<TContract, TImplementation>(services);
+
+        if (!services.Any(descriptor =>
+                descriptor.ServiceType == typeof(PluginServiceExportRegistration) &&
+                descriptor.ImplementationInstance is PluginServiceExportRegistration existing &&
+                existing.ContractType == typeof(TContract) &&
+                existing.ImplementationType == typeof(TImplementation)))
+        {
+            services.AddSingleton(new PluginServiceExportRegistration(typeof(TContract), typeof(TImplementation)));
+        }
+
+        return services;
+    }
+
+    private static void EnsureSingletonRegistration<TContract, TImplementation>(IServiceCollection services)
+        where TContract : class
+        where TImplementation : class, TContract
+    {
+        var contractDescriptor = services.LastOrDefault(descriptor => descriptor.ServiceType == typeof(TContract));
+        if (contractDescriptor is null)
+        {
+            services.AddSingleton<TContract, TImplementation>();
+            return;
+        }
+
+        if (contractDescriptor.Lifetime != ServiceLifetime.Singleton)
+        {
+            throw new InvalidOperationException(
+                $"Exported contract '{typeof(TContract).FullName}' must be registered as Singleton.");
+        }
+    }
+}

LanMountainDesktop.PluginSdk/PluginServiceExportDescriptor.cs

@@ -0,0 +1,6 @@
+namespace LanMountainDesktop.PluginSdk;
+
+public sealed record PluginServiceExportDescriptor(
+    string ProviderPluginId,
+    Type ContractType,
+    object ServiceInstance);

LanMountainDesktop.PluginSdk/PluginServiceExportRegistration.cs

@@ -0,0 +1,17 @@
+namespace LanMountainDesktop.PluginSdk;
+
+public sealed class PluginServiceExportRegistration
+{
+    public PluginServiceExportRegistration(Type contractType, Type implementationType)
+    {
+        ArgumentNullException.ThrowIfNull(contractType);
+        ArgumentNullException.ThrowIfNull(implementationType);
+
+        ContractType = contractType;
+        ImplementationType = implementationType;
+    }
+
+    public Type ContractType { get; }
+
+    public Type ImplementationType { get; }
+}

LanMountainDesktop.PluginSdk/PluginSettingsPageRegistration.cs

@@ -1,30 +0,0 @@
-using Avalonia.Controls;
-
-namespace LanMountainDesktop.PluginSdk;
-
-public sealed class PluginSettingsPageRegistration
-{
-    public PluginSettingsPageRegistration(
-        string id,
-        string title,
-        Func<Control> contentFactory,
-        int sortOrder = 0)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(id);
-        ArgumentException.ThrowIfNullOrWhiteSpace(title);
-        ArgumentNullException.ThrowIfNull(contentFactory);
-
-        Id = id.Trim();
-        Title = title.Trim();
-        ContentFactory = contentFactory;
-        SortOrder = sortOrder;
-    }
-
-    public string Id { get; }
-
-    public string Title { get; }
-
-    public int SortOrder { get; }
-
-    public Func<Control> ContentFactory { get; }
-}

LanMountainDesktop.PluginSdk/PluginSettingsSectionBuilder.cs

@@ -0,0 +1,147 @@
+using System.Collections.Generic;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public sealed class PluginSettingsSectionBuilder
+{
+    private readonly List<SettingsOptionDefinition> _options = [];
+
+    internal PluginSettingsSectionBuilder(
+        string id,
+        string titleLocalizationKey,
+        string? descriptionLocalizationKey,
+        string iconKey,
+        int sortOrder)
+    {
+        Id = id;
+        TitleLocalizationKey = titleLocalizationKey;
+        DescriptionLocalizationKey = descriptionLocalizationKey;
+        IconKey = iconKey;
+        SortOrder = sortOrder;
+    }
+
+    public string Id { get; }
+
+    public string TitleLocalizationKey { get; }
+
+    public string? DescriptionLocalizationKey { get; }
+
+    public string IconKey { get; }
+
+    public int SortOrder { get; }
+
+    public IReadOnlyList<SettingsOptionDefinition> Options => _options;
+
+    public PluginSettingsSectionBuilder AddOption(SettingsOptionDefinition option)
+    {
+        ArgumentNullException.ThrowIfNull(option);
+        _options.Add(option);
+        return this;
+    }
+
+    public PluginSettingsSectionBuilder AddToggle(
+        string key,
+        string titleLocalizationKey,
+        string? descriptionLocalizationKey = null,
+        bool defaultValue = false)
+    {
+        return AddOption(new SettingsOptionDefinition(
+            key,
+            SettingsOptionType.Toggle,
+            titleLocalizationKey,
+            descriptionLocalizationKey,
+            defaultValue));
+    }
+
+    public PluginSettingsSectionBuilder AddText(
+        string key,
+        string titleLocalizationKey,
+        string? descriptionLocalizationKey = null,
+        string defaultValue = "",
+        string? validationPattern = null)
+    {
+        return AddOption(new SettingsOptionDefinition(
+            key,
+            SettingsOptionType.Text,
+            titleLocalizationKey,
+            descriptionLocalizationKey,
+            defaultValue,
+            validationPattern: validationPattern));
+    }
+
+    public PluginSettingsSectionBuilder AddNumber(
+        string key,
+        string titleLocalizationKey,
+        string? descriptionLocalizationKey = null,
+        double defaultValue = 0,
+        double? minimum = null,
+        double? maximum = null)
+    {
+        return AddOption(new SettingsOptionDefinition(
+            key,
+            SettingsOptionType.Number,
+            titleLocalizationKey,
+            descriptionLocalizationKey,
+            defaultValue,
+            minimum: minimum,
+            maximum: maximum));
+    }
+
+    public PluginSettingsSectionBuilder AddSelect(
+        string key,
+        string titleLocalizationKey,
+        IEnumerable<SettingsOptionChoice> choices,
+        string? descriptionLocalizationKey = null,
+        string? defaultValue = null)
+    {
+        ArgumentNullException.ThrowIfNull(choices);
+        var normalizedChoices = choices.ToArray();
+
+        return AddOption(new SettingsOptionDefinition(
+            key,
+            SettingsOptionType.Select,
+            titleLocalizationKey,
+            descriptionLocalizationKey,
+            defaultValue,
+            normalizedChoices));
+    }
+
+    public PluginSettingsSectionBuilder AddPath(
+        string key,
+        string titleLocalizationKey,
+        string? descriptionLocalizationKey = null,
+        string defaultValue = "")
+    {
+        return AddOption(new SettingsOptionDefinition(
+            key,
+            SettingsOptionType.Path,
+            titleLocalizationKey,
+            descriptionLocalizationKey,
+            defaultValue));
+    }
+
+    public PluginSettingsSectionBuilder AddList(
+        string key,
+        string titleLocalizationKey,
+        string? descriptionLocalizationKey = null,
+        IReadOnlyList<string>? defaultValue = null)
+    {
+        return AddOption(new SettingsOptionDefinition(
+            key,
+            SettingsOptionType.List,
+            titleLocalizationKey,
+            descriptionLocalizationKey,
+            defaultValue ?? Array.Empty<string>()));
+    }
+
+    internal PluginSettingsSectionRegistration Build()
+    {
+        return new PluginSettingsSectionRegistration(
+            Id,
+            TitleLocalizationKey,
+            _options.ToArray(),
+            DescriptionLocalizationKey,
+            IconKey,
+            SortOrder);
+    }
+}

LanMountainDesktop.PluginSdk/PluginSettingsSectionRegistration.cs

@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public sealed class PluginSettingsSectionRegistration
+{
+    public PluginSettingsSectionRegistration(
+        string id,
+        string titleLocalizationKey,
+        IReadOnlyList<SettingsOptionDefinition> options,
+        string? descriptionLocalizationKey = null,
+        string iconKey = "PuzzlePiece",
+        int sortOrder = 0)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(id);
+        ArgumentException.ThrowIfNullOrWhiteSpace(titleLocalizationKey);
+        ArgumentException.ThrowIfNullOrWhiteSpace(iconKey);
+
+        Id = id.Trim();
+        TitleLocalizationKey = titleLocalizationKey.Trim();
+        DescriptionLocalizationKey = string.IsNullOrWhiteSpace(descriptionLocalizationKey)
+            ? null
+            : descriptionLocalizationKey.Trim();
+        IconKey = iconKey.Trim();
+        SortOrder = sortOrder;
+        Options = options ?? [];
+    }
+
+    public string Id { get; }
+
+    public string TitleLocalizationKey { get; }
+
+    public string? DescriptionLocalizationKey { get; }
+
+    public string IconKey { get; }
+
+    public int SortOrder { get; }
+
+    public IReadOnlyList<SettingsOptionDefinition> Options { get; }
+}

LanMountainDesktop.PluginSdk/PluginSharedContractReference.cs

@@ -0,0 +1,47 @@
+using System.Text.Json.Serialization;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public sealed record PluginSharedContractReference(
+    string Id,
+    string Version,
+    string AssemblyName)
+{
+    [JsonIgnore]
+    public string NormalizedId => Id.Trim();
+
+    [JsonIgnore]
+    public string NormalizedVersion => Version.Trim();
+
+    [JsonIgnore]
+    public string NormalizedAssemblyName => AssemblyName.Trim();
+
+    internal PluginSharedContractReference NormalizeAndValidate(string manifestPath)
+    {
+        var normalized = this with
+        {
+            Id = RequireValue(Id, nameof(Id), manifestPath),
+            Version = RequireValue(Version, nameof(Version), manifestPath),
+            AssemblyName = RequireValue(AssemblyName, nameof(AssemblyName), manifestPath)
+        };
+
+        if (!System.Version.TryParse(normalized.Version, out _))
+        {
+            throw new InvalidOperationException(
+                $"Plugin manifest '{manifestPath}' declares invalid shared contract version '{normalized.Version}' for '{normalized.Id}'.");
+        }
+
+        return normalized;
+    }
+
+    private static string RequireValue(string? value, string propertyName, string manifestPath)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            throw new InvalidOperationException(
+                $"Plugin manifest '{manifestPath}' is missing required shared contract property '{propertyName}'.");
+        }
+
+        return value.Trim();
+    }
+}

LanMountainDesktop.PluginSdk/SettingsCategories.cs

@@ -0,0 +1,14 @@
+namespace LanMountainDesktop.PluginSdk;
+
+public static class SettingsCategories
+{
+    public const string General = "General";
+    public const string Appearance = "Appearance";
+    public const string Components = "Components";
+    public const string Plugins = "Plugins";
+    public const string PluginMarket = "PluginMarket";
+    public const string Update = "Update";
+    public const string About = "About";
+    public const string Advanced = "Advanced";
+    public const string External = "External";
+}

LanMountainDesktop.PluginSdk/SettingsChangedEvent.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public sealed class SettingsChangedEvent
+{
+    public SettingsChangedEvent(
+        SettingsScope scope,
+        string? subjectId = null,
+        string? placementId = null,
+        string? sectionId = null,
+        IReadOnlyCollection<string>? changedKeys = null)
+    {
+        Scope = scope;
+        SubjectId = string.IsNullOrWhiteSpace(subjectId) ? null : subjectId.Trim();
+        PlacementId = string.IsNullOrWhiteSpace(placementId) ? null : placementId.Trim();
+        SectionId = string.IsNullOrWhiteSpace(sectionId) ? null : sectionId.Trim();
+        ChangedKeys = changedKeys is { Count: > 0 }
+            ? changedKeys.ToArray()
+            : [];
+    }
+
+    public SettingsScope Scope { get; }
+
+    public string? SubjectId { get; }
+
+    public string? PlacementId { get; }
+
+    public string? SectionId { get; }
+
+    public IReadOnlyCollection<string> ChangedKeys { get; }
+}

LanMountainDesktop.PluginSdk/SettingsOptionChoice.cs

@@ -0,0 +1,17 @@
+namespace LanMountainDesktop.PluginSdk;
+
+public sealed class SettingsOptionChoice
+{
+    public SettingsOptionChoice(string value, string titleLocalizationKey)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(value);
+        ArgumentException.ThrowIfNullOrWhiteSpace(titleLocalizationKey);
+
+        Value = value.Trim();
+        TitleLocalizationKey = titleLocalizationKey.Trim();
+    }
+
+    public string Value { get; }
+
+    public string TitleLocalizationKey { get; }
+}

LanMountainDesktop.PluginSdk/SettingsOptionDefinition.cs

@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public sealed class SettingsOptionDefinition
+{
+    public SettingsOptionDefinition(
+        string key,
+        SettingsOptionType optionType,
+        string titleLocalizationKey,
+        string? descriptionLocalizationKey = null,
+        object? defaultValue = null,
+        IReadOnlyList<SettingsOptionChoice>? choices = null,
+        double? minimum = null,
+        double? maximum = null,
+        string? validationPattern = null)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(key);
+        ArgumentException.ThrowIfNullOrWhiteSpace(titleLocalizationKey);
+
+        Key = key.Trim();
+        OptionType = optionType;
+        TitleLocalizationKey = titleLocalizationKey.Trim();
+        DescriptionLocalizationKey = string.IsNullOrWhiteSpace(descriptionLocalizationKey)
+            ? null
+            : descriptionLocalizationKey.Trim();
+        DefaultValue = defaultValue;
+        Choices = choices ?? [];
+        Minimum = minimum;
+        Maximum = maximum;
+        ValidationPattern = string.IsNullOrWhiteSpace(validationPattern)
+            ? null
+            : validationPattern.Trim();
+    }
+
+    public string Key { get; }
+
+    public SettingsOptionType OptionType { get; }
+
+    public string TitleLocalizationKey { get; }
+
+    public string? DescriptionLocalizationKey { get; }
+
+    public object? DefaultValue { get; }
+
+    public IReadOnlyList<SettingsOptionChoice> Choices { get; }
+
+    public double? Minimum { get; }
+
+    public double? Maximum { get; }
+
+    public string? ValidationPattern { get; }
+}

LanMountainDesktop.PluginSdk/SettingsOptionType.cs

@@ -0,0 +1,11 @@
+namespace LanMountainDesktop.PluginSdk;
+
+public enum SettingsOptionType
+{
+    Toggle = 0,
+    Select = 1,
+    Text = 2,
+    Number = 3,
+    Path = 4,
+    List = 5
+}

LanMountainDesktop.PluginSdk/SettingsPageBase.cs

@@ -0,0 +1,54 @@
+using System;
+using Avalonia.Controls;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public abstract class SettingsPageBase : UserControl
+{
+    public static readonly string DialogHostIdentifier = "LanMountainDesktop.SettingsWindow";
+
+    private ISettingsPageHostContext? _hostContext;
+
+    public ISettingsPageHostContext? HostContext => _hostContext;
+
+    public Uri? NavigationUri { get; set; }
+
+    public void InitializeHostContext(ISettingsPageHostContext hostContext)
+    {
+        _hostContext = hostContext;
+    }
+
+    public virtual void OnNavigatedTo(object? parameter)
+    {
+    }
+
+    protected void OpenDrawer(Control content, string? title = null)
+    {
+        _hostContext?.OpenDrawer(content, title);
+    }
+
+    protected void OpenDrawer(object content, bool usePageDataContext = false, object? dataContext = null, string? title = null)
+    {
+        if (content is Control control && !usePageDataContext)
+        {
+            control.DataContext = dataContext ?? DataContext ?? this;
+            OpenDrawer(control, title);
+            return;
+        }
+
+        if (content is Control drawerControl)
+        {
+            OpenDrawer(drawerControl, title);
+        }
+    }
+
+    protected void CloseDrawer()
+    {
+        _hostContext?.CloseDrawer();
+    }
+
+    protected void RequestRestart(string? reason = null)
+    {
+        _hostContext?.RequestRestart(reason);
+    }
+}

LanMountainDesktop.PluginSdk/SettingsPageCategory.cs

@@ -0,0 +1,11 @@
+namespace LanMountainDesktop.PluginSdk;
+
+public enum SettingsPageCategory
+{
+    General = 0,
+    Appearance = 10,
+    Components = 20,
+    Plugins = 30,
+    PluginMarket = 35,
+    About = 40
+}

LanMountainDesktop.PluginSdk/SettingsPageInfoAttribute.cs

@@ -0,0 +1,46 @@
+using System;
+
+namespace LanMountainDesktop.PluginSdk;
+
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+public sealed class SettingsPageInfoAttribute : Attribute
+{
+    public SettingsPageInfoAttribute(
+        string id,
+        string name,
+        SettingsPageCategory category)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(id);
+        ArgumentException.ThrowIfNullOrWhiteSpace(name);
+
+        Id = id.Trim();
+        Name = name.Trim();
+        Category = category;
+    }
+
+    public string Id { get; }
+
+    public string Name { get; }
+
+    public SettingsPageCategory Category { get; }
+
+    public string? TitleLocalizationKey { get; init; }
+
+    public string? DescriptionLocalizationKey { get; init; }
+
+    public string IconKey { get; init; } = "Settings";
+
+    public string? SelectedIconKey { get; init; }
+
+    public int SortOrder { get; init; }
+
+    public bool HideDefault { get; init; }
+
+    public bool HidePageTitle { get; init; }
+
+    public bool UseFullWidth { get; init; }
+
+    public string? GroupId { get; init; }
+
+    public SettingsScope Scope { get; init; } = SettingsScope.App;
+}

LanMountainDesktop.PluginSdk/SettingsScope.cs

@@ -0,0 +1,9 @@
+namespace LanMountainDesktop.PluginSdk;
+
+public enum SettingsScope
+{
+    App = 0,
+    Launcher = 1,
+    Plugin = 2,
+    ComponentInstance = 3
+}

LanMountainDesktop.PluginSdk/SettingsSectionDefinition.cs

@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+
+namespace LanMountainDesktop.PluginSdk;
+
+public sealed class SettingsSectionDefinition
+{
+    public SettingsSectionDefinition(
+        string id,
+        string category,
+        SettingsScope scope,
+        string titleLocalizationKey,
+        string? descriptionLocalizationKey = null,
+        string iconKey = "Settings",
+        int sortOrder = 0,
+        string? subjectId = null,
+        IReadOnlyList<SettingsOptionDefinition>? options = null)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(id);
+        ArgumentException.ThrowIfNullOrWhiteSpace(category);
+        ArgumentException.ThrowIfNullOrWhiteSpace(titleLocalizationKey);
+        ArgumentException.ThrowIfNullOrWhiteSpace(iconKey);
+
+        Id = id.Trim();
+        Category = category.Trim();
+        Scope = scope;
+        TitleLocalizationKey = titleLocalizationKey.Trim();
+        DescriptionLocalizationKey = string.IsNullOrWhiteSpace(descriptionLocalizationKey)
+            ? null
+            : descriptionLocalizationKey.Trim();
+        IconKey = iconKey.Trim();
+        SortOrder = sortOrder;
+        SubjectId = string.IsNullOrWhiteSpace(subjectId) ? null : subjectId.Trim();
+        Options = options ?? [];
+    }
+
+    public string Id { get; }
+
+    public string Category { get; }
+
+    public SettingsScope Scope { get; }
+
+    public string TitleLocalizationKey { get; }
+
+    public string? DescriptionLocalizationKey { get; }
+
+    public string IconKey { get; }
+
+    public int SortOrder { get; }
+
+    public string? SubjectId { get; }
+
+    public IReadOnlyList<SettingsOptionDefinition> Options { get; }
+}

LanMountainDesktop.PluginsInstallHelper/LanMountainDesktop.PluginsInstallHelper.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk" TreatAsLocalProperty="Version;PackageVersion;InformationalVersion;AssemblyVersion;FileVersion">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Version>1.0.0</Version>
+    <PackageVersion>$(Version)</PackageVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\LanMountainDesktop.PluginSdk\LanMountainDesktop.PluginSdk.csproj" />
+  </ItemGroup>
+</Project>

LanMountainDesktop.PluginsInstallHelper/Program.cs

@@ -0,0 +1,242 @@
+using System.IO.Compression;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.Json;
+using LanMountainDesktop.PluginSdk;
+
+internal static class Program
+{
+    private static readonly TimeSpan[] RetryDelays =
+    [
+        TimeSpan.FromMilliseconds(120),
+        TimeSpan.FromMilliseconds(250),
+        TimeSpan.FromMilliseconds(500)
+    ];
+
+    private static async Task<int> Main(string[] args)
+    {
+        var result = new HelperResult();
+        string? resultPath = null;
+
+        try
+        {
+            var parsedArgs = ParseArgs(args);
+            if (!parsedArgs.TryGetValue("source", out var sourcePath) ||
+                !parsedArgs.TryGetValue("plugins-dir", out var pluginsDirectory) ||
+                !parsedArgs.TryGetValue("result", out resultPath) ||
+                string.IsNullOrWhiteSpace(sourcePath) ||
+                string.IsNullOrWhiteSpace(pluginsDirectory) ||
+                string.IsNullOrWhiteSpace(resultPath))
+            {
+                throw new InvalidOperationException("Required arguments: --source <path> --plugins-dir <path> --result <path>.");
+            }
+
+            var fullSourcePath = Path.GetFullPath(sourcePath);
+            var fullPluginsDirectory = Path.GetFullPath(pluginsDirectory);
+            resultPath = Path.GetFullPath(resultPath);
+
+            if (!File.Exists(fullSourcePath))
+            {
+                throw new FileNotFoundException($"Plugin package '{fullSourcePath}' was not found.", fullSourcePath);
+            }
+
+            var manifest = ReadManifestFromPackage(fullSourcePath);
+            Directory.CreateDirectory(fullPluginsDirectory);
+            var destinationPath = Path.Combine(fullPluginsDirectory, BuildInstalledPackageFileName(manifest.Id));
+            var stagingPath = destinationPath + ".incoming";
+            DeleteFileWithRetry(stagingPath);
+            CopyWithRetry(fullSourcePath, stagingPath, overwrite: true);
+            RemoveExistingPluginPackages(fullPluginsDirectory, manifest.Id, destinationPath, stagingPath);
+            MoveWithOverwriteRetry(stagingPath, destinationPath);
+
+            result = new HelperResult
+            {
+                Success = true,
+                InstalledPackagePath = destinationPath,
+                ManifestId = manifest.Id,
+                ManifestName = manifest.Name
+            };
+        }
+        catch (Exception ex)
+        {
+            result = new HelperResult
+            {
+                Success = false,
+                ErrorMessage = ex.Message
+            };
+        }
+
+        if (!string.IsNullOrWhiteSpace(resultPath))
+        {
+            var resultDirectory = Path.GetDirectoryName(resultPath);
+            if (!string.IsNullOrWhiteSpace(resultDirectory))
+            {
+                Directory.CreateDirectory(resultDirectory);
+            }
+
+            await File.WriteAllTextAsync(
+                resultPath,
+                JsonSerializer.Serialize(result, new JsonSerializerOptions
+                {
+                    WriteIndented = true
+                }),
+                Encoding.UTF8);
+        }
+
+        return result.Success ? 0 : 1;
+    }
+
+    private static Dictionary<string, string> ParseArgs(string[] args)
+    {
+        var values = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        for (var i = 0; i < args.Length; i++)
+        {
+            var current = args[i];
+            if (!current.StartsWith("--", StringComparison.Ordinal))
+            {
+                continue;
+            }
+
+            var key = current[2..];
+            if (string.IsNullOrWhiteSpace(key) || i + 1 >= args.Length)
+            {
+                continue;
+            }
+
+            values[key] = args[++i];
+        }
+
+        return values;
+    }
+
+    private static PluginManifest ReadManifestFromPackage(string packagePath)
+    {
+        using var archive = ZipFile.OpenRead(packagePath);
+        var entries = archive.Entries
+            .Where(entry => string.Equals(entry.Name, PluginSdkInfo.ManifestFileName, StringComparison.OrdinalIgnoreCase))
+            .ToArray();
+
+        if (entries.Length == 0)
+        {
+            throw new InvalidOperationException(
+                $"Plugin package '{packagePath}' does not contain '{PluginSdkInfo.ManifestFileName}'.");
+        }
+
+        if (entries.Length > 1)
+        {
+            throw new InvalidOperationException(
+                $"Plugin package '{packagePath}' contains multiple '{PluginSdkInfo.ManifestFileName}' files.");
+        }
+
+        using var stream = entries[0].Open();
+        return PluginManifest.Load(stream, $"{packagePath}!/{entries[0].FullName}");
+    }
+
+    private static void RemoveExistingPluginPackages(string pluginsDirectory, string pluginId, string destinationPath, string stagingPath)
+    {
+        var runtimeRootDirectory = EnsureTrailingSeparator(Path.Combine(Path.GetFullPath(pluginsDirectory), PluginSdkInfo.RuntimeDirectoryName));
+        foreach (var existingPackagePath in Directory
+                     .EnumerateFiles(pluginsDirectory, "*" + PluginSdkInfo.PackageFileExtension, SearchOption.AllDirectories)
+                     .Select(Path.GetFullPath)
+                     .Where(path => !path.StartsWith(runtimeRootDirectory, StringComparison.OrdinalIgnoreCase)))
+        {
+            try
+            {
+                if (string.Equals(existingPackagePath, Path.GetFullPath(destinationPath), StringComparison.OrdinalIgnoreCase) ||
+                    string.Equals(existingPackagePath, Path.GetFullPath(stagingPath), StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                var existingManifest = ReadManifestFromPackage(existingPackagePath);
+                if (!string.Equals(existingManifest.Id, pluginId, StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                DeleteFileWithRetry(existingPackagePath);
+            }
+            catch
+            {
+                // Ignore unrelated or malformed packages while replacing an install target.
+            }
+        }
+    }
+
+    private static void CopyWithRetry(string sourcePath, string destinationPath, bool overwrite)
+    {
+        Retry(() => File.Copy(sourcePath, destinationPath, overwrite));
+    }
+
+    private static void MoveWithOverwriteRetry(string sourcePath, string destinationPath)
+    {
+        Retry(() => File.Move(sourcePath, destinationPath, overwrite: true));
+    }
+
+    private static void DeleteFileWithRetry(string filePath)
+    {
+        Retry(() =>
+        {
+            if (File.Exists(filePath))
+            {
+                File.Delete(filePath);
+            }
+        });
+    }
+
+    private static void Retry(Action action)
+    {
+        Exception? lastException = null;
+
+        for (var attempt = 0; attempt <= RetryDelays.Length; attempt++)
+        {
+            try
+            {
+                action();
+                return;
+            }
+            catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+            {
+                lastException = ex;
+                if (attempt >= RetryDelays.Length)
+                {
+                    break;
+                }
+
+                Thread.Sleep(RetryDelays[attempt]);
+            }
+        }
+
+        if (lastException is not null)
+        {
+            throw lastException;
+        }
+    }
+
+    private static string BuildInstalledPackageFileName(string pluginId)
+    {
+        var invalidChars = Path.GetInvalidFileNameChars();
+        var fileName = new string(pluginId.Select(ch => invalidChars.Contains(ch) ? '_' : ch).ToArray());
+        return fileName + PluginSdkInfo.PackageFileExtension;
+    }
+
+    private static string EnsureTrailingSeparator(string path)
+    {
+        return path.EndsWith(Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal)
+            ? path
+            : path + Path.DirectorySeparatorChar;
+    }
+
+    private sealed class HelperResult
+    {
+        public bool Success { get; init; }
+
+        public string? InstalledPackagePath { get; init; }
+
+        public string? ManifestId { get; init; }
+
+        public string? ManifestName { get; init; }
+
+        public string? ErrorMessage { get; init; }
+    }
+}

LanMountainDesktop.Tests/ComponentSettingsServiceTests.cs

@@ -0,0 +1,187 @@
+using System.Text.Json;
+using LanMountainDesktop.Models;
+using LanMountainDesktop.Services;
+using Xunit;
+
+namespace LanMountainDesktop.Tests;
+
+public sealed class ComponentSettingsServiceTests
+{
+    [Fact]
+    public void Load_MigratesLegacySnapshotFileToCanonicalDocument()
+    {
+        using var sandbox = new ComponentSettingsSandbox();
+        File.WriteAllText(
+            sandbox.SettingsPath,
+            """
+            {
+              "DesktopClockSecondHandMode": "Sweep",
+              "ImportedClassSchedules": [
+                {
+                  "Id": "spring-2026",
+                  "DisplayName": "Spring 2026",
+                  "FilePath": "C:\\Schedules\\spring-2026.yaml"
+                }
+              ],
+              "ActiveImportedClassScheduleId": "spring-2026"
+            }
+            """);
+
+        var service = sandbox.CreateService();
+
+        var snapshot = service.Load();
+
+        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 _));
+    }
+
+    [Fact]
+    public void Load_ReadsPascalCaseDocumentAndRewritesToCanonicalDocument()
+    {
+        using var sandbox = new ComponentSettingsSandbox();
+        File.WriteAllText(
+            sandbox.SettingsPath,
+            """
+            {
+              "DefaultSettings": {
+                "DesktopClockSecondHandMode": "Tick"
+              },
+              "InstanceSettings": {
+                "DesktopClock::clock-2x2": {
+                  "DesktopClockSecondHandMode": "Sweep"
+                }
+              },
+              "PluginSettings": {
+                "DesktopClock::clock-2x2": {
+                  "SampleFlag": true
+                }
+              }
+            }
+            """);
+
+        var service = sandbox.CreateService();
+
+        var snapshot = service.LoadForComponent("DesktopClock", "clock-2x2");
+        var pluginSettings = service.LoadPluginSettings<SamplePluginSettings>("DesktopClock", "clock-2x2");
+
+        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 _));
+    }
+
+    [Fact]
+    public void SaveForComponent_RoundTripsInstanceAndPluginSettingsAcrossNewService()
+    {
+        using var sandbox = new ComponentSettingsSandbox();
+        var service = sandbox.CreateService();
+
+        service.SaveForComponent(
+            "DesktopClock",
+            "clock-2x2",
+            new ComponentSettingsSnapshot
+            {
+                DesktopClockSecondHandMode = "Sweep"
+            });
+        service.SaveForComponent(
+            "DesktopClassSchedule",
+            "class-schedule-2x2",
+            new ComponentSettingsSnapshot
+            {
+                ImportedClassSchedules =
+                [
+                    new ImportedClassScheduleSnapshot
+                    {
+                        Id = "spring-2026",
+                        DisplayName = "Spring 2026",
+                        FilePath = "C:\\Schedules\\spring-2026.yaml"
+                    }
+                ],
+                ActiveImportedClassScheduleId = "spring-2026"
+            });
+        service.SavePluginSettings(
+            "DesktopClassSchedule",
+            "class-schedule-2x2",
+            new SamplePluginSettings
+            {
+                SampleFlag = true,
+                Title = "schedule-settings"
+            });
+
+        ComponentSettingsService.ResetCacheForTests();
+        var reloadedService = sandbox.CreateService();
+
+        var clockSnapshot = reloadedService.LoadForComponent("DesktopClock", "clock-2x2");
+        var classScheduleSnapshot = reloadedService.LoadForComponent("DesktopClassSchedule", "class-schedule-2x2");
+        var pluginSettings = reloadedService.LoadPluginSettings<SamplePluginSettings>(
+            "DesktopClassSchedule",
+            "class-schedule-2x2");
+
+        Assert.Equal("Sweep", clockSnapshot.DesktopClockSecondHandMode);
+        Assert.Single(classScheduleSnapshot.ImportedClassSchedules);
+        Assert.Equal("spring-2026", classScheduleSnapshot.ActiveImportedClassScheduleId);
+        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 _));
+    }
+
+    private sealed class ComponentSettingsSandbox : IDisposable
+    {
+        private readonly string _directoryPath = Path.Combine(
+            Path.GetTempPath(),
+            "LanMountainDesktop.ComponentSettingsTests",
+            Guid.NewGuid().ToString("N"));
+
+        public ComponentSettingsSandbox()
+        {
+            Directory.CreateDirectory(_directoryPath);
+            ComponentSettingsService.ResetCacheForTests();
+        }
+
+        public string SettingsPath => Path.Combine(_directoryPath, "component-settings.json");
+
+        public ComponentSettingsService CreateService()
+        {
+            return new ComponentSettingsService(_directoryPath);
+        }
+
+        public void Dispose()
+        {
+            ComponentSettingsService.ResetCacheForTests();
+
+            try
+            {
+                if (Directory.Exists(_directoryPath))
+                {
+                    Directory.Delete(_directoryPath, true);
+                }
+            }
+            catch
+            {
+                // Temporary test directories are best-effort cleanup.
+            }
+        }
+    }
+
+    private sealed class SamplePluginSettings
+    {
+        public bool SampleFlag { get; set; }
+
+        public string Title { get; set; } = string.Empty;
+    }
+}

LanMountainDesktop.Tests/LanMountainDesktop.Tests.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+  </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">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\LanMountainDesktop\LanMountainDesktop.csproj" />
+  </ItemGroup>
+</Project>

LanMountainDesktop.Tests/UiExceptionGuardTests.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Threading.Tasks;
+using LanMountainDesktop.Services;
+using Xunit;
+
+namespace LanMountainDesktop.Tests;
+
+public sealed class UiExceptionGuardTests
+{
+    [Fact]
+    public async Task RunGuardedUiActionAsync_SwallowsNonFatalException_AndInvokesHandler()
+    {
+        var handlerCalled = false;
+
+        await UiExceptionGuard.RunGuardedUiActionAsync(
+            () => throw new InvalidOperationException("boom"),
+            "UnitTest.NonFatal",
+            onHandledException: ex =>
+            {
+                handlerCalled = ex is InvalidOperationException;
+                return Task.CompletedTask;
+            });
+
+        Assert.True(handlerCalled);
+    }
+
+    [Fact]
+    public async Task RunGuardedUiActionAsync_RethrowsFatalException()
+    {
+        await Assert.ThrowsAsync<OutOfMemoryException>(() =>
+            UiExceptionGuard.RunGuardedUiActionAsync(
+                () => throw new OutOfMemoryException("fatal"),
+                "UnitTest.Fatal"));
+    }
+
+    [Fact]
+    public void IsFatalException_ReturnsExpectedClassification()
+    {
+        Assert.True(UiExceptionGuard.IsFatalException(new OutOfMemoryException()));
+        Assert.True(UiExceptionGuard.IsFatalException(new AccessViolationException()));
+        Assert.False(UiExceptionGuard.IsFatalException(new InvalidOperationException()));
+    }
+}

LanMountainDesktop.sln

@@ -1,37 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanMountainDesktop", "LanMountainDesktop\LanMountainDesktop.csproj", "{00000001-0000-0000-0000-000000000001}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanMountainDesktop.SamplePlugin", "LanAirApp\samples\LanMountainDesktop.SamplePlugin\LanMountainDesktop.SamplePlugin.csproj", "{BDCD028D-DB6E-4BD5-994A-65889DBDEE0C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanMountainDesktop.PluginPackager", "LanAirApp\tools\LanMountainDesktop.PluginPackager\LanMountainDesktop.PluginPackager.csproj", "{AAE8578B-1F9D-4D4F-8B2E-0A98C55B0C31}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanMountainDesktop.PluginSdk", "LanMountainDesktop.PluginSdk\LanMountainDesktop.PluginSdk.csproj", "{30A0F689-AACC-48C8-8BFE-BC7BFBA6CC55}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{00000001-0000-0000-0000-000000000001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{00000001-0000-0000-0000-000000000001}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{00000001-0000-0000-0000-000000000001}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{00000001-0000-0000-0000-000000000001}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BDCD028D-DB6E-4BD5-994A-65889DBDEE0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BDCD028D-DB6E-4BD5-994A-65889DBDEE0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BDCD028D-DB6E-4BD5-994A-65889DBDEE0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BDCD028D-DB6E-4BD5-994A-65889DBDEE0C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AAE8578B-1F9D-4D4F-8B2E-0A98C55B0C31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAE8578B-1F9D-4D4F-8B2E-0A98C55B0C31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAE8578B-1F9D-4D4F-8B2E-0A98C55B0C31}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AAE8578B-1F9D-4D4F-8B2E-0A98C55B0C31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{30A0F689-AACC-48C8-8BFE-BC7BFBA6CC55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30A0F689-AACC-48C8-8BFE-BC7BFBA6CC55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30A0F689-AACC-48C8-8BFE-BC7BFBA6CC55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{30A0F689-AACC-48C8-8BFE-BC7BFBA6CC55}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal

LanMountainDesktop.slnx

@@ -0,0 +1,7 @@
+<Solution>
+  <Project Path="LanAirApp/tools/LanMountainDesktop.PluginPackager/LanMountainDesktop.PluginPackager.csproj" />
+  <Project Path="LanMountainDesktop.PluginSdk/LanMountainDesktop.PluginSdk.csproj" />
+  <Project Path="LanMountainDesktop.PluginsInstallHelper/LanMountainDesktop.PluginsInstallHelper.csproj" />
+  <Project Path="LanMountainDesktop/LanMountainDesktop.csproj" />
+  <Project Path="LanMountainDesktop.Tests/LanMountainDesktop.Tests.csproj" />
+</Solution>

LanMountainDesktop/App.axaml

@@ -1,4 +1,4 @@
-<Application xmlns="https://github.com/avaloniaui"
+<Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:sty="using:FluentAvalonia.Styling"
              xmlns:fi="using:FluentIcons.Avalonia"
@@ -22,6 +22,7 @@
         <StyleInclude Source="avares://LanMountainDesktop/Styles/FluttermotionToken.axaml" />
         <StyleInclude Source="avares://LanMountainDesktop/Styles/GlassModule.axaml" />
         <StyleInclude Source="avares://LanMountainDesktop/Styles/SettingsAnimations.axaml" />
+        <StyleInclude Source="avares://LanMountainDesktop/Styles/SettingsCardStyles.axaml" />
 
         <Style Selector="Window">
             <Setter Property="FontFamily" Value="{DynamicResource AppFontFamily}" />

LanMountainDesktop/App.axaml.cs

@@ -1,44 +1,113 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Data.Core;
 using Avalonia.Data.Core.Plugins;
-using System;
-using System.Diagnostics;
-using System.Linq;
 using Avalonia.Markup.Xaml;
+using Avalonia.Media;
 using Avalonia.Platform;
+using Avalonia.Styling;
 using Avalonia.Threading;
+using AvaloniaWebView;
+using LanMountainDesktop.ComponentSystem;
+using LanMountainDesktop.Models;
+using LanMountainDesktop.PluginSdk;
 using LanMountainDesktop.Services;
+using LanMountainDesktop.Services.Settings;
+using LanMountainDesktop.Theme;
 using LanMountainDesktop.ViewModels;
 using LanMountainDesktop.Views;
-using AvaloniaWebView;
 
 namespace LanMountainDesktop;
 
 public partial class App : Application
 {
-    private readonly AppSettingsService _appSettingsService = new();
-    private readonly LocalizationService _localizationService = new();
+    private static readonly Color DefaultAccentColor = Color.Parse("#FF3B82F6");
+    private enum DesktopShellState
+    {
+        ForegroundDesktop = 0,
+        MinimizedToTaskbar = 1,
+        TrayOnly = 2
+    }
+
+    private enum ShutdownIntent
+    {
+        None = 0,
+        ExitRequested = 1,
+        RestartRequested = 2
+    }
+
+    private readonly ISettingsFacadeService _settingsFacade = HostSettingsFacadeProvider.GetOrCreate();
+    private readonly IAppearanceThemeService _appearanceThemeService = HostAppearanceThemeProvider.GetOrCreate();
+    private readonly IAppLogoService _appLogoService = HostAppLogoProvider.GetOrCreate();
+    private readonly LocalizationService _localizationService = new();
+    private readonly IHostApplicationLifecycle _hostApplicationLifecycle = new HostApplicationLifecycleService();
+    private readonly IDetachedComponentLibraryWindowService _detachedComponentLibraryWindowService = new DetachedComponentLibraryWindowService();
+    private readonly ILocationService _locationService = HostLocationServiceProvider.GetOrCreate();
+    private ISettingsPageRegistry? _settingsPageRegistry;
+    private ISettingsWindowService? _settingsWindowService;
+    private WeatherLocationRefreshService? _weatherLocationRefreshService;
+    private bool _exitCleanupCompleted;
+    private DesktopShellState _desktopShellState = DesktopShellState.ForegroundDesktop;
+    private ShutdownIntent _shutdownIntent;
 
-    private SettingsWindow? _traySettingsWindow;
     private TrayIcons? _trayIcons;
     private PluginRuntimeService? _pluginRuntimeService;
+    private MainWindow? _mainWindow;
+    private bool _mainWindowClosed;
+    private bool _uiUnhandledExceptionHooked;
+
+    internal static SingleInstanceService? CurrentSingleInstanceService { get; set; }
+    internal static (UserBehaviorAnalyticsService?, CrashReportService?) AnalyticsServices { get; set; }
+    internal static IHostApplicationLifecycle? CurrentHostApplicationLifecycle =>
+        (Current as App)?._hostApplicationLifecycle;
 
     public PluginRuntimeService? PluginRuntimeService => _pluginRuntimeService;
+    public ISettingsFacadeService SettingsFacade => _settingsFacade;
+    public IHostApplicationLifecycle HostApplicationLifecycle => _hostApplicationLifecycle;
+    internal ISettingsWindowService? SettingsWindowService => _settingsWindowService;
+
+    internal void OpenIndependentSettingsModule(string source, string? pageTag = null)
+    {
+        EnsureSettingsWindowService();
+        AppLogger.Info(
+            "SettingsFacade",
+            $"Opening settings window. Source='{source}'; PageTag='{pageTag ?? "<default>"}'.");
+        _settingsWindowService?.Open(new SettingsWindowOpenRequest(
+            Source: source,
+            Owner: _mainWindow is { IsVisible: true } ? _mainWindow : null,
+            PageId: pageTag));
+    }
+
+    public App()
+    {
+        _settingsFacade.Settings.Changed += OnSettingsChanged;
+        _appearanceThemeService.Changed += OnAppearanceThemeChanged;
+    }
 
     public override void Initialize()
     {
+        AppLogger.Info("App", "Initializing application resources.");
         ConfigureWebViewUserDataFolder();
         AvaloniaWebViewBuilder.Initialize(default);
         AvaloniaXamlLoader.Load(this);
+        ApplyThemeFromSettings();
+        ApplyCurrentCultureFromSettings();
+        EnsureSettingsWindowService();
+        EnsureWeatherLocationRefreshService();
     }
 
     public override void OnFrameworkInitializationCompleted()
     {
+        AppLogger.Info("App", "Framework initialization completed.");
+        RegisterUiUnhandledExceptionGuard();
         LinuxDesktopEntryInstaller.EnsureInstalled();
         InitializePluginRuntime();
-        AppSettingsService.SettingsSaved += OnAppSettingsSaved;
         InitializeTrayIcon();
 
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
@@ -49,80 +118,55 @@ public partial class App : Application
             desktop.ShutdownMode = Avalonia.Controls.ShutdownMode.OnExplicitShutdown;
             desktop.Exit += (_, _) =>
             {
-                AppSettingsService.SettingsSaved -= OnAppSettingsSaved;
-                DisposeTrayIcon();
-            };
-            desktop.MainWindow = new MainWindow
-            {
-                DataContext = new MainWindowViewModel(),
+                AppLogger.Info("App", "Desktop lifetime exit triggered.");
+                PerformExitCleanup();
             };
+
+            CreateAndAssignMainWindow(desktop, "FrameworkInitialization");
+            CurrentSingleInstanceService?.StartActivationListener(ActivateMainWindow);
         }
 
+        StartWeatherLocationRefreshIfNeeded();
+
         base.OnFrameworkInitializationCompleted();
     }
 
     private void OnTrayExitClick(object? sender, EventArgs e)
     {
-        DisposeTrayIcon();
-
-        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-        {
-            desktop.Shutdown();
-        }
+        _ = _hostApplicationLifecycle.TryExit(new HostApplicationLifecycleRequest(
+            Source: "TrayMenu",
+            Reason: "User selected Exit App from the tray menu."));
     }
 
-    private void OnTraySettingsClick(object? sender, EventArgs e)
+    private void OnTrayShowDesktopClick(object? sender, EventArgs e)
     {
-        if (ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime)
-        {
-            return;
-        }
-
-        Dispatcher.UIThread.Post(() =>
-        {
-            try
-            {
-                if (_traySettingsWindow is { } existingWindow && existingWindow.IsVisible)
-                {
-                    existingWindow.WindowState = Avalonia.Controls.WindowState.Normal;
-                    existingWindow.Activate();
-                    return;
-                }
-
-                var settingsWindow = new SettingsWindow();
-                settingsWindow.Closed += (_, _) =>
-                {
-                    if (ReferenceEquals(_traySettingsWindow, settingsWindow))
-                    {
-                        _traySettingsWindow = null;
-                    }
-                };
-
-                _traySettingsWindow = settingsWindow;
-                settingsWindow.Show();
-                settingsWindow.Activate();
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine($"[TraySettings] Failed to open settings window: {ex}");
-            }
-        }, DispatcherPriority.Normal);
+        RestoreOrCreateMainWindow(showSingleInstanceNotice: false, source: "TrayMenu");
     }
 
     private void OnTrayRestartClick(object? sender, EventArgs e)
     {
-        AppRestartService.TryRestartApplication();
+        _ = _hostApplicationLifecycle.TryRestart(new HostApplicationLifecycleRequest(
+            Source: "TrayMenu",
+            Reason: "User selected Restart App from the tray menu."));
     }
 
-    private void OnAppSettingsSaved(string _)
+    private void OnTraySettingsClick(object? sender, EventArgs e)
     {
-        Dispatcher.UIThread.Post(() =>
+        _ = sender;
+        _ = e;
+        OpenIndependentSettingsModule("TrayMenu");
+    }
+
+    private void OnTrayComponentLibraryClick(object? sender, EventArgs e)
+    {
+        _ = sender;
+        _ = e;
+        if (_mainWindow is null)
         {
-            if (_trayIcons is not null)
-            {
-                InitializeTrayIcon();
-            }
-        }, DispatcherPriority.Background);
+            return;
+        }
+
+        _detachedComponentLibraryWindowService.Open(_mainWindow);
     }
 
     private void DisableAvaloniaDataAnnotationValidation()
@@ -159,9 +203,10 @@ public partial class App : Application
                 userDataFolder,
                 EnvironmentVariableTarget.Process);
         }
-        catch
+        catch (Exception ex)
         {
             // Keep startup resilient if user profile folders are unavailable.
+            AppLogger.Warn("WebView2", "Failed to configure WebView2 user data folder.", ex);
         }
     }
 
@@ -170,12 +215,13 @@ public partial class App : Application
         try
         {
             _pluginRuntimeService?.Dispose();
-            _pluginRuntimeService = new PluginRuntimeService();
+            _pluginRuntimeService = new PluginRuntimeService(_settingsFacade);
+            HostSettingsFacadeProvider.BindPluginRuntime(_pluginRuntimeService);
             _pluginRuntimeService.LoadInstalledPlugins();
         }
         catch (Exception ex)
         {
-            Debug.WriteLine($"[PluginRuntime] Failed to initialize plugin runtime: {ex}");
+            AppLogger.Warn("PluginRuntime", "Failed to initialize plugin runtime.", ex);
         }
     }
 
@@ -185,10 +231,9 @@ public partial class App : Application
         {
             DisposeTrayIcon();
 
-            using var iconStream = AssetLoader.Open(new Uri("avares://LanMountainDesktop/Assets/avalonia-logo.ico"));
             var trayIcon = new TrayIcon
             {
-                Icon = new WindowIcon(iconStream),
+                Icon = _appLogoService.CreateTrayIcon(),
                 ToolTipText = L("tray.tooltip", "LanMountainDesktop"),
                 Menu = BuildTrayMenu(),
                 IsVisible = true
@@ -199,7 +244,7 @@ public partial class App : Application
         }
         catch (Exception ex)
         {
-            Debug.WriteLine($"[TrayIcon] Failed to initialize tray icon: {ex}");
+            AppLogger.Warn("TrayIcon", "Failed to initialize tray icon.", ex);
         }
     }
 
@@ -207,19 +252,27 @@ public partial class App : Application
     {
         var menu = new NativeMenu();
 
-        var settingsItem = new NativeMenuItem(L("tray.menu.settings", "ÉèÖÃ"));
+        var showDesktopItem = new NativeMenuItem(L("tray.menu.show_desktop", "Open Desktop"));
+        showDesktopItem.Click += OnTrayShowDesktopClick;
+        menu.Items.Add(showDesktopItem);
+
+        var settingsItem = new NativeMenuItem(L("tray.menu.settings", "Settings"));
         settingsItem.Click += OnTraySettingsClick;
         menu.Items.Add(settingsItem);
 
+        var componentLibraryItem = new NativeMenuItem(L("tray.menu.component_library", "Component Library"));
+        componentLibraryItem.Click += OnTrayComponentLibraryClick;
+        menu.Items.Add(componentLibraryItem);
+
         menu.Items.Add(new NativeMenuItemSeparator());
 
-        var restartItem = new NativeMenuItem(L("tray.menu.restart", "ÖØÆôÓ¦ÓÃ"));
+        var restartItem = new NativeMenuItem(L("tray.menu.restart", "Restart App"));
         restartItem.Click += OnTrayRestartClick;
         menu.Items.Add(restartItem);
 
         menu.Items.Add(new NativeMenuItemSeparator());
 
-        var exitItem = new NativeMenuItem(L("tray.menu.exit", "Í˳öÓ¦ÓÃ"));
+        var exitItem = new NativeMenuItem(L("tray.menu.exit", "Exit App"));
         exitItem.Click += OnTrayExitClick;
         menu.Items.Add(exitItem);
 
@@ -242,9 +295,522 @@ public partial class App : Application
         _trayIcons = null;
     }
 
+    private void EnsureSettingsWindowService()
+    {
+        _settingsPageRegistry ??= new SettingsPageRegistry(
+            _settingsFacade,
+            _hostApplicationLifecycle,
+            _localizationService,
+            () => _pluginRuntimeService);
+        _settingsWindowService ??= new SettingsWindowService(
+            _settingsPageRegistry,
+            _hostApplicationLifecycle,
+            _settingsFacade);
+    }
+
+    private void EnsureWeatherLocationRefreshService()
+    {
+        _weatherLocationRefreshService ??= new WeatherLocationRefreshService(
+            _settingsFacade,
+            _locationService,
+            _localizationService);
+    }
+
+    private void StartWeatherLocationRefreshIfNeeded()
+    {
+        EnsureWeatherLocationRefreshService();
+        if (_weatherLocationRefreshService is null)
+        {
+            return;
+        }
+
+        _ = Task.Run(async () =>
+        {
+            try
+            {
+                await _weatherLocationRefreshService.TryRefreshOnStartupAsync();
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Warn("Weather.Location", "Failed to refresh weather location during startup.", ex);
+            }
+        });
+    }
+
+    private void ApplyThemeFromSettings()
+    {
+        var snapshot = _appearanceThemeService.GetCurrent();
+        RequestedThemeVariant = snapshot.IsNightMode
+            ? ThemeVariant.Dark
+            : ThemeVariant.Light;
+        ApplyAdaptiveThemeResources();
+    }
+
+    private void ApplyCurrentCultureFromSettings()
+    {
+        var snapshot = _settingsFacade.Settings.LoadSnapshot<AppSettingsSnapshot>(SettingsScope.App);
+        var languageCode = _localizationService.NormalizeLanguageCode(snapshot.LanguageCode);
+
+        CultureInfo culture;
+        try
+        {
+            culture = CultureInfo.GetCultureInfo(languageCode);
+        }
+        catch (CultureNotFoundException)
+        {
+            culture = CultureInfo.GetCultureInfo("zh-CN");
+        }
+
+        CultureInfo.DefaultThreadCurrentCulture = culture;
+        CultureInfo.DefaultThreadCurrentUICulture = culture;
+        Thread.CurrentThread.CurrentCulture = culture;
+        Thread.CurrentThread.CurrentUICulture = culture;
+    }
+
+    private void ActivateMainWindow()
+    {
+        RestoreOrCreateMainWindow(showSingleInstanceNotice: true, source: "SingleInstance");
+    }
+
+    private void RestoreOrCreateMainWindow(bool showSingleInstanceNotice, string source)
+    {
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop)
+            {
+                return;
+            }
+
+            try
+            {
+                var mainWindow = GetOrCreateMainWindow(desktop, source);
+                mainWindow.ShowInTaskbar = true;
+
+                if (!mainWindow.IsVisible)
+                {
+                    mainWindow.Show();
+                }
+
+                if (mainWindow.WindowState == WindowState.Minimized)
+                {
+                    mainWindow.WindowState = WindowState.Normal;
+                }
+
+                if (mainWindow.WindowState != WindowState.FullScreen)
+                {
+                    mainWindow.WindowState = WindowState.FullScreen;
+                }
+
+                mainWindow.Activate();
+                mainWindow.Topmost = true;
+                mainWindow.Topmost = false;
+                SetDesktopShellState(DesktopShellState.ForegroundDesktop, $"Restore:{source}");
+                AppLogger.Info(
+                    "DesktopShell",
+                    $"Desktop restored. Source='{source}'; MainWindowClosed={_mainWindowClosed}; ShowSingleInstanceNotice={showSingleInstanceNotice}; WindowState='{mainWindow.WindowState}'.");
+
+                if (showSingleInstanceNotice)
+                {
+                    mainWindow.ShowSingleInstanceNotice();
+                }
+            }
+            catch (Exception ex)
+            {
+                AppLogger.Warn("DesktopShell", $"Failed to restore desktop shell. Source='{source}'.", ex);
+            }
+        }, DispatcherPriority.Send);
+    }
+
+    internal void PrepareForShutdown(bool isRestart, string source)
+    {
+        void Mark()
+        {
+            _shutdownIntent = isRestart
+                ? ShutdownIntent.RestartRequested
+                : ShutdownIntent.ExitRequested;
+            AppLogger.Info(
+                "DesktopShell",
+                $"Shutdown intent marked. Intent='{_shutdownIntent}'; Source='{source}'; CurrentShellState='{_desktopShellState}'.");
+        }
+
+        if (Dispatcher.UIThread.CheckAccess())
+        {
+            Mark();
+            return;
+        }
+
+        Dispatcher.UIThread.InvokeAsync(Mark, DispatcherPriority.Send).GetAwaiter().GetResult();
+    }
+
+    internal void ResetShutdownIntent(string source)
+    {
+        void Reset()
+        {
+            if (_shutdownIntent == ShutdownIntent.None)
+            {
+                return;
+            }
+
+            AppLogger.Warn(
+                "DesktopShell",
+                $"Shutdown intent cleared without process exit. PreviousIntent='{_shutdownIntent}'; Source='{source}'.");
+            _shutdownIntent = ShutdownIntent.None;
+        }
+
+        if (Dispatcher.UIThread.CheckAccess())
+        {
+            Reset();
+            return;
+        }
+
+        Dispatcher.UIThread.InvokeAsync(Reset, DispatcherPriority.Send).GetAwaiter().GetResult();
+    }
+
+    private void OnSettingsChanged(object? sender, SettingsChangedEvent e)
+    {
+        _ = sender;
+
+        if (e.Scope != SettingsScope.App)
+        {
+            return;
+        }
+
+        Dispatcher.UIThread.Post(() =>
+        {
+            var changedKeys = e.ChangedKeys?.ToArray();
+            var refreshAll = changedKeys is null || changedKeys.Length == 0;
+            var liveAppearance = _appearanceThemeService.GetCurrent();
+            var themeChanged =
+                refreshAll ||
+                changedKeys.Contains(nameof(AppSettingsSnapshot.IsNightMode), StringComparer.OrdinalIgnoreCase) ||
+                changedKeys.Contains(nameof(AppSettingsSnapshot.UseSystemChrome), StringComparer.OrdinalIgnoreCase) ||
+                (string.Equals(liveAppearance.ThemeColorMode, ThemeAppearanceValues.ColorModeSeedMonet, StringComparison.OrdinalIgnoreCase) &&
+                 changedKeys.Contains(nameof(AppSettingsSnapshot.ThemeColor), StringComparer.OrdinalIgnoreCase)) ||
+                (string.Equals(liveAppearance.ThemeColorMode, ThemeAppearanceValues.ColorModeWallpaperMonet, StringComparison.OrdinalIgnoreCase) &&
+                 (changedKeys.Contains(nameof(AppSettingsSnapshot.WallpaperPath), StringComparer.OrdinalIgnoreCase) ||
+                  changedKeys.Contains(nameof(AppSettingsSnapshot.WallpaperType), StringComparer.OrdinalIgnoreCase) ||
+                  changedKeys.Contains(nameof(AppSettingsSnapshot.WallpaperColor), StringComparer.OrdinalIgnoreCase)));
+            var languageChanged =
+                refreshAll ||
+                changedKeys.Contains(nameof(AppSettingsSnapshot.LanguageCode), StringComparer.OrdinalIgnoreCase);
+
+            if (themeChanged)
+            {
+                ApplyThemeFromSettings();
+            }
+
+            if (languageChanged)
+            {
+                ApplyCurrentCultureFromSettings();
+                if (_trayIcons is not null)
+                {
+                    InitializeTrayIcon();
+                }
+            }
+        }, DispatcherPriority.Background);
+    }
+
+    private void OnAppearanceThemeChanged(object? sender, AppearanceThemeSnapshot e)
+    {
+        _ = sender;
+        _ = e;
+
+        Dispatcher.UIThread.Post(ApplyThemeFromSettings, DispatcherPriority.Background);
+    }
+
+    private void ApplyAdaptiveThemeResources()
+    {
+        _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 PerformExitCleanup()
+    {
+        if (_exitCleanupCompleted)
+        {
+            return;
+        }
+
+        _exitCleanupCompleted = true;
+        _settingsFacade.Settings.Changed -= OnSettingsChanged;
+        _appearanceThemeService.Changed -= OnAppearanceThemeChanged;
+
+        try
+        {
+            var (analytics, crashReport) = App.AnalyticsServices;
+            analytics?.SendShutdownEvent();
+            crashReport?.SendShutdownEvent();
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("Analytics", "Failed to send shutdown events during exit cleanup.", ex);
+        }
+
+        try
+        {
+            HostUpdateWorkflowServiceProvider.GetOrCreate().TryApplyPendingUpdateOnExit();
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("UpdateWorkflow", "Failed to apply pending update during exit cleanup.", ex);
+        }
+
+        try
+        {
+            _pluginRuntimeService?.Dispose();
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("PluginRuntime", "Failed to dispose plugin runtime during shutdown.", ex);
+        }
+        finally
+        {
+            _pluginRuntimeService = null;
+        }
+
+        _settingsWindowService?.Close();
+        if (_settingsPageRegistry is IDisposable disposableRegistry)
+        {
+            disposableRegistry.Dispose();
+        }
+
+        AudioRecorderServiceFactory.DisposeSharedServices();
+        StudyAnalyticsServiceFactory.DisposeSharedService();
+        DisposeTrayIcon();
+    }
+
+    private MainWindow CreateAndAssignMainWindow(
+        IClassicDesktopStyleApplicationLifetime desktop,
+        string reason)
+    {
+        var mainWindow = new MainWindow
+        {
+            DataContext = new MainWindowViewModel(),
+            ShowInTaskbar = true
+        };
+
+        AttachMainWindow(mainWindow);
+        desktop.MainWindow = mainWindow;
+        AppLogger.Info("App", $"Main window created. Reason='{reason}'. LogFile={AppLogger.LogFilePath}");
+        LogBrowserStartupDiagnostics();
+        SetDesktopShellState(DesktopShellState.ForegroundDesktop, $"MainWindowCreated:{reason}");
+        return mainWindow;
+    }
+
+    private MainWindow GetOrCreateMainWindow(
+        IClassicDesktopStyleApplicationLifetime desktop,
+        string reason)
+    {
+        if (_mainWindow is not null && !_mainWindowClosed)
+        {
+            return _mainWindow;
+        }
+
+        if (desktop.MainWindow is MainWindow desktopMainWindow && !_mainWindowClosed)
+        {
+            AttachMainWindow(desktopMainWindow);
+            return desktopMainWindow;
+        }
+
+        return CreateAndAssignMainWindow(desktop, reason);
+    }
+
+    private void AttachMainWindow(MainWindow mainWindow)
+    {
+        if (ReferenceEquals(_mainWindow, mainWindow))
+        {
+            _mainWindowClosed = false;
+            return;
+        }
+
+        if (_mainWindow is not null)
+        {
+            _mainWindow.Closing -= OnMainWindowClosing;
+            _mainWindow.Closed -= OnMainWindowClosed;
+            _mainWindow.PropertyChanged -= OnMainWindowPropertyChanged;
+        }
+
+        _mainWindow = mainWindow;
+        _mainWindowClosed = false;
+        mainWindow.Closing += OnMainWindowClosing;
+        mainWindow.Closed += OnMainWindowClosed;
+        mainWindow.PropertyChanged += OnMainWindowPropertyChanged;
+    }
+
+    private void OnMainWindowClosing(object? sender, WindowClosingEventArgs e)
+    {
+        if (sender is not MainWindow mainWindow)
+        {
+            return;
+        }
+
+        AppLogger.Info(
+            "DesktopShell",
+            $"Main window closing requested. Intent='{_shutdownIntent}'; ShellState='{_desktopShellState}'; WindowState='{mainWindow.WindowState}'; IsVisible={mainWindow.IsVisible}.");
+
+        if (_shutdownIntent is ShutdownIntent.ExitRequested or ShutdownIntent.RestartRequested)
+        {
+            AppLogger.Info(
+                "DesktopShell",
+                $"Main window close allowed. Intent='{_shutdownIntent}'; ShellState='{_desktopShellState}'.");
+            return;
+        }
+
+        e.Cancel = true;
+        HideMainWindowToTray(mainWindow, "MainWindowClosing");
+    }
+
+    private void OnMainWindowClosed(object? sender, EventArgs e)
+    {
+        if (sender is not MainWindow mainWindow)
+        {
+            return;
+        }
+
+        mainWindow.Closing -= OnMainWindowClosing;
+        mainWindow.Closed -= OnMainWindowClosed;
+        mainWindow.PropertyChanged -= OnMainWindowPropertyChanged;
+
+        if (ReferenceEquals(_mainWindow, mainWindow))
+        {
+            _mainWindow = null;
+        }
+
+        _mainWindowClosed = true;
+        AppLogger.Info(
+            "DesktopShell",
+            $"Main window closed. Intent='{_shutdownIntent}'; ShellState='{_desktopShellState}'.");
+
+        if (_shutdownIntent == ShutdownIntent.None)
+        {
+            SetDesktopShellState(DesktopShellState.TrayOnly, "MainWindowClosedUnexpected");
+        }
+    }
+
+    private void OnMainWindowPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+    {
+        if (sender is not MainWindow mainWindow)
+        {
+            return;
+        }
+
+        if (e.Property != Window.WindowStateProperty)
+        {
+            return;
+        }
+
+        if (_shutdownIntent != ShutdownIntent.None || !mainWindow.IsVisible)
+        {
+            return;
+        }
+
+        if (mainWindow.WindowState == WindowState.Minimized)
+        {
+            SetDesktopShellState(DesktopShellState.MinimizedToTaskbar, "MainWindowMinimized");
+            return;
+        }
+
+        SetDesktopShellState(DesktopShellState.ForegroundDesktop, "MainWindowRestored");
+    }
+
+    private void HideMainWindowToTray(MainWindow mainWindow, string source)
+    {
+        try
+        {
+            mainWindow.ShowInTaskbar = false;
+            mainWindow.Hide();
+            SetDesktopShellState(DesktopShellState.TrayOnly, source);
+            AppLogger.Info(
+                "DesktopShell",
+                $"Main window hidden to tray. Source='{source}'; WindowState='{mainWindow.WindowState}'.");
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("DesktopShell", $"Failed to hide main window to tray. Source='{source}'.", ex);
+        }
+    }
+
+    private void SetDesktopShellState(DesktopShellState state, string source)
+    {
+        if (_desktopShellState == state)
+        {
+            return;
+        }
+
+        var previous = _desktopShellState;
+        _desktopShellState = state;
+        AppLogger.Info(
+            "DesktopShell",
+            $"Shell state changed. Previous='{previous}'; Current='{state}'; Source='{source}'.");
+    }
+
+    private void LogBrowserStartupDiagnostics()
+    {
+        try
+        {
+            var snapshot = new DesktopLayoutSettingsService().Load();
+            var browserPlacements = snapshot.DesktopComponentPlacements
+                .Where(placement => string.Equals(
+                    placement.ComponentId,
+                    BuiltInComponentIds.DesktopBrowser,
+                    StringComparison.OrdinalIgnoreCase))
+                .ToList();
+            var runtimeAvailability = WebView2RuntimeProbe.GetAvailability();
+
+            AppLogger.Info(
+                "StartupDiagnostics",
+                $"Browser component diagnostics. HasBrowserPlacement={browserPlacements.Count > 0}; " +
+                $"ActivePageHasBrowser={browserPlacements.Any(item => item.PageIndex == snapshot.CurrentDesktopSurfaceIndex)}; " +
+                $"CurrentDesktopSurfaceIndex={snapshot.CurrentDesktopSurfaceIndex}; " +
+                $"WebViewRuntimeAvailable={runtimeAvailability.IsAvailable}; " +
+                $"WebViewRuntimeVersion={runtimeAvailability.Version ?? string.Empty}; " +
+                $"WebViewRuntimeMessage={runtimeAvailability.Message}");
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("StartupDiagnostics", "Failed to log browser component diagnostics.", ex);
+        }
+    }
+
     private string L(string key, string fallback)
     {
-        var snapshot = _appSettingsService.Load();
+        var snapshot = _settingsFacade.Settings.LoadSnapshot<AppSettingsSnapshot>(SettingsScope.App);
         var languageCode = _localizationService.NormalizeLanguageCode(snapshot.LanguageCode);
         return _localizationService.GetString(languageCode, key, fallback);
     }

LanMountainDesktop/Assets/logo_nightly.svg

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="375" height="374.999991" viewBox="0 0 375 374.999991">
+<defs>
+<clipPath id="clip-0">
+<path clip-rule="nonzero" d="M 196.875 178.398438 L 285.058594 178.398438 L 285.058594 266.582031 L 196.875 266.582031 Z M 196.875 178.398438 "/>
+</clipPath>
+<clipPath id="clip-1">
+<path clip-rule="nonzero" d="M 240.96875 178.398438 C 216.617188 178.398438 196.875 198.140625 196.875 222.492188 C 196.875 246.839844 216.617188 266.582031 240.96875 266.582031 C 265.320312 266.582031 285.058594 246.839844 285.058594 222.492188 C 285.058594 198.140625 265.320312 178.398438 240.96875 178.398438 Z M 240.96875 178.398438 "/>
+</clipPath>
+<clipPath id="clip-2">
+<path clip-rule="nonzero" d="M 0.875 0.398438 L 89.058594 0.398438 L 89.058594 88.582031 L 0.875 88.582031 Z M 0.875 0.398438 "/>
+</clipPath>
+<clipPath id="clip-3">
+<path clip-rule="nonzero" d="M 44.96875 0.398438 C 20.617188 0.398438 0.875 20.140625 0.875 44.492188 C 0.875 68.839844 20.617188 88.582031 44.96875 88.582031 C 69.320312 88.582031 89.058594 68.839844 89.058594 44.492188 C 89.058594 20.140625 69.320312 0.398438 44.96875 0.398438 Z M 44.96875 0.398438 "/>
+</clipPath>
+<clipPath id="clip-4">
+<rect x="0" y="0" width="90" height="89"/>
+</clipPath>
+<g id="source-5" clip-path="url(#clip-4)">
+<g clip-path="url(#clip-2)">
+<g clip-path="url(#clip-3)">
+<path fill-rule="nonzero" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 0.875 0.398438 L 89.058594 0.398438 L 89.058594 88.582031 L 0.875 88.582031 Z M 0.875 0.398438 "/>
+</g>
+</g>
+</g>
+</defs>
+<rect x="-37.5" y="-37.499999" width="450" height="449.999989" fill="rgb(100%, 100%, 100%)" fill-opacity="1"/>
+<rect x="-37.5" y="-37.499999" width="450" height="449.999989" fill="rgb(0%, 0%, 0%)" fill-opacity="1"/>
+<path fill="none" stroke-width="21" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 0.00219613 10.500482 L 127.627201 10.500482 " transform="matrix(0.75, 0, 0, 0.75, 93.623353, 248.98792)"/>
+<path fill="none" stroke-width="21" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 0.00244625 10.500708 L 127.622243 10.500708 " transform="matrix(0.75, 0, 0, 0.75, 189.341915, 110.327595)"/>
+<path fill="none" stroke-width="21" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 10.492181 33.974247 C 11.537452 2.677252 36.02023 2.673354 83.94005 33.972962 " transform="matrix(-0.0333864, -0.749256, 0.749256, -0.0333864, 70.972996, 265.851083)"/>
+<path fill="none" stroke-width="21" stroke-linecap="butt" stroke-linejoin="miter" stroke="rgb(100%, 100%, 100%)" stroke-opacity="1" stroke-miterlimit="4" d="M 10.498903 37.532093 C 10.670763 1.489257 37.447477 1.488034 90.82363 37.533419 " transform="matrix(0.0300175, 0.749399, -0.749399, 0.0300175, 310.455894, 109.212543)"/>
+<g clip-path="url(#clip-0)">
+<g clip-path="url(#clip-1)">
+<use xlink:href="#source-5" transform="matrix(1, 0, 0, 1, 196, 178)"/>
+</g>
+</g>
+</svg>

LanMountainDesktop/Assets/logo_nightly_render.html

@@ -0,0 +1,31 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8" />
+<style>
+html, body {
+  margin: 0;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  background: #000;
+}
+.stage {
+  width: 512px;
+  height: 512px;
+  background: #000;
+}
+.stage img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  display: block;
+}
+</style>
+</head>
+<body>
+  <div class="stage">
+    <img src="./logo_nightly.svg" alt="logo" />
+  </div>
+</body>
+</html>

LanMountainDesktop/ComponentSystem/DesktopComponentEditorRegistry.cs

@@ -0,0 +1,159 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using LanMountainDesktop.PluginSdk;
+using LanMountainDesktop.Services;
+using LanMountainDesktop.Services.Settings;
+
+namespace LanMountainDesktop.ComponentSystem;
+
+public sealed record DesktopComponentEditorContext(
+    DesktopComponentDefinition Definition,
+    string ComponentId,
+    string? PlacementId,
+    ISettingsFacadeService SettingsFacade,
+    ISettingsService SettingsService,
+    IComponentSettingsAccessor ComponentSettingsAccessor,
+    IComponentInstanceSettingsStore ComponentSettingsStore,
+    IComponentEditorHostContext HostContext);
+
+public sealed class DesktopComponentEditorRegistration
+{
+    public DesktopComponentEditorRegistration(
+        string componentId,
+        Func<DesktopComponentEditorContext, Control> editorFactory,
+        double preferredWidth = 720d,
+        double preferredHeight = 540d,
+        double minScale = 0.85d,
+        double maxScale = 1.45d)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(componentId);
+        ArgumentNullException.ThrowIfNull(editorFactory);
+
+        if (preferredWidth <= 0)
+        {
+            throw new ArgumentOutOfRangeException(nameof(preferredWidth));
+        }
+
+        if (preferredHeight <= 0)
+        {
+            throw new ArgumentOutOfRangeException(nameof(preferredHeight));
+        }
+
+        if (minScale <= 0)
+        {
+            throw new ArgumentOutOfRangeException(nameof(minScale));
+        }
+
+        if (maxScale < minScale)
+        {
+            throw new ArgumentOutOfRangeException(nameof(maxScale));
+        }
+
+        ComponentId = componentId.Trim();
+        EditorFactory = editorFactory;
+        PreferredWidth = preferredWidth;
+        PreferredHeight = preferredHeight;
+        MinScale = minScale;
+        MaxScale = maxScale;
+        AspectRatio = preferredWidth / preferredHeight;
+    }
+
+    public string ComponentId { get; }
+
+    public Func<DesktopComponentEditorContext, Control> EditorFactory { get; }
+
+    public double PreferredWidth { get; }
+
+    public double PreferredHeight { get; }
+
+    public double MinScale { get; }
+
+    public double MaxScale { get; }
+
+    public double AspectRatio { get; }
+}
+
+public sealed class DesktopComponentEditorDescriptor
+{
+    internal DesktopComponentEditorDescriptor(
+        DesktopComponentDefinition definition,
+        Func<DesktopComponentEditorContext, Control> editorFactory,
+        double preferredWidth,
+        double preferredHeight,
+        double minScale,
+        double maxScale,
+        double aspectRatio)
+    {
+        Definition = definition;
+        _editorFactory = editorFactory;
+        PreferredWidth = preferredWidth;
+        PreferredHeight = preferredHeight;
+        MinScale = minScale;
+        MaxScale = maxScale;
+        AspectRatio = aspectRatio;
+    }
+
+    private readonly Func<DesktopComponentEditorContext, Control> _editorFactory;
+
+    public DesktopComponentDefinition Definition { get; }
+
+    public double PreferredWidth { get; }
+
+    public double PreferredHeight { get; }
+
+    public double MinScale { get; }
+
+    public double MaxScale { get; }
+
+    public double AspectRatio { get; }
+
+    public Control CreateEditor(DesktopComponentEditorContext context)
+    {
+        return _editorFactory(context);
+    }
+}
+
+public sealed class DesktopComponentEditorRegistry
+{
+    private readonly Dictionary<string, DesktopComponentEditorDescriptor> _descriptors;
+
+    public DesktopComponentEditorRegistry(
+        ComponentRegistry componentRegistry,
+        IEnumerable<DesktopComponentEditorRegistration> registrations)
+    {
+        ArgumentNullException.ThrowIfNull(componentRegistry);
+        ArgumentNullException.ThrowIfNull(registrations);
+
+        _descriptors = new Dictionary<string, DesktopComponentEditorDescriptor>(StringComparer.OrdinalIgnoreCase);
+
+        foreach (var registration in registrations)
+        {
+            if (!componentRegistry.TryGetDefinition(registration.ComponentId, out var definition))
+            {
+                continue;
+            }
+
+            _descriptors[registration.ComponentId] = new DesktopComponentEditorDescriptor(
+                definition,
+                registration.EditorFactory,
+                registration.PreferredWidth,
+                registration.PreferredHeight,
+                registration.MinScale,
+                registration.MaxScale,
+                registration.AspectRatio);
+        }
+    }
+
+    public bool TryGetDescriptor(string componentId, out DesktopComponentEditorDescriptor descriptor)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(componentId);
+        return _descriptors.TryGetValue(componentId.Trim(), out descriptor!);
+    }
+
+    public IReadOnlyList<DesktopComponentEditorDescriptor> GetAll()
+    {
+        return _descriptors.Values.ToList();
+    }
+}

LanMountainDesktop/ComponentSystem/DesktopComponentRuntimeContext.cs

@@ -1,8 +1,14 @@
+using LanMountainDesktop.PluginSdk;
 using LanMountainDesktop.Services;
+using LanMountainDesktop.Services.Settings;
 
 namespace LanMountainDesktop.ComponentSystem;
 
 public sealed record DesktopComponentRuntimeContext(
     string ComponentId,
     string? PlacementId,
+    ISettingsFacadeService SettingsFacade,
+    ISettingsService SettingsService,
+    IAppearanceThemeService AppearanceTheme,
+    IComponentSettingsAccessor ComponentSettingsAccessor,
     IComponentInstanceSettingsStore ComponentSettingsStore);

LanMountainDesktop/ComponentSystem/IComponentSettingsContextAware.cs

@@ -0,0 +1,19 @@
+using LanMountainDesktop.PluginSdk;
+using LanMountainDesktop.Services;
+using LanMountainDesktop.Services.Settings;
+
+namespace LanMountainDesktop.ComponentSystem;
+
+public sealed record DesktopComponentSettingsContext(
+    string ComponentId,
+    string? PlacementId,
+    ISettingsFacadeService SettingsFacade,
+    ISettingsService SettingsService,
+    IAppearanceThemeService AppearanceTheme,
+    IComponentSettingsAccessor ComponentSettingsAccessor,
+    IComponentInstanceSettingsStore ComponentSettingsStore);
+
+public interface IComponentSettingsContextAware
+{
+    void SetComponentSettingsContext(DesktopComponentSettingsContext context);
+}

LanMountainDesktop/ComponentSystem/IComponentSettingsStoreAware.cs

@@ -1,8 +0,0 @@
-using LanMountainDesktop.Services;
-
-namespace LanMountainDesktop.ComponentSystem;
-
-public interface IComponentSettingsStoreAware
-{
-    void SetComponentSettingsStore(IComponentInstanceSettingsStore settingsStore);
-}

LanMountainDesktop/Controls/IconText.axaml

@@ -0,0 +1,19 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:fi="using:FluentIcons.Avalonia"
+             x:Class="LanMountainDesktop.Controls.IconText">
+
+    <StackPanel Orientation="Horizontal"
+                Spacing="8"
+                VerticalAlignment="Center">
+        <fi:FluentIcon x:Name="IconElement"
+                       Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
+                       FontSize="14"
+                       VerticalAlignment="Center" />
+        <TextBlock x:Name="TextElement"
+                   Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
+                   FontSize="14"
+                   FontWeight="SemiBold"
+                   VerticalAlignment="Center" />
+    </StackPanel>
+</UserControl>

LanMountainDesktop/Controls/IconText.axaml.cs

@@ -0,0 +1,52 @@
+using Avalonia;
+using Avalonia.Controls;
+using FluentIcons.Avalonia;
+using FluentIcons.Common;
+
+namespace LanMountainDesktop.Controls;
+
+public partial class IconText : UserControl
+{
+    public static readonly StyledProperty<Icon> IconProperty =
+        AvaloniaProperty.Register<IconText, Icon>(nameof(Icon), Icon.Info);
+
+    public static readonly StyledProperty<string> TextProperty =
+        AvaloniaProperty.Register<IconText, string>(nameof(Text), string.Empty);
+
+    public IconText()
+    {
+        InitializeComponent();
+    }
+
+    public Icon Icon
+    {
+        get => GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+
+    public string Text
+    {
+        get => GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+
+        if (change.Property == IconProperty)
+        {
+            if (IconElement is not null)
+            {
+                IconElement.Icon = change.GetNewValue<Icon>();
+            }
+        }
+        else if (change.Property == TextProperty)
+        {
+            if (TextElement is not null)
+            {
+                TextElement.Text = change.GetNewValue<string?>();
+            }
+        }
+    }
+}

LanMountainDesktop/Controls/SettingsOptionCard.axaml

@@ -0,0 +1,37 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:LanMountainDesktop.Controls"
+             xmlns:fi="using:FluentIcons.Avalonia"
+             x:Class="LanMountainDesktop.Controls.SettingsOptionCard"
+             x:Name="Root">
+    <Border Classes="settings-option-card">
+        <Grid RowDefinitions="Auto,Auto"
+              RowSpacing="12">
+            <Grid ColumnDefinitions="Auto,*,Auto"
+                  ColumnSpacing="14">
+                <Border x:Name="IconHost"
+                        Classes="settings-option-card-icon-host">
+                    <fi:SymbolIcon x:Name="CardIcon"
+                                   Classes="icon-m" />
+                </Border>
+
+                <StackPanel Grid.Column="1"
+                            Spacing="4"
+                            VerticalAlignment="Center">
+                    <TextBlock x:Name="TitleTextBlock"
+                               Classes="settings-item-label" />
+                    <TextBlock x:Name="DescriptionTextBlock"
+                               Classes="settings-item-description" />
+                </StackPanel>
+
+                <ContentPresenter x:Name="ActionContentHost"
+                                  Grid.Column="2"
+                                  VerticalAlignment="Center" />
+            </Grid>
+
+            <ContentPresenter x:Name="DetailsContentHost"
+                              Grid.Row="1"
+                              Margin="54,0,0,0" />
+        </Grid>
+    </Border>
+</UserControl>

LanMountainDesktop/Controls/SettingsOptionCard.axaml.cs

@@ -0,0 +1,113 @@
+using Avalonia;
+using Avalonia.Controls;
+using FluentIcons.Common;
+
+namespace LanMountainDesktop.Controls;
+
+public partial class SettingsOptionCard : UserControl
+{
+    public static readonly StyledProperty<string?> IconKeyProperty =
+        AvaloniaProperty.Register<SettingsOptionCard, string?>(nameof(IconKey), "Settings");
+
+    public static readonly StyledProperty<string?> TitleProperty =
+        AvaloniaProperty.Register<SettingsOptionCard, string?>(nameof(Title));
+
+    public static readonly StyledProperty<string?> DescriptionProperty =
+        AvaloniaProperty.Register<SettingsOptionCard, string?>(nameof(Description));
+
+    public static readonly StyledProperty<object?> ActionContentProperty =
+        AvaloniaProperty.Register<SettingsOptionCard, object?>(nameof(ActionContent));
+
+    public static readonly StyledProperty<object?> DetailsContentProperty =
+        AvaloniaProperty.Register<SettingsOptionCard, object?>(nameof(DetailsContent));
+
+    public SettingsOptionCard()
+    {
+        InitializeComponent();
+        RefreshVisualState();
+    }
+
+    public string? IconKey
+    {
+        get => GetValue(IconKeyProperty);
+        set => SetValue(IconKeyProperty, value);
+    }
+
+    public string? Title
+    {
+        get => GetValue(TitleProperty);
+        set => SetValue(TitleProperty, value);
+    }
+
+    public string? Description
+    {
+        get => GetValue(DescriptionProperty);
+        set => SetValue(DescriptionProperty, value);
+    }
+
+    public object? ActionContent
+    {
+        get => GetValue(ActionContentProperty);
+        set => SetValue(ActionContentProperty, value);
+    }
+
+    public object? DetailsContent
+    {
+        get => GetValue(DetailsContentProperty);
+        set => SetValue(DetailsContentProperty, value);
+    }
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+
+        if (change.Property == IconKeyProperty ||
+            change.Property == TitleProperty ||
+            change.Property == DescriptionProperty ||
+            change.Property == ActionContentProperty ||
+            change.Property == DetailsContentProperty)
+        {
+            RefreshVisualState();
+        }
+    }
+
+    private void RefreshVisualState()
+    {
+        if (CardIcon is null ||
+            IconHost is null ||
+            TitleTextBlock is null ||
+            DescriptionTextBlock is null ||
+            ActionContentHost is null ||
+            DetailsContentHost is null)
+        {
+            return;
+        }
+
+        CardIcon.Symbol = MapIcon(IconKey);
+        IconHost.IsVisible = !string.IsNullOrWhiteSpace(IconKey);
+
+        TitleTextBlock.Text = Title ?? string.Empty;
+        DescriptionTextBlock.Text = Description ?? string.Empty;
+        DescriptionTextBlock.IsVisible = !string.IsNullOrWhiteSpace(Description);
+
+        ActionContentHost.Content = ActionContent;
+        ActionContentHost.IsVisible = ActionContent is not null;
+
+        DetailsContentHost.Content = DetailsContent;
+        DetailsContentHost.IsVisible = DetailsContent is not null;
+    }
+
+    private static Symbol MapIcon(string? iconKey)
+    {
+        return iconKey?.Trim() switch
+        {
+            "DesignIdeas" => Symbol.Color,
+            "Image" => Symbol.Image,
+            "GridDots" => Symbol.GridDots,
+            "PuzzlePiece" => Symbol.PuzzlePiece,
+            "Info" => Symbol.Info,
+            "ArrowSync" => Symbol.ArrowSync,
+            _ => Symbol.Settings
+        };
+    }
+}

LanMountainDesktop/Controls/SettingsSectionCard.axaml

@@ -0,0 +1,33 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:LanMountainDesktop.Controls"
+             xmlns:fi="using:FluentIcons.Avalonia"
+             x:Class="LanMountainDesktop.Controls.SettingsSectionCard"
+             x:Name="Root">
+    <Border Classes="settings-section-card">
+        <Grid RowDefinitions="Auto,Auto"
+              RowSpacing="16">
+            <Grid ColumnDefinitions="Auto,*"
+                  ColumnSpacing="14">
+                <Border x:Name="IconHost"
+                        Classes="settings-section-card-icon-host">
+                    <fi:SymbolIcon x:Name="CardIcon"
+                                   Classes="icon-l" />
+                </Border>
+
+                <StackPanel Grid.Column="1"
+                            Spacing="4">
+                    <TextBlock x:Name="TitleTextBlock"
+                               Classes="settings-card-header"
+                               Margin="0" />
+                    <TextBlock x:Name="DescriptionTextBlock"
+                               Classes="settings-card-description"
+                               Margin="0" />
+                </StackPanel>
+            </Grid>
+
+            <ContentPresenter x:Name="CardContentHost"
+                              Grid.Row="1" />
+        </Grid>
+    </Border>
+</UserControl>

LanMountainDesktop/Controls/SettingsSectionCard.axaml.cs

@@ -0,0 +1,98 @@
+using Avalonia;
+using Avalonia.Controls;
+using FluentIcons.Common;
+
+namespace LanMountainDesktop.Controls;
+
+public partial class SettingsSectionCard : UserControl
+{
+    public static readonly StyledProperty<string?> IconKeyProperty =
+        AvaloniaProperty.Register<SettingsSectionCard, string?>(nameof(IconKey), "Settings");
+
+    public static readonly StyledProperty<string?> TitleProperty =
+        AvaloniaProperty.Register<SettingsSectionCard, string?>(nameof(Title));
+
+    public static readonly StyledProperty<string?> DescriptionProperty =
+        AvaloniaProperty.Register<SettingsSectionCard, string?>(nameof(Description));
+
+    public static readonly StyledProperty<object?> CardContentProperty =
+        AvaloniaProperty.Register<SettingsSectionCard, object?>(nameof(CardContent));
+
+    public SettingsSectionCard()
+    {
+        InitializeComponent();
+        RefreshVisualState();
+    }
+
+    public string? IconKey
+    {
+        get => GetValue(IconKeyProperty);
+        set => SetValue(IconKeyProperty, value);
+    }
+
+    public string? Title
+    {
+        get => GetValue(TitleProperty);
+        set => SetValue(TitleProperty, value);
+    }
+
+    public string? Description
+    {
+        get => GetValue(DescriptionProperty);
+        set => SetValue(DescriptionProperty, value);
+    }
+
+    public object? CardContent
+    {
+        get => GetValue(CardContentProperty);
+        set => SetValue(CardContentProperty, value);
+    }
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+
+        if (change.Property == IconKeyProperty ||
+            change.Property == TitleProperty ||
+            change.Property == DescriptionProperty ||
+            change.Property == CardContentProperty)
+        {
+            RefreshVisualState();
+        }
+    }
+
+    private void RefreshVisualState()
+    {
+        if (CardIcon is null ||
+            IconHost is null ||
+            TitleTextBlock is null ||
+            DescriptionTextBlock is null ||
+            CardContentHost is null)
+        {
+            return;
+        }
+
+        CardIcon.Symbol = MapIcon(IconKey);
+        IconHost.IsVisible = !string.IsNullOrWhiteSpace(IconKey);
+
+        TitleTextBlock.Text = Title ?? string.Empty;
+        DescriptionTextBlock.Text = Description ?? string.Empty;
+        DescriptionTextBlock.IsVisible = !string.IsNullOrWhiteSpace(Description);
+
+        CardContentHost.Content = CardContent;
+    }
+
+    private static Symbol MapIcon(string? iconKey)
+    {
+        return iconKey?.Trim() switch
+        {
+            "DesignIdeas" => Symbol.Color,
+            "Image" => Symbol.Image,
+            "GridDots" => Symbol.GridDots,
+            "PuzzlePiece" => Symbol.PuzzlePiece,
+            "Info" => Symbol.Info,
+            "ArrowSync" => Symbol.ArrowSync,
+            _ => Symbol.Settings
+        };
+    }
+}

LanMountainDesktop/Helpers/PluginMarketMarkdownHelper.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Diagnostics;
+using System.Windows.Input;
+using CommunityToolkit.Mvvm.Input;
+using Markdown.Avalonia;
+
+namespace LanMountainDesktop.Helpers;
+
+public static class PluginMarketMarkdownHelper
+{
+    private static Markdown.Avalonia.Markdown? _engine;
+
+    public static ICommand OpenLinkCommand { get; } = new RelayCommand<object?>(OpenLink);
+
+    public static Markdown.Avalonia.Markdown Engine => _engine ??= new Markdown.Avalonia.Markdown
+    {
+        HyperlinkCommand = OpenLinkCommand
+    };
+
+    private static void OpenLink(object? parameter)
+    {
+        var url = parameter switch
+        {
+            Uri uri => uri.ToString(),
+            string text => text,
+            _ => null
+        };
+
+        if (string.IsNullOrWhiteSpace(url))
+        {
+            return;
+        }
+
+        try
+        {
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = url,
+                UseShellExecute = true
+            });
+        }
+        catch
+        {
+            // Ignore browser launch failures inside the markdown viewer.
+        }
+    }
+}

LanMountainDesktop/LanMountainDesktop.csproj

@@ -5,6 +5,7 @@
     <Nullable>enable</Nullable>
     <Version>1.0.0</Version>
     <ApplicationManifest>app.manifest</ApplicationManifest>
+    <ApplicationIcon>Assets\logo_nightly.ico</ApplicationIcon>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <SelfContained Condition="'$(RuntimeIdentifier)' != ''">true</SelfContained>
   </PropertyGroup>
@@ -26,6 +27,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\LanMountainDesktop.PluginSdk\LanMountainDesktop.PluginSdk.csproj" />
+    <ProjectReference Include="..\LanMountainDesktop.PluginsInstallHelper\LanMountainDesktop.PluginsInstallHelper.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
@@ -40,13 +42,21 @@
     </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.319" />
     <PackageReference Include="FluentIcons.Avalonia.Fluent" Version="2.0.319" />
+    <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="LibVLCSharp.Avalonia" Version="3.9.5" />
     <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="VideoLAN.LibVLC.Windows" Version="3.0.23" Condition="('$(RuntimeIdentifier)' == '' and $([MSBuild]::IsOSPlatform('Windows')))&#xA;                              or '$(RuntimeIdentifier)' == 'win-x64'&#xA;                              or '$(RuntimeIdentifier)' == 'win-x86'" />
@@ -55,4 +65,18 @@
     <PackageReference Include="WebView.Avalonia.Desktop" Version="11.0.0.1" />
     <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
+
+  <Target Name="CopyPluginsInstallHelperToOutput" AfterTargets="Build">
+    <ItemGroup>
+      <PluginsInstallHelperFiles Include="..\LanMountainDesktop.PluginsInstallHelper\bin\$(Configuration)\net10.0\**\*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(PluginsInstallHelperFiles)" DestinationFiles="@(PluginsInstallHelperFiles->'$(OutDir)PluginsInstallHelper\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
+  </Target>
+
+  <Target Name="CopyPluginsInstallHelperToPublish" AfterTargets="Publish" Condition="'$(PublishDir)' != ''">
+    <ItemGroup>
+      <PluginsInstallHelperPublishFiles Include="..\LanMountainDesktop.PluginsInstallHelper\bin\$(Configuration)\net10.0\**\*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(PluginsInstallHelperPublishFiles)" DestinationFiles="@(PluginsInstallHelperPublishFiles->'$(PublishDir)PluginsInstallHelper\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
+  </Target>
 </Project>

LanMountainDesktop/Localization/en-US.json

@@ -1,17 +1,19 @@
-{
+{
     "app.title":  "LanMountainDesktop",
     "tray.tooltip":  "LanMountainDesktop",
+    "tray.menu.show_desktop":  "Open Desktop",
     "tray.menu.settings":  "Settings",
+    "tray.menu.component_library":  "Component Library",
     "tray.menu.restart":  "Restart App",
     "tray.menu.exit":  "Exit App",
     "button.back_to_windows":  "Back to Windows",
     "tooltip.back_to_windows":  "Back to Windows",
     "tooltip.open_settings":  "Settings",
     "settings.title":  "Settings",
-    "settings.shell.title":  "Application Settings",
-    "settings.shell.subtitle":  "LanMountainDesktop standalone preferences",
+    "settings.shell.title":  "Settings",
+    "settings.shell.subtitle":  "LanMountainDesktop independent settings module",
     "settings.shell.sidebar_hint":  "Choose a category to adjust application behavior, desktop layout, and appearance.",
-    "settings.shell.footer_hint":  "Tray-opened settings are managed in this standalone window.",
+    "settings.shell.footer_hint":  "Tray-opened settings are managed in this independent settings module.",
     "settings.back_to_desktop":  "Back to Desktop",
     "settings.nav_header":  "Settings",
     "settings.nav.group_desktop":  "Desktop",
@@ -24,6 +26,7 @@
     "settings.nav.weather":  "Weather",
     "settings.nav.region":  "Region",
     "settings.nav.update":  "Update",
+    "settings.nav.privacy":  "Privacy",
     "settings.nav.launcher":  "App Launcher",
     "settings.nav.plugins":  "Plugins",
     "settings.nav.about":  "About",
@@ -90,7 +93,14 @@
     "settings.status_bar.spacing_mode_custom":  "Custom",
     "settings.status_bar.spacing_custom_label":  "Custom spacing (%)",
     "settings.status_bar.spacing_custom_px_format":  "≈ {0:F1}px",
+    "settings.privacy.title":  "Privacy",
+    "settings.privacy.description":  "Manage optional anonymous uploads that help improve the app over time.",
+    "settings.privacy.crash_upload_title":  "Anonymous crash data uploads",
+    "settings.privacy.crash_upload_description":  "Help us improve application stability.",
+    "settings.privacy.usage_upload_title":  "Anonymous usage data uploads",
+    "settings.privacy.usage_upload_description":  "Help us improve application features.",
     "settings.weather.title":  "Weather",
+    "settings.weather.description":  "Configure weather location, Xiaomi weather preview, and startup positioning behavior.",
     "settings.weather.location_source_header":  "Location Source",
     "settings.weather.location_source_desc":  "Choose how weather widgets resolve location.",
     "settings.weather.mode_city_search":  "City Search",
@@ -117,6 +127,14 @@
     "settings.weather.apply_coordinates_button":  "Apply Coordinates",
     "settings.weather.coordinates_saved_format":  "Coordinates saved: {0:F4}, {1:F4}",
     "settings.weather.coordinates_default_name_format":  "Coordinate {0:F4}, {1:F4}",
+    "settings.weather.location_services_header":  "Location Service",
+    "settings.weather.location_services_desc":  "Use the current Windows location and decide whether it refreshes automatically on startup.",
+    "settings.weather.use_current_location":  "Use Current Location",
+    "settings.weather.location_unsupported":  "Current platform does not support retrieving the current location.",
+    "settings.weather.location_ready":  "You can use the current Windows location.",
+    "settings.weather.location_refreshing":  "Requesting current location...",
+    "settings.weather.location_refresh_success_format":  "Current location applied: {0}",
+    "settings.weather.location_refresh_failed_format":  "Failed to get current location: {0}",
     "settings.weather.preview_header":  "Connection Test",
     "settings.weather.preview_desc":  "Send one test request to verify current settings.",
     "settings.weather.preview_button":  "Test Fetch",
@@ -125,6 +143,7 @@
     "settings.weather.preview_panel_header":  "Weather Preview",
     "settings.weather.preview_panel_desc":  "Refresh and verify current weather service status.",
     "settings.weather.refresh_button":  "Refresh",
+    "settings.weather.preview_updated_format":  "Updated {0}",
     "settings.weather.preview_hint":  "Use test fetch to verify your weather configuration.",
     "settings.weather.preview_missing_location":  "Please apply one weather location before testing.",
     "settings.weather.preview_success_format":  "Test success: {0} · {1} · {2}",
@@ -220,6 +239,59 @@
     "settings.region.timezone_header":  "Time Zone",
     "settings.region.timezone_desc":  "Select a time zone. Clock and calendar widgets will follow this zone.",
     "settings.region.applied_format":  "Language switched to: {0}",
+    "settings.region.follow_system":  "Follow system default",
+    "settings.general.title":  "General",
+    "settings.general.description":  "Adjust language, time zone, and runtime behavior.",
+    "settings.general.basic_header":  "Basic Settings",
+    "settings.general.runtime_header":  "Runtime",
+    "settings.general.preview_header":  "Date & Time Preview",
+    "settings.general.preview_time_label":  "Time",
+    "settings.general.preview_date_label":  "Date",
+    "settings.general.render_mode_restart_message":  "Rendering mode changes require restarting the app.",
+    "settings.appearance.title":  "Appearance",
+    "settings.appearance.description":  "Adjust theme source, system material, and window chrome.",
+    "settings.appearance.theme_header":  "Theme",
+    "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",
+    "settings.appearance.theme_color_mode_label":  "Theme color source",
+    "settings.appearance.system_material_label":  "System material",
+    "settings.appearance.theme_color_mode.neutral":  "Default neutral",
+    "settings.appearance.theme_color_mode.user":  "User theme color Monet",
+    "settings.appearance.theme_color_mode.wallpaper":  "Wallpaper Monet",
+    "settings.appearance.theme_color_mode_desc.neutral":  "Use the default white and black neutral surfaces for light and dark mode.",
+    "settings.appearance.theme_color_mode_desc.user":  "Use the selected theme color as the Monet seed for the whole shell.",
+    "settings.appearance.theme_color_mode_desc.wallpaper":  "Use wallpaper colors. The app wallpaper is preferred, then the system wallpaper.",
+    "settings.appearance.theme_color_preview.app":  "Currently previewing colors extracted from the app wallpaper.",
+    "settings.appearance.theme_color_preview.system":  "Currently previewing colors extracted from the system wallpaper.",
+    "settings.appearance.theme_color_preview.fallback":  "No usable wallpaper was found. The app is using a fallback accent.",
+    "settings.appearance.system_material.none":  "None",
+    "settings.appearance.system_material.mica":  "Mica",
+    "settings.appearance.system_material.acrylic":  "Acrylic",
+    "settings.appearance.system_material_desc.switchable":  "Apply the selected material to windows, Dock, status bar, and component hosts.",
+    "settings.appearance.system_material_desc.fixed":  "Your current system only exposes the material modes listed here.",
+    "settings.appearance.restart_message":  "Theme source and system material changes require restarting the app.",
+    "settings.appearance.preview.primary":  "Primary",
+    "settings.appearance.preview.secondary":  "Secondary",
+    "settings.appearance.preview.tertiary":  "Tertiary",
+    "settings.appearance.preview.neutral":  "Neutral",
+    "settings.appearance.preview.seed":  "Seed",
+    "settings.appearance.preview.neutral_light":  "White",
+    "settings.appearance.preview.neutral_dark":  "Black",
+    "settings.appearance.preview.apply_seed":  "Apply",
+    "settings.appearance.preview.wallpaper_candidates":  "Wallpaper seed candidates",
+    "settings.appearance.preview.wallpaper_current":  "Current",
+    "settings.wallpaper.placement.fill":  "Fill",
+    "settings.wallpaper.placement.fit":  "Fit",
+    "settings.wallpaper.placement.stretch":  "Stretch",
+    "settings.wallpaper.placement.center":  "Center",
+    "settings.wallpaper.placement.tile":  "Tile",
+    "settings.status_bar.clock_format_label":  "Clock format",
+    "settings.status_bar.clock_format.hm":  "Hour:Minute",
+    "settings.status_bar.clock_format.hms":  "Hour:Minute:Second",
+    "settings.components.title":  "Components",
+    "settings.components.description":  "Adjust desktop grid density and widget placement.",
+    "settings.components.grid_header":  "Grid Layout",
     "settings.update.title":  "Update",
     "settings.update.current_version_label":  "Current Version",
     "settings.update.latest_version_label":  "Latest Release",
@@ -251,6 +323,7 @@
     "settings.update.status_launching_installer":  "Download complete. Launching installer...",
     "settings.update.status_installer_missing":  "Installer file was not found after download.",
     "settings.update.status_installer_started":  "Installer started. The app will close for update.",
+    "settings.update.status_elevation_cancelled":  "Administrator permission was not granted. Update was cancelled.",
     "settings.update.status_launch_failed_format":  "Failed to start installer: {0}",
     "settings.about.title":  "About",
     "settings.about.version_format":  "Version: {0}",
@@ -271,9 +344,42 @@
     "settings.about.render_mode.current_format":  "Current backend: {0}",
     "settings.about.render_mode.impl_format":  "Runtime implementation: {0}",
     "settings.about.render_mode.impl_unavailable":  "Runtime implementation details are unavailable.",
+    "settings.about.description":  "Application details.",
+    "settings.update.description":  "Check releases, choose the update channel and download source, and control how updates are installed.",
+    "settings.update.status_card_title":  "Update Status",
+    "settings.update.status_card_description":  "Check for updates, review release details, and continue with download or installation when a new version is available.",
+    "settings.update.preferences_header":  "Update Preferences",
+    "settings.update.preferences_description":  "Choose the release channel, installer download source, installation behavior, and download parallelism.",
+    "settings.update.last_checked_label":  "Last Checked",
+    "settings.update.source_label":  "Download Source",
+    "settings.update.source_github":  "GitHub",
+    "settings.update.source_ghproxy":  "gh-proxy",
+    "settings.update.source_github_desc":  "Download release assets directly from GitHub.",
+    "settings.update.source_ghproxy_desc":  "Use the gh-proxy mirror when downloading GitHub release assets.",
+    "settings.update.mode_label":  "Update Mode",
+    "settings.update.mode_manual":  "Manual Update",
+    "settings.update.mode_download_then_confirm":  "Silent Download",
+    "settings.update.mode_silent_on_exit":  "Silent Install",
+    "settings.update.mode_manual_desc":  "Only check for updates. You decide when downloads and installation happen.",
+    "settings.update.mode_download_then_confirm_desc":  "Download updates in the background and ask for confirmation before installing them.",
+    "settings.update.mode_silent_on_exit_desc":  "Download updates in the background and install them the next time you exit the app.",
+    "settings.update.channel_stable_desc":  "Stable builds prioritize reliability and are recommended for most users.",
+    "settings.update.channel_preview_desc":  "Preview builds may contain newer features but can be less stable.",
+    "settings.update.download_threads_label":  "Download Threads",
+    "settings.update.download_threads_desc":  "Set the number of parallel download threads for application update packages.",
+    "settings.update.install_now_button":  "Install Now",
+    "settings.update.status_downloaded_confirm":  "Update downloaded. Review it and choose when to install.",
+    "settings.update.status_downloaded_exit":  "Update downloaded. It will be installed when you exit the app.",
+    "settings.about.app_info_header":  "Application Information",
+    "settings.about.update_header":  "Updates",
+    "settings.about.version_label":  "Version",
+    "settings.about.codename_label":  "Codename",
+    "settings.about.render_backend_label":  "Render Backend",
+    "settings.about.render_backend_format":  "Render Backend: {0}",
     "settings.restart_dialog.title":  "Restart required",
     "settings.restart_dialog.render_mode_message":  "Restart the app to switch the rendering mode from \"{0}\" to \"{1}\". Restart now?",
     "settings.restart_dialog.restart":  "Restart now",
+    "settings.restart_dialog.later":  "Later",
     "settings.restart_dialog.cancel":  "Cancel",
     "settings.restart_dock.title":  "Restart required",
     "settings.restart_dock.description":  "Some changes will take effect after restarting the app.",
@@ -300,21 +406,39 @@
     "launcher.context.hide_icon":  "Hide Icon",
     "launcher.action.hide":  "Hide",
     "settings.launcher.title":  "App Launcher",
+    "settings.launcher.description":  "Manage hidden apps and folders in the App Launcher.",
     "settings.launcher.hidden_header":  "Hidden Items",
     "settings.launcher.hidden_desc":  "Review hidden launcher entries and show them again.",
     "settings.launcher.hidden_hint":  "In desktop edit mode, select a launcher icon and click Hide. Hidden entries appear here.",
     "settings.launcher.hidden_empty":  "No hidden items.",
+    "settings.launcher.hidden_summary_format":  "{0} hidden items",
     "settings.launcher.hidden_type_folder":  "Folder",
-    "settings.launcher.hidden_type_shortcut":  "Shortcut",
-    "settings.launcher.restore_button":  "Show Again",
+    "settings.launcher.hidden_type_shortcut":  "App",
+    "settings.launcher.restore_button":  "Unhide",
     "settings.plugins.title":  "Plugins",
     "settings.plugins.runtime_header":  "Plugin Runtime",
     "settings.plugins.runtime_desc":  "Review plugin runtime state and load results.",
     "settings.plugins.runtime_hint":  "This page shows discovery status, load results, and runtime diagnostics for installed plugins.",
     "settings.plugins.runtime_status":  "Plugin runtime status will appear here after plugin discovery completes.",
+    "settings.plugins.description":  "Manage installed plugins and review their runtime state.",
+    "settings.plugins.initial_status":  "Refresh plugin state to see the latest installed plugins.",
+    "settings.plugins.refresh_button":  "Refresh Plugins",
+    "settings.plugins.refresh_success_installed_format":  "Loaded {0} installed plugins.",
+    "settings.plugins.refresh_success_format":  "Loaded {0} installed plugins and {1} marketplace entries.",
+    "settings.plugins.refresh_failed":  "Failed to load plugin market index.",
+    "settings.plugins.marketplace_header":  "Marketplace",
+    "settings.plugins.marketplace_empty":  "No marketplace plugins are available right now.",
+    "settings.plugins.delete_button_short":  "Delete",
+    "settings.plugins.install_button_short":  "Install",
+    "settings.plugins.restart_required":  "Plugin changes take effect after restart.",
+    "settings.plugins.toggle_unchanged_format":  "Plugin '{0}' did not change.",
+    "settings.plugins.delete_failed_name_format":  "Failed to remove plugin '{0}'.",
+    "settings.plugins.install_failed_name_format":  "Failed to install '{0}'.",
     "settings.plugins.installed_header":  "Installed Plugins",
-    "settings.plugins.installed_desc":  "Enable or disable plugins here. Detailed plugin settings appear as separate settings pages.",
-    "settings.plugins.restart_hint":  "Plugin enable state changes take effect after restarting the app.",
+    "settings.plugins.installed_desc":  "Review installed plugins and remove them here.",
+    "settings.plugins.import_header":  "Install From Package",
+    "settings.plugins.import_desc":  "Open a .laapp package and stage it into the local plugin directory.",
+    "settings.plugins.restart_hint":  "Plugin installation and deletion changes take effect after restarting the app.",
     "settings.plugins.empty":  "No plugins found.",
     "settings.plugins.runtime_unavailable":  "Plugin runtime is not available.",
     "settings.plugins.summary_format":  "Detected {0} plugin(s); enabled {1}; loaded {2}; settings pages {3}; widgets {4}; failures {5}.",
@@ -329,6 +453,7 @@
     "settings.plugins.toggle_result_format":  "Plugin '{0}' was {1} for the next launch. Restart the app to apply page and widget changes.",
     "settings.plugins.toggle_state_enabled":  "enabled",
     "settings.plugins.toggle_state_disabled":  "disabled",
+    "settings.plugins.toggle_failed_detail_format":  "Failed to update plugin '{0}': {1}",
     "settings.plugins.install_button":  "Open .laapp package",
     "settings.plugins.install_unavailable":  "Plugin runtime is unavailable, so .laapp packages cannot be installed right now.",
     "settings.plugins.install_hint_format":  "Open a .laapp package to install it into: {0}",
@@ -338,6 +463,12 @@
     "settings.plugins.install_copy_failed":  "Failed to copy the selected .laapp package.",
     "settings.plugins.install_success_format":  "Installed plugin '{0}'. Restart the app to apply newly added settings pages and widgets.",
     "settings.plugins.install_failed_format":  "Failed to install plugin package: {0}",
+    "settings.plugins.delete_button":  "Delete plugin",
+    "settings.plugins.delete_success_format":  "Plugin '{0}' was staged for deletion. Restart the app to finish removing it.",
+    "settings.plugins.delete_failed_format":  "Failed to delete plugin: {0}",
+    "settings.plugins.delete_failed_detail_format":  "Failed to delete plugin '{0}': {1}",
+    "settings.plugins.publisher_format":  "Publisher: {0}",
+    "settings.plugins.publisher_unknown":  "Unknown publisher",
     "settings.plugins.source_package":  ".laapp package",
     "settings.plugins.source_manifest":  "Loose manifest",
     "settings.plugins.subtitle_format":  "{0} | {1} | {2}",
@@ -346,6 +477,12 @@
     "settings.plugin_market.title":  "Plugin Market",
     "settings.plugin_market.subtitle":  "Browse plugins from the official LanAirApp source and stage installs.",
     "settings.plugin_market.unavailable":  "Plugin runtime is not available, so the official market cannot be opened right now.",
+    "settings.update.status_idle":  "No update check has been performed yet.",
+    "settings.update.status_preferences_saved":  "Update preferences saved.",
+    "settings.update.status_check_failed":  "Failed to check for updates.",
+    "settings.update.status_available_summary_format":  "Update available: {0} (current: {1})",
+    "settings.update.status_up_to_date_format":  "You are up to date ({0}).",
+    "settings.window.drawer_default":  "Details",
     "market.toolbar.search_placeholder":  "Search plugins",
     "market.toolbar.refresh":  "Refresh",
     "market.status.loading":  "Loading the official plugin market...",
@@ -362,7 +499,7 @@
     "market.card.loaded":  "Loaded",
     "market.card.pending_restart":  "Restart required",
     "market.detail.placeholder":  "Select a plugin on the left to inspect details.",
-    "market.detail.author":  "Author",
+    "market.detail.author":  "Publisher",
     "market.detail.version":  "Version",
     "market.detail.api_version":  "API Version",
     "market.detail.min_host_version":  "Minimum Host Version",
@@ -381,6 +518,11 @@
     "market.detail.homepage":  "Homepage",
     "market.detail.repository":  "Repository",
     "market.detail.release_notes":  "Release Notes",
+    "market.detail.dependencies":  "Dependencies",
+    "market.detail.dependencies_empty":  "No shared contract dependencies were declared by this plugin.",
+    "market.detail.readme_loading":  "Loading README...",
+    "market.detail.readme_empty":  "README is empty.",
+    "market.detail.readme_error_format":  "README could not be loaded: {0}",
     "market.detail.state.not_installed":  "Not installed",
     "market.detail.state.update_available":  "Update available",
     "market.detail.state.installed":  "Installed",
@@ -389,6 +531,7 @@
     "market.button.update":  "Update",
     "market.button.installed":  "Installed",
     "market.button.installing":  "Installing...",
+    "market.button.restart":  "Restart to apply",
     "button.component_library":  "Edit Desktop",
     "tooltip.component_library":  "Edit Desktop",
     "component_library.title":  "Widgets",
@@ -396,6 +539,12 @@
     "component_library.drag_hint":  "Drag to place",
     "component.delete":  "Delete",
     "component.edit":  "Edit",
+    "component.editor.instance_scope": "Changes apply to this component instance only.",
+    "component.editor.info_header": "Component Info",
+    "component.editor.id_label": "Component ID",
+    "component.editor.placement_label": "Placement ID",
+    "component.editor.scope_label": "Scope",
+    "component.editor.scope_instance": "Instance-scoped editor",
     "component_category.clock":  "Clock",
     "component_category.date":  "Calendar",
     "component_category.weather":  "Weather",
@@ -733,7 +882,8 @@
     "placement.fit":  "Fit",
     "placement.stretch":  "Stretch",
     "placement.center":  "Center",
-    "placement.tile":  "Tile"
-}
-
-
+    "placement.tile":  "Tile",
+    "single_instance.notice.title":  "App already running",
+    "single_instance.notice.description":  "The app is already running. There is no need to click multiple times to open it.",
+    "single_instance.notice.button":  "OK"
+  }

LanMountainDesktop/Localization/zh-CN.json

@@ -1,17 +1,19 @@
-{
+{
     "app.title":  "LanMountainDesktop",
     "tray.tooltip":  "LanMountainDesktop",
+    "tray.menu.show_desktop":  "打开桌面",
     "tray.menu.settings":  "设置",
+    "tray.menu.component_library":  "独立组件库",
     "tray.menu.restart":  "重启应用",
     "tray.menu.exit":  "退出应用",
     "button.back_to_windows":  "回到Windows",
     "tooltip.back_to_windows":  "回到Windows",
     "tooltip.open_settings":  "设置",
     "settings.title":  "设置",
-    "settings.shell.title":  "应用设置",
-    "settings.shell.subtitle":  "LanMountainDesktop 独立设置窗口",
+    "settings.shell.title":  "设置",
+    "settings.shell.subtitle":  "LanMountainDesktop 独立设置模块",
     "settings.shell.sidebar_hint":  "选择一个分类以调整应用行为、桌面布局与外观。",
-    "settings.shell.footer_hint":  "托盘菜单打开的设置会统一在这个独立窗口中管理。",
+    "settings.shell.footer_hint":  "托盘菜单打开的设置会统一在这个独立设置模块中管理。",
     "settings.back_to_desktop":  "返回桌面",
     "settings.nav_header":  "设置选项",
     "settings.nav.group_desktop":  "桌面",
@@ -24,15 +26,21 @@
     "settings.nav.weather":  "天气",
     "settings.nav.region":  "地区",
     "settings.nav.update":  "更新",
+    "settings.nav.privacy":  "隐私",
     "settings.nav.launcher":  "应用启动台",
     "settings.nav.plugins":  "插件",
     "settings.nav.about":  "关于",
     "settings.wallpaper.title":  "壁纸",
     "settings.wallpaper.description":  "选择图片或视频后可立即设为应用窗口壁纸。",
     "settings.wallpaper.current_label":  "当前壁纸",
+    "settings.wallpaper.type_label":  "壁纸类型",
+    "settings.wallpaper.type.image":  "图片",
+    "settings.wallpaper.type.video":  "视频",
+    "settings.wallpaper.type.solid_color":  "纯色",
+    "settings.wallpaper.color_label":  "壁纸颜色",
     "settings.wallpaper.placement_label":  "显示方式",
     "settings.wallpaper.placement_desc":  "调整图像在桌面上的填充方式。",
-    "settings.wallpaper.pick_button":  "浏览文件",
+    "settings.wallpaper.pick_button":  "选择文件",
     "settings.wallpaper.clear_button":  "恢复纯色",
     "settings.wallpaper.no_selection":  "未选择壁纸。",
     "settings.wallpaper.storage_unavailable":  "存储提供器不可用。",
@@ -90,7 +98,14 @@
     "settings.status_bar.spacing_mode_custom":  "自定义",
     "settings.status_bar.spacing_custom_label":  "自定义间距（%）",
     "settings.status_bar.spacing_custom_px_format":  "≈ {0:F1}px",
+    "settings.privacy.title":  "隐私",
+    "settings.privacy.description":  "管理可选的匿名上传设置，帮助我们逐步改进应用体验。",
+    "settings.privacy.crash_upload_title":  "匿名上传崩溃数据",
+    "settings.privacy.crash_upload_description":  "帮助我们提高应用稳定性。",
+    "settings.privacy.usage_upload_title":  "匿名上传使用数据",
+    "settings.privacy.usage_upload_description":  "帮助我们改善应用功能。",
     "settings.weather.title":  "天气",
+    "settings.weather.description":  "配置天气位置、小米天气预览和启动时的位置刷新行为。",
     "settings.weather.location_source_header":  "位置来源",
     "settings.weather.location_source_desc":  "选择天气组件如何解析当前位置。",
     "settings.weather.mode_city_search":  "城市搜索",
@@ -117,6 +132,14 @@
     "settings.weather.apply_coordinates_button":  "应用坐标",
     "settings.weather.coordinates_saved_format":  "坐标已保存：{0:F4}, {1:F4}",
     "settings.weather.coordinates_default_name_format":  "坐标 {0:F4}, {1:F4}",
+    "settings.weather.location_services_header":  "定位服务",
+    "settings.weather.location_services_desc":  "使用当前 Windows 定位，并决定是否在启动时自动刷新天气位置。",
+    "settings.weather.use_current_location":  "使用当前位置",
+    "settings.weather.location_unsupported":  "当前平台不支持获取当前位置。",
+    "settings.weather.location_ready":  "可以使用当前 Windows 定位。",
+    "settings.weather.location_refreshing":  "正在获取当前位置……",
+    "settings.weather.location_refresh_success_format":  "已应用当前位置：{0}",
+    "settings.weather.location_refresh_failed_format":  "获取当前位置失败：{0}",
     "settings.weather.preview_header":  "连接测试",
     "settings.weather.preview_desc":  "发送一次测试请求，验证当前配置是否可用。",
     "settings.weather.preview_button":  "测试获取",
@@ -125,6 +148,7 @@
     "settings.weather.preview_panel_header":  "天气预览",
     "settings.weather.preview_panel_desc":  "刷新并验证当前天气服务状态。",
     "settings.weather.refresh_button":  "刷新",
+    "settings.weather.preview_updated_format":  "更新于 {0}",
     "settings.weather.preview_hint":  "可通过测试获取快速验证天气配置。",
     "settings.weather.preview_missing_location":  "请先应用一个天气位置后再测试。",
     "settings.weather.preview_success_format":  "测试成功：{0} · {1} · {2}",
@@ -220,6 +244,59 @@
     "settings.region.timezone_header":  "时区",
     "settings.region.timezone_desc":  "选择时区。时钟与日历组件会使用该时区。",
     "settings.region.applied_format":  "语言已切换为：{0}",
+    "settings.region.follow_system":  "跟随系统默认",
+    "settings.general.title":  "基本设置",
+    "settings.general.description":  "调整语言、时区与运行时行为。",
+    "settings.general.basic_header":  "基础设置",
+    "settings.general.runtime_header":  "运行设置",
+    "settings.general.preview_header":  "日期与时间预览",
+    "settings.general.preview_time_label":  "时间",
+    "settings.general.preview_date_label":  "日期",
+    "settings.general.render_mode_restart_message":  "渲染模式变更需要重启应用。",
+    "settings.appearance.title":  "外观",
+    "settings.appearance.description":  "调整主题来源、系统材质与窗口外观。",
+    "settings.appearance.theme_header":  "主题",
+    "settings.color.enable_night_mode_toggle":  "启用夜间模式",
+    "settings.color.use_system_chrome_toggle":  "使用系统窗口标题栏",
+    "settings.color.theme_color_label":  "主题强调色",
+    "settings.appearance.theme_color_mode_label":  "主题色来源",
+    "settings.appearance.system_material_label":  "系统材质",
+    "settings.appearance.theme_color_mode.neutral":  "默认中性",
+    "settings.appearance.theme_color_mode.user":  "用户主题色 Monet",
+    "settings.appearance.theme_color_mode.wallpaper":  "壁纸 Monet 取色",
+    "settings.appearance.theme_color_mode_desc.neutral":  "使用标准的日间白底黑字与夜间黑底白字中性色表面。",
+    "settings.appearance.theme_color_mode_desc.user":  "使用用户选择的主题色作为整个桌面壳层的 Monet 种子色。",
+    "settings.appearance.theme_color_mode_desc.wallpaper":  "使用壁纸颜色。优先取应用壁纸，失败后回退系统桌面壁纸。",
+    "settings.appearance.theme_color_preview.app":  "当前正在预览从应用壁纸提取的颜色。",
+    "settings.appearance.theme_color_preview.system":  "当前正在预览从系统壁纸提取的颜色。",
+    "settings.appearance.theme_color_preview.fallback":  "没有可用壁纸，当前使用回退强调色。",
+    "settings.appearance.system_material.none":  "无",
+    "settings.appearance.system_material.mica":  "Mica",
+    "settings.appearance.system_material.acrylic":  "Acrylic",
+    "settings.appearance.system_material_desc.switchable":  "将所选材质应用到窗口、Dock、状态栏和组件宿主背板。",
+    "settings.appearance.system_material_desc.fixed":  "当前系统仅提供这里列出的材质模式。",
+    "settings.appearance.restart_message":  "主题色来源和系统材质更改需要重启应用。",
+    "settings.appearance.preview.primary":  "主色",
+    "settings.appearance.preview.secondary":  "次色",
+    "settings.appearance.preview.tertiary":  "三次色",
+    "settings.appearance.preview.neutral":  "中性色",
+    "settings.appearance.preview.seed":  "种子色",
+    "settings.appearance.preview.neutral_light":  "白色",
+    "settings.appearance.preview.neutral_dark":  "黑色",
+    "settings.appearance.preview.apply_seed":  "应用",
+    "settings.appearance.preview.wallpaper_candidates":  "壁纸候选主题色",
+    "settings.appearance.preview.wallpaper_current":  "当前",
+    "settings.wallpaper.placement.fill":  "填充",
+    "settings.wallpaper.placement.fit":  "适应",
+    "settings.wallpaper.placement.stretch":  "拉伸",
+    "settings.wallpaper.placement.center":  "居中",
+    "settings.wallpaper.placement.tile":  "平铺",
+    "settings.status_bar.clock_format_label":  "时钟格式",
+    "settings.status_bar.clock_format.hm":  "时:分",
+    "settings.status_bar.clock_format.hms":  "时:分:秒",
+    "settings.components.title":  "网格",
+    "settings.components.description":  "调整桌面网格与布局。",
+    "settings.components.grid_header":  "网格布局",
     "settings.update.title":  "更新",
     "settings.update.current_version_label":  "当前版本",
     "settings.update.latest_version_label":  "最新发布",
@@ -251,6 +328,7 @@
     "settings.update.status_launching_installer":  "下载完成，正在启动安装程序...",
     "settings.update.status_installer_missing":  "下载后未找到安装包文件。",
     "settings.update.status_installer_started":  "安装程序已启动，应用将关闭进行更新。",
+    "settings.update.status_elevation_cancelled":  "未授予管理员权限，更新已取消。",
     "settings.update.status_launch_failed_format":  "启动安装程序失败：{0}",
     "settings.about.title":  "关于",
     "settings.about.version_format":  "版本号: {0}",
@@ -271,9 +349,42 @@
     "settings.about.render_mode.current_format":  "当前后端：{0}",
     "settings.about.render_mode.impl_format":  "运行时实现：{0}",
     "settings.about.render_mode.impl_unavailable":  "当前无法获取运行时实现信息。",
+    "settings.about.description":  "应用信息。",
+    "settings.update.description":  "检查更新、选择发布通道与下载源，并控制更新安装方式。",
+    "settings.update.status_card_title":  "更新状态",
+    "settings.update.status_card_description":  "检查新版本、查看发布信息，并在有更新时继续下载或安装。",
+    "settings.update.preferences_header":  "更新偏好",
+    "settings.update.preferences_description":  "选择发布通道、安装包下载源、安装方式以及下载并行线程数。",
+    "settings.update.last_checked_label":  "上次检查",
+    "settings.update.source_label":  "下载源",
+    "settings.update.source_github":  "GitHub",
+    "settings.update.source_ghproxy":  "gh-proxy",
+    "settings.update.source_github_desc":  "直接从 GitHub 下载发布安装包。",
+    "settings.update.source_ghproxy_desc":  "下载 GitHub 发布安装包时使用 gh-proxy 镜像。",
+    "settings.update.mode_label":  "更新模式",
+    "settings.update.mode_manual":  "手动更新",
+    "settings.update.mode_download_then_confirm":  "静默下载",
+    "settings.update.mode_silent_on_exit":  "静默安装",
+    "settings.update.mode_manual_desc":  "仅检查更新，何时下载和安装都由你决定。",
+    "settings.update.mode_download_then_confirm_desc":  "后台下载更新，下载完成后由你确认是否安装。",
+    "settings.update.mode_silent_on_exit_desc":  "后台下载更新，并在你下次退出应用时静默安装。",
+    "settings.update.channel_stable_desc":  "正式版以稳定性优先，适合大多数用户。",
+    "settings.update.channel_preview_desc":  "预览版可能包含更早的新功能，但稳定性可能较低。",
+    "settings.update.download_threads_label":  "下载线程数",
+    "settings.update.download_threads_desc":  "设置应用更新安装包使用的并行下载线程数。",
+    "settings.update.install_now_button":  "立即安装",
+    "settings.update.status_downloaded_confirm":  "更新已下载完成，请查看并选择安装时机。",
+    "settings.update.status_downloaded_exit":  "更新已下载完成，将在你退出应用时安装。",
+    "settings.about.app_info_header":  "应用信息",
+    "settings.about.update_header":  "更新",
+    "settings.about.version_label":  "版本",
+    "settings.about.codename_label":  "版本代号",
+    "settings.about.render_backend_label":  "渲染后端",
+    "settings.about.render_backend_format":  "渲染后端：{0}",
     "settings.restart_dialog.title":  "需要重启应用",
     "settings.restart_dialog.render_mode_message":  "需要重启应用，才能将渲染模式从“{0}”切换到“{1}”。是否现在重启？",
     "settings.restart_dialog.restart":  "立即重启",
+    "settings.restart_dialog.later":  "稍后",
     "settings.restart_dialog.cancel":  "取消",
     "settings.restart_dock.title":  "需要重启应用",
     "settings.restart_dock.description":  "部分更改需要在重启应用后才会生效。",
@@ -300,21 +411,39 @@
     "launcher.context.hide_icon":  "隐藏图标",
     "launcher.action.hide":  "隐藏",
     "settings.launcher.title":  "应用启动台",
+    "settings.launcher.description":  "管理应用启动台中已隐藏的应用与文件夹。",
     "settings.launcher.hidden_header":  "已隐藏项目",
     "settings.launcher.hidden_desc":  "查看已隐藏的启动台项目并重新显示。",
     "settings.launcher.hidden_hint":  "进入桌面编辑模式后，在启动台选中图标并点击“隐藏”，隐藏后的项目会显示在这里。",
     "settings.launcher.hidden_empty":  "暂无隐藏项目。",
+    "settings.launcher.hidden_summary_format":  "共 {0} 个隐藏项目",
     "settings.launcher.hidden_type_folder":  "文件夹",
-    "settings.launcher.hidden_type_shortcut":  "快捷方式",
-    "settings.launcher.restore_button":  "重新显示",
+    "settings.launcher.hidden_type_shortcut":  "应用",
+    "settings.launcher.restore_button":  "取消隐藏",
     "settings.plugins.title":  "插件",
     "settings.plugins.runtime_header":  "插件运行时",
     "settings.plugins.runtime_desc":  "查看插件运行时状态、加载结果与诊断信息。",
     "settings.plugins.runtime_hint":  "这里展示已安装插件的发现结果、加载状态和运行时诊断信息。",
     "settings.plugins.runtime_status":  "插件扫描完成后，运行时状态会显示在这里。",
+    "settings.plugins.description":  "管理已安装插件并查看其运行时状态。",
+    "settings.plugins.initial_status":  "刷新插件状态以查看最新的已安装插件。",
+    "settings.plugins.refresh_button":  "刷新插件",
+    "settings.plugins.refresh_success_installed_format":  "已加载 {0} 个已安装插件。",
+    "settings.plugins.refresh_success_format":  "已加载 {0} 个已安装插件和 {1} 个市场条目。",
+    "settings.plugins.refresh_failed":  "加载插件市场索引失败。",
+    "settings.plugins.marketplace_header":  "插件市场",
+    "settings.plugins.marketplace_empty":  "当前没有可用的市场插件。",
+    "settings.plugins.delete_button_short":  "删除",
+    "settings.plugins.install_button_short":  "安装",
+    "settings.plugins.restart_required":  "插件变更将在重启后生效。",
+    "settings.plugins.toggle_unchanged_format":  "插件“{0}”没有变化。",
+    "settings.plugins.delete_failed_name_format":  "移除插件“{0}”失败。",
+    "settings.plugins.install_failed_name_format":  "安装插件“{0}”失败。",
     "settings.plugins.installed_header":  "已安装插件",
-    "settings.plugins.installed_desc":  "在这里启用或禁用插件。插件自己的详细设置会作为独立设置页出现。",
-    "settings.plugins.restart_hint":  "插件启用状态变更会在重启应用后生效。",
+    "settings.plugins.installed_desc":  "在这里查看和删除已安装的插件。",
+    "settings.plugins.import_header":  "从安装包导入",
+    "settings.plugins.import_desc":  "打开一个 .laapp 插件包，并将其暂存到本地插件目录。",
+    "settings.plugins.restart_hint":  "插件安装和删除变更会在重启应用后生效。",
     "settings.plugins.empty":  "未找到插件。",
     "settings.plugins.runtime_unavailable":  "插件运行时不可用。",
     "settings.plugins.summary_format":  "共检测到 {0} 个插件；已启用 {1} 个；已加载 {2} 个；设置页 {3} 个；组件 {4} 个；失败 {5} 个。",
@@ -329,6 +458,7 @@
     "settings.plugins.toggle_result_format":  "插件“{0}”已在下次启动时设为{1}。重启应用后，设置页和组件变更才会生效。",
     "settings.plugins.toggle_state_enabled":  "启用",
     "settings.plugins.toggle_state_disabled":  "禁用",
+    "settings.plugins.toggle_failed_detail_format":  "更新插件“{0}”状态失败：{1}",
     "settings.plugins.install_button":  "打开 .laapp 插件包",
     "settings.plugins.install_unavailable":  "插件运行时不可用，暂时无法安装 .laapp 插件包。",
     "settings.plugins.install_hint_format":  "打开一个 .laapp 插件包，安装到：{0}",
@@ -338,6 +468,12 @@
     "settings.plugins.install_copy_failed":  "复制所选 .laapp 插件包失败。",
     "settings.plugins.install_success_format":  "插件“{0}”安装完成。重启应用后，新增的设置页和组件才会生效。",
     "settings.plugins.install_failed_format":  "安装插件包失败：{0}",
+    "settings.plugins.delete_button":  "删除插件",
+    "settings.plugins.delete_success_format":  "插件“{0}”已暂存删除。重启应用后会完成移除。",
+    "settings.plugins.delete_failed_format":  "删除插件失败：{0}",
+    "settings.plugins.delete_failed_detail_format":  "删除插件“{0}”失败：{1}",
+    "settings.plugins.publisher_format":  "发布者：{0}",
+    "settings.plugins.publisher_unknown":  "未知发布者",
     "settings.plugins.source_package":  ".laapp 包",
     "settings.plugins.source_manifest":  "散装清单",
     "settings.plugins.subtitle_format":  "{0} | {1} | {2}",
@@ -346,6 +482,12 @@
     "settings.plugin_market.title":  "插件市场",
     "settings.plugin_market.subtitle":  "浏览来自 LanAirApp 官方源的插件，并将安装暂存到本地。",
     "settings.plugin_market.unavailable":  "插件运行时不可用，暂时无法打开官方市场。",
+    "settings.update.status_idle":  "尚未执行更新检查。",
+    "settings.update.status_preferences_saved":  "更新偏好已保存。",
+    "settings.update.status_check_failed":  "检查更新失败。",
+    "settings.update.status_available_summary_format":  "发现更新：{0}（当前：{1}）。",
+    "settings.update.status_up_to_date_format":  "当前已是最新版本（{0}）。",
+    "settings.window.drawer_default":  "详情",
     "market.toolbar.search_placeholder":  "搜索插件",
     "market.toolbar.refresh":  "刷新",
     "market.status.loading":  "正在加载官方插件市场...",
@@ -362,7 +504,7 @@
     "market.card.loaded":  "已加载",
     "market.card.pending_restart":  "需要重启",
     "market.detail.placeholder":  "从左侧选择一个插件以查看详情。",
-    "market.detail.author":  "作者",
+    "market.detail.author":  "发行者",
     "market.detail.version":  "版本",
     "market.detail.api_version":  "API 版本",
     "market.detail.min_host_version":  "最低宿主版本",
@@ -381,6 +523,11 @@
     "market.detail.homepage":  "主页",
     "market.detail.repository":  "仓库",
     "market.detail.release_notes":  "发布说明",
+    "market.detail.dependencies":  "依赖项",
+    "market.detail.dependencies_empty":  "该插件没有声明 SharedContracts 依赖项。",
+    "market.detail.readme_loading":  "正在加载 README...",
+    "market.detail.readme_empty":  "README 为空。",
+    "market.detail.readme_error_format":  "README 加载失败：{0}",
     "market.detail.state.not_installed":  "未安装",
     "market.detail.state.update_available":  "可更新",
     "market.detail.state.installed":  "已安装",
@@ -389,6 +536,7 @@
     "market.button.update":  "更新",
     "market.button.installed":  "已安装",
     "market.button.installing":  "安装中...",
+    "market.button.restart":  "重启后应用",
     "button.component_library":  "桌面编辑",
     "tooltip.component_library":  "桌面编辑",
     "component_library.title":  "桌面编辑",
@@ -396,6 +544,12 @@
     "component_library.drag_hint":  "拖动放置",
     "component.delete":  "删除",
     "component.edit":  "编辑",
+    "component.editor.instance_scope": "设置仅对当前组件实例生效。",
+    "component.editor.info_header": "组件信息",
+    "component.editor.id_label": "组件 ID",
+    "component.editor.placement_label": "实例 ID",
+    "component.editor.scope_label": "作用域",
+    "component.editor.scope_instance": "实例级编辑器",
     "component_category.clock":  "时钟",
     "component_category.date":  "日历",
     "component_category.weather":  "天气",
@@ -733,7 +887,8 @@
     "placement.fit":  "适应",
     "placement.stretch":  "拉伸",
     "placement.center":  "居中",
-    "placement.tile":  "平铺"
-}
-
-
+    "placement.tile":  "平铺",
+    "single_instance.notice.title":  "应用已经运行",
+    "single_instance.notice.description":  "应用已经运行，无需多次点击打开。",
+    "single_instance.notice.button":  "确定"
+  }

LanMountainDesktop/Models/AppSettingsSnapshot.cs

@@ -14,8 +14,20 @@ public sealed class AppSettingsSnapshot
 
     public string? ThemeColor { get; set; }
 
+    public bool UseSystemChrome { get; set; }
+
+    public string ThemeColorMode { get; set; } = "default_neutral";
+
+    public string SystemMaterialMode { get; set; } = "none";
+
+    public string? SelectedWallpaperSeed { get; set; }
+
     public string? WallpaperPath { get; set; }
 
+    public string WallpaperType { get; set; } = "Image";
+
+    public string? WallpaperColor { get; set; }
+
     public string WallpaperPlacement { get; set; } = "Fill";
 
     public int SettingsTabIndex { get; set; } = 0;
@@ -42,7 +54,7 @@ public sealed class AppSettingsSnapshot
 
     public string WeatherExcludedAlerts { get; set; } = string.Empty;
 
-    public string WeatherIconPackId { get; set; } = "FluentRegular";
+    public string WeatherIconPackId { get; set; } = "HyperOS3";
 
     public bool WeatherNoTlsRequests { get; set; }
 
@@ -54,14 +66,33 @@ public sealed class AppSettingsSnapshot
 
     public bool IncludePrereleaseUpdates { get; set; }
 
-    public string UpdateChannel { get; set; } = string.Empty;
+    public bool UploadAnonymousCrashData { get; set; }
+
+    public bool UploadAnonymousUsageData { get; set; }
+
+    public string? DeviceId { get; set; }
+
+    public string UpdateChannel { get; set; } = "stable";
+
+    public string UpdateMode { get; set; } = "download_then_confirm";
+
+    public string UpdateDownloadSource { get; set; } = "github";
+
+    public int UpdateDownloadThreads { get; set; } = 4;
+
+    public string? PendingUpdateInstallerPath { get; set; }
+
+    public string? PendingUpdateVersion { get; set; }
+
+    public long? PendingUpdatePublishedAtUtcMs { get; set; }
+
+    public long? LastUpdateCheckUtcMs { get; set; }
 
     public List<string> TopStatusComponentIds { get; set; } = [];
 
     public List<string> PinnedTaskbarActions { get; set; } =
     [
-        TaskbarActionId.MinimizeToWindows.ToString(),
-        TaskbarActionId.OpenSettings.ToString()
+        TaskbarActionId.MinimizeToWindows.ToString()
     ];
 
     public bool EnableDynamicTaskbarActions { get; set; } = true;

LanMountainDesktop/Models/MonetPalette.cs

@@ -1,8 +1,49 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Avalonia.Media;
 
 namespace LanMountainDesktop.Models;
 
-public sealed record MonetPalette(
-    IReadOnlyList<Color> RecommendedColors,
-    IReadOnlyList<Color> MonetColors);
+public sealed record MonetPalette
+{
+    public MonetPalette(
+        IReadOnlyList<Color> recommendedColors,
+        Color seed,
+        Color primary,
+        Color secondary,
+        Color tertiary,
+        Color neutral,
+        Color neutralVariant)
+    {
+        RecommendedColors = recommendedColors;
+        Seed = seed;
+        Primary = primary;
+        Secondary = secondary;
+        Tertiary = tertiary;
+        Neutral = neutral;
+        NeutralVariant = neutralVariant;
+        MonetColors =
+        [
+            primary,
+            secondary,
+            tertiary,
+            neutral,
+            neutralVariant
+        ];
+    }
+
+    public IReadOnlyList<Color> RecommendedColors { get; }
+
+    public IReadOnlyList<Color> MonetColors { get; }
+
+    public Color Seed { get; }
+
+    public Color Primary { get; }
+
+    public Color Secondary { get; }
+
+    public Color Tertiary { get; }
+
+    public Color Neutral { get; }
+
+    public Color NeutralVariant { get; }
+}

LanMountainDesktop/Models/TaskbarActionId.cs

@@ -1,12 +1,11 @@
-namespace LanMountainDesktop.Models;
+namespace LanMountainDesktop.Models;
 
 public enum TaskbarActionId
 {
     MinimizeToWindows,
-    OpenSettings,
     AddDesktopPage,
     DeleteDesktopPage,
-    DeleteComponent,
     EditComponent,
+    DeleteComponent,
     HideLauncherEntry
 }

LanMountainDesktop/Models/TaskbarContext.cs

@@ -2,11 +2,5 @@
 
 public enum TaskbarContext
 {
-    Desktop,
-    SettingsWallpaper,
-    SettingsGrid,
-    SettingsColor,
-    SettingsStatusBar,
-    SettingsWeather,
-    SettingsRegion
+    Desktop
 }

LanMountainDesktop/Program.cs

@@ -1,20 +1,70 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.WebView.Desktop;
+using LanMountainDesktop.Models;
 using LanMountainDesktop.Services;
-using System;
+using LanMountainDesktop.Services.Settings;
+using Sentry;
 
 namespace LanMountainDesktop;
 
 sealed class Program
 {
-    // Initialization code. Don't use any Avalonia, third-party APIs or any
-    // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
-    // yet and stuff might break.
-    [STAThread]
-    public static void Main(string[] args) => BuildAvaloniaApp(LoadConfiguredRenderMode())
-        .StartWithClassicDesktopLifetime(args);
+    internal static string StartupRenderMode { get; private set; } = AppRenderingModeHelper.Default;
+
+    [STAThread]
+    public static void Main(string[] args)
+    {
+        AppLogger.Initialize();
+        RegisterGlobalExceptionLogging();
+        InitializeDeviceId();
+        InitializeCrashReporting();
+        InitializeUserBehaviorAnalytics();
+        var restartParentProcessId = AppRestartService.TryGetRestartParentProcessId(args);
+
+        using var singleInstance = AcquireSingleInstance(restartParentProcessId);
+        if (!singleInstance.IsPrimaryInstance)
+        {
+            if (restartParentProcessId is not null)
+            {
+                AppLogger.Warn(
+                    "Startup",
+                    $"Restart relaunch could not acquire the single-instance lock. pid={restartParentProcessId.Value}. Suppressing multi-open activation prompt.");
+                return;
+            }
+
+            AppLogger.Warn("Startup", "A secondary launch was blocked because another instance is already running.");
+            _ = singleInstance.TryNotifyPrimaryInstance(TimeSpan.FromSeconds(2));
+            return;
+        }
+
+        var diagnostics = StartupDiagnosticsService.Run(args);
+        StartupDiagnosticsService.ShowLegacyExecutableWarningIfNeeded(diagnostics);
+
+        try
+        {
+            var renderMode = LoadConfiguredRenderMode();
+            StartupRenderMode = renderMode;
+            AppLogger.Info("Startup", $"Resolved render mode '{renderMode}'.");
+            App.CurrentSingleInstanceService = singleInstance;
+            App.AnalyticsServices = (_userBehaviorAnalyticsService, _crashReportService);
+            BuildAvaloniaApp(renderMode).StartWithClassicDesktopLifetime(args);
+            AppLogger.Info("Startup", "Application exited normally.");
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Critical("Startup", "Application terminated during startup.", ex);
+            throw;
+        }
+        finally
+        {
+            App.CurrentSingleInstanceService = null;
+        }
+    }
 
-    // Avalonia configuration, don't remove; also used by visual designer.
     public static AppBuilder BuildAvaloniaApp(string renderMode = AppRenderingModeHelper.Default)
     {
         var builder = AppBuilder.Configure<App>()
@@ -38,15 +88,279 @@ sealed class Program
         return builder;
     }
 
+    private static SingleInstanceService AcquireSingleInstance(int? restartParentProcessId)
+    {
+        var singleInstance = SingleInstanceService.CreateDefault();
+        if (singleInstance.IsPrimaryInstance || restartParentProcessId is null)
+        {
+            return singleInstance;
+        }
+
+        AppLogger.Info(
+            "Startup",
+            $"Restart relaunch detected. Waiting for previous instance pid={restartParentProcessId.Value} to exit before re-acquiring the single-instance lock.");
+        singleInstance.Dispose();
+
+        var deadline = DateTime.UtcNow + TimeSpan.FromSeconds(12);
+        WaitForRestartParentExit(restartParentProcessId.Value, deadline);
+
+        while (DateTime.UtcNow < deadline)
+        {
+            var retryInstance = SingleInstanceService.CreateDefault();
+            if (retryInstance.IsPrimaryInstance)
+            {
+                AppLogger.Info("Startup", "Restart relaunch acquired the single-instance lock.");
+                return retryInstance;
+            }
+
+            retryInstance.Dispose();
+            Thread.Sleep(150);
+        }
+
+        AppLogger.Warn(
+            "Startup",
+            $"Restart relaunch timed out while waiting for the single-instance lock. pid={restartParentProcessId.Value}.");
+        return SingleInstanceService.CreateDefault();
+    }
+
     private static string LoadConfiguredRenderMode()
     {
         try
         {
-            return AppRenderingModeHelper.Normalize(new AppSettingsService().Load().AppRenderMode);
+            var snapshot = HostSettingsFacadeProvider.GetOrCreate()
+                .Settings
+                .LoadSnapshot<AppSettingsSnapshot>(LanMountainDesktop.PluginSdk.SettingsScope.App);
+            return AppRenderingModeHelper.Normalize(snapshot.AppRenderMode);
         }
-        catch
+        catch (Exception ex)
         {
+            AppLogger.Warn("Startup", "Failed to load configured render mode. Falling back to default.", ex);
             return AppRenderingModeHelper.Default;
         }
     }
+
+    private static void WaitForRestartParentExit(int processId, DateTime deadlineUtc)
+    {
+        try
+        {
+            using var process = Process.GetProcessById(processId);
+            var remaining = deadlineUtc - DateTime.UtcNow;
+            if (remaining > TimeSpan.Zero)
+            {
+                process.WaitForExit((int)Math.Ceiling(remaining.TotalMilliseconds));
+            }
+        }
+        catch (ArgumentException)
+        {
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("Startup", $"Failed while waiting for restart parent pid={processId} to exit.", ex);
+        }
+    }
+
+    private static void RegisterGlobalExceptionLogging()
+    {
+        AppDomain.CurrentDomain.UnhandledException += (_, eventArgs) =>
+        {
+            AppLogger.Critical(
+                "UnhandledException",
+                $"Unhandled exception. IsTerminating={eventArgs.IsTerminating}",
+                eventArgs.ExceptionObject as Exception);
+
+            if (eventArgs.IsTerminating)
+            {
+                SentrySdk.Flush(TimeSpan.FromSeconds(5));
+            }
+        };
+
+        TaskScheduler.UnobservedTaskException += (_, eventArgs) =>
+        {
+            AppLogger.Error("TaskScheduler", "Unobserved task exception.", eventArgs.Exception);
+            eventArgs.SetObserved();
+        };
+    }
+
+    private static void InitializeDeviceId()
+    {
+        try
+        {
+            DeviceIdService.Initialize(HostSettingsFacadeProvider.GetOrCreate());
+            AppLogger.Info("Startup", $"DeviceId initialized: {DeviceIdService.Instance.DeviceId}");
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("Startup", "Failed to initialize DeviceIdService.", ex);
+        }
+    }
+
+    private static void InitializeSentryForAnalytics()
+    {
+        try
+        {
+            var deviceId = DeviceIdService.Instance.DeviceId;
+
+            SentrySdk.Init(options =>
+            {
+                options.Dsn = "https://f2aad3a1c63b5f2213ad82683ce93c06@o4511049423257600.ingest.us.sentry.io/4511049425813504";
+                options.AutoSessionTracking = true;
+                options.Release = GetAppVersion();
+                options.Environment = GetEnvironment();
+            });
+
+            SentrySdk.ConfigureScope(scope =>
+            {
+                scope.User = new SentryUser
+                {
+                    Id = deviceId
+                };
+
+                scope.SetTag("data_type", "analytics");
+                scope.SetTag("device_id", deviceId);
+                scope.SetTag("app_version", GetAppVersion());
+                scope.SetTag("os_name", GetOsName());
+                scope.SetTag("os_version", GetOsVersion());
+                scope.SetTag("os_build", GetOsBuild());
+                scope.SetTag("device_model", GetDeviceModel());
+                scope.SetTag("device_arch", GetDeviceArchitecture());
+                scope.SetTag("processor_count", GetProcessorCount().ToString());
+                scope.SetTag("total_memory_mb", GetTotalMemoryMB().ToString());
+                scope.SetTag("runtime_version", GetRuntimeVersion());
+                scope.SetTag("language", GetSystemLanguage());
+                scope.SetTag("clr_version", GetClrVersion());
+                scope.SetTag("is_64bit", Environment.Is64BitOperatingSystem.ToString());
+            });
+
+            SentrySdk.CaptureMessage("user_active");
+
+            AppLogger.Info("Startup", $"Analytics service initialized. DeviceId={deviceId}");
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("Startup", "Failed to initialize analytics service.", ex);
+        }
+    }
+
+    private static string GetAppVersion()
+    {
+        var version = typeof(Program).Assembly.GetName().Version;
+        return version is null ? "1.0.0" : $"{version.Major}.{version.Minor}.{version.Build}";
+    }
+
+    private static string GetOsName()
+    {
+        if (OperatingSystem.IsWindows()) return "Windows";
+        if (OperatingSystem.IsLinux()) return "Linux";
+        if (OperatingSystem.IsMacOS()) return "macOS";
+        return "Unknown";
+    }
+
+    private static string GetOsVersion()
+    {
+        try { return Environment.OSVersion.VersionString ?? "Unknown"; }
+        catch { return "Unknown"; }
+    }
+
+    private static string GetOsBuild()
+    {
+        try { return Environment.OSVersion.Version.Build.ToString() ?? "Unknown"; }
+        catch { return "Unknown"; }
+    }
+
+    private static string GetDeviceName()
+    {
+        try { return Environment.MachineName ?? "Unknown"; }
+        catch { return "Unknown"; }
+    }
+
+    private static string GetDeviceModel()
+    {
+        if (OperatingSystem.IsWindows()) return "Windows PC";
+        if (OperatingSystem.IsLinux()) return "Linux PC";
+        if (OperatingSystem.IsMacOS()) return "Mac";
+        return "Unknown";
+    }
+
+    private static string GetDeviceArchitecture()
+    {
+        return Environment.Is64BitOperatingSystem ? "x64" : "x86";
+    }
+
+    private static int GetProcessorCount()
+    {
+        return Environment.ProcessorCount;
+    }
+
+    private static long GetTotalMemoryMB()
+    {
+        try { return GC.GetGCMemoryInfo().TotalAvailableMemoryBytes / (1024 * 1024); }
+        catch { return 0; }
+    }
+
+    private static string GetRuntimeVersion()
+    {
+        return Environment.Version.ToString();
+    }
+
+    private static string GetSystemLanguage()
+    {
+        try { return System.Globalization.CultureInfo.CurrentUICulture.Name ?? "en-US"; }
+        catch { return "en-US"; }
+    }
+
+    private static string GetClrVersion()
+    {
+        return Environment.Version.ToString();
+    }
+
+    private static CrashReportService? _crashReportService;
+    private static UserBehaviorAnalyticsService? _userBehaviorAnalyticsService;
+
+    private static void InitializeCrashReporting()
+    {
+        try
+        {
+            var settingsFacade = HostSettingsFacadeProvider.GetOrCreate();
+            _crashReportService = new CrashReportService(settingsFacade, DeviceIdService.Instance);
+            _crashReportService.RefreshEnabledState();
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("Startup", "Failed to initialize crash reporting service.", ex);
+        }
+    }
+
+    private static void InitializeUserBehaviorAnalytics()
+    {
+        try
+        {
+            var settingsFacade = HostSettingsFacadeProvider.GetOrCreate();
+            _userBehaviorAnalyticsService = new UserBehaviorAnalyticsService(settingsFacade, DeviceIdService.Instance);
+            _userBehaviorAnalyticsService.Initialize();
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("Startup", "Failed to initialize user behavior analytics service.", ex);
+        }
+    }
+
+    private static string GetReleaseVersion()
+    {
+        var assembly = typeof(Program).Assembly;
+        var version = assembly.GetName().Version;
+        if (version is null)
+        {
+            return "1.0.0";
+        }
+        return version.Major >= 0 ? $"{version.Major}.{version.Minor}.{version.Build}" : "1.0.0";
+    }
+
+    private static string GetEnvironment()
+    {
+#if DEBUG
+        return "development";
+#else
+        return "production";
+#endif
+    }
 }

LanMountainDesktop/Properties/AssemblyInfo.cs

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("LanMountainDesktop.Tests")]

LanMountainDesktop/Services/AppLogger.cs

@@ -0,0 +1,169 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+
+namespace LanMountainDesktop.Services;
+
+public static class AppLogger
+{
+    private static readonly object SyncRoot = new();
+    private static bool _initialized;
+    private static string _logDirectory = string.Empty;
+    private static string _logFilePath = string.Empty;
+
+    public static string LogDirectory
+    {
+        get
+        {
+            EnsureInitialized();
+            return _logDirectory;
+        }
+    }
+
+    public static string LogFilePath
+    {
+        get
+        {
+            EnsureInitialized();
+            return _logFilePath;
+        }
+    }
+
+    public static void Initialize()
+    {
+        lock (SyncRoot)
+        {
+            if (_initialized)
+            {
+                return;
+            }
+
+            var preferredDirectory = Path.Combine(AppContext.BaseDirectory, "log");
+            var fallbackDirectory = Path.Combine(
+                Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                "LanMountainDesktop",
+                "log");
+
+            var preferredReady = TryPrepareDirectory(preferredDirectory, out var preferredError);
+            var fallbackReady = false;
+            string? fallbackError = null;
+
+            if (preferredReady)
+            {
+                _logDirectory = preferredDirectory;
+            }
+            else
+            {
+                fallbackReady = TryPrepareDirectory(fallbackDirectory, out fallbackError);
+                _logDirectory = fallbackReady ? fallbackDirectory : preferredDirectory;
+            }
+
+            _logFilePath = Path.Combine(_logDirectory, $"app-{DateTime.Now:yyyyMMdd}.log");
+            _initialized = true;
+
+            WriteCore(
+                "INFO",
+                "Logger",
+                $"Initialized. Directory={_logDirectory}; File={_logFilePath}; PreferredDirectory={preferredDirectory}");
+
+            if (!preferredReady && !string.IsNullOrWhiteSpace(preferredError))
+            {
+                WriteCore(
+                    "WARN",
+                    "Logger",
+                    $"Failed to use program log directory '{preferredDirectory}'. Falling back to '{_logDirectory}'. Reason: {preferredError}");
+            }
+
+            if (!preferredReady && !fallbackReady && !string.IsNullOrWhiteSpace(fallbackError))
+            {
+                Trace.WriteLine(
+                    $"[LanMountainDesktop][Logger][ERROR] Failed to initialize fallback log directory '{fallbackDirectory}': {fallbackError}");
+            }
+        }
+    }
+
+    public static void Info(string category, string message)
+    {
+        Write("INFO", category, message, null);
+    }
+
+    public static void Warn(string category, string message, Exception? exception = null)
+    {
+        Write("WARN", category, message, exception);
+    }
+
+    public static void Error(string category, string message, Exception? exception = null)
+    {
+        Write("ERROR", category, message, exception);
+    }
+
+    public static void Critical(string category, string message, Exception? exception = null)
+    {
+        Write("CRITICAL", category, message, exception);
+    }
+
+    private static void Write(string level, string category, string message, Exception? exception)
+    {
+        EnsureInitialized();
+
+        var payload = exception is null
+            ? message
+            : $"{message}{Environment.NewLine}{exception}";
+        WriteCore(level, category, payload);
+    }
+
+    private static void EnsureInitialized()
+    {
+        if (_initialized)
+        {
+            return;
+        }
+
+        Initialize();
+    }
+
+    private static void WriteCore(string level, string category, string message)
+    {
+        var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
+        var line = $"[{timestamp}] [{level}] [{category}] {message}";
+
+        lock (SyncRoot)
+        {
+            try
+            {
+                var directory = Path.GetDirectoryName(_logFilePath);
+                if (!string.IsNullOrWhiteSpace(directory))
+                {
+                    Directory.CreateDirectory(directory);
+                }
+
+                File.AppendAllText(_logFilePath, line + Environment.NewLine, Encoding.UTF8);
+            }
+            catch (Exception ex)
+            {
+                Trace.WriteLine($"[LanMountainDesktop][Logger][ERROR] {ex}");
+            }
+        }
+
+        Trace.WriteLine(line);
+    }
+
+    private static bool TryPrepareDirectory(string directory, out string? error)
+    {
+        try
+        {
+            Directory.CreateDirectory(directory);
+            var probePath = Path.Combine(directory, $".probe-{Guid.NewGuid():N}.tmp");
+            File.WriteAllText(probePath, "probe");
+            File.Delete(probePath);
+            error = null;
+            return true;
+        }
+        catch (Exception ex)
+        {
+            error = ex.Message;
+            return false;
+        }
+    }
+}

LanMountainDesktop/Services/AppLogoService.cs

@@ -0,0 +1,72 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Platform;
+
+namespace LanMountainDesktop.Services;
+
+public enum AppLogoVariant
+{
+    Auto = 0,
+    Day = 1,
+    Night = 2
+}
+
+public interface IAppLogoService
+{
+    WindowIcon CreateWindowIcon(AppLogoVariant variant = AppLogoVariant.Auto);
+    WindowIcon CreateTrayIcon(AppLogoVariant variant = AppLogoVariant.Auto);
+    Uri GetVectorLogoUri(AppLogoVariant variant = AppLogoVariant.Auto);
+}
+
+internal sealed class AppLogoService : IAppLogoService
+{
+    private static readonly Uri NightVectorLogoUri = new("avares://LanMountainDesktop/Assets/logo_nightly.svg");
+    private static readonly Uri DayVectorLogoUri = new("avares://LanMountainDesktop/Assets/logo_nightly.svg");
+    private static readonly Uri NightIconUri = new("avares://LanMountainDesktop/Assets/logo_nightly.ico");
+    private static readonly Uri DayIconUri = new("avares://LanMountainDesktop/Assets/logo_nightly.ico");
+
+    public WindowIcon CreateWindowIcon(AppLogoVariant variant = AppLogoVariant.Auto) => CreateIcon(ResolveIconUri(variant));
+
+    public WindowIcon CreateTrayIcon(AppLogoVariant variant = AppLogoVariant.Auto) => CreateIcon(ResolveIconUri(variant));
+
+    public Uri GetVectorLogoUri(AppLogoVariant variant = AppLogoVariant.Auto) => ResolveVectorLogoUri(variant);
+
+    private static WindowIcon CreateIcon(Uri assetUri)
+    {
+        using var stream = AssetLoader.Open(assetUri);
+        return new WindowIcon(stream);
+    }
+
+    private static Uri ResolveIconUri(AppLogoVariant variant) => ResolveVariant(variant) switch
+    {
+        AppLogoVariant.Day => DayIconUri,
+        _ => NightIconUri
+    };
+
+    private static Uri ResolveVectorLogoUri(AppLogoVariant variant) => ResolveVariant(variant) switch
+    {
+        AppLogoVariant.Day => DayVectorLogoUri,
+        _ => NightVectorLogoUri
+    };
+
+    private static AppLogoVariant ResolveVariant(AppLogoVariant variant) => variant switch
+    {
+        AppLogoVariant.Day => AppLogoVariant.Day,
+        AppLogoVariant.Night => AppLogoVariant.Night,
+        _ => AppLogoVariant.Night
+    };
+}
+
+internal static class HostAppLogoProvider
+{
+    private static readonly object Gate = new();
+    private static IAppLogoService? _instance;
+
+    public static IAppLogoService GetOrCreate()
+    {
+        lock (Gate)
+        {
+            return _instance ??= new AppLogoService();
+        }
+    }
+}

LanMountainDesktop/Services/AppRestartService.cs

@@ -3,26 +3,19 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
+using LanMountainDesktop.PluginSdk;
 
 namespace LanMountainDesktop.Services;
 
 public static class AppRestartService
 {
+    private const string RestartParentPidArgumentPrefix = "--restart-parent-pid=";
+
     public static bool TryRestartApplication()
     {
-        if (!TryRestartCurrentProcess())
-        {
-            return false;
-        }
-
-        if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-        {
-            desktop.Shutdown();
-        }
-
-        return true;
+        return App.CurrentHostApplicationLifecycle?.TryRestart(new HostApplicationLifecycleRequest(
+            Source: nameof(AppRestartService),
+            Reason: "Legacy restart entry point invoked.")) == true;
     }
 
     public static bool TryRestartCurrentProcess()
@@ -84,6 +77,21 @@ public static class AppRestartService
         return null;
     }
 
+    public static int? TryGetRestartParentProcessId(IReadOnlyList<string> commandLineArgs)
+    {
+        ArgumentNullException.ThrowIfNull(commandLineArgs);
+
+        foreach (var argument in commandLineArgs)
+        {
+            if (TryParseRestartParentProcessId(argument, out var processId))
+            {
+                return processId;
+            }
+        }
+
+        return null;
+    }
+
     private static ProcessStartInfo CreateExecutableStartInfo(
         string executablePath,
         string? entryAssemblyPath,
@@ -97,6 +105,7 @@ public static class AppRestartService
         };
 
         AppendArguments(startInfo, commandLineArgs);
+        AppendRestartParentProcessArgument(startInfo);
         return startInfo;
     }
 
@@ -119,6 +128,7 @@ public static class AppRestartService
 
         startInfo.ArgumentList.Add(entryAssemblyPath);
         AppendArguments(startInfo, commandLineArgs);
+        AppendRestartParentProcessArgument(startInfo);
         return startInfo;
     }
 
@@ -126,10 +136,34 @@ public static class AppRestartService
     {
         for (var i = 1; i < commandLineArgs.Count; i++)
         {
+            if (TryParseRestartParentProcessId(commandLineArgs[i], out _))
+            {
+                continue;
+            }
+
             startInfo.ArgumentList.Add(commandLineArgs[i]);
         }
     }
 
+    private static void AppendRestartParentProcessArgument(ProcessStartInfo startInfo)
+    {
+        startInfo.ArgumentList.Add($"{RestartParentPidArgumentPrefix}{Environment.ProcessId}");
+    }
+
+    private static bool TryParseRestartParentProcessId(string? argument, out int processId)
+    {
+        processId = 0;
+        if (string.IsNullOrWhiteSpace(argument) ||
+            !argument.StartsWith(RestartParentPidArgumentPrefix, StringComparison.OrdinalIgnoreCase))
+        {
+            return false;
+        }
+
+        return int.TryParse(
+            argument[RestartParentPidArgumentPrefix.Length..],
+            out processId) && processId > 0;
+    }
+
     private static string? NormalizeExistingPath(string? path)
     {
         if (string.IsNullOrWhiteSpace(path))

LanMountainDesktop/Services/AppSettingsService.cs

@@ -63,8 +63,9 @@ public sealed class AppSettingsService
                 return loadedSnapshot.Clone();
             }
         }
-        catch
+        catch (Exception ex)
         {
+            AppLogger.Warn("AppSettings", $"Failed to load settings from '{_settingsPath}'.", ex);
             return new AppSettingsSnapshot();
         }
     }
@@ -95,9 +96,9 @@ public sealed class AppSettingsService
 
             SettingsSaved?.Invoke(InstanceId);
         }
-        catch
+        catch (Exception ex)
         {
-            // Swallow persistence errors to keep UI interactions uninterrupted.
+            AppLogger.Warn("AppSettings", $"Failed to save settings to '{_settingsPath}'.", ex);
         }
     }
 
@@ -136,8 +137,9 @@ public sealed class AppSettingsService
             var json = File.ReadAllText(_settingsPath);
             return JsonSerializer.Deserialize<AppSettingsSnapshot>(json, SerializerOptions) ?? new AppSettingsSnapshot();
         }
-        catch
+        catch (Exception ex)
         {
+            AppLogger.Warn("AppSettings", $"Failed to deserialize settings from '{_settingsPath}'.", ex);
             return new AppSettingsSnapshot();
         }
     }

LanMountainDesktop/Services/ComponentEditorMaterialThemeAdapter.cs

@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Media;
+using LanMountainDesktop.Models;
+using LanMountainDesktop.Services.Settings;
+using LanMountainDesktop.Theme;
+
+namespace LanMountainDesktop.Services;
+
+internal sealed record ComponentEditorThemePalette(
+    bool IsNightMode,
+    Color PrimaryColor,
+    Color SecondaryColor,
+    Color TertiaryColor,
+    Color WindowBackgroundColor,
+    Color SurfaceColor,
+    Color SurfaceContainerColor,
+    Color SurfaceContainerHighColor,
+    Color TopAppBarColor,
+    Color HeaderIconBackgroundColor,
+    Color TitleBarButtonHoverColor,
+    Color OutlineColor,
+    Color DividerColor,
+    Color OnSurfaceColor,
+    Color OnSurfaceVariantColor,
+    Color OnPrimaryColor);
+
+internal static class ComponentEditorMaterialThemeAdapter
+{
+    private static readonly Color DefaultPrimary = Color.Parse("#FF6750A4");
+    private static readonly Color DarkBackgroundBase = Color.Parse("#FF0B0F14");
+    private static readonly Color DarkSurfaceBase = Color.Parse("#FF10161D");
+    private static readonly Color DarkSurfaceContainerBase = Color.Parse("#FF151C24");
+    private static readonly Color DarkSurfaceContainerHighBase = Color.Parse("#FF1A232D");
+    private static readonly Color LightBackgroundBase = Color.Parse("#FFFCFCFF");
+    private static readonly Color LightSurfaceBase = Color.Parse("#FFFFFFFF");
+    private static readonly Color LightSurfaceContainerBase = Color.Parse("#FFF6F8FD");
+    private static readonly Color LightSurfaceContainerHighBase = Color.Parse("#FFF0F4FA");
+    private static readonly Color LightOnSurfaceBase = Color.Parse("#FF101316");
+    private static readonly Color DarkOnSurfaceBase = Color.Parse("#FFF6F8FC");
+
+    public static ComponentEditorThemePalette Build(
+        ThemeAppearanceSettingsState themeState,
+        WallpaperSettingsState wallpaperState,
+        MonetPalette monetPalette,
+        WallpaperMediaType wallpaperMediaType)
+    {
+        ArgumentNullException.ThrowIfNull(monetPalette);
+
+        var isNightMode = themeState.IsNightMode;
+        var fallbackThemeColor = TryParseColor(themeState.ThemeColor);
+        var useWallpaperPalette = wallpaperMediaType == WallpaperMediaType.Image && monetPalette.Primary.A > 0;
+
+        var primary = useWallpaperPalette
+            ? monetPalette.Primary
+            : fallbackThemeColor ?? monetPalette.Primary;
+        if (primary == default)
+        {
+            primary = DefaultPrimary;
+        }
+
+        var secondary = ResolveSecondaryColor(primary, monetPalette, isNightMode);
+        var tertiary = ResolveTertiaryColor(primary, secondary, monetPalette, isNightMode);
+
+        var backgroundBase = isNightMode ? DarkBackgroundBase : LightBackgroundBase;
+        var surfaceBase = isNightMode ? DarkSurfaceBase : LightSurfaceBase;
+        var surfaceContainerBase = isNightMode ? DarkSurfaceContainerBase : LightSurfaceContainerBase;
+        var surfaceContainerHighBase = isNightMode ? DarkSurfaceContainerHighBase : LightSurfaceContainerHighBase;
+
+        var background = ColorMath.Blend(backgroundBase, primary, isNightMode ? 0.10 : 0.025);
+        var surface = ColorMath.Blend(surfaceBase, primary, isNightMode ? 0.12 : 0.035);
+        var surfaceContainer = ColorMath.Blend(surfaceContainerBase, primary, isNightMode ? 0.18 : 0.065);
+        var surfaceContainerHigh = ColorMath.Blend(surfaceContainerHighBase, primary, isNightMode ? 0.24 : 0.09);
+        var topAppBar = ColorMath.Blend(surfaceContainerHigh, primary, isNightMode ? 0.10 : 0.06);
+
+        var onSurfaceBase = isNightMode ? DarkOnSurfaceBase : LightOnSurfaceBase;
+        var onSurface = ColorMath.EnsureContrast(onSurfaceBase, background, 7.0);
+        var onSurfaceVariantBase = ColorMath.Blend(
+            onSurface,
+            surfaceContainer,
+            isNightMode ? 0.30 : 0.42);
+        var onSurfaceVariant = ColorMath.EnsureContrast(onSurfaceVariantBase, surfaceContainer, 4.5);
+        var outlineBase = ColorMath.Blend(onSurface, surfaceContainer, isNightMode ? 0.74 : 0.82);
+        var outline = Color.FromArgb(
+            isNightMode ? (byte)0x66 : (byte)0x42,
+            outlineBase.R,
+            outlineBase.G,
+            outlineBase.B);
+        var divider = Color.FromArgb(
+            isNightMode ? (byte)0x52 : (byte)0x26,
+            outlineBase.R,
+            outlineBase.G,
+            outlineBase.B);
+        var headerIconBackground = Color.FromArgb(
+            isNightMode ? (byte)0x36 : (byte)0x1F,
+            primary.R,
+            primary.G,
+            primary.B);
+        var titleBarButtonHover = Color.FromArgb(
+            isNightMode ? (byte)0x24 : (byte)0x12,
+            onSurface.R,
+            onSurface.G,
+            onSurface.B);
+        var onPrimaryBase = isNightMode ? Color.Parse("#FF111318") : Color.Parse("#FFFFFFFF");
+        var onPrimary = ColorMath.EnsureContrast(onPrimaryBase, primary, 4.5);
+
+        return new ComponentEditorThemePalette(
+            isNightMode,
+            primary,
+            secondary,
+            tertiary,
+            background,
+            surface,
+            surfaceContainer,
+            surfaceContainerHigh,
+            topAppBar,
+            headerIconBackground,
+            titleBarButtonHover,
+            outline,
+            divider,
+            onSurface,
+            onSurfaceVariant,
+            onPrimary);
+    }
+
+    private static Color ResolveSecondaryColor(Color primary, MonetPalette monetPalette, bool isNightMode)
+    {
+        if (monetPalette.Secondary != default)
+        {
+            return monetPalette.Secondary;
+        }
+
+        return ColorMath.Blend(
+            primary,
+            isNightMode ? Color.Parse("#FFFFFFFF") : Color.Parse("#FF1F1B24"),
+            isNightMode ? 0.18 : 0.16);
+    }
+
+    private static Color ResolveTertiaryColor(
+        Color primary,
+        Color secondary,
+        MonetPalette monetPalette,
+        bool isNightMode)
+    {
+        if (monetPalette.Tertiary != default)
+        {
+            return monetPalette.Tertiary;
+        }
+
+        var blendTarget = isNightMode ? Color.Parse("#FFFFFFFF") : Color.Parse("#FF2A2230");
+        return ColorMath.Blend(ColorMath.Blend(primary, secondary, 0.5), blendTarget, isNightMode ? 0.12 : 0.14);
+    }
+
+    private static Color? TryParseColor(string? value)
+    {
+        return !string.IsNullOrWhiteSpace(value) && Color.TryParse(value, out var parsed)
+            ? parsed
+            : null;
+    }
+}

LanMountainDesktop/Services/ComponentEditorWindowService.cs

@@ -0,0 +1,190 @@
+using System;
+using System.Linq;
+using Avalonia.Controls;
+using LanMountainDesktop.ComponentSystem;
+using LanMountainDesktop.Models;
+using LanMountainDesktop.PluginSdk;
+using LanMountainDesktop.Services.Settings;
+using LanMountainDesktop.Views;
+
+namespace LanMountainDesktop.Services;
+
+public readonly record struct ComponentEditorOpenRequest(
+    Window Owner,
+    DesktopComponentEditorDescriptor Descriptor,
+    string ComponentId,
+    string PlacementId,
+    Action RefreshAction,
+    Action<string?>? RestartAction = null);
+
+public interface IComponentEditorWindowService
+{
+    bool IsOpen { get; }
+
+    string? CurrentPlacementId { get; }
+
+    void Open(ComponentEditorOpenRequest request);
+
+    void Close();
+}
+
+internal sealed class ComponentEditorWindowService : IComponentEditorWindowService
+{
+    private readonly ISettingsFacadeService _settingsFacade;
+    private readonly IAppearanceThemeService _appearanceThemeService;
+    private ComponentEditorWindow? _window;
+    private string? _currentPlacementId;
+
+    public ComponentEditorWindowService(ISettingsFacadeService settingsFacade)
+    {
+        _settingsFacade = settingsFacade ?? throw new ArgumentNullException(nameof(settingsFacade));
+        _appearanceThemeService = HostAppearanceThemeProvider.GetOrCreate();
+        _settingsFacade.Settings.Changed += OnSettingsChanged;
+        _appearanceThemeService.Changed += OnAppearanceThemeChanged;
+    }
+
+    public bool IsOpen => _window is { IsVisible: true };
+
+    public string? CurrentPlacementId => _currentPlacementId;
+
+    public void Open(ComponentEditorOpenRequest request)
+    {
+        ArgumentNullException.ThrowIfNull(request.Owner);
+        ArgumentNullException.ThrowIfNull(request.RefreshAction);
+
+        _window ??= CreateWindow();
+
+        var settingsService = _settingsFacade.Settings;
+        var accessor = settingsService.GetComponentAccessor(request.ComponentId, request.PlacementId);
+        var scopedStore = new ComponentSettingsService(settingsService);
+        scopedStore.SetScopedComponentContext(request.ComponentId, request.PlacementId);
+
+        var hostContext = new HostContext(this, request.RefreshAction, request.RestartAction);
+        var context = new DesktopComponentEditorContext(
+            request.Descriptor.Definition,
+            request.ComponentId,
+            request.PlacementId,
+            _settingsFacade,
+            settingsService,
+            accessor,
+            scopedStore,
+            hostContext);
+
+        _currentPlacementId = request.PlacementId;
+        _window.ApplyDescriptor(request.Descriptor, context);
+
+        if (!_window.IsVisible)
+        {
+            _window.Show(request.Owner);
+            return;
+        }
+
+        _window.Activate();
+    }
+
+    public void Close()
+    {
+        _window?.Close();
+    }
+
+    private ComponentEditorWindow CreateWindow()
+    {
+        var window = new ComponentEditorWindow();
+        ApplyTheme(window);
+        window.ShowInTaskbar = false;
+        window.Closed += (_, _) =>
+        {
+            _window = null;
+            _currentPlacementId = null;
+        };
+        return window;
+    }
+
+    private void OnSettingsChanged(object? sender, SettingsChangedEvent e)
+    {
+        if (_window is null || e.Scope != SettingsScope.App)
+        {
+            return;
+        }
+
+        var changedKeys = e.ChangedKeys?.ToArray() ?? [];
+        var liveAppearance = _appearanceThemeService.GetCurrent();
+        if (changedKeys.Length > 0 &&
+            !changedKeys.Contains(nameof(AppSettingsSnapshot.IsNightMode), StringComparer.OrdinalIgnoreCase) &&
+            !(string.Equals(liveAppearance.ThemeColorMode, ThemeAppearanceValues.ColorModeSeedMonet, StringComparison.OrdinalIgnoreCase) &&
+              changedKeys.Contains(nameof(AppSettingsSnapshot.ThemeColor), StringComparer.OrdinalIgnoreCase)) &&
+            !(string.Equals(liveAppearance.ThemeColorMode, ThemeAppearanceValues.ColorModeWallpaperMonet, StringComparison.OrdinalIgnoreCase) &&
+              (changedKeys.Contains(nameof(AppSettingsSnapshot.WallpaperPath), StringComparer.OrdinalIgnoreCase) ||
+               changedKeys.Contains(nameof(AppSettingsSnapshot.WallpaperType), StringComparer.OrdinalIgnoreCase) ||
+               changedKeys.Contains(nameof(AppSettingsSnapshot.WallpaperColor), StringComparer.OrdinalIgnoreCase))) &&
+            !changedKeys.Contains(nameof(AppSettingsSnapshot.UseSystemChrome), StringComparer.OrdinalIgnoreCase))
+        {
+            return;
+        }
+
+        ApplyTheme(_window);
+    }
+
+    private void ApplyTheme(ComponentEditorWindow window)
+    {
+        var appearanceSnapshot = _appearanceThemeService.GetCurrent();
+        var themeState = _settingsFacade.Theme.Get();
+        var wallpaperState = _settingsFacade.Wallpaper.Get();
+        var wallpaperMediaType = _settingsFacade.WallpaperMedia.DetectMediaType(
+            appearanceSnapshot.ResolvedWallpaperPath ?? wallpaperState.WallpaperPath);
+        var palette = ComponentEditorMaterialThemeAdapter.Build(
+            themeState,
+            wallpaperState,
+            appearanceSnapshot.MonetPalette,
+            wallpaperMediaType);
+
+        window.ApplyTheme(palette);
+        window.ApplyChromeMode(themeState.UseSystemChrome);
+        _appearanceThemeService.ApplyWindowMaterial(window, MaterialSurfaceRole.WindowBackground);
+    }
+
+    private void OnAppearanceThemeChanged(object? sender, AppearanceThemeSnapshot e)
+    {
+        _ = sender;
+        _ = e;
+
+        if (_window is null)
+        {
+            return;
+        }
+
+        ApplyTheme(_window);
+    }
+
+    private sealed class HostContext : IComponentEditorHostContext
+    {
+        private readonly ComponentEditorWindowService _owner;
+        private readonly Action _refreshAction;
+        private readonly Action<string?>? _restartAction;
+
+        public HostContext(
+            ComponentEditorWindowService owner,
+            Action refreshAction,
+            Action<string?>? restartAction)
+        {
+            _owner = owner;
+            _refreshAction = refreshAction;
+            _restartAction = restartAction;
+        }
+
+        public void RequestRefresh()
+        {
+            _refreshAction();
+        }
+
+        public void CloseEditor()
+        {
+            _owner.Close();
+        }
+
+        public void RequestRestart(string? reason = null)
+        {
+            _restartAction?.Invoke(reason);
+        }
+    }
+}

LanMountainDesktop/Services/ComponentLibraryServices.cs

@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls;
+using LanMountainDesktop.ComponentSystem;
+using LanMountainDesktop.Models;
+using LanMountainDesktop.Views;
+using LanMountainDesktop.Views.Components;
+using LanMountainDesktop.Services.Settings;
+
+namespace LanMountainDesktop.Services;
+
+public interface IEmbeddedComponentLibraryService
+{
+    void Open(MainWindow window);
+
+    void Close(MainWindow window);
+
+    void Toggle(MainWindow window);
+}
+
+public interface IDetachedComponentLibraryWindowService
+{
+    void Open(MainWindow window);
+
+    void Close(MainWindow window);
+
+    void Toggle(MainWindow window);
+}
+
+internal sealed class ComponentLibraryService : IComponentLibraryService
+{
+    private readonly ComponentRegistry _registry;
+    private readonly DesktopComponentRuntimeRegistry _runtimeRegistry;
+
+    public ComponentLibraryService(ComponentRegistry registry, DesktopComponentRuntimeRegistry runtimeRegistry)
+    {
+        _registry = registry;
+        _runtimeRegistry = runtimeRegistry;
+    }
+
+    public IReadOnlyList<DesktopComponentDefinition> GetDefinitions()
+    {
+        return _registry.GetAll().ToArray();
+    }
+
+    public IReadOnlyList<ComponentLibraryCategoryEntry> GetDesktopCategories()
+    {
+        return _runtimeRegistry
+            .GetDesktopComponents()
+            .GroupBy(
+                descriptor => string.IsNullOrWhiteSpace(descriptor.Definition.Category)
+                    ? "Other"
+                    : descriptor.Definition.Category.Trim(),
+                StringComparer.OrdinalIgnoreCase)
+            .OrderBy(group => group.Key, StringComparer.OrdinalIgnoreCase)
+            .Select(group => new ComponentLibraryCategoryEntry(
+                group.Key,
+                group
+                    .OrderBy(descriptor => descriptor.Definition.DisplayName, StringComparer.OrdinalIgnoreCase)
+                    .Select(descriptor => new ComponentLibraryComponentEntry(
+                        descriptor.Definition.Id,
+                        descriptor.Definition.DisplayName,
+                        descriptor.DisplayNameLocalizationKey,
+                        group.Key,
+                        descriptor.Definition.MinWidthCells,
+                        descriptor.Definition.MinHeightCells))
+                    .ToArray()))
+            .ToArray();
+    }
+
+    public bool TryCreateControl(
+        string componentId,
+        ComponentLibraryCreateContext context,
+        out Control? control,
+        out Exception? exception)
+    {
+        control = null;
+        exception = null;
+
+        if (!_runtimeRegistry.TryGetDescriptor(componentId, out var descriptor))
+        {
+            return false;
+        }
+
+        try
+        {
+            control = descriptor.CreateControl(
+                context.CellSize,
+                context.TimeZoneService,
+                context.WeatherInfoService,
+                context.RecommendationInfoService,
+                context.CalculatorDataService,
+                context.SettingsFacade,
+                context.PlacementId);
+            return true;
+        }
+        catch (Exception ex)
+        {
+            exception = ex;
+            return false;
+        }
+    }
+}
+
+internal sealed class EmbeddedComponentLibraryService : IEmbeddedComponentLibraryService
+{
+    public void Open(MainWindow window)
+    {
+        ArgumentNullException.ThrowIfNull(window);
+        window.OpenComponentLibraryWindowFromService();
+    }
+
+    public void Close(MainWindow window)
+    {
+        ArgumentNullException.ThrowIfNull(window);
+        window.CloseComponentLibraryWindowFromService();
+    }
+
+    public void Toggle(MainWindow window)
+    {
+        ArgumentNullException.ThrowIfNull(window);
+        if (window.IsComponentLibraryOpenFromService)
+        {
+            window.CloseComponentLibraryWindowFromService();
+            return;
+        }
+
+        window.OpenComponentLibraryWindowFromService();
+    }
+}
+
+internal sealed class DetachedComponentLibraryWindowService : IDetachedComponentLibraryWindowService
+{
+    public void Open(MainWindow window)
+    {
+        ArgumentNullException.ThrowIfNull(window);
+        window.OpenDetachedComponentLibraryWindowFromService();
+    }
+
+    public void Close(MainWindow window)
+    {
+        ArgumentNullException.ThrowIfNull(window);
+        window.CloseDetachedComponentLibraryWindowFromService();
+    }
+
+    public void Toggle(MainWindow window)
+    {
+        ArgumentNullException.ThrowIfNull(window);
+        if (window.IsDetachedComponentLibraryWindowOpenFromService)
+        {
+            window.CloseDetachedComponentLibraryWindowFromService();
+            return;
+        }
+
+        window.OpenDetachedComponentLibraryWindowFromService();
+    }
+}

LanMountainDesktop/Services/ComponentSettingsService.cs

@@ -1,39 +1,40 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Text.Json;
 using LanMountainDesktop.Models;
+using LanMountainDesktop.PluginSdk;
+using LanMountainDesktop.Services.Settings;
 
 namespace LanMountainDesktop.Services;
 
 public sealed class ComponentSettingsService : IComponentInstanceSettingsStore
 {
-    private static readonly JsonSerializerOptions SerializerOptions = new()
-    {
-        WriteIndented = true
-    };
-
-    private static readonly object CacheGate = new();
-    private static readonly TimeSpan CacheProbeInterval = TimeSpan.FromMilliseconds(400);
-
-    private static string? _cachedPath;
-    private static ComponentSettingsDocumentSnapshot? _cachedSnapshot;
-    private static DateTime _cachedWriteTimeUtc = DateTime.MinValue;
-    private static DateTime _lastProbeUtc = DateTime.MinValue;
-
-    private readonly string _settingsPath;
-    private readonly string _legacyAppSettingsPath;
+    private const string LegacySectionId = "__legacy__";
+    private readonly ISettingsService? _settingsService;
+    private readonly IComponentStateStore? _stateStore;
+    private readonly IComponentMessageStore? _messageStore;
     private string _scopedComponentId = string.Empty;
     private string _scopedPlacementId = string.Empty;
 
     public ComponentSettingsService()
     {
-        var appData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-        var settingsDirectory = Path.Combine(appData, "LanMountainDesktop");
-        _settingsPath = Path.Combine(settingsDirectory, "component-settings.json");
-        _legacyAppSettingsPath = Path.Combine(settingsDirectory, "settings.json");
+        _settingsService = HostSettingsFacadeProvider.GetOrCreate().Settings;
+    }
+
+    public ComponentSettingsService(ISettingsService settingsService)
+    {
+        _settingsService = settingsService ?? throw new ArgumentNullException(nameof(settingsService));
+    }
+
+    internal ComponentSettingsService(string settingsDirectory)
+    {
+        if (string.IsNullOrWhiteSpace(settingsDirectory))
+        {
+            throw new ArgumentException("Settings directory cannot be null or whitespace.", nameof(settingsDirectory));
+        }
+
+        var storage = new SqliteComponentDomainStorage(settingsDirectory);
+        _stateStore = storage;
+        _messageStore = storage;
     }
 
     public ComponentSettingsSnapshot Load()
@@ -43,18 +44,15 @@ public sealed class ComponentSettingsService : IComponentInstanceSettingsStore
             return LoadForComponent(_scopedComponentId, _scopedPlacementId);
         }
 
-        try
+        if (_settingsService is not null)
         {
-            lock (CacheGate)
-            {
-                var document = LoadDocumentLocked();
-                return document.DefaultSettings.Clone();
-            }
-        }
-        catch
-        {
-            return new ComponentSettingsSnapshot();
+            return _settingsService.LoadSnapshot<ComponentSettingsSnapshot>(
+                SettingsScope.ComponentInstance,
+                subjectId: string.Empty,
+                placementId: null);
         }
+
+        return _stateStore?.LoadState(componentId: string.Empty, placementId: null) ?? new ComponentSettingsSnapshot();
     }
 
     public void Save(ComponentSettingsSnapshot snapshot)
@@ -65,166 +63,116 @@ public sealed class ComponentSettingsService : IComponentInstanceSettingsStore
             return;
         }
 
-        var snapshotToPersist = NormalizeSnapshot(snapshot);
+        if (_settingsService is not null)
+        {
+            _settingsService.SaveSnapshot(
+                SettingsScope.ComponentInstance,
+                snapshot ?? new ComponentSettingsSnapshot(),
+                subjectId: string.Empty,
+                placementId: null);
+            return;
+        }
 
-        try
-        {
-            lock (CacheGate)
-            {
-                var document = LoadDocumentLocked();
-                document.DefaultSettings = snapshotToPersist;
-                PersistDocumentLocked(document);
-            }
-        }
-        catch
-        {
-            // Swallow persistence errors to keep UI interactions uninterrupted.
-        }
+        _stateStore?.SaveState(componentId: string.Empty, placementId: null, snapshot ?? new ComponentSettingsSnapshot());
     }
 
     public ComponentSettingsSnapshot LoadForComponent(string componentId, string? placementId)
     {
-        try
+        if (_settingsService is not null)
         {
-            lock (CacheGate)
-            {
-                var document = LoadDocumentLocked();
-                var instanceKey = BuildInstanceKey(componentId, placementId);
-                if (!string.IsNullOrWhiteSpace(instanceKey) &&
-                    document.InstanceSettings.TryGetValue(instanceKey, out var snapshot))
-                {
-                    return snapshot.Clone();
-                }
+            return _settingsService.LoadSnapshot<ComponentSettingsSnapshot>(
+                SettingsScope.ComponentInstance,
+                subjectId: componentId,
+                placementId: placementId);
+        }
 
-                return document.DefaultSettings.Clone();
-            }
-        }
-        catch
-        {
-            return new ComponentSettingsSnapshot();
-        }
+        return _stateStore?.LoadState(componentId, placementId) ?? new ComponentSettingsSnapshot();
     }
 
     public void SaveForComponent(string componentId, string? placementId, ComponentSettingsSnapshot snapshot)
     {
-        var normalizedSnapshot = NormalizeSnapshot(snapshot);
-        var instanceKey = BuildInstanceKey(componentId, placementId);
-        if (string.IsNullOrWhiteSpace(instanceKey))
+        if (_settingsService is not null)
         {
-            Save(normalizedSnapshot);
+            _settingsService.SaveSnapshot(
+                SettingsScope.ComponentInstance,
+                snapshot ?? new ComponentSettingsSnapshot(),
+                subjectId: componentId,
+                placementId: placementId);
             return;
         }
 
-        try
-        {
-            lock (CacheGate)
-            {
-                var document = LoadDocumentLocked();
-                document.InstanceSettings[instanceKey] = normalizedSnapshot;
-                PersistDocumentLocked(document);
-            }
-        }
-        catch
-        {
-            // Swallow persistence errors to keep UI interactions uninterrupted.
-        }
+        _stateStore?.SaveState(componentId, placementId, snapshot ?? new ComponentSettingsSnapshot());
     }
 
     public void DeleteForComponent(string componentId, string? placementId)
     {
-        var instanceKey = BuildInstanceKey(componentId, placementId);
-        if (string.IsNullOrWhiteSpace(instanceKey))
+        if (_settingsService is not null)
         {
+            _settingsService.SaveSnapshot(
+                SettingsScope.ComponentInstance,
+                new ComponentSettingsSnapshot(),
+                subjectId: componentId,
+                placementId: placementId);
+            _settingsService.DeleteSection(SettingsScope.ComponentInstance, componentId, LegacySectionId, placementId);
             return;
         }
 
-        try
-        {
-            lock (CacheGate)
-            {
-                var document = LoadDocumentLocked();
-                var changed = document.InstanceSettings.Remove(instanceKey);
-                changed |= document.PluginSettings.Remove(instanceKey);
-                if (changed)
-                {
-                    PersistDocumentLocked(document);
-                }
-            }
-        }
-        catch
-        {
-            // Swallow persistence errors to keep UI interactions uninterrupted.
-        }
+        _stateStore?.DeleteState(componentId, placementId);
     }
 
     public T LoadPluginSettings<T>(string componentId, string? placementId) where T : new()
     {
-        try
+        if (_settingsService is not null)
         {
-            lock (CacheGate)
-            {
-                var document = LoadDocumentLocked();
-                var instanceKey = BuildInstanceKey(componentId, placementId);
-                if (string.IsNullOrWhiteSpace(instanceKey) ||
-                    !document.PluginSettings.TryGetValue(instanceKey, out var settingsElement))
-                {
-                    return new T();
-                }
+            return _settingsService.LoadSection<T>(
+                SettingsScope.ComponentInstance,
+                subjectId: componentId,
+                sectionId: LegacySectionId,
+                placementId: placementId);
+        }
 
-                return JsonSerializer.Deserialize<T>(settingsElement.GetRawText(), SerializerOptions) ?? new T();
-            }
-        }
-        catch
+        if (_messageStore is SqliteComponentDomainStorage sqliteStorage)
         {
-            return new T();
+            return sqliteStorage.LoadLegacyMessage<T>(componentId, placementId);
         }
+
+        return new T();
     }
 
     public void SavePluginSettings<T>(string componentId, string? placementId, T settings)
     {
-        var instanceKey = BuildInstanceKey(componentId, placementId);
-        if (string.IsNullOrWhiteSpace(instanceKey))
+        if (_settingsService is not null)
         {
+            _settingsService.SaveSection(
+                SettingsScope.ComponentInstance,
+                subjectId: componentId,
+                sectionId: LegacySectionId,
+                section: settings,
+                placementId: placementId);
             return;
         }
 
-        try
+        if (_messageStore is SqliteComponentDomainStorage sqliteStorage)
         {
-            lock (CacheGate)
-            {
-                var document = LoadDocumentLocked();
-                document.PluginSettings[instanceKey] = JsonSerializer.SerializeToElement(settings, SerializerOptions).Clone();
-                PersistDocumentLocked(document);
-            }
-        }
-        catch
-        {
-            // Swallow persistence errors to keep UI interactions uninterrupted.
+            sqliteStorage.SaveLegacyMessage(componentId, placementId, settings);
         }
     }
 
     public void DeletePluginSettings(string componentId, string? placementId)
     {
-        var instanceKey = BuildInstanceKey(componentId, placementId);
-        if (string.IsNullOrWhiteSpace(instanceKey))
+        if (_settingsService is not null)
         {
+            _settingsService.DeleteSection(
+                SettingsScope.ComponentInstance,
+                subjectId: componentId,
+                sectionId: LegacySectionId,
+                placementId: placementId);
             return;
         }
 
-        try
+        if (_messageStore is SqliteComponentDomainStorage sqliteStorage)
         {
-            lock (CacheGate)
-            {
-                var document = LoadDocumentLocked();
-                if (document.PluginSettings.Remove(instanceKey))
-                {
-                    PersistDocumentLocked(document);
-                }
-            }
-        }
-        catch
-        {
-            // Swallow persistence errors to keep UI interactions uninterrupted.
+            sqliteStorage.DeleteLegacyMessage(componentId, placementId);
         }
     }
 
@@ -276,375 +224,9 @@ public sealed class ComponentSettingsService : IComponentInstanceSettingsStore
         }
     }
 
-    private bool TryGetCachedWithoutProbe(DateTime nowUtc, out ComponentSettingsDocumentSnapshot snapshot)
+    internal static void ResetCacheForTests()
     {
-        if (string.Equals(_cachedPath, _settingsPath, StringComparison.Ordinal) &&
-            _cachedSnapshot is not null &&
-            nowUtc - _lastProbeUtc < CacheProbeInterval)
-        {
-            snapshot = _cachedSnapshot.Clone();
-            return true;
-        }
-
-        snapshot = null!;
-        return false;
-    }
-
-    private bool TryGetCachedAfterProbe(DateTime writeTimeUtc, out ComponentSettingsDocumentSnapshot snapshot)
-    {
-        if (string.Equals(_cachedPath, _settingsPath, StringComparison.Ordinal) &&
-            _cachedSnapshot is not null &&
-            writeTimeUtc == _cachedWriteTimeUtc)
-        {
-            snapshot = _cachedSnapshot.Clone();
-            return true;
-        }
-
-        snapshot = null!;
-        return false;
-    }
-
-    private ComponentSettingsDocumentSnapshot LoadDocumentLocked()
-    {
-        var nowUtc = DateTime.UtcNow;
-        if (TryGetCachedWithoutProbe(nowUtc, out var cached))
-        {
-            return cached;
-        }
-
-        var hasFile = File.Exists(_settingsPath);
-        var writeTimeUtc = hasFile
-            ? File.GetLastWriteTimeUtc(_settingsPath)
-            : DateTime.MinValue;
-
-        _lastProbeUtc = nowUtc;
-        if (TryGetCachedAfterProbe(writeTimeUtc, out cached))
-        {
-            return cached;
-        }
-
-        ComponentSettingsDocumentSnapshot loadedSnapshot;
-        var loadedFromLegacy = false;
-        if (hasFile)
-        {
-            loadedSnapshot = LoadSnapshotFromDisk();
-        }
-        else if (TryLoadLegacySnapshot(out var migratedSnapshot))
-        {
-            loadedSnapshot = new ComponentSettingsDocumentSnapshot
-            {
-                DefaultSettings = NormalizeSnapshot(migratedSnapshot)
-            };
-            loadedFromLegacy = true;
-        }
-        else
-        {
-            loadedSnapshot = new ComponentSettingsDocumentSnapshot();
-        }
-
-        var normalizedSnapshot = NormalizeDocument(loadedSnapshot);
-        if (loadedFromLegacy)
-        {
-            writeTimeUtc = PersistSnapshotToDisk(normalizedSnapshot);
-        }
-
-        UpdateCache(normalizedSnapshot, writeTimeUtc, nowUtc);
-        return normalizedSnapshot.Clone();
-    }
-
-    private ComponentSettingsDocumentSnapshot LoadSnapshotFromDisk()
-    {
-        try
-        {
-            var json = File.ReadAllText(_settingsPath);
-            using var document = JsonDocument.Parse(json);
-            if (document.RootElement.ValueKind == JsonValueKind.Object &&
-                (document.RootElement.TryGetProperty("defaultSettings", out _) ||
-                 document.RootElement.TryGetProperty("instanceSettings", out _) ||
-                 document.RootElement.TryGetProperty("pluginSettings", out _)))
-            {
-                var snapshot = JsonSerializer.Deserialize<ComponentSettingsDocumentSnapshot>(json, SerializerOptions);
-                return NormalizeDocument(snapshot);
-            }
-
-            var legacySnapshot = JsonSerializer.Deserialize<ComponentSettingsSnapshot>(json, SerializerOptions);
-            return new ComponentSettingsDocumentSnapshot
-            {
-                DefaultSettings = NormalizeSnapshot(legacySnapshot)
-            };
-        }
-        catch
-        {
-            return new ComponentSettingsDocumentSnapshot();
-        }
-    }
-
-    private bool TryLoadLegacySnapshot(out ComponentSettingsSnapshot snapshot)
-    {
-        snapshot = new ComponentSettingsSnapshot();
-        try
-        {
-            if (!File.Exists(_legacyAppSettingsPath))
-            {
-                return false;
-            }
-
-            var legacyJson = File.ReadAllText(_legacyAppSettingsPath);
-            var legacy = JsonSerializer.Deserialize<LegacyComponentSettingsSnapshot>(legacyJson, SerializerOptions);
-            if (legacy is null)
-            {
-                return false;
-            }
-
-            snapshot = new ComponentSettingsSnapshot
-            {
-                DailyArtworkMirrorSource = legacy.DailyArtworkMirrorSource,
-                ImportedClassSchedules = legacy.ImportedClassSchedules ?? [],
-                ActiveImportedClassScheduleId = legacy.ActiveImportedClassScheduleId ?? string.Empty,
-                StudyEnvironmentShowDisplayDb = legacy.StudyEnvironmentShowDisplayDb,
-                StudyEnvironmentShowDbfs = legacy.StudyEnvironmentShowDbfs,
-                DesktopClockTimeZoneId = legacy.DesktopClockTimeZoneId,
-                DesktopClockSecondHandMode = legacy.DesktopClockSecondHandMode,
-                WorldClockTimeZoneIds = legacy.WorldClockTimeZoneIds ?? [],
-                WorldClockSecondHandMode = legacy.WorldClockSecondHandMode,
-                CnrDailyNewsAutoRotateEnabled = legacy.CnrDailyNewsAutoRotateEnabled,
-                CnrDailyNewsAutoRotateIntervalMinutes = legacy.CnrDailyNewsAutoRotateIntervalMinutes,
-                IfengNewsAutoRefreshEnabled = legacy.IfengNewsAutoRefreshEnabled,
-                IfengNewsAutoRefreshIntervalMinutes = legacy.IfengNewsAutoRefreshIntervalMinutes,
-                IfengNewsChannelType = legacy.IfengNewsChannelType,
-                DailyWordAutoRefreshEnabled = legacy.DailyWordAutoRefreshEnabled,
-                DailyWordAutoRefreshIntervalMinutes = legacy.DailyWordAutoRefreshIntervalMinutes,
-                BilibiliHotSearchAutoRefreshEnabled = legacy.BilibiliHotSearchAutoRefreshEnabled,
-                BilibiliHotSearchAutoRefreshIntervalMinutes = legacy.BilibiliHotSearchAutoRefreshIntervalMinutes,
-                BaiduHotSearchAutoRefreshEnabled = legacy.BaiduHotSearchAutoRefreshEnabled,
-                BaiduHotSearchAutoRefreshIntervalMinutes = legacy.BaiduHotSearchAutoRefreshIntervalMinutes,
-                BaiduHotSearchSourceType = legacy.BaiduHotSearchSourceType,
-                WeatherAutoRefreshEnabled = legacy.WeatherAutoRefreshEnabled,
-                WeatherAutoRefreshIntervalMinutes = legacy.WeatherAutoRefreshIntervalMinutes,
-                Stcn24ForumAutoRefreshEnabled = legacy.Stcn24ForumAutoRefreshEnabled,
-                Stcn24ForumAutoRefreshIntervalMinutes = legacy.Stcn24ForumAutoRefreshIntervalMinutes,
-                Stcn24ForumSourceType = legacy.Stcn24ForumSourceType
-            };
-
-            return true;
-        }
-        catch
-        {
-            return false;
-        }
-    }
-
-    private void PersistDocumentLocked(ComponentSettingsDocumentSnapshot snapshot)
-    {
-        var writeTimeUtc = PersistSnapshotToDisk(snapshot);
-        UpdateCache(snapshot, writeTimeUtc, DateTime.UtcNow);
-    }
-
-    private DateTime PersistSnapshotToDisk(ComponentSettingsDocumentSnapshot snapshot)
-    {
-        var directory = Path.GetDirectoryName(_settingsPath);
-        if (!string.IsNullOrWhiteSpace(directory))
-        {
-            Directory.CreateDirectory(directory);
-        }
-
-        var json = JsonSerializer.Serialize(snapshot, SerializerOptions);
-        File.WriteAllText(_settingsPath, json);
-
-        return File.Exists(_settingsPath)
-            ? File.GetLastWriteTimeUtc(_settingsPath)
-            : DateTime.UtcNow;
-    }
-
-    private static ComponentSettingsSnapshot NormalizeSnapshot(ComponentSettingsSnapshot? snapshot)
-    {
-        var normalized = snapshot?.Clone() ?? new ComponentSettingsSnapshot();
-
-        normalized.DailyArtworkMirrorSource = DailyArtworkMirrorSources.Normalize(normalized.DailyArtworkMirrorSource);
-        normalized.ImportedClassSchedules = NormalizeImportedSchedules(normalized.ImportedClassSchedules);
-        normalized.ActiveImportedClassScheduleId = NormalizeActiveScheduleId(
-            normalized.ActiveImportedClassScheduleId,
-            normalized.ImportedClassSchedules);
-
-        if (!normalized.StudyEnvironmentShowDisplayDb && !normalized.StudyEnvironmentShowDbfs)
-        {
-            normalized.StudyEnvironmentShowDisplayDb = true;
-        }
-
-        normalized.DesktopClockTimeZoneId = NormalizeDesktopClockTimeZoneId(normalized.DesktopClockTimeZoneId);
-        normalized.DesktopClockSecondHandMode = ClockSecondHandMode.Normalize(normalized.DesktopClockSecondHandMode);
-        normalized.WorldClockTimeZoneIds = WorldClockTimeZoneCatalog
-            .NormalizeTimeZoneIds(normalized.WorldClockTimeZoneIds)
-            .ToList();
-        normalized.WorldClockSecondHandMode = ClockSecondHandMode.Normalize(normalized.WorldClockSecondHandMode);
-        normalized.CnrDailyNewsAutoRotateIntervalMinutes = NormalizeCnrInterval(normalized.CnrDailyNewsAutoRotateIntervalMinutes);
-        normalized.IfengNewsAutoRefreshIntervalMinutes = NormalizeIfengNewsInterval(normalized.IfengNewsAutoRefreshIntervalMinutes);
-        normalized.IfengNewsChannelType = IfengNewsChannelTypes.Normalize(normalized.IfengNewsChannelType);
-        normalized.DailyWordAutoRefreshIntervalMinutes = NormalizeDailyWordInterval(normalized.DailyWordAutoRefreshIntervalMinutes);
-        normalized.BilibiliHotSearchAutoRefreshIntervalMinutes = NormalizeBilibiliHotSearchInterval(
-            normalized.BilibiliHotSearchAutoRefreshIntervalMinutes);
-        normalized.BaiduHotSearchAutoRefreshIntervalMinutes = NormalizeBaiduHotSearchInterval(
-            normalized.BaiduHotSearchAutoRefreshIntervalMinutes);
-        normalized.BaiduHotSearchSourceType = BaiduHotSearchSourceTypes.Normalize(normalized.BaiduHotSearchSourceType);
-        normalized.WeatherAutoRefreshIntervalMinutes = NormalizeWeatherInterval(normalized.WeatherAutoRefreshIntervalMinutes);
-        normalized.Stcn24ForumAutoRefreshIntervalMinutes = NormalizeStcn24ForumInterval(normalized.Stcn24ForumAutoRefreshIntervalMinutes);
-        normalized.Stcn24ForumSourceType = Stcn24ForumSourceTypes.Normalize(normalized.Stcn24ForumSourceType);
-
-        return normalized;
-    }
-
-    private static ComponentSettingsDocumentSnapshot NormalizeDocument(ComponentSettingsDocumentSnapshot? snapshot)
-    {
-        var normalized = snapshot?.Clone() ?? new ComponentSettingsDocumentSnapshot();
-        normalized.DefaultSettings = NormalizeSnapshot(normalized.DefaultSettings);
-
-        var instanceSettings = new Dictionary<string, ComponentSettingsSnapshot>(StringComparer.OrdinalIgnoreCase);
-        foreach (var pair in normalized.InstanceSettings)
-        {
-            var key = NormalizeInstanceKey(pair.Key);
-            if (string.IsNullOrWhiteSpace(key))
-            {
-                continue;
-            }
-
-            instanceSettings[key] = NormalizeSnapshot(pair.Value);
-        }
-
-        var pluginSettings = new Dictionary<string, JsonElement>(StringComparer.OrdinalIgnoreCase);
-        foreach (var pair in normalized.PluginSettings)
-        {
-            var key = NormalizeInstanceKey(pair.Key);
-            if (string.IsNullOrWhiteSpace(key))
-            {
-                continue;
-            }
-
-            pluginSettings[key] = pair.Value.Clone();
-        }
-
-        normalized.InstanceSettings = instanceSettings;
-        normalized.PluginSettings = pluginSettings;
-        return normalized;
-    }
-
-    private static List<ImportedClassScheduleSnapshot> NormalizeImportedSchedules(
-        IReadOnlyList<ImportedClassScheduleSnapshot>? schedules)
-    {
-        if (schedules is null || schedules.Count == 0)
-        {
-            return [];
-        }
-
-        var result = new List<ImportedClassScheduleSnapshot>(schedules.Count);
-        var seenIds = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-        foreach (var schedule in schedules)
-        {
-            if (schedule is null)
-            {
-                continue;
-            }
-
-            var id = schedule.Id?.Trim() ?? string.Empty;
-            var filePath = schedule.FilePath?.Trim() ?? string.Empty;
-            if (string.IsNullOrWhiteSpace(id) || string.IsNullOrWhiteSpace(filePath))
-            {
-                continue;
-            }
-
-            if (!seenIds.Add(id))
-            {
-                continue;
-            }
-
-            result.Add(new ImportedClassScheduleSnapshot
-            {
-                Id = id,
-                DisplayName = schedule.DisplayName?.Trim() ?? string.Empty,
-                FilePath = filePath
-            });
-        }
-
-        return result;
-    }
-
-    private static string NormalizeActiveScheduleId(
-        string? activeScheduleId,
-        IReadOnlyList<ImportedClassScheduleSnapshot> schedules)
-    {
-        var activeId = activeScheduleId?.Trim() ?? string.Empty;
-        if (schedules.Count == 0)
-        {
-            return string.Empty;
-        }
-
-        if (string.IsNullOrWhiteSpace(activeId))
-        {
-            return schedules[0].Id;
-        }
-
-        return schedules.Any(item => string.Equals(item.Id, activeId, StringComparison.OrdinalIgnoreCase))
-            ? activeId
-            : schedules[0].Id;
-    }
-
-    private static string NormalizeDesktopClockTimeZoneId(string? timeZoneId)
-    {
-        var normalizedId = string.IsNullOrWhiteSpace(timeZoneId)
-            ? "China Standard Time"
-            : timeZoneId.Trim();
-        return WorldClockTimeZoneCatalog.ResolveTimeZoneOrLocal(normalizedId).Id;
-    }
-
-    private static int NormalizeCnrInterval(int minutes)
-    {
-        return RefreshIntervalCatalog.Normalize(minutes, 60);
-    }
-
-    private static int NormalizeDailyWordInterval(int minutes)
-    {
-        return RefreshIntervalCatalog.Normalize(minutes, 360);
-    }
-
-    private static int NormalizeIfengNewsInterval(int minutes)
-    {
-        return RefreshIntervalCatalog.Normalize(minutes, 20);
-    }
-
-    private static int NormalizeBilibiliHotSearchInterval(int minutes)
-    {
-        return RefreshIntervalCatalog.Normalize(minutes, 15);
-    }
-
-    private static int NormalizeBaiduHotSearchInterval(int minutes)
-    {
-        return RefreshIntervalCatalog.Normalize(minutes, 15);
-    }
-
-    private static int NormalizeWeatherInterval(int minutes)
-    {
-        return RefreshIntervalCatalog.Normalize(minutes, 12);
-    }
-
-    private static int NormalizeStcn24ForumInterval(int minutes)
-    {
-        return RefreshIntervalCatalog.Normalize(minutes, 20);
-    }
-
-    private static string BuildInstanceKey(string componentId, string? placementId)
-    {
-        var normalizedComponentId = componentId?.Trim() ?? string.Empty;
-        var normalizedPlacementId = placementId?.Trim() ?? string.Empty;
-        if (string.IsNullOrWhiteSpace(normalizedComponentId) || string.IsNullOrWhiteSpace(normalizedPlacementId))
-        {
-            return string.Empty;
-        }
-
-        return $"{normalizedComponentId}::{normalizedPlacementId}";
-    }
-
-    private static string NormalizeInstanceKey(string? key)
-    {
-        return key?.Trim() ?? string.Empty;
+        // no-op: SQLite storage is directly persisted without in-memory cache.
     }
 
     private bool HasScopedComponentContext()
@@ -652,100 +234,4 @@ public sealed class ComponentSettingsService : IComponentInstanceSettingsStore
         return !string.IsNullOrWhiteSpace(_scopedComponentId) &&
                !string.IsNullOrWhiteSpace(_scopedPlacementId);
     }
-
-    private void UpdateCache(ComponentSettingsDocumentSnapshot snapshot, DateTime writeTimeUtc, DateTime probeTimeUtc)
-    {
-        _cachedPath = _settingsPath;
-        _cachedSnapshot = snapshot.Clone();
-        _cachedWriteTimeUtc = writeTimeUtc;
-        _lastProbeUtc = probeTimeUtc;
-    }
-
-    private sealed class ComponentSettingsDocumentSnapshot
-    {
-        public ComponentSettingsSnapshot DefaultSettings { get; set; } = new();
-
-        public Dictionary<string, ComponentSettingsSnapshot> InstanceSettings { get; set; } =
-            new(StringComparer.OrdinalIgnoreCase);
-
-        public Dictionary<string, JsonElement> PluginSettings { get; set; } =
-            new(StringComparer.OrdinalIgnoreCase);
-
-        public ComponentSettingsDocumentSnapshot Clone()
-        {
-            var clone = new ComponentSettingsDocumentSnapshot
-            {
-                DefaultSettings = DefaultSettings?.Clone() ?? new ComponentSettingsSnapshot(),
-                InstanceSettings = new Dictionary<string, ComponentSettingsSnapshot>(StringComparer.OrdinalIgnoreCase),
-                PluginSettings = new Dictionary<string, JsonElement>(StringComparer.OrdinalIgnoreCase)
-            };
-
-            foreach (var pair in InstanceSettings)
-            {
-                clone.InstanceSettings[pair.Key] = pair.Value?.Clone() ?? new ComponentSettingsSnapshot();
-            }
-
-            foreach (var pair in PluginSettings)
-            {
-                clone.PluginSettings[pair.Key] = pair.Value.Clone();
-            }
-
-            return clone;
-        }
-    }
-
-    private sealed class LegacyComponentSettingsSnapshot
-    {
-        public string DailyArtworkMirrorSource { get; set; } = DailyArtworkMirrorSources.Overseas;
-
-        public List<ImportedClassScheduleSnapshot>? ImportedClassSchedules { get; set; }
-
-        public string? ActiveImportedClassScheduleId { get; set; }
-
-        public bool StudyEnvironmentShowDisplayDb { get; set; } = true;
-
-        public bool StudyEnvironmentShowDbfs { get; set; }
-
-        public string DesktopClockTimeZoneId { get; set; } = "China Standard Time";
-
-        public string DesktopClockSecondHandMode { get; set; } = "Tick";
-
-        public List<string>? WorldClockTimeZoneIds { get; set; }
-
-        public string WorldClockSecondHandMode { get; set; } = "Tick";
-
-        public bool CnrDailyNewsAutoRotateEnabled { get; set; } = true;
-
-        public int CnrDailyNewsAutoRotateIntervalMinutes { get; set; } = 60;
-
-        public bool IfengNewsAutoRefreshEnabled { get; set; } = true;
-
-        public int IfengNewsAutoRefreshIntervalMinutes { get; set; } = 20;
-
-        public string IfengNewsChannelType { get; set; } = IfengNewsChannelTypes.Comprehensive;
-
-        public bool DailyWordAutoRefreshEnabled { get; set; } = true;
-
-        public int DailyWordAutoRefreshIntervalMinutes { get; set; } = 360;
-
-        public bool BilibiliHotSearchAutoRefreshEnabled { get; set; } = true;
-
-        public int BilibiliHotSearchAutoRefreshIntervalMinutes { get; set; } = 15;
-
-        public bool BaiduHotSearchAutoRefreshEnabled { get; set; } = true;
-
-        public int BaiduHotSearchAutoRefreshIntervalMinutes { get; set; } = 15;
-
-        public string BaiduHotSearchSourceType { get; set; } = BaiduHotSearchSourceTypes.Official;
-
-        public bool WeatherAutoRefreshEnabled { get; set; } = true;
-
-        public int WeatherAutoRefreshIntervalMinutes { get; set; } = 12;
-
-        public bool Stcn24ForumAutoRefreshEnabled { get; set; } = true;
-
-        public int Stcn24ForumAutoRefreshIntervalMinutes { get; set; } = 20;
-
-        public string Stcn24ForumSourceType { get; set; } = Stcn24ForumSourceTypes.LatestCreated;
-    }
 }

LanMountainDesktop/Services/CrashReportService.cs

@@ -0,0 +1,943 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.Json;
+using LanMountainDesktop.Models;
+using LanMountainDesktop.PluginSdk;
+using LanMountainDesktop.Services.Settings;
+using Sentry;
+
+namespace LanMountainDesktop.Services;
+
+public sealed class DeviceIdService
+{
+    private static DeviceIdService? _instance;
+    private string? _deviceId;
+    private readonly ISettingsFacadeService _settingsFacade;
+    private bool _isInitialized;
+
+    public static DeviceIdService Instance => _instance ?? throw new InvalidOperationException("DeviceIdService not initialized");
+
+    public DeviceIdService(ISettingsFacadeService settingsFacade)
+    {
+        _settingsFacade = settingsFacade ?? throw new ArgumentNullException(nameof(settingsFacade));
+    }
+
+    public static void Initialize(ISettingsFacadeService settingsFacade)
+    {
+        _instance = new DeviceIdService(settingsFacade);
+        _instance.EnsureDeviceId();
+    }
+
+    public string DeviceId
+    {
+        get
+        {
+            if (_deviceId is null)
+            {
+                throw new InvalidOperationException("DeviceId not initialized");
+            }
+            return _deviceId;
+        }
+    }
+
+    private void EnsureDeviceId()
+    {
+        if (_isInitialized)
+        {
+            return;
+        }
+
+        _isInitialized = true;
+
+        try
+        {
+            var snapshot = _settingsFacade.Settings.LoadSnapshot<AppSettingsSnapshot>(SettingsScope.App);
+
+            if (string.IsNullOrEmpty(snapshot.DeviceId))
+            {
+                snapshot.DeviceId = GenerateDeviceId();
+                _settingsFacade.Settings.SaveSnapshot(
+                    SettingsScope.App,
+                    snapshot,
+                    changedKeys: [nameof(AppSettingsSnapshot.DeviceId)]);
+                _deviceId = snapshot.DeviceId;
+                AppLogger.Info("DeviceId", $"Generated new device ID: {_deviceId}");
+            }
+            else
+            {
+                _deviceId = snapshot.DeviceId;
+                AppLogger.Info("DeviceId", $"Loaded existing device ID: {_deviceId}");
+            }
+        }
+        catch (Exception ex)
+        {
+            _deviceId = GenerateDeviceId();
+            AppLogger.Warn("DeviceId", $"Failed to persist device ID, using generated ID: {_deviceId}", ex);
+        }
+    }
+
+    private static string GenerateDeviceId()
+    {
+        var timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+        var deviceInfo = $"{Environment.MachineName}|{Environment.ProcessorCount}|{Environment.OSVersion}|{Environment.UserName}|{timestamp}";
+        using var sha = System.Security.Cryptography.SHA256.Create();
+        var hash = sha.ComputeHash(System.Text.Encoding.UTF8.GetBytes(deviceInfo));
+        return Convert.ToHexString(hash)[..32].ToLower();
+    }
+}
+
+public sealed class UserBehaviorAnalyticsService : IDisposable
+{
+    private const string PostHogApiKey = "phc_bhQZvKDDfsEdLT6kkRFvrWMT8Pc5aCGGsnxoc5ijSf9";
+    private const string PostHogHost = "https://us.i.posthog.com/capture/";
+
+    private bool _isEnabled;
+    private bool _isInitialized;
+    private readonly ISettingsFacadeService _settingsFacade;
+    private readonly DeviceIdService _deviceIdService;
+    private readonly Queue<UserBehaviorEvent> _eventQueue = new();
+    private readonly object _queueLock = new();
+    private System.Threading.Timer? _flushTimer;
+    private readonly PluginSdk.ISettingsService _settingsService;
+
+    public UserBehaviorAnalyticsService(ISettingsFacadeService settingsFacade, DeviceIdService deviceIdService)
+    {
+        _settingsFacade = settingsFacade ?? throw new ArgumentNullException(nameof(settingsFacade));
+        _settingsService = settingsFacade.Settings;
+        _deviceIdService = deviceIdService ?? throw new ArgumentNullException(nameof(deviceIdService));
+        _settingsService.Changed += OnSettingsChanged;
+    }
+
+    private void OnSettingsChanged(object? sender, PluginSdk.SettingsChangedEvent e)
+    {
+        if (e.Scope == PluginSdk.SettingsScope.App &&
+            e.ChangedKeys is not null &&
+            (e.ChangedKeys.Contains("UploadAnonymousCrashData") || e.ChangedKeys.Contains("UploadAnonymousUsageData")))
+        {
+            AppLogger.Info("UserBehaviorAnalytics", "Settings changed, refreshing enabled state.");
+            RefreshEnabledState();
+        }
+    }
+
+    public void Initialize()
+    {
+        if (_isInitialized)
+        {
+            return;
+        }
+
+        _isInitialized = true;
+        RefreshEnabledState();
+
+        try
+        {
+            _flushTimer = new System.Threading.Timer(
+                _ => FlushEvents(),
+                null,
+                TimeSpan.FromSeconds(10),
+                TimeSpan.FromSeconds(30));
+
+            CaptureEvent("app_online", new Dictionary<string, object>
+            {
+                { "event_type", "app_start" }
+            });
+
+            AppLogger.Info("UserBehaviorAnalytics", $"Analytics initialized. DeviceId={_deviceIdService.DeviceId}, Enabled={_isEnabled}");
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("UserBehaviorAnalytics", "Failed to initialize analytics.", ex);
+        }
+    }
+
+    public void TrackClick(string componentName, string? action = null)
+    {
+        if (!_isEnabled || !_isInitialized)
+        {
+            return;
+        }
+
+        CaptureEvent("ui_click", new Dictionary<string, object>
+        {
+            { "component", componentName },
+            { "action", action ?? "click" }
+        });
+    }
+
+    public void TrackComponentDrag(string componentId, string action)
+    {
+        if (!_isEnabled || !_isInitialized)
+        {
+            return;
+        }
+
+        CaptureEvent("component_drag", new Dictionary<string, object>
+        {
+            { "component_id", componentId },
+            { "action", action }
+        });
+    }
+
+    public void TrackComponentDrop(string componentId, string targetPosition)
+    {
+        if (!_isEnabled || !_isInitialized)
+        {
+            return;
+        }
+
+        CaptureEvent("component_drop", new Dictionary<string, object>
+        {
+            { "component_id", componentId },
+            { "target_position", targetPosition }
+        });
+    }
+
+    public void TrackSettingsOpen(string settingsPage)
+    {
+        if (!_isEnabled || !_isInitialized)
+        {
+            return;
+        }
+
+        CaptureEvent("settings_open", new Dictionary<string, object>
+        {
+            { "page", settingsPage }
+        });
+    }
+
+    public void TrackSettingsChange(string settingsPage, string settingKey, string? oldValue, string newValue)
+    {
+        if (!_isEnabled || !_isInitialized)
+        {
+            return;
+        }
+
+        CaptureEvent("settings_change", new Dictionary<string, object>
+        {
+            { "page", settingsPage },
+            { "key", settingKey },
+            { "old_value", oldValue ?? "" },
+            { "new_value", newValue }
+        });
+    }
+
+    public void TrackSettingsClose(string settingsPage)
+    {
+        if (!_isEnabled || !_isInitialized)
+        {
+            return;
+        }
+
+        CaptureEvent("settings_close", new Dictionary<string, object>
+        {
+            { "page", settingsPage }
+        });
+    }
+
+    public void TrackUpdateAction(string action, string? version = null)
+    {
+        if (!_isEnabled || !_isInitialized)
+        {
+            return;
+        }
+
+        var props = new Dictionary<string, object>
+        {
+            { "action", action }
+        };
+
+        if (version is not null)
+        {
+            props["version"] = version;
+        }
+
+        CaptureEvent("update_action", props);
+    }
+
+    public void TrackRestartAction(string action)
+    {
+        if (!_isEnabled || !_isInitialized)
+        {
+            return;
+        }
+
+        CaptureEvent("restart_action", new Dictionary<string, object>
+        {
+            { "action", action }
+        });
+    }
+
+    public void TrackNavigation(string fromPage, string toPage)
+    {
+        if (!_isEnabled || !_isInitialized)
+        {
+            return;
+        }
+
+        CaptureEvent("navigation", new Dictionary<string, object>
+        {
+            { "from", fromPage },
+            { "to", toPage }
+        });
+    }
+
+    public void SendCrashEvent()
+    {
+        if (!_isInitialized)
+        {
+            return;
+        }
+
+        try
+        {
+            var properties = new Dictionary<string, object>
+            {
+                { "app_version", GetAppVersion() },
+                { "event_time", DateTimeOffset.UtcNow.ToString("o") },
+                { "event_type", "app_crash" }
+            };
+
+            CaptureEvent("app_crash", properties);
+            FlushEvents();
+
+            AppLogger.Info("UserBehaviorAnalytics", $"Crash event sent. DeviceId={_deviceIdService.DeviceId}");
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("UserBehaviorAnalytics", "Failed to send crash event.", ex);
+        }
+    }
+
+    public void SendShutdownEvent()
+    {
+        if (!_isInitialized)
+        {
+            return;
+        }
+
+        try
+        {
+            var properties = new Dictionary<string, object>
+            {
+                { "app_version", GetAppVersion() },
+                { "event_time", DateTimeOffset.UtcNow.ToString("o") },
+                { "event_type", "app_shutdown" }
+            };
+
+            if (_isEnabled)
+            {
+                properties["os_name"] = GetOsName();
+                properties["os_version"] = GetOsVersion();
+                properties["device_name"] = GetDeviceName();
+                properties["device_model"] = GetDeviceModel();
+                properties["device_arch"] = GetDeviceArchitecture();
+                properties["language"] = GetSystemLanguage();
+            }
+
+            CaptureEvent("app_shutdown", properties);
+            FlushEvents();
+
+            AppLogger.Info("UserBehaviorAnalytics", $"Shutdown event sent. DeviceId={_deviceIdService.DeviceId}");
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("UserBehaviorAnalytics", "Failed to send shutdown event.", ex);
+        }
+    }
+
+    public void RefreshEnabledState()
+    {
+        try
+        {
+            var snapshot = _settingsFacade.Settings.LoadSnapshot<AppSettingsSnapshot>(SettingsScope.App);
+            var newEnabled = snapshot.UploadAnonymousUsageData;
+
+            if (_isEnabled != newEnabled)
+            {
+                _isEnabled = newEnabled;
+                AppLogger.Info("UserBehaviorAnalytics", $"User behavior analytics enabled state changed to '{_isEnabled}'.");
+
+                if (_isEnabled && _isInitialized)
+                {
+                    CaptureEvent("analytics_enabled", new Dictionary<string, object>());
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("UserBehaviorAnalytics", "Failed to refresh analytics enabled state.", ex);
+            _isEnabled = false;
+        }
+    }
+
+    public void CaptureEvent(string eventName, Dictionary<string, object>? properties = null)
+    {
+        if (!_isInitialized)
+        {
+            return;
+        }
+
+        try
+        {
+            var eventData = new UserBehaviorEvent
+            {
+                Event = eventName,
+                DistinctId = _deviceIdService.DeviceId,
+                Timestamp = DateTimeOffset.UtcNow,
+                Properties = properties ?? new Dictionary<string, object>(),
+                IncludeDetailedData = _isEnabled
+            };
+
+            lock (_queueLock)
+            {
+                _eventQueue.Enqueue(eventData);
+
+                if (_eventQueue.Count >= 20)
+                {
+                    FlushEvents();
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("UserBehaviorAnalytics", $"Failed to capture event '{eventName}'.", ex);
+        }
+    }
+
+    public void CapturePageView(string pageName, string? sourcePage = null)
+    {
+        var properties = new Dictionary<string, object>
+        {
+            { "page_name", pageName }
+        };
+
+        if (!string.IsNullOrEmpty(sourcePage))
+        {
+            properties["source_page"] = sourcePage;
+        }
+
+        CaptureEvent("page_view", properties);
+    }
+
+    public void CaptureFeatureUsage(string featureName, string action)
+    {
+        CaptureEvent("feature_usage", new Dictionary<string, object>
+        {
+            { "feature_name", featureName },
+            { "action", action }
+        });
+    }
+
+    private void FlushEvents()
+    {
+        List<UserBehaviorEvent> eventsToSend;
+
+        lock (_queueLock)
+        {
+            if (_eventQueue.Count == 0)
+            {
+                return;
+            }
+
+            eventsToSend = new List<UserBehaviorEvent>();
+            while (_eventQueue.Count > 0 && eventsToSend.Count < 20)
+            {
+                eventsToSend.Add(_eventQueue.Dequeue());
+            }
+        }
+
+        try
+        {
+            SendEventsToPostHog(eventsToSend);
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("UserBehaviorAnalytics", "Failed to send events to PostHog.", ex);
+
+            lock (_queueLock)
+            {
+                foreach (var evt in eventsToSend)
+                {
+                    if (_eventQueue.Count < 100)
+                    {
+                        _eventQueue.Enqueue(evt);
+                    }
+                }
+            }
+        }
+    }
+
+    private void SendEventsToPostHog(List<UserBehaviorEvent> events)
+    {
+        try
+        {
+            using var client = new System.Net.Http.HttpClient
+            {
+                Timeout = TimeSpan.FromSeconds(10)
+            };
+
+            var firstEvent = events.FirstOrDefault();
+            if (firstEvent is not null)
+            {
+                SendIdentifyToPostHog(client, firstEvent.DistinctId);
+            }
+
+            foreach (var e in events)
+            {
+                var properties = new Dictionary<string, object>
+                {
+                    { "distinct_id", e.DistinctId }
+                };
+
+                if (e.IncludeDetailedData)
+                {
+                    properties["$os"] = GetOsName();
+                    properties["$os_version"] = GetOsVersion();
+                    properties["$app_version"] = GetAppVersion();
+                    properties["$device_id"] = e.DistinctId;
+                }
+
+                foreach (var kvp in e.Properties)
+                {
+                    properties[kvp.Key] = kvp.Value;
+                }
+
+                var requestBody = new Dictionary<string, object>
+                {
+                    { "api_key", PostHogApiKey },
+                    { "event", e.Event },
+                    { "timestamp", e.Timestamp.ToString("o") },
+                    { "properties", properties }
+                };
+
+                var json = JsonSerializer.Serialize(requestBody);
+                var bytes = Encoding.UTF8.GetBytes(json);
+
+                var content = new System.Net.Http.ByteArrayContent(bytes);
+                content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
+
+                var response = client.PostAsync(PostHogHost, content).GetAwaiter().GetResult();
+                var responseBody = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
+
+                if (!response.IsSuccessStatusCode)
+                {
+                    AppLogger.Warn("UserBehaviorAnalytics", $"PostHog API error for event '{e.Event}': {response.StatusCode} - {responseBody}");
+                }
+            }
+
+            AppLogger.Info("UserBehaviorAnalytics", $"Successfully sent {events.Count} events to PostHog.");
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("UserBehaviorAnalytics", "Failed to send events to PostHog API.", ex);
+        }
+    }
+
+    private void SendIdentifyToPostHog(System.Net.Http.HttpClient client, string distinctId)
+    {
+        try
+        {
+            var userProperties = new Dictionary<string, object>
+            {
+                { "$device_id", distinctId },
+                { "$app_version", GetAppVersion() },
+                { "$os", GetOsName() },
+                { "$os_version", GetOsVersion() }
+            };
+
+            var requestBody = new Dictionary<string, object>
+            {
+                { "api_key", PostHogApiKey },
+                { "event", "$identify" },
+                { "timestamp", DateTimeOffset.UtcNow.ToString("o") },
+                { "properties", new Dictionary<string, object>
+                    {
+                        { "distinct_id", distinctId },
+                        { "$set", userProperties }
+                    }
+                }
+            };
+
+            var json = JsonSerializer.Serialize(requestBody);
+            var bytes = Encoding.UTF8.GetBytes(json);
+
+            var content = new System.Net.Http.ByteArrayContent(bytes);
+            content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
+
+            var response = client.PostAsync(PostHogHost, content).GetAwaiter().GetResult();
+            var responseBody = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
+
+            AppLogger.Info("UserBehaviorAnalytics", $"PostHog identify response: {response.StatusCode}");
+
+            if (!response.IsSuccessStatusCode)
+            {
+                AppLogger.Warn("UserBehaviorAnalytics", $"PostHog identify failed: {response.StatusCode} - {responseBody}");
+            }
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("UserBehaviorAnalytics", "Failed to send identify to PostHog.", ex);
+        }
+    }
+
+    private static Dictionary<string, object> GetEventProperties(UserBehaviorEvent e)
+    {
+        var props = new Dictionary<string, object>
+        {
+            { "$os", GetOsName() },
+            { "$os_version", GetOsVersion() },
+            { "$app_version", GetAppVersion() },
+            { "$device_id", e.DistinctId }
+        };
+
+        foreach (var kvp in e.Properties)
+        {
+            props[kvp.Key] = kvp.Value;
+        }
+
+        return props;
+    }
+
+    public bool IsEnabled => _isEnabled;
+
+    public string DeviceId => _deviceIdService.DeviceId;
+
+    private static string GetAppVersion()
+    {
+        var assembly = typeof(UserBehaviorAnalyticsService).Assembly;
+        var version = assembly.GetName().Version;
+        return version is null ? "1.0.0" : $"{version.Major}.{version.Minor}.{version.Build}";
+    }
+
+    private static string GetOsName()
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return "Windows";
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) return "Linux";
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) return "macOS";
+        return "Unknown";
+    }
+
+    private static string GetOsVersion()
+    {
+        try { return Environment.OSVersion.VersionString ?? "Unknown"; }
+        catch { return "Unknown"; }
+    }
+
+    private static string GetDeviceName()
+    {
+        try { return Environment.MachineName ?? "Unknown"; }
+        catch { return "Unknown"; }
+    }
+
+    private static string GetDeviceModel()
+    {
+        var osDesc = RuntimeInformation.OSDescription;
+        if (osDesc.Contains("Windows")) return "Windows PC";
+        if (osDesc.Contains("Linux")) return "Linux PC";
+        if (osDesc.Contains("Darwin")) return "Mac";
+        return osDesc;
+    }
+
+    private static string GetDeviceArchitecture()
+    {
+        return RuntimeInformation.OSArchitecture.ToString();
+    }
+
+    private static string GetSystemLanguage()
+    {
+        try { return System.Globalization.CultureInfo.CurrentUICulture.Name ?? "en-US"; }
+        catch { return "en-US"; }
+    }
+
+    private static string GetOsBuild()
+    {
+        try { return Environment.OSVersion.Version.Build.ToString() ?? "Unknown"; }
+        catch { return "Unknown"; }
+    }
+
+    private static int GetProcessorCount()
+    {
+        return Environment.ProcessorCount;
+    }
+
+    private static long GetTotalMemoryMB()
+    {
+        try { return GC.GetGCMemoryInfo().TotalAvailableMemoryBytes / (1024 * 1024); }
+        catch { return 0; }
+    }
+
+    private static string GetRuntimeVersion()
+    {
+        return Environment.Version.ToString();
+    }
+
+    private static string GetClrVersion()
+    {
+        return Environment.Version.ToString();
+    }
+
+    private static string GetDotNetVersion()
+    {
+        return Environment.Version.ToString();
+    }
+
+    public void Dispose()
+    {
+        try
+        {
+            _flushTimer?.Dispose();
+            FlushEvents();
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("UserBehaviorAnalytics", "Error disposing analytics service.", ex);
+        }
+    }
+
+    private class UserBehaviorEvent
+    {
+        public string Event { get; set; } = string.Empty;
+        public string DistinctId { get; set; } = string.Empty;
+        public DateTimeOffset Timestamp { get; set; }
+        public Dictionary<string, object> Properties { get; set; } = new();
+        public bool IncludeDetailedData { get; set; }
+    }
+}
+
+public static class DictionaryExtensions
+{
+    public static Dictionary<string, object> Merge(this Dictionary<string, object> first, Dictionary<string, object> second)
+    {
+        var result = new Dictionary<string, object>(first);
+        foreach (var kvp in second)
+        {
+            result[kvp.Key] = kvp.Value;
+        }
+        return result;
+    }
+}
+
+public sealed class CrashReportService
+{
+    private const string SentryDsn = "https://f2aad3a1c63b5f2213ad82683ce93c06@o4511049423257600.ingest.us.sentry.io/4511049425813504";
+
+    private bool _isInitialized;
+    private bool _isEnabled;
+    private readonly ISettingsFacadeService _settingsFacade;
+    private readonly DeviceIdService _deviceIdService;
+    private readonly PluginSdk.ISettingsService _settingsService;
+
+    public CrashReportService(ISettingsFacadeService settingsFacade, DeviceIdService deviceIdService)
+    {
+        _settingsFacade = settingsFacade ?? throw new ArgumentNullException(nameof(settingsFacade));
+        _settingsService = settingsFacade.Settings;
+        _deviceIdService = deviceIdService ?? throw new ArgumentNullException(nameof(deviceIdService));
+        _settingsService.Changed += OnSettingsChanged;
+    }
+
+    private void OnSettingsChanged(object? sender, PluginSdk.SettingsChangedEvent e)
+    {
+        if (e.Scope == PluginSdk.SettingsScope.App &&
+            e.ChangedKeys is not null &&
+            (e.ChangedKeys.Contains("UploadAnonymousCrashData") || e.ChangedKeys.Contains("UploadAnonymousUsageData")))
+        {
+            AppLogger.Info("CrashReport", "Settings changed, refreshing enabled state.");
+            RefreshEnabledState();
+        }
+    }
+
+    public void RefreshEnabledState()
+    {
+        try
+        {
+            var snapshot = _settingsFacade.Settings.LoadSnapshot<AppSettingsSnapshot>(SettingsScope.App);
+            var newEnabled = snapshot.UploadAnonymousCrashData;
+
+            if (_isEnabled != newEnabled)
+            {
+                _isEnabled = newEnabled;
+                AppLogger.Info("CrashReport", $"Crash reporting enabled state changed to '{_isEnabled}'.");
+
+                if (_isEnabled && !_isInitialized)
+                {
+                    InitializeSentry();
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("CrashReport", "Failed to refresh crash reporting enabled state.", ex);
+            _isEnabled = false;
+        }
+    }
+
+    private void InitializeSentry()
+    {
+        if (_isInitialized)
+        {
+            return;
+        }
+
+        _isInitialized = true;
+
+        try
+        {
+            SentrySdk.Init(options =>
+            {
+                options.Dsn = SentryDsn;
+                options.AutoSessionTracking = true;
+                options.AttachStacktrace = true;
+                options.MaxBreadcrumbs = 100;
+                options.Release = GetAppVersion();
+                options.Environment = GetEnvironment();
+            });
+
+            ConfigureCrashReportingScope();
+
+            AppLogger.Info("CrashReport", $"Sentry crash reporting initialized. DeviceId={_deviceIdService.DeviceId}");
+
+#if DEBUG
+            SentrySdk.CaptureMessage($"Crash reporting enabled - Debug mode test. DeviceId={_deviceIdService.DeviceId}");
+#endif
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("CrashReport", "Failed to initialize Sentry crash reporting.", ex);
+            _isInitialized = false;
+        }
+    }
+
+    private void ConfigureCrashReportingScope()
+    {
+        try
+        {
+            SentrySdk.ConfigureScope(scope =>
+            {
+                scope.User = new SentryUser
+                {
+                    Id = _deviceIdService.DeviceId
+                };
+
+                scope.SetTag("data_type", "crash_report");
+                scope.SetTag("device_id", _deviceIdService.DeviceId);
+                scope.SetTag("device_name", GetDeviceName());
+                scope.SetTag("device_model", GetDeviceModel());
+                scope.SetTag("device_arch", GetDeviceArchitecture());
+                scope.SetTag("os_name", GetOsName());
+                scope.SetTag("os_version", GetOsVersion());
+                scope.SetTag("language", GetSystemLanguage());
+            });
+
+            AppLogger.Info("CrashReport", $"Crash reporting scope configured. DeviceId={_deviceIdService.DeviceId}");
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("CrashReport", "Failed to configure crash reporting scope.", ex);
+        }
+    }
+
+    public bool IsEnabled => _isEnabled;
+
+    public string DeviceId => _deviceIdService.DeviceId;
+
+    public void SendShutdownEvent()
+    {
+        try
+        {
+            if (_isEnabled && _isInitialized)
+            {
+                AppLogger.Info("CrashReport", $"Shutdown event will be sent via Sentry. DeviceId={_deviceIdService.DeviceId}");
+                return;
+            }
+
+            if (!_isInitialized)
+            {
+                SentrySdk.Init(options =>
+                {
+                    options.Dsn = SentryDsn;
+                    options.AutoSessionTracking = false;
+                    options.Release = GetAppVersion();
+                    options.Environment = GetEnvironment();
+                });
+            }
+
+            SentrySdk.ConfigureScope(scope =>
+            {
+                scope.User = new SentryUser
+                {
+                    Id = _deviceIdService.DeviceId
+                };
+                scope.SetTag("data_type", "shutdown");
+                scope.SetTag("device_id", _deviceIdService.DeviceId);
+                scope.SetTag("app_version", GetAppVersion());
+            });
+
+            SentrySdk.CaptureMessage($"app_shutdown - DeviceId={_deviceIdService.DeviceId}");
+            SentrySdk.Flush(TimeSpan.FromSeconds(3));
+
+            AppLogger.Info("CrashReport", $"Shutdown event sent. DeviceId={_deviceIdService.DeviceId}");
+        }
+        catch (Exception ex)
+        {
+            AppLogger.Warn("CrashReport", "Failed to send shutdown event.", ex);
+        }
+    }
+
+    private static string GetDeviceName()
+    {
+        try { return Environment.MachineName ?? "Unknown"; }
+        catch { return "Unknown"; }
+    }
+
+    private static string GetDeviceModel()
+    {
+        var osDesc = RuntimeInformation.OSDescription;
+        if (osDesc.Contains("Windows")) return "Windows PC";
+        if (osDesc.Contains("Linux")) return "Linux PC";
+        if (osDesc.Contains("Darwin")) return "Mac";
+        return osDesc;
+    }
+
+    private static string GetDeviceArchitecture()
+    {
+        return RuntimeInformation.OSArchitecture.ToString();
+    }
+
+    private static string GetOsName()
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return "Windows";
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) return "Linux";
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) return "macOS";
+        return "Unknown";
+    }
+
+    private static string GetOsVersion()
+    {
+        try { return Environment.OSVersion.VersionString ?? "Unknown"; }
+        catch { return "Unknown"; }
+    }
+
+    private static string GetSystemLanguage()
+    {
+        try { return System.Globalization.CultureInfo.CurrentUICulture.Name ?? "en-US"; }
+        catch { return "en-US"; }
+    }
+
+    private static string GetAppVersion()
+    {
+        var version = typeof(CrashReportService).Assembly.GetName().Version;
+        return version is null ? "1.0.0" : $"{version.Major}.{version.Minor}.{version.Build}";
+    }
+
+    private static string GetEnvironment()
+    {
+#if DEBUG
+        return "development";
+#else
+        return "production";
+#endif
+    }
+}

LanMountainDesktop/Services/CurrentUserProfileService.cs

@@ -0,0 +1,196 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Avalonia.Media.Imaging;
+
+namespace LanMountainDesktop.Services;
+
+public sealed record CurrentUserProfileSnapshot(
+    string DisplayName,
+    Bitmap? AvatarBitmap,
+    string FallbackMonogram,
+    bool IsPlaceholder);
+
+public interface ICurrentUserProfileService
+{
+    CurrentUserProfileSnapshot GetCurrentProfile();
+}
+
+internal sealed class CurrentUserProfileService : ICurrentUserProfileService, IDisposable
+{
+    private readonly object _gate = new();
+    private CurrentUserProfileSnapshot? _cachedSnapshot;
+    private Bitmap? _cachedAvatarBitmap;
+
+    public CurrentUserProfileSnapshot GetCurrentProfile()
+    {
+        lock (_gate)
+        {
+            if (_cachedSnapshot is not null)
+            {
+                return _cachedSnapshot;
+            }
+
+            var displayName = ResolveDisplayName();
+            _cachedAvatarBitmap = TryLoadSystemAvatarBitmap();
+            _cachedSnapshot = new CurrentUserProfileSnapshot(
+                displayName,
+                _cachedAvatarBitmap,
+                BuildMonogram(displayName),
+                _cachedAvatarBitmap is null);
+            return _cachedSnapshot;
+        }
+    }
+
+    public void Dispose()
+    {
+        lock (_gate)
+        {
+            _cachedSnapshot = null;
+            _cachedAvatarBitmap?.Dispose();
+            _cachedAvatarBitmap = null;
+        }
+    }
+
+    private static string ResolveDisplayName()
+    {
+        var userName = Environment.UserName?.Trim();
+        return string.IsNullOrWhiteSpace(userName) ? "User" : userName;
+    }
+
+    private static Bitmap? TryLoadSystemAvatarBitmap()
+    {
+        foreach (var path in EnumerateAvatarCandidates())
+        {
+            try
+            {
+                using var stream = File.OpenRead(path);
+                return new Bitmap(stream);
+            }
+            catch
+            {
+                // Ignore unreadable avatar files and continue with the next candidate.
+            }
+        }
+
+        return null;
+    }
+
+    private static IEnumerable<string> EnumerateAvatarCandidates()
+    {
+        var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+        foreach (var path in EnumerateDirectoryCandidates(
+                     Path.Combine(
+                         Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                         "Microsoft",
+                         "Windows",
+                         "AccountPictures")))
+        {
+            if (seen.Add(path))
+            {
+                yield return path;
+            }
+        }
+
+        foreach (var path in EnumerateDirectoryCandidates(
+                     Path.Combine(
+                         Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                         "Microsoft",
+                         "Windows",
+                         "AccountPictures")))
+        {
+            if (seen.Add(path))
+            {
+                yield return path;
+            }
+        }
+
+        var commonPicturesDirectory = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData),
+            "Microsoft",
+            "User Account Pictures");
+
+        foreach (var fileName in new[]
+                 {
+                     "user-448.png",
+                     "user-240.png",
+                     "user-192.png",
+                     "user-96.png",
+                     "user-64.png",
+                     "user-48.png",
+                     "user.png"
+                 })
+        {
+            var path = Path.Combine(commonPicturesDirectory, fileName);
+            if (File.Exists(path) && seen.Add(path))
+            {
+                yield return path;
+            }
+        }
+    }
+
+    private static IEnumerable<string> EnumerateDirectoryCandidates(string directoryPath)
+    {
+        if (!Directory.Exists(directoryPath))
+        {
+            yield break;
+        }
+
+        var files = Directory.EnumerateFiles(directoryPath)
+            .Where(path =>
+            {
+                var extension = Path.GetExtension(path);
+                return extension.Equals(".png", StringComparison.OrdinalIgnoreCase) ||
+                       extension.Equals(".jpg", StringComparison.OrdinalIgnoreCase) ||
+                       extension.Equals(".jpeg", StringComparison.OrdinalIgnoreCase) ||
+                       extension.Equals(".bmp", StringComparison.OrdinalIgnoreCase) ||
+                       extension.Equals(".webp", StringComparison.OrdinalIgnoreCase);
+            })
+            .Select(path => new FileInfo(path))
+            .OrderByDescending(file => file.LastWriteTimeUtc)
+            .ThenByDescending(file => file.Length);
+
+        foreach (var file in files)
+        {
+            yield return file.FullName;
+        }
+    }
+
+    private static string BuildMonogram(string text)
+    {
+        if (string.IsNullOrWhiteSpace(text))
+        {
+            return "?";
+        }
+
+        var letters = text
+            .Trim()
+            .Split(' ', StringSplitOptions.RemoveEmptyEntries)
+            .Select(part => part[0])
+            .Take(2)
+            .ToArray();
+
+        if (letters.Length == 0)
+        {
+            return "?";
+        }
+
+        return new string(letters).ToUpperInvariant();
+    }
+}
+
+internal static class HostCurrentUserProfileProvider
+{
+    private static readonly object Gate = new();
+    private static ICurrentUserProfileService? _instance;
+
+    public static ICurrentUserProfileService GetOrCreate()
+    {
+        lock (Gate)
+        {
+            return _instance ??= new CurrentUserProfileService();
+        }
+    }
+}

LanMountainDesktop/Services/DesktopComponentEditorRegistryFactory.cs

@@ -0,0 +1,365 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Avalonia.Controls;
+using LanMountainDesktop.ComponentSystem;
+using LanMountainDesktop.Models;
+using LanMountainDesktop.Plugins;
+using LanMountainDesktop.PluginSdk;
+using LanMountainDesktop.Views.ComponentEditors;
+
+namespace LanMountainDesktop.Services;
+
+public static class DesktopComponentEditorRegistryFactory
+{
+    public static DesktopComponentEditorRegistry Create(
+        ComponentRegistry componentRegistry,
+        PluginRuntimeService? pluginRuntimeService)
+    {
+        ArgumentNullException.ThrowIfNull(componentRegistry);
+
+        var registrations = GetBuiltInRegistrations(componentRegistry).ToList();
+        var registeredIds = new HashSet<string>(
+            registrations.Select(registration => registration.ComponentId),
+            StringComparer.OrdinalIgnoreCase);
+
+        if (pluginRuntimeService is not null)
+        {
+            foreach (var contribution in pluginRuntimeService.DesktopComponentEditors)
+            {
+                var registration = contribution.Registration;
+                if (!componentRegistry.TryGetDefinition(registration.ComponentId, out var definition) ||
+                    !definition.AllowDesktopPlacement ||
+                    !registeredIds.Add(registration.ComponentId))
+                {
+                    continue;
+                }
+
+                registrations.Add(new DesktopComponentEditorRegistration(
+                    registration.ComponentId,
+                    context => CreatePluginEditor(contribution, context),
+                    registration.PreferredWidth,
+                    registration.PreferredHeight,
+                    registration.MinScale,
+                    registration.MaxScale));
+            }
+        }
+
+        return new DesktopComponentEditorRegistry(componentRegistry, registrations);
+    }
+
+    private static IEnumerable<DesktopComponentEditorRegistration> GetBuiltInRegistrations(ComponentRegistry componentRegistry)
+    {
+        var registrations = new Dictionary<string, DesktopComponentEditorRegistration>(StringComparer.OrdinalIgnoreCase)
+        {
+            [BuiltInComponentIds.DesktopClock] = new(
+                BuiltInComponentIds.DesktopClock,
+                context => new ClockComponentEditor(context)),
+            [BuiltInComponentIds.DesktopWorldClock] = new(
+                BuiltInComponentIds.DesktopWorldClock,
+                context => new WorldClockComponentEditor(context),
+                preferredWidth: 820d,
+                preferredHeight: 620d),
+            [BuiltInComponentIds.DesktopClassSchedule] = new(
+                BuiltInComponentIds.DesktopClassSchedule,
+                context => new ClassScheduleComponentEditor(context),
+                preferredWidth: 860d,
+                preferredHeight: 640d),
+            [BuiltInComponentIds.DesktopDailyArtwork] = new(
+                BuiltInComponentIds.DesktopDailyArtwork,
+                context => new DailyArtworkComponentEditor(context)),
+            [BuiltInComponentIds.DesktopStudyEnvironment] = new(
+                BuiltInComponentIds.DesktopStudyEnvironment,
+                context => new StudyEnvironmentComponentEditor(context)),
+            [BuiltInComponentIds.DesktopWeather] = CreateWeatherRegistration(BuiltInComponentIds.DesktopWeather),
+            [BuiltInComponentIds.DesktopWeatherClock] = CreateWeatherRegistration(BuiltInComponentIds.DesktopWeatherClock),
+            [BuiltInComponentIds.DesktopHourlyWeather] = CreateWeatherRegistration(BuiltInComponentIds.DesktopHourlyWeather),
+            [BuiltInComponentIds.DesktopMultiDayWeather] = CreateWeatherRegistration(BuiltInComponentIds.DesktopMultiDayWeather),
+            [BuiltInComponentIds.DesktopExtendedWeather] = CreateWeatherRegistration(BuiltInComponentIds.DesktopExtendedWeather),
+            [BuiltInComponentIds.DesktopCnrDailyNews] = new(
+                BuiltInComponentIds.DesktopCnrDailyNews,
+                context => new ToggleIntervalComponentEditor(
+                    context,
+                    new ToggleIntervalComponentEditorOptions
+                    {
+                        DescriptionKey = "cnr.settings.desc",
+                        DescriptionFallback = "Configure auto rotation for this CNR news widget.",
+                        ToggleLabelKey = "cnr.settings.auto_rotate",
+                        ToggleLabelFallback = "Auto rotate",
+                        ToggleDescriptionKey = "component.editor.instance_scope",
+                        ToggleDescriptionFallback = "Changes are stored per component instance.",
+                        IntervalLabelKey = "cnr.settings.rotate_interval",
+                        IntervalLabelFallback = "Rotate interval",
+                        DefaultInterval = 60,
+                        GetEnabled = snapshot => snapshot.CnrDailyNewsAutoRotateEnabled,
+                        SetEnabled = (snapshot, value) => snapshot.CnrDailyNewsAutoRotateEnabled = value,
+                        GetInterval = snapshot => snapshot.CnrDailyNewsAutoRotateIntervalMinutes,
+                        SetInterval = (snapshot, value) => snapshot.CnrDailyNewsAutoRotateIntervalMinutes = value,
+                        ChangedKeys =
+                        [
+                            nameof(ComponentSettingsSnapshot.CnrDailyNewsAutoRotateEnabled),
+                            nameof(ComponentSettingsSnapshot.CnrDailyNewsAutoRotateIntervalMinutes)
+                        ]
+                    })),
+            [BuiltInComponentIds.DesktopIfengNews] = new(
+                BuiltInComponentIds.DesktopIfengNews,
+                context => new ToggleIntervalComponentEditor(
+                    context,
+                    new ToggleIntervalComponentEditorOptions
+                    {
+                        DescriptionKey = "ifeng.settings.desc",
+                        DescriptionFallback = "Configure auto refresh and source channel for this iFeng widget.",
+                        ToggleLabelKey = "ifeng.settings.auto_refresh",
+                        ToggleLabelFallback = "Auto refresh",
+                        ToggleDescriptionKey = "component.editor.instance_scope",
+                        ToggleDescriptionFallback = "Changes are stored per component instance.",
+                        IntervalLabelKey = "ifeng.settings.refresh_interval",
+                        IntervalLabelFallback = "Refresh interval",
+                        DefaultInterval = 20,
+                        GetEnabled = snapshot => snapshot.IfengNewsAutoRefreshEnabled,
+                        SetEnabled = (snapshot, value) => snapshot.IfengNewsAutoRefreshEnabled = value,
+                        GetInterval = snapshot => snapshot.IfengNewsAutoRefreshIntervalMinutes,
+                        SetInterval = (snapshot, value) => snapshot.IfengNewsAutoRefreshIntervalMinutes = value,
+                        ExtraSelectorLabelKey = "ifeng.settings.channel",
+                        ExtraSelectorLabelFallback = "Channel",
+                        ExtraOptions =
+                        [
+                            new ComponentEditorSelectionOption(
+                                IfengNewsChannelTypes.Comprehensive,
+                                "ifeng.settings.channel.comprehensive",
+                                "Comprehensive"),
+                            new ComponentEditorSelectionOption(
+                                IfengNewsChannelTypes.Mainland,
+                                "ifeng.settings.channel.mainland",
+                                "Mainland"),
+                            new ComponentEditorSelectionOption(
+                                IfengNewsChannelTypes.Taiwan,
+                                "ifeng.settings.channel.taiwan",
+                                "Taiwan")
+                        ],
+                        GetExtraValue = snapshot => IfengNewsChannelTypes.Normalize(snapshot.IfengNewsChannelType),
+                        SetExtraValue = (snapshot, value) => snapshot.IfengNewsChannelType = IfengNewsChannelTypes.Normalize(value),
+                        ChangedKeys =
+                        [
+                            nameof(ComponentSettingsSnapshot.IfengNewsAutoRefreshEnabled),
+                            nameof(ComponentSettingsSnapshot.IfengNewsAutoRefreshIntervalMinutes),
+                            nameof(ComponentSettingsSnapshot.IfengNewsChannelType)
+                        ]
+                    })),
+            [BuiltInComponentIds.DesktopDailyWord] = CreateDailyWordRegistration(BuiltInComponentIds.DesktopDailyWord),
+            [BuiltInComponentIds.DesktopDailyWord2x2] = CreateDailyWordRegistration(BuiltInComponentIds.DesktopDailyWord2x2),
+            [BuiltInComponentIds.DesktopBilibiliHotSearch] = new(
+                BuiltInComponentIds.DesktopBilibiliHotSearch,
+                context => new ToggleIntervalComponentEditor(
+                    context,
+                    new ToggleIntervalComponentEditorOptions
+                    {
+                        DescriptionKey = "bilibili.settings.desc",
+                        DescriptionFallback = "Configure auto refresh for this Bilibili hot search widget.",
+                        ToggleLabelKey = "bilibili.settings.auto_refresh",
+                        ToggleLabelFallback = "Auto refresh",
+                        ToggleDescriptionKey = "component.editor.instance_scope",
+                        ToggleDescriptionFallback = "Changes are stored per component instance.",
+                        IntervalLabelKey = "bilibili.settings.refresh_interval",
+                        IntervalLabelFallback = "Refresh interval",
+                        DefaultInterval = 15,
+                        GetEnabled = snapshot => snapshot.BilibiliHotSearchAutoRefreshEnabled,
+                        SetEnabled = (snapshot, value) => snapshot.BilibiliHotSearchAutoRefreshEnabled = value,
+                        GetInterval = snapshot => snapshot.BilibiliHotSearchAutoRefreshIntervalMinutes,
+                        SetInterval = (snapshot, value) => snapshot.BilibiliHotSearchAutoRefreshIntervalMinutes = value,
+                        ChangedKeys =
+                        [
+                            nameof(ComponentSettingsSnapshot.BilibiliHotSearchAutoRefreshEnabled),
+                            nameof(ComponentSettingsSnapshot.BilibiliHotSearchAutoRefreshIntervalMinutes)
+                        ]
+                    })),
+            [BuiltInComponentIds.DesktopBaiduHotSearch] = new(
+                BuiltInComponentIds.DesktopBaiduHotSearch,
+                context => new ToggleIntervalComponentEditor(
+                    context,
+                    new ToggleIntervalComponentEditorOptions
+                    {
+                        DescriptionKey = "baidu.settings.desc",
+                        DescriptionFallback = "Configure auto refresh and source for this Baidu hot search widget.",
+                        ToggleLabelKey = "baidu.settings.auto_refresh",
+                        ToggleLabelFallback = "Auto refresh",
+                        ToggleDescriptionKey = "component.editor.instance_scope",
+                        ToggleDescriptionFallback = "Changes are stored per component instance.",
+                        IntervalLabelKey = "baidu.settings.refresh_interval",
+                        IntervalLabelFallback = "Refresh interval",
+                        DefaultInterval = 15,
+                        GetEnabled = snapshot => snapshot.BaiduHotSearchAutoRefreshEnabled,
+                        SetEnabled = (snapshot, value) => snapshot.BaiduHotSearchAutoRefreshEnabled = value,
+                        GetInterval = snapshot => snapshot.BaiduHotSearchAutoRefreshIntervalMinutes,
+                        SetInterval = (snapshot, value) => snapshot.BaiduHotSearchAutoRefreshIntervalMinutes = value,
+                        ExtraSelectorLabelKey = "baidu.settings.source",
+                        ExtraSelectorLabelFallback = "Source",
+                        ExtraOptions =
+                        [
+                            new ComponentEditorSelectionOption(
+                                BaiduHotSearchSourceTypes.Official,
+                                "baidu.settings.source.official",
+                                "Official"),
+                            new ComponentEditorSelectionOption(
+                                BaiduHotSearchSourceTypes.ThirdPartyRss,
+                                "baidu.settings.source.third_party",
+                                "Third-party RSS")
+                        ],
+                        GetExtraValue = snapshot => BaiduHotSearchSourceTypes.Normalize(snapshot.BaiduHotSearchSourceType),
+                        SetExtraValue = (snapshot, value) => snapshot.BaiduHotSearchSourceType = BaiduHotSearchSourceTypes.Normalize(value),
+                        ChangedKeys =
+                        [
+                            nameof(ComponentSettingsSnapshot.BaiduHotSearchAutoRefreshEnabled),
+                            nameof(ComponentSettingsSnapshot.BaiduHotSearchAutoRefreshIntervalMinutes),
+                            nameof(ComponentSettingsSnapshot.BaiduHotSearchSourceType)
+                        ]
+                    })),
+            [BuiltInComponentIds.DesktopStcn24Forum] = new(
+                BuiltInComponentIds.DesktopStcn24Forum,
+                context => new ToggleIntervalComponentEditor(
+                    context,
+                    new ToggleIntervalComponentEditorOptions
+                    {
+                        DescriptionKey = "stcn.settings.desc",
+                        DescriptionFallback = "Configure auto refresh and sort mode for this STCN forum widget.",
+                        ToggleLabelKey = "stcn.settings.auto_refresh",
+                        ToggleLabelFallback = "Auto refresh",
+                        ToggleDescriptionKey = "component.editor.instance_scope",
+                        ToggleDescriptionFallback = "Changes are stored per component instance.",
+                        IntervalLabelKey = "stcn.settings.refresh_interval",
+                        IntervalLabelFallback = "Refresh interval",
+                        DefaultInterval = 20,
+                        GetEnabled = snapshot => snapshot.Stcn24ForumAutoRefreshEnabled,
+                        SetEnabled = (snapshot, value) => snapshot.Stcn24ForumAutoRefreshEnabled = value,
+                        GetInterval = snapshot => snapshot.Stcn24ForumAutoRefreshIntervalMinutes,
+                        SetInterval = (snapshot, value) => snapshot.Stcn24ForumAutoRefreshIntervalMinutes = value,
+                        ExtraSelectorLabelKey = "stcn.settings.sort_mode",
+                        ExtraSelectorLabelFallback = "Sort mode",
+                        ExtraOptions = Stcn24ForumSourceTypes.SupportedValues
+                            .Select(value => new ComponentEditorSelectionOption(
+                                value,
+                                $"stcn.settings.source.{value}",
+                                value))
+                            .ToArray(),
+                        GetExtraValue = snapshot => Stcn24ForumSourceTypes.Normalize(snapshot.Stcn24ForumSourceType),
+                        SetExtraValue = (snapshot, value) => snapshot.Stcn24ForumSourceType = Stcn24ForumSourceTypes.Normalize(value),
+                        ChangedKeys =
+                        [
+                            nameof(ComponentSettingsSnapshot.Stcn24ForumAutoRefreshEnabled),
+                            nameof(ComponentSettingsSnapshot.Stcn24ForumAutoRefreshIntervalMinutes),
+                            nameof(ComponentSettingsSnapshot.Stcn24ForumSourceType)
+                        ]
+                    }))
+        };
+
+        foreach (var componentId in GetBuiltInDesktopComponentIds(componentRegistry))
+        {
+            if (registrations.ContainsKey(componentId))
+            {
+                continue;
+            }
+
+            registrations[componentId] = new DesktopComponentEditorRegistration(
+                componentId,
+                context => new InformationalComponentEditor(
+                    context,
+                    $"This {context.Definition.DisplayName} component currently exposes instance-scoped editor metadata only."));
+        }
+
+        return registrations.Values;
+    }
+
+    private static IEnumerable<string> GetBuiltInDesktopComponentIds(ComponentRegistry componentRegistry)
+    {
+        return typeof(BuiltInComponentIds)
+            .GetFields(BindingFlags.Public | BindingFlags.Static)
+            .Where(field => field.FieldType == typeof(string))
+            .Select(field => field.GetRawConstantValue() as string)
+            .Where(id => !string.IsNullOrWhiteSpace(id))
+            .Select(id => id!)
+            .Where(id => componentRegistry.TryGetDefinition(id, out var definition) && definition.AllowDesktopPlacement)
+            .Distinct(StringComparer.OrdinalIgnoreCase);
+    }
+
+    private static DesktopComponentEditorRegistration CreateWeatherRegistration(string componentId)
+    {
+        return new DesktopComponentEditorRegistration(
+            componentId,
+            context => new ToggleIntervalComponentEditor(
+                context,
+                new ToggleIntervalComponentEditorOptions
+                {
+                    DescriptionKey = "weather.settings.desc",
+                    DescriptionFallback = "Configure weather auto refresh for this component instance.",
+                    ToggleLabelKey = "weather.settings.auto_refresh",
+                    ToggleLabelFallback = "Auto refresh",
+                    ToggleDescriptionKey = "component.editor.instance_scope",
+                    ToggleDescriptionFallback = "Changes are stored per component instance.",
+                    IntervalLabelKey = "weather.settings.refresh_interval",
+                    IntervalLabelFallback = "Refresh interval",
+                    DefaultInterval = 12,
+                    GetEnabled = snapshot => snapshot.WeatherAutoRefreshEnabled,
+                    SetEnabled = (snapshot, value) => snapshot.WeatherAutoRefreshEnabled = value,
+                    GetInterval = snapshot => snapshot.WeatherAutoRefreshIntervalMinutes,
+                    SetInterval = (snapshot, value) => snapshot.WeatherAutoRefreshIntervalMinutes = value,
+                    ChangedKeys =
+                    [
+                        nameof(ComponentSettingsSnapshot.WeatherAutoRefreshEnabled),
+                        nameof(ComponentSettingsSnapshot.WeatherAutoRefreshIntervalMinutes)
+                    ]
+                }));
+    }
+
+    private static DesktopComponentEditorRegistration CreateDailyWordRegistration(string componentId)
+    {
+        return new DesktopComponentEditorRegistration(
+            componentId,
+            context => new ToggleIntervalComponentEditor(
+                context,
+                new ToggleIntervalComponentEditorOptions
+                {
+                    DescriptionKey = "dailyword.settings.desc",
+                    DescriptionFallback = "Configure auto refresh for this Daily Word component.",
+                    ToggleLabelKey = "dailyword.settings.auto_refresh",
+                    ToggleLabelFallback = "Auto refresh",
+                    ToggleDescriptionKey = "component.editor.instance_scope",
+                    ToggleDescriptionFallback = "Changes are stored per component instance.",
+                    IntervalLabelKey = "dailyword.settings.refresh_interval",
+                    IntervalLabelFallback = "Refresh interval",
+                    DefaultInterval = 360,
+                    GetEnabled = snapshot => snapshot.DailyWordAutoRefreshEnabled,
+                    SetEnabled = (snapshot, value) => snapshot.DailyWordAutoRefreshEnabled = value,
+                    GetInterval = snapshot => snapshot.DailyWordAutoRefreshIntervalMinutes,
+                    SetInterval = (snapshot, value) => snapshot.DailyWordAutoRefreshIntervalMinutes = value,
+                    ChangedKeys =
+                    [
+                        nameof(ComponentSettingsSnapshot.DailyWordAutoRefreshEnabled),
+                        nameof(ComponentSettingsSnapshot.DailyWordAutoRefreshIntervalMinutes)
+                    ]
+                }));
+    }
+
+    private static Control CreatePluginEditor(
+        PluginDesktopComponentEditorContribution contribution,
+        DesktopComponentEditorContext context)
+    {
+        var settingsService = contribution.Plugin.Services.GetService(typeof(ISettingsService)) as ISettingsService
+            ?? context.SettingsService;
+        var pluginSettings = new PluginScopedSettingsService(
+            contribution.Plugin.Manifest.Id,
+            settingsService);
+        var pluginContext = new PluginDesktopComponentEditorContext(
+            contribution.Plugin.Manifest,
+            contribution.Plugin.Context.PluginDirectory,
+            contribution.Plugin.Context.DataDirectory,
+            contribution.Plugin.Services,
+            contribution.Plugin.Context.Properties,
+            context.ComponentId,
+            context.PlacementId,
+            pluginSettings,
+            context.HostContext);
+
+        return contribution.Registration.EditorFactory(contribution.Plugin.Services, pluginContext);
+    }
+}

LanMountainDesktop/Services/DesktopComponentRegistryFactory.cs

@@ -10,6 +10,7 @@ using Avalonia.Media;
 using LanMountainDesktop.ComponentSystem;
 using LanMountainDesktop.ComponentSystem.Extensions;
 using LanMountainDesktop.PluginSdk;
+using LanMountainDesktop.Services.Settings;
 using LanMountainDesktop.Views.Components;
 
 namespace LanMountainDesktop.Services;
@@ -32,7 +33,8 @@ public static class DesktopComponentRegistryFactory
 
     public static DesktopComponentRuntimeRegistry CreateRuntimeRegistry(
         ComponentRegistry componentRegistry,
-        PluginRuntimeService? pluginRuntimeService)
+        PluginRuntimeService? pluginRuntimeService,
+        ISettingsFacadeService settingsFacade)
     {
         var registrations = DesktopComponentRuntimeRegistry.GetDefaultRegistrations().ToList();
         var registeredIds = new HashSet<string>(
@@ -64,6 +66,7 @@ public static class DesktopComponentRegistryFactory
             }
         }
 
+        _ = settingsFacade;
         return new DesktopComponentRuntimeRegistry(componentRegistry, registrations);
     }
 
@@ -114,17 +117,23 @@ public static class DesktopComponentRegistryFactory
     {
         try
         {
+            var settingsService = contribution.Plugin.Services.GetService(typeof(ISettingsService)) as ISettingsService
+                ?? context.SettingsService;
+            var pluginSettings = new PluginScopedSettingsService(
+                contribution.Plugin.Manifest.Id,
+                settingsService);
             var pluginContext = new PluginDesktopComponentContext(
                 contribution.Plugin.Manifest,
                 contribution.Plugin.Context.PluginDirectory,
                 contribution.Plugin.Context.DataDirectory,
-                contribution.Plugin.Context.Services,
+                contribution.Plugin.Services,
                 contribution.Plugin.Context.Properties,
                 contribution.Registration.ComponentId,
                 context.PlacementId,
-                context.CellSize);
+                context.CellSize,
+                pluginSettings);
 
-            return contribution.Registration.ControlFactory(pluginContext);
+            return contribution.Registration.ControlFactory(contribution.Plugin.Services, pluginContext);
         }
         catch (Exception ex)
         {

LanMountainDesktop/Services/DesktopGridLayoutService.cs

@@ -0,0 +1,116 @@
+using System;
+
+namespace LanMountainDesktop.Services;
+
+public readonly record struct DesktopGridMetrics(
+    int ColumnCount,
+    int RowCount,
+    double CellSize,
+    double GapPx,
+    double EdgeInsetPx,
+    double GridWidthPx,
+    double GridHeightPx)
+{
+    public double Pitch => CellSize + GapPx;
+}
+
+public sealed class DesktopGridLayoutService
+{
+    public const string RelaxedSpacingPreset = "Relaxed";
+    public const string CompactSpacingPreset = "Compact";
+
+    public string NormalizeSpacingPreset(string? value)
+    {
+        return string.Equals(value, CompactSpacingPreset, StringComparison.OrdinalIgnoreCase)
+            ? CompactSpacingPreset
+            : RelaxedSpacingPreset;
+    }
+
+    public double ResolveGapRatio(string? preset)
+    {
+        return string.Equals(preset, CompactSpacingPreset, StringComparison.OrdinalIgnoreCase) ? 0.06 : 0.12;
+    }
+
+    public double CalculateEdgeInset(double hostWidth, double hostHeight, int shortSideCells, int insetPercent)
+    {
+        if (hostWidth <= 1 || hostHeight <= 1)
+        {
+            return 0;
+        }
+
+        var cells = Math.Max(1, shortSideCells);
+        var shortSidePx = Math.Max(1, Math.Min(hostWidth, hostHeight));
+        var baseCell = shortSidePx / cells;
+        var insetRatio = Math.Clamp(insetPercent, 0, 30) / 100d;
+        return Math.Clamp(baseCell * insetRatio, 0, 80);
+    }
+
+    public DesktopGridMetrics CalculateGridMetrics(
+        double hostWidth,
+        double hostHeight,
+        int shortSideCells,
+        double gapRatio,
+        double edgeInsetPx)
+    {
+        if (hostWidth <= 1 || hostHeight <= 1)
+        {
+            return default;
+        }
+
+        var shortSide = Math.Max(1, shortSideCells);
+        var clampedGapRatio = Math.Max(0, gapRatio);
+        var inset = Math.Max(0, edgeInsetPx);
+        var availableWidth = Math.Max(1, hostWidth - inset * 2);
+        var availableHeight = Math.Max(1, hostHeight - inset * 2);
+
+        if (hostWidth >= hostHeight)
+        {
+            var rowCount = shortSide;
+            var denominator = rowCount + Math.Max(0, rowCount - 1) * clampedGapRatio;
+            if (denominator <= 0)
+            {
+                return default;
+            }
+
+            var cellSize = availableHeight / denominator;
+            var gapPx = cellSize * clampedGapRatio;
+            var pitch = cellSize + gapPx;
+            if (pitch <= 0)
+            {
+                return default;
+            }
+
+            var columnCount = Math.Max(1, (int)Math.Floor((availableWidth + gapPx) / pitch));
+            var gridWidth = columnCount * cellSize + Math.Max(0, columnCount - 1) * gapPx;
+            var gridHeight = rowCount * cellSize + Math.Max(0, rowCount - 1) * gapPx;
+            return new DesktopGridMetrics(columnCount, rowCount, cellSize, gapPx, inset, gridWidth, gridHeight);
+        }
+
+        var columnCountPortrait = shortSide;
+        var denominatorPortrait = columnCountPortrait + Math.Max(0, columnCountPortrait - 1) * clampedGapRatio;
+        if (denominatorPortrait <= 0)
+        {
+            return default;
+        }
+
+        var cellSizePortrait = availableWidth / denominatorPortrait;
+        var gapPxPortrait = cellSizePortrait * clampedGapRatio;
+        var pitchPortrait = cellSizePortrait + gapPxPortrait;
+        if (pitchPortrait <= 0)
+        {
+            return default;
+        }
+
+        var rowCountPortrait = Math.Max(1, (int)Math.Floor((availableHeight + gapPxPortrait) / pitchPortrait));
+        var gridWidthPortrait = columnCountPortrait * cellSizePortrait + Math.Max(0, columnCountPortrait - 1) * gapPxPortrait;
+        var gridHeightPortrait = rowCountPortrait * cellSizePortrait + Math.Max(0, rowCountPortrait - 1) * gapPxPortrait;
+        return new DesktopGridMetrics(
+            columnCountPortrait,
+            rowCountPortrait,
+            cellSizePortrait,
+            gapPxPortrait,
+            inset,
+            gridWidthPortrait,
+            gridHeightPortrait);
+    }
+}

LanMountainDesktop/Services/DesktopLayoutSettingsService.cs

@@ -1,248 +1,19 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
 using LanMountainDesktop.Models;
+using LanMountainDesktop.Services.Settings;
 
 namespace LanMountainDesktop.Services;
 
 public sealed class DesktopLayoutSettingsService
 {
-    private static readonly JsonSerializerOptions SerializerOptions = new()
-    {
-        WriteIndented = true
-    };
-    private static readonly object CacheGate = new();
-    private static readonly TimeSpan CacheProbeInterval = TimeSpan.FromMilliseconds(400);
-
-    private static string? _cachedPath;
-    private static DesktopLayoutSettingsSnapshot? _cachedSnapshot;
-    private static DateTime _cachedWriteTimeUtc = DateTime.MinValue;
-    private static DateTime _lastProbeUtc = DateTime.MinValue;
-
-    private readonly string _settingsPath;
-    private readonly string _legacyAppSettingsPath;
-
-    public DesktopLayoutSettingsService()
-    {
-        var appData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-        var settingsDirectory = Path.Combine(appData, "LanMountainDesktop");
-        _settingsPath = Path.Combine(settingsDirectory, "desktop-layout-settings.json");
-        _legacyAppSettingsPath = Path.Combine(settingsDirectory, "settings.json");
-    }
+    private readonly IComponentLayoutStore _layoutStore = ComponentDomainStorageProvider.Instance;
 
     public DesktopLayoutSettingsSnapshot Load()
     {
-        try
-        {
-            lock (CacheGate)
-            {
-                var nowUtc = DateTime.UtcNow;
-                if (TryGetCachedWithoutProbe(nowUtc, out var cached))
-                {
-                    return cached;
-                }
-
-                var hasFile = File.Exists(_settingsPath);
-                var writeTimeUtc = hasFile
-                    ? File.GetLastWriteTimeUtc(_settingsPath)
-                    : DateTime.MinValue;
-
-                _lastProbeUtc = nowUtc;
-                if (TryGetCachedAfterProbe(writeTimeUtc, out cached))
-                {
-                    return cached;
-                }
-
-                DesktopLayoutSettingsSnapshot loadedSnapshot;
-                var loadedFromLegacy = false;
-                if (hasFile)
-                {
-                    loadedSnapshot = LoadSnapshotFromDisk();
-                }
-                else if (TryLoadLegacySnapshot(out var migratedSnapshot))
-                {
-                    loadedSnapshot = migratedSnapshot;
-                    loadedFromLegacy = true;
-                }
-                else
-                {
-                    loadedSnapshot = new DesktopLayoutSettingsSnapshot();
-                }
-
-                var normalizedSnapshot = NormalizeSnapshot(loadedSnapshot);
-                if (loadedFromLegacy)
-                {
-                    writeTimeUtc = PersistSnapshotToDisk(normalizedSnapshot);
-                }
-
-                UpdateCache(normalizedSnapshot, writeTimeUtc, nowUtc);
-                return normalizedSnapshot.Clone();
-            }
-        }
-        catch
-        {
-            return new DesktopLayoutSettingsSnapshot();
-        }
+        return _layoutStore.LoadLayout();
     }
 
     public void Save(DesktopLayoutSettingsSnapshot snapshot)
     {
-        var snapshotToPersist = NormalizeSnapshot(snapshot);
-
-        try
-        {
-            var writeTimeUtc = PersistSnapshotToDisk(snapshotToPersist);
-
-            lock (CacheGate)
-            {
-                UpdateCache(snapshotToPersist, writeTimeUtc, DateTime.UtcNow);
-            }
-        }
-        catch
-        {
-            // Swallow persistence errors to keep UI interactions uninterrupted.
-        }
-    }
-
-    private bool TryGetCachedWithoutProbe(DateTime nowUtc, out DesktopLayoutSettingsSnapshot snapshot)
-    {
-        if (string.Equals(_cachedPath, _settingsPath, StringComparison.Ordinal) &&
-            _cachedSnapshot is not null &&
-            nowUtc - _lastProbeUtc < CacheProbeInterval)
-        {
-            snapshot = _cachedSnapshot.Clone();
-            return true;
-        }
-
-        snapshot = null!;
-        return false;
-    }
-
-    private bool TryGetCachedAfterProbe(DateTime writeTimeUtc, out DesktopLayoutSettingsSnapshot snapshot)
-    {
-        if (string.Equals(_cachedPath, _settingsPath, StringComparison.Ordinal) &&
-            _cachedSnapshot is not null &&
-            writeTimeUtc == _cachedWriteTimeUtc)
-        {
-            snapshot = _cachedSnapshot.Clone();
-            return true;
-        }
-
-        snapshot = null!;
-        return false;
-    }
-
-    private DesktopLayoutSettingsSnapshot LoadSnapshotFromDisk()
-    {
-        try
-        {
-            var json = File.ReadAllText(_settingsPath);
-            var snapshot = JsonSerializer.Deserialize<DesktopLayoutSettingsSnapshot>(json, SerializerOptions);
-            return NormalizeSnapshot(snapshot);
-        }
-        catch
-        {
-            return new DesktopLayoutSettingsSnapshot();
-        }
-    }
-
-    private bool TryLoadLegacySnapshot(out DesktopLayoutSettingsSnapshot snapshot)
-    {
-        snapshot = new DesktopLayoutSettingsSnapshot();
-
-        try
-        {
-            if (!File.Exists(_legacyAppSettingsPath))
-            {
-                return false;
-            }
-
-            var legacyJson = File.ReadAllText(_legacyAppSettingsPath);
-            var legacy = JsonSerializer.Deserialize<LegacyDesktopLayoutSettingsSnapshot>(legacyJson, SerializerOptions);
-            if (legacy is null)
-            {
-                return false;
-            }
-
-            snapshot = new DesktopLayoutSettingsSnapshot
-            {
-                DesktopPageCount = legacy.DesktopPageCount,
-                CurrentDesktopSurfaceIndex = legacy.CurrentDesktopSurfaceIndex,
-                DesktopComponentPlacements = legacy.DesktopComponentPlacements ?? []
-            };
-
-            return true;
-        }
-        catch
-        {
-            return false;
-        }
-    }
-
-    private DateTime PersistSnapshotToDisk(DesktopLayoutSettingsSnapshot snapshot)
-    {
-        var directory = Path.GetDirectoryName(_settingsPath);
-        if (!string.IsNullOrWhiteSpace(directory))
-        {
-            Directory.CreateDirectory(directory);
-        }
-
-        var json = JsonSerializer.Serialize(snapshot, SerializerOptions);
-        File.WriteAllText(_settingsPath, json);
-
-        return File.Exists(_settingsPath)
-            ? File.GetLastWriteTimeUtc(_settingsPath)
-            : DateTime.UtcNow;
-    }
-
-    private static DesktopLayoutSettingsSnapshot NormalizeSnapshot(DesktopLayoutSettingsSnapshot? snapshot)
-    {
-        var normalized = snapshot?.Clone() ?? new DesktopLayoutSettingsSnapshot();
-        normalized.DesktopPageCount = Math.Max(1, normalized.DesktopPageCount);
-        normalized.CurrentDesktopSurfaceIndex = Math.Max(0, normalized.CurrentDesktopSurfaceIndex);
-
-        var placements = new List<DesktopComponentPlacementSnapshot>(normalized.DesktopComponentPlacements?.Count ?? 0);
-        if (normalized.DesktopComponentPlacements is not null)
-        {
-            foreach (var placement in normalized.DesktopComponentPlacements)
-            {
-                if (placement is null)
-                {
-                    continue;
-                }
-
-                placements.Add(new DesktopComponentPlacementSnapshot
-                {
-                    PlacementId = placement.PlacementId?.Trim() ?? string.Empty,
-                    PageIndex = Math.Max(0, placement.PageIndex),
-                    ComponentId = placement.ComponentId?.Trim() ?? string.Empty,
-                    Row = Math.Max(0, placement.Row),
-                    Column = Math.Max(0, placement.Column),
-                    WidthCells = Math.Max(1, placement.WidthCells),
-                    HeightCells = Math.Max(1, placement.HeightCells)
-                });
-            }
-        }
-
-        normalized.DesktopComponentPlacements = placements;
-        return normalized;
-    }
-
-    private void UpdateCache(DesktopLayoutSettingsSnapshot snapshot, DateTime writeTimeUtc, DateTime probeTimeUtc)
-    {
-        _cachedPath = _settingsPath;
-        _cachedSnapshot = snapshot.Clone();
-        _cachedWriteTimeUtc = writeTimeUtc;
-        _lastProbeUtc = probeTimeUtc;
-    }
-
-    private sealed class LegacyDesktopLayoutSettingsSnapshot
-    {
-        public int DesktopPageCount { get; set; } = 1;
-
-        public int CurrentDesktopSurfaceIndex { get; set; }
-
-        public List<DesktopComponentPlacementSnapshot>? DesktopComponentPlacements { get; set; }
+        _layoutStore.SaveLayout(snapshot ?? new DesktopLayoutSettingsSnapshot());
     }
 }