0.5.1

插件系统试验
2026-06-22 09:14:25 +08:00 · 2026-03-09 12:27:33 +08:00
parent c9f92a4755
commit cab35f4c22
49 changed files with 3355 additions and 158 deletions
--- a/LanMountainDesktop/App.axaml.cs
+++ b/LanMountainDesktop/App.axaml.cs
@@ -17,6 +17,9 @@ namespace LanMountainDesktop;
 public partial class App : Application
 {
    private SettingsWindow? _traySettingsWindow;
+    private PluginRuntimeService? _pluginRuntimeService;
+
+    public PluginRuntimeService? PluginRuntimeService => _pluginRuntimeService;

    public override void Initialize()
    {
@@ -28,6 +31,7 @@ public partial class App : Application
    public override void OnFrameworkInitializationCompleted()
    {
        LinuxDesktopEntryInstaller.EnsureInstalled();
+        InitializePluginRuntime();

        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
        {
@@ -172,4 +176,18 @@ public partial class App : Application
            // Keep startup resilient if user profile folders are unavailable.
        }
    }
+
+    private void InitializePluginRuntime()
+    {
+        try
+        {
+            _pluginRuntimeService?.Dispose();
+            _pluginRuntimeService = new PluginRuntimeService();
+            _pluginRuntimeService.LoadInstalledPlugins();
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"[PluginRuntime] Failed to initialize plugin runtime: {ex}");
+        }
+    }
 }
--- a/LanMountainDesktop/ComponentSystem/ComponentRegistry.cs
+++ b/LanMountainDesktop/ComponentSystem/ComponentRegistry.cs
@@ -385,6 +385,13 @@ public sealed class ComponentRegistry
        return new ComponentRegistry(merged);
    }

+    public ComponentRegistry RegisterComponents(IEnumerable<DesktopComponentDefinition> definitions)
+    {
+        var merged = _definitions.Values.ToList();
+        merged.AddRange(definitions);
+        return new ComponentRegistry(merged);
+    }
+
    public bool TryGetDefinition(string componentId, out DesktopComponentDefinition definition)
    {
        return _definitions.TryGetValue(componentId, out definition!);
--- a/LanMountainDesktop/LanMountainDesktop.csproj
+++ b/LanMountainDesktop/LanMountainDesktop.csproj
@@ -24,6 +24,10 @@
    <None Include="Extensions\Components\*.json" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>

+  <ItemGroup>
+    <ProjectReference Include="..\LanMountainDesktop.PluginSdk\LanMountainDesktop.PluginSdk.csproj" />
+  </ItemGroup>
+
  <ItemGroup>
    <PackageReference Include="Avalonia" Version="11.3.12" />
    <PackageReference Include="Avalonia.Desktop" Version="11.3.12" />
--- a/LanMountainDesktop/Localization/en-US.json
+++ b/LanMountainDesktop/Localization/en-US.json
@@ -268,9 +268,30 @@
    "settings.launcher.restore_button":  "Show Again",
    "settings.plugins.title":  "Plugins",
    "settings.plugins.runtime_header":  "Plugin Runtime",
-    "settings.plugins.runtime_desc":  "Manage plugin loading and backend isolation.",
-    "settings.plugins.runtime_hint":  "This page will host installed plugin management, permission review, and sandboxed backend runtime controls.",
-    "settings.plugins.runtime_status":  "Plugin management UI is not connected yet. Next step is wiring the loader, permissions, and worker isolation state into this panel.",
+    "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.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.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}.",
+    "settings.plugins.summary_item_format":  "{0}  v{1}  |  {2}",
+    "settings.plugins.state.enabled":  "Enabled",
+    "settings.plugins.state.enabled_failed":  "Enabled / failed to load",
+    "settings.plugins.state.disabled":  "Disabled",
+    "settings.plugins.state.loaded":  "Loaded",
+    "settings.plugins.state.load_failed":  "Load failed",
+    "settings.plugins.toggle_on":  "Enabled",
+    "settings.plugins.toggle_off":  "Disabled",
+    "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.source_package":  ".laapp package",
+    "settings.plugins.source_manifest":  "Loose manifest",
+    "settings.plugins.subtitle_format":  "{0} | {1} | {2}",
+    "settings.plugins.detail_format":  "Settings pages: {0} | Widgets: {1}",
    "button.component_library":  "Edit Desktop",
    "tooltip.component_library":  "Edit Desktop",
    "component_library.title":  "Widgets",
@@ -617,3 +638,5 @@
    "placement.center":  "Center",
    "placement.tile":  "Tile"
 }
+
+
--- a/LanMountainDesktop/Localization/zh-CN.json
+++ b/LanMountainDesktop/Localization/zh-CN.json
@@ -268,9 +268,30 @@
    "settings.launcher.restore_button":  "重新显示",
    "settings.plugins.title":  "插件",
    "settings.plugins.runtime_header":  "插件运行时",
-    "settings.plugins.runtime_desc":  "管理插件加载与后端隔离运行。",
-    "settings.plugins.runtime_hint":  "这里将承载已安装插件、权限审查和沙盒后端运行时控制。",
-    "settings.plugins.runtime_status":  "插件管理界面尚未接入实际数据。下一步是把加载器、权限和 worker 隔离状态接到这里。",
+    "settings.plugins.runtime_desc":  "查看插件运行时状态、加载结果与诊断信息。",
+    "settings.plugins.runtime_hint":  "这里展示已安装插件的发现结果、加载状态和运行时诊断信息。",
+    "settings.plugins.runtime_status":  "插件扫描完成后，运行时状态会显示在这里。",
+    "settings.plugins.installed_header":  "已安装插件",
+    "settings.plugins.installed_desc":  "在这里启用或禁用插件。插件自己的详细设置会作为独立设置页出现。",
+    "settings.plugins.restart_hint":  "插件启用状态变更会在重启应用后生效。",
+    "settings.plugins.empty":  "未找到插件。",
+    "settings.plugins.runtime_unavailable":  "插件运行时不可用。",
+    "settings.plugins.summary_format":  "共检测到 {0} 个插件；已启用 {1} 个；已加载 {2} 个；设置页 {3} 个；组件 {4} 个；失败 {5} 个。",
+    "settings.plugins.summary_item_format":  "{0}  v{1}  |  {2}",
+    "settings.plugins.state.enabled":  "已启用",
+    "settings.plugins.state.enabled_failed":  "已启用 / 加载失败",
+    "settings.plugins.state.disabled":  "已禁用",
+    "settings.plugins.state.loaded":  "已加载",
+    "settings.plugins.state.load_failed":  "加载失败",
+    "settings.plugins.toggle_on":  "启用",
+    "settings.plugins.toggle_off":  "禁用",
+    "settings.plugins.toggle_result_format":  "插件“{0}”已在下次启动时设为{1}。重启应用后，设置页和组件变更才会生效。",
+    "settings.plugins.toggle_state_enabled":  "启用",
+    "settings.plugins.toggle_state_disabled":  "禁用",
+    "settings.plugins.source_package":  ".laapp 包",
+    "settings.plugins.source_manifest":  "散装清单",
+    "settings.plugins.subtitle_format":  "{0} | {1} | {2}",
+    "settings.plugins.detail_format":  "设置页：{0} | 组件：{1}",
    "button.component_library":  "桌面编辑",
    "tooltip.component_library":  "桌面编辑",
    "component_library.title":  "桌面编辑",
@@ -617,3 +638,5 @@
    "placement.center":  "居中",
    "placement.tile":  "平铺"
 }
+
+
--- a/LanMountainDesktop/Models/AppSettingsSnapshot.cs
+++ b/LanMountainDesktop/Models/AppSettingsSnapshot.cs
@@ -20,6 +20,8 @@ public sealed class AppSettingsSnapshot

    public int SettingsTabIndex { get; set; } = 0;

+    public string? SettingsTabTag { get; set; }
+
    public string LanguageCode { get; set; } = "zh-CN";

    public string? TimeZoneId { get; set; }
@@ -70,6 +72,8 @@ public sealed class AppSettingsSnapshot

    public int StatusBarCustomSpacingPercent { get; set; } = 12;

+    public List<string> DisabledPluginIds { get; set; } = [];
+
    public AppSettingsSnapshot Clone()
    {
        var clone = (AppSettingsSnapshot)MemberwiseClone();
@@ -80,6 +84,9 @@ public sealed class AppSettingsSnapshot
        clone.PinnedTaskbarActions = PinnedTaskbarActions is { Count: > 0 }
            ? new List<string>(PinnedTaskbarActions)
            : [];
+        clone.DisabledPluginIds = DisabledPluginIds is { Count: > 0 }
+            ? new List<string>(DisabledPluginIds)
+            : [];

        return clone;
    }
--- a/LanMountainDesktop/Services/DesktopComponentRegistryFactory.cs
+++ b/LanMountainDesktop/Services/DesktopComponentRegistryFactory.cs
@@ -0,0 +1,174 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+using LanMountainDesktop.ComponentSystem;
+using LanMountainDesktop.ComponentSystem.Extensions;
+using LanMountainDesktop.PluginSdk;
+using LanMountainDesktop.Views.Components;
+
+namespace LanMountainDesktop.Services;
+
+public static class DesktopComponentRegistryFactory
+{
+    public static ComponentRegistry Create(PluginRuntimeService? pluginRuntimeService)
+    {
+        var registry = ComponentRegistry
+            .CreateDefault()
+            .RegisterExtensions(
+                JsonComponentExtensionProvider.LoadProvidersFromDirectory(
+                    Path.Combine(AppContext.BaseDirectory, "Extensions", "Components")));
+
+        var pluginDefinitions = GetPluginDefinitions(registry, pluginRuntimeService);
+        return pluginDefinitions.Count == 0
+            ? registry
+            : registry.RegisterComponents(pluginDefinitions);
+    }
+
+    public static DesktopComponentRuntimeRegistry CreateRuntimeRegistry(
+        ComponentRegistry componentRegistry,
+        PluginRuntimeService? pluginRuntimeService)
+    {
+        var registrations = DesktopComponentRuntimeRegistry.GetDefaultRegistrations().ToList();
+        var registeredIds = new HashSet<string>(
+            registrations.Select(registration => registration.ComponentId),
+            StringComparer.OrdinalIgnoreCase);
+
+        if (pluginRuntimeService is not null)
+        {
+            foreach (var contribution in pluginRuntimeService.DesktopComponents)
+            {
+                var registration = contribution.Registration;
+                if (!componentRegistry.TryGetDefinition(registration.ComponentId, out _))
+                {
+                    continue;
+                }
+
+                if (!registeredIds.Add(registration.ComponentId))
+                {
+                    Debug.WriteLine(
+                        $"[PluginRuntime] Skipped plugin widget '{registration.ComponentId}' from '{contribution.Plugin.Manifest.Id}' because a runtime registration already exists.");
+                    continue;
+                }
+
+                registrations.Add(new DesktopComponentRuntimeRegistration(
+                    registration.ComponentId,
+                    registration.DisplayNameLocalizationKey,
+                    factoryContext => CreatePluginControl(contribution, factoryContext),
+                    registration.CornerRadiusResolver));
+            }
+        }
+
+        return new DesktopComponentRuntimeRegistry(componentRegistry, registrations);
+    }
+
+    private static List<DesktopComponentDefinition> GetPluginDefinitions(
+        ComponentRegistry baseRegistry,
+        PluginRuntimeService? pluginRuntimeService)
+    {
+        var definitions = new List<DesktopComponentDefinition>();
+        if (pluginRuntimeService is null)
+        {
+            return definitions;
+        }
+
+        var knownIds = new HashSet<string>(
+            baseRegistry.GetAll().Select(definition => definition.Id),
+            StringComparer.OrdinalIgnoreCase);
+
+        foreach (var contribution in pluginRuntimeService.DesktopComponents)
+        {
+            var registration = contribution.Registration;
+            if (!knownIds.Add(registration.ComponentId))
+            {
+                Debug.WriteLine(
+                    $"[PluginRuntime] Skipped plugin widget '{registration.ComponentId}' from '{contribution.Plugin.Manifest.Id}' because the component id already exists.");
+                continue;
+            }
+
+            definitions.Add(new DesktopComponentDefinition(
+                registration.ComponentId,
+                registration.DisplayName,
+                registration.IconKey,
+                registration.Category,
+                registration.MinWidthCells,
+                registration.MinHeightCells,
+                registration.AllowStatusBarPlacement,
+                registration.AllowDesktopPlacement,
+                registration.ResizeMode == PluginDesktopComponentResizeMode.Free
+                    ? DesktopComponentResizeMode.Free
+                    : DesktopComponentResizeMode.Proportional));
+        }
+
+        return definitions;
+    }
+
+    private static Control CreatePluginControl(
+        PluginDesktopComponentContribution contribution,
+        DesktopComponentControlFactoryContext context)
+    {
+        try
+        {
+            var pluginContext = new PluginDesktopComponentContext(
+                contribution.Plugin.Manifest,
+                contribution.Plugin.Context.PluginDirectory,
+                contribution.Plugin.Context.DataDirectory,
+                contribution.Plugin.Context.Services,
+                contribution.Plugin.Context.Properties,
+                contribution.Registration.ComponentId,
+                context.PlacementId,
+                context.CellSize);
+
+            return contribution.Registration.ControlFactory(pluginContext);
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine(
+                $"[PluginRuntime] Failed to create widget '{contribution.Registration.ComponentId}' from '{contribution.Plugin.Manifest.Id}': {ex}");
+            return CreatePluginErrorControl(contribution, ex);
+        }
+    }
+
+    private static Control CreatePluginErrorControl(
+        PluginDesktopComponentContribution contribution,
+        Exception exception)
+    {
+        return new Border
+        {
+            Background = new SolidColorBrush(Color.Parse("#332B0F16")),
+            BorderBrush = new SolidColorBrush(Color.Parse("#66F97316")),
+            BorderThickness = new Thickness(1),
+            CornerRadius = new CornerRadius(16),
+            Padding = new Thickness(12),
+            Child = new StackPanel
+            {
+                Spacing = 6,
+                Children =
+                {
+                    new TextBlock
+                    {
+                        Text = contribution.Registration.DisplayName,
+                        FontSize = 14,
+                        FontWeight = FontWeight.SemiBold,
+                        TextWrapping = TextWrapping.Wrap
+                    },
+                    new TextBlock
+                    {
+                        Text = $"Plugin {contribution.Plugin.Manifest.Name} failed to create this widget.",
+                        TextWrapping = TextWrapping.Wrap
+                    },
+                    new TextBlock
+                    {
+                        Text = exception.Message,
+                        TextWrapping = TextWrapping.Wrap
+                    }
+                }
+            }
+        };
+    }
+}
--- a/LanMountainDesktop/Services/PluginCatalogEntry.cs
+++ b/LanMountainDesktop/Services/PluginCatalogEntry.cs
@@ -0,0 +1,19 @@
+using LanMountainDesktop.PluginSdk;
+
+namespace LanMountainDesktop.Services;
+
+public enum PluginCatalogSourceKind
+{
+    Package = 0,
+    Manifest = 1
+}
+
+public sealed record PluginCatalogEntry(
+    PluginManifest Manifest,
+    string SourcePath,
+    bool IsPackage,
+    bool IsEnabled,
+    bool IsLoaded,
+    string? ErrorMessage,
+    int SettingsPageCount,
+    int WidgetCount);
--- a/LanMountainDesktop/Services/PluginContributions.cs
+++ b/LanMountainDesktop/Services/PluginContributions.cs
@@ -0,0 +1,11 @@
+using LanMountainDesktop.PluginSdk;
+
+namespace LanMountainDesktop.Services;
+
+public sealed record PluginSettingsPageContribution(
+    LoadedPlugin Plugin,
+    PluginSettingsPageRegistration Registration);
+
+public sealed record PluginDesktopComponentContribution(
+    LoadedPlugin Plugin,
+    PluginDesktopComponentRegistration Registration);
--- a/LanMountainDesktop/Services/PluginRuntimeService.cs
+++ b/LanMountainDesktop/Services/PluginRuntimeService.cs
@@ -0,0 +1,315 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Reflection;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using LanMountainDesktop.Models;
+using LanMountainDesktop.PluginSdk;
+
+namespace LanMountainDesktop.Services;
+
+public sealed class PluginRuntimeService : IDisposable
+{
+    private readonly PluginLoader _loader;
+    private readonly AppSettingsService _appSettingsService = new();
+    private readonly List<LoadedPlugin> _loadedPlugins = [];
+    private readonly List<PluginLoadResult> _loadResults = [];
+    private readonly List<PluginCatalogEntry> _catalog = [];
+    private readonly List<PluginSettingsPageContribution> _settingsPages = [];
+    private readonly List<PluginDesktopComponentContribution> _desktopComponents = [];
+
+    public PluginRuntimeService()
+    {
+        PluginsDirectory = Path.Combine(AppContext.BaseDirectory, "Extensions", "Plugins");
+        _loader = new PluginLoader(CreateOptions());
+    }
+
+    public string PluginsDirectory { get; }
+
+    public IReadOnlyList<LoadedPlugin> LoadedPlugins => _loadedPlugins;
+
+    public IReadOnlyList<PluginLoadResult> LoadResults => _loadResults;
+
+    public IReadOnlyList<PluginCatalogEntry> Catalog => _catalog;
+
+    public IReadOnlyList<PluginSettingsPageContribution> SettingsPages => _settingsPages;
+
+    public IReadOnlyList<PluginDesktopComponentContribution> DesktopComponents => _desktopComponents;
+
+    public void LoadInstalledPlugins()
+    {
+        Directory.CreateDirectory(PluginsDirectory);
+        UnloadInstalledPlugins();
+
+        var disabledPluginIds = GetDisabledPluginIds();
+        var hostProperties = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase)
+        {
+            ["HostApplicationName"] = "LanMountainDesktop",
+            ["HostVersion"] = typeof(App).Assembly.GetName().Version?.ToString(),
+            ["PluginSdkApiVersion"] = PluginSdkInfo.ApiVersion
+        };
+
+        var discoveryFailures = new List<PluginLoadResult>();
+        var candidates = DiscoverCandidates(discoveryFailures);
+        _loadResults.AddRange(discoveryFailures);
+
+        var selectedPluginIds = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        foreach (var candidate in candidates)
+        {
+            if (!selectedPluginIds.Add(candidate.Manifest.Id))
+            {
+                var duplicateFailure = PluginLoadResult.Failure(
+                    candidate.SourcePath,
+                    candidate.Manifest,
+                    new InvalidOperationException(
+                        $"Duplicate plugin id '{candidate.Manifest.Id}' was found. Source '{candidate.SourcePath}' was ignored because a higher-priority source was already selected."));
+                _loadResults.Add(duplicateFailure);
+                continue;
+            }
+
+            var isEnabled = !disabledPluginIds.Contains(candidate.Manifest.Id);
+            if (!isEnabled)
+            {
+                _catalog.Add(new PluginCatalogEntry(
+                    candidate.Manifest,
+                    candidate.SourcePath,
+                    candidate.SourceKind == PluginCatalogSourceKind.Package,
+                    false,
+                    false,
+                    null,
+                    0,
+                    0));
+                continue;
+            }
+
+            var loadResult = candidate.SourceKind switch
+            {
+                PluginCatalogSourceKind.Package => _loader.LoadFromPackage(
+                    candidate.SourcePath,
+                    PluginsDirectory,
+                    services: null,
+                    hostProperties),
+                _ => _loader.LoadFromManifest(
+                    candidate.SourcePath,
+                    services: null,
+                    hostProperties)
+            };
+
+            _loadResults.Add(loadResult);
+
+            if (loadResult.IsSuccess && loadResult.LoadedPlugin is not null)
+            {
+                _loadedPlugins.Add(loadResult.LoadedPlugin);
+                CollectContributions(loadResult.LoadedPlugin);
+                _catalog.Add(new PluginCatalogEntry(
+                    loadResult.LoadedPlugin.Manifest,
+                    loadResult.SourcePath,
+                    candidate.SourceKind == PluginCatalogSourceKind.Package,
+                    true,
+                    true,
+                    null,
+                    loadResult.LoadedPlugin.SettingsPages.Count,
+                    loadResult.LoadedPlugin.DesktopComponents.Count));
+                Debug.WriteLine($"[PluginRuntime] Loaded '{loadResult.Manifest?.Id}' from '{loadResult.SourcePath}'.");
+                continue;
+            }
+
+            _catalog.Add(new PluginCatalogEntry(
+                candidate.Manifest,
+                candidate.SourcePath,
+                candidate.SourceKind == PluginCatalogSourceKind.Package,
+                true,
+                false,
+                loadResult.Error?.Message,
+                0,
+                0));
+            Debug.WriteLine($"[PluginRuntime] Failed to load plugin from '{loadResult.SourcePath}': {loadResult.Error}");
+        }
+
+        if (_catalog.Count == 0 && discoveryFailures.Count == 0)
+        {
+            Debug.WriteLine($"[PluginRuntime] No .laapp packages or loose plugin manifests found under '{PluginsDirectory}'.");
+        }
+    }
+
+    public bool SetPluginEnabled(string pluginId, bool isEnabled)
+    {
+        if (string.IsNullOrWhiteSpace(pluginId))
+        {
+            return false;
+        }
+
+        var snapshot = _appSettingsService.Load();
+        var disabledPluginIds = snapshot.DisabledPluginIds is { Count: > 0 }
+            ? new HashSet<string>(snapshot.DisabledPluginIds, StringComparer.OrdinalIgnoreCase)
+            : new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+        var changed = isEnabled
+            ? disabledPluginIds.Remove(pluginId)
+            : disabledPluginIds.Add(pluginId);
+
+        if (!changed)
+        {
+            return false;
+        }
+
+        snapshot.DisabledPluginIds = disabledPluginIds
+            .OrderBy(id => id, StringComparer.OrdinalIgnoreCase)
+            .ToList();
+        _appSettingsService.Save(snapshot);
+
+        for (var i = 0; i < _catalog.Count; i++)
+        {
+            if (string.Equals(_catalog[i].Manifest.Id, pluginId, StringComparison.OrdinalIgnoreCase))
+            {
+                _catalog[i] = _catalog[i] with { IsEnabled = isEnabled };
+            }
+        }
+
+        return true;
+    }
+
+    public void Dispose()
+    {
+        UnloadInstalledPlugins();
+    }
+
+    private void UnloadInstalledPlugins()
+    {
+        for (var i = _loadedPlugins.Count - 1; i >= 0; i--)
+        {
+            _loadedPlugins[i].Dispose();
+        }
+
+        _loadedPlugins.Clear();
+        _loadResults.Clear();
+        _catalog.Clear();
+        _settingsPages.Clear();
+        _desktopComponents.Clear();
+    }
+
+    private HashSet<string> GetDisabledPluginIds()
+    {
+        var snapshot = _appSettingsService.Load();
+        return snapshot.DisabledPluginIds is { Count: > 0 }
+            ? new HashSet<string>(snapshot.DisabledPluginIds, StringComparer.OrdinalIgnoreCase)
+            : new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+    }
+
+    private IReadOnlyList<PluginCandidate> DiscoverCandidates(List<PluginLoadResult> failures)
+    {
+        var candidates = new List<PluginCandidate>();
+
+        foreach (var packagePath in EnumerateCandidatePaths($"*{PluginSdkInfo.PackageFileExtension}"))
+        {
+            try
+            {
+                var manifest = ReadManifestFromPackage(packagePath);
+                candidates.Add(new PluginCandidate(packagePath, manifest, PluginCatalogSourceKind.Package));
+            }
+            catch (Exception ex)
+            {
+                failures.Add(PluginLoadResult.Failure(packagePath, null, ex));
+            }
+        }
+
+        foreach (var manifestPath in EnumerateCandidatePaths("plugin.json"))
+        {
+            try
+            {
+                var manifest = PluginManifest.Load(manifestPath);
+                candidates.Add(new PluginCandidate(manifestPath, manifest, PluginCatalogSourceKind.Manifest));
+            }
+            catch (Exception ex)
+            {
+                failures.Add(PluginLoadResult.Failure(manifestPath, null, ex));
+            }
+        }
+
+        return candidates
+            .OrderBy(candidate => candidate.SourceKind)
+            .ThenBy(candidate => candidate.SourcePath, StringComparer.OrdinalIgnoreCase)
+            .ToArray();
+    }
+
+    private IEnumerable<string> EnumerateCandidatePaths(string searchPattern)
+    {
+        var runtimeRootDirectory = EnsureTrailingSeparator(Path.Combine(Path.GetFullPath(PluginsDirectory), ".runtime"));
+
+        return Directory
+            .EnumerateFiles(PluginsDirectory, searchPattern, SearchOption.AllDirectories)
+            .Select(Path.GetFullPath)
+            .Where(path => !path.StartsWith(runtimeRootDirectory, StringComparison.OrdinalIgnoreCase))
+            .OrderBy(path => path, StringComparer.OrdinalIgnoreCase);
+    }
+
+    private static PluginManifest ReadManifestFromPackage(string packagePath)
+    {
+        using var archive = ZipFile.OpenRead(packagePath);
+        var entries = archive.Entries
+            .Where(entry => string.Equals(entry.Name, "plugin.json", StringComparison.OrdinalIgnoreCase))
+            .ToArray();
+
+        if (entries.Length == 0)
+        {
+            throw new InvalidOperationException($"Plugin package '{packagePath}' does not contain 'plugin.json'.");
+        }
+
+        if (entries.Length > 1)
+        {
+            throw new InvalidOperationException($"Plugin package '{packagePath}' contains multiple 'plugin.json' files.");
+        }
+
+        using var stream = entries[0].Open();
+        return PluginManifest.Load(stream, $"{packagePath}!/{entries[0].FullName}");
+    }
+
+    private static string EnsureTrailingSeparator(string path)
+    {
+        return path.EndsWith(Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal)
+            ? path
+            : path + Path.DirectorySeparatorChar;
+    }
+
+    private static PluginLoaderOptions CreateOptions()
+    {
+        var options = new PluginLoaderOptions();
+        AddSharedAssembly(options, typeof(App).Assembly);
+        AddSharedAssembly(options, typeof(Application).Assembly);
+        AddSharedAssembly(options, typeof(Control).Assembly);
+        AddSharedAssembly(options, typeof(AvaloniaXamlLoader).Assembly);
+        return options;
+    }
+
+    private static void AddSharedAssembly(PluginLoaderOptions options, Assembly assembly)
+    {
+        var assemblyName = assembly.GetName().Name;
+        if (!string.IsNullOrWhiteSpace(assemblyName))
+        {
+            options.SharedAssemblyNames.Add(assemblyName);
+        }
+    }
+
+    private void CollectContributions(LoadedPlugin loadedPlugin)
+    {
+        foreach (var settingsPage in loadedPlugin.SettingsPages)
+        {
+            _settingsPages.Add(new PluginSettingsPageContribution(loadedPlugin, settingsPage));
+        }
+
+        foreach (var desktopComponent in loadedPlugin.DesktopComponents)
+        {
+            _desktopComponents.Add(new PluginDesktopComponentContribution(loadedPlugin, desktopComponent));
+        }
+    }
+
+    private sealed record PluginCandidate(
+        string SourcePath,
+        PluginManifest Manifest,
+        PluginCatalogSourceKind SourceKind);
+}
--- a/LanMountainDesktop/Views/Components/DesktopComponentRuntimeRegistry.cs
+++ b/LanMountainDesktop/Views/Components/DesktopComponentRuntimeRegistry.cs
@@ -7,24 +7,65 @@ using LanMountainDesktop.Services;

 namespace LanMountainDesktop.Views.Components;

-public sealed record DesktopComponentRuntimeRegistration(
-    string ComponentId,
-    string DisplayNameLocalizationKey,
-    Func<Control> ControlFactory,
-    Func<double, double>? CornerRadiusResolver = null);
+public sealed record DesktopComponentControlFactoryContext(
+    DesktopComponentDefinition Definition,
+    double CellSize,
+    TimeZoneService TimeZoneService,
+    IWeatherInfoService WeatherInfoService,
+    IRecommendationInfoService RecommendationInfoService,
+    ICalculatorDataService CalculatorDataService,
+    IComponentInstanceSettingsStore ComponentSettingsStore,
+    string? PlacementId = null);
+
+public sealed class DesktopComponentRuntimeRegistration
+{
+    public DesktopComponentRuntimeRegistration(
+        string componentId,
+        string? displayNameLocalizationKey,
+        Func<Control> controlFactory,
+        Func<double, double>? cornerRadiusResolver = null)
+        : this(componentId, displayNameLocalizationKey, _ => controlFactory(), cornerRadiusResolver)
+    {
+    }
+
+    public DesktopComponentRuntimeRegistration(
+        string componentId,
+        string? displayNameLocalizationKey,
+        Func<DesktopComponentControlFactoryContext, Control> controlFactory,
+        Func<double, double>? cornerRadiusResolver = null)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(componentId);
+        ArgumentNullException.ThrowIfNull(controlFactory);
+
+        ComponentId = componentId.Trim();
+        DisplayNameLocalizationKey = string.IsNullOrWhiteSpace(displayNameLocalizationKey)
+            ? null
+            : displayNameLocalizationKey.Trim();
+        ControlFactory = controlFactory;
+        CornerRadiusResolver = cornerRadiusResolver;
+    }
+
+    public string ComponentId { get; }
+
+    public string? DisplayNameLocalizationKey { get; }
+
+    public Func<DesktopComponentControlFactoryContext, Control> ControlFactory { get; }
+
+    public Func<double, double>? CornerRadiusResolver { get; }
+}

 public sealed class DesktopComponentRuntimeDescriptor
 {
    private static readonly Func<double, double> DefaultCornerRadiusResolver =
        cellSize => Math.Clamp(cellSize * 0.22, 8, 18);

-    private readonly Func<Control> _controlFactory;
+    private readonly Func<DesktopComponentControlFactoryContext, Control> _controlFactory;
    private readonly Func<double, double> _cornerRadiusResolver;

    internal DesktopComponentRuntimeDescriptor(
        DesktopComponentDefinition definition,
-        string displayNameLocalizationKey,
-        Func<Control> controlFactory,
+        string? displayNameLocalizationKey,
+        Func<DesktopComponentControlFactoryContext, Control> controlFactory,
        Func<double, double>? cornerRadiusResolver)
    {
        Definition = definition;
@@ -35,7 +76,7 @@ public sealed class DesktopComponentRuntimeDescriptor

    public DesktopComponentDefinition Definition { get; }

-    public string DisplayNameLocalizationKey { get; }
+    public string? DisplayNameLocalizationKey { get; }

    public Control CreateControl(
        double cellSize,
@@ -46,7 +87,15 @@ public sealed class DesktopComponentRuntimeDescriptor
        IComponentInstanceSettingsStore componentSettingsStore,
        string? placementId = null)
    {
-        var control = _controlFactory();
+        var control = _controlFactory(new DesktopComponentControlFactoryContext(
+            Definition,
+            cellSize,
+            timeZoneService,
+            weatherInfoService,
+            recommendationInfoService,
+            calculatorDataService,
+            componentSettingsStore,
+            placementId));
        var runtimeContext = new DesktopComponentRuntimeContext(
            Definition.Id,
            placementId,
@@ -133,12 +182,10 @@ public sealed class DesktopComponentRuntimeRegistry
                StringComparer.OrdinalIgnoreCase);
    }

-    public static DesktopComponentRuntimeRegistry CreateDefault(ComponentRegistry componentRegistry)
+    public static IReadOnlyList<DesktopComponentRuntimeRegistration> GetDefaultRegistrations()
    {
-        return new DesktopComponentRuntimeRegistry(
-            componentRegistry,
-            new[]
-            {
+        return
+        [
                new DesktopComponentRuntimeRegistration(
                    BuiltInComponentIds.Date,
                    "component.date",
@@ -319,7 +366,12 @@ public sealed class DesktopComponentRuntimeRegistry
                    "component.holiday_calendar",
                    () => new HolidayCalendarWidget(),
                    cellSize => Math.Clamp(cellSize * 0.32, 12, 28))
-            });
+        ];
+    }
+
+    public static DesktopComponentRuntimeRegistry CreateDefault(ComponentRegistry componentRegistry)
+    {
+        return new DesktopComponentRuntimeRegistry(componentRegistry, GetDefaultRegistrations());
    }

    public bool TryGetDescriptor(string componentId, out DesktopComponentRuntimeDescriptor descriptor)
--- a/LanMountainDesktop/Views/MainWindow.ComponentSystem.cs
+++ b/LanMountainDesktop/Views/MainWindow.ComponentSystem.cs
@@ -3216,7 +3216,9 @@ public partial class MainWindow

    private string GetLocalizedComponentDisplayName(DesktopComponentRuntimeDescriptor descriptor)
    {
-        return L(descriptor.DisplayNameLocalizationKey, descriptor.Definition.DisplayName);
+        return string.IsNullOrWhiteSpace(descriptor.DisplayNameLocalizationKey)
+            ? descriptor.Definition.DisplayName
+            : L(descriptor.DisplayNameLocalizationKey, descriptor.Definition.DisplayName);
    }

    private void OnComponentLibraryComponentPreviewPointerPressed(object? sender, PointerPressedEventArgs e)
--- a/LanMountainDesktop/Views/MainWindow.Localization.cs
+++ b/LanMountainDesktop/Views/MainWindow.Localization.cs
@@ -280,13 +280,22 @@ public partial class MainWindow
        PluginSystemSettingsExpander.Header = L("settings.plugins.runtime_header", "Plugin Runtime");
        PluginSystemSettingsExpander.Description = L(
            "settings.plugins.runtime_desc",
-            "Manage plugin loading and backend isolation.");
+            "Review plugin runtime state and load results.");
        PluginSystemDescriptionTextBlock.Text = L(
            "settings.plugins.runtime_hint",
-            "This page will host installed plugin management, permission review, and sandboxed backend runtime controls.");
+            "This page shows discovery status, load results, and runtime diagnostics for installed plugins.");
        PluginSystemStatusTextBlock.Text = L(
            "settings.plugins.runtime_status",
-            "Plugin management UI is not connected yet. Next step is wiring the loader, permissions, and worker isolation state into this panel.");
+            "Plugin runtime status will appear here after plugin discovery completes.");
+        InstalledPluginsSettingsExpander.Header = L("settings.plugins.installed_header", "Installed Plugins");
+        InstalledPluginsSettingsExpander.Description = L(
+            "settings.plugins.installed_desc",
+            "Enable or disable plugins here. Detailed plugin settings appear as separate settings pages.");
+        PluginRestartHintTextBlock.Text = L(
+            "settings.plugins.restart_hint",
+            "Plugin enable state changes take effect after restarting the app.");
+        PluginCatalogEmptyTextBlock.Text = L("settings.plugins.empty", "No plugins found.");
+        PluginSettingsPanel.RefreshFromRuntime();

        SettingsNavAboutItem.Content = L("settings.nav.about", "About");
        AboutPanelTitleTextBlock.Text = L("settings.about.title", "About");
@@ -428,3 +437,4 @@ public partial class MainWindow
                : _weatherLocationKey);
    }
 }
+
--- a/LanMountainDesktop/Views/MainWindow.PluginSettings.cs
+++ b/LanMountainDesktop/Views/MainWindow.PluginSettings.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+using FluentAvalonia.UI.Controls;
+using FluentIcons.Avalonia.Fluent;
+using FluentIcons.Common;
+using LanMountainDesktop.Models;
+using LanMountainDesktop.Services;
+
+namespace LanMountainDesktop.Views;
+
+public partial class MainWindow
+{
+    private readonly Dictionary<string, Control> _pluginSettingsPageHosts = new(StringComparer.OrdinalIgnoreCase);
+
+    private void InitializePluginSettingsNavigation()
+    {
+        if (_pluginSettingsPageHosts.Count > 0 || SettingsNavView?.MenuItems is null)
+        {
+            return;
+        }
+
+        var runtime = (Application.Current as App)?.PluginRuntimeService;
+        var contributions = runtime?.SettingsPages
+            .OrderBy(contribution => contribution.Registration.SortOrder)
+            .ThenBy(contribution => contribution.Plugin.Manifest.Name, StringComparer.OrdinalIgnoreCase)
+            .ThenBy(contribution => contribution.Registration.Title, StringComparer.OrdinalIgnoreCase)
+            .ToArray();
+
+        if (contributions is not { Length: > 0 })
+        {
+            return;
+        }
+
+        var pageCountsByPluginId = contributions
+            .GroupBy(contribution => contribution.Plugin.Manifest.Id, StringComparer.OrdinalIgnoreCase)
+            .ToDictionary(group => group.Key, group => group.Count(), StringComparer.OrdinalIgnoreCase);
+
+        var insertIndex = SettingsNavView.MenuItems.IndexOf(SettingsNavPluginsItem) + 1;
+        foreach (var contribution in contributions)
+        {
+            var tag = BuildPluginSettingsTag(contribution);
+            var navigationTitle = BuildPluginSettingsNavigationTitle(contribution, pageCountsByPluginId);
+            var navItem = new NavigationViewItem
+            {
+                Content = navigationTitle,
+                Tag = tag,
+                IconSource = new FluentIcons.Avalonia.Fluent.SymbolIconSource
+                {
+                    Symbol = FluentIcons.Common.Symbol.PuzzlePiece,
+                    IconVariant = FluentIcons.Common.IconVariant.Regular
+                }
+            };
+
+            ToolTip.SetTip(navItem, $"{contribution.Plugin.Manifest.Name} - {contribution.Registration.Title}");
+
+            SettingsNavView.MenuItems.Insert(insertIndex++, navItem);
+
+            var pageHost = CreatePluginSettingsPageHost(contribution);
+            pageHost.IsVisible = false;
+            SettingsContentPagesHost.Children.Add(pageHost);
+            _pluginSettingsPageHosts[tag] = pageHost;
+        }
+    }
+
+    private static string BuildPluginSettingsTag(PluginSettingsPageContribution contribution)
+    {
+        return $"PluginPage:{contribution.Plugin.Manifest.Id}:{contribution.Registration.Id}";
+    }
+
+    private static string BuildPluginSettingsNavigationTitle(
+        PluginSettingsPageContribution contribution,
+        IReadOnlyDictionary<string, int> pageCountsByPluginId)
+    {
+        return pageCountsByPluginId.TryGetValue(contribution.Plugin.Manifest.Id, out var pageCount) && pageCount > 1
+            ? $"{contribution.Plugin.Manifest.Name} - {contribution.Registration.Title}"
+            : contribution.Plugin.Manifest.Name;
+    }
+
+    private Control CreatePluginSettingsPageHost(PluginSettingsPageContribution contribution)
+    {
+        Control content;
+        try
+        {
+            content = contribution.Registration.ContentFactory();
+        }
+        catch (Exception ex)
+        {
+            content = CreatePluginPageErrorContent(ex);
+        }
+
+        return new StackPanel
+        {
+            Spacing = 16,
+            Children =
+            {
+                new TextBlock
+                {
+                    Text = contribution.Registration.Title,
+                    FontSize = 24,
+                    FontWeight = FontWeight.SemiBold,
+                    Foreground = GetThemeBrush("AdaptiveTextPrimaryBrush")
+                },
+                new TextBlock
+                {
+                    Text = contribution.Plugin.Manifest.Name,
+                    Foreground = GetThemeBrush("AdaptiveTextSecondaryBrush")
+                },
+                content
+            }
+        };
+    }
+
+    private Control CreatePluginPageErrorContent(Exception exception)
+    {
+        return new Border
+        {
+            Background = new SolidColorBrush(Color.Parse("#332B0F16")),
+            BorderBrush = new SolidColorBrush(Color.Parse("#66F97316")),
+            BorderThickness = new Thickness(1),
+            CornerRadius = new CornerRadius(16),
+            Padding = new Thickness(16),
+            Child = new TextBlock
+            {
+                Text = exception.Message,
+                TextWrapping = TextWrapping.Wrap
+            }
+        };
+    }
+
+    private void UpdatePluginSettingsPageVisibility(string? selectedTag)
+    {
+        foreach (var pair in _pluginSettingsPageHosts)
+        {
+            pair.Value.IsVisible = string.Equals(pair.Key, selectedTag, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+
+    private string? GetSelectedSettingsTabTag()
+    {
+        return (SettingsNavView?.SelectedItem as NavigationViewItem)?.Tag?.ToString();
+    }
+
+    private int ResolveSelectedSettingsTabIndex()
+    {
+        if (SettingsNavView?.SelectedItem is null || SettingsNavView.MenuItems is null)
+        {
+            return 0;
+        }
+
+        for (var i = 0; i < SettingsNavView.MenuItems.Count; i++)
+        {
+            if (ReferenceEquals(SettingsNavView.MenuItems[i], SettingsNavView.SelectedItem))
+            {
+                return i;
+            }
+        }
+
+        return 0;
+    }
+
+    private void RestoreSettingsTabSelection(AppSettingsSnapshot snapshot)
+    {
+        if (SettingsNavView?.MenuItems is null || SettingsNavView.MenuItems.Count == 0)
+        {
+            return;
+        }
+
+        if (!string.IsNullOrWhiteSpace(snapshot.SettingsTabTag))
+        {
+            var taggedItem = SettingsNavView.MenuItems
+                .OfType<NavigationViewItem>()
+                .FirstOrDefault(item => string.Equals(item.Tag?.ToString(), snapshot.SettingsTabTag, StringComparison.OrdinalIgnoreCase));
+            if (taggedItem is not null)
+            {
+                SettingsNavView.SelectedItem = taggedItem;
+                return;
+            }
+        }
+
+        var safeIndex = Math.Clamp(snapshot.SettingsTabIndex, 0, Math.Max(0, SettingsNavView.MenuItems.Count - 1));
+        if (SettingsNavView.MenuItems[safeIndex] is NavigationViewItem navItem)
+        {
+            SettingsNavView.SelectedItem = navItem;
+        }
+    }
+}
+
+
+
--- a/LanMountainDesktop/Views/MainWindow.Settings.cs
+++ b/LanMountainDesktop/Views/MainWindow.Settings.cs
@@ -100,24 +100,7 @@ public partial class MainWindow

    private int GetSettingsTabIndex()
    {
-        if (SettingsNavView?.SelectedItem is FluentAvalonia.UI.Controls.NavigationViewItem item)
-        {
-            return item.Tag?.ToString() switch
-            {
-                "Wallpaper" => 0,
-                "Grid" => 1,
-                "Color" => 2,
-                "StatusBar" => 3,
-                "Weather" => 4,
-                "Region" => 5,
-                "Update" => 6,
-                "About" => 7,
-                "Launcher" => 8,
-                "Plugins" => 9,
-                _ => 0
-            };
-        }
-        return 0;
+        return ResolveSelectedSettingsTabIndex();
    }

    private void UpdateSettingsTabContent()
@@ -150,6 +133,7 @@ public partial class MainWindow
        AboutSettingsPanel.IsVisible = tag == "About";
        LauncherSettingsPanel.IsVisible = tag == "Launcher";
        PluginSettingsPanel.IsVisible = tag == "Plugins";
+        UpdatePluginSettingsPageVisibility(tag);

        if (tag == "Launcher")
        {
@@ -984,10 +968,7 @@ public partial class MainWindow
            GridSizeNumberBox.Value = _targetShortSideCells;
            GridSizeSlider.Value = _targetShortSideCells;

-            if (SettingsNavView.MenuItems.ElementAtOrDefault(Math.Clamp(snapshot.SettingsTabIndex, 0, 9)) is FluentAvalonia.UI.Controls.NavigationViewItem navItem)
-            {
-                SettingsNavView.SelectedItem = navItem;
-            }
+            RestoreSettingsTabSelection(snapshot);

            UpdateSettingsTabContent();
            WallpaperPlacementComboBox.SelectedIndex = GetPlacementIndexFromSetting(snapshot.WallpaperPlacement);
@@ -1036,42 +1017,41 @@ public partial class MainWindow

    private AppSettingsSnapshot BuildAppSettingsSnapshot()
    {
-        return new AppSettingsSnapshot
-        {
-            GridShortSideCells = _targetShortSideCells,
-            GridSpacingPreset = _gridSpacingPreset,
-            DesktopEdgeInsetPercent = _desktopEdgeInsetPercent,
-            IsNightMode = _isNightMode,
-            ThemeColor = _selectedThemeColor.ToString(),
-            WallpaperPath = _wallpaperPath,
-            WallpaperPlacement = GetPlacementDisplayName(GetSelectedWallpaperPlacement()),
-            SettingsTabIndex = Math.Max(0, GetSettingsTabIndex()),
-            LanguageCode = _languageCode,
-            TimeZoneId = _timeZoneService.CurrentTimeZone.Id,
-            WeatherLocationMode = ToWeatherLocationModeTag(_weatherLocationMode),
-            WeatherLocationKey = _weatherLocationKey,
-            WeatherLocationName = _weatherLocationName,
-            WeatherLatitude = _weatherLatitude,
-            WeatherLongitude = _weatherLongitude,
-            WeatherAutoRefreshLocation = _weatherAutoRefreshLocation,
-            WeatherLocationQuery = BuildLegacyWeatherLocationQuery(),
-            WeatherExcludedAlerts = _weatherExcludedAlertsRaw,
-            WeatherIconPackId = _weatherIconPackId,
-            WeatherNoTlsRequests = _weatherNoTlsRequests,
-            AutoStartWithWindows = _autoStartWithWindows,
-            AutoCheckUpdates = _autoCheckUpdates,
-            IncludePrereleaseUpdates = IncludePrereleaseUpdates,
-            UpdateChannel = IncludePrereleaseUpdates ? "Preview" : "Stable",
-            TopStatusComponentIds = _topStatusComponentIds.ToList(),
-            PinnedTaskbarActions = _pinnedTaskbarActions.Select(action => action.ToString()).ToList(),
-            EnableDynamicTaskbarActions = _enableDynamicTaskbarActions,
-            TaskbarLayoutMode = _taskbarLayoutMode,
-            ClockDisplayFormat = _clockDisplayFormat == ClockDisplayFormat.HourMinute ? "HourMinute" : "HourMinuteSecond",
-            StatusBarSpacingMode = _statusBarSpacingMode,
-            StatusBarCustomSpacingPercent = _statusBarCustomSpacingPercent
-        };
+        var snapshot = _appSettingsService.Load();
+        snapshot.GridShortSideCells = _targetShortSideCells;
+        snapshot.GridSpacingPreset = _gridSpacingPreset;
+        snapshot.DesktopEdgeInsetPercent = _desktopEdgeInsetPercent;
+        snapshot.IsNightMode = _isNightMode;
+        snapshot.ThemeColor = _selectedThemeColor.ToString();
+        snapshot.WallpaperPath = _wallpaperPath;
+        snapshot.WallpaperPlacement = GetPlacementDisplayName(GetSelectedWallpaperPlacement());
+        snapshot.SettingsTabIndex = Math.Max(0, GetSettingsTabIndex());
+        snapshot.SettingsTabTag = GetSelectedSettingsTabTag();
+        snapshot.LanguageCode = _languageCode;
+        snapshot.TimeZoneId = _timeZoneService.CurrentTimeZone.Id;
+        snapshot.WeatherLocationMode = ToWeatherLocationModeTag(_weatherLocationMode);
+        snapshot.WeatherLocationKey = _weatherLocationKey;
+        snapshot.WeatherLocationName = _weatherLocationName;
+        snapshot.WeatherLatitude = _weatherLatitude;
+        snapshot.WeatherLongitude = _weatherLongitude;
+        snapshot.WeatherAutoRefreshLocation = _weatherAutoRefreshLocation;
+        snapshot.WeatherLocationQuery = BuildLegacyWeatherLocationQuery();
+        snapshot.WeatherExcludedAlerts = _weatherExcludedAlertsRaw;
+        snapshot.WeatherIconPackId = _weatherIconPackId;
+        snapshot.WeatherNoTlsRequests = _weatherNoTlsRequests;
+        snapshot.AutoStartWithWindows = _autoStartWithWindows;
+        snapshot.AutoCheckUpdates = _autoCheckUpdates;
+        snapshot.IncludePrereleaseUpdates = IncludePrereleaseUpdates;
+        snapshot.UpdateChannel = IncludePrereleaseUpdates ? UpdateChannelPreview : UpdateChannelStable;
+        snapshot.TopStatusComponentIds = _topStatusComponentIds.ToList();
+        snapshot.PinnedTaskbarActions = _pinnedTaskbarActions.Select(action => action.ToString()).ToList();
+        snapshot.EnableDynamicTaskbarActions = _enableDynamicTaskbarActions;
+        snapshot.TaskbarLayoutMode = _taskbarLayoutMode;
+        snapshot.ClockDisplayFormat = _clockDisplayFormat == ClockDisplayFormat.HourMinute ? "HourMinute" : "HourMinuteSecond";
+        snapshot.StatusBarSpacingMode = _statusBarSpacingMode;
+        snapshot.StatusBarCustomSpacingPercent = _statusBarCustomSpacingPercent;
+        return snapshot;
    }
-
    private DesktopLayoutSettingsSnapshot BuildDesktopLayoutSettingsSnapshot()
    {
        return new DesktopLayoutSettingsSnapshot
@@ -1081,7 +1061,6 @@ public partial class MainWindow
            DesktopComponentPlacements = _desktopComponentPlacements.ToList()
        };
    }
-
    private LauncherSettingsSnapshot BuildLauncherSettingsSnapshot()
    {
        return new LauncherSettingsSnapshot
@@ -2678,4 +2657,10 @@ public partial class MainWindow
    internal FluentAvalonia.UI.Controls.SettingsExpander PluginSystemSettingsExpander => PluginSettingsPanel.FindControl<FluentAvalonia.UI.Controls.SettingsExpander>("PluginSystemSettingsExpander")!;
    internal TextBlock PluginSystemDescriptionTextBlock => PluginSettingsPanel.FindControl<TextBlock>("PluginSystemDescriptionTextBlock")!;
    internal TextBlock PluginSystemStatusTextBlock => PluginSettingsPanel.FindControl<TextBlock>("PluginSystemStatusTextBlock")!;
+    internal FluentAvalonia.UI.Controls.SettingsExpander InstalledPluginsSettingsExpander => PluginSettingsPanel.FindControl<FluentAvalonia.UI.Controls.SettingsExpander>("InstalledPluginsSettingsExpander")!;
+    internal TextBlock PluginRestartHintTextBlock => PluginSettingsPanel.FindControl<TextBlock>("PluginRestartHintTextBlock")!;
+    internal TextBlock PluginCatalogEmptyTextBlock => PluginSettingsPanel.FindControl<TextBlock>("PluginCatalogEmptyTextBlock")!;
 }
+
+
+
--- a/LanMountainDesktop/Views/MainWindow.axaml
+++ b/LanMountainDesktop/Views/MainWindow.axaml
@@ -104,7 +104,7 @@
                                ClipToBounds="True"
                                BorderThickness="0"
                                PointerWheelChanged="OnDesktopPagesPointerWheelChanged">
-                            <Grid>
+                            <Grid x:Name="SettingsContentPagesHost">
                                <Grid x:Name="DesktopPagesHost"
                                      HorizontalAlignment="Left"
                                      VerticalAlignment="Top">
--- a/LanMountainDesktop/Views/MainWindow.axaml.cs
+++ b/LanMountainDesktop/Views/MainWindow.axaml.cs
@@ -19,7 +19,6 @@ using Avalonia.Styling;
 using Avalonia.Threading;
 using FluentAvalonia.Styling;
 using LanMountainDesktop.ComponentSystem;
-using LanMountainDesktop.ComponentSystem.Extensions;
 using LanMountainDesktop.Models;
 using LanMountainDesktop.Services;
 using LanMountainDesktop.Theme;
@@ -98,11 +97,7 @@ public partial class MainWindow : Window
    private readonly IWeatherDataService _weatherDataService = new XiaomiWeatherService();
    private readonly IRecommendationInfoService _recommendationInfoService = new RecommendationDataService();
    private readonly ICalculatorDataService _calculatorDataService = new CalculatorDataService();
-    private readonly ComponentRegistry _componentRegistry = ComponentRegistry
-        .CreateDefault()
-        .RegisterExtensions(
-            JsonComponentExtensionProvider.LoadProvidersFromDirectory(
-                Path.Combine(AppContext.BaseDirectory, "Extensions", "Components")));
+    private readonly ComponentRegistry _componentRegistry;
    private readonly DesktopComponentRuntimeRegistry _componentRuntimeRegistry;
    private readonly FluentAvaloniaTheme? _fluentAvaloniaTheme;
    private readonly HashSet<string> _topStatusComponentIds = new(StringComparer.OrdinalIgnoreCase);
@@ -182,8 +177,14 @@ public partial class MainWindow : Window

    public MainWindow()
    {
+        var pluginRuntimeService = (Application.Current as App)?.PluginRuntimeService;
+        _componentRegistry = DesktopComponentRegistryFactory.Create(pluginRuntimeService);
+
        InitializeComponent();
-        _componentRuntimeRegistry = DesktopComponentRuntimeRegistry.CreateDefault(_componentRegistry);
+        InitializePluginSettingsNavigation();
+        _componentRuntimeRegistry = DesktopComponentRegistryFactory.CreateRuntimeRegistry(
+            _componentRegistry,
+            pluginRuntimeService);
        _fluentAvaloniaTheme = Application.Current?.Styles.OfType<FluentAvaloniaTheme>().FirstOrDefault();
        AppSettingsService.SettingsSaved += OnExternalAppSettingsSaved;
        LauncherSettingsService.SettingsSaved += OnExternalLauncherSettingsSaved;
@@ -300,10 +301,7 @@ public partial class MainWindow : Window
        GridSizeSlider.ValueChanged += OnGridSizeSliderChanged;
        GridSizeNumberBox.ValueChanged += OnGridSizeNumberBoxChanged;

-        if (SettingsNavView.MenuItems.ElementAtOrDefault(Math.Clamp(snapshot.SettingsTabIndex, 0, 9)) is FluentAvalonia.UI.Controls.NavigationViewItem navItem)
-        {
-            SettingsNavView.SelectedItem = navItem;
-        }
+        RestoreSettingsTabSelection(snapshot);
        UpdateSettingsTabContent();

        WallpaperPlacementComboBox.SelectedIndex = GetPlacementIndexFromSetting(snapshot.WallpaperPlacement);
--- a/LanMountainDesktop/Views/SettingsPages/PluginSettingsPage.axaml
+++ b/LanMountainDesktop/Views/SettingsPages/PluginSettingsPage.axaml
@@ -35,6 +35,31 @@
                                       TextWrapping="Wrap"
                                       Text="Plugin management UI is not connected yet. Next step is wiring the loader, permissions, and worker isolation state into this panel." />
                        </Border>
+                        <StackPanel x:Name="PluginRuntimeSummaryPanel" Spacing="6" />
+                    </StackPanel>
+                </ui:SettingsExpander.Footer>
+            </ui:SettingsExpander>
+        </Border>
+
+        <Border Classes="settings-expander-shell">
+            <ui:SettingsExpander x:Name="InstalledPluginsSettingsExpander"
+                                 Header="Installed Plugins"
+                                 Description="Enable plugins here. Detailed settings appear as separate settings pages."
+                                 IsExpanded="True">
+                <ui:SettingsExpander.IconSource>
+                    <ui:FontIconSource Glyph="&#xe8fd;" FontFamily="{StaticResource SymbolThemeFontFamily}" />
+                </ui:SettingsExpander.IconSource>
+                <ui:SettingsExpander.Footer>
+                    <StackPanel Spacing="10">
+                        <TextBlock x:Name="PluginRestartHintTextBlock"
+                                   Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
+                                   TextWrapping="Wrap"
+                                   Text="Plugin enable state changes take effect after restarting the app." />
+                        <TextBlock x:Name="PluginCatalogEmptyTextBlock"
+                                   Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
+                                   Text="No plugins found."
+                                   IsVisible="False" />
+                        <StackPanel x:Name="PluginCatalogItemsHost" Spacing="12" />
                    </StackPanel>
                </ui:SettingsExpander.Footer>
            </ui:SettingsExpander>
--- a/LanMountainDesktop/Views/SettingsPages/PluginSettingsPage.axaml.cs
+++ b/LanMountainDesktop/Views/SettingsPages/PluginSettingsPage.axaml.cs
@@ -1,12 +1,222 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.Layout;
+using Avalonia.Media;
+using FluentAvalonia.UI.Controls;
+using LanMountainDesktop.Services;

 namespace LanMountainDesktop.Views.SettingsPages;

 public partial class PluginSettingsPage : UserControl
 {
+    private readonly AppSettingsService _appSettingsService = new();
+    private readonly LocalizationService _localizationService = new();
+
    public PluginSettingsPage()
    {
        InitializeComponent();
+        AttachedToVisualTree += (_, _) => RefreshFromRuntime();
+    }
+
+    public void RefreshFromRuntime()
+    {
+        var runtime = (Application.Current as App)?.PluginRuntimeService;
+        if (runtime is null)
+        {
+            PluginSystemStatusTextBlock.Text = L("settings.plugins.runtime_unavailable", "Plugin runtime is not available.");
+            PluginRuntimeSummaryPanel.Children.Clear();
+            PluginCatalogItemsHost.Children.Clear();
+            PluginRestartHintTextBlock.IsVisible = false;
+            return;
+        }
+
+        BuildRuntimeSummary(runtime);
+        BuildPluginCatalog(runtime);
+    }
+
+    private void BuildRuntimeSummary(PluginRuntimeService runtime)
+    {
+        var failures = runtime.LoadResults.Where(result => !result.IsSuccess).ToArray();
+        var enabledCount = runtime.Catalog.Count(entry => entry.IsEnabled);
+        PluginSystemStatusTextBlock.Text = F(
+            "settings.plugins.summary_format",
+            "Detected {0} plugin(s); enabled {1}; loaded {2}; settings pages {3}; widgets {4}; failures {5}.",
+            runtime.Catalog.Count,
+            enabledCount,
+            runtime.LoadedPlugins.Count,
+            runtime.SettingsPages.Count,
+            runtime.DesktopComponents.Count,
+            failures.Length);
+
+        PluginRuntimeSummaryPanel.Children.Clear();
+        foreach (var plugin in runtime.Catalog.OrderBy(entry => entry.Manifest.Name, StringComparer.OrdinalIgnoreCase))
+        {
+            var status = plugin.IsEnabled
+                ? plugin.IsLoaded
+                    ? L("settings.plugins.state.enabled", "Enabled")
+                    : L("settings.plugins.state.enabled_failed", "Enabled / failed to load")
+                : L("settings.plugins.state.disabled", "Disabled");
+            PluginRuntimeSummaryPanel.Children.Add(CreateSummaryLine(
+                F(
+                    "settings.plugins.summary_item_format",
+                    "{0}  v{1}  |  {2}",
+                    plugin.Manifest.Name,
+                    plugin.Manifest.Version ?? "dev",
+                    status)));
+        }
+    }
+
+    private void BuildPluginCatalog(PluginRuntimeService runtime)
+    {
+        PluginCatalogItemsHost.Children.Clear();
+
+        var plugins = runtime.Catalog
+            .OrderBy(entry => entry.Manifest.Name, StringComparer.OrdinalIgnoreCase)
+            .ToList();
+
+        PluginCatalogEmptyTextBlock.IsVisible = plugins.Count == 0;
+        PluginRestartHintTextBlock.IsVisible = plugins.Count > 0;
+
+        foreach (var plugin in plugins)
+        {
+            PluginCatalogItemsHost.Children.Add(CreatePluginCatalogItem(runtime, plugin));
+        }
+    }
+
+    private Control CreatePluginCatalogItem(PluginRuntimeService runtime, PluginCatalogEntry entry)
+    {
+        var title = new TextBlock
+        {
+            Text = entry.Manifest.Name,
+            FontSize = 16,
+            FontWeight = FontWeight.SemiBold,
+            TextWrapping = TextWrapping.Wrap
+        };
+
+        var subtitle = new TextBlock
+        {
+            Text = BuildPluginSubtitle(entry),
+            Foreground = PluginSystemDescriptionTextBlock.Foreground,
+            TextWrapping = TextWrapping.Wrap
+        };
+
+        var enabledToggle = new ToggleSwitch
+        {
+            IsChecked = entry.IsEnabled,
+            OnContent = L("settings.plugins.toggle_on", "Enabled"),
+            OffContent = L("settings.plugins.toggle_off", "Disabled"),
+            HorizontalAlignment = HorizontalAlignment.Right,
+            VerticalAlignment = VerticalAlignment.Center
+        };
+
+        enabledToggle.Checked += (_, _) => OnPluginEnableChanged(runtime, entry, true);
+        enabledToggle.Unchecked += (_, _) => OnPluginEnableChanged(runtime, entry, false);
+
+        var header = new Grid
+        {
+            ColumnDefinitions = new ColumnDefinitions("*,Auto"),
+            ColumnSpacing = 12,
+            Children =
+            {
+                new StackPanel
+                {
+                    Spacing = 4,
+                    Children = { title, subtitle }
+                },
+                enabledToggle
+            }
+        };
+        Grid.SetColumn(enabledToggle, 1);
+
+        var details = new TextBlock
+        {
+            Text = BuildPluginDetails(entry),
+            Foreground = PluginSystemDescriptionTextBlock.Foreground,
+            TextWrapping = TextWrapping.Wrap
+        };
+
+        return new Border
+        {
+            Background = new SolidColorBrush(Color.Parse("#14000000")),
+            CornerRadius = new CornerRadius(16),
+            Padding = new Thickness(14),
+            Child = new StackPanel
+            {
+                Spacing = 10,
+                Children = { header, details }
+            }
+        };
+    }
+
+    private void OnPluginEnableChanged(PluginRuntimeService runtime, PluginCatalogEntry entry, bool isEnabled)
+    {
+        runtime.SetPluginEnabled(entry.Manifest.Id, isEnabled);
+        BuildRuntimeSummary(runtime);
+        BuildPluginCatalog(runtime);
+        PluginSystemStatusTextBlock.Text = F(
+            "settings.plugins.toggle_result_format",
+            "Plugin '{0}' was {1} for the next launch. Restart the app to apply page and widget changes.",
+            entry.Manifest.Name,
+            isEnabled
+                ? L("settings.plugins.toggle_state_enabled", "enabled")
+                : L("settings.plugins.toggle_state_disabled", "disabled"));
+    }
+
+    private string BuildPluginSubtitle(PluginCatalogEntry entry)
+    {
+        var source = entry.IsPackage
+            ? L("settings.plugins.source_package", ".laapp package")
+            : L("settings.plugins.source_manifest", "Loose manifest");
+        var state = entry.IsEnabled
+            ? entry.IsLoaded
+                ? L("settings.plugins.state.loaded", "Loaded")
+                : L("settings.plugins.state.load_failed", "Load failed")
+            : L("settings.plugins.state.disabled", "Disabled");
+        return F(
+            "settings.plugins.subtitle_format",
+            "{0} | {1} | {2}",
+            state,
+            source,
+            entry.Manifest.Id);
+    }
+
+    private string BuildPluginDetails(PluginCatalogEntry entry)
+    {
+        var detail = F(
+            "settings.plugins.detail_format",
+            "Settings pages: {0} | Widgets: {1}",
+            entry.SettingsPageCount,
+            entry.WidgetCount);
+        return string.IsNullOrWhiteSpace(entry.ErrorMessage)
+            ? detail
+            : detail + Environment.NewLine + entry.ErrorMessage;
+    }
+
+    private TextBlock CreateSummaryLine(string text)
+    {
+        return new TextBlock
+        {
+            Text = text,
+            TextWrapping = TextWrapping.Wrap,
+            Foreground = PluginSystemDescriptionTextBlock.Foreground
+        };
+    }
+
+    private string L(string key, string fallback)
+    {
+        var snapshot = _appSettingsService.Load();
+        return _localizationService.GetString(snapshot.LanguageCode, key, fallback);
+    }
+
+    private string F(string key, string fallback, params object[] args)
+    {
+        return string.Format(CultureInfo.CurrentCulture, L(key, fallback), args);
    }
 }
+
+
+
+
--- a/LanMountainDesktop/Views/SettingsWindow.Controls.cs
+++ b/LanMountainDesktop/Views/SettingsWindow.Controls.cs
@@ -1,4 +1,4 @@
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using LibVLCSharp.Avalonia;
@@ -206,4 +206,8 @@ public partial class SettingsWindow
    internal FluentAvalonia.UI.Controls.SettingsExpander PluginSystemSettingsExpander => PluginSettingsPanel.FindControl<FluentAvalonia.UI.Controls.SettingsExpander>("PluginSystemSettingsExpander")!;
    internal TextBlock PluginSystemDescriptionTextBlock => PluginSettingsPanel.FindControl<TextBlock>("PluginSystemDescriptionTextBlock")!;
    internal TextBlock PluginSystemStatusTextBlock => PluginSettingsPanel.FindControl<TextBlock>("PluginSystemStatusTextBlock")!;
+    internal FluentAvalonia.UI.Controls.SettingsExpander InstalledPluginsSettingsExpander => PluginSettingsPanel.FindControl<FluentAvalonia.UI.Controls.SettingsExpander>("InstalledPluginsSettingsExpander")!;
+    internal TextBlock PluginRestartHintTextBlock => PluginSettingsPanel.FindControl<TextBlock>("PluginRestartHintTextBlock")!;
+    internal TextBlock PluginCatalogEmptyTextBlock => PluginSettingsPanel.FindControl<TextBlock>("PluginCatalogEmptyTextBlock")!;
 }
+
--- a/LanMountainDesktop/Views/SettingsWindow.Core.cs
+++ b/LanMountainDesktop/Views/SettingsWindow.Core.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -54,25 +54,7 @@ public partial class SettingsWindow

    private int GetSettingsTabIndex()
    {
-        if (SettingsNavView?.SelectedItem is FluentAvalonia.UI.Controls.NavigationViewItem item)
-        {
-            return item.Tag?.ToString() switch
-            {
-                "Wallpaper" => 0,
-                "Grid" => 1,
-                "Color" => 2,
-                "StatusBar" => 3,
-                "Weather" => 4,
-                "Region" => 5,
-                "Update" => 6,
-                "About" => 7,
-                "Launcher" => 8,
-                "Plugins" => 9,
-                _ => 0
-            };
-        }
-
-        return 0;
+        return ResolveSelectedSettingsTabIndex();
    }

    private void UpdateSettingsTabContent()
@@ -95,6 +77,7 @@ public partial class SettingsWindow
        AboutSettingsPanel.IsVisible = tag == "About";
        LauncherSettingsPanel.IsVisible = tag == "Launcher";
        PluginSettingsPanel.IsVisible = tag == "Plugins";
+        UpdatePluginSettingsPageVisibility(tag);

        if (tag == "Launcher")
        {
@@ -122,40 +105,40 @@ public partial class SettingsWindow

    private AppSettingsSnapshot BuildAppSettingsSnapshot()
    {
-        return new AppSettingsSnapshot
-        {
-            GridShortSideCells = _targetShortSideCells,
-            GridSpacingPreset = _gridSpacingPreset,
-            DesktopEdgeInsetPercent = _desktopEdgeInsetPercent,
-            IsNightMode = _isNightMode,
-            ThemeColor = _selectedThemeColor.ToString(),
-            WallpaperPath = _wallpaperPath,
-            WallpaperPlacement = GetPlacementDisplayName(GetSelectedWallpaperPlacement()),
-            SettingsTabIndex = Math.Max(0, GetSettingsTabIndex()),
-            LanguageCode = _languageCode,
-            TimeZoneId = _timeZoneService.CurrentTimeZone.Id,
-            WeatherLocationMode = ToWeatherLocationModeTag(_weatherLocationMode),
-            WeatherLocationKey = _weatherLocationKey,
-            WeatherLocationName = _weatherLocationName,
-            WeatherLatitude = _weatherLatitude,
-            WeatherLongitude = _weatherLongitude,
-            WeatherAutoRefreshLocation = _weatherAutoRefreshLocation,
-            WeatherLocationQuery = BuildLegacyWeatherLocationQuery(),
-            WeatherExcludedAlerts = _weatherExcludedAlertsRaw,
-            WeatherIconPackId = _weatherIconPackId,
-            WeatherNoTlsRequests = _weatherNoTlsRequests,
-            AutoStartWithWindows = _autoStartWithWindows,
-            AutoCheckUpdates = _autoCheckUpdates,
-            IncludePrereleaseUpdates = IncludePrereleaseUpdates,
-            UpdateChannel = IncludePrereleaseUpdates ? UpdateChannelPreview : UpdateChannelStable,
-            TopStatusComponentIds = _topStatusComponentIds.ToList(),
-            PinnedTaskbarActions = _pinnedTaskbarActions.Select(action => action.ToString()).ToList(),
-            EnableDynamicTaskbarActions = _enableDynamicTaskbarActions,
-            TaskbarLayoutMode = _taskbarLayoutMode,
-            ClockDisplayFormat = _clockDisplayFormat == ClockDisplayFormat.HourMinute ? "HourMinute" : "HourMinuteSecond",
-            StatusBarSpacingMode = _statusBarSpacingMode,
-            StatusBarCustomSpacingPercent = _statusBarCustomSpacingPercent
-        };
+        var snapshot = _appSettingsService.Load();
+        snapshot.GridShortSideCells = _targetShortSideCells;
+        snapshot.GridSpacingPreset = _gridSpacingPreset;
+        snapshot.DesktopEdgeInsetPercent = _desktopEdgeInsetPercent;
+        snapshot.IsNightMode = _isNightMode;
+        snapshot.ThemeColor = _selectedThemeColor.ToString();
+        snapshot.WallpaperPath = _wallpaperPath;
+        snapshot.WallpaperPlacement = GetPlacementDisplayName(GetSelectedWallpaperPlacement());
+        snapshot.SettingsTabIndex = Math.Max(0, GetSettingsTabIndex());
+        snapshot.SettingsTabTag = GetSelectedSettingsTabTag();
+        snapshot.LanguageCode = _languageCode;
+        snapshot.TimeZoneId = _timeZoneService.CurrentTimeZone.Id;
+        snapshot.WeatherLocationMode = ToWeatherLocationModeTag(_weatherLocationMode);
+        snapshot.WeatherLocationKey = _weatherLocationKey;
+        snapshot.WeatherLocationName = _weatherLocationName;
+        snapshot.WeatherLatitude = _weatherLatitude;
+        snapshot.WeatherLongitude = _weatherLongitude;
+        snapshot.WeatherAutoRefreshLocation = _weatherAutoRefreshLocation;
+        snapshot.WeatherLocationQuery = BuildLegacyWeatherLocationQuery();
+        snapshot.WeatherExcludedAlerts = _weatherExcludedAlertsRaw;
+        snapshot.WeatherIconPackId = _weatherIconPackId;
+        snapshot.WeatherNoTlsRequests = _weatherNoTlsRequests;
+        snapshot.AutoStartWithWindows = _autoStartWithWindows;
+        snapshot.AutoCheckUpdates = _autoCheckUpdates;
+        snapshot.IncludePrereleaseUpdates = IncludePrereleaseUpdates;
+        snapshot.UpdateChannel = IncludePrereleaseUpdates ? UpdateChannelPreview : UpdateChannelStable;
+        snapshot.TopStatusComponentIds = _topStatusComponentIds.ToList();
+        snapshot.PinnedTaskbarActions = _pinnedTaskbarActions.Select(action => action.ToString()).ToList();
+        snapshot.EnableDynamicTaskbarActions = _enableDynamicTaskbarActions;
+        snapshot.TaskbarLayoutMode = _taskbarLayoutMode;
+        snapshot.ClockDisplayFormat = _clockDisplayFormat == ClockDisplayFormat.HourMinute ? "HourMinute" : "HourMinuteSecond";
+        snapshot.StatusBarSpacingMode = _statusBarSpacingMode;
+        snapshot.StatusBarCustomSpacingPercent = _statusBarCustomSpacingPercent;
+        return snapshot;
    }

    private LauncherSettingsSnapshot BuildLauncherSettingsSnapshot()
@@ -514,3 +497,4 @@ public partial class SettingsWindow
        return Brushes.Transparent;
    }
 }
+
--- a/LanMountainDesktop/Views/SettingsWindow.Localization.cs
+++ b/LanMountainDesktop/Views/SettingsWindow.Localization.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using Avalonia.Controls;

@@ -111,9 +111,14 @@ public partial class SettingsWindow

        PluginSettingsPanelTitleTextBlock.Text = L("settings.plugins.title", "Plugins");
        PluginSystemSettingsExpander.Header = L("settings.plugins.runtime_header", "Plugin Runtime");
-        PluginSystemSettingsExpander.Description = L("settings.plugins.runtime_desc", "Manage plugin loading and backend isolation.");
-        PluginSystemDescriptionTextBlock.Text = L("settings.plugins.runtime_hint", "This page will host installed plugin management, permission review, and sandboxed backend runtime controls.");
-        PluginSystemStatusTextBlock.Text = L("settings.plugins.runtime_status", "Plugin management UI is not connected yet. Next step is wiring the loader, permissions, and worker isolation state into this panel.");
+        PluginSystemSettingsExpander.Description = L("settings.plugins.runtime_desc", "Review plugin runtime state and load results.");
+        PluginSystemDescriptionTextBlock.Text = L("settings.plugins.runtime_hint", "This page shows discovery status, load results, and runtime diagnostics for installed plugins.");
+        PluginSystemStatusTextBlock.Text = L("settings.plugins.runtime_status", "Plugin runtime status will appear here after plugin discovery completes.");
+        InstalledPluginsSettingsExpander.Header = L("settings.plugins.installed_header", "Installed Plugins");
+        InstalledPluginsSettingsExpander.Description = L("settings.plugins.installed_desc", "Enable or disable plugins here. Detailed plugin settings appear as separate settings pages.");
+        PluginRestartHintTextBlock.Text = L("settings.plugins.restart_hint", "Plugin enable state changes take effect after restarting the app.");
+        PluginCatalogEmptyTextBlock.Text = L("settings.plugins.empty", "No plugins found.");
+        PluginSettingsPanel.RefreshFromRuntime();

        AboutPanelTitleTextBlock.Text = L("settings.about.title", "About");
        VersionTextBlock.Text = Lf("settings.about.version_format", "Version: {0}", GetAppVersionText());
@@ -183,3 +188,4 @@ public partial class SettingsWindow
        PersistSettings();
    }
 }
+
--- a/LanMountainDesktop/Views/SettingsWindow.PluginSettings.cs
+++ b/LanMountainDesktop/Views/SettingsWindow.PluginSettings.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+using FluentAvalonia.UI.Controls;
+using FluentIcons.Avalonia.Fluent;
+using FluentIcons.Common;
+using LanMountainDesktop.Models;
+using LanMountainDesktop.Services;
+
+namespace LanMountainDesktop.Views;
+
+public partial class SettingsWindow
+{
+    private readonly Dictionary<string, Control> _pluginSettingsPageHosts = new(StringComparer.OrdinalIgnoreCase);
+
+    private void InitializePluginSettingsNavigation()
+    {
+        if (_pluginSettingsPageHosts.Count > 0 || SettingsNavView?.MenuItems is null)
+        {
+            return;
+        }
+
+        var runtime = (Application.Current as App)?.PluginRuntimeService;
+        var contributions = runtime?.SettingsPages
+            .OrderBy(contribution => contribution.Registration.SortOrder)
+            .ThenBy(contribution => contribution.Plugin.Manifest.Name, StringComparer.OrdinalIgnoreCase)
+            .ThenBy(contribution => contribution.Registration.Title, StringComparer.OrdinalIgnoreCase)
+            .ToArray();
+
+        if (contributions is not { Length: > 0 })
+        {
+            return;
+        }
+
+        var pageCountsByPluginId = contributions
+            .GroupBy(contribution => contribution.Plugin.Manifest.Id, StringComparer.OrdinalIgnoreCase)
+            .ToDictionary(group => group.Key, group => group.Count(), StringComparer.OrdinalIgnoreCase);
+
+        var insertIndex = SettingsNavView.MenuItems.IndexOf(SettingsNavPluginsItem) + 1;
+        foreach (var contribution in contributions)
+        {
+            var tag = BuildPluginSettingsTag(contribution);
+            var navigationTitle = BuildPluginSettingsNavigationTitle(contribution, pageCountsByPluginId);
+            var navItem = new NavigationViewItem
+            {
+                Content = navigationTitle,
+                Tag = tag,
+                IconSource = new FluentIcons.Avalonia.Fluent.SymbolIconSource
+                {
+                    Symbol = FluentIcons.Common.Symbol.PuzzlePiece,
+                    IconVariant = FluentIcons.Common.IconVariant.Regular
+                }
+            };
+
+            ToolTip.SetTip(navItem, $"{contribution.Plugin.Manifest.Name} - {contribution.Registration.Title}");
+
+            SettingsNavView.MenuItems.Insert(insertIndex++, navItem);
+
+            var pageHost = CreatePluginSettingsPageHost(contribution);
+            pageHost.IsVisible = false;
+            SettingsContentPagesHost.Children.Add(pageHost);
+            _pluginSettingsPageHosts[tag] = pageHost;
+        }
+    }
+
+    private static string BuildPluginSettingsTag(PluginSettingsPageContribution contribution)
+    {
+        return $"PluginPage:{contribution.Plugin.Manifest.Id}:{contribution.Registration.Id}";
+    }
+
+    private static string BuildPluginSettingsNavigationTitle(
+        PluginSettingsPageContribution contribution,
+        IReadOnlyDictionary<string, int> pageCountsByPluginId)
+    {
+        return pageCountsByPluginId.TryGetValue(contribution.Plugin.Manifest.Id, out var pageCount) && pageCount > 1
+            ? $"{contribution.Plugin.Manifest.Name} - {contribution.Registration.Title}"
+            : contribution.Plugin.Manifest.Name;
+    }
+
+    private Control CreatePluginSettingsPageHost(PluginSettingsPageContribution contribution)
+    {
+        Control content;
+        try
+        {
+            content = contribution.Registration.ContentFactory();
+        }
+        catch (Exception ex)
+        {
+            content = CreatePluginPageErrorContent(ex);
+        }
+
+        return new StackPanel
+        {
+            Spacing = 16,
+            Children =
+            {
+                new TextBlock
+                {
+                    Text = contribution.Registration.Title,
+                    FontSize = 24,
+                    FontWeight = FontWeight.SemiBold,
+                    Foreground = GetThemeBrush("AdaptiveTextPrimaryBrush")
+                },
+                new TextBlock
+                {
+                    Text = contribution.Plugin.Manifest.Name,
+                    Foreground = GetThemeBrush("AdaptiveTextSecondaryBrush")
+                },
+                content
+            }
+        };
+    }
+
+    private static Control CreatePluginPageErrorContent(Exception exception)
+    {
+        return new Border
+        {
+            Background = new SolidColorBrush(Color.Parse("#332B0F16")),
+            BorderBrush = new SolidColorBrush(Color.Parse("#66F97316")),
+            BorderThickness = new Thickness(1),
+            CornerRadius = new CornerRadius(16),
+            Padding = new Thickness(16),
+            Child = new TextBlock
+            {
+                Text = exception.Message,
+                TextWrapping = TextWrapping.Wrap
+            }
+        };
+    }
+
+    private void UpdatePluginSettingsPageVisibility(string? selectedTag)
+    {
+        foreach (var pair in _pluginSettingsPageHosts)
+        {
+            pair.Value.IsVisible = string.Equals(pair.Key, selectedTag, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+
+    private string? GetSelectedSettingsTabTag()
+    {
+        return (SettingsNavView?.SelectedItem as NavigationViewItem)?.Tag?.ToString();
+    }
+
+    private int ResolveSelectedSettingsTabIndex()
+    {
+        if (SettingsNavView?.SelectedItem is null || SettingsNavView.MenuItems is null)
+        {
+            return 0;
+        }
+
+        for (var i = 0; i < SettingsNavView.MenuItems.Count; i++)
+        {
+            if (ReferenceEquals(SettingsNavView.MenuItems[i], SettingsNavView.SelectedItem))
+            {
+                return i;
+            }
+        }
+
+        return 0;
+    }
+
+    private void RestoreSettingsTabSelection(AppSettingsSnapshot snapshot)
+    {
+        if (SettingsNavView?.MenuItems is null || SettingsNavView.MenuItems.Count == 0)
+        {
+            return;
+        }
+
+        if (!string.IsNullOrWhiteSpace(snapshot.SettingsTabTag))
+        {
+            var taggedItem = SettingsNavView.MenuItems
+                .OfType<NavigationViewItem>()
+                .FirstOrDefault(item => string.Equals(item.Tag?.ToString(), snapshot.SettingsTabTag, StringComparison.OrdinalIgnoreCase));
+            if (taggedItem is not null)
+            {
+                SettingsNavView.SelectedItem = taggedItem;
+                return;
+            }
+        }
+
+        var safeIndex = Math.Clamp(snapshot.SettingsTabIndex, 0, Math.Max(0, SettingsNavView.MenuItems.Count - 1));
+        if (SettingsNavView.MenuItems[safeIndex] is NavigationViewItem navItem)
+        {
+            SettingsNavView.SelectedItem = navItem;
+        }
+    }
+}
+
+
+
--- a/LanMountainDesktop/Views/SettingsWindow.axaml
+++ b/LanMountainDesktop/Views/SettingsWindow.axaml
@@ -141,7 +141,7 @@
                                          Padding="0,0,16,0"
                                          HorizontalScrollBarVisibility="Disabled"
                                          VerticalScrollBarVisibility="Auto">
-                                <Grid>
+                                <Grid x:Name="SettingsContentPagesHost">
                                    <pages:WallpaperSettingsPage x:Name="WallpaperSettingsPanel" IsVisible="True" />
                                    <pages:GridSettingsPage x:Name="GridSettingsPanel" IsVisible="False" />
                                    <pages:ColorSettingsPage x:Name="ColorSettingsPanel" IsVisible="False" />
--- a/LanMountainDesktop/Views/SettingsWindow.axaml.cs
+++ b/LanMountainDesktop/Views/SettingsWindow.axaml.cs
@@ -93,7 +93,7 @@ public partial class SettingsWindow : Window
    private readonly WindowsStartupService _windowsStartupService = new();
    private readonly GitHubReleaseUpdateService _releaseUpdateService = new("wwiinnddyy", "LanMountainDesktop");
    private readonly IWeatherDataService _weatherDataService = new XiaomiWeatherService();
-    private readonly ComponentRegistry _componentRegistry = ComponentRegistry.CreateDefault();
+    private readonly ComponentRegistry _componentRegistry;
    private readonly WindowsStartMenuService _windowsStartMenuService = new();
    private readonly LinuxDesktopEntryService _linuxDesktopEntryService = new();
    private readonly FluentAvaloniaTheme? _fluentAvaloniaTheme;
@@ -158,7 +158,9 @@ public partial class SettingsWindow : Window

    public SettingsWindow()
    {
+        _componentRegistry = DesktopComponentRegistryFactory.Create((Application.Current as App)?.PluginRuntimeService);
        InitializeComponent();
+        InitializePluginSettingsNavigation();
        _fluentAvaloniaTheme = Application.Current?.Styles.OfType<FluentAvaloniaTheme>().FirstOrDefault();
        RequestedThemeVariant = Application.Current?.RequestedThemeVariant ?? ThemeVariant.Default;
        HookEvents();
@@ -278,6 +280,7 @@ public partial class SettingsWindow : Window
        WindowTitleTextBlock.Text = L("settings.title", "Settings");
        WindowSubtitleTextBlock.Text = L("settings.footer", "LanMountainDesktop Settings");
        _defaultDesktopBackground = DesktopWallpaperLayer.Background;
+        RestoreSettingsTabSelection(snapshot);
        UpdateSettingsTabContent();
        UpdateWallpaperDisplay();
        UpdateWallpaperPreviewLayout();