diff --git a/.gitignore b/.gitignore
index 27d3e27e..0f5e8f3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,11 @@ build_output.txt
 /test_interface/
 
 # Local-only verification project
-/MFAAvalonia.Tests/
+/MFAAvalonia.Tests/*
+# 策略编辑器的回归测试随功能保留，其他本地核对文件继续忽略。
+!/MFAAvalonia.Tests/MFAAvalonia.Tests.csproj
+!/MFAAvalonia.Tests/CombatStrategy*Tests.cs
 /MFAAvalonia/AssemblyInfo.cs
 workflows/android/__pycache__/mfa_android_agent.cpython-312.pyc
+# MAP 本地定制迁移设计文档
+/docs/map定制迁移/
diff --git a/MFAAvalonia.Desktop/MFAAvalonia.Desktop.csproj b/MFAAvalonia.Desktop/MFAAvalonia.Desktop.csproj
index ffce18df..a1dddf5f 100644
--- a/MFAAvalonia.Desktop/MFAAvalonia.Desktop.csproj
+++ b/MFAAvalonia.Desktop/MFAAvalonia.Desktop.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <AssemblyName>MFAAvalonia</AssemblyName>
-        <OutputName>MFAAvalonia</OutputName>
+        <AssemblyName>MaaPazugiri</AssemblyName>
+        <OutputName>MaaPazugiri</OutputName>
         <TargetFramework>net10.0</TargetFramework>
         <Nullable>enable</Nullable>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
diff --git a/MFAAvalonia.Desktop/Program.cs b/MFAAvalonia.Desktop/Program.cs
index 8c5d6323..8b9fffdf 100644
--- a/MFAAvalonia.Desktop/Program.cs
+++ b/MFAAvalonia.Desktop/Program.cs
@@ -46,7 +46,7 @@ public static void Main(string[] args)
 
         try
         {
-            var executablePath = Environment.ProcessPath ?? Path.Combine(AppContext.BaseDirectory, "MFAAvalonia.exe");
+            var executablePath = Environment.ProcessPath ?? Path.Combine(AppContext.BaseDirectory, "MaaPazugiri.exe");
             var instanceKey = AppRuntime.CreateInstanceKey(executablePath);
             AppRuntime.Initialize(args, instanceKey);
             TelemetryService.InitializeBootstrapFromInterface(AppContext.BaseDirectory);
diff --git a/MFAAvalonia.Tests/CombatStrategyControlsTests.cs b/MFAAvalonia.Tests/CombatStrategyControlsTests.cs
new file mode 100644
index 00000000..4a268715
--- /dev/null
+++ b/MFAAvalonia.Tests/CombatStrategyControlsTests.cs
@@ -0,0 +1,93 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+using Avalonia.LogicalTree;
+using Avalonia.Input;
+using MFAAvalonia.Features.CombatStrategies;
+using MFAAvalonia.Features.CombatStrategies.Controls;
+using System.Linq;
+using System;
+using System.IO;
+using System.Text.Json;
+using MFAAvalonia.Views.Pages;
+using Xunit;
+
+namespace MFAAvalonia.Tests;
+
+[Collection("策略界面")]
+public sealed class CombatStrategyControlsTests
+{
+    [Theory]
+    [InlineData(0, 60, 0)]
+    [InlineData(0, 150, 0)]
+    [InlineData(0, 190, 1)]
+    [InlineData(0, 350, 2)]
+    [InlineData(2, 20, 0)]
+    [InlineData(2, 140, 1)]
+    public void DragDrop_AccountsForRemovedSourceRow(int from, double y, int expected)
+    {
+        var reorder = typeof(StrategyStageCard).Assembly.GetType("MFAAvalonia.Features.CombatStrategies.Controls.StrategyReorder")!;
+        var calculate = reorder.GetMethod("CalculateDropIndex", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static)!;
+        Avalonia.Rect[] rows = [new(0, 0, 200, 100), new(0, 110, 200, 100), new(0, 220, 200, 100)];
+        Assert.Equal(expected, calculate.Invoke(null, [rows, from, y]));
+    }
+
+    [Fact]
+    public void PageControls_SaveStageAndUltimateEditsToRealJson()
+    {
+        var directory = Path.Combine(Path.GetTempPath(), "map-page-tests", Guid.NewGuid().ToString("N"));
+        try
+        {
+            var session = new StrategyEditorSession(new StrategyStore(directory));
+            session.Create("界面策略");
+            var view = new CombatStrategyView(session);
+            view.FindControl<Button>("AddStage")!.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
+            Assert.Equal(2, session.Current.Stages.Count);
+            var cards = view.FindControl<StackPanel>("StageCards")!;
+            var firstCard = cards.Children.OfType<StrategyStageCard>().First();
+            firstCard.DragHandle.RaiseEvent(new KeyEventArgs { RoutedEvent = Avalonia.Input.InputElement.KeyDownEvent, Key = Key.Down });
+            Assert.Equal(session.Current.InitialStageId, session.Current.Stages[1].Id);
+            var initialCard = cards.Children.OfType<StrategyStageCard>().Last();
+            var slot = initialCard.GetLogicalDescendants().OfType<CheckBox>().First(x => Equals(x.Content, "位置 2"));
+            slot.IsChecked = false;
+            view.FindControl<Button>("SaveStrategy")!.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
+            var restored = new StrategyStore(directory).Load(session.Current.Id);
+            Assert.Equal(2, restored.Stages.Count);
+            Assert.False(restored.Stages[1].Actions.Ultimates.Single(x => x.Slot == 2).Enabled);
+            Assert.False(session.HasUnsavedChanges);
+        }
+        finally { if (Directory.Exists(directory)) Directory.Delete(directory, true); }
+    }
+
+    [Fact]
+    public void ConditionControls_WriteNumericValuesAndNestedGroupsToDraft()
+    {
+        var changed = 0;
+        var root = new ConditionGroup
+        {
+            Children = [new ConditionPredicate { Metric = ConditionMetric.StageNormalLinks, Comparison = ComparisonOperator.GreaterOrEqual, Value = 1 }]
+        };
+        var editor = new StrategyConditionEditor(root, () => changed++, ownerSlot: 3);
+        var number = editor.GetLogicalDescendants().OfType<NumericUpDown>().Single();
+        number.Value = 2;
+        Assert.Equal(2, Assert.IsType<ConditionPredicate>(root.Children[0]).Value);
+        var addGroup = editor.GetLogicalDescendants().OfType<Button>().First(x => x.Name == "AddConditionGroup");
+        addGroup.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
+        Assert.Equal(2, root.Children.Count);
+        Assert.IsType<ConditionGroup>(root.Children[1]);
+        Assert.True(changed >= 2);
+    }
+
+    [Fact]
+    public void RootCondition_ContainsExplicitTypeForPythonConsumer()
+    {
+        var document = StrategyDefaults.CreateEditable("条件契约");
+        document.Stages[0].Actions.Ultimates[0].Condition = new ConditionGroup
+        {
+            Children = [new ConditionPredicate { Metric = ConditionMetric.EnemyHp, Comparison = ComparisonOperator.LessOrEqual, Value = 10000 }]
+        };
+        using var json = JsonDocument.Parse(StrategyJson.Serialize(document));
+        var condition = json.RootElement.GetProperty("stages")[0].GetProperty("actions").GetProperty("ultimates")[0].GetProperty("condition");
+        Assert.Equal("group", condition.GetProperty("type").GetString());
+    }
+}
diff --git a/MFAAvalonia.Tests/CombatStrategyDialogTests.cs b/MFAAvalonia.Tests/CombatStrategyDialogTests.cs
new file mode 100644
index 00000000..4b5ecd63
--- /dev/null
+++ b/MFAAvalonia.Tests/CombatStrategyDialogTests.cs
@@ -0,0 +1,52 @@
+using Avalonia.Controls;
+using MFAAvalonia.Views.Pages;
+using SukiUI.Controls;
+using SukiUI.MessageBox;
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace MFAAvalonia.Tests;
+
+[Collection("策略界面")]
+public sealed class CombatStrategyDialogTests
+{
+    [Theory]
+    [InlineData("删除", true)]
+    [InlineData("取消", false)]
+    [InlineData(null, false)]
+    public async Task DeleteConfirmation_UsesMessageBoxResult(string? action, bool expected)
+    {
+        var result = await Invoke<bool>("ConfirmDeleteAsync", "测试策略", Presenter(action));
+        Assert.Equal(expected, result);
+    }
+
+    [Theory]
+    [InlineData("确定", "新名称")]
+    [InlineData("取消", null)]
+    [InlineData(null, null)]
+    public async Task RenamePrompt_UsesMessageBoxResult(string? action, string? expected)
+    {
+        Assert.Equal(expected, await Invoke<string?>("RenameAsync", "重命名", "旧名称", Presenter(action, "  新名称  ")));
+    }
+
+    private static Func<SukiMessageBoxHost, SukiMessageBoxOptions, Task<object?>> Presenter(string? action, string? name = null) =>
+        (host, _) =>
+        {
+            if (name != null) Assert.IsType<TextBox>(host.Content).Text = name;
+            if (action == null) return Task.FromResult<object?>(null);
+            var button = host.ActionButtonsSource!.Single(x => Equals(x.Content, action));
+            // 弹窗库会原样返回标准结果，自定义标签则返回按钮本身。
+            var result = Assert.IsType<SukiMessageBoxResult>(button.Tag);
+            return Task.FromResult<object?>(result);
+        };
+
+    private static Task<T> Invoke<T>(string name, params object?[] arguments)
+    {
+        var dialogs = typeof(CombatStrategyView).Assembly.GetType("MFAAvalonia.Features.CombatStrategies.Controls.StrategyDialogs")!;
+        var method = dialogs.GetMethod(name, BindingFlags.NonPublic | BindingFlags.Static)!;
+        return (Task<T>)method.Invoke(null, arguments)!;
+    }
+}
diff --git a/MFAAvalonia.Tests/CombatStrategyEditorTests.cs b/MFAAvalonia.Tests/CombatStrategyEditorTests.cs
new file mode 100644
index 00000000..df0ae28b
--- /dev/null
+++ b/MFAAvalonia.Tests/CombatStrategyEditorTests.cs
@@ -0,0 +1,126 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using MFAAvalonia.Features.CombatStrategies;
+using Xunit;
+
+namespace MFAAvalonia.Tests;
+
+public sealed class CombatStrategyEditorTests : IDisposable
+{
+    private readonly string _directory = Path.Combine(Path.GetTempPath(), "map-editor-tests", Guid.NewGuid().ToString("N"));
+
+    [Fact]
+    public async Task Cancel_KeepsCurrentDraftAndUnsavedChanges()
+    {
+        var session = new StrategyEditorSession(new StrategyStore(_directory));
+        session.Create("未保存");
+        var id = session.Current.Id;
+        Assert.False(await session.TrySwitchAsync("default", () => Task.FromResult(UnsavedDecision.Cancel)));
+        Assert.Equal(id, session.Current.Id);
+        Assert.True(session.HasUnsavedChanges);
+    }
+
+    [Fact]
+    public async Task SaveBeforeSwitch_ReloadsEditedDataFromDisk()
+    {
+        var session = new StrategyEditorSession(new StrategyStore(_directory));
+        session.Create("保存策略");
+        var id = session.Current.Id;
+        session.Current.Stages[0].Name = "准备";
+        session.MarkDirty();
+        Assert.True(await session.TrySwitchAsync("default", () => Task.FromResult(UnsavedDecision.Save)));
+        Assert.False(session.HasUnsavedChanges);
+        session.Select(id);
+        Assert.Equal("准备", session.Current.Stages[0].Name);
+    }
+
+    [Fact]
+    public async Task Discard_RestoresSavedDocumentAndRemovesNewDraft()
+    {
+        var session = new StrategyEditorSession(new StrategyStore(_directory));
+        session.Create("策略");
+        session.Save();
+        session.Current.Name = "不应保留";
+        session.MarkDirty();
+        Assert.True(await session.TryLeaveAsync(() => Task.FromResult(UnsavedDecision.Discard)));
+        Assert.Equal("策略", session.Current.Name);
+        session.Create("临时策略");
+        var unsavedId = session.Current.Id;
+        Assert.True(await session.TryLeaveAsync(() => Task.FromResult(UnsavedDecision.Discard)));
+        Assert.DoesNotContain(session.Catalog.Strategies, x => x.Id == unsavedId);
+    }
+
+    [Fact]
+    public async Task SaveFailure_DoesNotSwitchOrClearDirtyState()
+    {
+        Directory.CreateDirectory(Path.GetDirectoryName(_directory)!);
+        File.WriteAllText(_directory, "阻止创建策略目录");
+        var session = new StrategyEditorSession(new StrategyStore(_directory));
+        session.Create("保存失败");
+        var id = session.Current.Id;
+        Assert.False(await session.TrySwitchAsync("default", () => Task.FromResult(UnsavedDecision.Save)));
+        Assert.Equal(id, session.Current.Id);
+        Assert.True(session.HasUnsavedChanges);
+        Assert.False(string.IsNullOrWhiteSpace(session.Error));
+    }
+
+    [Fact]
+    public void CopyStrategy_RemapTargetsAndKeepOriginalIndependent()
+    {
+        var session = new StrategyEditorSession(new StrategyStore(_directory));
+        session.Create("来源");
+        var first = session.Current.Stages[0];
+        var second = session.AddStage();
+        first.Transitions.Add(new StageTransition
+        {
+            TargetStageId = second.Id,
+            Condition = new ConditionGroup { Children = [new ConditionPredicate { Metric = ConditionMetric.FrenzyActive, Expected = true }] }
+        });
+        session.Save();
+        var sourceId = session.Current.Id;
+        var oldStageIds = session.Current.Stages.Select(x => x.Id).ToArray();
+        session.Duplicate();
+        Assert.NotEqual(sourceId, session.Current.Id);
+        Assert.DoesNotContain(session.Current.Stages[0].Id, oldStageIds);
+        Assert.Equal(session.Current.Stages[1].Id, session.Current.Stages[0].Transitions[0].TargetStageId);
+        Assert.Equal(session.Current.Stages[0].Id, session.Current.InitialStageId);
+        session.Current.Stages[0].Name = "修改副本";
+        Assert.NotEqual("修改副本", new StrategyStore(_directory).Load(sourceId).Stages[0].Name);
+    }
+
+    [Fact]
+    public void StageDelete_ProtectsReferencesAndInitialStage()
+    {
+        var session = new StrategyEditorSession(new StrategyStore(_directory));
+        session.Create("引用");
+        var first = session.Current.Stages[0];
+        var second = session.AddStage();
+        first.Transitions.Add(new StageTransition { TargetStageId = second.Id });
+        Assert.Throws<InvalidOperationException>(() => session.DeleteStage(first));
+        Assert.Throws<InvalidOperationException>(() => session.DeleteStage(second));
+        first.Transitions.Clear();
+        session.DeleteStage(second);
+        Assert.Single(session.Current.Stages);
+    }
+
+    [Fact]
+    public void DefaultCannotBeEditedButCanBeCopied()
+    {
+        var session = new StrategyEditorSession(new StrategyStore(_directory));
+        Assert.True(session.IsReadOnly);
+        Assert.Throws<InvalidOperationException>(() => session.AddStage());
+        session.Duplicate();
+        Assert.False(session.IsReadOnly);
+        Assert.True(session.HasUnsavedChanges);
+        session.Current.Stages[0].Name = "自定义";
+        Assert.Equal("全程作战", StrategyDefaults.Create().Stages[0].Name);
+    }
+
+    public void Dispose()
+    {
+        if (Directory.Exists(_directory)) Directory.Delete(_directory, true);
+        if (File.Exists(_directory)) File.Delete(_directory);
+    }
+}
diff --git a/MFAAvalonia.Tests/CombatStrategyMenuTests.cs b/MFAAvalonia.Tests/CombatStrategyMenuTests.cs
new file mode 100644
index 00000000..7f88ed24
--- /dev/null
+++ b/MFAAvalonia.Tests/CombatStrategyMenuTests.cs
@@ -0,0 +1,80 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Templates;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+using MFAAvalonia.Features.CombatStrategies;
+using MFAAvalonia.Views.Pages;
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace MFAAvalonia.Tests;
+
+[CollectionDefinition("策略界面", DisableParallelization = true)]
+public sealed class CombatStrategyUiCollection { }
+
+[Collection("策略界面")]
+public sealed class CombatStrategyMenuTests
+{
+    [Theory]
+    [InlineData("删除", false, false)]
+    [InlineData("重命名", false, false)]
+    [InlineData("删除", true, false)]
+    [InlineData("重命名", true, false)]
+    [InlineData("删除", false, true)]
+    [InlineData("重命名", false, true)]
+    [InlineData("删除", true, true)]
+    [InlineData("重命名", true, true)]
+    public void ContextMenu_ClickPromptsAndChangesTheClickedStrategy(string action, bool requestAlreadyHandled, bool isSelected)
+    {
+        var directory = Path.Combine(Path.GetTempPath(), "map-menu-tests", Guid.NewGuid().ToString("N"));
+        try
+        {
+            var store = new StrategyStore(directory);
+            var document = StrategyDefaults.CreateEditable("右键目标");
+            store.Save(document);
+            var session = new StrategyEditorSession(store);
+            if (isSelected) session.Select(document.Id);
+            var prompted = false;
+            var view = new CombatStrategyView(session,
+                (_, name) => { Assert.Equal(document.Name, name); prompted = true; return Task.FromResult<string?>("修改后的名称"); },
+                name => { Assert.Equal(document.Name, name); prompted = true; return Task.FromResult(true); });
+            var target = session.Catalog.Strategies.Single(x => x.Id == document.Id);
+            var list = view.FindControl<ListBox>("StrategyList")!;
+            var row = list.ItemTemplate!.Build(target)!;
+            row.DataContext = target;
+            var menu = row.ContextMenu!;
+            list.Template = new FuncControlTemplate<ListBox>((_, _) => new StackPanel { Children = { row } });
+            list.ApplyTemplate();
+            Assert.Contains(list, row.GetVisualAncestors());
+            // 触发真实菜单打开事件，同时阻止创建依赖桌面平台的弹出窗口。
+            menu.Opening += (_, e) => e.Cancel = true;
+            // 模拟框架先自动打开菜单并将请求标记为已处理。
+            using var consumeRequest = Control.ContextRequestedEvent.AddClassHandler<Border>((sender, e) =>
+            {
+                if (requestAlreadyHandled && ReferenceEquals(sender, row)) e.Handled = true;
+            });
+            row.GetVisualDescendants().OfType<TextBlock>().Single()
+                .RaiseEvent(new ContextRequestedEventArgs { RoutedEvent = Control.ContextRequestedEvent });
+            var item = menu.Items.OfType<MenuItem>().Single(x => Equals(x.Header, action));
+            item.RaiseEvent(new RoutedEventArgs(MenuItem.ClickEvent));
+            Assert.True(prompted);
+            Assert.Equal(isSelected && action != "删除" ? document.Id : "default", session.Current.Id);
+            if (action == "删除")
+                Assert.DoesNotContain(store.List().Strategies, x => x.Id == document.Id);
+            else
+            {
+                if (isSelected)
+                {
+                    Assert.Equal("修改后的名称", session.Current.Name);
+                    Assert.True(session.HasUnsavedChanges);
+                    view.FindControl<Button>("SaveStrategy")!.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
+                }
+                Assert.Equal("修改后的名称", store.Load(document.Id).Name);
+            }
+        }
+        finally { if (Directory.Exists(directory)) Directory.Delete(directory, true); }
+    }
+}
diff --git a/MFAAvalonia.Tests/CombatStrategyNavigationTests.cs b/MFAAvalonia.Tests/CombatStrategyNavigationTests.cs
new file mode 100644
index 00000000..1303c29b
--- /dev/null
+++ b/MFAAvalonia.Tests/CombatStrategyNavigationTests.cs
@@ -0,0 +1,36 @@
+using MFAAvalonia.Features.CombatStrategies.Controls;
+using SukiUI.Controls;
+using Avalonia.Controls;
+using System.Reflection;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace MFAAvalonia.Tests;
+
+[Collection("策略界面")]
+public sealed class CombatStrategyNavigationTests
+{
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public async Task DirtyEditor_RestoresSelectionUntilLeaveDecision(bool allow)
+    {
+        var menu = new SukiSideMenu();
+        var editor = new SukiSideMenuItem { Header = "策略", PageContent = new TextBlock { Text = "策略内容" } };
+        var home = new SukiSideMenuItem { Header = "首页", PageContent = new TextBlock { Text = "首页内容" } };
+        var content = new SukiTransitioningContentControl();
+        typeof(SukiSideMenu).GetField("_contentControl", BindingFlags.Instance | BindingFlags.NonPublic)!.SetValue(menu, content);
+        menu.Items.Add(editor);
+        menu.Items.Add(home);
+        menu.SelectedItem = editor;
+        var decision = new TaskCompletionSource<bool>();
+        using var guard = new CombatStrategyNavigationGuard(menu, editor, () => true, () => decision.Task);
+        menu.SelectedItem = home;
+        Assert.Same(editor, menu.SelectedItem);
+        Assert.Same(editor.PageContent, content.Content);
+        decision.SetResult(allow);
+        await guard.PendingNavigation;
+        Assert.Same(allow ? home : editor, menu.SelectedItem);
+        Assert.Same((allow ? home : editor).PageContent, content.Content);
+    }
+}
diff --git a/MFAAvalonia.Tests/CombatStrategyStoreTests.cs b/MFAAvalonia.Tests/CombatStrategyStoreTests.cs
new file mode 100644
index 00000000..6908196a
--- /dev/null
+++ b/MFAAvalonia.Tests/CombatStrategyStoreTests.cs
@@ -0,0 +1,222 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using MFAAvalonia.Features.CombatStrategies;
+using Xunit;
+
+namespace MFAAvalonia.Tests;
+
+public sealed class CombatStrategyStoreTests : IDisposable
+{
+    private readonly string _directory = Path.Combine(Path.GetTempPath(), "map-strategy-tests", Guid.NewGuid().ToString("N"));
+
+    [Fact]
+    public void SaveLoad_PreservesNestedConditionsAndStageTargets()
+    {
+        var store = new StrategyStore(_directory);
+        var strategy = StrategyDefaults.CreateEditable("循环策略");
+        var first = strategy.Stages[0];
+        var second = new StrategyStage { Name = "乱舞" };
+        strategy.Stages.Add(second);
+        first.Actions.Ultimates = [new() { Slot = 2 }, new() { Slot = 1 }, new() { Slot = 3 }];
+        first.Actions.Ultimates[2].Condition = new ConditionGroup
+        {
+            Children =
+            [
+                new ConditionPredicate { Metric = ConditionMetric.StageNormalLinks, Comparison = ComparisonOperator.GreaterOrEqual, Value = 2 },
+                new ConditionGroup
+                {
+                    Match = ConditionMatch.Any,
+                    Children =
+                    [
+                        new ConditionPredicate { Metric = ConditionMetric.UltimateReleased, Slots = [1], SlotMatch = ConditionMatch.All, Expected = true },
+                        new ConditionPredicate { Metric = ConditionMetric.UltimateReleased, Slots = [2], SlotMatch = ConditionMatch.All, Expected = true }
+                    ]
+                }
+            ]
+        };
+        first.Transitions.Add(new StageTransition
+        {
+            TargetStageId = second.Id,
+            Condition = new ConditionGroup
+            {
+                Children = [new ConditionPredicate { Metric = ConditionMetric.FrenzyActive, Expected = true }]
+            }
+        });
+        store.Save(strategy);
+        var saved = File.ReadAllText(Path.Combine(_directory, strategy.Id + ".json"));
+        using var json = JsonDocument.Parse(saved);
+        Assert.Equal(1, json.RootElement.GetProperty("schema_version").GetInt32());
+        Assert.Equal("循环策略", store.Load(strategy.Id).Name);
+        var loaded = store.Load(strategy.Id);
+        Assert.Equal([2, 1, 3], loaded.Stages[0].Actions.Ultimates.Select(x => x.Slot));
+        Assert.Equal(second.Id, loaded.Stages[0].Transitions[0].TargetStageId);
+        var condition = Assert.IsType<ConditionGroup>(loaded.Stages[0].Actions.Ultimates[2].Condition);
+        Assert.Equal(2, Assert.IsType<ConditionPredicate>(condition.Children[0]).Value);
+        Assert.Equal(ConditionMatch.Any, Assert.IsType<ConditionGroup>(condition.Children[1]).Match);
+    }
+
+    [Fact]
+    public void Save_InvalidReferenceDoesNotOverwriteExistingFile()
+    {
+        var store = new StrategyStore(_directory);
+        var strategy = StrategyDefaults.CreateEditable("原策略");
+        store.Save(strategy);
+        var original = File.ReadAllText(Path.Combine(_directory, strategy.Id + ".json"));
+        strategy.Stages[0].Transitions.Add(new StageTransition
+        {
+            TargetStageId = Guid.NewGuid().ToString("N"),
+            Condition = new ConditionGroup { Children = [new ConditionPredicate { Metric = ConditionMetric.BattleNormalLinks, Comparison = ComparisonOperator.GreaterOrEqual, Value = 8 }] }
+        });
+        Assert.Throws<StrategyValidationException>(() => store.Save(strategy));
+        Assert.Equal(original, File.ReadAllText(Path.Combine(_directory, strategy.Id + ".json")));
+    }
+
+    [Fact]
+    public void List_ReportsCorruptAndFutureFilesWithoutOverwritingThem()
+    {
+        Directory.CreateDirectory(_directory);
+        var corruptId = Guid.NewGuid().ToString("N");
+        var future = StrategyDefaults.CreateEditable("未来策略");
+        File.WriteAllText(Path.Combine(_directory, corruptId + ".json"), "{破损");
+        var json = StrategyJson.Serialize(future).Replace("\"schema_version\": 1", "\"schema_version\": 99");
+        File.WriteAllText(Path.Combine(_directory, future.Id + ".json"), json);
+        var catalog = new StrategyStore(_directory).List();
+        Assert.Single(catalog.Strategies);
+        Assert.Equal("default", catalog.Strategies[0].Id);
+        Assert.Equal(2, catalog.Errors.Count);
+        Assert.Equal("{破损", File.ReadAllText(Path.Combine(_directory, corruptId + ".json")));
+        Assert.Throws<StrategyValidationException>(() => new StrategyStore(_directory).Load(future.Id));
+    }
+
+    [Fact]
+    public void Store_ProtectsDefaultAndRejectsPathTraversal()
+    {
+        var store = new StrategyStore(_directory);
+        Assert.Equal("default", store.Load("default").Id);
+        Assert.Throws<InvalidOperationException>(() => store.Save(StrategyDefaults.Create()));
+        Assert.Throws<InvalidOperationException>(() => store.Delete("default"));
+        Assert.Throws<ArgumentException>(() => store.Load("../outside"));
+        Assert.Throws<ArgumentException>(() => store.Delete("../outside"));
+    }
+
+    [Fact]
+    public void DocumentationExample_LoadsNestedSlotDependencies()
+    {
+        var root = new DirectoryInfo(AppContext.BaseDirectory);
+        while (root != null && !Directory.Exists(Path.Combine(root.FullName, "docs", "zh"))) root = root.Parent;
+        Assert.NotNull(root);
+        var document = StrategyJson.Deserialize(File.ReadAllText(Path.Combine(root.FullName, "docs", "examples", "combat-strategy-v1.json")));
+        Assert.Equal(new[] { 2, 1, 3 }, document.Stages[0].Actions.Ultimates.Select(x => x.Slot));
+        var condition = Assert.IsType<ConditionGroup>(document.Stages[0].Actions.Ultimates[2].Condition);
+        Assert.Equal(2, Assert.IsType<ConditionPredicate>(condition.Children[0]).Value);
+        Assert.Equal(ConditionMatch.Any, Assert.IsType<ConditionGroup>(condition.Children[1]).Match);
+    }
+
+    [Theory]
+    [InlineData("actions")]
+    [InlineData("frenzy")]
+    [InlineData("transitions")]
+    public void Deserialize_RejectsMissingRequiredStageConfiguration(string field)
+    {
+        var node = System.Text.Json.Nodes.JsonNode.Parse(StrategyJson.Serialize(StrategyDefaults.CreateEditable("完整性")))!;
+        node["stages"]![0]!.AsObject().Remove(field);
+        Assert.Throws<StrategyValidationException>(() => StrategyJson.Deserialize(node.ToJsonString()));
+    }
+
+    [Theory]
+    [InlineData(ConditionMetric.EnemyHpPercent, -1)]
+    [InlineData(ConditionMetric.AllyHpPercent, 101)]
+    [InlineData(ConditionMetric.StageNormalLinks, 1.5)]
+    public void Validate_RejectsInvalidNumericConditions(ConditionMetric metric, double value)
+    {
+        var strategy = StrategyDefaults.CreateEditable("数值测试");
+        strategy.Stages[0].Actions.Ultimates[0].Condition = new ConditionGroup
+        {
+            Children = [new ConditionPredicate { Metric = metric, Comparison = ComparisonOperator.LessOrEqual, Value = (decimal)value }]
+        };
+        Assert.NotEmpty(StrategyValidator.Validate(strategy));
+    }
+
+    [Fact]
+    public void Validate_RejectsEmptyTransitionAndOwnReadinessCondition()
+    {
+        var strategy = StrategyDefaults.CreateEditable("条件测试");
+        strategy.Stages[0].Actions.Ultimates[0].Condition = new ConditionGroup
+        {
+            Children = [new ConditionPredicate { Metric = ConditionMetric.UltimateReady, Slots = [1], SlotMatch = ConditionMatch.All, Expected = true }]
+        };
+        strategy.Stages[0].Transitions.Add(new StageTransition { TargetStageId = strategy.Stages[0].Id });
+        Assert.True(StrategyValidator.Validate(strategy).Count >= 2);
+    }
+
+    [Fact]
+    public void Clone_DoesNotShareMutableConditions()
+    {
+        var original = StrategyDefaults.CreateEditable("复制来源");
+        original.Stages[0].Actions.Ultimates[0].Condition = new ConditionGroup
+        {
+            Children = [new ConditionPredicate { Metric = ConditionMetric.EnemyHp, Comparison = ComparisonOperator.LessOrEqual, Value = 10000 }]
+        };
+        var clone = StrategyJson.Clone(original);
+        var clonedGroup = Assert.IsType<ConditionGroup>(clone.Stages[0].Actions.Ultimates[0].Condition);
+        Assert.IsType<ConditionPredicate>(clonedGroup.Children[0]).Value = 2000;
+        var originalGroup = Assert.IsType<ConditionGroup>(original.Stages[0].Actions.Ultimates[0].Condition);
+        Assert.Equal(10000, Assert.IsType<ConditionPredicate>(originalGroup.Children[0]).Value);
+    }
+
+    [Fact]
+    public void Validate_RejectsLeafAsRootCondition()
+    {
+        var strategy = StrategyDefaults.CreateEditable("错误根节点");
+        strategy.Stages[0].Actions.Ultimates[0].Condition = new ConditionPredicate
+        {
+            Metric = ConditionMetric.EnemyHp, Comparison = ComparisonOperator.LessOrEqual, Value = 10000
+        };
+        Assert.NotEmpty(StrategyValidator.Validate(strategy));
+    }
+
+    [Fact]
+    public void Validate_RejectsExtraNullUltimate()
+    {
+        var strategy = StrategyDefaults.CreateEditable("空位置");
+        strategy.Stages[0].Actions.Ultimates.Add(null!);
+        Assert.NotEmpty(StrategyValidator.Validate(strategy));
+    }
+
+    [Fact]
+    public void List_ReportsFileWithReservedDefaultName()
+    {
+        Directory.CreateDirectory(_directory);
+        File.WriteAllText(Path.Combine(_directory, "default.json"), "{}");
+        var catalog = new StrategyStore(_directory).List();
+        Assert.Single(catalog.Strategies);
+        Assert.Single(catalog.Errors);
+    }
+
+    [Fact]
+    public void Save_LockedDestinationKeepsOldFileAndCleansTemporaryFile()
+    {
+        if (!OperatingSystem.IsWindows()) return;
+        var store = new StrategyStore(_directory);
+        var strategy = StrategyDefaults.CreateEditable("原文件");
+        store.Save(strategy);
+        var path = Path.Combine(_directory, strategy.Id + ".json");
+        var original = File.ReadAllText(path);
+        strategy.Name = "不应写入";
+        using (var locked = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.None))
+        {
+            var error = Record.Exception(() => store.Save(strategy));
+            Assert.True(error is IOException or UnauthorizedAccessException);
+        }
+        Assert.Equal(original, File.ReadAllText(path));
+        Assert.Empty(Directory.EnumerateFiles(_directory, "*.tmp"));
+    }
+
+    public void Dispose()
+    {
+        if (Directory.Exists(_directory))
+            Directory.Delete(_directory, true);
+    }
+}
diff --git a/MFAAvalonia.Tests/MFAAvalonia.Tests.csproj b/MFAAvalonia.Tests/MFAAvalonia.Tests.csproj
new file mode 100644
index 00000000..81a103d6
--- /dev/null
+++ b/MFAAvalonia.Tests/MFAAvalonia.Tests.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="xunit.v3" Version="3.0.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MFAAvalonia\MFAAvalonia.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/MFAAvalonia/App.axaml.cs b/MFAAvalonia/App.axaml.cs
index 02ac1bdc..4bd32593 100644
--- a/MFAAvalonia/App.axaml.cs
+++ b/MFAAvalonia/App.axaml.cs
@@ -142,13 +142,17 @@ public override void Initialize()
             base.Initialize();
             AppPaths.Initialize();
             LoggerHelper.InitializeLogger();
+            AppPaths.CleanupObsoleteExecutableBackups(
+                message => LoggerHelper.Info(message),
+                message => LoggerHelper.Warning(message));
+            AppPaths.CleanupOldDebugLogs(
+                logInfo: message => LoggerHelper.Info(message),
+                logWarning: message => LoggerHelper.Warning(message));
             if (!IsRuntimeMissingMode && !IsTempDirMode)
             {
                 MaaProcessor.StartInterfacePreload();
+                MaaLogRotator.Start();
             }
-            AppPaths.CleanupObsoleteExecutableBackups(
-                message => LoggerHelper.Info(message),
-                message => LoggerHelper.Warning(message));
             AvaloniaXamlLoader.Load(this);
             LanguageHelper.Initialize();
             ConfigurationManager.Initialize();
@@ -304,6 +308,7 @@ public override void OnFrameworkInitializationCompleted()
 
     private void OnShutdownRequested(object sender, ShutdownRequestedEventArgs e)
     {
+        MaaLogRotator.Stop();
         TelemetryService.Shutdown();
         TrayIconManager.DisposeTrayIcon(this);
 
@@ -388,6 +393,7 @@ private static ViewsHelper ConfigureViews(ServiceCollection services)
             .AddView<ResourcesView, ResourcesViewModel>(services)
             .AddView<SettingsView, SettingsViewModel>(services)
             .AddView<ScreenshotView, ScreenshotViewModel>(services)
+            .AddView<CombatStrategyView, CombatStrategyViewModel>(services)
 
             // Add additional views
             .AddView<AddTaskDialogView, AddTaskDialogViewModel>(services)
diff --git a/MFAAvalonia/AppRuntime.cs b/MFAAvalonia/AppRuntime.cs
index c3529a85..229ba161 100644
--- a/MFAAvalonia/AppRuntime.cs
+++ b/MFAAvalonia/AppRuntime.cs
@@ -222,6 +222,11 @@ public static bool TryForwardLaunchCommand(int timeoutMilliseconds = 3000)
             {
                 if (connected) return false;
             }
+            catch (UnauthorizedAccessException)
+            {
+                // 既有实例可能以不同权限级别运行，无法转发时由新进程安静退出。
+                return true;
+            }
 
             Thread.Sleep(50);
         }
diff --git a/MFAAvalonia/Assets/Localization/Strings.en-US.resx b/MFAAvalonia/Assets/Localization/Strings.en-US.resx
index e0c10003..534a4f06 100644
--- a/MFAAvalonia/Assets/Localization/Strings.en-US.resx
+++ b/MFAAvalonia/Assets/Localization/Strings.en-US.resx
@@ -88,7 +88,7 @@
         <value>Applying update...</value>
     </data>
     <data name="AppTitle" xml:space="preserve">
-        <value>MFA Task Manager</value>
+        <value>MaaPazugiri</value>
     </data>
     <data name="AutoDetect" xml:space="preserve">
         <value>AutoDetect (Automatic Detection)</value>
@@ -837,6 +837,9 @@
     <data name="GlobalOption" xml:space="preserve">
         <value>Global Task Config</value>
     </data>
+    <data name="GlobalSetting" xml:space="preserve">
+        <value>Global</value>
+    </data>
     <data name="ControllerPresetConfig" xml:space="preserve">
         <value>Controller Preset Config</value>
     </data>
@@ -912,6 +915,9 @@
     <data name="SelectAll" xml:space="preserve">
         <value>Select All</value>
     </data>
+    <data name="ToggleSelectAll" xml:space="preserve">
+        <value>Select All / Deselect All</value>
+    </data>
     <data name="SelectExecutableFile" xml:space="preserve">
         <value>Select Executable File</value>
     </data>
@@ -1029,6 +1035,9 @@
     <data name="TaskStart" xml:space="preserve">
         <value>Starting task: {0}</value>
     </data>
+    <data name="TaskRoundComplete" xml:space="preserve">
+        <value>Task completed: {0} Progress {1}/{2}</value>
+    </data>
     <data name="TaskStopped" xml:space="preserve">
         <value>Task has been stopped</value>
     </data>
@@ -1850,7 +1859,7 @@ Please do not copy only the main executable by itself.</value>
         <value>Select All / Deselect All</value>
     </data>
     <data name="TutorialStepSelectAllDesc" xml:space="preserve">
-        <value>These two buttons quickly check or uncheck all tasks. The left one is "Select All" and the right one is "Deselect All".</value>
+        <value>This button switches between selecting and deselecting all tasks based on their current selection.</value>
     </data>
     <data name="TutorialStepAddTaskBtnTitle" xml:space="preserve">
         <value>Add &amp; Reset Tasks</value>
diff --git a/MFAAvalonia/Assets/Localization/Strings.ja-JP.resx b/MFAAvalonia/Assets/Localization/Strings.ja-JP.resx
index 26e28fa8..87bf4f2b 100644
--- a/MFAAvalonia/Assets/Localization/Strings.ja-JP.resx
+++ b/MFAAvalonia/Assets/Localization/Strings.ja-JP.resx
@@ -47,7 +47,7 @@
     <value>更新を適用しています...</value>
   </data>
   <data name="AppTitle" xml:space="preserve">
-    <value>MFA タスクマネージャー</value>
+    <value>MaaPazugiri</value>
   </data>
   <data name="AutoDetect" xml:space="preserve">
     <value>自動検出</value>
@@ -211,6 +211,9 @@
   <data name="GlobalOption" xml:space="preserve">
     <value>グローバルタスク設定</value>
   </data>
+  <data name="GlobalSetting" xml:space="preserve">
+    <value>グローバル</value>
+  </data>
   <data name="ControllerPresetConfig" xml:space="preserve">
     <value>コントローラープリセット設定</value>
   </data>
@@ -325,6 +328,9 @@
   <data name="TaskStart" xml:space="preserve">
     <value>タスク開始: {0}</value>
   </data>
+  <data name="TaskRoundComplete" xml:space="preserve">
+    <value>タスク完了: {0} 進捗 {1}/{2}</value>
+  </data>
   <data name="TaskStopped" xml:space="preserve">
     <value>タスクは停止しました</value>
   </data>
@@ -1294,6 +1300,9 @@
   <data name="SelectAll" xml:space="preserve">
         <value>すべて選択</value>
     </data>
+  <data name="ToggleSelectAll" xml:space="preserve">
+    <value>すべて選択／選択解除</value>
+  </data>
   <data name="SelectExecutableFile" xml:space="preserve">
         <value>実行可能ファイルの選択</value>
     </data>
@@ -2034,7 +2043,7 @@
         <value>すべて選択/すべて選択解除</value>
     </data>
   <data name="TutorialStepSelectAllDesc" xml:space="preserve">
-        <value>これら 2 つのボタンは、すべてのタスクをすばやくオンまたはオフにします。左が「すべて選択」、右が「すべて選択解除」です。</value>
+        <value>このボタンは、現在の選択状態に応じてすべてのタスクを選択または解除します。</value>
     </data>
   <data name="TutorialStepAddTaskBtnTitle" xml:space="preserve">
         <value>タスクの追加とリセット</value>
diff --git a/MFAAvalonia/Assets/Localization/Strings.resx b/MFAAvalonia/Assets/Localization/Strings.resx
index cd252e0c..a512869c 100644
--- a/MFAAvalonia/Assets/Localization/Strings.resx
+++ b/MFAAvalonia/Assets/Localization/Strings.resx
@@ -96,7 +96,7 @@
         <value>正在应用更新.....</value>
     </data>
     <data name="AppTitle" xml:space="preserve">
-        <value>MFA 任务管理器</value>
+        <value>MaaPazugiri</value>
     </data>
     <data name="AutoDetect" xml:space="preserve">
         <value>AutoDetect (自动检测)</value>
@@ -846,6 +846,9 @@
     <data name="GlobalOption" xml:space="preserve">
         <value>全局任务配置</value>
     </data>
+    <data name="GlobalSetting" xml:space="preserve">
+        <value>全局</value>
+    </data>
     <data name="ControllerPresetConfig" xml:space="preserve">
         <value>控制器预设配置</value>
     </data>
@@ -921,6 +924,9 @@
     <data name="SelectAll" xml:space="preserve">
         <value>全选</value>
     </data>
+    <data name="ToggleSelectAll" xml:space="preserve">
+        <value>全选/取消全选</value>
+    </data>
     <data name="SelectExecutableFile" xml:space="preserve">
         <value>选择可运行文件</value>
     </data>
@@ -1038,6 +1044,9 @@
     <data name="TaskStart" xml:space="preserve">
         <value>开始任务: {0}</value>
     </data>
+    <data name="TaskRoundComplete" xml:space="preserve">
+        <value>任务完成: {0} 进度 {1}/{2}</value>
+    </data>
     <data name="TaskStopped" xml:space="preserve">
         <value>任务已中止</value>
     </data>
@@ -1857,10 +1866,10 @@
         <value>任务执行过程中的日志信息会显示在这里，方便实时查看运行状态和排查问题。</value>
     </data>
     <data name="TutorialStepSelectAllTitle" xml:space="preserve">
-        <value>全选与全不选</value>
+        <value>全选与取消全选</value>
     </data>
     <data name="TutorialStepSelectAllDesc" xml:space="preserve">
-        <value>这两个按钮可以快速勾选或取消勾选所有任务。左侧为「全选」，右侧为「全不选」。</value>
+        <value>这个按钮会根据当前任务勾选情况，在全选和取消全选之间切换。</value>
     </data>
     <data name="TutorialStepAddTaskBtnTitle" xml:space="preserve">
         <value>添加与重置任务</value>
diff --git a/MFAAvalonia/Assets/Localization/Strings.zh-Hant.resx b/MFAAvalonia/Assets/Localization/Strings.zh-Hant.resx
index aba7179f..084447ab 100644
--- a/MFAAvalonia/Assets/Localization/Strings.zh-Hant.resx
+++ b/MFAAvalonia/Assets/Localization/Strings.zh-Hant.resx
@@ -88,7 +88,7 @@
         <value>正在套用更新.....</value>
     </data>
     <data name="AppTitle" xml:space="preserve">
-        <value>MFA 任務管理器</value>
+        <value>MaaPazugiri</value>
     </data>
     <data name="AutoDetect" xml:space="preserve">
         <value>AutoDetect (自動偵測)</value>
@@ -837,6 +837,9 @@
     <data name="GlobalOption" xml:space="preserve">
         <value>全域任務配置</value>
     </data>
+    <data name="GlobalSetting" xml:space="preserve">
+        <value>全域</value>
+    </data>
     <data name="ControllerPresetConfig" xml:space="preserve">
         <value>控制器預設配置</value>
     </data>
@@ -912,6 +915,9 @@
     <data name="SelectAll" xml:space="preserve">
         <value>全選</value>
     </data>
+    <data name="ToggleSelectAll" xml:space="preserve">
+        <value>全選/取消全選</value>
+    </data>
     <data name="SelectExecutableFile" xml:space="preserve">
         <value>選擇可執行檔案</value>
     </data>
@@ -1029,6 +1035,9 @@
     <data name="TaskStart" xml:space="preserve">
         <value>開始任務: {0}</value>
     </data>
+    <data name="TaskRoundComplete" xml:space="preserve">
+        <value>任務完成: {0} 進度 {1}/{2}</value>
+    </data>
     <data name="TaskStopped" xml:space="preserve">
         <value>任務已中止</value>
     </data>
@@ -1847,10 +1856,10 @@
         <value>任務執行過程中的日誌訊息會顯示在這裡，方便即時查看執行狀態和排查問題。</value>
     </data>
     <data name="TutorialStepSelectAllTitle" xml:space="preserve">
-        <value>全選與全不選</value>
+        <value>全選與取消全選</value>
     </data>
     <data name="TutorialStepSelectAllDesc" xml:space="preserve">
-        <value>這兩個按鈕可以快速勾選或取消勾選所有任務。左側為「全選」，右側為「全不選」。</value>
+        <value>這個按鈕會根據目前任務勾選情況，在全選和取消全選之間切換。</value>
     </data>
     <data name="TutorialStepAddTaskBtnTitle" xml:space="preserve">
         <value>新增與重置任務</value>
diff --git a/MFAAvalonia/Assets/fox-mascot.png b/MFAAvalonia/Assets/fox-mascot.png
new file mode 100644
index 00000000..dfc48838
Binary files /dev/null and b/MFAAvalonia/Assets/fox-mascot.png differ
diff --git a/MFAAvalonia/Assets/fox-scroll-crop.png b/MFAAvalonia/Assets/fox-scroll-crop.png
new file mode 100644
index 00000000..943813b8
Binary files /dev/null and b/MFAAvalonia/Assets/fox-scroll-crop.png differ
diff --git a/MFAAvalonia/Assets/logo.ico b/MFAAvalonia/Assets/logo.ico
index 5ba2eee3..ab9a9a47 100644
Binary files a/MFAAvalonia/Assets/logo.ico and b/MFAAvalonia/Assets/logo.ico differ
diff --git a/MFAAvalonia/Assets/logo.png b/MFAAvalonia/Assets/logo.png
new file mode 100644
index 00000000..d12f7502
Binary files /dev/null and b/MFAAvalonia/Assets/logo.png differ
diff --git a/MFAAvalonia/Extensions/MaaFW/AgentHelper.cs b/MFAAvalonia/Extensions/MaaFW/AgentHelper.cs
index 788c20f8..4091b08a 100644
--- a/MFAAvalonia/Extensions/MaaFW/AgentHelper.cs
+++ b/MFAAvalonia/Extensions/MaaFW/AgentHelper.cs
@@ -784,6 +784,16 @@ public static bool KillSingleAgent(AgentContext ctx, MaaTasker? taskerToDispose
             {
                 LoggerHelper.Warning($"检查 AgentClient LinkStop 状态失败：{e.Message}");
             }
+
+            try
+            {
+                agentClient.Dispose();
+                LoggerHelper.Info("AgentClient 已释放。");
+            }
+            catch (Exception e)
+            {
+                LoggerHelper.Warning($"释放 AgentClient 失败：{e.Message}");
+            }
         }
 
         // 步骤 2: 终止进程
diff --git a/MFAAvalonia/Extensions/MaaFW/Custom/ActionParamHelper.cs b/MFAAvalonia/Extensions/MaaFW/Custom/ActionParamHelper.cs
index 837def50..799f113e 100644
--- a/MFAAvalonia/Extensions/MaaFW/Custom/ActionParamHelper.cs
+++ b/MFAAvalonia/Extensions/MaaFW/Custom/ActionParamHelper.cs
@@ -2,6 +2,7 @@
 using Newtonsoft.Json.Linq;
 using MaaFramework.Binding;
 using System;
+using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
@@ -15,6 +16,41 @@ namespace MFAAvalonia.Extensions.MaaFW.Custom;
 /// </summary>
 public static class ActionParamHelper
 {
+    public static void ClickWithProgress<T>(this T context, int x, int y) where T : IMaaContext
+    {
+        context.Click(x, y);
+        ResolveOwnerProcessor(context)?.RecordCustomActionActivity();
+    }
+
+    public static void SwipeWithProgress<T>(this T context, int x1, int y1, int x2, int y2, int duration) where T : IMaaContext
+    {
+        context.Swipe(x1, y1, x2, y2, duration);
+        ResolveOwnerProcessor(context)?.RecordCustomActionActivity();
+    }
+
+    public static void TouchDownWithProgress<T>(this T context, int contact, int x, int y, int pressure) where T : IMaaContext
+    {
+        context.TouchDown(contact, x, y, pressure);
+        ResolveOwnerProcessor(context)?.RecordCustomActionActivity();
+    }
+
+    public static void TouchMoveWithProgress<T>(this T context, int contact, int x, int y, int pressure) where T : IMaaContext
+    {
+        context.TouchMove(contact, x, y, pressure);
+        ResolveOwnerProcessor(context)?.RecordCustomActionActivity();
+    }
+
+    public static void TouchUpWithProgress<T>(this T context, int contact) where T : IMaaContext
+    {
+        context.TouchUp(contact);
+        ResolveOwnerProcessor(context)?.RecordCustomActionActivity();
+    }
+
+    /// <summary>根据任务执行器定位所属实例，避免多实例时把进度记到当前选中的其它实例。</summary>
+    public static MaaProcessor? ResolveOwnerProcessor(IMaaContext? context)
+        => MaaProcessorManager.Instance.Instances.FirstOrDefault(processor => ReferenceEquals(processor.MaaTasker, context?.Tasker))
+           ?? MaaProcessorManager.Instance.Current;
+
     public static JObject Parse(string actionParam)
     {
         if (string.IsNullOrWhiteSpace(actionParam))
diff --git a/MFAAvalonia/Extensions/MaaFW/Custom/CompleteCurrentTaskAction.cs b/MFAAvalonia/Extensions/MaaFW/Custom/CompleteCurrentTaskAction.cs
new file mode 100644
index 00000000..06d2b6d4
--- /dev/null
+++ b/MFAAvalonia/Extensions/MaaFW/Custom/CompleteCurrentTaskAction.cs
@@ -0,0 +1,47 @@
+using MaaFramework.Binding;
+using MaaFramework.Binding.Custom;
+using MFAAvalonia.Helper;
+using System;
+
+namespace MFAAvalonia.Extensions.MaaFW.Custom;
+
+/// <summary>
+/// 请求当前队列项在本轮结束后停止重复执行。
+/// </summary>
+public sealed class CompleteCurrentTaskAction : IMaaCustomAction
+{
+    private readonly MaaProcessor _owner;
+
+    public string Name { get; set; } = nameof(CompleteCurrentTaskAction);
+
+    public CompleteCurrentTaskAction(MaaProcessor owner)
+    {
+        _owner = owner;
+    }
+
+    public bool Run<T>(T context, in RunArgs args, in RunResults results) where T : IMaaContext
+    {
+        try
+        {
+            var parameters = ActionParamHelper.Parse(args.ActionParam);
+            var reason = (string?)parameters["reason"];
+            if (string.IsNullOrWhiteSpace(reason))
+                reason = "提前结束当前任务";
+
+            if (!_owner.RequestEarlyCompletionForActiveTask(reason))
+            {
+                LoggerHelper.Warning("[提前结束任务] 当前没有可结束的队列项");
+                _owner.AddLog("[提前结束任务] 当前没有可结束的队列项");
+                return false;
+            }
+
+            return true;
+        }
+        catch (Exception ex)
+        {
+            LoggerHelper.Error($"[提前结束任务] 处理请求失败：{ex.Message}");
+            _owner.AddLog($"[提前结束任务] 处理请求失败：{ex.Message}");
+            return false;
+        }
+    }
+}
diff --git a/MFAAvalonia/Extensions/MaaFW/Custom/HeiLiuAction.cs b/MFAAvalonia/Extensions/MaaFW/Custom/HeiLiuAction.cs
index a13acde5..75854ccc 100644
--- a/MFAAvalonia/Extensions/MaaFW/Custom/HeiLiuAction.cs
+++ b/MFAAvalonia/Extensions/MaaFW/Custom/HeiLiuAction.cs
@@ -88,14 +88,14 @@ protected bool Execute(IMaaContext context, RunArgs args)
                 }
                 if (context.TemplateMatch("开始探索.png", image, out detail, 0.84, 1006, 470, 264, 250) && detail?.HitBox != null)
                 {
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     return true;
                 }
                 if (context.TemplateMatch("继续探索.png", image, out detail, 0.9, 1006, 470, 264, 250) && detail?.HitBox != null)
                 {
                     if (!context.TemplateMatch("放弃本次探索.png", image, out var de1, 0.75, 1002, 184, 274, 250))
                     {
-                        context.Click(detail.HitBox.X, detail.HitBox.Y);
+                        context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                         Leave(context, args, hasBacked: true);
                     }
                 }
@@ -112,14 +112,14 @@ protected bool Execute(IMaaContext context, RunArgs args)
                 if (context.TemplateMatch("特勤任务影像确认.png", image, out detail, 0.9, 598, 621, 79, 66) && detail?.HitBox != null)
                 {
                     Thread.Sleep(100);
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     Thread.Sleep(1000);
                     return true;
                 }
                 if (context.TemplateMatch("获得藏品或零件.png", image, out detail, 0.8, 592, 497, 110, 103) && detail?.HitBox != null)
                 {
                     Thread.Sleep(100);
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     Thread.Sleep(1000);
                     return true;
                 }
@@ -130,11 +130,11 @@ protected bool Execute(IMaaContext context, RunArgs args)
                 context.GetImage(ref image);
                 if (context.TemplateMatch("特勤.png", image, out detail, 0.9, 142, 192, 1107, 389) && detail?.HitBox != null)
                 {
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     return true;
                 }
-                context.Swipe(885, 406, 599, 406, 200);
-                context.Swipe(599, 406, 599, 806, 200);
+                context.SwipeWithProgress(885, 406, 599, 406, 200);
+                context.SwipeWithProgress(599, 406, 599, 806, 200);
                 return false;
             })).Until(context);
             Thread.Sleep(500);
@@ -143,11 +143,11 @@ protected bool Execute(IMaaContext context, RunArgs args)
                 context.GetImage(ref image);
                 if (context.TemplateMatch("特勤.png", image, out detail, 0.9, 142, 192, 1107, 389) && detail?.HitBox != null)
                 {
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                 }
                 if (context.TemplateMatch("确定.png", image, out detail, 0.9, 22, 569, 1251, 51) && detail?.HitBox != null)
                 {
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     return true;
                 }
                 return false;
@@ -162,33 +162,33 @@ protected bool Execute(IMaaContext context, RunArgs args)
                 if (context.TemplateMatch("稳扎稳打.png", image, out detail, 0.9, 294, 160, 330, 456) && detail?.HitBox != null)
                 {
                     Thread.Sleep(200);
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     return true;
                 }
                 if (cz != 1 && context.TemplateMatch("调查预付款.png", image, out detail, 0.9, 214, 205, 840, 292) && detail?.HitBox != null)
                 {
                     Thread.Sleep(200);
                     cz = 1;
-                    context.Click(detail.HitBox.X + 30, detail.HitBox.Y + 30);
+                    context.ClickWithProgress(detail.HitBox.X + 30, detail.HitBox.Y + 30);
                 }
                 if (cz != 1 && context.TemplateMatch("林间代步.png", image, out detail, 0.9, 214, 205, 840, 292) && detail?.HitBox != null)
                 {
                     Thread.Sleep(200);
                     cz = 1;
-                    context.Click(detail.HitBox.X + 30, detail.HitBox.Y + 30);
+                    context.ClickWithProgress(detail.HitBox.X + 30, detail.HitBox.Y + 30);
                 }
                 if (cz != 1 && context.TemplateMatch("退行补偿.png", image, out detail, 0.9, 214, 205, 840, 292) && detail?.HitBox != null)
                 {
                     Thread.Sleep(200);
                     cz = 1;
-                    context.Click(detail.HitBox.X + 30, detail.HitBox.Y + 30);
+                    context.ClickWithProgress(detail.HitBox.X + 30, detail.HitBox.Y + 30);
                 }
 
                 if (cz != 1 && context.TemplateMatch("空间租凭.png", image, out detail, 0.9, 214, 205, 840, 292) && detail?.HitBox != null)
                 {
                     Thread.Sleep(200);
                     cz = 1;
-                    context.Click(detail.HitBox.X + 30, detail.HitBox.Y + 30);
+                    context.ClickWithProgress(detail.HitBox.X + 30, detail.HitBox.Y + 30);
                 }
 
                 // if (cz != 1 && context.TemplateMatch("巢寄生.png", image, out detail, 0.9, 214, 205, 840, 292) && detail?.HitBox != null)
@@ -207,12 +207,12 @@ protected bool Execute(IMaaContext context, RunArgs args)
                 if (cz == 1 && context.TemplateMatch("确定.png", image, out detail, 0.8, 263, 564, 747, 61) && detail?.HitBox != null)
                 {
                     Thread.Sleep(1200);
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                 }
                 if (cz == 1 && context.TemplateMatch("获得藏品或零件.png", image, out detail, 0.8, 592, 497, 110, 103) && detail?.HitBox != null)
                 {
                     Thread.Sleep(500);
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                 }
                 return false;
             })).Until(context, sleepMilliseconds: 500);
@@ -222,12 +222,12 @@ protected bool Execute(IMaaContext context, RunArgs args)
                 context.GetImage(ref image);
                 if (context.TemplateMatch("稳扎稳打.png", image, out detail, 0.9, 294, 160, 330, 456) && detail?.HitBox != null)
                 {
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                 }
 
                 if (context.TemplateMatch("确定.png", image, out detail, 0.9, 352, 536, 205, 113) && detail?.HitBox != null)
                 {
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     return true;
                 }
                 return false;
@@ -241,7 +241,7 @@ protected bool Execute(IMaaContext context, RunArgs args)
                     if (context.TemplateMatch("招募.png", image, out detail, 0.9, 222, 374, 261, 256) && detail?.HitBox != null)
                     {
                         Thread.Sleep(200);
-                        context.Click(detail.HitBox.X, detail.HitBox.Y);
+                        context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                         return true;
                     }
                     return false;
@@ -253,7 +253,7 @@ protected bool Execute(IMaaContext context, RunArgs args)
                     if (context.TemplateMatch("招募.png", image, out detail, 0.9, 222, 374, 261, 256) && detail?.HitBox != null)
                     {
                         Thread.Sleep(600);
-                        context.Click(detail.HitBox.X, detail.HitBox.Y);
+                        context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     }
                     if (context.TemplateMatch("机械师.png", image, out detail, 0.85, 383, 45, 897, 599) && detail?.HitBox != null)
                     {
@@ -278,7 +278,7 @@ protected bool Execute(IMaaContext context, RunArgs args)
                     if (context.TemplateMatch("机械师.png", image, out detail, 0.85, 383, 45, 897, 599) && detail?.HitBox != null)
                     {
                         Thread.Sleep(100);
-                        context.Click(detail.HitBox.X, detail.HitBox.Y);
+                        context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     }
                     return false;
                 })).Until(context);
@@ -300,7 +300,7 @@ protected bool Execute(IMaaContext context, RunArgs args)
                     if (context.TemplateMatch("确认招募.png", image, out detail, 0.9, 1036, 623, 242, 97) && detail?.HitBox != null)
                     {
                         Thread.Sleep(100);
-                        context.Click(detail.HitBox.X, detail.HitBox.Y);
+                        context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                         return true;
                     }
                     return false;
@@ -313,7 +313,7 @@ protected bool Execute(IMaaContext context, RunArgs args)
                         Thread.Sleep(100);
                         return true;
                     }
-                    context.Click(1233, 13);
+                    context.ClickWithProgress(1233, 13);
                     return false;
                 })).Until(context);
             }
@@ -326,7 +326,7 @@ protected bool Execute(IMaaContext context, RunArgs args)
                     if (context.TemplateMatch("招募.png", image, out detail, 0.9, 188, 471, 1030, 158) && detail?.HitBox != null)
                     {
                         Thread.Sleep(200);
-                        context.Click(detail.HitBox.X, detail.HitBox.Y);
+                        context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                         return true;
                     }
                     return false;
@@ -338,13 +338,13 @@ protected bool Execute(IMaaContext context, RunArgs args)
                     if (context.TemplateMatch("招募.png", image, out detail, 0.9, 188, 471, 1030, 158) && detail?.HitBox != null)
                     {
                         Thread.Sleep(600);
-                        context.Click(detail.HitBox.X, detail.HitBox.Y);
+                        context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     }
                     if (context.TemplateMatch("放弃招募.png", image, out detail, 0.9, 817, 600, 260, 120) && detail?.HitBox != null)
                     {
 
                         Thread.Sleep(100);
-                        context.Click(detail.HitBox.X, detail.HitBox.Y);
+                        context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                         return true;
                     }
                     return false;
@@ -357,12 +357,12 @@ protected bool Execute(IMaaContext context, RunArgs args)
                     {
 
                         Thread.Sleep(100);
-                        context.Click(detail.HitBox.X, detail.HitBox.Y);
+                        context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     }
                     if (context.TemplateMatch("确认放弃.png", image, out detail, 0.9, 594, 410, 533, 168) && detail?.HitBox != null)
                     {
                         Thread.Sleep(100);
-                        context.Click(detail.HitBox.X + 70, detail.HitBox.Y + 20);
+                        context.ClickWithProgress(detail.HitBox.X + 70, detail.HitBox.Y + 20);
                         return true;
                     }
                     return false;
@@ -374,7 +374,7 @@ protected bool Execute(IMaaContext context, RunArgs args)
                 context.GetImage(ref image);
                 if (context.TemplateMatch("沉沦于树海.png", image, out detail, 0.9, 1030, 223, 250, 352) && detail?.HitBox != null)
                 {
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     return true;
                 }
                 return false;
@@ -409,7 +409,7 @@ protected bool Execute(IMaaContext context, RunArgs args)
                 if (context.TemplateMatch("行动力.png", image, out detail, 0.9, 1149, 71, 118, 116) && detail?.HitBox != null)
                 {
                     Thread.Sleep(100);
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     return true;
                 }
                 return false;
@@ -421,15 +421,15 @@ protected bool Execute(IMaaContext context, RunArgs args)
                 if (context.TemplateMatch("结构性原理1.png", image, out detail, 0.9, 845, 155, 435, 565) && detail?.HitBox != null)
                 {
                     Thread.Sleep(100);
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                     return true;
                 }
                 return false;
             })).Until(context);
             Thread.Sleep(1000);
-            context.Click(845, 155);
+            context.ClickWithProgress(845, 155);
             Thread.Sleep(200);
-            context.Click(845, 155);
+            context.ClickWithProgress(845, 155);
             // Thread.Sleep(200);
             // ((Func<bool>)(() =>
             // {
@@ -507,13 +507,13 @@ protected bool Execute(IMaaContext context, RunArgs args)
                     {
                         Thread.Sleep(100);
                         IsTrade = true;
-                        context.Click(detail.HitBox.X + 30, detail.HitBox.Y + 30);
+                        context.ClickWithProgress(detail.HitBox.X + 30, detail.HitBox.Y + 30);
                         return true;
                     }
                     if (context.TemplateMatch("未知.png", image, out detail, 0.8, 194, 81, 898, 552, order: "Horizontal", index: -1) && detail?.HitBox != null)
                     {
                         Thread.Sleep(100);
-                        context.Click(detail.HitBox.X + 30, detail.HitBox.Y + 30);
+                        context.ClickWithProgress(detail.HitBox.X + 30, detail.HitBox.Y + 30);
                         return true;
                     }
                     return false;
@@ -525,7 +525,7 @@ protected bool Execute(IMaaContext context, RunArgs args)
                     if (context.TemplateMatch("出发前往.png", image, out detail, 0.8, 913, 460, 367, 180) && detail?.HitBox != null)
                     {
                         Thread.Sleep(100);
-                        context.Click(detail.HitBox.X + 30, detail.HitBox.Y + 30);
+                        context.ClickWithProgress(detail.HitBox.X + 30, detail.HitBox.Y + 30);
                         return true;
                     }
                     return false;
@@ -663,7 +663,7 @@ public bool SaveMoney(IMaaContext context, RunArgs args)
             var image = context.GetImage();
             if (context.TemplateMatch("Roguelike@StageTraderInvestSystem.png", image, out detail, 0.75, 400, 172, 230, 150))
             {
-                context.Click(detail.HitBox.X, detail.HitBox.Y);
+                context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                 return true;
             }
             return false;
@@ -676,12 +676,12 @@ public bool SaveMoney(IMaaContext context, RunArgs args)
 
             if (context.TemplateMatch("Roguelike@StageTraderInvestSystem.png", image, out detail, 0.75, 400, 172, 230, 150))
             {
-                context.Click(detail.HitBox.X, detail.HitBox.Y);
+                context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
             }
             if (context.TemplateMatch("Roguelike@StageTraderInvestSystemEnter.png", image, out detail, 0.9, 460, 273, 420, 200))
             {
                 LoggerHelper.Info($"{detail.HitBox.X}, {detail.HitBox.Y}");
-                context.Click(640, 360);
+                context.ClickWithProgress(640, 360);
                 return true;
             }
             return false;
@@ -701,7 +701,7 @@ public bool SaveMoney(IMaaContext context, RunArgs args)
             var image = context.GetImage();
             if (context.TemplateMatch("Roguelike@StageTraderInvestSystemEnter.png", image, out detail, 0.9, 460, 273, 420, 200))
             {
-                context.Click(640, 360);
+                context.ClickWithProgress(640, 360);
             }
             if (context.TemplateMatch("Roguelike@StageTraderInvestSystemError.png", image, out detail, 0.9, 454,
                     191,
@@ -734,11 +734,11 @@ public bool SaveMoney(IMaaContext context, RunArgs args)
                 result = 0;
                 return true;
             }
-            context.Click(980, 495);
+            context.ClickWithProgress(980, 495);
             Thread.Sleep(70);
-            context.Click(980, 495);
+            context.ClickWithProgress(980, 495);
             Thread.Sleep(70);
-            context.Click(980, 495);
+            context.ClickWithProgress(980, 495);
             error++;
             if (error >= 50)
             {
@@ -817,7 +817,7 @@ public void GetSomething(IMaaContext context)
         Thread.Sleep(1000);
         for (int i = 0; i < 3; i++)
         {
-            context.Click(624, 355);
+            context.ClickWithProgress(624, 355);
             Thread.Sleep(150);
         }
         var xh = () =>
@@ -828,7 +828,7 @@ public void GetSomething(IMaaContext context)
                 Thread.Sleep(1000);
                 return true;
             }
-            context.Click(624, 355);
+            context.ClickWithProgress(624, 355);
             return false;
         };
         xh.Until(context);
@@ -836,7 +836,7 @@ public void GetSomething(IMaaContext context)
 
         SelectOne(context, 1, 1);
         Thread.Sleep(1000);
-        context.Click(624, 355);
+        context.ClickWithProgress(624, 355);
         Thread.Sleep(1000);
         SelectOne(context, 1, 3);
         var leaving = () =>
@@ -846,7 +846,7 @@ public void GetSomething(IMaaContext context)
             {
                 return true;
             }
-            context.Click(628, 621);
+            context.ClickWithProgress(628, 621);
             return false;
         };
         leaving.Until(context);
@@ -863,7 +863,7 @@ public void SeedShop(IMaaContext context)
     {
         return true;
     }
-    context.Click(628, 621);
+    context.ClickWithProgress(628, 621);
     return false;
 };
         leaving.Until(context);
@@ -874,7 +874,7 @@ public void SeedShop(IMaaContext context)
     {
         return true;
     }
-    context.Click(628, 621);
+    context.ClickWithProgress(628, 621);
     return false;
 };
         confirmleaving.Until(context);
@@ -885,7 +885,7 @@ public void MeetByChance(IMaaContext context)
         Thread.Sleep(1000);
         for (int i = 0; i < 3; i++)
         {
-            context.Click(624, 355);
+            context.ClickWithProgress(624, 355);
             Thread.Sleep(150);
         }
         var image = context.GetImage();
@@ -959,7 +959,7 @@ public void MeetByChance(IMaaContext context)
             {
                 return true;
             }
-            context.Click(628, 621);
+            context.ClickWithProgress(628, 621);
             return false;
         };
         leaving.Until(context);
@@ -1005,7 +1005,7 @@ public void Combat(IMaaContext context, string NodeName)
             if (context.TemplateMatch("进入作战.png", image, out detail, 0.9, 973, 421, 307, 256) && detail?.HitBox != null)
             {
                 Thread.Sleep(800);
-                context.Click(detail.HitBox.X + 100, detail.HitBox.Y + 50);
+                context.ClickWithProgress(detail.HitBox.X + 100, detail.HitBox.Y + 50);
                 return true;
             }
             return false;
@@ -1016,7 +1016,7 @@ public void Combat(IMaaContext context, string NodeName)
             if (context.TemplateMatch("开始作战.png", image, out detail, 0.9, 894, 571, 386, 149) && detail?.HitBox != null)
             {
                 Thread.Sleep(800);
-                context.Click(detail.HitBox.X + 100, detail.HitBox.Y + 50);
+                context.ClickWithProgress(detail.HitBox.X + 100, detail.HitBox.Y + 50);
                 return true;
             }
             return false;
@@ -1027,7 +1027,7 @@ public void Combat(IMaaContext context, string NodeName)
             if (context.TemplateMatch("确认放弃.png", image, out detail, 0.9, 594, 410, 533, 168) && detail?.HitBox != null)
             {
                 Thread.Sleep(800);
-                context.Click(detail.HitBox.X + 100, detail.HitBox.Y + 30);
+                context.ClickWithProgress(detail.HitBox.X + 100, detail.HitBox.Y + 30);
                 return true;
             }
             return false;
@@ -1040,7 +1040,7 @@ public void Combat(IMaaContext context, string NodeName)
             if (context.TemplateMatch("局内设置.png", image, out detail, 0.9, 0, 0, 169, 162) && detail?.HitBox != null)
             {
                 Thread.Sleep(1000);
-                context.Click(detail.HitBox.X + 30, detail.HitBox.Y + 30);
+                context.ClickWithProgress(detail.HitBox.X + 30, detail.HitBox.Y + 30);
                 return true;
             }
             return false;
@@ -1050,12 +1050,12 @@ public void Combat(IMaaContext context, string NodeName)
             context.GetImage(ref image);
             if (context.TemplateMatch("局内设置.png", image, out detail, 0.9, 0, 0, 169, 162) && detail?.HitBox != null)
             {
-                context.Click(detail.HitBox.X + 30, detail.HitBox.Y + 30);
+                context.ClickWithProgress(detail.HitBox.X + 30, detail.HitBox.Y + 30);
             }
             if (context.TemplateMatch("局内放弃行动.png", image, out detail, 0.9, 633, 214, 249, 271) && detail?.HitBox != null)
             {
                 Thread.Sleep(800);
-                context.Click(detail.HitBox.X + 100, detail.HitBox.Y + 50);
+                context.ClickWithProgress(detail.HitBox.X + 100, detail.HitBox.Y + 50);
                 return true;
             }
             return false;
@@ -1066,12 +1066,12 @@ public void Combat(IMaaContext context, string NodeName)
             if (context.TemplateMatch("局内放弃行动.png", image, out detail, 0.9, 633, 214, 249, 271) && detail?.HitBox != null)
             {
                 Thread.Sleep(800);
-                context.Click(detail.HitBox.X + 100, detail.HitBox.Y + 50);
+                context.ClickWithProgress(detail.HitBox.X + 100, detail.HitBox.Y + 50);
             }
             if (context.TemplateMatch("确认放弃行动.png", image, out detail, 0.9, 682, 411, 319, 164) && detail?.HitBox != null)
             {
                 Thread.Sleep(800);
-                context.Click(detail.HitBox.X + 70, detail.HitBox.Y + 50);
+                context.ClickWithProgress(detail.HitBox.X + 70, detail.HitBox.Y + 50);
                 return true;
             }
             return false;
@@ -1083,7 +1083,7 @@ public void Combat(IMaaContext context, string NodeName)
             if (context.TemplateMatch("一败涂地.png", image, out detail, 0.9, 418, 47, 450, 401) && detail?.HitBox != null)
             {
                 Thread.Sleep(800);
-                context.Click(detail.HitBox.X, detail.HitBox.Y);
+                context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                 return true;
             }
             return false;
@@ -1097,7 +1097,7 @@ public void Combat(IMaaContext context, string NodeName)
             {
                 return true;
             }
-            context.Click(628, 621);
+            context.ClickWithProgress(628, 621);
             return false;
         })).Until(context);
     }
@@ -1127,11 +1127,11 @@ public void SelectOne(IMaaContext context, int targetOptionIndex, int totalOptio
             context.GetImage(ref image);
             if (context.TemplateMatch("确认这么做.png", image, out var detail, 0.8, 1032, 0, 247, 720) && detail?.HitBox != null)
             {
-                context.Click(detail.HitBox.X, detail.HitBox.Y);
+                context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                 return true;
             }
             LoggerHelper.Info($"{clickX}, {(int)clickY}");
-            context.Click(clickX, (int)clickY);
+            context.ClickWithProgress(clickX, (int)clickY);
             return false;
         };
         select.Until(context);
@@ -1219,7 +1219,7 @@ public bool Leave(IMaaContext context, RunArgs args, bool hasExited = false, boo
                     var image = context.GetImage();
                     if (context.TemplateMatch("Roguelike@ExitThenAbandon.png", image, out var detail, 0.75, 0, 0, 130, 60) && detail?.HitBox != null)
                     {
-                        context.Click(detail.HitBox.X, detail.HitBox.Y);
+                        context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                         return true;
                     }
                     return false;
@@ -1231,11 +1231,11 @@ public bool Leave(IMaaContext context, RunArgs args, bool hasExited = false, boo
                 var image = context.GetImage();
                 if (context.TemplateMatch("Roguelike@ExitThenAbandon.png", image, out var detail, 0.75, 0, 0, 130, 60) && detail?.HitBox != null)
                 {
-                    context.Click(detail.HitBox.X, detail.HitBox.Y);
+                    context.ClickWithProgress(detail.HitBox.X, detail.HitBox.Y);
                 }
                 if (context.TemplateMatch("放弃本次探索.png", image, out detail, 0.75, 1002, 184, 274, 250) && detail?.HitBox != null)
                 {
-                    context.Click(detail.HitBox.X + 50, detail.HitBox.Y + 50);
+                    context.ClickWithProgress(detail.HitBox.X + 50, detail.HitBox.Y + 50);
                     return true;
                 }
                 return false;
@@ -1246,12 +1246,12 @@ public bool Leave(IMaaContext context, RunArgs args, bool hasExited = false, boo
                 var image = context.GetImage();
                 if (context.TemplateMatch("放弃本次探索.png", image, out var detail, 0.75, 1002, 184, 274, 250) && detail?.HitBox != null)
                 {
-                    context.Click(detail.HitBox.X + 50, detail.HitBox.Y + 50);
+                    context.ClickWithProgress(detail.HitBox.X + 50, detail.HitBox.Y + 50);
                 }
                 if (context.TemplateMatch("确认放弃.png", image, out detail, 0.9, 594, 410, 533, 168) && detail?.HitBox != null)
                 {
                     Thread.Sleep(100);
-                    context.Click(detail.HitBox.X + 70, detail.HitBox.Y + 20);
+                    context.ClickWithProgress(detail.HitBox.X + 70, detail.HitBox.Y + 20);
                     return true;
                 }
                 return false;
@@ -1265,7 +1265,7 @@ public bool Leave(IMaaContext context, RunArgs args, bool hasExited = false, boo
                 Thread.Sleep(1400);
                 return true;
             }
-            context.Click(631, 610);
+            context.ClickWithProgress(631, 610);
             return false;
         })).Until(context, sleepMilliseconds: 500, maxCount: 300);
         Thread.Sleep(1400);
@@ -1276,7 +1276,7 @@ public bool Leave(IMaaContext context, RunArgs args, bool hasExited = false, boo
             {
                 return true;
             }
-            context.Click(631, 610);
+            context.ClickWithProgress(631, 610);
             return false;
         })).Until(context, sleepMilliseconds: 500, maxCount: 300);
         Thread.Sleep(1400);
@@ -1287,7 +1287,7 @@ public bool Leave(IMaaContext context, RunArgs args, bool hasExited = false, boo
             {
                 return true;
             }
-            context.Click(631, 610);
+            context.ClickWithProgress(631, 610);
             return false;
         })).Until(context, sleepMilliseconds: 500, maxCount: 300);
         return true;
diff --git a/MFAAvalonia/Extensions/MaaFW/Custom/RestartGameAction.cs b/MFAAvalonia/Extensions/MaaFW/Custom/RestartGameAction.cs
new file mode 100644
index 00000000..fef54e04
--- /dev/null
+++ b/MFAAvalonia/Extensions/MaaFW/Custom/RestartGameAction.cs
@@ -0,0 +1,820 @@
+using MaaFramework.Binding;
+using MaaFramework.Binding.Custom;
+using MFAAvalonia.Configuration;
+using MFAAvalonia.Helper;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+
+namespace MFAAvalonia.Extensions.MaaFW.Custom;
+
+public class RestartGameAction : IMaaCustomAction
+{
+    private readonly MaaProcessor? _owner;
+
+    public string Name { get; set; } = nameof(RestartGameAction);
+
+    public RestartGameAction(MaaProcessor? owner = null)
+    {
+        _owner = owner;
+    }
+
+    /// <summary>模拟器无响应或游戏重启期间 ADB 超时时，必须跳过温和重启并强制重启实例。</summary>
+    public static bool ShouldForceEmulatorRestart(bool emulatorUnresponsive, bool gameRestartAdbTimedOut)
+        => emulatorUnresponsive || gameRestartAdbTimedOut;
+
+    /// <summary>只有观察到旧 ADB 连接断开且随后恢复可用，才能确认模拟器已经重启。</summary>
+    public static bool IsEmulatorRestartConfirmed(bool observedOldConnectionUnavailable, bool adbReady)
+        => observedOldConnectionUnavailable && adbReady;
+
+    private string? _adbPath;
+    private string? _adbSerial;
+    private string? _deviceName;
+    private EmulatorKind _emulatorKind;
+    private string? _emulatorInstallRoot;
+    private string? _emulatorConsoleExe;
+    private string? _emulatorLaunchExe;
+    private string[] _emulatorProcessNames = [];
+    private (string Shutdown, string Launch)? _emulatorConsoleCommands;
+    private string _configuredLaunchArguments = string.Empty;
+    private bool _mumuConsoleUsesVmIndexFlag;
+    private int? _instanceIndex;
+
+    // 模拟器重启的等待策略：挂死的实例不会响应控制命令，过长的轮询只会拖慢恢复
+    private const int AdbReadyAttemptsPerRound = 12;
+    private const int AdbReadyAttemptTimeoutMs = 3000;
+    private const int AdbReadyIntervalMs = 2000;
+    private const int EmulatorStartRounds = 2;
+    private const int KillProcessWaitMs = 10000;
+    private const int GracefulCloseWaitMs = 8000;
+
+    private CancellationToken _recoveryToken;
+
+    private string InstanceText => _instanceIndex?.ToString() ?? "默认";
+
+    private void WaitForRecovery(int milliseconds)
+    {
+        if (_recoveryToken.WaitHandle.WaitOne(milliseconds))
+            _recoveryToken.ThrowIfCancellationRequested();
+    }
+
+    private void EnsureEmulatorEnvironment(MaaProcessor? owner = null)
+    {
+        if (_adbPath != null) return;
+
+        var processor = owner ?? MaaProcessorManager.Instance.Current;
+        int? configuredIndex = null;
+        string? configuredEmulatorPath = null;
+        var configuredSoftwarePath = string.Empty;
+        if (processor != null)
+        {
+            _adbPath = processor.Config.AdbDevice.AdbPath;
+            _adbSerial = processor.Config.AdbDevice.AdbSerial;
+            _deviceName = processor.Config.AdbDevice.Name;
+
+            // 启动设置里的软件路径与启动参数是用户显式配置，优先级高于任何自动探测
+            configuredSoftwarePath = processor.InstanceConfiguration.GetValue(ConfigurationKeys.SoftwarePath, string.Empty);
+            _configuredLaunchArguments = processor.InstanceConfiguration.GetValue(ConfigurationKeys.EmulatorConfig, string.Empty);
+
+            var configStr = processor.Config.AdbDevice.Config;
+            if (!string.IsNullOrWhiteSpace(configStr))
+            {
+                try
+                {
+                    using var doc = JsonDocument.Parse(configStr);
+                    if (doc.RootElement.TryGetProperty("extras", out var extras) &&
+                        extras.TryGetProperty("mumu", out var mumu))
+                    {
+                        if (mumu.TryGetProperty("path", out var path))
+                            configuredEmulatorPath = path.GetString();
+                        if (mumu.TryGetProperty("index", out var index) &&
+                            index.ValueKind == JsonValueKind.Number &&
+                            index.TryGetInt32(out var parsedIndex))
+                            configuredIndex = parsedIndex;
+                    }
+                }
+                catch { }
+            }
+        }
+        _adbPath ??= "adb";
+        _adbSerial ??= "";
+
+        var softwareExePath = ResolveConfiguredExecutable(configuredSoftwarePath);
+        var (runningKind, runningExePath) = EmulatorEnvironmentHelper.DetectRunningEmulator();
+
+        // 类型识别顺序：启动设置的软件路径 → 设备名 → 连接配置里的 MuMu 环境 → 运行中的模拟器进程
+        _emulatorKind = EmulatorEnvironmentHelper.DetectKindByExecutablePath(softwareExePath);
+        if (_emulatorKind == EmulatorKind.Unknown)
+            _emulatorKind = EmulatorEnvironmentHelper.DetectKindByDeviceName(Path.GetFileName(configuredSoftwarePath));
+        if (_emulatorKind == EmulatorKind.Unknown)
+            _emulatorKind = EmulatorEnvironmentHelper.DetectKindByDeviceName(_deviceName);
+        if (_emulatorKind == EmulatorKind.Unknown && !string.IsNullOrWhiteSpace(configuredEmulatorPath))
+            _emulatorKind = EmulatorKind.MuMu;
+        if (_emulatorKind == EmulatorKind.Unknown)
+            _emulatorKind = runningKind;
+
+        _emulatorProcessNames = EmulatorEnvironmentHelper.GetProcessNames(_emulatorKind);
+        _emulatorConsoleCommands = EmulatorEnvironmentHelper.GetConsoleCommands(_emulatorKind);
+
+        var probeRoots = BuildProbeRoots(softwareExePath, configuredEmulatorPath, runningExePath);
+        foreach (var root in probeRoots)
+        {
+            _emulatorConsoleExe = EmulatorEnvironmentHelper.FindConsole(_emulatorKind, root, runningExePath);
+            if (_emulatorConsoleExe == null) continue;
+            _emulatorInstallRoot = root;
+            break;
+        }
+
+        _emulatorLaunchExe = ResolveLaunchExecutable(softwareExePath, configuredSoftwarePath, probeRoots, runningExePath);
+        if (_emulatorInstallRoot == null)
+        {
+            foreach (var root in probeRoots)
+            {
+                if (EmulatorEnvironmentHelper.FindLaunchExecutable(_emulatorKind, root, runningExePath) == null) continue;
+                _emulatorInstallRoot = root;
+                break;
+            }
+        }
+        _emulatorInstallRoot ??= probeRoots.FirstOrDefault();
+
+        // 没有控制入口时只能靠结束主程序进程，MuMu 旧版需要连带结束 MuMuPlayer.exe
+        if (_emulatorKind == EmulatorKind.MuMu && _emulatorConsoleExe == null)
+            _emulatorProcessNames = [.. _emulatorProcessNames, EmulatorEnvironmentHelper.MuMuLegacyProcessName];
+
+        _mumuConsoleUsesVmIndexFlag = _emulatorConsoleExe != null
+                                      && Path.GetFileName(_emulatorConsoleExe)
+                                          .Equals("mumu-cli.exe", StringComparison.OrdinalIgnoreCase);
+
+        // 实例序号优先取启动设置的启动参数，其次连接配置，最后按 ADB 端口反推
+        _instanceIndex = EmulatorEnvironmentHelper.ResolveInstanceIndexFromArguments(_configuredLaunchArguments)
+                         ?? configuredIndex
+                         ?? EmulatorEnvironmentHelper.ResolveInstanceIndex(_emulatorKind, _adbSerial);
+
+        LoggerHelper.Info(
+            $"[RestartGameAction] 模拟器环境：类型={_emulatorKind}，设备名={_deviceName ?? "未知"}，" +
+            $"安装目录={_emulatorInstallRoot ?? "未解析"}，实例={InstanceText}，" +
+            $"控制台={_emulatorConsoleExe ?? "无"}，主程序={_emulatorLaunchExe ?? "无"}，" +
+            $"启动设置路径={configuredSoftwarePath ?? string.Empty}，启动参数={_configuredLaunchArguments}");
+    }
+
+    /// <summary>启动设置的软件路径可能为空或指向快捷方式，这里只接受真实存在的可执行文件。</summary>
+    private static string? ResolveConfiguredExecutable(string? configuredSoftwarePath)
+        => !string.IsNullOrWhiteSpace(configuredSoftwarePath)
+           && File.Exists(configuredSoftwarePath)
+           && configuredSoftwarePath.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)
+            ? configuredSoftwarePath
+            : null;
+
+    /// <summary>收集候选安装目录：启动设置的软件路径 → 连接配置中的模拟器路径 → 运行中进程反推。</summary>
+    private List<string> BuildProbeRoots(string? softwareExePath, string? configuredEmulatorPath, string? runningExePath)
+    {
+        var roots = new List<string>();
+        AddProbeRoot(roots, string.IsNullOrWhiteSpace(softwareExePath)
+            ? null
+            : EmulatorEnvironmentHelper.ResolveInstallRoot(_emulatorKind, softwareExePath));
+        AddProbeRoot(roots, string.IsNullOrWhiteSpace(softwareExePath) ? null : Path.GetDirectoryName(softwareExePath));
+        AddProbeRoot(roots, configuredEmulatorPath);
+        AddProbeRoot(roots, EmulatorEnvironmentHelper.ResolveInstallRoot(_emulatorKind, runningExePath));
+        return roots;
+    }
+
+    private static void AddProbeRoot(List<string> roots, string? candidate)
+    {
+        if (string.IsNullOrWhiteSpace(candidate) || !Directory.Exists(candidate)) return;
+        if (!roots.Contains(candidate, StringComparer.OrdinalIgnoreCase)) roots.Add(candidate);
+    }
+
+    private string? ResolveLaunchExecutable(string? softwareExePath, string configuredSoftwarePath,
+        List<string> probeRoots, string? runningExePath)
+    {
+        if (!string.IsNullOrWhiteSpace(softwareExePath))
+            return softwareExePath;
+
+        foreach (var root in probeRoots)
+        {
+            var launchExe = EmulatorEnvironmentHelper.FindLaunchExecutable(_emulatorKind, root, runningExePath);
+            if (launchExe != null)
+                return launchExe;
+        }
+
+        // 启动设置允许填快捷方式，直接交给 ShellExecute 启动
+        return File.Exists(configuredSoftwarePath)
+               && configuredSoftwarePath.EndsWith(".lnk", StringComparison.OrdinalIgnoreCase)
+            ? configuredSoftwarePath
+            : null;
+    }
+
+    private static string GetPackageName()
+    {
+        return TaskRecoveryPolicy.TargetPackageName;
+    }
+
+    /// <summary>
+    /// 重启模拟器。force 为 true 表示模拟器已判定无响应（挂起形态），
+    /// 此时不做温和重启：挂起的实例不会响应控制命令，直接强杀进程后重新拉起。
+    /// </summary>
+    private bool RestartEmulator(bool force)
+    {
+        _recoveryToken.ThrowIfCancellationRequested();
+        if (!OperatingSystem.IsWindows())
+        {
+            LoggerHelper.Warning("[RestartGameAction] 当前平台不支持模拟器重启命令");
+            return false;
+        }
+
+        switch (_emulatorKind)
+        {
+            case EmulatorKind.MuMu:
+                return RestartMuMuEmulator(force);
+            case EmulatorKind.LDPlayer:
+            case EmulatorKind.Nox:
+            case EmulatorKind.MEmu:
+                return RestartConsoleEmulator(force);
+            case EmulatorKind.BlueStacks:
+                return RestartProcessLevelEmulator();
+            default:
+                LoggerHelper.Error(
+                    $"[RestartGameAction] 未识别模拟器类型（设备名={_deviceName ?? "未知"}），无法自动重启模拟器；" +
+                    "请手动重启模拟器后继续任务");
+                return false;
+        }
+    }
+
+    /// <summary>MuMu：mumu-cli 走温和重启，MuMuManager 与无响应形态直接强制重启。</summary>
+    private bool RestartMuMuEmulator(bool force)
+    {
+        if (_emulatorConsoleExe == null && _emulatorLaunchExe == null)
+        {
+            LoggerHelper.Error("[RestartGameAction] 未找到 MuMu 控制入口与主程序，无法重启模拟器");
+            return false;
+        }
+
+        if (force || !_mumuConsoleUsesVmIndexFlag)
+        {
+            if (!force)
+                LoggerHelper.Info("[RestartGameAction] 控制入口为 MuMuManager，直接走强制重启路径");
+            return RestartMuMuForce();
+        }
+
+        LoggerHelper.Info($"[RestartGameAction] 通过控制台重启模拟器实例 {InstanceText}...");
+        if (RunConsoleCommand(BuildMuMuArguments("restart"), 30000))
+        {
+            LoggerHelper.Info("[RestartGameAction] 控制命令已提交，等待旧 ADB 连接断开...");
+            var oldConnectionUnavailable = WaitForAdbDisconnected(
+                AdbReadyAttemptsPerRound, AdbReadyAttemptTimeoutMs, AdbReadyIntervalMs);
+            if (oldConnectionUnavailable)
+            {
+                LoggerHelper.Info("[RestartGameAction] 已观察到旧 ADB 连接断开，等待模拟器重新就绪...");
+                var adbReady = WaitForAdbReady(
+                    AdbReadyAttemptsPerRound, AdbReadyAttemptTimeoutMs, AdbReadyIntervalMs);
+                if (IsEmulatorRestartConfirmed(oldConnectionUnavailable, adbReady))
+                {
+                    LoggerHelper.Info("[RestartGameAction] 已确认模拟器重启完成");
+                    return true;
+                }
+            }
+
+            LoggerHelper.Warning("[RestartGameAction] 未确认控制命令实际重启模拟器，转为强制重启");
+        }
+        else
+        {
+            LoggerHelper.Warning("[RestartGameAction] 控制命令重启未成功，转为强制重启");
+        }
+
+        return RestartMuMuForce();
+    }
+
+    /// <summary>
+    /// MuMu 强制重启：先强杀设备进程（挂起进程也能强杀），确认进程退出后再拉起实例，
+    /// 并以 ADB 就绪作为唯一判定标准；一次未就绪会再提交一次启动命令。
+    /// </summary>
+    private bool RestartMuMuForce()
+    {
+        StopAndWaitEmulatorExit(KillProcessWaitMs);
+        return LaunchAndWaitReady();
+    }
+
+    /// <summary>
+    /// 雷电、夜神、逍遥：优先用各自控制台关闭实例，控制台不可用或未生效时强制结束进程，
+    /// 再通过控制台拉起实例。
+    /// </summary>
+    private bool RestartConsoleEmulator(bool force)
+    {
+        var closed = false;
+        if (!force && _emulatorConsoleExe != null && _emulatorConsoleCommands != null)
+        {
+            LoggerHelper.Info($"[RestartGameAction] 通过控制台关闭模拟器实例 {InstanceText}...");
+            closed = RunConsoleCommand(BuildConsoleArguments(_emulatorConsoleCommands.Value.Shutdown), 20000)
+                     && WaitForEmulatorProcessesExit(GracefulCloseWaitMs);
+            if (!closed)
+                LoggerHelper.Warning("[RestartGameAction] 控制台关闭未生效，改为强制结束模拟器进程");
+        }
+
+        if (!closed)
+            StopAndWaitEmulatorExit(KillProcessWaitMs);
+
+        return LaunchAndWaitReady();
+    }
+
+    /// <summary>蓝叠没有按实例控制的稳定接口，只能结束主程序再重新启动，不保证只影响目标实例。</summary>
+    private bool RestartProcessLevelEmulator()
+    {
+        LoggerHelper.Warning("[RestartGameAction] 蓝叠不支持按实例控制，按进程级别重启模拟器");
+        StopAndWaitEmulatorExit(KillProcessWaitMs);
+        return LaunchAndWaitReady();
+    }
+
+    private bool LaunchAndWaitReady()
+    {
+        for (var round = 0; round < EmulatorStartRounds; round++)
+        {
+            if (round > 0)
+                LoggerHelper.Warning("[RestartGameAction] 模拟器仍未就绪，重新提交一次启动命令");
+
+            if (!LaunchEmulatorInstance())
+                LoggerHelper.Warning("[RestartGameAction] 模拟器启动命令未成功提交，继续等待 ADB 就绪");
+
+            if (WaitForAdbReady(AdbReadyAttemptsPerRound, AdbReadyAttemptTimeoutMs, AdbReadyIntervalMs))
+            {
+                LoggerHelper.Info("[RestartGameAction] 模拟器已重新就绪");
+                return true;
+            }
+        }
+
+        LoggerHelper.Error("[RestartGameAction] 模拟器重启后仍未就绪");
+        return false;
+    }
+
+    /// <summary>拉起模拟器实例：优先控制台命令，控制台不可用时启动主程序。</summary>
+    private bool LaunchEmulatorInstance()
+    {
+        var arguments = BuildLaunchArguments();
+        if (arguments != null && RunConsoleCommand(arguments, 15000))
+            return true;
+
+        if (_emulatorLaunchExe == null)
+            return false;
+
+        LoggerHelper.Info($"[RestartGameAction] 启动模拟器主程序（{_emulatorLaunchExe}）...");
+        try
+        {
+            Process.Start(new ProcessStartInfo(_emulatorLaunchExe, BuildLaunchExecutableArguments())
+            {
+                UseShellExecute = true,
+            });
+            return true;
+        }
+        catch (Exception e)
+        {
+            LoggerHelper.Info($"[RestartGameAction] 启动模拟器主程序异常: {e.Message}");
+            return false;
+        }
+    }
+
+    private string? BuildLaunchArguments()
+    {
+        if (_emulatorConsoleExe == null)
+            return null;
+        if (_emulatorKind == EmulatorKind.MuMu)
+            return BuildMuMuArguments("launch");
+
+        var template = _emulatorConsoleCommands?.Launch;
+        return template == null ? null : BuildConsoleArguments(template);
+    }
+
+    /// <summary>
+    /// 主程序启动参数：优先用启动设置里的启动参数（用户配置的实例选择），
+    /// 其次为 MuMu 旧版补 -v，其余模拟器主程序不带实例参数。
+    /// </summary>
+    private string BuildLaunchExecutableArguments()
+    {
+        if (!string.IsNullOrWhiteSpace(_configuredLaunchArguments))
+            return _configuredLaunchArguments;
+
+        return _emulatorKind == EmulatorKind.MuMu && (_instanceIndex ?? 0) > 0 ? $"-v {_instanceIndex}" : "";
+    }
+
+    private string BuildMuMuArguments(string command)
+    {
+        var index = _instanceIndex ?? 0;
+        return _mumuConsoleUsesVmIndexFlag
+            ? $"control --vmindex {index} {command}"
+            : $"control -v {index} {command}";
+    }
+
+    private string BuildConsoleArguments(string template)
+        => string.Format(CultureInfo.InvariantCulture, template, _instanceIndex ?? 0);
+
+    /// <summary>结束该模拟器的全部相关进程；进程不存在时跳过。</summary>
+    private void ForceStopEmulatorProcesses()
+    {
+        foreach (var processName in _emulatorProcessNames)
+        {
+            if (!IsProcessRunning(processName)) continue;
+            LoggerHelper.Info($"[RestartGameAction] 强制结束 {processName}.exe...");
+            RunHiddenProcess("taskkill", $"/F /IM {processName}.exe /T", 8000);
+        }
+    }
+
+    private void StopAndWaitEmulatorExit(int waitMs)
+    {
+        ForceStopEmulatorProcesses();
+        if (!WaitForEmulatorProcessesExit(waitMs))
+            LoggerHelper.Warning(
+                $"[RestartGameAction] 模拟器进程在 {waitMs / 1000} 秒内仍未退出，继续尝试启动实例");
+        WaitForRecovery(2000);
+    }
+
+    private bool WaitForEmulatorProcessesExit(int timeoutMs)
+    {
+        var deadline = Environment.TickCount64 + timeoutMs;
+        while (Environment.TickCount64 < deadline)
+        {
+            if (!AnyEmulatorProcessRunning())
+                return true;
+            WaitForRecovery(500);
+        }
+
+        return !AnyEmulatorProcessRunning();
+    }
+
+    private bool AnyEmulatorProcessRunning() => _emulatorProcessNames.Any(IsProcessRunning);
+
+    private static bool IsProcessRunning(string processName)
+    {
+        try
+        {
+            return Process.GetProcessesByName(processName).Length > 0;
+        }
+        catch
+        {
+            // 查询进程失败时按已退出处理，避免重启流程被查询异常打断
+            return false;
+        }
+    }
+
+    /// <summary>执行模拟器控制台命令，返回是否成功（退出码 0）。</summary>
+    private bool RunConsoleCommand(string arguments, int timeoutMs)
+    {
+        if (_emulatorConsoleExe == null)
+            return false;
+
+        LoggerHelper.Info($"[RestartGameAction] 执行 {Path.GetFileName(_emulatorConsoleExe)} {arguments}");
+        var (timedOut, exitCode, standardOutput, standardError) =
+            RunHiddenProcess(_emulatorConsoleExe, arguments, timeoutMs);
+        if (timedOut)
+        {
+            LoggerHelper.Info($"[RestartGameAction] 控制台命令超时（{timeoutMs / 1000} 秒），按失败处理");
+            return false;
+        }
+        if (exitCode == 0)
+            return true;
+
+        var detail = string.Join(' ', new[] { standardOutput, standardError }
+            .Where(text => !string.IsNullOrWhiteSpace(text)));
+        LoggerHelper.Info($"[RestartGameAction] 控制台命令返回异常: code={exitCode} {detail}".TrimEnd());
+        return false;
+    }
+
+    /// <summary>轮询 ADB，确认控制命令提交后旧连接曾经不可用。</summary>
+    private bool WaitForAdbDisconnected(int maxAttempts, int attemptTimeoutMs, int intervalMs)
+    {
+        for (var attempt = 0; attempt < maxAttempts; attempt++)
+        {
+            _recoveryToken.ThrowIfCancellationRequested();
+            if (!IsAdbReady(attemptTimeoutMs))
+                return true;
+
+            WaitForRecovery(intervalMs);
+        }
+
+        return false;
+    }
+
+    /// <summary>轮询 ADB 判断模拟器是否恢复响应，返回是否就绪。</summary>
+    private bool WaitForAdbReady(int maxAttempts, int attemptTimeoutMs, int intervalMs)
+    {
+        for (var attempt = 0; attempt < maxAttempts; attempt++)
+        {
+            _recoveryToken.ThrowIfCancellationRequested();
+
+            if (IsAdbReady(attemptTimeoutMs))
+            {
+                LoggerHelper.Info("[RestartGameAction] 模拟器已就绪");
+                return true;
+            }
+
+            WaitForRecovery(intervalMs);
+        }
+
+        return false;
+    }
+
+    private bool IsAdbReady(int timeoutMs)
+    {
+        var arguments = string.IsNullOrWhiteSpace(_adbSerial)
+            ? "shell echo ready"
+            : $"-s {_adbSerial} shell echo ready";
+        var (timedOut, exitCode, _, _) = RunHiddenProcess(_adbPath!, arguments, timeoutMs);
+        return !timedOut && exitCode == 0;
+    }
+
+    /// <summary>
+    /// 运行外部命令并等待退出：异步读取输出，避免子进程因管道写满而挂住；
+    /// 超时后结束进程并返回 TimedOut=true。
+    /// </summary>
+    private static (bool TimedOut, int ExitCode, string StandardOutput, string StandardError) RunHiddenProcess(
+        string fileName, string arguments, int timeoutMs)
+    {
+        var startInfo = new ProcessStartInfo(fileName, arguments)
+        {
+            CreateNoWindow = true,
+            UseShellExecute = false,
+            RedirectStandardOutput = true,
+            RedirectStandardError = true,
+        };
+
+        Process? process = null;
+        try
+        {
+            process = Process.Start(startInfo);
+            if (process == null)
+                return (false, -1, "", "无法启动进程");
+
+            var outputTask = process.StandardOutput.ReadToEndAsync();
+            var errorTask = process.StandardError.ReadToEndAsync();
+            if (!process.WaitForExit(timeoutMs))
+            {
+                try
+                {
+                    process.Kill(true);
+                    process.WaitForExit(2000);
+                }
+                catch { }
+                return (true, -1, outputTask.GetAwaiter().GetResult(), errorTask.GetAwaiter().GetResult());
+            }
+
+            return (false, process.ExitCode,
+                outputTask.GetAwaiter().GetResult().Trim(),
+                errorTask.GetAwaiter().GetResult().Trim());
+        }
+        catch (Exception e)
+        {
+            return (false, -1, "", e.Message);
+        }
+        finally
+        {
+            process?.Dispose();
+        }
+    }
+
+    /// <summary>
+    /// 执行一条 adb 命令，并返回命令是否成功
+    /// </summary>
+    private bool RunAdbCommand(string adbPath, string adbSerial, string args, out string output, out bool timedOut)
+    {
+        _recoveryToken.ThrowIfCancellationRequested();
+        var arguments = string.IsNullOrWhiteSpace(adbSerial) ? args : $"-s {adbSerial} {args}";
+        var (commandTimedOut, exitCode, standardOutput, standardError) = RunHiddenProcess(adbPath, arguments, 10000);
+        output = standardOutput;
+        timedOut = commandTimedOut;
+
+        if (commandTimedOut)
+        {
+            LoggerHelper.Error($"[RestartGameAction] ADB 命令执行超时: {args}");
+            return false;
+        }
+
+        if (exitCode != 0)
+        {
+            LoggerHelper.Error($"[RestartGameAction] ADB 命令执行失败: code={exitCode} out={standardOutput} err={standardError}");
+            return false;
+        }
+
+        if (!string.IsNullOrWhiteSpace(standardError))
+            LoggerHelper.Warning($"[RestartGameAction] ADB 命令返回警告: {standardError}");
+        return true;
+    }
+
+    private bool RunAdbCommand(string adbPath, string adbSerial, string args, out string output)
+        => RunAdbCommand(adbPath, adbSerial, args, out output, out _);
+
+    private bool RunAdbCommand(string adbPath, string adbSerial, string args)
+    {
+        return RunAdbCommand(adbPath, adbSerial, args, out _);
+    }
+
+    private bool TryResolveLaunchActivity(string package, out string launchActivity, out bool adbTimedOut)
+    {
+        launchActivity = "";
+        adbTimedOut = false;
+        if (!RunAdbCommand(
+                _adbPath!,
+                _adbSerial ?? "",
+                $"shell cmd package resolve-activity --brief -a android.intent.action.MAIN -c android.intent.category.LAUNCHER {package}",
+                out var output,
+                out adbTimedOut))
+            return false;
+
+        var component = output
+            .Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries)
+            .Select(line => line.Trim())
+            .LastOrDefault(line => line.StartsWith($"{package}/", StringComparison.Ordinal));
+        if (string.IsNullOrWhiteSpace(component))
+            return false;
+
+        launchActivity = component;
+        LoggerHelper.Info($"[RestartGameAction] 已解析游戏启动 Activity: {launchActivity}");
+        return true;
+    }
+
+    private bool IsGameRunning(string package)
+    {
+        if (RunAdbCommand(_adbPath!, _adbSerial ?? "", $"shell pidof {package} || true", out var processIds))
+        {
+            var processId = processIds
+                .Split((char[]?)null, StringSplitOptions.RemoveEmptyEntries)
+                .FirstOrDefault(value => int.TryParse(value, out _));
+            if (processId != null)
+            {
+                LoggerHelper.Info($"[RestartGameAction] pidof 检测到游戏进程：{processId}");
+                return true;
+            }
+        }
+
+        if (!RunAdbCommand(_adbPath!, _adbSerial ?? "", "shell ps -A", out var processList)
+            || string.IsNullOrWhiteSpace(processList))
+        {
+            LoggerHelper.Warning("[RestartGameAction] 无法确认游戏进程状态，将继续重启游戏");
+            return false;
+        }
+
+        var matchingProcess = processList
+            .Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries)
+            .FirstOrDefault(line =>
+            {
+                var processName = line.Split((char[]?)null, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
+                return processName != null
+                    && (string.Equals(processName, package, StringComparison.OrdinalIgnoreCase)
+                        || processName.StartsWith($"{package}:", StringComparison.OrdinalIgnoreCase));
+            });
+
+        if (matchingProcess != null)
+        {
+            LoggerHelper.Info($"[RestartGameAction] ps 检测到游戏进程：{matchingProcess.Trim()}");
+            return true;
+        }
+
+        LoggerHelper.Info($"[RestartGameAction] pidof 与 ps 均未发现游戏进程：{package}");
+        return false;
+    }
+
+    private bool TryRestartGame(string package, out bool adbTimedOut)
+    {
+        adbTimedOut = false;
+        _recoveryToken.ThrowIfCancellationRequested();
+        LoggerHelper.Info($"[RestartGameAction] 强制停止游戏进程: {package}");
+        if (!RunAdbCommand(_adbPath!, _adbSerial ?? "", $"shell am force-stop {package}", out _, out var stopTimedOut))
+            LoggerHelper.Info("[RestartGameAction] 强制停止游戏失败，继续尝试启动游戏");
+        adbTimedOut |= stopTimedOut;
+        WaitForRecovery(2000);
+
+        LoggerHelper.Info($"[RestartGameAction] 重新启动游戏: {package}");
+        if (TryResolveLaunchActivity(package, out var launchActivity, out var resolveTimedOut))
+        {
+            if (!RunAdbCommand(_adbPath!, _adbSerial ?? "", $"shell am start -n {launchActivity}", out _, out var startTimedOut))
+            {
+                adbTimedOut |= startTimedOut;
+                LoggerHelper.Info("[RestartGameAction] 使用已解析的 Activity 启动游戏失败");
+                return false;
+            }
+        }
+        else
+        {
+            adbTimedOut |= resolveTimedOut;
+            if (!RunAdbCommand(
+                    _adbPath!,
+                    _adbSerial ?? "",
+                    $"shell am start -a android.intent.action.MAIN -c android.intent.category.LAUNCHER -p {package}",
+                    out _,
+                    out var startTimedOut))
+            {
+                adbTimedOut |= startTimedOut;
+                LoggerHelper.Info("[RestartGameAction] 游戏启动失败");
+                return false;
+            }
+        }
+
+        LoggerHelper.Info("[RestartGameAction] 游戏重启完成");
+        return true;
+    }
+
+    /// <summary>
+    /// 从当前处理器收集模拟器环境，优先重启游戏；仅在游戏重启失败时重启模拟器后重试。
+    /// 供 pipeline node 与 MATR 层卡死循环检测恢复复用。
+    /// emulatorUnresponsive 为 true 表示模拟器已判定无响应（Maa 回调静默超时），
+    /// 此时先强制重启模拟器再启动游戏，避免在挂起的实例上白等 ADB 超时。
+    /// skipIfRunning 为 true 时，检测到游戏进程已运行则跳过重启。
+    /// </summary>
+    public static void RestartAndReloadGame(bool logAutoRecovery = true, MaaProcessor? processor = null,
+        CancellationToken token = default, bool emulatorUnresponsive = false, bool skipIfRunning = false)
+    {
+        token.ThrowIfCancellationRequested();
+        processor ??= MaaProcessorManager.Instance.Current;
+        if (!token.CanBeCanceled && processor?.CancellationTokenSource != null)
+            token = processor.CancellationTokenSource.Token;
+        token.ThrowIfCancellationRequested();
+        if (processor != null) processor.IsGameRecoveryRunning = true;
+        try
+        {
+            if (logAutoRecovery)
+                processor?.LogRestartEvent("重启游戏", "检测到游戏疑似卡死", true);
+            var action = new RestartGameAction { _recoveryToken = token };
+            action.EnsureEmulatorEnvironment(processor);
+
+            var package = GetPackageName();
+
+            if (skipIfRunning && !emulatorUnresponsive && action.IsGameRunning(package))
+            {
+                LoggerHelper.Info("[RestartGameAction] 游戏已运行，根据设置跳过重启");
+                return;
+            }
+
+            if (emulatorUnresponsive)
+            {
+                processor?.LogRestartEvent("重启模拟器", "模拟器无响应，强制重启模拟器", true);
+                if (!action.RestartEmulator(force: true))
+                {
+                    processor?.LogRestartEvent("重启模拟器", "模拟器重启失败，停止任务", true);
+                    throw new InvalidOperationException("模拟器重启失败，请检查模拟器路径、实例状态和 ADB 连接");
+                }
+
+                if (action.TryRestartGame(package, out _))
+                    processor?.LogRestartEvent("重启游戏", "模拟器重启完成，游戏已重新启动", false);
+                else
+                {
+                    processor?.LogRestartEvent("重启游戏", "模拟器已恢复，但游戏启动失败，停止任务", true);
+                    throw new InvalidOperationException("模拟器恢复后无法启动游戏");
+                }
+                return;
+            }
+
+            if (action.TryRestartGame(package, out var gameRestartAdbTimedOut))
+            {
+                processor?.LogRestartEvent("重启游戏", "游戏重启完成", false);
+                return;
+            }
+
+            var forceRestart = ShouldForceEmulatorRestart(emulatorUnresponsive, gameRestartAdbTimedOut);
+            processor?.LogRestartEvent("重启模拟器",
+                forceRestart ? "游戏重启期间 ADB 超时，强制重启模拟器" : "游戏重启失败，重启模拟器", true);
+            if (!action.RestartEmulator(force: forceRestart))
+            {
+                processor?.LogRestartEvent("重启模拟器", "模拟器重启失败，停止任务", true);
+                throw new InvalidOperationException("模拟器重启失败，请检查模拟器路径、实例状态和 ADB 连接");
+            }
+
+            if (!action.TryRestartGame(package, out _))
+            {
+                processor?.LogRestartEvent("重启游戏", "模拟器已恢复，但游戏启动失败，停止任务", true);
+                throw new InvalidOperationException("模拟器恢复后无法启动游戏");
+            }
+
+            processor?.LogRestartEvent("重启游戏", "游戏重启完成", false);
+        }
+        finally
+        {
+            if (processor != null) processor.IsGameRecoveryRunning = false;
+        }
+    }
+
+    public bool Run<T>(T context, in RunArgs args, in RunResults results) where T : IMaaContext
+    {
+        try
+        {
+            ActionParamHelper.ThrowIfStopping(context);
+            var parameters = ActionParamHelper.Parse(args.ActionParam);
+            var logAutoRecovery = (bool?)parameters["log_auto_recovery"] ?? true;
+            var skipIfRunning = (bool?)parameters["skip_if_running"] ?? false;
+            if (skipIfRunning)
+                LoggerHelper.Info("[RestartGameAction] 已启用游戏运行检测");
+            RestartAndReloadGame(logAutoRecovery, processor: _owner, skipIfRunning: skipIfRunning);
+            return true;
+        }
+        catch (MaaStopException)
+        {
+            LoggerHelper.Info("[RestartGameAction] 检测到手动停止，已取消执行");
+            return false;
+        }
+        catch (Exception e)
+        {
+            LoggerHelper.Error($"[RestartGameAction] 错误: {e.Message}");
+            return false;
+        }
+    }
+}
diff --git a/MFAAvalonia/Extensions/MaaFW/FocusHandler.cs b/MFAAvalonia/Extensions/MaaFW/FocusHandler.cs
index 39af7c07..2797e22d 100644
--- a/MFAAvalonia/Extensions/MaaFW/FocusHandler.cs
+++ b/MFAAvalonia/Extensions/MaaFW/FocusHandler.cs
@@ -43,11 +43,17 @@ public class FocusHandler
 
     private AutoInitDictionary autoInitDictionary;
     private readonly TaskQueueViewModel _viewModel;
+    private readonly Func<string, Task> _externalNotificationSender;
 
-    public FocusHandler(AutoInitDictionary autoInitDictionary, TaskQueueViewModel viewModel)
+    public FocusHandler(
+        AutoInitDictionary autoInitDictionary,
+        TaskQueueViewModel viewModel,
+        Func<string, Task>? externalNotificationSender = null)
     {
         this.autoInitDictionary = autoInitDictionary;
         _viewModel = viewModel;
+        _externalNotificationSender = externalNotificationSender
+                                      ?? (message => ExternalNotificationHelper.ExternalNotificationAsync(message));
     }
 
     public void UpdateDictionary(AutoInitDictionary dictionary)
@@ -238,6 +244,9 @@ private void DispatchToChannels(string displayText, List<string> displays)
                         LangKeys.Tip.ToLocalization(),
                         CreateFocusMarkdownContent(displayText, NotificationMarkdownMaxHeight));
                     break;
+                case "external_notification":
+                    _ = SendExternalNotificationAsync(displayText);
+                    break;
                 case "dialog":
                     // 非阻塞式弹窗：fire-and-forget，任务继续执行
                     Avalonia.Threading.Dispatcher.UIThread.Post(async () =>
@@ -283,6 +292,18 @@ await SukiMessageBox.ShowDialog(new SukiMessageBoxHost
         }
     }
 
+    private async Task SendExternalNotificationAsync(string displayText)
+    {
+        try
+        {
+            await _externalNotificationSender(displayText);
+        }
+        catch (Exception e)
+        {
+            LoggerHelper.Error($"发送 Focus 外部通知失败：原因={e.Message}", e);
+        }
+    }
+
     /// <summary>
     /// 处理旧协议消息
     /// </summary>
diff --git a/MFAAvalonia/Extensions/MaaFW/MaaAdbConnectionFallback.cs b/MFAAvalonia/Extensions/MaaFW/MaaAdbConnectionFallback.cs
new file mode 100644
index 00000000..f28ac78d
--- /dev/null
+++ b/MFAAvalonia/Extensions/MaaFW/MaaAdbConnectionFallback.cs
@@ -0,0 +1,14 @@
+using MaaFramework.Binding;
+
+namespace MFAAvalonia.Extensions.MaaFW;
+
+/// <summary>
+/// MuMu 专用 ADB 截图方式不可用时回退到通用方式。
+/// </summary>
+public static class MaaAdbConnectionFallback
+{
+    public static AdbScreencapMethods GetFallbackScreenCap(AdbScreencapMethods screenCap) =>
+        screenCap.HasFlag(AdbScreencapMethods.EmulatorExtras)
+            ? AdbScreencapMethods.Default
+            : screenCap;
+}
diff --git a/MFAAvalonia/Extensions/MaaFW/MaaInterface.cs b/MFAAvalonia/Extensions/MaaFW/MaaInterface.cs
index 09fb30e4..1c81026d 100644
--- a/MFAAvalonia/Extensions/MaaFW/MaaInterface.cs
+++ b/MFAAvalonia/Extensions/MaaFW/MaaInterface.cs
@@ -172,6 +172,10 @@ public partial class MaaInterfaceOption : ObservableObject
         [JsonProperty("type")]
         public string? Type { get; set; }
 
+        /// <summary>是否为下拉框启用搜索功能。</summary>
+        [JsonProperty("is_searchable")]
+        public bool IsSearchable { get; set; }
+
         /// <summary>
         /// 可选。指定该配置项适用的控制器类型列表。
         /// 数组元素应与 controller 配置中的 name 字段对应。
diff --git a/MFAAvalonia/Extensions/MaaFW/MaaProcessor.cs b/MFAAvalonia/Extensions/MaaFW/MaaProcessor.cs
index 5196629c..edee520c 100644
--- a/MFAAvalonia/Extensions/MaaFW/MaaProcessor.cs
+++ b/MFAAvalonia/Extensions/MaaFW/MaaProcessor.cs
@@ -47,6 +47,7 @@ public class MaaProcessor
     private static readonly Random Random = new();
     private int _taskQueueTotal;
     private int _isTaskRunActive;
+    private MFATask? _activeQueueTask;
     private readonly BlockingCollection<Func<Task>> _commandQueue = new();
     private readonly object _commandThreadLock = new();
     private readonly CancellationTokenSource _commandThreadCts = new();
@@ -399,17 +400,14 @@ public void AddLog(string content,
     public void AddLogByKey(string key, IBrush? brush = null, bool changeColor = true, bool transformKey = true, params string[] formatArgsKeys)
     {
         brush ??= Brushes.Black;
-        Task.Run(() =>
+        DispatcherHelper.PostOnMainThread(() =>
         {
-            DispatcherHelper.PostOnMainThread(() =>
-            {
-                var log = new LogItemViewModel(key, brush, "Regular", true, "HH':'mm':'ss", changeColor: changeColor, showTime: true, transformKey: transformKey, formatArgsKeys);
-                LogItemViewModels.Add(log);
-                PublishPlatformLog(log);
-                using var logScope = BeginInstanceLogScope("MonitorLog", "Monitor");
-                LoggerHelper.Info(log.Content);
-                TrimExcessLogs();
-            });
+            var log = new LogItemViewModel(key, brush, "Regular", true, "HH':'mm':'ss", changeColor: changeColor, showTime: true, transformKey: transformKey, formatArgsKeys);
+            LogItemViewModels.Add(log);
+            PublishPlatformLog(log);
+            using var logScope = BeginInstanceLogScope("MonitorLog", "Monitor");
+            LoggerHelper.Info(log.Content);
+            TrimExcessLogs();
         });
     }
 
@@ -422,20 +420,17 @@ public void AddLogByKey(string key, string color = "", bool changeColor = true,
     public void AddMarkdown(string key, IBrush? brush = null, bool changeColor = true, bool transformKey = true, params string[] formatArgsKeys)
     {
         brush ??= Brushes.Black;
-        Task.Run(() =>
+        DispatcherHelper.PostOnMainThread(() =>
         {
-            DispatcherHelper.PostOnMainThread(() =>
+            var log = new LogItemViewModel(key, brush, "Regular", true, "HH':'mm':'ss", changeColor: changeColor, showTime: true, transformKey: transformKey, formatArgsKeys)
             {
-                var log = new LogItemViewModel(key, brush, "Regular", true, "HH':'mm':'ss", changeColor: changeColor, showTime: true, transformKey: transformKey, formatArgsKeys)
-                {
-                    UseMarkdown = true
-                };
-                LogItemViewModels.Add(log);
-                PublishPlatformLog(log);
-                using var logScope = BeginInstanceLogScope("MonitorMarkdown", "Monitor");
-                LoggerHelper.Info(log.Content);
-                TrimExcessLogs();
-            });
+                UseMarkdown = true
+            };
+            LogItemViewModels.Add(log);
+            PublishPlatformLog(log);
+            using var logScope = BeginInstanceLogScope("MonitorMarkdown", "Monitor");
+            LoggerHelper.Info(log.Content);
+            TrimExcessLogs();
         });
     }
 
@@ -512,12 +507,37 @@ public MaaProcessor(string instanceId)
     /// modal 弹窗等待标志：FocusHandler 触发 modal 时设为 true，用户确认后设为 false
     /// </summary>
     private volatile bool _isWaitingForModal = false;
+    private readonly Stopwatch _recoveryClock = Stopwatch.StartNew();
+    private readonly TaskRecoveryMonitor _recoveryMonitor = new();
+    private int _isGameRecoveryRunning;
 
     /// <summary>
     /// 设置 modal 等待状态（由 FocusHandler 调用）
     /// </summary>
     public void SetWaitingForModal(bool waiting) => _isWaitingForModal = waiting;
 
+    public void RecordCustomActionActivity()
+    {
+        _recoveryMonitor.RecordActivity(_recoveryClock.Elapsed);
+    }
+
+    public bool RequestEarlyCompletionForActiveTask(string? reason)
+    {
+        var activeTask = Volatile.Read(ref _activeQueueTask);
+        return activeTask?.RequestEarlyCompletion(reason) == true;
+    }
+
+    public void LogRestartEvent(string eventName, string message, bool isError)
+    {
+        var content = $"卡死恢复：{eventName}：{message}";
+        if (isError)
+            LoggerHelper.Warning(content);
+        else
+            LoggerHelper.Info(content);
+        var prefix = isError ? "warn:" : "info:";
+        AddLog($"{prefix} {content}", (IBrush?)null);
+    }
+
     public void Dispose()
     {
         _isClosed = true;
@@ -1207,6 +1227,11 @@ private void DisposeScreenshotTasker()
     private bool _suppressConnectionAttemptErrorToast;
     public bool IsConnecting => _isConnecting != 0;
     public bool IsTaskRunActive => Volatile.Read(ref _isTaskRunActive) != 0;
+    public bool IsGameRecoveryRunning
+    {
+        get => Volatile.Read(ref _isGameRecoveryRunning) != 0;
+        set => Volatile.Write(ref _isGameRecoveryRunning, value ? 1 : 0);
+    }
 
     private MaaController? GetScreenshotController(bool test)
     {
@@ -1843,9 +1868,48 @@ private void ConfigureScreenshotTasker(MaaTasker tasker)
             }
             catch (Exception ex)
             {
-                TelemetryService.RecordTaskFailure(InstanceId, "controller_link_start_failed", "controller", ex);
-                throw;
+                var fallbackScreenCap = MaaAdbConnectionFallback.GetFallbackScreenCap(Config.AdbDevice.ScreenCap);
+                if (controller is not MaaAdbController || fallbackScreenCap == Config.AdbDevice.ScreenCap)
+                {
+                    TelemetryService.RecordTaskFailure(InstanceId, "controller_link_start_failed", "controller", ex);
+                    throw;
+                }
+
+                LoggerHelper.Warning($"截图方式 {Config.AdbDevice.ScreenCap} 连接失败，回退到 {fallbackScreenCap} 后重试：{ex.Message}");
+                tasker.Dispose();
+                Config.AdbDevice.ScreenCap = fallbackScreenCap;
+                controller = InitializeController(MaaControllerTypes.Adb, logConfig: true);
+                tasker = new MaaTasker
+                {
+                    Controller = controller,
+                    Resource = maaResource,
+                    Toolkit = Toolkit,
+                    Global = Global,
+                    DisposeOptions = DisposeOptions.All,
+                };
+                linkStatus = tasker.Controller?.LinkStart().Wait();
+            }
+            if (linkStatus != MaaJobStatus.Succeeded)
+            {
+                var fallbackScreenCap = MaaAdbConnectionFallback.GetFallbackScreenCap(Config.AdbDevice.ScreenCap);
+                if (controller is MaaAdbController && fallbackScreenCap != Config.AdbDevice.ScreenCap)
+                {
+                    LoggerHelper.Warning($"截图方式 {Config.AdbDevice.ScreenCap} 连接返回失败，回退到 {fallbackScreenCap} 后重试。");
+                    tasker.Dispose();
+                    Config.AdbDevice.ScreenCap = fallbackScreenCap;
+                    controller = InitializeController(MaaControllerTypes.Adb, logConfig: true);
+                    tasker = new MaaTasker
+                    {
+                        Controller = controller,
+                        Resource = maaResource,
+                        Toolkit = Toolkit,
+                        Global = Global,
+                        DisposeOptions = DisposeOptions.All,
+                    };
+                    linkStatus = tasker.Controller?.LinkStart().Wait();
+                }
             }
+
             if (linkStatus != MaaJobStatus.Succeeded)
             {
                 LoggerHelper.Warning($"控制器 LinkStart 失败：状态={linkStatus}");
@@ -1964,6 +2028,7 @@ private void ConfigureScreenshotTasker(MaaTasker tasker)
 
     public void HandleCallBack(object? sender, MaaCallbackEventArgs args)
     {
+        _recoveryMonitor.RecordCallback(_recoveryClock.Elapsed);
         if (OperatingSystem.IsAndroid())
         {
             // MaaFramework invokes callbacks synchronously while some native action
@@ -2003,6 +2068,18 @@ private void HandleCallBackCore(object? sender, MaaCallbackEventArgs args)
         }
 
         var callbackName = jObject["name"]?.ToString() ?? string.Empty;
+        if (args.Message.StartsWith(MaaMsg.Node.Action.Succeeded, StringComparison.Ordinal))
+        {
+            var actionDetails = jObject["action_details"];
+            var action = actionDetails?["action"]?.ToString() ?? string.Empty;
+            if (action == "Click")
+            {
+                var box = actionDetails?["box"] as JArray;
+                var x = box is { Count: >= 2 } ? (int)Math.Round(box[0].Value<double>()) : 0;
+                var y = box is { Count: >= 2 } ? (int)Math.Round(box[1].Value<double>()) : 0;
+                _recoveryMonitor.FeedAction(callbackName, action, x, y, _recoveryClock.Elapsed);
+            }
+        }
         var shouldTraceNodeEvent = ShouldTraceNodeEvent(jObject, args.Message);
         if (CancellationTokenSource?.IsCancellationRequested != true
             && (shouldTraceNodeEvent || args.Message.Equals("Node.PipelineNode.Starting", StringComparison.Ordinal)))
@@ -2305,13 +2382,31 @@ private MaaController InitializeController(MaaControllerTypes controllerType, bo
                     LoggerHelper.Info($"控制器配置：{Config.AdbDevice.Config}");
                 }
 
-                return new MaaAdbController(
-                    Config.AdbDevice.AdbPath,
-                    Config.AdbDevice.AdbSerial,
-                    Config.AdbDevice.ScreenCap, Config.AdbDevice.Input,
-                    !string.IsNullOrWhiteSpace(Config.AdbDevice.Config) ? Config.AdbDevice.Config : "{}",
-                    Path.Combine(AppPaths.InstallRoot, "libs", "MaaAgentBinary")
-                );
+                var screenCap = Config.AdbDevice.ScreenCap;
+                var agentPath = Path.Combine(AppPaths.InstallRoot, "libs", "MaaAgentBinary");
+                try
+                {
+                    return new MaaAdbController(
+                        Config.AdbDevice.AdbPath,
+                        Config.AdbDevice.AdbSerial,
+                        screenCap, Config.AdbDevice.Input,
+                        !string.IsNullOrWhiteSpace(Config.AdbDevice.Config) ? Config.AdbDevice.Config : "{}",
+                        agentPath);
+                }
+                catch (Exception ex) when (MaaAdbConnectionFallback.GetFallbackScreenCap(screenCap) != screenCap)
+                {
+                    var fallbackScreenCap = MaaAdbConnectionFallback.GetFallbackScreenCap(screenCap);
+                    LoggerHelper.Warning($"截图方式 {screenCap} 初始化失败，回退到 {fallbackScreenCap} 后重试：{ex.Message}");
+                    if (logConfig)
+                        Config.AdbDevice.ScreenCap = fallbackScreenCap;
+
+                    return new MaaAdbController(
+                        Config.AdbDevice.AdbPath,
+                        Config.AdbDevice.AdbSerial,
+                        fallbackScreenCap, Config.AdbDevice.Input,
+                        !string.IsNullOrWhiteSpace(Config.AdbDevice.Config) ? Config.AdbDevice.Config : "{}",
+                        agentPath);
+                }
 
             case MaaControllerTypes.PlayCover:
                 if (logConfig)
@@ -3034,11 +3129,19 @@ private AdbInputMethods ConfigureAdbInputTypes()
             new UniversalEnumConverter<AdbInputMethods>());
         return inputType switch
         {
-            AdbInputMethods.None => Config.AdbDevice.Info?.InputMethods ?? AdbInputMethods.Default,
+            AdbInputMethods.None => GetEffectiveAdbInputMethods(),
             _ => inputType
         };
     }
 
+    private AdbInputMethods GetEffectiveAdbInputMethods()
+    {
+        var detected = Config.AdbDevice.Info?.InputMethods ?? AdbInputMethods.Default;
+        return Config.AdbDevice.Name?.Contains("MuMu", StringComparison.OrdinalIgnoreCase) == true
+            ? detected | AdbInputMethods.EmulatorExtras
+            : detected;
+    }
+
     private AdbScreencapMethods ConfigureAdbScreenCapTypes()
     {
         var screenCapType = InstanceConfiguration.GetValue(ConfigurationKeys.AdbControlScreenCapType,
@@ -3627,7 +3730,17 @@ async private Task<TaskQueueResult> ExecuteTasks(CancellationToken token)
             }
             if (token.IsCancellationRequested) break;
 
-            var result = await task.Run(token);
+            Volatile.Write(ref _activeQueueTask, task);
+            MFATask.RunResult result;
+            try
+            {
+                result = await task.Run(token);
+            }
+            finally
+            {
+                Interlocked.CompareExchange(ref _activeQueueTask, null, task);
+            }
+
             if (result.Status == MFATask.MFATaskStatus.FAILED)
             {
                 completedWithFailures = true;
@@ -4050,11 +4163,51 @@ await TaskManager.RunTaskAsync(async () =>
             await MeasureExecutionTimeAsync(async () =>
             {
                 token.ThrowIfCancellationRequested();
-                MaaTasker?.Controller.Screencap().Wait();
+                var controller = MaaTasker?.Controller;
+                if (controller == null)
+                    throw new InvalidOperationException("截图测试失败：控制器未初始化。");
+
+                var status = controller.Screencap().Wait();
+                if (status == MaaJobStatus.Succeeded)
+                    return;
+
+                if (await FallbackToDefaultScreencapAsync(status, token))
+                    return;
+
+                throw new InvalidOperationException($"截图测试失败：状态={status}。");
             });
         }, token: token, name: "截图测试");
     }
 
+    private async Task<bool> FallbackToDefaultScreencapAsync(MaaJobStatus failedStatus, CancellationToken token)
+    {
+        var currentScreenCap = Config.AdbDevice.ScreenCap;
+        var fallbackScreenCap = MaaAdbConnectionFallback.GetFallbackScreenCap(currentScreenCap);
+        if (fallbackScreenCap == currentScreenCap)
+            return false;
+
+        LoggerHelper.Warning($"截图方式 {currentScreenCap} 截图失败：状态={failedStatus}；回退到 {fallbackScreenCap} 并重新连接。");
+        Config.AdbDevice.ScreenCap = fallbackScreenCap;
+        SetTasker();
+
+        var tasker = await GetTaskerAsync(token);
+        if (tasker?.Controller == null)
+        {
+            LoggerHelper.Error($"截图方式回退到 {fallbackScreenCap} 后，控制器重新初始化失败。");
+            return false;
+        }
+
+        var fallbackStatus = tasker.Controller.Screencap().Wait();
+        if (fallbackStatus == MaaJobStatus.Succeeded)
+        {
+            LoggerHelper.Info($"截图方式已回退到 {fallbackScreenCap}，截图测试通过。");
+            return true;
+        }
+
+        LoggerHelper.Error($"截图方式回退到 {fallbackScreenCap} 后截图仍失败：状态={fallbackStatus}。");
+        return false;
+    }
+
     async private Task HandleDeviceConnectionAsync(CancellationToken token, bool showMessage = true)
     {
         await _connectionGate.WaitAsync(token);
@@ -4337,12 +4490,78 @@ private void AddCoreTasksAsync(List<NodeAndParam> taskAndParams, CancellationTok
 
     async private Task<MaaJobStatus> TryRunTasksAsync(MaaTasker? maa, string? task, string? param, CancellationToken token)
     {
-        if (maa == null || task == null) return MaaJobStatus.Invalid;
+        if (maa == null || task == null)
+            return MaaJobStatus.Invalid;
+
+        while (true)
+        {
+            token.ThrowIfCancellationRequested();
+            _recoveryMonitor.Start(_recoveryClock.Elapsed);
+            try
+            {
+                var job = maa.AppendTask(task, param ?? "{}");
+                TelemetryService.SetActiveTaskId(InstanceId, job.Id);
+                var completion = TaskManager.RunTaskAsync(() => job.Wait(), token, (ex) => throw ex,
+                    name: "队列任务", catchException: true, shouldLog: false);
+                string? reason = null;
+                while (!completion.IsCompleted)
+                {
+                    await Task.WhenAny(completion, Task.Delay(TimeSpan.FromSeconds(5), token));
+                    token.ThrowIfCancellationRequested();
+                    if (completion.IsCompleted)
+                        break;
+
+                    var shouldMonitor = TaskRecoveryPolicy.ShouldMonitor(
+                        OperatingSystem.IsAndroid(),
+                        ViewModel?.CurrentController == MaaControllerTypes.Adb,
+                        PlatformControllerFactory.CanInitializeWithoutDevice,
+                        ViewModels.UsersControls.Settings.AddTaskDialogViewModel.SpecialActionNames.Contains(task));
+                    reason = _recoveryMonitor.GetReason(_recoveryClock.Elapsed, TimeSpan.FromSeconds(120),
+                        shouldMonitor, _isWaitingForModal || IsGameRecoveryRunning);
+                    if (reason != null)
+                        break;
+                }
+
+                if (reason == null)
+                    return await completion;
+
+                _recoveryMonitor.Stop();
+                token.ThrowIfCancellationRequested();
+                LogRestartEvent("重启游戏", $"检测到任务疑似卡死：{TaskRecoveryMonitor.GetDisplayReason(reason)}", true);
+                var stopping = Task.Run(() => maa.Stop().Wait());
+                try
+                {
+                    var emulatorUnresponsive = TaskRecoveryMonitor.IsEmulatorUnresponsiveReason(reason);
+                    await Task.Run(() => Custom.RestartGameAction.RestartAndReloadGame(
+                        logAutoRecovery: false, processor: this, token: token,
+                        emulatorUnresponsive: emulatorUnresponsive), token);
+                    if (await stopping.WaitAsync(TimeSpan.FromSeconds(30), token) != MaaJobStatus.Succeeded)
+                        throw new InvalidOperationException("卡死恢复时底层执行器未能停止。");
+                    await completion.WaitAsync(TimeSpan.FromSeconds(30), token);
+                    token.ThrowIfCancellationRequested();
+                    SetTasker();
+                    await ReconnectAsync(token);
+                }
+                catch (OperationCanceledException) when (token.IsCancellationRequested)
+                {
+                    throw;
+                }
+                catch (Exception ex)
+                {
+                    LogRestartEvent("重启游戏", $"恢复失败，停止任务：{ex.Message}", true);
+                    CancelOperations();
+                    Stop(MFATask.MFATaskStatus.FAILED);
+                    throw;
+                }
 
-        var job = maa.AppendTask(task, param ?? "{}");
-        TelemetryService.SetActiveTaskId(InstanceId, job.Id);
-        return await TaskManager.RunTaskAsync(() => job.Wait(), token, (ex) => throw ex,
-            name: "队列任务", catchException: true, shouldLog: false);
+                maa = MaaTasker ?? throw new InvalidOperationException("卡死恢复后未能重建任务执行器。");
+                LogRestartEvent("重启游戏", $"重连完成，继续中断任务 {task}", false);
+            }
+            finally
+            {
+                _recoveryMonitor.Stop();
+            }
+        }
     }
 
     async private Task RunScript(string str = "Prescript")
@@ -5032,6 +5251,7 @@ private void RegisterCustomRecognitionsAndActions(MaaTasker tasker)
             tasker.Resource.Register(new Custom.WebhookAction());
             tasker.Resource.Register(new Custom.HeiLiuAction((content, color) => AddLog(content, color)));
             tasker.Resource.Register(new Custom.SwitchInstanceAction(this));
+            tasker.Resource.Register(new Custom.CompleteCurrentTaskAction(this));
             LoggerHelper.Info("已注册内置特殊任务动作。");
 
             // 获取当前资源的自定义目录
diff --git a/MFAAvalonia/Extensions/MaaFW/TaskLoader.cs b/MFAAvalonia/Extensions/MaaFW/TaskLoader.cs
index 7d57c5dc..e83d52ab 100644
--- a/MFAAvalonia/Extensions/MaaFW/TaskLoader.cs
+++ b/MFAAvalonia/Extensions/MaaFW/TaskLoader.cs
@@ -20,6 +20,7 @@ public class TaskLoader(MaaInterface? maaInterface, TaskQueueViewModel taskQueue
 {
     public const string NEW_SEPARATOR = "<|||>";
     public const string OLD_SEPARATOR = ":";
+    public const string LightweightRecognitionOptionName = "轻量识别";
 
 
     /// <summary>
@@ -131,24 +132,36 @@ private void InitializeResources()
     /// </summary>
     private void InitializeGlobalSelectOptions()
     {
-        if (maaInterface == null || maaInterface.GlobalOption == null || maaInterface.GlobalOption.Count == 0)
+        var savedGlobalOptions = taskQueueViewModel.Processor.InstanceConfiguration.GetValue(
+            ConfigurationKeys.GlobalOptionItems,
+            new List<MaaInterface.MaaInterfaceSelectOption>());
+        InitializeGlobalSelectOptions(maaInterface, savedGlobalOptions);
+    }
+
+    public static void InitializeGlobalSelectOptions(
+        MaaInterface? maaInterface,
+        List<MaaInterface.MaaInterfaceSelectOption>? savedGlobalOptions)
+    {
+        if (maaInterface == null)
+            return;
+
+        var optionNames = maaInterface.GlobalOption?.ToList() ?? new List<string>();
+        if (maaInterface.Option?.ContainsKey(LightweightRecognitionOptionName) == true &&
+            !optionNames.Contains(LightweightRecognitionOptionName))
+        {
+            optionNames.Add(LightweightRecognitionOptionName);
+        }
+
+        if (optionNames.Count == 0)
         {
-            if (maaInterface != null)
-                maaInterface.GlobalSelectOptions = null;
+            maaInterface.GlobalSelectOptions = null;
             return;
         }
 
-        var config = taskQueueViewModel.Processor.InstanceConfiguration;
-        var savedGlobalOptions = config.GetValue(
-            ConfigurationKeys.GlobalOptionItems,
-            new List<MaaInterface.MaaInterfaceSelectOption>());
         var savedDict = savedGlobalOptions?.ToDictionary(o => o.Name ?? string.Empty)
             ?? new Dictionary<string, MaaInterface.MaaInterfaceSelectOption>();
 
-        var existingDict = maaInterface.GlobalSelectOptions?.ToDictionary(o => o.Name ?? string.Empty)
-            ?? new Dictionary<string, MaaInterface.MaaInterfaceSelectOption>();
-
-        maaInterface.GlobalSelectOptions = maaInterface.GlobalOption.Select(optionName =>
+        maaInterface.GlobalSelectOptions = optionNames.Select(optionName =>
         {
             if (savedDict.TryGetValue(optionName, out var saved))
             {
@@ -163,14 +176,10 @@ private void InitializeGlobalSelectOptions()
                 SetDefaultOptionValue(maaInterface, savedOption);
                 return savedOption;
             }
-            if (existingDict.TryGetValue(optionName, out var existing))
-            {
-                SetDefaultOptionValue(maaInterface, existing);
-                return existing;
-            }
-            var opt = new MaaInterface.MaaInterfaceSelectOption { Name = optionName };
-            SetDefaultOptionValue(maaInterface, opt);
-            return opt;
+
+            var option = new MaaInterface.MaaInterfaceSelectOption { Name = optionName };
+            SetDefaultOptionValue(maaInterface, option);
+            return option;
         }).ToList();
     }
 
@@ -697,8 +706,9 @@ private void UpdateViewModels(IList<DragItemViewModel> drags, List<MaaInterface.
             if (settingItem != null) finalItems.Add(settingItem);
         }
 
-        // 如果有 global_option，置顶显示一个全局设置项（包含所有全局选项）
-        if (maaInterface?.GlobalOption is { Count: > 0 } && maaInterface.GlobalSelectOptions is { Count: > 0 })
+        // Android 移动界面仍通过任务列表中的全局设置项编辑全局选项。
+        if (OperatingSystem.IsAndroid() &&
+            maaInterface?.GlobalOption is { Count: > 0 } && maaInterface.GlobalSelectOptions is { Count: > 0 })
         {
             var globalOptionItem = CreateGlobalOptionItem(drags);
             if (globalOptionItem != null)
diff --git a/MFAAvalonia/Features/CombatStrategies/Controls/CombatStrategyNavigationGuard.cs b/MFAAvalonia/Features/CombatStrategies/Controls/CombatStrategyNavigationGuard.cs
new file mode 100644
index 00000000..5ac235f1
--- /dev/null
+++ b/MFAAvalonia/Features/CombatStrategies/Controls/CombatStrategyNavigationGuard.cs
@@ -0,0 +1,51 @@
+using Avalonia;
+using SukiUI.Controls;
+using System;
+using System.Threading.Tasks;
+
+namespace MFAAvalonia.Features.CombatStrategies.Controls;
+
+/// <summary>导航决定完成前恢复原选择，取消时保留当前编辑页面。</summary>
+public sealed class CombatStrategyNavigationGuard : IDisposable
+{
+    private readonly SukiSideMenu _menu;
+    private readonly SukiSideMenuItem _editorItem;
+    private readonly Func<bool> _isDirty;
+    private readonly Func<Task<bool>> _confirm;
+    private bool _restoring;
+    private bool _pending;
+    public Task PendingNavigation { get; private set; } = Task.CompletedTask;
+
+    public CombatStrategyNavigationGuard(SukiSideMenu menu, SukiSideMenuItem editorItem, Func<bool> isDirty, Func<Task<bool>> confirm)
+    {
+        _menu = menu;
+        _editorItem = editorItem;
+        _isDirty = isDirty;
+        _confirm = confirm;
+        _menu.PropertyChanged += OnSelectionChanged;
+    }
+
+    private void OnSelectionChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
+    {
+        if (_restoring || e.Property != SukiSideMenu.SelectedItemProperty || e.OldValue != _editorItem || e.NewValue is not SukiSideMenuItem target || !_isDirty()) return;
+        SetSelection(_editorItem);
+        if (_pending) return;
+        _pending = true;
+        PendingNavigation = CompleteNavigationAsync(target);
+    }
+
+    private async Task CompleteNavigationAsync(SukiSideMenuItem target)
+    {
+        try { if (await _confirm()) SetSelection(target); }
+        finally { _pending = false; }
+    }
+
+    private void SetSelection(SukiSideMenuItem item)
+    {
+        _restoring = true;
+        try { _menu.SelectedItem = item; }
+        finally { _restoring = false; }
+    }
+
+    public void Dispose() => _menu.PropertyChanged -= OnSelectionChanged;
+}
diff --git a/MFAAvalonia/Features/CombatStrategies/Controls/StrategyConditionEditor.cs b/MFAAvalonia/Features/CombatStrategies/Controls/StrategyConditionEditor.cs
new file mode 100644
index 00000000..1afbb65f
--- /dev/null
+++ b/MFAAvalonia/Features/CombatStrategies/Controls/StrategyConditionEditor.cs
@@ -0,0 +1,172 @@
+using Avalonia;
+using Avalonia.Controls;
+using System;
+using System.Linq;
+
+namespace MFAAvalonia.Features.CombatStrategies.Controls;
+
+public sealed class StrategyConditionEditor : UserControl
+{
+    private readonly Action _changed;
+    private readonly int? _ownerSlot;
+
+    public StrategyConditionEditor(ConditionGroup root, Action changed, int? ownerSlot = null)
+    {
+        _changed = changed;
+        _ownerSlot = ownerSlot;
+        Content = BuildGroup(root, null, 0);
+    }
+
+    private Control BuildGroup(ConditionGroup group, Action? remove, int depth)
+    {
+        var children = new StackPanel { Spacing = 8 };
+        var mode = StrategyUi.Choice(StrategyUi.Matches, group.Match, value => { group.Match = value; _changed(); });
+        mode.Name = "ConditionMatch";
+        var addCondition = StrategyUi.Button("添加条件", () =>
+        {
+            group.Children.Add(NewPredicate());
+            RefreshChildren();
+            _changed();
+        });
+        addCondition.Name = "AddCondition";
+        var addGroup = StrategyUi.Button("添加条件组", () =>
+        {
+            group.Children.Add(new ConditionGroup { Children = [NewPredicate()] });
+            RefreshChildren();
+            _changed();
+        });
+        addGroup.Name = "AddConditionGroup";
+        addGroup.IsEnabled = depth < StrategyValidator.MaxConditionDepth - 2;
+        var header = StrategyUi.Row(mode, addCondition, addGroup);
+        if (remove != null) header.Children.Add(StrategyUi.Button("移除组", remove));
+        var body = StrategyUi.Column(header, children);
+        var card = StrategyUi.Card(body, "strategy-condition");
+        card.Margin = new Thickness(depth == 0 ? 0 : 8, 2, 0, 2);
+        RefreshChildren();
+        return card;
+
+        void RefreshChildren()
+        {
+            children.Children.Clear();
+            if (group.Children.Count == 0)
+                children.Children.Add(StrategyUi.Text("尚未添加条件"));
+            foreach (var condition in group.Children.ToArray())
+            {
+                void Remove()
+                {
+                    group.Children.Remove(condition);
+                    RefreshChildren();
+                    _changed();
+                }
+                children.Children.Add(condition is ConditionGroup nested
+                    ? BuildGroup(nested, Remove, depth + 1)
+                    : BuildPredicate((ConditionPredicate)condition, Remove));
+            }
+        }
+    }
+
+    private Control BuildPredicate(ConditionPredicate predicate, Action remove)
+    {
+        var host = new StackPanel { Spacing = 4 };
+        Render();
+        return host;
+
+        void Render()
+        {
+            host.Children.Clear();
+            var metric = StrategyUi.Choice(Metrics, predicate.Metric, value =>
+            {
+                predicate.Metric = value;
+                predicate.Comparison = null;
+                predicate.Value = null;
+                predicate.Slots = null;
+                predicate.SlotMatch = null;
+                predicate.Expected = null;
+                if (value is ConditionMetric.UltimateReady or ConditionMetric.UltimateReleased)
+                {
+                    predicate.Slots = [Enumerable.Range(1, 3).First(x => value != ConditionMetric.UltimateReady || x != _ownerSlot)];
+                    predicate.SlotMatch = ConditionMatch.All;
+                    predicate.Expected = true;
+                }
+                else if (value == ConditionMetric.FrenzyActive) predicate.Expected = true;
+                else { predicate.Comparison = ComparisonOperator.GreaterOrEqual; predicate.Value = 1; }
+                _changed();
+                Render();
+            }, 180);
+            metric.Name = "ConditionMetric";
+            var row = StrategyUi.Row(metric);
+            if (predicate.Metric is ConditionMetric.UltimateReady or ConditionMetric.UltimateReleased)
+            {
+                foreach (var slot in Enumerable.Range(1, 3))
+                {
+                    if (predicate.Metric == ConditionMetric.UltimateReady && slot == _ownerSlot) continue;
+                    row.Children.Add(StrategyUi.Check($"位置 {slot}", predicate.Slots?.Contains(slot) == true, selected =>
+                    {
+                        predicate.Slots ??= [];
+                        if (selected && !predicate.Slots.Contains(slot)) predicate.Slots.Add(slot);
+                        if (!selected) predicate.Slots.Remove(slot);
+                        predicate.Slots.Sort();
+                        _changed();
+                    }));
+                }
+                row.Children.Add(StrategyUi.Choice(StrategyUi.Matches, predicate.SlotMatch ?? ConditionMatch.All, value => { predicate.SlotMatch = value; _changed(); }, 120));
+                var ready = predicate.Metric == ConditionMetric.UltimateReady;
+                row.Children.Add(StrategyUi.Choice(
+                    new[] { new EditorChoice<bool>(true, ready ? "已就绪" : "已释放"), new EditorChoice<bool>(false, ready ? "未就绪" : "未释放") },
+                    predicate.Expected ?? true, value => { predicate.Expected = value; _changed(); }, 100));
+            }
+            else if (predicate.Metric == ConditionMetric.FrenzyActive)
+                row.Children.Add(StrategyUi.Choice(
+                    new[] { new EditorChoice<bool>(true, "处于乱舞"), new EditorChoice<bool>(false, "不处于乱舞") },
+                    predicate.Expected ?? true, value => { predicate.Expected = value; _changed(); }));
+            else
+            {
+                row.Children.Add(StrategyUi.Choice(Comparisons, predicate.Comparison ?? ComparisonOperator.GreaterOrEqual, value => { predicate.Comparison = value; _changed(); }, 85));
+                var percent = predicate.Metric is ConditionMetric.EnemyHpPercent or ConditionMetric.AllyHpPercent;
+                var number = new NumericUpDown
+                {
+                    Name = "ConditionValue", Value = predicate.Value, Minimum = 0,
+                    Maximum = percent ? 100 : 999999999999m, Increment = 1, Width = 150,
+                    FormatString = percent ? "0.##" : "0.##"
+                };
+                number.PropertyChanged += (_, e) =>
+                {
+                    if (e.Property != NumericUpDown.ValueProperty) return;
+                    predicate.Value = number.Value;
+                    _changed();
+                };
+                row.Children.Add(number);
+                if (percent) row.Children.Add(StrategyUi.Text("%"));
+            }
+            row.Children.Add(StrategyUi.Button("移除", remove));
+            host.Children.Add(row);
+        }
+    }
+
+    private static ConditionPredicate NewPredicate() => new()
+    {
+        Metric = ConditionMetric.StageNormalLinks,
+        Comparison = ComparisonOperator.GreaterOrEqual,
+        Value = 1
+    };
+
+    private static readonly EditorChoice<ConditionMetric>[] Metrics =
+    [
+        new(ConditionMetric.BattleNormalLinks, "本场普通连线手数"),
+        new(ConditionMetric.StageNormalLinks, "当前阶段普通连线手数"),
+        new(ConditionMetric.EnemyHp, "敌方血量数值"),
+        new(ConditionMetric.AllyHp, "我方血量数值"),
+        new(ConditionMetric.EnemyHpPercent, "敌方血量百分比"),
+        new(ConditionMetric.AllyHpPercent, "我方血量百分比"),
+        new(ConditionMetric.UltimateReady, "其他位置奥义就绪"),
+        new(ConditionMetric.UltimateReleased, "位置奥义已释放"),
+        new(ConditionMetric.FrenzyActive, "乱舞状态")
+    ];
+
+    private static readonly EditorChoice<ComparisonOperator>[] Comparisons =
+    [
+        new(ComparisonOperator.GreaterOrEqual, "≥"), new(ComparisonOperator.LessOrEqual, "≤"),
+        new(ComparisonOperator.Greater, ">"), new(ComparisonOperator.Less, "<"),
+        new(ComparisonOperator.Equal, "="), new(ComparisonOperator.NotEqual, "≠")
+    ];
+}
diff --git a/MFAAvalonia/Features/CombatStrategies/Controls/StrategyDialogs.cs b/MFAAvalonia/Features/CombatStrategies/Controls/StrategyDialogs.cs
new file mode 100644
index 00000000..79f64f70
--- /dev/null
+++ b/MFAAvalonia/Features/CombatStrategies/Controls/StrategyDialogs.cs
@@ -0,0 +1,69 @@
+using Avalonia.Controls;
+using SukiUI.Controls;
+using SukiUI.MessageBox;
+using System;
+using System.Threading.Tasks;
+
+namespace MFAAvalonia.Features.CombatStrategies.Controls;
+
+internal static class StrategyDialogs
+{
+    private static Button Action(string label, SukiMessageBoxResult result, bool cancel = false)
+    {
+        var button = SukiMessageBoxButtonsFactory.CreateButton(label, result);
+        button.IsCancel = cancel;
+        return button;
+    }
+
+    public static async Task<UnsavedDecision> UnsavedAsync()
+    {
+        var result = await SukiMessageBox.ShowDialog(new SukiMessageBoxHost
+        {
+            Content = "当前策略有未保存的修改。选择“是”保存后继续，选择“否”放弃修改并继续。",
+            ActionButtonsPreset = SukiMessageBoxButtons.YesNoCancel,
+            IconPreset = SukiMessageBoxIcons.Warning
+        }, new SukiMessageBoxOptions { Title = "未保存的策略" });
+        return result switch
+        {
+            SukiMessageBoxResult.Yes => UnsavedDecision.Save,
+            SukiMessageBoxResult.No => UnsavedDecision.Discard,
+            _ => UnsavedDecision.Cancel
+        };
+    }
+
+    public static Task<string?> RenameAsync(string title, string current) => RenameAsync(title, current, SukiMessageBox.ShowDialog);
+
+    internal static async Task<string?> RenameAsync(string title, string current, Func<SukiMessageBoxHost, SukiMessageBoxOptions, Task<object?>> showDialog)
+    {
+        var input = new TextBox { Text = current, MinWidth = 300, Watermark = "请输入名称" };
+        var result = await showDialog(new SukiMessageBoxHost
+        {
+            Content = input,
+            ActionButtonsSource = [Action("确定", SukiMessageBoxResult.OK), Action("取消", SukiMessageBoxResult.Cancel, true)]
+        }, new SukiMessageBoxOptions { Title = title });
+        if (result is not SukiMessageBoxResult.OK) return null;
+        var name = input.Text?.Trim();
+        if (!string.IsNullOrWhiteSpace(name)) return name;
+        await ErrorAsync("名称不能为空。");
+        return null;
+    }
+
+    public static Task<bool> ConfirmDeleteAsync(string name) => ConfirmDeleteAsync(name, SukiMessageBox.ShowDialog);
+
+    internal static async Task<bool> ConfirmDeleteAsync(string name, Func<SukiMessageBoxHost, SukiMessageBoxOptions, Task<object?>> showDialog)
+    {
+        var result = await showDialog(new SukiMessageBoxHost
+        {
+            Content = $"确定删除策略“{name}”吗？",
+            ActionButtonsSource = [Action("删除", SukiMessageBoxResult.Yes), Action("取消", SukiMessageBoxResult.Cancel, true)]
+        }, new SukiMessageBoxOptions { Title = "删除策略" });
+        return result is SukiMessageBoxResult.Yes;
+    }
+
+    public static async Task ErrorAsync(string message) =>
+        await SukiMessageBox.ShowDialog(new SukiMessageBoxHost
+        {
+            Content = message,
+            ActionButtonsSource = [Action("关闭", SukiMessageBoxResult.Close, true)]
+        }, new SukiMessageBoxOptions { Title = "作战策略" });
+}
diff --git a/MFAAvalonia/Features/CombatStrategies/Controls/StrategyReorder.cs b/MFAAvalonia/Features/CombatStrategies/Controls/StrategyReorder.cs
new file mode 100644
index 00000000..7f52bcac
--- /dev/null
+++ b/MFAAvalonia/Features/CombatStrategies/Controls/StrategyReorder.cs
@@ -0,0 +1,87 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.VisualTree;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MFAAvalonia.Features.CombatStrategies.Controls;
+
+/// <summary>在当前列表内捕获手柄拖动，不占用系统剪贴板。</summary>
+internal static class StrategyReorder
+{
+    public static void Attach<T>(Control handle, Control row, StackPanel container, IList<T> values, T value, Action changed)
+    {
+        Point start = default;
+        bool pressed = false, dragging = false;
+        handle.PointerPressed += (_, e) =>
+        {
+            if (!e.GetCurrentPoint(handle).Properties.IsLeftButtonPressed) return;
+            start = e.GetPosition(handle);
+            pressed = true;
+            handle.Focus();
+            e.Pointer.Capture(handle);
+            e.Handled = true;
+        };
+        handle.PointerMoved += (_, e) =>
+        {
+            if (!pressed) return;
+            var point = e.GetPosition(handle);
+            if (!dragging && Math.Abs(point.Y - start.Y) + Math.Abs(point.X - start.X) < 6) return;
+            dragging = true;
+            row.Opacity = 0.5;
+            var scroll = container.GetVisualAncestors().OfType<ScrollViewer>().FirstOrDefault();
+            if (scroll != null)
+            {
+                var y = e.GetPosition(scroll).Y;
+                if (y < 35) scroll.Offset = new Vector(scroll.Offset.X, Math.Max(0, scroll.Offset.Y - 18));
+                if (y > scroll.Bounds.Height - 35) scroll.Offset = new Vector(scroll.Offset.X, scroll.Offset.Y + 18);
+            }
+            e.Handled = true;
+        };
+        handle.PointerReleased += (_, e) =>
+        {
+            if (!pressed) return;
+            pressed = false;
+            var moved = dragging;
+            dragging = false;
+            row.Opacity = 1;
+            var point = e.GetPosition(container);
+            e.Pointer.Capture(null);
+            if (!moved || values.Count < 2) return;
+            var from = values.IndexOf(value);
+            Move(from, CalculateDropIndex(container.Children.Select(x => x.Bounds).ToArray(), from, point.Y));
+            e.Handled = true;
+        };
+        handle.PointerCaptureLost += (_, _) => { pressed = false; dragging = false; row.Opacity = 1; };
+        handle.KeyDown += (_, e) =>
+        {
+            var from = values.IndexOf(value);
+            if (e.Key is Key.Up or Key.Down)
+            {
+                Move(from, from + (e.Key == Key.Up ? -1 : 1));
+                e.Handled = true;
+            }
+        };
+
+        void Move(int from, int to)
+        {
+            if (from < 0 || to < 0 || to >= values.Count || from == to) return;
+            values.RemoveAt(from);
+            values.Insert(to, value);
+            changed();
+        }
+    }
+
+    internal static int CalculateDropIndex(IReadOnlyList<Rect> rows, int from, double y)
+    {
+        if (rows.Count == 0) return -1;
+        var index = rows.Count;
+        for (var i = 0; i < rows.Count; i++)
+            if (y < rows[i].Center.Y) { index = i; break; }
+        // 移除原行后，位于其后的插入位置需要向前修正一格。
+        if (from >= 0 && from < index) index--;
+        return Math.Clamp(index, 0, rows.Count - 1);
+    }
+}
diff --git a/MFAAvalonia/Features/CombatStrategies/Controls/StrategyStageCard.cs b/MFAAvalonia/Features/CombatStrategies/Controls/StrategyStageCard.cs
new file mode 100644
index 00000000..ddc36070
--- /dev/null
+++ b/MFAAvalonia/Features/CombatStrategies/Controls/StrategyStageCard.cs
@@ -0,0 +1,158 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MFAAvalonia.Features.CombatStrategies.Controls;
+
+public sealed class StrategyStageCard : UserControl
+{
+    private readonly StrategyEditorSession _session;
+    private readonly StrategyStage _stage;
+    private readonly StackPanel _body = new() { Spacing = 8 };
+    private readonly Button _title;
+    private readonly HashSet<int> _openSlots = [];
+    private readonly HashSet<string> _openRules = [];
+    public Control DragHandle { get; }
+    public StrategyStage Stage => _stage;
+    public bool IsExpanded
+    {
+        get => _body.IsVisible;
+        set { _body.IsVisible = value; _title.Content = (_session.Current.InitialStageId == _stage.Id ? "初始阶段  " : "") + _stage.Name + (value ? "  ▾" : "  ▸"); }
+    }
+
+    public StrategyStageCard(StrategyEditorSession session, StrategyStage stage, Action<string> showError, Func<string, string, Task<string?>> rename)
+    {
+        _session = session; _stage = stage;
+        DragHandle = StrategyUi.DragHandle();
+        DragHandle.IsEnabled = !session.IsReadOnly;
+        _title = new Button { HorizontalAlignment = HorizontalAlignment.Stretch, HorizontalContentAlignment = HorizontalAlignment.Left, FontSize = 15 };
+        _title.Click += (_, _) => IsExpanded = !IsExpanded;
+        var header = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*"), ColumnSpacing = 8 };
+        header.Children.Add(DragHandle); Grid.SetColumn(_title, 1); header.Children.Add(_title);
+        var renameItem = new MenuItem { Header = "重命名", IsEnabled = !session.IsReadOnly };
+        renameItem.Click += async (_, _) => { var name = await rename("重命名阶段", stage.Name); if (name != null) { stage.Name = name; session.StructuralChange(); } };
+        var copy = new MenuItem { Header = "复制阶段", IsEnabled = !session.IsReadOnly };
+        copy.Click += (_, _) => session.CopyStage(stage);
+        var initial = new MenuItem { Header = "设为初始阶段", IsEnabled = !session.IsReadOnly && session.Current.InitialStageId != stage.Id };
+        initial.Click += (_, _) => session.SetInitialStage(stage);
+        var delete = new MenuItem { Header = "删除阶段", IsEnabled = !session.IsReadOnly };
+        delete.Click += (_, _) => { try { session.DeleteStage(stage); } catch (InvalidOperationException ex) { showError(ex.Message); } };
+        header.ContextMenu = new ContextMenu { Items = { renameItem, copy, initial, delete } };
+        _body.IsEnabled = !session.IsReadOnly;
+        _body.Margin = new Thickness(8, 2, 8, 6);
+        AddSection("行动优先级", BuildPriority());
+        _body.Children.Add(StrategyUi.Text("连线固定最后；普通操作与乱舞共用此顺序。"));
+        var bombs = StrategyUi.Row();
+        foreach (var level in new[] { 1, 2, 3 })
+            bombs.Children.Add(StrategyUi.Check($"{level} 级", stage.Actions.BombLevels.Contains(level), value =>
+            {
+                if (value && !stage.Actions.BombLevels.Contains(level)) stage.Actions.BombLevels.Add(level);
+                if (!value) stage.Actions.BombLevels.Remove(level);
+                stage.Actions.BombLevels.Sort(); session.MarkDirty();
+            }));
+        AddSection("炸弹", bombs);
+        AddSection("奥义", BuildUltimates());
+        AddSection("普通连线", BuildNormalLinks());
+        AddSection("乱舞", BuildFrenzy());
+        AddSection("阶段转变", BuildTransitions());
+        Content = StrategyUi.Card(StrategyUi.Column(header, _body));
+        IsExpanded = true;
+    }
+
+    private void AddSection(string name, Control content) { _body.Children.Add(StrategyUi.Section(name)); _body.Children.Add(content); }
+
+    private Control BuildPriority()
+    {
+        var list = new StackPanel { Spacing = 4 };
+        Render(); return list;
+        void Render()
+        {
+            list.Children.Clear();
+            foreach (var action in _stage.Actions.Priority)
+            {
+                var handle = StrategyUi.DragHandle();
+                var row = StrategyUi.Row(handle, StrategyUi.Text(action == StrategyAction.Ultimate ? "使用奥义" : "使用炸弹"));
+                list.Children.Add(row);
+                StrategyReorder.Attach(handle, row, list, _stage.Actions.Priority, action, () => { _session.MarkDirty(); Render(); });
+            }
+        }
+    }
+
+    private Control BuildUltimates()
+    {
+        var list = new StackPanel { Spacing = 8 };
+        Render(); return list;
+        void Render()
+        {
+            list.Children.Clear();
+            foreach (var ultimate in _stage.Actions.Ultimates)
+            {
+                var handle = StrategyUi.DragHandle();
+                var details = new StackPanel { IsVisible = _openSlots.Contains(ultimate.Slot) };
+                var root = ultimate.Condition as ConditionGroup ?? new ConditionGroup();
+                details.Children.Add(new StrategyConditionEditor(root, () => { ultimate.Condition = root.Children.Count == 0 ? null : root; _session.MarkDirty(); }, ultimate.Slot));
+                var toggle = StrategyUi.Button("前置条件", () => { details.IsVisible = !details.IsVisible; if (details.IsVisible) _openSlots.Add(ultimate.Slot); else _openSlots.Remove(ultimate.Slot); });
+                var row = StrategyUi.Column(StrategyUi.Row(handle, StrategyUi.Check($"位置 {ultimate.Slot}", ultimate.Enabled, value => { ultimate.Enabled = value; _session.MarkDirty(); }), toggle), details);
+                list.Children.Add(row);
+                StrategyReorder.Attach(handle, row, list, _stage.Actions.Ultimates, ultimate, () => { _session.MarkDirty(); Render(); });
+            }
+        }
+    }
+
+    private Control BuildNormalLinks()
+    {
+        var colors = new StackPanel { Spacing = 4, IsVisible = _stage.Actions.NormalLink.PrioritizeColors };
+        Render();
+        return StrategyUi.Column(StrategyUi.Check("设置目标颜色优先级", _stage.Actions.NormalLink.PrioritizeColors, value => { _stage.Actions.NormalLink.PrioritizeColors = value; colors.IsVisible = value; _session.MarkDirty(); }), colors);
+        void Render()
+        {
+            colors.Children.Clear();
+            foreach (var color in _stage.Actions.NormalLink.ColorPriority)
+            {
+                var handle = StrategyUi.DragHandle();
+                var row = StrategyUi.Row(handle, StrategyUi.Text(StrategyUi.ColorName(color)));
+                colors.Children.Add(row);
+                StrategyReorder.Attach(handle, row, colors, _stage.Actions.NormalLink.ColorPriority, color, () => { _session.MarkDirty(); Render(); });
+            }
+        }
+    }
+
+    private Control BuildFrenzy()
+    {
+        var selected = _stage.Frenzy.ReservedColor ?? GhoulColor.Red;
+        var color = StrategyUi.Choice(StrategyUi.Colors, selected, value => { selected = value; if (_stage.Frenzy.ReservedColor != null) { _stage.Frenzy.ReservedColor = value; _session.MarkDirty(); } });
+        color.IsVisible = _stage.Frenzy.ReservedColor != null;
+        return StrategyUi.Column(
+            StrategyUi.Check("乱舞期间使用奥义", _stage.Frenzy.AllowUltimates, value => { _stage.Frenzy.AllowUltimates = value; _session.MarkDirty(); }),
+            StrategyUi.Check("乱舞期间使用炸弹", _stage.Frenzy.AllowBombs, value => { _stage.Frenzy.AllowBombs = value; _session.MarkDirty(); }),
+            StrategyUi.Check("保留一种颜色", _stage.Frenzy.ReservedColor != null, value => { _stage.Frenzy.ReservedColor = value ? selected : null; color.IsVisible = value; _session.MarkDirty(); }), color);
+    }
+
+    private Control BuildTransitions()
+    {
+        var list = new StackPanel { Spacing = 10 };
+        var add = StrategyUi.Button("添加转变规则", () => { var rule = new StageTransition(); _stage.Transitions.Add(rule); _openRules.Add(rule.Id); _session.MarkDirty(); Render(); });
+        Render(); return StrategyUi.Column(list, add);
+        void Render()
+        {
+            list.Children.Clear();
+            foreach (var rule in _stage.Transitions)
+            {
+                var handle = StrategyUi.DragHandle();
+                var target = StrategyUi.Choice(_session.Current.Stages.Select(x => new EditorChoice<string>(x.Id, x.Name)), rule.TargetStageId, value => { rule.TargetStageId = value; _session.MarkDirty(); });
+                target.PlaceholderText = "选择目标阶段";
+                var details = new StackPanel { IsVisible = _openRules.Contains(rule.Id) };
+                details.Children.Add(new StrategyConditionEditor((ConditionGroup)rule.Condition, _session.MarkDirty));
+                var edit = StrategyUi.Button("转变条件", () => { details.IsVisible = !details.IsVisible; if (details.IsVisible) _openRules.Add(rule.Id); else _openRules.Remove(rule.Id); });
+                var remove = StrategyUi.Button("删除规则", () => { _stage.Transitions.Remove(rule); _session.MarkDirty(); Render(); });
+                var row = StrategyUi.Card(StrategyUi.Column(StrategyUi.Row(handle, StrategyUi.Text("转到"), target, edit, remove), details), "strategy-condition");
+                list.Children.Add(row);
+                StrategyReorder.Attach(handle, row, list, _stage.Transitions, rule, () => { _session.MarkDirty(); Render(); });
+            }
+        }
+    }
+}
diff --git a/MFAAvalonia/Features/CombatStrategies/Controls/StrategyUi.cs b/MFAAvalonia/Features/CombatStrategies/Controls/StrategyUi.cs
new file mode 100644
index 00000000..f51dd934
--- /dev/null
+++ b/MFAAvalonia/Features/CombatStrategies/Controls/StrategyUi.cs
@@ -0,0 +1,104 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Layout;
+using Avalonia.Media;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MFAAvalonia.Features.CombatStrategies.Controls;
+
+public sealed record EditorChoice<T>(T Value, string Label)
+{
+    public override string ToString() => Label;
+}
+
+internal static class StrategyUi
+{
+    public static TextBlock Text(string text, bool heading = false) => new()
+    {
+        Text = text, TextWrapping = TextWrapping.Wrap, VerticalAlignment = VerticalAlignment.Center,
+        FontSize = heading ? 15 : 13, FontWeight = heading ? FontWeight.SemiBold : FontWeight.Normal
+    };
+
+    public static Button Button(string label, Action action)
+    {
+        var button = new Button { Content = label, Padding = new Thickness(10, 6), VerticalAlignment = VerticalAlignment.Center };
+        button.Click += (_, _) => action();
+        return button;
+    }
+
+    public static CheckBox Check(string label, bool value, Action<bool> changed)
+    {
+        var box = new CheckBox { Content = label, IsChecked = value, VerticalAlignment = VerticalAlignment.Center };
+        box.PropertyChanged += (_, e) => { if (e.Property == ToggleButton.IsCheckedProperty) changed(box.IsChecked == true); };
+        return box;
+    }
+
+    public static ComboBox Choice<T>(IEnumerable<EditorChoice<T>> source, T selected, Action<T> changed, double width = 160)
+    {
+        var options = source.ToList();
+        var combo = new ComboBox
+        {
+            ItemsSource = options, MinWidth = width, MaxWidth = 340,
+            SelectedItem = options.FirstOrDefault(x => EqualityComparer<T>.Default.Equals(x.Value, selected)),
+            VerticalAlignment = VerticalAlignment.Center
+        };
+        combo.SelectionChanged += (_, _) => { if (combo.SelectedItem is EditorChoice<T> item) changed(item.Value); };
+        return combo;
+    }
+
+    public static WrapPanel Row(params Control[] controls)
+    {
+        var row = new WrapPanel { Orientation = Orientation.Horizontal };
+        foreach (var control in controls)
+        {
+            control.Margin = new Thickness(0, 3, 10, 3);
+            row.Children.Add(control);
+        }
+        return row;
+    }
+
+    public static StackPanel Column(params Control[] controls)
+    {
+        var panel = new StackPanel { Spacing = 8 };
+        foreach (var control in controls) panel.Children.Add(control);
+        return panel;
+    }
+
+    public static TextBlock Section(string title)
+    {
+        var text = Text(title, true);
+        text.Margin = new Thickness(0, 12, 0, 2);
+        return text;
+    }
+
+    public static Border Card(Control content, string className = "strategy-card")
+    {
+        var border = new Border { Child = content, CornerRadius = new CornerRadius(12), Padding = new Thickness(14) };
+        border.Classes.Add(className);
+        return border;
+    }
+
+    public static readonly EditorChoice<ConditionMatch>[] Matches =
+        [new(ConditionMatch.All, "全部满足"), new(ConditionMatch.Any, "任一满足")];
+
+    public static readonly EditorChoice<GhoulColor>[] Colors =
+        [new(GhoulColor.Red, "红色"), new(GhoulColor.Blue, "蓝色"), new(GhoulColor.Green, "绿色"), new(GhoulColor.Yellow, "黄色")];
+
+    public static string ColorName(GhoulColor color) => Colors.First(x => x.Value == color).Label;
+
+    public static Border DragHandle()
+    {
+        var handle = new Border
+        {
+            Child = new TextBlock { Text = "⠿", FontSize = 22, VerticalAlignment = VerticalAlignment.Center },
+            Padding = new Thickness(5), Focusable = true
+        };
+        // 光标由平台创建，挂载到实际界面时再获取。
+        handle.AttachedToVisualTree += (_, _) => handle.Cursor = new Avalonia.Input.Cursor(Avalonia.Input.StandardCursorType.SizeAll);
+        ToolTip.SetTip(handle, "拖动排序；聚焦后可用上下方向键移动");
+        return handle;
+    }
+}
diff --git a/MFAAvalonia/Features/CombatStrategies/StrategyDocument.cs b/MFAAvalonia/Features/CombatStrategies/StrategyDocument.cs
new file mode 100644
index 00000000..5c2eaf58
--- /dev/null
+++ b/MFAAvalonia/Features/CombatStrategies/StrategyDocument.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+
+namespace MFAAvalonia.Features.CombatStrategies;
+
+public enum StrategyAction { Ultimate, Bomb }
+public enum GhoulColor { Red, Blue, Green, Yellow }
+public enum ConditionMatch { All, Any }
+public enum ConditionMetric { BattleNormalLinks, StageNormalLinks, EnemyHp, AllyHp, EnemyHpPercent, AllyHpPercent, UltimateReady, UltimateReleased, FrenzyActive }
+public enum ComparisonOperator { GreaterOrEqual, LessOrEqual, Greater, Less, Equal, NotEqual }
+
+public sealed class StrategyDocument
+{
+    [JsonRequired] public int SchemaVersion { get; set; } = 1;
+    [JsonRequired] public string Id { get; set; } = Guid.NewGuid().ToString("N");
+    [JsonRequired] public string Name { get; set; } = "未命名策略";
+    [JsonRequired] public string InitialStageId { get; set; } = "";
+    [JsonRequired] public List<StrategyStage> Stages { get; set; } = [];
+}
+
+public sealed class StrategyStage
+{
+    [JsonRequired] public string Id { get; set; } = Guid.NewGuid().ToString("N");
+    [JsonRequired] public string Name { get; set; } = "新阶段";
+    [JsonRequired] public StageActions Actions { get; set; } = new();
+    [JsonRequired] public FrenzySettings Frenzy { get; set; } = new();
+    [JsonRequired] public List<StageTransition> Transitions { get; set; } = [];
+}
+
+public sealed class StageActions
+{
+    [JsonRequired] public List<StrategyAction> Priority { get; set; } = [StrategyAction.Ultimate, StrategyAction.Bomb];
+    [JsonRequired] public List<int> BombLevels { get; set; } = [3];
+    [JsonRequired] public List<UltimateRule> Ultimates { get; set; } = [new() { Slot = 1 }, new() { Slot = 2 }, new() { Slot = 3 }];
+    [JsonRequired] public NormalLinkSettings NormalLink { get; set; } = new();
+}
+
+public sealed class UltimateRule
+{
+    [JsonRequired] public int Slot { get; set; }
+    [JsonRequired] public bool Enabled { get; set; } = true;
+    public StrategyCondition? Condition { get; set; }
+}
+
+public sealed class NormalLinkSettings
+{
+    [JsonRequired] public bool PrioritizeColors { get; set; }
+    [JsonRequired] public int LongLinkThreshold { get; set; } = 7;
+    [JsonRequired] public List<GhoulColor> ColorPriority { get; set; } = [GhoulColor.Red, GhoulColor.Blue, GhoulColor.Green, GhoulColor.Yellow];
+}
+
+public sealed class FrenzySettings
+{
+    [JsonRequired] public bool AllowUltimates { get; set; } = true;
+    [JsonRequired] public bool AllowBombs { get; set; } = true;
+    public GhoulColor? ReservedColor { get; set; }
+}
+
+public sealed class StageTransition
+{
+    [JsonRequired] public string Id { get; set; } = Guid.NewGuid().ToString("N");
+    [JsonRequired] public string TargetStageId { get; set; } = "";
+    [JsonRequired] public StrategyCondition Condition { get; set; } = new ConditionGroup();
+}
+
+[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
+[JsonDerivedType(typeof(ConditionGroup), "group")]
+[JsonDerivedType(typeof(ConditionPredicate), "predicate")]
+public abstract class StrategyCondition { }
+
+public sealed class ConditionGroup : StrategyCondition
+{
+    [JsonRequired] public ConditionMatch Match { get; set; } = ConditionMatch.All;
+    [JsonRequired] public List<StrategyCondition> Children { get; set; } = [];
+}
+
+public sealed class ConditionPredicate : StrategyCondition
+{
+    [JsonRequired] public ConditionMetric Metric { get; set; } = ConditionMetric.StageNormalLinks;
+    public ComparisonOperator? Comparison { get; set; }
+    public decimal? Value { get; set; }
+    public List<int>? Slots { get; set; }
+    public ConditionMatch? SlotMatch { get; set; }
+    public bool? Expected { get; set; }
+}
+
+public static class StrategyDefaults
+{
+    public static StrategyDocument Create()
+    {
+        var result = CreateEditable("默认策略");
+        result.Id = "default";
+        return result;
+    }
+
+    public static StrategyDocument CreateEditable(string name)
+    {
+        var stage = new StrategyStage { Name = "全程作战" };
+        return new StrategyDocument { Name = name, InitialStageId = stage.Id, Stages = [stage] };
+    }
+}
+
+public sealed record StrategySummary(string Id, string Name, bool IsBuiltIn = false)
+{
+    public override string ToString() => Name;
+}
+
+public sealed record StrategyCatalog(IReadOnlyList<StrategySummary> Strategies, IReadOnlyList<string> Errors);
+
+public sealed class StrategyValidationException(IReadOnlyList<string> errors) : Exception(string.Join(Environment.NewLine, errors))
+{
+    public IReadOnlyList<string> Errors { get; } = errors;
+}
diff --git a/MFAAvalonia/Features/CombatStrategies/StrategyEditorSession.cs b/MFAAvalonia/Features/CombatStrategies/StrategyEditorSession.cs
new file mode 100644
index 00000000..c417d650
--- /dev/null
+++ b/MFAAvalonia/Features/CombatStrategies/StrategyEditorSession.cs
@@ -0,0 +1,264 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MFAAvalonia.Features.CombatStrategies;
+
+public enum UnsavedDecision { Cancel, Save, Discard }
+
+/// <summary>编辑草稿与持久化分离，只有保存成功才清除修改状态。</summary>
+public sealed class StrategyEditorSession
+{
+    private readonly StrategyStore _store;
+    private StrategyDocument _saved;
+    private bool _isNew;
+    public StrategyDocument Current { get; private set; }
+    public StrategyCatalog Catalog { get; private set; }
+    public bool HasUnsavedChanges { get; private set; }
+    public bool IsReadOnly => Current.Id == "default";
+    public string? Error { get; private set; }
+    public string DirectoryPath => _store.DirectoryPath;
+    public event Action? DraftChanged;
+    public event Action? StateChanged;
+
+    public StrategyEditorSession(StrategyStore store)
+    {
+        _store = store;
+        Current = StrategyDefaults.Create();
+        _saved = StrategyJson.Clone(Current);
+        Catalog = _store.List();
+    }
+
+    public void MarkDirty()
+    {
+        EnsureWritable();
+        HasUnsavedChanges = true;
+        Error = null;
+        StateChanged?.Invoke();
+    }
+
+    public void Select(string id)
+    {
+        if (HasUnsavedChanges) throw new InvalidOperationException("请先处理未保存的修改。");
+        Open(_store.Load(id), isNew: false);
+    }
+
+    public void Create(string name)
+    {
+        if (HasUnsavedChanges) throw new InvalidOperationException("请先处理未保存的修改。");
+        Open(StrategyDefaults.CreateEditable(name), isNew: true);
+    }
+
+    public StrategyDocument Load(string id) => _store.Load(id);
+
+    public void Duplicate() => Duplicate(Current);
+
+    public void Duplicate(StrategyDocument source)
+    {
+        var clone = StrategyJson.Clone(source);
+        clone.Id = NewId();
+        clone.Name = source.Name + " 副本";
+        var ids = clone.Stages.ToDictionary(x => x.Id, _ => NewId());
+        clone.InitialStageId = ids[clone.InitialStageId];
+        foreach (var stage in clone.Stages)
+        {
+            stage.Id = ids[stage.Id];
+            foreach (var transition in stage.Transitions)
+            {
+                transition.Id = NewId();
+                if (ids.TryGetValue(transition.TargetStageId, out var target))
+                    transition.TargetStageId = target;
+            }
+        }
+        Open(clone, isNew: true);
+    }
+
+    public void Rename(string name)
+    {
+        EnsureWritable();
+        Current.Name = name.Trim();
+        MarkDirty();
+        RefreshCatalog();
+    }
+
+    public void Rename(string id, string name)
+    {
+        if (id == Current.Id)
+        {
+            Rename(name);
+            return;
+        }
+
+        var document = _store.Load(id);
+        document.Name = name.Trim();
+        _store.Save(document);
+        RefreshCatalog();
+        StateChanged?.Invoke();
+    }
+
+    public void Save()
+    {
+        EnsureWritable();
+        _store.Save(Current);
+        _saved = StrategyJson.Clone(Current);
+        _isNew = false;
+        HasUnsavedChanges = false;
+        Error = null;
+        RefreshCatalog();
+        StateChanged?.Invoke();
+    }
+
+    public bool TrySave()
+    {
+        try { Save(); return true; }
+        catch (Exception ex) when (StrategyStore.IsFileError(ex) || ex is InvalidOperationException)
+        {
+            Error = ex.Message;
+            StateChanged?.Invoke();
+            return false;
+        }
+    }
+
+    public async Task<bool> TryLeaveAsync(Func<Task<UnsavedDecision>> prompt)
+    {
+        if (!HasUnsavedChanges) return true;
+        switch (await prompt())
+        {
+            case UnsavedDecision.Save:
+                return TrySave();
+            case UnsavedDecision.Discard:
+                Current = _isNew ? StrategyDefaults.Create() : StrategyJson.Clone(_saved);
+                _saved = StrategyJson.Clone(Current);
+                _isNew = false;
+                HasUnsavedChanges = false;
+                Error = null;
+                RefreshCatalog();
+                DraftChanged?.Invoke();
+                StateChanged?.Invoke();
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    public async Task<bool> TrySwitchAsync(string id, Func<Task<UnsavedDecision>> prompt)
+    {
+        if (id == Current.Id) return true;
+        if (!await TryLeaveAsync(prompt)) return false;
+        try { Select(id); return true; }
+        catch (Exception ex) when (StrategyStore.IsFileError(ex))
+        {
+            Error = ex.Message;
+            StateChanged?.Invoke();
+            return false;
+        }
+    }
+
+    public void DeleteCurrent()
+    {
+        EnsureWritable();
+        _store.Delete(Current.Id);
+        Open(StrategyDefaults.Create(), false);
+    }
+
+    public void Delete(string id)
+    {
+        if (id == Current.Id)
+        {
+            DeleteCurrent();
+            return;
+        }
+
+        _store.Delete(id);
+        RefreshCatalog();
+        StateChanged?.Invoke();
+    }
+
+    public StrategyStage AddStage()
+    {
+        EnsureWritable();
+        var stage = new StrategyStage { Name = $"阶段 {Current.Stages.Count + 1}" };
+        Current.Stages.Add(stage);
+        StructuralChange();
+        return stage;
+    }
+
+    public StrategyStage CopyStage(StrategyStage source)
+    {
+        EnsureWritable();
+        var copy = StrategyJson.Clone(Current).Stages[Current.Stages.IndexOf(source)];
+        copy.Id = NewId();
+        copy.Name = source.Name + " 副本";
+        foreach (var transition in copy.Transitions)
+        {
+            transition.Id = NewId();
+            if (transition.TargetStageId == source.Id) transition.TargetStageId = copy.Id;
+        }
+        Current.Stages.Insert(Current.Stages.IndexOf(source) + 1, copy);
+        StructuralChange();
+        return copy;
+    }
+
+    public void DeleteStage(StrategyStage stage)
+    {
+        EnsureWritable();
+        if (Current.Stages.Count <= 1) throw new InvalidOperationException("策略至少保留一个阶段。");
+        if (Current.InitialStageId == stage.Id) throw new InvalidOperationException("请先将其他阶段设为初始阶段。");
+        var references = Current.Stages.Where(x => x.Id != stage.Id && x.Transitions.Any(t => t.TargetStageId == stage.Id)).Select(x => x.Name).ToArray();
+        if (references.Length != 0) throw new InvalidOperationException("以下阶段仍引用此阶段，请先修改跳转目标：" + string.Join("、", references));
+        Current.Stages.Remove(stage);
+        StructuralChange();
+    }
+
+    public void SetInitialStage(StrategyStage stage)
+    {
+        EnsureWritable();
+        Current.InitialStageId = stage.Id;
+        StructuralChange();
+    }
+
+    public void MoveStage(StrategyStage source, StrategyStage target)
+    {
+        EnsureWritable();
+        var from = Current.Stages.IndexOf(source);
+        var to = Current.Stages.IndexOf(target);
+        if (from < 0 || to < 0 || from == to) return;
+        Current.Stages.RemoveAt(from);
+        Current.Stages.Insert(to, source);
+        StructuralChange();
+    }
+
+    public void RefreshCatalog()
+    {
+        var loaded = _store.List();
+        var list = loaded.Strategies.Where(x => x.Id != Current.Id).ToList();
+        list.Add(new StrategySummary(Current.Id, Current.Name, IsReadOnly));
+        Catalog = new(list.OrderByDescending(x => x.IsBuiltIn).ThenBy(x => x.Name, StringComparer.CurrentCulture).ToList(), loaded.Errors);
+    }
+
+    public void StructuralChange()
+    {
+        MarkDirty();
+        DraftChanged?.Invoke();
+    }
+
+    private void Open(StrategyDocument document, bool isNew)
+    {
+        Current = document;
+        _saved = StrategyJson.Clone(document);
+        _isNew = isNew;
+        HasUnsavedChanges = isNew;
+        Error = null;
+        RefreshCatalog();
+        DraftChanged?.Invoke();
+        StateChanged?.Invoke();
+    }
+
+    private void EnsureWritable()
+    {
+        if (IsReadOnly) throw new InvalidOperationException("默认策略为只读，请先复制。");
+    }
+
+    private static string NewId() => Guid.NewGuid().ToString("N");
+}
diff --git a/MFAAvalonia/Features/CombatStrategies/StrategyJson.cs b/MFAAvalonia/Features/CombatStrategies/StrategyJson.cs
new file mode 100644
index 00000000..a41f25d9
--- /dev/null
+++ b/MFAAvalonia/Features/CombatStrategies/StrategyJson.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace MFAAvalonia.Features.CombatStrategies;
+
+/// <summary>客户端与后续战斗执行端共用的版本化策略格式。</summary>
+public static class StrategyJson
+{
+    private static readonly JsonSerializerOptions Options = new()
+    {
+        PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
+        WriteIndented = true,
+        Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+        UnmappedMemberHandling = JsonUnmappedMemberHandling.Disallow,
+        AllowOutOfOrderMetadataProperties = true,
+        MaxDepth = 64,
+        Converters = { new JsonStringEnumConverter(JsonNamingPolicy.SnakeCaseLower, allowIntegerValues: false) }
+    };
+
+    public static string Serialize(StrategyDocument document)
+    {
+        StrategyValidator.EnsureValid(document);
+        return JsonSerializer.Serialize(document, Options);
+    }
+
+    public static StrategyDocument Deserialize(string json)
+    {
+        try
+        {
+            var result = JsonSerializer.Deserialize<StrategyDocument>(json, Options)
+                ?? throw new StrategyValidationException(["策略文件内容为空。"]);
+            StrategyValidator.EnsureValid(result);
+            return result;
+        }
+        catch (JsonException ex)
+        {
+            throw new StrategyValidationException([$"策略 JSON 格式错误：{ex.Message}"]);
+        }
+    }
+
+    /// <summary>复制编辑草稿，允许保留尚未填写完整的条件。</summary>
+    public static StrategyDocument Clone(StrategyDocument document) =>
+        JsonSerializer.Deserialize<StrategyDocument>(JsonSerializer.Serialize(document, Options), Options)!;
+}
diff --git a/MFAAvalonia/Features/CombatStrategies/StrategyStore.cs b/MFAAvalonia/Features/CombatStrategies/StrategyStore.cs
new file mode 100644
index 00000000..9c5518c9
--- /dev/null
+++ b/MFAAvalonia/Features/CombatStrategies/StrategyStore.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace MFAAvalonia.Features.CombatStrategies;
+
+/// <summary>使用独立文件保存策略，失败时显式报告并保留原文件。</summary>
+public sealed class StrategyStore(string directory)
+{
+    public string DirectoryPath { get; } = Path.GetFullPath(directory);
+
+    public StrategyCatalog List()
+    {
+        var items = new List<StrategySummary> { new("default", "默认策略", true) };
+        var errors = new List<string>();
+        if (!Directory.Exists(DirectoryPath)) return new(items, errors);
+        try
+        {
+            foreach (var path in Directory.EnumerateFiles(DirectoryPath, "*.json").OrderBy(x => x, StringComparer.Ordinal))
+            {
+                try
+                {
+                    var id = Path.GetFileNameWithoutExtension(path);
+                    if (id == "default") throw new ArgumentException("用户文件不能使用内置默认策略的保留标识。");
+                    var document = Load(id);
+                    items.Add(new(document.Id, document.Name));
+                }
+                catch (Exception ex) when (IsFileError(ex))
+                { errors.Add($"{Path.GetFileName(path)}：{ex.Message}"); }
+            }
+        }
+        catch (Exception ex) when (IsFileError(ex)) { errors.Add($"无法读取策略目录：{ex.Message}"); }
+        return new(items.Take(1).Concat(items.Skip(1).OrderBy(x => x.Name, StringComparer.CurrentCulture)).ToList(), errors);
+    }
+
+    public StrategyDocument Load(string id)
+    {
+        if (id == "default") return StrategyDefaults.Create();
+        var document = StrategyJson.Deserialize(File.ReadAllText(GetPath(id), Encoding.UTF8));
+        if (document.Id != id) throw new StrategyValidationException(["策略标识与文件名不一致。"]);
+        return document;
+    }
+
+    public void Save(StrategyDocument document)
+    {
+        if (document.Id == "default") throw new InvalidOperationException("内置默认策略不能覆盖，请先复制。");
+        var path = GetPath(document.Id);
+        var json = StrategyJson.Serialize(document);
+        Directory.CreateDirectory(DirectoryPath);
+        var temporary = path + "." + Guid.NewGuid().ToString("N") + ".tmp";
+        try
+        {
+            using (var stream = new FileStream(temporary, FileMode.CreateNew, FileAccess.Write, FileShare.None))
+            {
+                var bytes = Encoding.UTF8.GetBytes(json);
+                stream.Write(bytes);
+                stream.Flush(flushToDisk: true);
+            }
+            File.Move(temporary, path, overwrite: true);
+        }
+        finally
+        {
+            // 清理临时文件不能掩盖真正的保存错误。
+            try { if (File.Exists(temporary)) File.Delete(temporary); }
+            catch (IOException) { }
+            catch (UnauthorizedAccessException) { }
+        }
+    }
+
+    public void Delete(string id)
+    {
+        if (id == "default") throw new InvalidOperationException("内置默认策略不能删除。");
+        File.Delete(GetPath(id));
+    }
+
+    private string GetPath(string id)
+    {
+        if (!StrategyValidator.IsId(id)) throw new ArgumentException("策略标识无效。", nameof(id));
+        return Path.Combine(DirectoryPath, id + ".json");
+    }
+
+    public static bool IsFileError(Exception ex) =>
+        ex is IOException or UnauthorizedAccessException or ArgumentException or StrategyValidationException;
+}
diff --git a/MFAAvalonia/Features/CombatStrategies/StrategyValidator.cs b/MFAAvalonia/Features/CombatStrategies/StrategyValidator.cs
new file mode 100644
index 00000000..24855bd6
--- /dev/null
+++ b/MFAAvalonia/Features/CombatStrategies/StrategyValidator.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MFAAvalonia.Features.CombatStrategies;
+
+public static class StrategyValidator
+{
+    public const int MaxConditionDepth = 16;
+
+    public static void EnsureValid(StrategyDocument document)
+    {
+        var errors = Validate(document);
+        if (errors.Count != 0)
+            throw new StrategyValidationException(errors);
+    }
+
+    public static IReadOnlyList<string> Validate(StrategyDocument document)
+    {
+        var errors = new List<string>();
+        if (document.SchemaVersion != 1) errors.Add($"不支持策略格式版本 {document.SchemaVersion}。");
+        if (document.Id != "default" && !IsId(document.Id)) errors.Add("策略标识无效。");
+        if (string.IsNullOrWhiteSpace(document.Name)) errors.Add("请填写策略名称。");
+        if (document.Stages == null || document.Stages.Count == 0)
+        {
+            errors.Add("策略至少需要一个阶段。");
+            return errors;
+        }
+        var stageIds = new HashSet<string>(StringComparer.Ordinal);
+        foreach (var stage in document.Stages)
+        {
+            if (stage == null || !IsId(stage.Id) || !stageIds.Add(stage.Id))
+                errors.Add("阶段标识无效或重复。");
+        }
+        if (!stageIds.Contains(document.InitialStageId ?? "")) errors.Add("请选择有效的初始阶段。");
+        var transitionIds = new HashSet<string>(StringComparer.Ordinal);
+        foreach (var stage in document.Stages.Where(x => x != null))
+        {
+            var prefix = $"阶段“{stage.Name}”";
+            if (string.IsNullOrWhiteSpace(stage.Name)) errors.Add("请填写阶段名称。");
+            if (stage.Actions == null || stage.Frenzy == null || stage.Transitions == null)
+            {
+                errors.Add(prefix + "的配置不完整。");
+                continue;
+            }
+            var actions = stage.Actions;
+            if (!IsPermutation(actions.Priority, Enum.GetValues<StrategyAction>()))
+                errors.Add(prefix + "的行动优先级必须完整包含奥义和炸弹。");
+            if (actions.BombLevels == null || actions.BombLevels.Distinct().Count() != actions.BombLevels.Count || actions.BombLevels.Any(x => x < 1 || x > 3))
+                errors.Add(prefix + "的炸弹等级无效或重复。");
+            if (actions.NormalLink == null || actions.NormalLink.LongLinkThreshold != 7 || !IsPermutation(actions.NormalLink.ColorPriority, Enum.GetValues<GhoulColor>()))
+                errors.Add(prefix + "的连线颜色配置无效。");
+            if (stage.Frenzy.ReservedColor is { } color && !Enum.IsDefined(color)) errors.Add(prefix + "的乱舞保留颜色无效。");
+            if (actions.Ultimates == null || actions.Ultimates.Any(x => x == null) || !IsPermutation(actions.Ultimates.Where(x => x != null).Select(x => x.Slot), new[] { 1, 2, 3 }))
+                errors.Add(prefix + "必须包含三个不重复的奥义位置。");
+            if (actions.Ultimates != null)
+                foreach (var ultimate in actions.Ultimates.Where(x => x != null))
+                    if (ultimate.Condition != null)
+                    {
+                        if (ultimate.Condition is not ConditionGroup) errors.Add(prefix + "的奥义前置根节点必须是条件组。");
+                        ValidateCondition(ultimate.Condition, errors, prefix + $"的位置 {ultimate.Slot}", 0, ultimate.Slot, allowEmptyRoot: true);
+                    }
+            foreach (var transition in stage.Transitions)
+            {
+                if (transition == null) { errors.Add(prefix + "存在空转变规则。"); continue; }
+                if (!IsId(transition.Id) || !transitionIds.Add(transition.Id)) errors.Add(prefix + "的转变规则标识无效或重复。");
+                if (!stageIds.Contains(transition.TargetStageId ?? "")) errors.Add(prefix + "的转变目标不存在。");
+                if (transition.Condition is not ConditionGroup) errors.Add(prefix + "的转变条件根节点必须是条件组。");
+                ValidateCondition(transition.Condition, errors, prefix + "的转变条件", 0, null, false);
+            }
+        }
+        return errors;
+    }
+
+    private static bool IsPermutation<T>(IEnumerable<T>? actual, IEnumerable<T> expected) =>
+        actual != null && actual.OrderBy(x => x).SequenceEqual(expected.OrderBy(x => x));
+
+    public static bool IsId(string? id) => id is { Length: 32 } && Guid.TryParseExact(id, "N", out _);
+
+    private static void ValidateCondition(StrategyCondition? condition, List<string> errors, string prefix, int depth, int? ownerSlot, bool allowEmptyRoot)
+    {
+        if (depth >= MaxConditionDepth) { errors.Add(prefix + "的条件嵌套过深。"); return; }
+        if (condition is ConditionGroup group)
+        {
+            if (!Enum.IsDefined(group.Match)) errors.Add(prefix + "的条件组合无效。");
+            if (group.Children == null || (group.Children.Count == 0 && !(depth == 0 && allowEmptyRoot)))
+            { errors.Add(prefix + "存在空条件组，请添加条件或删除空组。"); return; }
+            foreach (var child in group.Children)
+                ValidateCondition(child, errors, prefix, depth + 1, ownerSlot, false);
+            return;
+        }
+        if (condition is not ConditionPredicate predicate || !Enum.IsDefined(predicate.Metric))
+        { errors.Add(prefix + "存在未知条件。"); return; }
+        if (predicate.Metric is ConditionMetric.UltimateReady or ConditionMetric.UltimateReleased)
+        {
+            if (predicate.Slots == null || predicate.Slots.Count == 0 || predicate.Slots.Distinct().Count() != predicate.Slots.Count || predicate.Slots.Any(x => x < 1 || x > 3))
+                errors.Add(prefix + "请选择有效的奥义位置。");
+            if (predicate.SlotMatch is not { } match || !Enum.IsDefined(match) || predicate.Expected == null)
+                errors.Add(prefix + "的奥义状态条件不完整。");
+            if (predicate.Metric == ConditionMetric.UltimateReady && ownerSlot != null && predicate.Slots?.Contains(ownerSlot.Value) == true)
+                errors.Add(prefix + "的自身就绪是内置条件，请只选择其他位置。");
+            if (predicate.Value != null || predicate.Comparison != null) errors.Add(prefix + "的奥义状态不能包含数值比较。");
+        }
+        else if (predicate.Metric == ConditionMetric.FrenzyActive)
+        {
+            if (predicate.Expected == null || predicate.Value != null || predicate.Comparison != null || predicate.Slots != null || predicate.SlotMatch != null)
+                errors.Add(prefix + "的乱舞状态条件无效。");
+        }
+        else
+        {
+            if (predicate.Value is not { } value || value < 0 || predicate.Comparison is not { } comparison || !Enum.IsDefined(comparison))
+                errors.Add(prefix + "请填写有效的非负数值和比较方式。");
+            else
+            {
+                if (predicate.Metric is ConditionMetric.AllyHpPercent or ConditionMetric.EnemyHpPercent && value > 100)
+                    errors.Add(prefix + "的血量百分比必须在 0 到 100 之间。");
+                if (predicate.Metric is ConditionMetric.BattleNormalLinks or ConditionMetric.StageNormalLinks && decimal.Truncate(value) != value)
+                    errors.Add(prefix + "的普通连线手数必须是整数。");
+            }
+            if (predicate.Expected != null || predicate.Slots != null || predicate.SlotMatch != null)
+                errors.Add(prefix + "的数值条件不能包含奥义位置或布尔状态。");
+        }
+    }
+}
diff --git a/MFAAvalonia/Helper/AppPaths.cs b/MFAAvalonia/Helper/AppPaths.cs
index ad6b6f87..f2646a4d 100644
--- a/MFAAvalonia/Helper/AppPaths.cs
+++ b/MFAAvalonia/Helper/AppPaths.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
@@ -155,4 +156,124 @@ public static void CleanupObsoleteExecutableBackups(Action<string>? logInfo = nu
             logWarning?.Invoke($"处理旧主程序 backupMFA 清理失败：原因={ex.Message}");
         }
     }
+
+    /// <summary>
+    /// 清理过期的 MaaFramework 调试日志和截图，并限制调试目录占用。
+    /// </summary>
+    public static void CleanupOldDebugLogs(int retainDays = 3, Action<string>? logInfo = null, Action<string>? logWarning = null)
+    {
+        try
+        {
+            var debugDirectory = Path.Combine(InstallRoot, "debug");
+            if (!Directory.Exists(debugDirectory))
+                return;
+
+            var cutoff = DateTime.Now.AddDays(-retainDays);
+            var activeLog = Path.Combine(debugDirectory, "maafw.log");
+            if (File.Exists(activeLog) && new FileInfo(activeLog).Length > 0)
+            {
+                try
+                {
+                    var backupName = $"maafw.bak.{DateTime.Now:yyyy.MM.dd-HH.mm.ss.fff}.log";
+                    File.Move(activeLog, Path.Combine(debugDirectory, backupName));
+                    logInfo?.Invoke($"已轮转调试日志：{backupName}");
+                }
+                catch (Exception ex)
+                {
+                    logWarning?.Invoke($"轮转调试日志失败：原因={ex.Message}");
+                }
+            }
+
+            foreach (var file in Directory.EnumerateFiles(debugDirectory, "maafw.bak.*.log", SearchOption.AllDirectories))
+            {
+                try
+                {
+                    if (File.GetLastWriteTime(file) >= cutoff)
+                        continue;
+
+                    File.SetAttributes(file, FileAttributes.Normal);
+                    File.Delete(file);
+                    logInfo?.Invoke($"已清理过期调试日志：文件={Path.GetFileName(file)}");
+                }
+                catch (Exception ex)
+                {
+                    logWarning?.Invoke($"清理调试日志失败：文件={file}，原因={ex.Message}");
+                }
+            }
+
+            var directorySize = Directory.EnumerateFiles(debugDirectory, "*", SearchOption.AllDirectories)
+                .Sum(file =>
+                {
+                    try { return new FileInfo(file).Length; }
+                    catch { return 0L; }
+                });
+            if (directorySize > 500L * 1024 * 1024)
+            {
+                DeleteExcessFiles(
+                    Directory.EnumerateFiles(debugDirectory, "maafw.bak.*.log", SearchOption.TopDirectoryOnly),
+                    10,
+                    "debug 目录超过 500 MiB，已清理备份日志",
+                    logInfo,
+                    logWarning);
+
+                var errorDirectory = Path.Combine(debugDirectory, "on_error");
+                if (Directory.Exists(errorDirectory))
+                {
+                    DeleteExcessFiles(
+                        Directory.EnumerateFiles(errorDirectory, "*.png", SearchOption.TopDirectoryOnly),
+                        50,
+                        "debug 目录超过 500 MiB，已清理错误截图",
+                        logInfo,
+                        logWarning);
+                }
+            }
+
+            foreach (var pattern in new[] { "*.png", "*.jpg", "*.jpeg" })
+            {
+                foreach (var file in Directory.EnumerateFiles(debugDirectory, pattern, SearchOption.AllDirectories))
+                {
+                    try
+                    {
+                        if (File.GetLastWriteTime(file) >= cutoff)
+                            continue;
+
+                        File.SetAttributes(file, FileAttributes.Normal);
+                        File.Delete(file);
+                    }
+                    catch (Exception ex)
+                    {
+                        logWarning?.Invoke($"清理调试截图失败：文件={file}，原因={ex.Message}");
+                    }
+                }
+            }
+
+            logInfo?.Invoke("调试文件清理完成");
+        }
+        catch (Exception ex)
+        {
+            logWarning?.Invoke($"清理调试日志异常：原因={ex.Message}");
+        }
+    }
+
+    private static void DeleteExcessFiles(
+        IEnumerable<string> files,
+        int retainCount,
+        string message,
+        Action<string>? logInfo,
+        Action<string>? logWarning)
+    {
+        foreach (var file in files.OrderByDescending(file => file).Skip(retainCount))
+        {
+            try
+            {
+                File.SetAttributes(file, FileAttributes.Normal);
+                File.Delete(file);
+                logInfo?.Invoke($"{message}：文件={Path.GetFileName(file)}");
+            }
+            catch (Exception ex)
+            {
+                logWarning?.Invoke($"清理调试文件失败：文件={file}，原因={ex.Message}");
+            }
+        }
+    }
 }
diff --git a/MFAAvalonia/Helper/Converters/TitleConverter.cs b/MFAAvalonia/Helper/Converters/TitleConverter.cs
index 74e83b8f..621ec1f2 100644
--- a/MFAAvalonia/Helper/Converters/TitleConverter.cs
+++ b/MFAAvalonia/Helper/Converters/TitleConverter.cs
@@ -17,18 +17,18 @@ public class TitleConverter : MarkupExtension, IMultiValueConverter
         var customTitle = SafeGetValue<string>(values, 0);
         var isCustomVisible = SafeGetValue<bool>(values, 1);
         var appName = SafeGetValue<object>(values, 2);
-        var appVersion = SafeGetValue<string>(values, 3);
-        var resourceName = SafeGetValue<string>(values, 4);
-        var resourceVersion = SafeGetValue<string>(values, 5);
-        var isResourceVisible = SafeGetValue<bool>(values, 6);
+        var resourceName = SafeGetValue<string>(values, 3);
+        var isResourceVisible = SafeGetValue<bool>(values, 4);
 
-        var result = $"{appName} {appVersion}";
+        var result = appName?.ToString() ?? string.Empty;
         // 主逻辑
         if (isCustomVisible && !string.IsNullOrEmpty(customTitle))
             result = customTitle;
 
-        if (isResourceVisible && !string.IsNullOrEmpty(resourceName))
-            result = $"{appName} {appVersion} | {resourceName} {resourceVersion}";
+        if (isResourceVisible
+            && !string.IsNullOrEmpty(resourceName)
+            && !string.Equals(appName?.ToString(), resourceName, StringComparison.OrdinalIgnoreCase))
+            result = $"{appName} | {resourceName}";
         return result;
     }
 
diff --git a/MFAAvalonia/Helper/DirectoryMerger.cs b/MFAAvalonia/Helper/DirectoryMerger.cs
index 4e9e4a96..1c5a587e 100644
--- a/MFAAvalonia/Helper/DirectoryMerger.cs
+++ b/MFAAvalonia/Helper/DirectoryMerger.cs
@@ -150,8 +150,8 @@ async private static Task MergeDirectoryAsync(
                 // 判断是否需要跳过文件
                 if (!(overwriteMFA
                         || !Path.GetFileName(tempPath).Contains("MFAUpdater")
-                        && !Path.GetFileName(tempPath).Contains("MFAAvalonia")
-                        && !Path.GetFileName(tempPath).Contains(Process.GetCurrentProcess().MainModule?.ModuleName ?? "MFAAvalonia.exe"))
+                        && !Path.GetFileName(tempPath).Contains("MaaPazugiri")
+                        && !Path.GetFileName(tempPath).Contains(Process.GetCurrentProcess().MainModule?.ModuleName ?? "MaaPazugiri.exe"))
                     || Path.GetFileName(tempPath).Contains("interface.json", StringComparison.OrdinalIgnoreCase)
                     // || Path.GetExtension(tempPath).Equals(".dll", StringComparison.OrdinalIgnoreCase) && OperatingSystem.IsWindows()
                     // || !Path.FindPath(tempPath).Contains("minicap.so", StringComparison.OrdinalIgnoreCase)
diff --git a/MFAAvalonia/Helper/EmulatorEnvironmentHelper.cs b/MFAAvalonia/Helper/EmulatorEnvironmentHelper.cs
new file mode 100644
index 00000000..97036789
--- /dev/null
+++ b/MFAAvalonia/Helper/EmulatorEnvironmentHelper.cs
@@ -0,0 +1,376 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+
+namespace MFAAvalonia.Helper;
+
+/// <summary>卡死恢复时可自动重启的模拟器类型。</summary>
+public enum EmulatorKind
+{
+    Unknown = 0,
+    MuMu = 1,
+    LDPlayer = 2,
+    Nox = 3,
+    MEmu = 4,
+    BlueStacks = 5,
+}
+
+/// <summary>
+/// 模拟器环境探测：类型识别、安装目录、控制台入口、主程序与实例序号。
+/// 连接配置可能缺失或过期，这里统一用设备名、运行中的进程与 ADB 端口兜底，
+/// 避免卡死恢复时因为拿不到控制入口而让重启链路空转。
+/// </summary>
+public static class EmulatorEnvironmentHelper
+{
+    /// <summary>MuMu 新版设备进程名。</summary>
+    public const string MuMuDeviceProcessName = "MuMuNxDevice";
+
+    /// <summary>MuMu 新版虚拟机进程名。</summary>
+    public const string MuMuVmProcessName = "MuMuVMMHeadless";
+
+    /// <summary>MuMu 旧版主程序进程名。</summary>
+    public const string MuMuLegacyProcessName = "MuMuPlayer";
+
+    /// <summary>实例序号上限：超过该值的端口不属于对应模拟器，避免指令落到错误实例。</summary>
+    private const int MaxInstanceIndex = 99;
+
+    /// <summary>已知的模拟器进程名与类型，按探测优先级排列。</summary>
+    private static readonly (EmulatorKind Kind, string ProcessName)[] KnownProcesses =
+    [
+        (EmulatorKind.MuMu, MuMuDeviceProcessName),
+        (EmulatorKind.MuMu, MuMuVmProcessName),
+        (EmulatorKind.MuMu, MuMuLegacyProcessName),
+        (EmulatorKind.LDPlayer, "dnplayer"),
+        (EmulatorKind.LDPlayer, "ld9boxHeadless"),
+        (EmulatorKind.Nox, "Nox"),
+        (EmulatorKind.MEmu, "MEmu"),
+        (EmulatorKind.BlueStacks, "HD-Player"),
+    ];
+
+    private static readonly string[] BlueStacksProcessNames = ["HD-Player"];
+
+    /// <summary>按设备名识别模拟器类型，识别不出来时返回 Unknown。</summary>
+    public static EmulatorKind DetectKindByDeviceName(string? deviceName)
+    {
+        if (string.IsNullOrWhiteSpace(deviceName))
+            return EmulatorKind.Unknown;
+        if (deviceName.Contains("MuMu", StringComparison.OrdinalIgnoreCase))
+            return EmulatorKind.MuMu;
+        if (deviceName.Contains("LDPlayer", StringComparison.OrdinalIgnoreCase)
+            || deviceName.Contains("雷电", StringComparison.Ordinal))
+            return EmulatorKind.LDPlayer;
+        if (deviceName.Contains("Nox", StringComparison.OrdinalIgnoreCase))
+            return EmulatorKind.Nox;
+        if (deviceName.Contains("MEmu", StringComparison.OrdinalIgnoreCase)
+            || deviceName.Contains("XYAZ", StringComparison.OrdinalIgnoreCase)
+            || deviceName.Contains("逍遥", StringComparison.Ordinal))
+            return EmulatorKind.MEmu;
+        if (deviceName.Contains("BlueStacks", StringComparison.OrdinalIgnoreCase)
+            || deviceName.Contains("蓝叠", StringComparison.Ordinal))
+            return EmulatorKind.BlueStacks;
+        return EmulatorKind.Unknown;
+    }
+
+    /// <summary>按进程名识别模拟器类型，识别不出来时返回 Unknown。</summary>
+    public static EmulatorKind DetectKindByProcessName(string? processName)
+    {
+        if (string.IsNullOrWhiteSpace(processName))
+            return EmulatorKind.Unknown;
+
+        return KnownProcesses
+            .FirstOrDefault(entry => entry.ProcessName.Equals(processName, StringComparison.OrdinalIgnoreCase))
+            .Kind;
+    }
+
+    /// <summary>按可执行文件名识别模拟器类型，识别不出来时返回 Unknown。</summary>
+    public static EmulatorKind DetectKindByExecutablePath(string? executablePath)
+    {
+        if (string.IsNullOrWhiteSpace(executablePath))
+            return EmulatorKind.Unknown;
+
+        return Path.GetFileName(executablePath).ToLowerInvariant() switch
+        {
+            "dnplayer.exe" or "ld9boxheadless.exe" or "ldconsole.exe" or "dnconsole.exe" => EmulatorKind.LDPlayer,
+            "mumuplayer.exe" or "mumunxdevice.exe" or "mumuvmmheadless.exe"
+                or "mumu-cli.exe" or "mumumanager.exe" => EmulatorKind.MuMu,
+            "nox.exe" or "noxconsole.exe" or "noxlauncher.exe" => EmulatorKind.Nox,
+            "memu.exe" or "memuc.exe" or "memuheadless.exe" or "memuconsole.exe" => EmulatorKind.MEmu,
+            "hd-player.exe" or "bluestacks.exe" or "bluestacksplayer.exe" => EmulatorKind.BlueStacks,
+            _ => EmulatorKind.Unknown,
+        };
+    }
+
+    /// <summary>启动设置里的启动参数可能不带实例序号，无法解析时返回 null。</summary>
+    private static readonly string[] InstanceArgumentPrefixes =
+    [
+        "--vmindex",
+        "--instance",
+        "--index",
+        "-index",
+        "-v",
+        "-i",
+    ];
+
+    /// <summary>
+    /// 从启动设置的启动参数中解析实例序号，支持 `-v 0`、`--vmindex 1`、`-index:2`、`-i 3` 等写法；
+    /// 解析不出来时返回 null，由调用方继续用连接配置或 ADB 端口兜底。
+    /// </summary>
+    public static int? ResolveInstanceIndexFromArguments(string? arguments)
+    {
+        if (string.IsNullOrWhiteSpace(arguments))
+            return null;
+
+        var tokens = arguments.Split([' ', '\t'], StringSplitOptions.RemoveEmptyEntries);
+        for (var i = 0; i < tokens.Length; i++)
+        {
+            foreach (var prefix in InstanceArgumentPrefixes)
+            {
+                var token = tokens[i];
+                if (!token.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+                    continue;
+
+                var remainder = token[prefix.Length..];
+                // 余下部分必须为空或以分隔符开头，避免把 -index 当成 -i
+                if (remainder.Length > 0 && remainder[0] is not ('=' or ':'))
+                    continue;
+
+                var inlineText = remainder.TrimStart('=', ':');
+                if (int.TryParse(inlineText, out var inlineIndex) && IsValidInstanceIndex(inlineIndex))
+                    return inlineIndex;
+                if (i + 1 < tokens.Length && int.TryParse(tokens[i + 1], out var nextIndex) && IsValidInstanceIndex(nextIndex))
+                    return nextIndex;
+            }
+        }
+
+        return null;
+    }
+
+    private static bool IsValidInstanceIndex(int index) => index >= 0 && index <= MaxInstanceIndex;
+
+    /// <summary>探测正在运行的模拟器，返回类型与其可执行文件路径。</summary>
+    public static (EmulatorKind Kind, string? ExePath) DetectRunningEmulator()
+    {
+        foreach (var (kind, processName) in KnownProcesses)
+        {
+            var exePath = TryGetExecutablePath(processName);
+            if (exePath != null)
+                return (kind, exePath);
+        }
+
+        return (EmulatorKind.Unknown, null);
+    }
+
+    /// <summary>该类型在强制结束时需要一并结束的进程名。</summary>
+    public static string[] GetProcessNames(EmulatorKind kind) => kind switch
+    {
+        EmulatorKind.MuMu => [MuMuDeviceProcessName, MuMuVmProcessName],
+        EmulatorKind.LDPlayer => ["dnplayer", "ld9boxHeadless"],
+        EmulatorKind.Nox => ["Nox", "NoxVMHandle"],
+        EmulatorKind.MEmu => ["MEmu", "MEmuHeadless"],
+        EmulatorKind.BlueStacks => BlueStacksProcessNames,
+        _ => [],
+    };
+
+    /// <summary>关闭与启动的控制台命令模板，{0} 为实例序号；没有控制台时返回 null。</summary>
+    public static (string Shutdown, string Launch)? GetConsoleCommands(EmulatorKind kind) => kind switch
+    {
+        EmulatorKind.LDPlayer => ("quit --index {0}", "launch --index {0}"),
+        EmulatorKind.Nox => ("quit -index:{0}", "launch -index:{0}"),
+        EmulatorKind.MEmu => ("stop -i {0}", "start -i {0}"),
+        _ => null,
+    };
+
+    /// <summary>从 ADB 地址反推实例序号；无法确定时返回 null，由调用方回退默认实例。</summary>
+    public static int? ResolveInstanceIndex(EmulatorKind kind, string? adbSerial)
+    {
+        var port = ParsePort(adbSerial);
+        if (port == null)
+            return null;
+
+        return kind switch
+        {
+            EmulatorKind.MuMu => ResolveMuMuIndex(port.Value),
+            EmulatorKind.LDPlayer => ResolveSteppedIndex(port.Value, 5555, 2),
+            EmulatorKind.Nox => ResolveNoxIndex(port.Value),
+            EmulatorKind.MEmu => ResolveSteppedIndex(port.Value, 21503, 10),
+            _ => null,
+        };
+    }
+
+    /// <summary>从模拟器进程路径推导安装目录，返回第一个包含控制台或主程序的候选目录。</summary>
+    public static string? ResolveInstallRoot(EmulatorKind kind, string? emulatorExePath)
+    {
+        if (string.IsNullOrWhiteSpace(emulatorExePath))
+            return null;
+
+        try
+        {
+            var directory = Path.GetDirectoryName(emulatorExePath);
+            if (string.IsNullOrWhiteSpace(directory))
+                return null;
+
+            var fileName = Path.GetFileName(emulatorExePath);
+            var candidates = GetInstallRootCandidates(fileName, directory);
+
+            // 先看哪个候选目录能定位到控制台，其次看主程序，最后退回存在的目录
+            foreach (var candidate in candidates)
+            {
+                if (FindConsole(kind, candidate, emulatorExePath) != null)
+                    return candidate;
+            }
+            foreach (var candidate in candidates)
+            {
+                if (FindLaunchExecutable(kind, candidate, emulatorExePath) != null)
+                    return candidate;
+            }
+
+            return candidates.FirstOrDefault(Directory.Exists);
+        }
+        catch
+        {
+            // 路径异常或权限不足时按未识别处理，由调用方决定后续兜底
+            return null;
+        }
+    }
+
+    /// <summary>
+    /// 安装目录候选顺序：MuMu 新版为 nx_device/&lt;版本&gt;/shell/xxx.exe 需上溯三级，
+    /// MuMu 旧版主程序位于 shell/ 下需上溯一级，其余模拟器进程一般就在安装目录内。
+    /// </summary>
+    private static string[] GetInstallRootCandidates(string fileName, string directory)
+    {
+        if (fileName.Equals("MuMuNxDevice.exe", StringComparison.OrdinalIgnoreCase)
+            || fileName.Equals("MuMuVMMHeadless.exe", StringComparison.OrdinalIgnoreCase))
+            return [Up(directory, 3), Up(directory, 1), directory];
+        if (fileName.Equals("MuMuPlayer.exe", StringComparison.OrdinalIgnoreCase))
+            return [Up(directory, 1), Up(directory, 2), directory];
+        return [directory, Up(directory, 1), Up(directory, 2)];
+    }
+
+    /// <summary>查找模拟器控制台可执行文件。</summary>
+    public static string? FindConsole(EmulatorKind kind, string? installRoot, string? runningExePath)
+        => FindFirstExisting(GetConsoleFileNames(kind), installRoot, runningExePath);
+
+    /// <summary>查找模拟器主程序可执行文件。</summary>
+    public static string? FindLaunchExecutable(EmulatorKind kind, string? installRoot, string? runningExePath)
+        => FindFirstExisting(GetLaunchFileNames(kind), installRoot, runningExePath);
+
+    private static string? FindFirstExisting(string[] relativeNames, string? installRoot, string? runningExePath)
+    {
+        if (relativeNames.Length == 0)
+            return null;
+
+        foreach (var directory in BuildProbeDirectories(installRoot, runningExePath))
+        {
+            foreach (var relativeName in relativeNames)
+            {
+                var path = Path.Combine(directory, relativeName);
+                if (File.Exists(path))
+                    return path;
+            }
+        }
+
+        return null;
+    }
+
+    private static string[] GetConsoleFileNames(EmulatorKind kind) => kind switch
+    {
+        EmulatorKind.MuMu =>
+        [
+            Path.Combine("nx_main", "mumu-cli.exe"),
+            Path.Combine("nx_main", "MuMuManager.exe"),
+            Path.Combine("shell", "MuMuManager.exe"),
+        ],
+        EmulatorKind.LDPlayer => ["ldconsole.exe", "dnconsole.exe"],
+        EmulatorKind.Nox => ["NoxConsole.exe", Path.Combine("bin", "NoxConsole.exe")],
+        EmulatorKind.MEmu => ["memuc.exe", "MEmuConsole.exe"],
+        _ => [],
+    };
+
+    private static string[] GetLaunchFileNames(EmulatorKind kind) => kind switch
+    {
+        EmulatorKind.MuMu => ["MuMuPlayer.exe"],
+        EmulatorKind.LDPlayer => ["dnplayer.exe", "ld9boxHeadless.exe"],
+        EmulatorKind.Nox => [Path.Combine("bin", "Nox.exe"), "Nox.exe", "NoxLauncher.exe"],
+        EmulatorKind.MEmu => ["MEmu.exe"],
+        EmulatorKind.BlueStacks => ["HD-Player.exe", "Bluestacks.exe"],
+        _ => [],
+    };
+
+    private static IEnumerable<string> BuildProbeDirectories(string? installRoot, string? runningExePath)
+    {
+        var directories = new List<string>();
+        var exeDirectory = string.IsNullOrWhiteSpace(runningExePath) ? null : Path.GetDirectoryName(runningExePath);
+        if (!string.IsNullOrWhiteSpace(exeDirectory))
+            directories.Add(exeDirectory);
+        if (!string.IsNullOrWhiteSpace(installRoot) && !directories.Contains(installRoot, StringComparer.OrdinalIgnoreCase))
+            directories.Add(installRoot);
+        return directories;
+    }
+
+    private static string? TryGetExecutablePath(string processName)
+    {
+        try
+        {
+            return Process.GetProcessesByName(processName).FirstOrDefault()?.MainModule?.FileName;
+        }
+        catch
+        {
+            // 位数不同或权限不足时读取模块路径会失败，按未运行处理
+            return null;
+        }
+    }
+
+    private static string Up(string directory, int levels)
+    {
+        var path = directory;
+        for (var i = 0; i < levels; i++)
+            path = Path.Combine(path, "..");
+        return Path.GetFullPath(path);
+    }
+
+    private static int? ParsePort(string? adbSerial)
+    {
+        if (string.IsNullOrWhiteSpace(adbSerial))
+            return null;
+
+        var address = adbSerial.Trim();
+        if (address.StartsWith("emulator-", StringComparison.OrdinalIgnoreCase))
+        {
+            // emulator-5554 的控制台端口实际对应 5555 这个 ADB 端口
+            return int.TryParse(address["emulator-".Length..], out var consolePort) ? consolePort + 1 : null;
+        }
+
+        var separatorIndex = address.LastIndexOf(':');
+        return separatorIndex >= 0 && int.TryParse(address[(separatorIndex + 1)..], out var port) ? port : null;
+    }
+
+    private static int? ResolveMuMuIndex(int port)
+    {
+        if (port == 7555)
+            return 0;
+        if (port >= 16384)
+            return ResolveSteppedIndex(port, 16384, 32);
+        return port >= 5555 ? ResolveSteppedIndex(port, 5555, 2) : null;
+    }
+
+    private static int? ResolveNoxIndex(int port)
+    {
+        if (port == 62001)
+            return 0;
+        var index = port - 62024;
+        return index > 0 && index <= MaxInstanceIndex ? index : null;
+    }
+
+    private static int? ResolveSteppedIndex(int port, int basePort, int step)
+    {
+        var offset = port - basePort;
+        if (offset < 0 || offset % step != 0)
+            return null;
+
+        var index = offset / step;
+        return index <= MaxInstanceIndex ? index : null;
+    }
+}
diff --git a/MFAAvalonia/Helper/FileLogExporter.cs b/MFAAvalonia/Helper/FileLogExporter.cs
index 86de4a4b..c4a16730 100644
--- a/MFAAvalonia/Helper/FileLogExporter.cs
+++ b/MFAAvalonia/Helper/FileLogExporter.cs
@@ -308,8 +308,8 @@ private static IEnumerable<string> GetMaaLogFiles(string debugDir)
         var namedMaaLogs = allFiles.Where(file =>
         {
             var fileName = Path.GetFileName(file);
-            return fileName.StartsWith("maa.log", StringComparison.OrdinalIgnoreCase)
-                   || fileName.StartsWith("maafw.log", StringComparison.OrdinalIgnoreCase);
+            return fileName.StartsWith("maa", StringComparison.OrdinalIgnoreCase)
+                   && fileName.EndsWith(".log", StringComparison.OrdinalIgnoreCase);
         });
 
         if (namedMaaLogs.Any())
@@ -454,9 +454,13 @@ private static int CountLines(string filePath)
     // 尝试以共享方式读取文件快照，降低“文件占用导致复制失败”的概率
     private static void CopyFileSnapshot(string sourcePath, string destPath)
     {
-        using var source = new FileStream(sourcePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete);
-        using var destination = new FileStream(destPath, FileMode.Create, FileAccess.Write, FileShare.None);
-        source.CopyTo(destination);
+        using (var source = new FileStream(sourcePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete))
+        using (var destination = new FileStream(destPath, FileMode.Create, FileAccess.Write, FileShare.None))
+        {
+            source.CopyTo(destination);
+        }
+
+        File.SetLastWriteTimeUtc(destPath, File.GetLastWriteTimeUtc(sourcePath));
     }
 
     private static List<string> CreateArchiveVolumes(string sourceDirectory, bool allowSplitArchives)
diff --git a/MFAAvalonia/Helper/IconHelper.cs b/MFAAvalonia/Helper/IconHelper.cs
index 46f55310..f3c95135 100644
--- a/MFAAvalonia/Helper/IconHelper.cs
+++ b/MFAAvalonia/Helper/IconHelper.cs
@@ -14,33 +14,48 @@ namespace MFAAvalonia.Helper;
 public static class IconHelper
 {
     private static readonly Lazy<Bitmap> LazyIcon = new(LoadIconWithFallback);
+    private static readonly Lazy<Bitmap> LazyLogo = new(LoadLogoWithFallback);
     public static Bitmap Icon => LazyIcon.Value;
+    public static Bitmap Logo => LazyLogo.Value;
     public static WindowIcon WindowIcon => new (Icon);
 
-    private static Bitmap LoadIconWithFallback()
+    private static Bitmap LoadLogoWithFallback()
     {
         try
         {
-            var dataDirectory = AppPaths.DataRoot;
             var installDirectory = AppPaths.InstallRoot;
+            var logoPath = Path.Combine(installDirectory, "Assets", "logo.png");
+            if (!File.Exists(logoPath))
+                logoPath = Path.Combine(installDirectory, "assets", "logo.png");
+            if (File.Exists(logoPath))
+            {
+                using var fileStream = File.OpenRead(logoPath);
+                return new Bitmap(fileStream);
+            }
 
-            // 尝试从 interface.json 同目录读取 icon 字段
-            var interfacePath = AppPaths.InterfaceJsonPath;
-            if (File.Exists(interfacePath))
+            var uri = new Uri("avares://MFAAvalonia.Core/Assets/logo.png");
+            if (AssetLoader.Exists(uri))
             {
-                var interfaceIcon = TryGetInterfaceIcon(interfacePath);
-                if (!string.IsNullOrWhiteSpace(interfaceIcon))
-                {
-                    var interfaceIconPath = Path.Combine(dataDirectory, interfaceIcon);
-                    if (File.Exists(interfaceIconPath))
-                    {
-                        using var fileStream = File.OpenRead(interfaceIconPath);
-                        return new Bitmap(fileStream);
-                    }
-                }
+                var assets = AssetLoader.Open(uri);
+                return new Bitmap(assets);
             }
+        }
+        catch (Exception ex)
+        {
+            LoggerHelper.Error("加载高清应用 Logo 失败", ex);
+        }
 
-            // 尝试从执行目录加载
+        return Icon;
+    }
+
+    private static Bitmap LoadIconWithFallback()
+    {
+        try
+        {
+            var dataDirectory = AppPaths.DataRoot;
+            var installDirectory = AppPaths.InstallRoot;
+
+            // 优先使用应用自带图标
             var iconPath = Path.Combine(installDirectory, "Assets", "logo.ico");
             if (!File.Exists(iconPath))
                 iconPath = Path.Combine(installDirectory, "assets", "logo.ico");
@@ -58,6 +73,22 @@ private static Bitmap LoadIconWithFallback()
                 return new Bitmap(assets);
             }
 
+            // 仅在应用图标资源不可用时尝试读取 interface.json 图标
+            var interfacePath = AppPaths.InterfaceJsonPath;
+            if (File.Exists(interfacePath))
+            {
+                var interfaceIcon = TryGetInterfaceIcon(interfacePath);
+                if (!string.IsNullOrWhiteSpace(interfaceIcon))
+                {
+                    var interfaceIconPath = Path.Combine(dataDirectory, interfaceIcon);
+                    if (File.Exists(interfaceIconPath))
+                    {
+                        using var fileStream = File.OpenRead(interfaceIconPath);
+                        return new Bitmap(fileStream);
+                    }
+                }
+            }
+
             LoggerHelper.Warning("未找到内嵌图标资源");
             return CreateEmptyImage();
         }
diff --git a/MFAAvalonia/Helper/Instances.cs b/MFAAvalonia/Helper/Instances.cs
index 400eafdd..7b112f82 100644
--- a/MFAAvalonia/Helper/Instances.cs
+++ b/MFAAvalonia/Helper/Instances.cs
@@ -440,6 +440,8 @@ public static void TryBeforeClosed(bool noLog, bool stopTask)
     private static MonitorViewModel _monitorViewModel;
     private static ScreenshotView _screenshotView;
     private static ScreenshotViewModel _screenshotViewModel;
+    private static CombatStrategyView _combatStrategyView;
+    private static CombatStrategyViewModel _combatStrategyViewModel;
     
     private static ConnectSettingsUserControl _connectSettingsUserControl;
     private static ConnectSettingsUserControlModel _connectSettingsUserControlModel;
diff --git a/MFAAvalonia/Helper/LangKeys.cs b/MFAAvalonia/Helper/LangKeys.cs
index 95a33c38..4f2b829c 100644
--- a/MFAAvalonia/Helper/LangKeys.cs
+++ b/MFAAvalonia/Helper/LangKeys.cs
@@ -286,6 +286,7 @@ public static class LangKeys
 	public static readonly string ResourceDownloadSource = "ResourceDownloadSource";
 	public static readonly string ResourceLink = "ResourceLink";
 	public static readonly string GlobalOption = "GlobalOption";
+	public static readonly string GlobalSetting = "GlobalSetting";
 	public static readonly string ControllerPresetConfig = "ControllerPresetConfig";
 	public static readonly string ResourceName = "ResourceName";
 	public static readonly string ResourceOption = "ResourceOption";
@@ -312,6 +313,7 @@ public static class LangKeys
 	public static readonly string ScreencapTimeoutDisconnected = "ScreencapTimeoutDisconnected";
 	public static readonly string Select = "Select";
 	public static readonly string SelectAll = "SelectAll";
+	public static readonly string ToggleSelectAll = "ToggleSelectAll";
 	public static readonly string SelectExecutableFile = "SelectExecutableFile";
 	public static readonly string SelectExistingImage = "SelectExistingImage";
 	public static readonly string Settings = "Settings";
@@ -350,6 +352,7 @@ public static class LangKeys
 	public static readonly string TaskSettings = "TaskSettings";
 	public static readonly string TaskStackError = "TaskStackError";
 	public static readonly string TaskStart = "TaskStart";
+	public static readonly string TaskRoundComplete = "TaskRoundComplete";
 	public static readonly string TaskStopped = "TaskStopped";
 	public static readonly string TaskAddedToast = "TaskAddedToast";
 	public static readonly string TaskDeletedToast = "TaskDeletedToast";
diff --git a/MFAAvalonia/Helper/LoopDetector.cs b/MFAAvalonia/Helper/LoopDetector.cs
new file mode 100644
index 00000000..20438656
--- /dev/null
+++ b/MFAAvalonia/Helper/LoopDetector.cs
@@ -0,0 +1,60 @@
+using System;
+
+namespace MFAAvalonia.Helper;
+
+/// <summary>统计连续重复的点击动作，并用二次确认排除短暂的正常重复。</summary>
+public sealed class LoopDetector
+{
+    /// <summary>连续相同点击达到此次数后进入二次确认。</summary>
+    public const int LoopThreshold = 80;
+
+    /// <summary>二次确认需要额外观察的相同点击次数。</summary>
+    public const int ConfirmCount = 20;
+
+    private readonly object _gate = new();
+    private string? _lastKey;
+    private int _count;
+    private int _confirmCount;
+
+    public bool IsTriggered { get; private set; }
+
+    public bool Feed(string nodeName, string action, int x, int y)
+    {
+        lock (_gate)
+        {
+            if (IsTriggered)
+                return false;
+
+            var key = $"{nodeName}|{action}";
+            if (key != _lastKey)
+            {
+                _lastKey = key;
+                _count = 1;
+                _confirmCount = 0;
+                return false;
+            }
+
+            _count++;
+            if (_count < LoopThreshold)
+                return false;
+
+            _confirmCount++;
+            if (_confirmCount < ConfirmCount)
+                return false;
+
+            IsTriggered = true;
+            return true;
+        }
+    }
+
+    public void Reset()
+    {
+        lock (_gate)
+        {
+            _lastKey = null;
+            _count = 0;
+            _confirmCount = 0;
+            IsTriggered = false;
+        }
+    }
+}
diff --git a/MFAAvalonia/Helper/MaaLogRotator.cs b/MFAAvalonia/Helper/MaaLogRotator.cs
new file mode 100644
index 00000000..1b1050d9
--- /dev/null
+++ b/MFAAvalonia/Helper/MaaLogRotator.cs
@@ -0,0 +1,201 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MaaFramework.Binding;
+using MFAAvalonia.Extensions.MaaFW;
+
+namespace MFAAvalonia.Helper;
+
+/// <summary>
+/// 按文件大小轮转 MaaFramework 调试日志。
+/// </summary>
+public static class MaaLogRotator
+{
+    public const long MaxLogChunkBytes = 20L * 1024 * 1024;
+
+    private static readonly TimeSpan PollInterval = TimeSpan.FromSeconds(30);
+    private static readonly SemaphoreSlim RotateGate = new(1, 1);
+    private static CancellationTokenSource? _cancellationTokenSource;
+    private static Task? _pollTask;
+    private static string? _activeLogDirectory;
+
+    /// <summary>
+    /// 启动日志轮转检查。
+    /// </summary>
+    public static void Start()
+    {
+        if (_pollTask is { IsCompleted: false })
+            return;
+
+        var cancellationTokenSource = new CancellationTokenSource();
+        _cancellationTokenSource = cancellationTokenSource;
+        _pollTask = Task.Run(async () =>
+        {
+            while (!cancellationTokenSource.IsCancellationRequested)
+            {
+                try
+                {
+                    TryRotateIfNeeded();
+                }
+                catch (Exception ex)
+                {
+                    LoggerHelper.Warning($"MaaFramework 日志轮转检查异常：{ex.Message}");
+                }
+
+                try
+                {
+                    await Task.Delay(PollInterval, cancellationTokenSource.Token).ConfigureAwait(false);
+                }
+                catch (OperationCanceledException)
+                {
+                    break;
+                }
+            }
+        }, cancellationTokenSource.Token);
+    }
+
+    /// <summary>
+    /// 停止日志轮转检查。
+    /// </summary>
+    public static void Stop()
+    {
+        var cancellationTokenSource = Interlocked.Exchange(ref _cancellationTokenSource, null);
+        _pollTask = null;
+        cancellationTokenSource?.Cancel();
+    }
+
+    /// <summary>
+    /// 超过大小阈值时切换日志目录并保存当前日志。
+    /// </summary>
+    public static void TryRotateIfNeeded()
+    {
+        if (!RotateGate.Wait(0))
+            return;
+
+        try
+        {
+            var debugDirectory = Path.Combine(AppPaths.InstallRoot, "debug");
+            var activeDirectory = _activeLogDirectory ?? debugDirectory;
+            var activeLog = Path.Combine(activeDirectory, "maafw.log");
+            if (!File.Exists(activeLog) || new FileInfo(activeLog).Length <= MaxLogChunkBytes)
+                return;
+
+            var tasker = FindAvailableTasker();
+            if (tasker == null)
+                return;
+
+            RotateCore(tasker, debugDirectory, activeLog);
+        }
+        catch (Exception ex)
+        {
+            LoggerHelper.Warning($"MaaFramework 日志轮转失败：{ex.Message}");
+        }
+        finally
+        {
+            RotateGate.Release();
+        }
+    }
+
+    private static MaaTasker? FindAvailableTasker()
+    {
+        if (!MaaProcessorManager.IsInstanceCreated)
+            return null;
+
+        return MaaProcessorManager.Instance.Instances
+            .SelectMany(processor => new[] { processor.MaaTasker, processor.ScreenshotTasker })
+            .FirstOrDefault(tasker => tasker != null);
+    }
+
+    private static void RotateCore(MaaTasker tasker, string debugDirectory, string activeLog)
+    {
+        var rotateDirectory = Path.Combine(AppPaths.TempMaaFwDirectory, $"rotate_{DateTime.Now:yyyyMMdd_HHmmss_fff}");
+        var switchedToTemporaryDirectory = false;
+        var switchedBackToDebugDirectory = false;
+
+        try
+        {
+            Directory.CreateDirectory(rotateDirectory);
+            LoggerHelper.Info($"MaaFramework 日志超过阈值，切换日志目录：{rotateDirectory}");
+
+            if (!tasker.Global.SetOption_LogDir(rotateDirectory))
+            {
+                LoggerHelper.Warning("MaaFramework 日志轮转失败：切换到临时目录失败。");
+                return;
+            }
+            switchedToTemporaryDirectory = true;
+
+            var backupPath = MoveLogToBackup(activeLog, debugDirectory);
+            if (tasker.Global.SetOption_LogDir(debugDirectory))
+            {
+                switchedBackToDebugDirectory = true;
+                _activeLogDirectory = null;
+                MergeTransitionLog(rotateDirectory, backupPath);
+            }
+            else
+            {
+                _activeLogDirectory = rotateDirectory;
+                LoggerHelper.Warning($"MaaFramework 日志轮转后未能切回目录：{debugDirectory}");
+            }
+
+            LoggerHelper.Info("MaaFramework 日志轮转完成。");
+        }
+        catch (Exception ex)
+        {
+            LoggerHelper.Warning($"MaaFramework 日志轮转异常：{ex.Message}");
+            if (switchedToTemporaryDirectory && !switchedBackToDebugDirectory)
+                _activeLogDirectory = rotateDirectory;
+        }
+        finally
+        {
+            try
+            {
+                if (Directory.Exists(rotateDirectory)
+                    && !string.Equals(_activeLogDirectory, rotateDirectory, StringComparison.Ordinal)
+                    && !Directory.EnumerateFileSystemEntries(rotateDirectory).Any())
+                {
+                    Directory.Delete(rotateDirectory);
+                }
+            }
+            catch (Exception ex)
+            {
+                LoggerHelper.Warning($"清理日志轮转临时目录失败：{ex.Message}");
+            }
+        }
+    }
+
+    private static void MergeTransitionLog(string rotateDirectory, string backupPath)
+    {
+        var transitionLog = Path.Combine(rotateDirectory, "maafw.log");
+        if (!File.Exists(transitionLog) || new FileInfo(transitionLog).Length == 0)
+            return;
+
+        try
+        {
+            using (var appendStream = new FileStream(backupPath, FileMode.Append, FileAccess.Write, FileShare.Read))
+            using (var sourceStream = new FileStream(transitionLog, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+            {
+                sourceStream.CopyTo(appendStream);
+            }
+
+            File.Delete(transitionLog);
+        }
+        catch (Exception ex)
+        {
+            LoggerHelper.Warning($"合并 MaaFramework 轮转过渡日志失败：{ex.Message}");
+        }
+    }
+
+    private static string MoveLogToBackup(string sourcePath, string targetDirectory)
+    {
+        var timestamp = DateTime.Now.ToString("yyyy.MM.dd-HH.mm.ss.fff");
+        var backupPath = Path.Combine(targetDirectory, $"maafw.bak.{timestamp}.log");
+        for (var suffix = 2; File.Exists(backupPath); suffix++)
+            backupPath = Path.Combine(targetDirectory, $"maafw.bak.{timestamp}_{suffix}.log");
+
+        File.Move(sourcePath, backupPath);
+        LoggerHelper.Info($"已保存 MaaFramework 日志分卷：{Path.GetFileName(backupPath)}");
+        return backupPath;
+    }
+}
diff --git a/MFAAvalonia/Helper/TaskOptionGenerator.cs b/MFAAvalonia/Helper/TaskOptionGenerator.cs
index 88453276..ec2546e8 100644
--- a/MFAAvalonia/Helper/TaskOptionGenerator.cs
+++ b/MFAAvalonia/Helper/TaskOptionGenerator.cs
@@ -95,8 +95,11 @@ public void GenerateAdvancedPanelContent(StackPanel panel, DragItemViewModel dra
             }
         }
     }
-    
-    public void GenerateResourceOptionPanelContent(StackPanel panel, DragItemViewModel dragItem)
+
+    public void GenerateResourceOptionPanelContent(
+        StackPanel panel,
+        DragItemViewModel dragItem,
+        bool useSettingsPresentation = false)
     {
         if (dragItem.ResourceItem?.SelectOptions == null)
             return;
@@ -128,7 +131,7 @@ public void GenerateResourceOptionPanelContent(StackPanel panel, DragItemViewMod
             if (subOptionNames.Contains(selectOption.Name ?? string.Empty))
                 continue;
 
-            AddOption(panel, selectOption, dragItem);
+            AddOption(panel, selectOption, dragItem, useSettingsPresentation);
         }
     }
 
@@ -169,7 +172,11 @@ private void AddRepeatOption(Panel panel, DragItemViewModel source)
         panel.Children.Add(grid);
     }
 
-    private void AddOption(Panel panel, MaaInterface.MaaInterfaceSelectOption option, DragItemViewModel source)
+    private void AddOption(
+        Panel panel,
+        MaaInterface.MaaInterfaceSelectOption option,
+        DragItemViewModel source,
+        bool useSettingsPresentation = false)
     {
         if (MaaProcessor.Interface?.Option?.TryGetValue(option.Name ?? string.Empty, out var interfaceOption) != true) return;
 
@@ -194,7 +201,7 @@ private void AddOption(Panel panel, MaaInterface.MaaInterfaceSelectOption option
         else if ((interfaceOption.IsSwitch && interfaceOption.Cases.ShouldSwitchButton(out var yes, out var no)) ||
                  interfaceOption.Cases.ShouldSwitchButton(out yes, out no)) // Try both conditions with/without type checking logic
         {
-            control = CreateToggleControl(option, yes, no, interfaceOption, source);
+            control = CreateToggleControl(option, yes, no, interfaceOption, source, useSettingsPresentation);
         }
         else
         {
@@ -610,20 +617,27 @@ private Control CreateToggleControl(
         int yesValue,
         int noValue,
         MaaInterface.MaaInterfaceOption interfaceOption,
-        DragItemViewModel source)
+        DragItemViewModel source,
+        bool useSettingsPresentation = false)
     {
         var wrapper = new StackPanel();
 
         var grid = new Grid
         {
-            ColumnDefinitions =
-            {
-                new ColumnDefinition { Width = GridLength.Auto },
-                new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) },
-                new ColumnDefinition { Width = GridLength.Auto }
-            },
-            Margin = OptionRowMargin
+            ColumnSpacing = useSettingsPresentation ? 16 : 0,
+            Margin = useSettingsPresentation ? new Thickness(0, 3, 0, 3) : OptionRowMargin
         };
+        if (useSettingsPresentation)
+        {
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        }
+        else
+        {
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+        }
         
         interfaceOption.InitializeIcon();
 
@@ -679,13 +693,21 @@ void UpdateSubOptions(int index)
         UpdateSubOptions(option.Index ?? 0);
 
         // Label with Icon
-        var labelPanel = CreateLabelPanel(option.DisplayName, option.Name, interfaceOption.Description, interfaceOption.Document);
-        var icon = CreateIcon(interfaceOption);
-        icon.Margin = new Thickness(0, 0, 6, 0);
-        labelPanel.Children.Insert(0, icon);
+        StackPanel labelPanel;
+        if (useSettingsPresentation)
+        {
+            labelPanel = CreateSettingsOptionLabelPanel(option.DisplayName, option.Name, interfaceOption);
+        }
+        else
+        {
+            labelPanel = CreateLabelPanel(option.DisplayName, option.Name, interfaceOption.Description, interfaceOption.Document);
+            var icon = CreateIcon(interfaceOption);
+            icon.Margin = new Thickness(0, 0, 6, 0);
+            labelPanel.Children.Insert(0, icon);
+        }
 
         Grid.SetColumn(labelPanel, 0);
-        Grid.SetColumn(toggleSwitch, 2);
+        Grid.SetColumn(toggleSwitch, useSettingsPresentation ? 1 : 2);
         
         grid.Children.Add(labelPanel);
         grid.Children.Add(toggleSwitch);
@@ -700,7 +722,8 @@ void UpdateSubOptions(int index)
     private Control CreateComboBoxControl(
         MaaInterface.MaaInterfaceSelectOption option, 
         MaaInterface.MaaInterfaceOption interfaceOption,
-        DragItemViewModel source)
+        DragItemViewModel source,
+        bool keepLabelInline = false)
     {
         var wrapper = new StackPanel();
         var grid = CreateBaseGrid();
@@ -760,7 +783,7 @@ void UpdateSubOptions(int index)
         
         UpdateSubOptions(option.Index ?? 0);
         ComboBoxExtensions.SetDisableNavigationOnLostFocus(comboBox, true);
-        ComboBoxExtensions.SetCanSearch(comboBox, true);
+        ComboBoxExtensions.SetCanSearch(comboBox, interfaceOption.IsSearchable);
         ComboBoxExtensions.SetSearchMemberPath(comboBox, "DisplayName");
         comboBox.Bind(ComboBoxExtensions.SearchWatermarkProperty, new I18nBinding(LangKeys.Search));
         // Header
@@ -771,8 +794,20 @@ void UpdateSubOptions(int index)
 
         Grid.SetColumn(labelPanel, 0);
         Grid.SetColumn(comboBox, 1);
-        
-        AddResponsiveBehavior(grid, labelPanel, comboBox);
+
+        if (keepLabelInline)
+        {
+            grid.ColumnDefinitions.Clear();
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
+            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
+            labelPanel.MinWidth = 0;
+            labelPanel.Margin = new Thickness(0, 0, 8, 0);
+            comboBox.MinWidth = 0;
+        }
+        else
+        {
+            AddResponsiveBehavior(grid, labelPanel, comboBox);
+        }
         
         grid.Children.Add(labelPanel);
         grid.Children.Add(comboBox);
@@ -882,7 +917,7 @@ private void AddSubOption(StackPanel container, MaaInterface.MaaInterfaceSelectO
                   subInterfaceOption.Cases.ShouldSwitchButton(out yes, out no))
             control = CreateToggleControl(subOption, yes, no, subInterfaceOption, source);
          else
-            control = CreateComboBoxControl(subOption, subInterfaceOption, source);
+            control = CreateComboBoxControl(subOption, subInterfaceOption, source, keepLabelInline: true);
 
          container.Children.Add(control);
     }
@@ -966,6 +1001,54 @@ private StackPanel CreateLabelPanel(string displayName, string? name, string? de
         return stackPanel;
     }
 
+    private StackPanel CreateSettingsOptionLabelPanel(
+        string displayName,
+        string? name,
+        MaaInterface.MaaInterfaceOption interfaceOption)
+    {
+        var stackPanel = new StackPanel
+        {
+            VerticalAlignment = VerticalAlignment.Center,
+            HorizontalAlignment = HorizontalAlignment.Left,
+            Spacing = 4
+        };
+        var headerPanel = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            VerticalAlignment = VerticalAlignment.Center
+        };
+
+        var icon = CreateIcon(interfaceOption);
+        icon.Margin = new Thickness(0, 0, 6, 0);
+        headerPanel.Children.Add(icon);
+
+        var headerText = new TextBlock
+        {
+            FontSize = 16,
+            FontWeight = FontWeight.SemiBold,
+            VerticalAlignment = VerticalAlignment.Center,
+            TextWrapping = TextWrapping.Wrap
+        };
+        headerText.Bind(TextBlock.TextProperty, new ResourceBindingWithFallback(displayName, name));
+        headerPanel.Children.Add(headerText);
+        stackPanel.Children.Add(headerPanel);
+
+        var description = GetTooltipText(interfaceOption.Description, interfaceOption.Document);
+        if (!string.IsNullOrWhiteSpace(description))
+        {
+            var descriptionText = new TextBlock
+            {
+                Margin = new Thickness(0, 2, 0, 0),
+                TextWrapping = TextWrapping.Wrap
+            };
+            descriptionText.Bind(TextBlock.TextProperty, new ResourceBinding(description));
+            descriptionText.Bind(TextBlock.ForegroundProperty, new DynamicResourceExtension("SukiLowText"));
+            stackPanel.Children.Add(descriptionText);
+        }
+
+        return stackPanel;
+    }
+
     private static TextBlock CreateLabelText(string key)
     {
         var textBlock = new TextBlock
diff --git a/MFAAvalonia/Helper/TaskRecoveryMonitor.cs b/MFAAvalonia/Helper/TaskRecoveryMonitor.cs
new file mode 100644
index 00000000..a7979256
--- /dev/null
+++ b/MFAAvalonia/Helper/TaskRecoveryMonitor.cs
@@ -0,0 +1,112 @@
+using System;
+
+namespace MFAAvalonia.Helper;
+
+/// <summary>检测任务回调静默、长时间无点击和重复点击循环。</summary>
+public sealed class TaskRecoveryMonitor
+{
+    /// <summary>用于区分模拟器无响应的回调静默原因。</summary>
+    public const string EmulatorUnresponsiveReasonPrefix = "模拟器无响应";
+
+    private readonly object _gate = new();
+    private readonly LoopDetector _loopDetector = new();
+    private TimeSpan _lastCallback;
+    private TimeSpan _lastClick;
+    private bool _active;
+    private string? _loopReason;
+
+    public void Start(TimeSpan now)
+    {
+        lock (_gate)
+        {
+            _active = true;
+            _lastCallback = now;
+            _lastClick = now;
+            _loopReason = null;
+            _loopDetector.Reset();
+        }
+    }
+
+    public void Stop()
+    {
+        lock (_gate)
+            _active = false;
+    }
+
+    public void RecordCallback(TimeSpan now)
+    {
+        lock (_gate)
+        {
+            if (_active)
+                _lastCallback = now;
+        }
+    }
+
+    public void FeedAction(string name, string action, int x, int y, TimeSpan now)
+    {
+        lock (_gate)
+        {
+            if (!_active)
+                return;
+
+            if (action == "Click")
+                _lastClick = now;
+
+            if (action == "Click" && !string.IsNullOrWhiteSpace(name)
+                && _loopDetector.Feed(name, action, x, y))
+                _loopReason = $"画面冻结：重复点击 {name}，坐标 ({x},{y})";
+        }
+    }
+
+    public void RecordActivity(TimeSpan now)
+    {
+        lock (_gate)
+        {
+            if (_active)
+                _lastClick = now;
+        }
+    }
+
+    public string? GetReason(TimeSpan now, TimeSpan timeout, bool enabled, bool waiting)
+    {
+        lock (_gate)
+        {
+            if (!_active)
+                return null;
+
+            if (!enabled || waiting)
+            {
+                _lastCallback = now;
+                _lastClick = now;
+                _loopReason = null;
+                _loopDetector.Reset();
+                return null;
+            }
+
+            if (_loopReason != null)
+                return _loopReason;
+            if (now - _lastCallback >= timeout)
+                return $"{EmulatorUnresponsiveReasonPrefix}：超过 {timeout.TotalSeconds:0} 秒没有任务回调";
+            if (now - _lastClick >= timeout)
+                return $"任务无点击：超过 {timeout.TotalSeconds:0} 秒没有成功点击";
+
+            return null;
+        }
+    }
+
+    /// <summary>判断原因是否代表模拟器整体无响应。</summary>
+    public static bool IsEmulatorUnresponsiveReason(string? reason) =>
+        reason != null && reason.StartsWith(EmulatorUnresponsiveReasonPrefix, StringComparison.Ordinal);
+
+    public static bool ShouldStartEmulator(bool retryLaunch, bool restartAdb, bool hardRestartAdb) =>
+        retryLaunch || restartAdb || hardRestartAdb;
+
+    public static string GetDisplayReason(string reason)
+    {
+        if (reason.StartsWith("动作循环卡死", StringComparison.Ordinal))
+            return $"动作循环{reason["动作循环卡死".Length..]}";
+        if (reason.StartsWith("画面冻结", StringComparison.Ordinal))
+            return $"动作循环{reason["画面冻结".Length..]}";
+        return reason;
+    }
+}
diff --git a/MFAAvalonia/Helper/TaskRecoveryPolicy.cs b/MFAAvalonia/Helper/TaskRecoveryPolicy.cs
new file mode 100644
index 00000000..c352fbde
--- /dev/null
+++ b/MFAAvalonia/Helper/TaskRecoveryPolicy.cs
@@ -0,0 +1,13 @@
+namespace MFAAvalonia.Helper;
+
+public static class TaskRecoveryPolicy
+{
+    public const string TargetPackageName = "com.dmm.games.touken.puzzle";
+
+    public static bool ShouldMonitor(
+        bool isAndroid,
+        bool isAdbController,
+        bool canInitializeWithoutDevice,
+        bool isSpecialTask)
+        => !isAndroid && isAdbController && !canInitializeWithoutDevice && !isSpecialTask;
+}
diff --git a/MFAAvalonia/Helper/ValueType/MFATask.cs b/MFAAvalonia/Helper/ValueType/MFATask.cs
index 28c2f06b..31dc839a 100644
--- a/MFAAvalonia/Helper/ValueType/MFATask.cs
+++ b/MFAAvalonia/Helper/ValueType/MFATask.cs
@@ -45,6 +45,43 @@ public enum MFATaskStatus
     public long RunId { get; set; }
     public bool ContinueOnError { get; set; }
 
+    private readonly object _earlyCompletionLock = new();
+    private string? _earlyCompletionReason;
+    private bool _earlyCompletionRequested;
+
+    /// <summary>
+    /// 请求本轮结束后停止该队列项的剩余重复次数。
+    /// </summary>
+    public bool RequestEarlyCompletion(string? reason)
+    {
+        lock (_earlyCompletionLock)
+        {
+            if (_earlyCompletionRequested)
+                return true;
+
+            _earlyCompletionReason = reason;
+            _earlyCompletionRequested = true;
+            return true;
+        }
+    }
+
+    private bool TryConsumeEarlyCompletion(out string? reason)
+    {
+        lock (_earlyCompletionLock)
+        {
+            if (!_earlyCompletionRequested)
+            {
+                reason = null;
+                return false;
+            }
+
+            reason = _earlyCompletionReason;
+            _earlyCompletionReason = null;
+            _earlyCompletionRequested = false;
+            return true;
+        }
+    }
+
     public async Task<RunResult> Run(CancellationToken token)
     {
         var instanceId = OwnerViewModel?.Processor.InstanceId;
@@ -72,6 +109,7 @@ void MarkFailed(string? detail = null)
 
         try
         {
+            var infinite = Count < 0;
             if (Count < 0)
                 Count = int.MaxValue;
             OwnerViewModel?.MarkTaskRunning(SourceItem, RunId);
@@ -105,7 +143,31 @@ void MarkFailed(string? detail = null)
                     await Action();
                     token.ThrowIfCancellationRequested();
                 }
+
+                if (TryConsumeEarlyCompletion(out var earlyCompletionReason))
+                {
+                    var taskName = string.IsNullOrWhiteSpace(SourceItem?.Name)
+                        ? LanguageHelper.GetLocalizedString(Name)
+                        : SourceItem.Name;
+                    var message = $"[{taskName}] 任务结束 原因：{earlyCompletionReason}";
+                    LoggerHelper.Info(message);
+                    OwnerViewModel?.Processor.AddLog(message, (IBrush?)null);
+                    break;
+                }
+
                 OwnerViewModel?.MarkTaskIterationCompleted(SourceItem, RunId);
+                // 有限重复任务每轮完成后输出进度；单次任务与无限任务不输出此进度。
+                if (!infinite && Count > 1 && Type == MFATaskType.MAAFW)
+                {
+                    OwnerViewModel?.AddLogByKey(
+                        LangKeys.TaskRoundComplete,
+                        (Avalonia.Media.IBrush?)null,
+                        true,
+                        true,
+                        LanguageHelper.GetLocalizedString(Name),
+                        (i + 1).ToString(),
+                        Count.ToString());
+                }
             }
             if (hasFailed)
             {
diff --git a/MFAAvalonia/Helper/VersionChecker.cs b/MFAAvalonia/Helper/VersionChecker.cs
index 11c247cf..809bc077 100644
--- a/MFAAvalonia/Helper/VersionChecker.cs
+++ b/MFAAvalonia/Helper/VersionChecker.cs
@@ -3614,16 +3614,17 @@ private static bool IsCoreApplicationFile(string relativePath)
             || normalized.StartsWith("libs/", StringComparison.OrdinalIgnoreCase))
             return true;
 
-        if (fileName.Equals("MFAAvalonia.dll", StringComparison.OrdinalIgnoreCase)
-            || fileName.Equals("MFAAvalonia.deps.json", StringComparison.OrdinalIgnoreCase)
-            || fileName.Equals("MFAAvalonia.runtimeconfig.json", StringComparison.OrdinalIgnoreCase)
+        if (fileName.Equals("MaaPazugiri.dll", StringComparison.OrdinalIgnoreCase)
+            || fileName.Equals("MaaPazugiri.deps.json", StringComparison.OrdinalIgnoreCase)
+            || fileName.Equals("MaaPazugiri.runtimeconfig.json", StringComparison.OrdinalIgnoreCase)
+            || fileName.Equals("MaaPazugiri", StringComparison.OrdinalIgnoreCase)
             || IsCurrentProcessExecutableFileName(fileName)
             || fileName.Equals("MFAUpdater", StringComparison.OrdinalIgnoreCase)
             || fileName.Equals("MFAUpdater.exe", StringComparison.OrdinalIgnoreCase))
             return true;
 
         if (fileName.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)
-            && fileName.Contains("MFAAvalonia", StringComparison.OrdinalIgnoreCase))
+            && fileName.Contains("MaaPazugiri", StringComparison.OrdinalIgnoreCase))
             return true;
 
         return false;
@@ -4314,7 +4315,7 @@ private static string FindMFAExecutableByAssemblyName(string directory, string t
 
     /// <summary>
     /// 从目录中查找 MFAAvalonia 的可执行文件
-    ///通过查找 MFAAvalonia.dll 或 MFAAvalonia.deps.json 来定位，因为这些文件名是固定的
+    /// 通过查找应用程序集或运行配置文件来定位可执行文件。
     /// </summary>
     /// <param name="directory">要搜索的目录</param>
     /// <returns>找到的可执行文件路径，如果未找到则返回空字符串</returns>
@@ -4325,8 +4326,8 @@ private static string FindMFAExecutableInDirectory(string directory)
 
         try
         {
-            // 方法1: 查找 MFAAvalonia.dll 所在目录，然后找同目录下的可执行文件
-            var dllFiles = Directory.GetFiles(directory, "MFAAvalonia.dll", SearchOption.AllDirectories);
+            // 方法1: 查找 MaaPazugiri.dll 所在目录，然后找同目录下的可执行文件
+            var dllFiles = Directory.GetFiles(directory, "MaaPazugiri.dll", SearchOption.AllDirectories);
             if (dllFiles.Length > 0)
             {
                 var dllDir = Path.GetDirectoryName(dllFiles[0]);
@@ -4335,14 +4336,14 @@ private static string FindMFAExecutableInDirectory(string directory)
                     var exeFile = FindExecutableInSameDirectory(dllDir);
                     if (!string.IsNullOrEmpty(exeFile))
                     {
-                        LoggerHelper.Info($"已通过 MFAAvalonia.dll 定位可执行文件：{exeFile}");
+                        LoggerHelper.Info($"已通过 MaaPazugiri.dll 定位可执行文件：{exeFile}");
                         return exeFile;
                     }
                 }
             }
 
-            // 方法2: 查找 MFAAvalonia.deps.json 所在目录
-            var depsFiles = Directory.GetFiles(directory, "MFAAvalonia.deps.json", SearchOption.AllDirectories);
+            // 方法2: 查找 MaaPazugiri.deps.json 所在目录
+            var depsFiles = Directory.GetFiles(directory, "MaaPazugiri.deps.json", SearchOption.AllDirectories);
             if (depsFiles.Length > 0)
             {
                 var depsDir = Path.GetDirectoryName(depsFiles[0]);
@@ -4351,14 +4352,14 @@ private static string FindMFAExecutableInDirectory(string directory)
                     var exeFile = FindExecutableInSameDirectory(depsDir);
                     if (!string.IsNullOrEmpty(exeFile))
                     {
-                        LoggerHelper.Info($"已通过 MFAAvalonia.deps.json 定位可执行文件：{exeFile}");
+                        LoggerHelper.Info($"已通过 MaaPazugiri.deps.json 定位可执行文件：{exeFile}");
                         return exeFile;
                     }
                 }
             }
 
-            // 方法3: 查找 MFAAvalonia.runtimeconfig.json 所在目录
-            var runtimeConfigFiles = Directory.GetFiles(directory, "MFAAvalonia.runtimeconfig.json", SearchOption.AllDirectories);
+            // 方法3: 查找 MaaPazugiri.runtimeconfig.json 所在目录
+            var runtimeConfigFiles = Directory.GetFiles(directory, "MaaPazugiri.runtimeconfig.json", SearchOption.AllDirectories);
             if (runtimeConfigFiles.Length > 0)
             {
                 var configDir = Path.GetDirectoryName(runtimeConfigFiles[0]);
@@ -4367,7 +4368,7 @@ private static string FindMFAExecutableInDirectory(string directory)
                     var exeFile = FindExecutableInSameDirectory(configDir);
                     if (!string.IsNullOrEmpty(exeFile))
                     {
-                        LoggerHelper.Info($"已通过 MFAAvalonia.runtimeconfig.json 定位可执行文件：{exeFile}");
+                        LoggerHelper.Info($"已通过 MaaPazugiri.runtimeconfig.json 定位可执行文件：{exeFile}");
                         return exeFile;
                     }
                 }
diff --git a/MFAAvalonia/MFAAvalonia.csproj b/MFAAvalonia/MFAAvalonia.csproj
index 1ff4235b..c3360990 100644
--- a/MFAAvalonia/MFAAvalonia.csproj
+++ b/MFAAvalonia/MFAAvalonia.csproj
@@ -17,6 +17,7 @@
     <ItemGroup>
         <Folder Include="Assets\Sound\" />
         <AvaloniaResource Include="Assets\logo.ico" />
+        <AvaloniaResource Include="Assets\logo.png" />
         <AvaloniaResource Include="Assets\Sound\**" />
         <Folder Include="resource\base\pipeline\" />
         <AvaloniaResource Remove="%(_MaaFrameworkRuntime.DestinationFolder)AnyCPU\**" />
diff --git a/MFAAvalonia/Services/ScheduledTaskHandoffService.cs b/MFAAvalonia/Services/ScheduledTaskHandoffService.cs
new file mode 100644
index 00000000..c2b6e205
--- /dev/null
+++ b/MFAAvalonia/Services/ScheduledTaskHandoffService.cs
@@ -0,0 +1,255 @@
+using MFAAvalonia.Extensions;
+using MFAAvalonia.Extensions.MaaFW;
+using MFAAvalonia.Helper;
+using MFAAvalonia.ViewModels.Pages;
+using MaaFramework.Binding;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MFAAvalonia.Services;
+
+public sealed record ScheduledTaskHandoffCandidate(string InstanceId, string? DeviceIdentity, bool IsActive);
+
+public static class ScheduledTaskHandoffPlanner
+{
+    public static IReadOnlySet<string> FindConflictingInstanceIds(
+        ScheduledTaskHandoffCandidate target,
+        IEnumerable<ScheduledTaskHandoffCandidate> candidates)
+    {
+        ArgumentNullException.ThrowIfNull(target);
+        ArgumentNullException.ThrowIfNull(candidates);
+
+        return candidates
+            .Where(candidate => candidate.IsActive
+                && (string.Equals(candidate.InstanceId, target.InstanceId, StringComparison.Ordinal)
+                    || (!string.IsNullOrWhiteSpace(target.DeviceIdentity)
+                        && string.Equals(candidate.DeviceIdentity, target.DeviceIdentity, StringComparison.OrdinalIgnoreCase))))
+            .Select(candidate => candidate.InstanceId)
+            .ToHashSet(StringComparer.Ordinal);
+    }
+}
+
+public static class ScheduledTaskHandoffService
+{
+    private static readonly TimeSpan NaturalCompletionTimeout = TimeSpan.FromMinutes(10);
+    private static readonly TimeSpan StopCompletionTimeout = TimeSpan.FromSeconds(30);
+    private static readonly TimeSpan StatePollInterval = TimeSpan.FromMilliseconds(250);
+    private static readonly ConcurrentDictionary<string, SemaphoreSlim> HandoffLocks = new(StringComparer.Ordinal);
+
+    public static async Task ExecuteAsync(
+        TaskQueueViewModel targetViewModel,
+        bool forceExecution,
+        Func<Task> startTarget)
+    {
+        ArgumentNullException.ThrowIfNull(targetViewModel);
+        ArgumentNullException.ThrowIfNull(startTarget);
+
+        try
+        {
+            var target = DispatcherHelper.RunOnMainThread(() => CreateCandidate(targetViewModel));
+            var started = await CoordinateAsync(
+                target,
+                () => DispatcherHelper.RunOnMainThread(() => CaptureCandidates(targetViewModel)),
+                forceExecution,
+                instanceId => DispatcherHelper.RunOnMainThread(() =>
+                    MaaProcessorManager.Instance.GetViewModel(instanceId)?.StopTask()),
+                () => DispatcherHelper.RunOnMainThreadAsync<Task>(startTarget).Unwrap());
+
+            if (!started)
+            {
+                LoggerHelper.Warning(forceExecution
+                    ? $"[定时执行] 冲突任务未在 {StopCompletionTimeout.TotalSeconds:0} 秒内停止，已取消本次定时启动。"
+                    : $"[定时执行] 冲突任务未在 {NaturalCompletionTimeout.TotalMinutes:0} 分钟内结束，已保留原任务并取消本次定时启动。");
+            }
+        }
+        catch (Exception exception)
+        {
+            LoggerHelper.Error($"[定时执行] 任务交接失败：{exception.Message}", exception);
+        }
+    }
+
+    public static async Task<bool> CoordinateAsync(
+        ScheduledTaskHandoffCandidate target,
+        Func<IReadOnlyCollection<ScheduledTaskHandoffCandidate>> captureCandidates,
+        bool forceExecution,
+        Action<string> stopInstance,
+        Func<Task> startTarget,
+        TimeSpan? naturalCompletionTimeout = null,
+        TimeSpan? pollInterval = null,
+        Func<TimeSpan, Task>? delayAsync = null,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(target);
+        ArgumentNullException.ThrowIfNull(captureCandidates);
+        ArgumentNullException.ThrowIfNull(stopInstance);
+        ArgumentNullException.ThrowIfNull(startTarget);
+
+        var timeout = forceExecution ? StopCompletionTimeout : naturalCompletionTimeout ?? NaturalCompletionTimeout;
+        var interval = pollInterval ?? StatePollInterval;
+        var delay = delayAsync ?? (duration => Task.Delay(duration, cancellationToken));
+        var locks = GetCoordinationLocks(target);
+        var acquiredLocks = new List<SemaphoreSlim>(locks.Count);
+
+        try
+        {
+            foreach (var handoffLock in locks)
+            {
+                await handoffLock.WaitAsync(cancellationToken);
+                acquiredLocks.Add(handoffLock);
+            }
+
+            var stopwatch = Stopwatch.StartNew();
+            var conflicts = GetActiveConflicts(target, captureCandidates);
+            if (conflicts.Count == 0)
+            {
+                await startTarget();
+                return true;
+            }
+
+            if (forceExecution)
+            {
+                var requestedStops = new HashSet<string>(StringComparer.Ordinal);
+                foreach (var instanceId in conflicts)
+                {
+                    stopInstance(instanceId);
+                    requestedStops.Add(instanceId);
+                }
+
+                while (true)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+                    conflicts = GetActiveConflicts(target, captureCandidates);
+                    if (conflicts.Count == 0)
+                        break;
+
+                    foreach (var instanceId in conflicts.Where(id => !requestedStops.Contains(id)))
+                    {
+                        stopInstance(instanceId);
+                        requestedStops.Add(instanceId);
+                    }
+
+                    if (stopwatch.Elapsed >= timeout)
+                        return false;
+
+                    await delay(interval);
+                }
+
+                await startTarget();
+                return true;
+            }
+
+            while (conflicts.Count > 0)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                if (stopwatch.Elapsed >= timeout)
+                    return false;
+
+                await delay(interval);
+                conflicts = GetActiveConflicts(target, captureCandidates);
+            }
+
+            await startTarget();
+            return true;
+        }
+        finally
+        {
+            for (var index = acquiredLocks.Count - 1; index >= 0; index--)
+                acquiredLocks[index].Release();
+        }
+    }
+
+    private static IReadOnlyCollection<string> GetActiveConflicts(
+        ScheduledTaskHandoffCandidate target,
+        Func<IReadOnlyCollection<ScheduledTaskHandoffCandidate>> captureCandidates)
+    {
+        return ScheduledTaskHandoffPlanner.FindConflictingInstanceIds(target, captureCandidates());
+    }
+
+    private static List<SemaphoreSlim> GetCoordinationLocks(ScheduledTaskHandoffCandidate target)
+    {
+        var keys = new List<string> { $"instance:{target.InstanceId}" };
+        if (!string.IsNullOrWhiteSpace(target.DeviceIdentity))
+            keys.Add($"device:{target.DeviceIdentity.ToUpperInvariant()}");
+
+        return keys
+            .Distinct(StringComparer.Ordinal)
+            .OrderBy(key => key, StringComparer.Ordinal)
+            .Select(key => HandoffLocks.GetOrAdd(key, static _ => new SemaphoreSlim(1, 1)))
+            .ToList();
+    }
+
+    private static IReadOnlyCollection<ScheduledTaskHandoffCandidate> CaptureCandidates(TaskQueueViewModel targetViewModel)
+    {
+        var candidates = MaaProcessorManager.Instance.Instances
+            .Select(processor => processor.ViewModel)
+            .OfType<TaskQueueViewModel>()
+            .Append(targetViewModel)
+            .DistinctBy(viewModel => viewModel.Processor.InstanceId, StringComparer.Ordinal)
+            .Select(CreateCandidate)
+            .ToList();
+
+        return candidates;
+    }
+
+    private static ScheduledTaskHandoffCandidate CreateCandidate(TaskQueueViewModel viewModel)
+    {
+        var processor = viewModel.Processor;
+        var isActive = viewModel.IsRunning || processor.IsTaskRunActive || processor.TaskQueue.Count > 0;
+        return new ScheduledTaskHandoffCandidate(
+            processor.InstanceId,
+            GetControllerTargetIdentity(viewModel),
+            isActive);
+    }
+
+    private static string? GetControllerTargetIdentity(TaskQueueViewModel viewModel)
+    {
+        return viewModel.CurrentController switch
+        {
+            MaaControllerTypes.Adb => GetAdbIdentity(viewModel),
+            MaaControllerTypes.Win32 or MaaControllerTypes.Gamepad => GetDesktopWindowIdentity(viewModel),
+            MaaControllerTypes.MacOS => GetMacOSWindowIdentity(viewModel),
+            MaaControllerTypes.WlRoots => GetWlRootsIdentity(viewModel),
+            MaaControllerTypes.PlayCover => GetPlayCoverIdentity(viewModel),
+            _ => null
+        };
+    }
+
+    private static string? GetAdbIdentity(TaskQueueViewModel viewModel)
+    {
+        var device = viewModel.CurrentDevice as AdbDeviceInfo ?? viewModel.Processor.Config.AdbDevice.Info;
+        var serial = device?.AdbSerial ?? viewModel.Processor.Config.AdbDevice.AdbSerial;
+        return string.IsNullOrWhiteSpace(serial) ? null : $"adb:{serial.Trim()}";
+    }
+
+    private static string? GetDesktopWindowIdentity(TaskQueueViewModel viewModel)
+    {
+        var handle = (viewModel.CurrentDevice as DesktopWindowInfo)?.Handle
+            ?? viewModel.Processor.Config.DesktopWindow.HWnd;
+        return handle == IntPtr.Zero ? null : $"desktop-window:{handle.ToInt64():X}";
+    }
+
+    private static string? GetMacOSWindowIdentity(TaskQueueViewModel viewModel)
+    {
+        var windowId = (viewModel.CurrentDevice as MacOSWindowInfo)?.WindowId
+            ?? viewModel.Processor.Config.MacOSWindow.WindowId;
+        return windowId == 0 ? null : $"macos-window:{windowId}";
+    }
+
+    private static string? GetWlRootsIdentity(TaskQueueViewModel viewModel)
+    {
+        var socketPath = (viewModel.CurrentDevice as WlRootsSocketInfo)?.SocketPath
+            ?? viewModel.Processor.Config.WlRoots.SocketPath;
+        return string.IsNullOrWhiteSpace(socketPath) ? null : $"wlroots:{socketPath.Trim()}";
+    }
+
+    private static string? GetPlayCoverIdentity(TaskQueueViewModel viewModel)
+    {
+        var address = viewModel.Processor.Config.PlayCover.PlayCoverAddress;
+        return string.IsNullOrWhiteSpace(address) ? null : $"playcover:{address.Trim()}";
+    }
+}
diff --git a/MFAAvalonia/ViewModels/Other/TimerModel.cs b/MFAAvalonia/ViewModels/Other/TimerModel.cs
index 254161b4..a989d1ad 100644
--- a/MFAAvalonia/ViewModels/Other/TimerModel.cs
+++ b/MFAAvalonia/ViewModels/Other/TimerModel.cs
@@ -7,6 +7,7 @@
 using MFAAvalonia.Extensions.MaaFW;
 using MFAAvalonia.Helper;
 using MFAAvalonia.Helper.ValueType;
+using MFAAvalonia.Services;
 using MFAAvalonia.ViewModels.Pages;
 using System;
 using System.Collections.ObjectModel;
@@ -294,10 +295,14 @@ private void ExecuteAction(TimerProperties timer, TaskQueueViewModel vm)
         }
         else
         {
-            if (ForceScheduledStart && vm.IsRunning)
-                vm.StopTask(vm.StartTask);
-            else
-                vm.StartTask();
+            _ = ScheduledTaskHandoffService.ExecuteAsync(
+                vm,
+                ForceScheduledStart,
+                () =>
+                {
+                    vm.StartTask();
+                    return Task.CompletedTask;
+                });
         }
     }
 
diff --git a/MFAAvalonia/ViewModels/Pages/CombatStrategyViewModel.cs b/MFAAvalonia/ViewModels/Pages/CombatStrategyViewModel.cs
new file mode 100644
index 00000000..4824f804
--- /dev/null
+++ b/MFAAvalonia/ViewModels/Pages/CombatStrategyViewModel.cs
@@ -0,0 +1,10 @@
+using MFAAvalonia.Features.CombatStrategies;
+using MFAAvalonia.Helper;
+using System.IO;
+
+namespace MFAAvalonia.ViewModels.Pages;
+
+public sealed class CombatStrategyViewModel : ViewModelBase
+{
+    public StrategyEditorSession Session { get; } = new(new StrategyStore(Path.Combine(AppPaths.ConfigDirectory, "strategies")));
+}
diff --git a/MFAAvalonia/ViewModels/Pages/MonitorItemViewModel.cs b/MFAAvalonia/ViewModels/Pages/MonitorItemViewModel.cs
index 2a851d45..892d5264 100644
--- a/MFAAvalonia/ViewModels/Pages/MonitorItemViewModel.cs
+++ b/MFAAvalonia/ViewModels/Pages/MonitorItemViewModel.cs
@@ -37,8 +37,8 @@ public partial class MonitorItemViewModel : ViewModelBase
 
     [ObservableProperty] private bool _hasImage;
 
-    public double CardWidth => _owner?.CardWidth ?? 360;
-    public double CardHeight => _owner?.CardHeight ?? 240;
+    public double CardWidth => _owner?.CardWidth ?? 240;
+    public double CardHeight => _owner?.CardHeight ?? 420;
 
     public MonitorItemViewModel(MaaProcessor processor, MonitorViewModel? owner = null)
     {
diff --git a/MFAAvalonia/ViewModels/Pages/MonitorViewModel.cs b/MFAAvalonia/ViewModels/Pages/MonitorViewModel.cs
index ce10657f..593c585a 100644
--- a/MFAAvalonia/ViewModels/Pages/MonitorViewModel.cs
+++ b/MFAAvalonia/ViewModels/Pages/MonitorViewModel.cs
@@ -11,8 +11,8 @@ namespace MFAAvalonia.ViewModels.Pages;
 
 public partial class MonitorViewModel : ViewModelBase, IDisposable
 {
-    private const double BaseCardWidth = 360;
-    private const double BaseCardHeight = 240;
+    private const double BaseCardWidth = 240;
+    private const double BaseCardHeight = 420;
     private const double MinCardScale = 0.6;
     private const double MaxCardScale = 1.8;
     private const double CardScaleStep = 0.1;
diff --git a/MFAAvalonia/ViewModels/Pages/TaskQueueViewModel.cs b/MFAAvalonia/ViewModels/Pages/TaskQueueViewModel.cs
index 2eb4b5de..ce7ffd7d 100644
--- a/MFAAvalonia/ViewModels/Pages/TaskQueueViewModel.cs
+++ b/MFAAvalonia/ViewModels/Pages/TaskQueueViewModel.cs
@@ -23,8 +23,10 @@
 using SukiUI.Dialogs;
 using System;
 using System.Buffers;
+using System.Collections.Specialized;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -643,15 +645,65 @@ protected override void Initialize()
     [ObservableProperty] private bool _isCommon = true;
     [ObservableProperty] private bool _showSettings;
     [ObservableProperty] private bool _toggleEnable = true;
+    [ObservableProperty] private bool _areAllTasksSelected;
 
     [ObservableProperty] private ObservableCollection<DragItemViewModel> _taskItemViewModels = [];
 
+    private ObservableCollection<DragItemViewModel>? _observedTaskItemViewModels;
+    private readonly HashSet<DragItemViewModel> _observedTaskItems = [];
+
     partial void OnTaskItemViewModelsChanged(ObservableCollection<DragItemViewModel> value)
     {
+        if (_observedTaskItemViewModels != null)
+            _observedTaskItemViewModels.CollectionChanged -= OnTaskItemsCollectionChanged;
+
+        foreach (var item in _observedTaskItems)
+            item.PropertyChanged -= OnTaskItemPropertyChanged;
+        _observedTaskItems.Clear();
+
+        _observedTaskItemViewModels = value;
+        _observedTaskItemViewModels.CollectionChanged += OnTaskItemsCollectionChanged;
+        SyncObservedTaskItems();
+
         if (ConfigurationManager.IsSwitching) return;
         Processor.InstanceConfiguration.SetValue(ConfigurationKeys.TaskItems, value.Where(model => !model.IsResourceOptionItem).Select(model => model.InterfaceItem).ToList());
     }
 
+    private void OnTaskItemsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+    {
+        SyncObservedTaskItems();
+    }
+
+    private void SyncObservedTaskItems()
+    {
+        var currentItems = TaskItemViewModels.ToHashSet();
+        foreach (var item in _observedTaskItems.Where(item => !currentItems.Contains(item)).ToList())
+        {
+            item.PropertyChanged -= OnTaskItemPropertyChanged;
+            _observedTaskItems.Remove(item);
+        }
+
+        foreach (var item in currentItems.Where(item => !_observedTaskItems.Contains(item)))
+        {
+            item.PropertyChanged += OnTaskItemPropertyChanged;
+            _observedTaskItems.Add(item);
+        }
+
+        UpdateAreAllTasksSelected();
+    }
+
+    private void OnTaskItemPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName is nameof(DragItemViewModel.IsCheckedWithNull) or nameof(DragItemViewModel.IsChecked))
+            UpdateAreAllTasksSelected();
+    }
+
+    private void UpdateAreAllTasksSelected()
+    {
+        var tasks = TaskItemViewModels.Where(item => !item.IsResourceOptionItem).ToList();
+        AreAllTasksSelected = tasks.Count > 0 && tasks.All(item => item.IsChecked);
+    }
+
     [RelayCommand]
     private void Toggle()
     {
@@ -830,6 +882,15 @@ private void SelectNone()
             operation: "SelectNoneTasks", instanceId: Processor.InstanceId, instanceName: InstanceName);
     }
 
+    [RelayCommand]
+    private void ToggleSelectAll()
+    {
+        if (AreAllTasksSelected)
+            SelectNone();
+        else
+            SelectAll();
+    }
+
     [RelayCommand]
     private void AddTask()
     {
@@ -1464,6 +1525,10 @@ private void SetEmptyDeviceState(MaaControllerTypes? controllerType = null)
     public void SetConnected(bool connected)
     {
         IsConnected = connected;
+        if (!connected) return;
+
+        _lastConnectedAtUtc = DateTime.UtcNow;
+        _liveViewLastFrameAtUtc = null;
     }
 
     private DateTime? _lastExecutionTime;
@@ -2933,12 +2998,13 @@ private void PersistResourceOptionConfiguration(InstanceConfiguration instanceCo
             .Where(m => m.IsResourceOptionItem && m.ResourceItem?.SelectOptions != null)
             .ToList();
 
-        var globalItem = allItems.FirstOrDefault(m => m.ResourceItem?.Name == "__GlobalOption__");
-        if (globalItem?.ResourceItem?.SelectOptions != null)
+        var globalOptions = allItems.FirstOrDefault(m => m.ResourceItem?.Name == "__GlobalOption__")
+            ?.ResourceItem?.SelectOptions ?? MaaProcessor.Interface?.GlobalSelectOptions;
+        if (globalOptions != null)
         {
             instanceConfig.SetValue(
                 ConfigurationKeys.GlobalOptionItems,
-                globalItem.ResourceItem.SelectOptions);
+                globalOptions);
         }
 
         const string controllerPrefix = "__ControllerOption__";
@@ -3080,13 +3146,18 @@ public void RefreshTaskSupportForCurrentContext(DragItemViewModel task)
     }
 
     /// <summary>
-    /// 计算资源选项项的插入位置（在全局选项项之后）
+    /// 计算资源选项项的插入位置（在全局设置项或独立设置项之后）
     /// </summary>
     private int FindResourceOptionInsertIndex()
     {
         var globalItem = TaskItemViewModels.FirstOrDefault(t =>
             t.IsResourceOptionItem && t.ResourceItem?.Name == "__GlobalOption__");
-        return globalItem != null ? TaskItemViewModels.IndexOf(globalItem) + 1 : 0;
+        if (globalItem != null)
+            return TaskItemViewModels.IndexOf(globalItem) + 1;
+
+        var lastSettingItem = TaskItemViewModels.LastOrDefault(t =>
+            t.IsResourceOptionItem && t.ResourceItem?.Name?.StartsWith("__Setting__") == true);
+        return lastSettingItem != null ? TaskItemViewModels.IndexOf(lastSettingItem) + 1 : 0;
     }
 
     /// <summary>
@@ -3172,10 +3243,8 @@ private int FindControllerOptionInsertIndex()
         if (resourceItem != null)
             return TaskItemViewModels.IndexOf(resourceItem) + 1;
 
-        // 没有资源选项项，插入到全局选项项之后
-        var globalItem = TaskItemViewModels.FirstOrDefault(t =>
-            t.IsResourceOptionItem && t.ResourceItem?.Name == "__GlobalOption__");
-        return globalItem != null ? TaskItemViewModels.IndexOf(globalItem) + 1 : 0;
+        // 没有资源选项项时，沿用资源选项的插入位置。
+        return FindResourceOptionInsertIndex();
     }
 
     /// <summary>
@@ -3348,6 +3417,13 @@ private void RestoreResourceOptionValues(MaaInterface.MaaInterfaceResource resou
     private int _liveViewTickInProgress;
     private int _isDisposed;
     private bool _liveViewNoImageLogged;
+    private DateTime? _lastConnectedAtUtc;
+    private DateTime? _liveViewLastFrameAtUtc;
+    private DateTime? _liveViewChannelRebuildAtUtc;
+
+    private static readonly TimeSpan LiveViewFrameGrace = TimeSpan.FromSeconds(15);
+    private static readonly TimeSpan LiveViewFrameStaleLimit = TimeSpan.FromSeconds(5);
+    private static readonly TimeSpan LiveViewChannelRebuildCooldown = TimeSpan.FromSeconds(10);
 
     private void UpdateLiveViewTimerInterval()
     {
@@ -3396,6 +3472,13 @@ private void OnLiveViewTimerElapsed(object? sender, System.Timers.ElapsedEventAr
             }
             if (!IsLiveViewExpanded)
                 return;
+
+            if (!IsConnected && IsRunning && Processor.IsMainControllerConnected())
+            {
+                LoggerHelper.Info("主任务控制器已恢复连接，重新启用实时画面。");
+                SetConnected(true);
+            }
+
             if (EnableLiveView && IsConnected)
             {
                 // 流水线：非阻塞提交下一帧截图（若上一帧仍在执行则复用，避免任务堆积），
@@ -3429,7 +3512,12 @@ private void OnLiveViewTimerElapsed(object? sender, System.Timers.ElapsedEventAr
                 var buffer = Processor.GetLiveViewBuffer(false);
                 if (buffer == null)
                 {
-                    if (!_liveViewNoImageLogged)
+                    if (ShouldRebuildStaleLiveViewChannel())
+                        return;
+
+                    if (!_liveViewNoImageLogged
+                        && (_lastConnectedAtUtc is null
+                            || DateTime.UtcNow - _lastConnectedAtUtc.Value >= LiveViewFrameGrace))
                     {
                         _liveViewNoImageLogged = true;
                         var screencapType = Processor.ScreenshotType();
@@ -3443,6 +3531,7 @@ private void OnLiveViewTimerElapsed(object? sender, System.Timers.ElapsedEventAr
                 }
                 else
                 {
+                    _liveViewLastFrameAtUtc = DateTime.UtcNow;
                     _liveViewNoImageLogged = false;
                     _ = UpdateLiveViewImageAsync(buffer);
                 }
@@ -3462,6 +3551,26 @@ private void OnLiveViewTimerElapsed(object? sender, System.Timers.ElapsedEventAr
         }
     }
 
+    private bool ShouldRebuildStaleLiveViewChannel()
+    {
+        var now = DateTime.UtcNow;
+        if (_lastConnectedAtUtc is { } connectedAt && now - connectedAt < LiveViewFrameGrace)
+            return false;
+
+        var lastFrameAt = _liveViewLastFrameAtUtc ?? _lastConnectedAtUtc;
+        if (lastFrameAt is null || now - lastFrameAt.Value < LiveViewFrameStaleLimit)
+            return false;
+
+        if (_liveViewChannelRebuildAtUtc is { } lastRebuildAt
+            && now - lastRebuildAt < LiveViewChannelRebuildCooldown)
+            return false;
+
+        _liveViewChannelRebuildAtUtc = now;
+        LoggerHelper.Warning($"实时画面超过 {LiveViewFrameStaleLimit.TotalSeconds:0} 秒没有新帧，准备重建截图任务执行器。");
+        Processor.ResetLiveViewTasker();
+        return true;
+    }
+
     /// <summary>
     /// Live View 是否启用
     /// </summary>
diff --git a/MFAAvalonia/Views/Mobile/MobileTaskQueueView.axaml.cs b/MFAAvalonia/Views/Mobile/MobileTaskQueueView.axaml.cs
index 458c6644..8c9dd54f 100644
--- a/MFAAvalonia/Views/Mobile/MobileTaskQueueView.axaml.cs
+++ b/MFAAvalonia/Views/Mobile/MobileTaskQueueView.axaml.cs
@@ -324,9 +324,10 @@ private void SaveConfiguration()
         var resourceItems = ViewModel.TaskItemViewModels
             .Where(item => item.IsResourceOptionItem && item.ResourceItem?.SelectOptions != null)
             .ToList();
-        var global = resourceItems.FirstOrDefault(item => item.ResourceItem?.Name == "__GlobalOption__");
-        if (global?.ResourceItem?.SelectOptions != null)
-            config.SetValue(ConfigurationKeys.GlobalOptionItems, global.ResourceItem.SelectOptions);
+        var globalOptions = resourceItems.FirstOrDefault(item => item.ResourceItem?.Name == "__GlobalOption__")
+            ?.ResourceItem?.SelectOptions ?? MaaProcessor.Interface?.GlobalSelectOptions;
+        if (globalOptions != null)
+            config.SetValue(ConfigurationKeys.GlobalOptionItems, globalOptions);
 
         const string controllerPrefix = "__ControllerOption__";
         var controllerOptions = resourceItems
diff --git a/MFAAvalonia/Views/Mobile/RootViewContent.axaml b/MFAAvalonia/Views/Mobile/RootViewContent.axaml
index e50fc58d..a3f653c8 100644
--- a/MFAAvalonia/Views/Mobile/RootViewContent.axaml
+++ b/MFAAvalonia/Views/Mobile/RootViewContent.axaml
@@ -42,7 +42,7 @@
                              Maximum="100" VerticalAlignment="Center"
                              Value="{Binding ConfigSwitchProgress}"
                              IsVisible="{Binding IsConfigSwitching}" />
-                <suki:SukiSideMenu IsVisible="{Binding '!IsConfigSwitching'}" IsMenuExpanded="False"
+                <suki:SukiSideMenu x:Name="MainSideMenu" IsVisible="{Binding '!IsConfigSwitching'}" IsMenuExpanded="False"
                                    IsSearchEnabled="False" OpenPaneLength="150">
                     <suki:SukiSideMenu.Items>
                         <suki:SukiSideMenuItem IsContentMovable="False"
@@ -50,6 +50,13 @@
                                                Icon="{fluent:FluentIcon Icon=TasksApp,
                                                                 IconVariant=Regular}"
                                                PageContent="{extensions:ServiceProvider ServiceType={x:Type pages:InstanceContainerView}}" />
+                        <suki:SukiSideMenuItem x:Name="CombatStrategyMenuItem" IsContentMovable="False"
+                                               Header="策略"
+                                               PageContent="{extensions:ServiceProvider ServiceType={x:Type pages:CombatStrategyView}}">
+                            <suki:SukiSideMenuItem.Icon>
+                                <fluentIcon:FluentIcon Icon="NotepadEdit" IconVariant="Regular" />
+                            </suki:SukiSideMenuItem.Icon>
+                        </suki:SukiSideMenuItem>
                         <suki:SukiSideMenuItem IsContentMovable="False"
                                                Header="{markup:I18n {x:Static helper:LangKeys.Monitor}}"
                                                PageContent="{extensions:ServiceProvider ServiceType={x:Type pages:MonitorView}}">
@@ -138,4 +145,4 @@
         <!-- First-use tutorial overlay -->
         <controls:TeachingTipOverlay x:Name="TutorialOverlay" />
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/MFAAvalonia/Views/Mobile/RootViewContent.axaml.cs b/MFAAvalonia/Views/Mobile/RootViewContent.axaml.cs
index 2a1ffff8..2f0ca838 100644
--- a/MFAAvalonia/Views/Mobile/RootViewContent.axaml.cs
+++ b/MFAAvalonia/Views/Mobile/RootViewContent.axaml.cs
@@ -20,9 +20,16 @@ namespace MFAAvalonia.Views.Mobile;
 
 public partial class RootViewContent : UserControl
 {
+    private readonly MFAAvalonia.Features.CombatStrategies.Controls.CombatStrategyNavigationGuard _strategyNavigationGuard;
+
     public RootViewContent()
     {
         InitializeComponent();
+        _strategyNavigationGuard = new(
+            this.FindControl<SukiSideMenu>("MainSideMenu")!,
+            this.FindControl<SukiSideMenuItem>("CombatStrategyMenuItem")!,
+            () => Instances.CombatStrategyViewModel.Session.HasUnsavedChanges,
+            () => Instances.CombatStrategyView.ConfirmLeaveAsync());
         Loaded += OnLoaded;
     }
 
@@ -119,11 +126,6 @@ private void SwitchToLightTheme(object? sender, Avalonia.Interactivity.RoutedEve
         return null;
     }
 
-    private Control? FindStartupSettingsControl()
-    {
-        return FindDescendantOfType<StartSettingsUserControl>(this);
-    }
-
     private Control? FindBeforeAfterTaskControl()
     {
         var startSettings = FindDescendantOfType<StartSettingsUserControl>(this);
@@ -248,7 +250,7 @@ public void TryStartTutorial()
                 DescriptionKey = LangKeys.TutorialStepSelectAllDesc,
                 FindTarget = () => FindTaskListHeaderButton(0),
                 PreferredPlacement = TipPlacement.Bottom,
-                CutoutPadding = new Thickness(4, 4, 50, 4) // extend right to cover DeselectAll
+                CutoutPadding = new Thickness(4)
             });
 
             // Step 8: AddTask / Reset buttons
@@ -256,9 +258,9 @@ public void TryStartTutorial()
             {
                 TitleKey = LangKeys.TutorialStepAddTaskBtnTitle,
                 DescriptionKey = LangKeys.TutorialStepAddTaskBtnDesc,
-                FindTarget = () => FindTaskListHeaderButton(2),
+                FindTargets = () => [FindTaskListHeaderButton(1), FindTaskListHeaderButton(2)],
                 PreferredPlacement = TipPlacement.Bottom,
-                CutoutPadding = new Thickness(4, 4, 50, 4) // extend right to cover Reset
+                CutoutPadding = new Thickness(4)
             });
 
             // Step 9: Start task button
@@ -354,18 +356,7 @@ public void TryStartTutorial()
                 OnLeave = () => NavigateToHome()
             });
 
-            // Step 18: Startup settings section
-            steps.Add(new TutorialStep
-            {
-                TitleKey = LangKeys.TutorialStepStartupSettingsTitle,
-                DescriptionKey = LangKeys.TutorialStepStartupSettingsDesc,
-                FindTarget = () => FindStartupSettingsControl(),
-                PreferredPlacement = TipPlacement.Left,
-                OnEnter = () => NavigateToSettings(),
-                OnLeave = () => NavigateToHome()
-            });
-
-            // Step 19: Before/After task actions (first GlassCard)
+            // Step 18：启动前与结束后操作设置卡片。
             steps.Add(new TutorialStep
             {
                 TitleKey = LangKeys.TutorialStepBeforeAfterTaskTitle,
@@ -376,7 +367,7 @@ public void TryStartTutorial()
                 OnLeave = () => NavigateToHome()
             });
 
-            // Step 20: Software path suggestion
+            // Step 19：软件路径设置卡片。
             steps.Add(new TutorialStep
             {
                 TitleKey = LangKeys.TutorialStepSoftwarePathTitle,
@@ -387,7 +378,7 @@ public void TryStartTutorial()
                 OnLeave = () => NavigateToHome()
             });
 
-            // Step 21: Re-watch tutorial hint (navigate to settings → about)
+            // Step 20：关于页的教程重播入口。
             steps.Add(new TutorialStep
             {
                 TitleKey = LangKeys.TutorialStepRewatchTitle,
diff --git a/MFAAvalonia/Views/Pages/CombatStrategyView.axaml b/MFAAvalonia/Views/Pages/CombatStrategyView.axaml
new file mode 100644
index 00000000..01e03199
--- /dev/null
+++ b/MFAAvalonia/Views/Pages/CombatStrategyView.axaml
@@ -0,0 +1,173 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:content="clr-namespace:SukiUI.Content;assembly=SukiUI"
+             x:Class="MFAAvalonia.Views.Pages.CombatStrategyView"
+             x:CompileBindings="False">
+    <UserControl.Resources>
+        <ContextMenu x:Key="StrategyMenu" Opening="OnStrategyMenuOpening">
+            <MenuItem Header="复制" Click="OnCopyStrategy" />
+            <MenuItem Header="粘贴" Click="OnPasteStrategy" />
+            <Separator />
+            <MenuItem Header="重命名" Click="OnRenameStrategy" />
+            <MenuItem Header="删除" Classes="DangerContextDelete" Click="OnDeleteStrategyFromMenu" />
+        </ContextMenu>
+    </UserControl.Resources>
+    <UserControl.Styles>
+        <Style Selector="Border.strategy-card">
+            <Setter Property="Background" Value="{DynamicResource SukiCardBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
+            <Setter Property="BorderThickness" Value="1" />
+        </Style>
+        <Style Selector="Border.strategy-condition">
+            <Setter Property="Background" Value="{DynamicResource SukiCardBackground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource SukiControlBorderBrush}" />
+            <Setter Property="BorderThickness" Value="1" />
+        </Style>
+        <Style Selector="ListBox#StrategyList &gt; ListBoxItem">
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Border Name="BorderBasicStyle" Margin="0" Padding="8,4" CornerRadius="10">
+                        <DockPanel>
+                            <Border Name="PART_SelectionIndicator" Width="2" DockPanel.Dock="Left"
+                                    Height="12" Margin="-13,0,0,0"
+                                    Background="{DynamicResource SukiPrimaryColor75}"
+                                    CornerRadius="2" Opacity="0" />
+                            <PathIcon Name="CheckSelected" Width="17" Height="17" Margin="8,0,0,0"
+                                      Data="{x:Static content:Icons.CircleCheck}" DockPanel.Dock="Right"
+                                      Foreground="{DynamicResource SukiPrimaryColor}">
+                                <PathIcon.Transitions>
+                                    <Transitions />
+                                </PathIcon.Transitions>
+                            </PathIcon>
+                            <ContentPresenter Name="PART_ContentPresenter" Margin="0"
+                                              Padding="{TemplateBinding Padding}"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              Background="Transparent" BorderBrush="Transparent"
+                                              BorderThickness="{TemplateBinding BorderThickness}"
+                                              Content="{TemplateBinding Content}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              CornerRadius="{TemplateBinding CornerRadius}" />
+                        </DockPanel>
+                    </Border>
+                </ControlTemplate>
+            </Setter>
+        </Style>
+        <Style Selector="Button.SyncButton Path">
+            <Setter Property="RenderTransformOrigin" Value="50%,50%" />
+            <Setter Property="Margin" Value="1" />
+            <Setter Property="RenderTransform">
+                <Setter.Value>
+                    <TransformGroup>
+                        <ScaleTransform ScaleX="1" ScaleY="1" />
+                        <RotateTransform Angle="0" />
+                    </TransformGroup>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style Selector="Button.SyncButton:pointerover Path">
+            <Style.Animations>
+                <Animation Duration="0:0:0.15" FillMode="Forward">
+                    <KeyFrame Cue="100%">
+                        <Setter Property="ScaleTransform.ScaleX" Value="1.1" />
+                        <Setter Property="ScaleTransform.ScaleY" Value="1.1" />
+                        <Setter Property="RotateTransform.Angle" Value="-15" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="Button.SyncButton:not(:pointerover) Path">
+            <Style.Animations>
+                <Animation Duration="0:0:0.15" FillMode="Forward">
+                    <KeyFrame Cue="100%">
+                        <Setter Property="ScaleTransform.ScaleX" Value="1" />
+                        <Setter Property="ScaleTransform.ScaleY" Value="1" />
+                        <Setter Property="RotateTransform.Angle" Value="0" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="Button.SyncButton:pressed Path">
+            <Style.Animations>
+                <Animation Duration="0:0:0.6" FillMode="Forward">
+                    <KeyFrame Cue="0%">
+                        <Setter Property="RotateTransform.Angle" Value="0" />
+                    </KeyFrame>
+                    <KeyFrame Cue="100%">
+                        <Setter Property="RotateTransform.Angle" Value="360" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="Button.TaskQueueBasicTight">
+            <Setter Property="RenderTransformOrigin" Value="50%,50%" />
+            <Setter Property="RenderTransform">
+                <Setter.Value>
+                    <ScaleTransform ScaleX="1" ScaleY="1" />
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style Selector="Button.TaskQueueBasicTight:pointerover">
+            <Setter Property="RenderTransform">
+                <ScaleTransform ScaleX="1.2" ScaleY="1.2" />
+            </Setter>
+            <Setter Property="Foreground" Value="{DynamicResource SukiPrimaryColor75}" />
+        </Style>
+    </UserControl.Styles>
+    <Grid ColumnDefinitions="225,12,*" Margin="12">
+        <Border Classes="strategy-card" CornerRadius="12" Padding="12">
+            <Grid RowDefinitions="Auto,Auto,*,Auto,Auto">
+                <Grid ColumnDefinitions="*,Auto" Margin="0,0,0,8">
+                    <TextBlock Text="策略列表" FontSize="12" FontWeight="Bold"
+                               Foreground="{DynamicResource SukiLowText}" VerticalAlignment="Center" />
+                    <Button Grid.Column="1" Classes="BasicTight TaskQueueBasicTight SyncButton"
+                            Width="24" Height="24" Margin="3,0,3,0" Padding="0"
+                            HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
+                            VerticalAlignment="Center"
+                            ToolTip.Tip="刷新策略列表" Click="OnRefreshStrategies">
+                        <Path Data="{StaticResource RefreshGeometry}" Width="16" Height="16"
+                              Stretch="Uniform"
+                              Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=Button}}" />
+                    </Button>
+                </Grid>
+                <Border Grid.Row="1" Height="1" Background="{DynamicResource SukiControlBorderBrush}"
+                        Margin="0,0,0,8" />
+                <ListBox Grid.Row="2" x:Name="StrategyList" SelectionChanged="OnStrategySelected">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <Border Padding="8,6" CornerRadius="6" Background="Transparent"
+                                    ContextMenu="{StaticResource StrategyMenu}">
+                                <TextBlock Text="{Binding Name}" FontSize="14" />
+                            </Border>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+                <Button Grid.Row="3" x:Name="NewStrategy" Content="＋" FontSize="20" Height="36"
+                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                        ToolTip.Tip="新增策略" Click="OnNewStrategy" />
+                <Button Grid.Row="4" x:Name="LoadWarnings" IsVisible="False" Content="部分策略文件无法读取"
+                        Margin="0,8,0,0" HorizontalAlignment="Stretch" Click="OnLoadWarnings" />
+            </Grid>
+        </Border>
+        <Grid Grid.Column="2" RowDefinitions="*,Auto">
+            <ScrollViewer x:Name="StageScroll" HorizontalScrollBarVisibility="Disabled">
+                <StackPanel Spacing="12" Margin="0,0,8,12">
+                    <StackPanel x:Name="StageCards" Spacing="12" />
+                    <Button x:Name="AddStage" Content="＋" FontSize="26" Height="48"
+                            HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+                            ToolTip.Tip="新增阶段" Click="OnAddStage" />
+                </StackPanel>
+            </ScrollViewer>
+            <Border Grid.Row="1" Classes="strategy-card" CornerRadius="12" Padding="12" Margin="0,8,0,0">
+                <Grid ColumnDefinitions="Auto,*" ColumnSpacing="12">
+                    <WrapPanel>
+                        <Button x:Name="SaveStrategy" Content="保存" Margin="0,0,8,0" Click="OnSaveStrategy" />
+                        <Button Content="全部展开" Margin="0,0,8,0" Click="OnExpandAll" />
+                        <Button Content="全部折叠" Click="OnCollapseAll" />
+                    </WrapPanel>
+                    <TextBlock Grid.Column="1" x:Name="SaveStatus" VerticalAlignment="Center"
+                               TextTrimming="CharacterEllipsis" TextWrapping="Wrap" MaxHeight="55" />
+                </Grid>
+            </Border>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/MFAAvalonia/Views/Pages/CombatStrategyView.axaml.cs b/MFAAvalonia/Views/Pages/CombatStrategyView.axaml.cs
new file mode 100644
index 00000000..1397289a
--- /dev/null
+++ b/MFAAvalonia/Views/Pages/CombatStrategyView.axaml.cs
@@ -0,0 +1,268 @@
+using Avalonia.Controls;
+using Avalonia.Input.Platform;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
+using MFAAvalonia.Features.CombatStrategies;
+using MFAAvalonia.Features.CombatStrategies.Controls;
+using MFAAvalonia.Helper;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MFAAvalonia.Views.Pages;
+
+public partial class CombatStrategyView : UserControl
+{
+    public StrategyEditorSession Session { get; }
+    private bool _refreshing;
+    private bool _operationPending;
+    private string? _renderedStrategyId;
+    private StrategySummary? _menuStrategy;
+    private readonly Func<string, string, Task<string?>> _renameStrategy;
+    private readonly Func<string, Task<bool>> _confirmDelete;
+    private readonly SemaphoreSlim _leaveGate = new(1, 1);
+
+    public CombatStrategyView() : this(Instances.CombatStrategyViewModel.Session) { }
+
+    public CombatStrategyView(StrategyEditorSession session,
+        Func<string, string, Task<string?>>? renameStrategy = null,
+        Func<string, Task<bool>>? confirmDelete = null)
+    {
+        Session = session;
+        _renameStrategy = renameStrategy ?? StrategyDialogs.RenameAsync;
+        _confirmDelete = confirmDelete ?? StrategyDialogs.ConfirmDeleteAsync;
+        InitializeComponent();
+        // 框架自动打开菜单后会处理掉请求，仍需记录实际右键条目的策略。
+        StrategyList.AddHandler(Control.ContextRequestedEvent, OnStrategyContextRequested, handledEventsToo: true);
+        Session.DraftChanged += RefreshEditor;
+        Session.StateChanged += RefreshStatus;
+        RefreshEditor();
+    }
+
+    private void RefreshEditor()
+    {
+        var same = _renderedStrategyId == Session.Current.Id;
+        var expanded = StageCards.Children.OfType<StrategyStageCard>().ToDictionary(x => x.Stage.Id, x => x.IsExpanded);
+        StageCards.Children.Clear();
+        foreach (var stage in Session.Current.Stages)
+        {
+            var card = new StrategyStageCard(Session, stage, ShowError, StrategyDialogs.RenameAsync);
+            card.IsExpanded = same && expanded.TryGetValue(stage.Id, out var open) ? open : same || StageCards.Children.Count == 0;
+            StageCards.Children.Add(card);
+            StrategyReorder.Attach(card.DragHandle, card, StageCards, Session.Current.Stages, stage, Session.StructuralChange);
+        }
+        if (!same) StageScroll.Offset = default;
+        _renderedStrategyId = Session.Current.Id;
+        RefreshList();
+        RefreshStatus();
+    }
+
+    private void RefreshList()
+    {
+        _refreshing = true;
+        try
+        {
+            StrategyList.ItemsSource = Session.Catalog.Strategies;
+            StrategyList.SelectedItem = Session.Catalog.Strategies.FirstOrDefault(x => x.Id == Session.Current.Id);
+            LoadWarnings.IsVisible = Session.Catalog.Errors.Count != 0;
+        }
+        finally { _refreshing = false; }
+    }
+
+    private void RefreshStatus()
+    {
+        SaveStrategy.IsEnabled = !Session.IsReadOnly;
+        AddStage.IsEnabled = !Session.IsReadOnly;
+        ToolTip.SetTip(AddStage, Session.IsReadOnly ? "默认策略只读，请先新增或切换到可编辑策略" : "新增阶段");
+        SaveStatus.Text = Session.Error != null ? "保存或读取失败，请查看提示"
+            : Session.IsReadOnly ? "默认策略只读，可复制并粘贴后编辑"
+            : Session.HasUnsavedChanges ? "有未保存的修改" : "已保存";
+        ToolTip.SetTip(SaveStatus, Session.Error);
+    }
+
+    public async Task<bool> ConfirmLeaveAsync()
+    {
+        await _leaveGate.WaitAsync();
+        try
+        {
+            var result = await Session.TryLeaveAsync(StrategyDialogs.UnsavedAsync);
+            if (!result && Session.Error != null) await StrategyDialogs.ErrorAsync(Session.Error);
+            RefreshList();
+            RefreshStatus();
+            return result;
+        }
+        finally { _leaveGate.Release(); }
+    }
+
+    private async void OnStrategySelected(object? sender, SelectionChangedEventArgs e)
+    {
+        if (_refreshing || _operationPending || StrategyList.SelectedItem is not StrategySummary selected) return;
+        _operationPending = true;
+        try
+        {
+            if (selected.Id != Session.Current.Id && await ConfirmLeaveAsync())
+            {
+                try { Session.Select(selected.Id); }
+                catch (Exception ex) when (StrategyStore.IsFileError(ex)) { await StrategyDialogs.ErrorAsync(ex.Message); }
+            }
+            RefreshList();
+        }
+        finally { _operationPending = false; }
+    }
+
+    private async void OnNewStrategy(object? sender, RoutedEventArgs e)
+    {
+        if (_operationPending) return;
+        _operationPending = true;
+        try
+        {
+            if (!await ConfirmLeaveAsync()) return;
+            var suffix = 1;
+            string name;
+            do { name = $"新策略 {suffix++}"; } while (Session.Catalog.Strategies.Any(x => x.Name == name));
+            Session.Create(name);
+        }
+        finally { _operationPending = false; }
+    }
+
+    private void OnStrategyContextRequested(object? sender, ContextRequestedEventArgs e)
+    {
+        var strategy = (e.Source as Control)?.GetSelfAndVisualAncestors()
+            .OfType<Control>().Select(x => x.DataContext).OfType<StrategySummary>().FirstOrDefault();
+        if (strategy == null || Resources["StrategyMenu"] is not ContextMenu menu)
+            return;
+
+        _menuStrategy = strategy;
+        menu.DataContext = strategy;
+        ApplyStrategyMenuEnabledStates(menu, strategy);
+    }
+
+    private void OnStrategyMenuOpening(object? sender, System.ComponentModel.CancelEventArgs e)
+    {
+        if (sender is not ContextMenu menu) return;
+        var strategy = _menuStrategy ?? menu.DataContext as StrategySummary;
+        menu.DataContext = strategy;
+        if (strategy != null) ApplyStrategyMenuEnabledStates(menu, strategy);
+    }
+
+    private static void ApplyStrategyMenuEnabledStates(ContextMenu menu, StrategySummary strategy)
+    {
+        var menuItems = menu.Items?.OfType<MenuItem>().ToList();
+        if (menuItems is not { Count: 4 }) return;
+        menuItems[0].IsEnabled = true;
+        menuItems[1].IsEnabled = true;
+        menuItems[2].IsEnabled = !strategy.IsBuiltIn;
+        menuItems[3].IsEnabled = !strategy.IsBuiltIn;
+    }
+
+    private StrategySummary? GetMenuStrategy(object? sender) =>
+        (sender as MenuItem)?.DataContext as StrategySummary ?? _menuStrategy;
+
+    private async void OnCopyStrategy(object? sender, RoutedEventArgs e)
+    {
+        if (GetMenuStrategy(sender) is not { } strategy) return;
+        try
+        {
+            var document = strategy.Id == Session.Current.Id ? StrategyJson.Clone(Session.Current) : Session.Load(strategy.Id);
+            var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
+            if (clipboard == null)
+            {
+                await StrategyDialogs.ErrorAsync("系统剪贴板不可用。");
+                return;
+            }
+            await clipboard.SetTextAsync(StrategyJson.Serialize(document));
+        }
+        catch (Exception ex) { await StrategyDialogs.ErrorAsync(ex.Message); }
+    }
+
+    private async void OnPasteStrategy(object? sender, RoutedEventArgs e)
+    {
+        if (_operationPending) return;
+        var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
+        string? text;
+        try { text = clipboard == null ? null : await clipboard.TryGetTextAsync(); }
+        catch (Exception ex)
+        {
+            await StrategyDialogs.ErrorAsync(ex.Message);
+            return;
+        }
+        if (string.IsNullOrWhiteSpace(text))
+        {
+            await StrategyDialogs.ErrorAsync("剪贴板中没有可粘贴的策略 JSON。");
+            return;
+        }
+
+        StrategyDocument document;
+        try { document = StrategyJson.Deserialize(text); }
+        catch (StrategyValidationException ex)
+        {
+            await StrategyDialogs.ErrorAsync(ex.Message);
+            return;
+        }
+
+        _operationPending = true;
+        try
+        {
+            if (await ConfirmLeaveAsync()) Session.Duplicate(document);
+        }
+        finally { _operationPending = false; }
+    }
+
+    private async void OnRenameStrategy(object? sender, RoutedEventArgs e)
+    {
+        var strategy = GetMenuStrategy(sender);
+        if (strategy == null || strategy.IsBuiltIn || _operationPending) return;
+        _operationPending = true;
+        try
+        {
+            var name = await _renameStrategy("重命名策略", strategy.Name);
+            if (name != null)
+            {
+                Session.Rename(strategy.Id, name);
+                RefreshList();
+            }
+        }
+        catch (Exception ex) when (StrategyStore.IsFileError(ex) || ex is InvalidOperationException)
+        { await StrategyDialogs.ErrorAsync(ex.Message); }
+        finally { _operationPending = false; }
+    }
+
+    private async void OnDeleteStrategyFromMenu(object? sender, RoutedEventArgs e)
+    {
+        var strategy = GetMenuStrategy(sender);
+        if (strategy == null || strategy.IsBuiltIn || _operationPending) return;
+        _operationPending = true;
+        try
+        {
+            if (!await _confirmDelete(strategy.Name)) return;
+            try
+            {
+                Session.Delete(strategy.Id);
+                RefreshList();
+            }
+            catch (Exception ex) when (StrategyStore.IsFileError(ex)) { await StrategyDialogs.ErrorAsync(ex.Message); }
+        }
+        finally { _operationPending = false; }
+    }
+
+    private void OnRefreshStrategies(object? sender, RoutedEventArgs e)
+    {
+        Session.RefreshCatalog();
+        RefreshList();
+        RefreshStatus();
+    }
+
+    private async void OnSaveStrategy(object? sender, RoutedEventArgs e)
+    {
+        if (!Session.TrySave()) await StrategyDialogs.ErrorAsync(Session.Error ?? "保存失败。");
+        RefreshList();
+        RefreshStatus();
+    }
+
+    private void OnAddStage(object? sender, RoutedEventArgs e) => Session.AddStage();
+    private void OnExpandAll(object? sender, RoutedEventArgs e) { foreach (var card in StageCards.Children.OfType<StrategyStageCard>()) card.IsExpanded = true; }
+    private void OnCollapseAll(object? sender, RoutedEventArgs e) { foreach (var card in StageCards.Children.OfType<StrategyStageCard>()) card.IsExpanded = false; }
+    private async void OnLoadWarnings(object? sender, RoutedEventArgs e) => await StrategyDialogs.ErrorAsync(string.Join(Environment.NewLine, Session.Catalog.Errors));
+    private static async void ShowError(string message) => await StrategyDialogs.ErrorAsync(message);
+}
diff --git a/MFAAvalonia/Views/Pages/SettingsView.axaml b/MFAAvalonia/Views/Pages/SettingsView.axaml
index 6541db83..b2e5ec96 100644
--- a/MFAAvalonia/Views/Pages/SettingsView.axaml
+++ b/MFAAvalonia/Views/Pages/SettingsView.axaml
@@ -30,7 +30,7 @@
             Margin="20,24,0,0"
             Text="{markup:I18n {x:Static helper:LangKeys.Settings}}" />
         <suki:SukiStackPage Margin="16,0,16,16" Name="Settings">
-            <suki:SettingsLayout Name="SettingsLayout" ScrollAnimationSpeed="3" MinWidthWhetherStackSummaryShow="700"
+            <suki:SettingsLayout Name="SettingsLayout" ScrollAnimationSpeed="3" MinWidthWhetherStackSummaryShow="900"
                                  StackSummaryWidth="220">
                 <suki:SettingsLayout.Items>
                     <suki:SettingsLayoutItem
diff --git a/MFAAvalonia/Views/Pages/TaskQueueView.axaml b/MFAAvalonia/Views/Pages/TaskQueueView.axaml
index dc62261b..4bf99687 100644
--- a/MFAAvalonia/Views/Pages/TaskQueueView.axaml
+++ b/MFAAvalonia/Views/Pages/TaskQueueView.axaml
@@ -154,70 +154,6 @@
         </Style>
 
 
-        <!-- 中心绿点脉冲动画 -->
-        <Style Selector="Ellipse#LiveStatusDot">
-            <Style.Animations>
-                <Animation Duration="0:0:1.5" IterationCount="INFINITE" Easing="CubicEaseInOut">
-                    <KeyFrame Cue="0%">
-                        <Setter Property="ScaleTransform.ScaleX" Value="1" />
-                        <Setter Property="ScaleTransform.ScaleY" Value="1" />
-                        <Setter Property="Opacity" Value="1" />
-                    </KeyFrame>
-                    <KeyFrame Cue="50%">
-                        <Setter Property="ScaleTransform.ScaleX" Value="1.2" />
-                        <Setter Property="ScaleTransform.ScaleY" Value="1.2" />
-                        <Setter Property="Opacity" Value="0.8" />
-                    </KeyFrame>
-                    <KeyFrame Cue="100%">
-                        <Setter Property="ScaleTransform.ScaleX" Value="1" />
-                        <Setter Property="ScaleTransform.ScaleY" Value="1" />
-                        <Setter Property="Opacity" Value="1" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-        </Style>
-
-        <!-- 外圈扩散动画 1 -->
-        <Style Selector="Ellipse#PulseRing1">
-            <Style.Animations>
-                <Animation Duration="0:0:1.5" IterationCount="INFINITE" Easing="CubicEaseOut">
-                    <KeyFrame Cue="0%">
-                        <Setter Property="ScaleTransform.ScaleX" Value="1" />
-                        <Setter Property="ScaleTransform.ScaleY" Value="1" />
-                        <Setter Property="Opacity" Value="0.6" />
-                        <Setter Property="StrokeThickness" Value="2" />
-                    </KeyFrame>
-                    <KeyFrame Cue="100%">
-                        <Setter Property="ScaleTransform.ScaleX" Value="2.5" />
-                        <Setter Property="ScaleTransform.ScaleY" Value="2.5" />
-                        <Setter Property="Opacity" Value="0" />
-                        <Setter Property="StrokeThickness" Value="0.5" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-        </Style>
-
-        <!-- 外圈扩散动画 2 (延迟 0.75s) -->
-        <Style Selector="Ellipse#PulseRing2">
-            <Style.Animations>
-                <Animation Duration="0:0:1.5" IterationCount="INFINITE" Easing="CubicEaseOut" Delay="0:0:0.75">
-                    <KeyFrame Cue="0%">
-                        <Setter Property="ScaleTransform.ScaleX" Value="1" />
-                        <Setter Property="ScaleTransform.ScaleY" Value="1" />
-                        <Setter Property="Opacity" Value="0.6" />
-                        <Setter Property="StrokeThickness" Value="2" />
-                    </KeyFrame>
-                    <KeyFrame Cue="100%">
-                        <Setter Property="ScaleTransform.ScaleX" Value="2.5" />
-                        <Setter Property="ScaleTransform.ScaleY" Value="2.5" />
-                        <Setter Property="Opacity" Value="0" />
-                        <Setter Property="StrokeThickness" Value="0.5" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-        </Style>
-
-
         <!-- TaskToggle 外层悬停放大 -->
         <Style Selector="Border#TaskToggleBorder, Border#TaskToggleBorder1">
             <Setter Property="RenderTransformOrigin" Value="50%,50%" />
@@ -1007,11 +943,11 @@
                                      CellSpacing="10">
             <dashboard:DashboardCard x:Name="SettingCard"
                                      CardId="settings"
-                                     GridColumn="4"
+                                     GridColumn="3"
                                      GridRow="0"
-                                     GridColumnSpan="4"
+                                     GridColumnSpan="5"
                                      GridRowSpan="5"
-                                     ExpandedColumnSpan="4"
+                                     ExpandedColumnSpan="5"
                                      ExpandedRowSpan="5">
                 <dashboard:DashboardCard.TitleContent>
                     <TextBlock FontSize="11"
@@ -1063,9 +999,9 @@
                                      CardId="task_list"
                                      GridColumn="0"
                                      GridRow="0"
-                                     GridColumnSpan="4"
+                                     GridColumnSpan="3"
                                      GridRowSpan="8"
-                                     ExpandedColumnSpan="4"
+                                     ExpandedColumnSpan="3"
                                      ExpandedRowSpan="8">
                 <dashboard:DashboardCard.TitleContent>
                     <TextBlock FontSize="11"
@@ -1084,25 +1020,19 @@
                                 Spacing="8">
                         <Button Classes="BasicTight TaskQueueBasicTight"
                                 ClipToBounds="False"
-                                Command="{Binding SelectAllCommand}"
+                                Command="{Binding ToggleSelectAllCommand}"
                                 Height="16"
                                 IsEnabled="{Binding CurrentInstanceIdle, Source={x:Static helper:Instances.RootViewModel}}"
                                 Margin="7,0,0,0"
                                 Padding="0"
-                                ToolTip.Tip="{markup:I18n {x:Static helper:LangKeys.SelectAll}}"
+                                ToolTip.Tip="{markup:I18n {x:Static helper:LangKeys.ToggleSelectAll}}"
                                 Width="16">
-                            <avalonia1:FluentIcon Icon="SelectAllOn" IconSize="Size16" IconVariant="Regular" />
-                        </Button>
-                        <Button Classes="BasicTight TaskQueueBasicTight"
-                                ClipToBounds="False"
-                                Command="{Binding SelectNoneCommand}"
-                                Height="16"
-                                IsEnabled="{Binding CurrentInstanceIdle, Source={x:Static helper:Instances.RootViewModel}}"
-                                Margin="7,0,0,0"
-                                Padding="0"
-                                ToolTip.Tip="{markup:I18n {x:Static helper:LangKeys.DeselectAll}}"
-                                Width="16">
-                            <avalonia1:FluentIcon Icon="SelectAllOff" IconSize="Size16" IconVariant="Regular" />
+                            <Grid>
+                                <avalonia1:FluentIcon Icon="SelectAllOn" IconSize="Size16" IconVariant="Regular"
+                                                     IsVisible="{calcBinding:Binding '!AreAllTasksSelected'}" />
+                                <avalonia1:FluentIcon Icon="SelectAllOff" IconSize="Size16" IconVariant="Regular"
+                                                     IsVisible="{Binding AreAllTasksSelected}" />
+                            </Grid>
                         </Button>
                         <Button Classes="BasicTight TaskQueueBasicTight"
                                 ClipToBounds="False"
@@ -1217,13 +1147,15 @@
                                 <Grid ToolTip.Tip="{markup:I18n {x:Static helper:LangKeys.TooltipDragLabel}}"
                                       Background="Transparent"
                                       extensions:DragDropExtensions.LimitDragDrop="True"
-                                      ColumnDefinitions="Auto,*,36,20,3,18"
+                                      ColumnDefinitions="Auto,*,24"
+                                      RowDefinitions="Auto,Auto"
                                       ContextMenu="{StaticResource TaskMenu}"
                                       PointerPressed="TaskItem_OnPointerPressed"
                                       ContextRequested="TaskItem_OnContextRequested"
                                       x:Name="ListGrid">
                                     <CheckBox IsThreeState="True"
                                               Grid.Column="0"
+                                              Grid.RowSpan="2"
                                               MinWidth="0"
                                               Margin="0,0,8,0"
                                               extensions:CheckBoxExtensions.EnableRightClickNull="{Binding !IsResourceOptionItem}"
@@ -1249,12 +1181,12 @@
                                                    TextWrapping="NoWrap"
                                                    VerticalAlignment="Center" />
                                     </Grid>
-                                    <TextBlock Grid.Column="2"
-                                               Width="36"
+                                    <TextBlock Grid.Row="1"
+                                               Grid.Column="1"
                                                Text="{Binding RunElapsedText}"
                                                Foreground="{DynamicResource SukiLowText}"
                                                FontSize="11"
-                                               TextAlignment="Right"
+                                               Margin="0,1,0,0"
                                                IsVisible="{Binding IsRunElapsedVisible}"
                                                VerticalAlignment="Center" />
                                     <RadioButton Classes="Icon"
@@ -1262,7 +1194,7 @@
                                                  IsHitTestVisible="False"
                                                  BorderThickness="0"
                                                  IsChecked="{Binding EnableSetting}"
-                                                 Grid.Column="3"
+                                                 Grid.Column="2"
                                                  Width="24"
                                                  MinWidth="0"
                                                  Padding="0"
@@ -1272,9 +1204,13 @@
                                                  GroupName="TaskSettings"
                                                  IsVisible="{Binding IsVisible}"
                                                  HorizontalContentAlignment="Center" />
-                                    <Grid Grid.Column="5" Width="18" Height="20"
+                                    <Grid Grid.Row="1" Grid.Column="2" Width="24" Height="24"
                                           IsVisible="{Binding IsRunStatusVisible}"
+                                          HorizontalAlignment="Center"
                                           VerticalAlignment="Center">
+                                        <Grid.RenderTransform>
+                                            <TranslateTransform X="3" />
+                                        </Grid.RenderTransform>
                                         <Path Width="15" Height="15" Stretch="Uniform"
                                               Classes="TaskRunSpinner"
                                               Data="{x:Static suki:Icons.Refresh}"
@@ -1323,11 +1259,11 @@
 
             <dashboard:DashboardCard x:Name="IntroductionCard"
                                      CardId="task_desc"
-                                     GridColumn="4"
+                                     GridColumn="3"
                                      GridRow="5"
-                                     GridColumnSpan="4"
+                                     GridColumnSpan="5"
                                      GridRowSpan="3"
-                                     ExpandedColumnSpan="4"
+                                     ExpandedColumnSpan="5"
                                      ExpandedRowSpan="3">
                 <dashboard:DashboardCard.TitleContent>
                     <TextBlock FontSize="11"
@@ -1354,192 +1290,14 @@
 
             </dashboard:DashboardCard>
 
-            <dashboard:DashboardCard x:Name="LiveViewCard"
-                                     CardId="live_view"
-                                     GridColumn="8"
-                                     GridRow="0"
-                                     GridColumnSpan="4"
-                                     GridRowSpan="4"
-                                     ExpandedColumnSpan="4"
-                                     ExpandedRowSpan="4"
-                                     CollapsedHeight="40">
-                <dashboard:DashboardCard.TitleContent>
-                    <TextBlock FontSize="11"
-                               FontWeight="Bold"
-                               Foreground="{DynamicResource SukiLowText}"
-                               Margin="2,0,0,0"
-                               Text="{markup:I18n {x:Static helper:LangKeys.LiveView}}"
-                               VerticalAlignment="Center" />
-                </dashboard:DashboardCard.TitleContent>
-                <Grid IsVisible="{Binding IsLiveViewExpanded}"
-                      Margin="0,8,0,0"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Top">
-                    <Border x:Name="LiveViewFrame"
-                            CornerRadius="12"
-                            ClipToBounds="True"
-                            Background="Transparent"
-                            BorderBrush="{DynamicResource SukiControlBorderBrush}"
-                            BorderThickness="0"
-                            MinWidth="260"
-                            MinHeight="160"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center">
-                        <Border CornerRadius="12" ClipToBounds="True">
-                            <Grid>
-                                <StackPanel
-                                    IsVisible="{Binding LiveViewImage, Converter={x:Static ObjectConverters.IsNull}}"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Spacing="8">
-                                    <avalonia1:FluentIcon Icon="Desktop"
-                                                          IconSize="Size32"
-                                                          Foreground="{DynamicResource SukiLowText}" />
-                                    <TextBlock
-                                        Text="{markup:I18n {x:Static helper:LangKeys.ScreenshotPlaceholder}}"
-                                        FontSize="13"
-                                        FontWeight="SemiBold"
-                                        Foreground="{DynamicResource SukiLowText}"
-                                        HorizontalAlignment="Center" />
-                                </StackPanel>
-                                <Image
-                                    Source="{Binding LiveViewImage}"
-                                    IsVisible="{Binding LiveViewImage, Converter={x:Static ObjectConverters.IsNotNull}}"
-                                    Stretch="Uniform"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center" />
-                            </Grid>
-                        </Border>
-                    </Border>
-
-                    <Grid
-                        Width="{Binding Bounds.Width, ElementName=LiveViewFrame}"
-                        Height="{Binding Bounds.Height, ElementName=LiveViewFrame}"
-                        VerticalAlignment="Center"
-                        HorizontalAlignment="Center"
-                        IsHitTestVisible="False"
-                        RowDefinitions="Auto,*"
-                        ColumnDefinitions="Auto,*">
-
-                        <Grid Grid.Row="0" Grid.Column="0"
-                              Margin="8 8 0 0"
-                              HorizontalAlignment="Left"
-                              VerticalAlignment="Top">
-                            <Grid.IsVisible>
-                                <MultiBinding Converter="{x:Static converters:BooleanAndConverter.Instance}">
-                                    <Binding Path="IsRunning" />
-                                    <Binding Path="LiveViewImage"
-                                             Converter="{x:Static ObjectConverters.IsNotNull}" />
-                                </MultiBinding>
-                            </Grid.IsVisible>
-                            <Border Background="{DynamicResource SukiCardBackground}"
-                                    BorderBrush="{DynamicResource SukiControlBorderBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="12"
-                                    Opacity="0.66" />
-                            <StackPanel Orientation="Horizontal" Spacing="6" Margin="8,4">
-                                <Grid Width="16" Height="16" VerticalAlignment="Center">
-                                    <Ellipse x:Name="PulseRing1"
-                                             Width="8"
-                                             Height="8"
-                                             Fill="Transparent"
-                                             Stroke="{DynamicResource SukiSuccessColor}"
-                                             StrokeThickness="2"
-                                             Opacity="0"
-                                             HorizontalAlignment="Center"
-                                             VerticalAlignment="Center"
-                                             RenderTransformOrigin="50%,50%">
-                                        <Ellipse.RenderTransform>
-                                            <ScaleTransform ScaleX="1" ScaleY="1" />
-                                        </Ellipse.RenderTransform>
-                                    </Ellipse>
-                                    <Ellipse x:Name="PulseRing2"
-                                             Width="8"
-                                             Height="8"
-                                             Fill="Transparent"
-                                             Stroke="{DynamicResource SukiSuccessColor}"
-                                             StrokeThickness="2"
-                                             Opacity="0"
-                                             HorizontalAlignment="Center"
-                                             VerticalAlignment="Center"
-                                             RenderTransformOrigin="50%,50%">
-                                        <Ellipse.RenderTransform>
-                                            <ScaleTransform ScaleX="1" ScaleY="1" />
-                                        </Ellipse.RenderTransform>
-                                    </Ellipse>
-                                    <Ellipse x:Name="LiveStatusDot"
-                                             Width="8"
-                                             Height="8"
-                                             Fill="{DynamicResource SukiSuccessColor}"
-                                             HorizontalAlignment="Center"
-                                             VerticalAlignment="Center"
-                                             RenderTransformOrigin="50%,50%">
-                                        <Ellipse.RenderTransform>
-                                            <ScaleTransform ScaleX="1" ScaleY="1" />
-                                        </Ellipse.RenderTransform>
-                                    </Ellipse>
-                                </Grid>
-                                <TextBlock Text="{markup:I18n {x:Static helper:LangKeys.Running}}"
-                                           FontSize="11"
-                                           Foreground="{DynamicResource SukiSuccessColor}"
-                                           VerticalAlignment="Center" />
-                            </StackPanel>
-                        </Grid>
-                        <Grid Grid.Row="0" Grid.Column="1"
-                              HorizontalAlignment="Right" Margin="0 8 8 0"
-                              VerticalAlignment="Top">
-                            <Grid.IsVisible>
-                                <MultiBinding Converter="{x:Static converters:BooleanAndConverter.Instance}">
-                                    <Binding Path="CurrentTaskName"
-                                             Converter="{x:Static StringConverters.IsNotNullOrEmpty}" />
-                                    <Binding Path="LiveViewImage"
-                                             Converter="{x:Static ObjectConverters.IsNotNull}" />
-                                </MultiBinding>
-                            </Grid.IsVisible>
-                            <Border Background="{DynamicResource SukiCardBackground}"
-                                    BorderBrush="{DynamicResource SukiControlBorderBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="12"
-                                    Opacity="0.66" />
-                            <StackPanel Orientation="Horizontal" Margin="8,4">
-                                <TextBlock Text="{markup:I18n {x:Static helper:LangKeys.Task}}"
-                                           FontSize="11"
-                                           Foreground="{DynamicResource SukiText}" />
-                                <TextBlock Text=": " FontSize="11" Foreground="{DynamicResource SukiText}" />
-                                <TextBlock
-                                    Text="{Binding CurrentTaskName}"
-                                    FontSize="11"
-                                    Foreground="{DynamicResource SukiText}" />
-                            </StackPanel>
-                        </Grid>
-
-                        <Grid Grid.Row="1" Grid.Column="0"
-                              HorizontalAlignment="Left" Margin="8 0 0 8"
-                              VerticalAlignment="Bottom"
-                              IsVisible="{Binding LiveViewImage, Converter={x:Static ObjectConverters.IsNotNull}}">
-                            <Border Background="{DynamicResource SukiCardBackground}"
-                                    BorderBrush="{DynamicResource SukiControlBorderBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="12"
-                                    Opacity="0.66" />
-                            <TextBlock Margin="8,4"
-                                       FontSize="11"
-                                       Foreground="{DynamicResource SukiText}"
-                                       Text="{Binding LiveViewFps, StringFormat='FPS: {0:F1}'}" />
-
-                        </Grid>
-                    </Grid>
-                </Grid>
-            </dashboard:DashboardCard>
-
             <dashboard:DashboardCard x:Name="LogCard"
                                      CardId="log"
                                      GridColumn="8"
-                                     GridRow="4"
+                                     GridRow="0"
                                      GridColumnSpan="4"
-                                     GridRowSpan="4"
+                                     GridRowSpan="8"
                                      ExpandedColumnSpan="4"
-                                     ExpandedRowSpan="4">
+                                     ExpandedRowSpan="8">
                 <dashboard:DashboardCard.TitleContent>
                     <TextBlock FontSize="11"
                                FontWeight="Bold"
diff --git a/MFAAvalonia/Views/Pages/TaskQueueView.axaml.cs b/MFAAvalonia/Views/Pages/TaskQueueView.axaml.cs
index feddd01f..fd4e517d 100644
--- a/MFAAvalonia/Views/Pages/TaskQueueView.axaml.cs
+++ b/MFAAvalonia/Views/Pages/TaskQueueView.axaml.cs
@@ -93,7 +93,6 @@ private void NavigateToConnectSettings()
     private void OnDataContextChanged(object? sender, EventArgs e)
     {
         UpdateViewModelSubscription(DataContext as TaskQueueViewModel);
-        ApplyLiveViewCardState();
     }
 
     private TaskQueueViewModel? _subscribedViewModel;
@@ -115,7 +114,6 @@ private void UpdateViewModelSubscription(TaskQueueViewModel? newVm)
             _subscribedViewModel.SetOptionRequested += OnSetOptionRequested;
             _subscribedViewModel.TaskItemViewModels.CollectionChanged += OnTaskItemsCollectionChanged;
             Dispatcher.UIThread.Post(ClearUnsupportedSelection, DispatcherPriority.Background);
-            Dispatcher.UIThread.Post(ApplyLiveViewCardState, DispatcherPriority.Background);
         }
     }
 
@@ -680,11 +678,11 @@ public void SetOption(DragItemViewModel dragItem, bool value, bool init = false)
 
         HideAllPanels();
         InvalidatePanelCache(cacheKey);
-        var juggle = dragItem.InterfaceItem is { Advanced: { Count: > 0 }, Option: { Count: > 0 } };
-        vm.ShowSettings = juggle;
         // 处理资源设置项的选项
         if (dragItem.IsResourceOptionItem)
         {
+            vm.ShowSettings = false;
+            vm.IsCommon = true;
             var hasOptions = dragItem.ResourceItem?.SelectOptions != null && dragItem.ResourceItem.SelectOptions.Count > 0;
             if (hasOptions)
             {
@@ -701,45 +699,35 @@ public void SetOption(DragItemViewModel dragItem, bool value, bool init = false)
         }
         else
         {
+            var interfaceItem = dragItem.InterfaceItem;
+            var hasCommonOptions = interfaceItem is { Repeatable: true }
+                || interfaceItem?.Option is { Count: > 0 };
+            var hasAdvancedOptions = interfaceItem?.Advanced is { Count: > 0 };
+            vm.ShowSettings = hasCommonOptions && hasAdvancedOptions;
+            vm.IsCommon = hasCommonOptions || !hasAdvancedOptions;
 
-            if (juggle)
+            if (!init)
             {
-                var newPanel = CommonPanelCache.GetOrAdd(cacheKey, key =>
+                var commonPanel = CommonPanelCache.GetOrAdd(cacheKey, key =>
                 {
                     var p = new StackPanel();
-                    new TaskOptionGenerator(vm, SaveConfiguration).GeneratePanelContent(p, dragItem);
-                    // GeneratePanelContent(p, dragItem);
+                    new TaskOptionGenerator(vm, SaveConfiguration).GenerateCommonPanelContent(p, dragItem);
                     CommonOptionSettings.Children.Add(p);
                     return p;
                 });
-                newPanel.IsVisible = true;
+                commonPanel.IsVisible = true;
             }
-            else
+
+            var advancedPanel = AdvancedPanelCache.GetOrAdd(cacheKey, key =>
             {
-                if (!init)
-                {
-                    var commonPanel = CommonPanelCache.GetOrAdd(cacheKey, key =>
-                    {
-                        var p = new StackPanel();
-                        new TaskOptionGenerator(vm, SaveConfiguration).GenerateCommonPanelContent(p, dragItem);
-                        // GenerateCommonPanelContent(p, dragItem);
-                        CommonOptionSettings.Children.Add(p);
-                        return p;
-                    });
-                    commonPanel.IsVisible = true;
-                }
-                var advancedPanel = AdvancedPanelCache.GetOrAdd(cacheKey, key =>
-                {
-                    var p = new StackPanel();
-                    new TaskOptionGenerator(vm, SaveConfiguration).GenerateAdvancedPanelContent(p, dragItem);
-                    // GenerateAdvancedPanelContent(p, dragItem);
-                    AdvancedOptionSettings.Children.Add(p);
-                    return p;
-                });
-                if (!init)
-                {
-                    advancedPanel.IsVisible = true;
-                }
+                var p = new StackPanel();
+                new TaskOptionGenerator(vm, SaveConfiguration).GenerateAdvancedPanelContent(p, dragItem);
+                AdvancedOptionSettings.Children.Add(p);
+                return p;
+            });
+            if (!init)
+            {
+                advancedPanel.IsVisible = true;
             }
         }
         if (!init)
@@ -764,6 +752,10 @@ public void SetOption(DragItemViewModel dragItem, bool value, bool init = false)
             {
                 hasSettings = panel.IsVisible && ((Panel)panel).Children.Count > 0;
             }
+            if (AdvancedPanelCache.TryGetValue(cacheKey, out var advancedPanel))
+            {
+                hasSettings = hasSettings || advancedPanel.IsVisible && ((Panel)advancedPanel).Children.Count > 0;
+            }
 
             var hasIntroduction = !string.IsNullOrWhiteSpace(newIntroduction);
             // if (!Instances.TaskQueueViewModel.IsLeftPanelCollapsed && !hasSettings)
@@ -880,11 +872,10 @@ private void HideCurrentPanel(string key)
         {
             oldPanel.IsVisible = false;
         }
-        if (AdvancedPanelCache.TryGetValue(key, out var oldaPanel))
+        if (AdvancedPanelCache.TryGetValue(key, out var oldAdvancedPanel))
         {
-            oldaPanel.IsVisible = false;
+            oldAdvancedPanel.IsVisible = false;
         }
-
         Introduction.Markdown = "";
         SetHiddenMode();
     }
@@ -911,6 +902,11 @@ private void HideAllPanels()
             panel.IsVisible = false;
         }
 
+        foreach (var panel in AdvancedPanelCache.Values)
+        {
+            panel.IsVisible = false;
+        }
+
         Introduction.Markdown = "";
         SetHiddenMode();
     }
@@ -2513,12 +2509,13 @@ private void SaveResourceOptionConfiguration(TaskQueueViewModel vm)
             .ToList();
 
         // 保存全局选项到 GlobalOptionItems
-        var globalItem = allItems.FirstOrDefault(m => m.ResourceItem?.Name == "__GlobalOption__");
-        if (globalItem?.ResourceItem?.SelectOptions != null)
+        var globalOptions = allItems.FirstOrDefault(m => m.ResourceItem?.Name == "__GlobalOption__")
+            ?.ResourceItem?.SelectOptions ?? MaaProcessor.Interface?.GlobalSelectOptions;
+        if (globalOptions != null)
         {
             vm.Processor.InstanceConfiguration.SetValue(
                 ConfigurationKeys.GlobalOptionItems,
-                globalItem.ResourceItem.SelectOptions);
+                globalOptions);
         }
 
         // 保存控制器选项到 ControllerOptionItems（Name 以 "__ControllerOption__" 开头）
@@ -2776,16 +2773,10 @@ private void RefreshCurrentIntroduction()
         }
     }
 
-    #region 实时图像
+    #region 视图生命周期
 
     private void OnTaskQueueViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
-        if (e.PropertyName == nameof(TaskQueueViewModel.EnableLiveView))
-        {
-            ApplyLiveViewCardState();
-            return;
-        }
-
         if (e.PropertyName == nameof(TaskQueueViewModel.CurrentController))
         {
             UpdateDeviceColumns();
@@ -2855,17 +2846,6 @@ private void OnLoaded(object? sender, RoutedEventArgs e)
         LanguageHelper.LanguageChanged += OnLanguageChanged;
 
         UpdateViewModelSubscription(DataContext as TaskQueueViewModel);
-        ApplyLiveViewCardState();
-    }
-
-    private void ApplyLiveViewCardState()
-    {
-        if (DataContext is not TaskQueueViewModel vm || LiveViewCard == null)
-        {
-            return;
-        }
-
-        LiveViewCard.IsVisible = vm.EnableLiveView;
     }
 
     private void OnSetOptionRequested(DragItemViewModel item, bool value)
diff --git a/MFAAvalonia/Views/UserControls/Dashboard/DashboardCardGrid.cs b/MFAAvalonia/Views/UserControls/Dashboard/DashboardCardGrid.cs
index db945bc3..6b81ea0d 100644
--- a/MFAAvalonia/Views/UserControls/Dashboard/DashboardCardGrid.cs
+++ b/MFAAvalonia/Views/UserControls/Dashboard/DashboardCardGrid.cs
@@ -867,11 +867,32 @@ private void ApplyLayouts(IEnumerable<DashboardCardLayout> layouts)
             card.GridRowSpan = layout.IsCollapsed ? 1 : Math.Max(1, layout.RowSpan);
         }
 
+        MigrateLegacyTaskDescriptionDefaultWidth();
+
         _suppressLayoutSave = false;
         InvalidateMeasure();
         InvalidateArrange();
     }
 
+    private void MigrateLegacyTaskDescriptionDefaultWidth()
+    {
+        var card = Children.OfType<DashboardCard>()
+            .FirstOrDefault(c => string.Equals(c.CardId, "task_desc", StringComparison.OrdinalIgnoreCase));
+
+        if (card == null
+            || card.GridColumn != 4
+            || card.GridRow != 5
+            || card.GridColumnSpan != 4
+            || card.ExpandedColumnSpan != 4)
+        {
+            return;
+        }
+
+        card.GridColumn = 3;
+        card.GridColumnSpan = 5;
+        card.ExpandedColumnSpan = 5;
+    }
+
     private void SaveLayouts()
     {
         if (_suppressLayoutSave)
@@ -1117,6 +1138,8 @@ private void ApplyResourceLayout(ResourceLayoutDefinition layout, List<Dashboard
             card.ExpandedRowSpan = rowSpan;
         }
 
+        MigrateLegacyTaskDescriptionDefaultWidth();
+
         _suppressLayoutSave = false;
         InvalidateMeasure();
         InvalidateArrange();
diff --git a/MFAAvalonia/Views/UserControls/Settings/AboutUserControl.axaml.cs b/MFAAvalonia/Views/UserControls/Settings/AboutUserControl.axaml.cs
index cbbfa19f..4c245331 100644
--- a/MFAAvalonia/Views/UserControls/Settings/AboutUserControl.axaml.cs
+++ b/MFAAvalonia/Views/UserControls/Settings/AboutUserControl.axaml.cs
@@ -134,8 +134,16 @@ private void ShowLicense_Click(object? sender, RoutedEventArgs e)
 
     private void StartTutorial_Click(object? sender, RoutedEventArgs e)
     {
-        var rootContent = this.GetVisualAncestors().OfType<RootViewContent>().FirstOrDefault();
-        rootContent?.TryStartTutorial();
+        var rootContent = this.GetVisualAncestors().OfType<RootViewContent>().FirstOrDefault()
+            ?? (this.GetVisualRoot() as Visual)?.FindDescendantOfType<RootViewContent>();
+        if (rootContent == null)
+        {
+            LoggerHelper.Warning("未找到根视图，无法启动使用教程");
+            ToastHelper.Warn("暂时无法启动教程，请回到任务页后重试。");
+            return;
+        }
+
+        rootContent.TryStartTutorial();
     }
 }
 
diff --git a/MFAAvalonia/Views/UserControls/Settings/GameSettingsUserControl.axaml b/MFAAvalonia/Views/UserControls/Settings/GameSettingsUserControl.axaml
index 7d904a82..6c5ffc9b 100644
--- a/MFAAvalonia/Views/UserControls/Settings/GameSettingsUserControl.axaml
+++ b/MFAAvalonia/Views/UserControls/Settings/GameSettingsUserControl.axaml
@@ -140,6 +140,22 @@
                             Text="{markup:I18n {x:Static helper:LangKeys.ShowHitDraw}}" />
                     </StackPanel>
                 </DockPanel>
+                <StackPanel
+                    x:Name="LightweightRecognitionSettingsPanel"
+                    IsVisible="False"
+                    Spacing="5" />
+            </StackPanel>
+        </suki:GlassCard>
+        <suki:GlassCard
+            x:Name="GlobalOptionCard"
+            IsVisible="False"
+            Padding="25">
+            <StackPanel Spacing="15">
+                <TextBlock
+                    FontSize="16"
+                    FontWeight="SemiBold"
+                    Text="{markup:I18n {x:Static helper:LangKeys.GlobalOption}}" />
+                <StackPanel x:Name="GlobalOptionSettingsPanel" Spacing="5" />
             </StackPanel>
         </suki:GlassCard>
         <!-- Live View Settings -->
@@ -182,4 +198,4 @@
             </StackPanel>
         </suki:GlassCard>
     </StackPanel>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/MFAAvalonia/Views/UserControls/Settings/GameSettingsUserControl.axaml.cs b/MFAAvalonia/Views/UserControls/Settings/GameSettingsUserControl.axaml.cs
index af70bd76..b574c1bd 100644
--- a/MFAAvalonia/Views/UserControls/Settings/GameSettingsUserControl.axaml.cs
+++ b/MFAAvalonia/Views/UserControls/Settings/GameSettingsUserControl.axaml.cs
@@ -1,9 +1,17 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;
+using MFAAvalonia.Configuration;
+using MFAAvalonia.Extensions.MaaFW;
 using MFAAvalonia.Helper;
+using MFAAvalonia.Helper.ValueType;
+using MFAAvalonia.ViewModels.Other;
+using MFAAvalonia.ViewModels.Pages;
+using System.ComponentModel;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace MFAAvalonia.Views.UserControls.Settings;
@@ -14,7 +22,101 @@ public GameSettingsUserControl()
     {
         DataContext = Instances.GameSettingsUserControlModel;
         InitializeComponent();
+        Loaded += OnLoaded;
+        Unloaded += OnUnloaded;
+    }
+
+    private void OnLoaded(object? sender, RoutedEventArgs e)
+    {
+        Instances.InstanceTabBarViewModel.PropertyChanged += OnInstanceTabBarPropertyChanged;
+        RefreshGlobalOptionSettings();
+    }
+
+    private void OnUnloaded(object? sender, RoutedEventArgs e)
+    {
+        Instances.InstanceTabBarViewModel.PropertyChanged -= OnInstanceTabBarPropertyChanged;
+    }
+
+    private void OnInstanceTabBarPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(InstanceTabBarViewModel.ActiveTab))
+            DispatcherHelper.PostOnMainThread(RefreshGlobalOptionSettings);
+    }
+
+    private void RefreshGlobalOptionSettings()
+    {
+        LightweightRecognitionSettingsPanel.Children.Clear();
+        GlobalOptionSettingsPanel.Children.Clear();
+
+        var taskQueueViewModel = Instances.InstanceTabBarViewModel.ActiveTab?.TaskQueueViewModel;
+        var maaInterface = MaaProcessor.Interface;
+        if (taskQueueViewModel == null || maaInterface == null)
+        {
+            LightweightRecognitionSettingsPanel.IsVisible = false;
+            GlobalOptionCard.IsVisible = false;
+            return;
+        }
+
+        var savedOptions = taskQueueViewModel.Processor.InstanceConfiguration.GetValue(
+            ConfigurationKeys.GlobalOptionItems,
+            new List<MaaInterface.MaaInterfaceSelectOption>());
+        TaskLoader.InitializeGlobalSelectOptions(maaInterface, savedOptions);
+        var globalSelectOptions = maaInterface.GlobalSelectOptions ?? new List<MaaInterface.MaaInterfaceSelectOption>();
+        void SaveGlobalOptions() => taskQueueViewModel.Processor.InstanceConfiguration.SetValue(
+            ConfigurationKeys.GlobalOptionItems,
+            globalSelectOptions);
+
+        var lightweightOption = globalSelectOptions.FirstOrDefault(option =>
+            option.Name == TaskLoader.LightweightRecognitionOptionName);
+        if (maaInterface.Option?.ContainsKey(TaskLoader.LightweightRecognitionOptionName) == true &&
+            lightweightOption != null)
+        {
+            var lightweightResource = CreateOptionResource([lightweightOption]);
+            var lightweightDragItem = new DragItemViewModel(lightweightResource)
+            {
+                OwnerViewModel = taskQueueViewModel,
+                IsVisible = true,
+            };
+            new TaskOptionGenerator(taskQueueViewModel, SaveGlobalOptions)
+                .GenerateResourceOptionPanelContent(
+                    LightweightRecognitionSettingsPanel,
+                    lightweightDragItem,
+                    useSettingsPresentation: true);
+        }
+        LightweightRecognitionSettingsPanel.IsVisible = LightweightRecognitionSettingsPanel.Children.Count > 0;
+
+        var regularGlobalOptions = globalSelectOptions
+            .Where(option => option.Name != TaskLoader.LightweightRecognitionOptionName &&
+                             maaInterface.GlobalOption?.Contains(option.Name ?? string.Empty) == true)
+            .ToList();
+        if (regularGlobalOptions.Count == 0)
+        {
+            GlobalOptionCard.IsVisible = false;
+            return;
+        }
+
+        var resource = CreateOptionResource(regularGlobalOptions);
+        var dragItem = new DragItemViewModel(resource)
+        {
+            OwnerViewModel = taskQueueViewModel,
+            IsVisible = true,
+        };
+
+        new TaskOptionGenerator(taskQueueViewModel, SaveGlobalOptions)
+            .GenerateResourceOptionPanelContent(GlobalOptionSettingsPanel, dragItem);
+        GlobalOptionCard.IsVisible = GlobalOptionSettingsPanel.Children.Count > 0;
+    }
+
+    private static MaaInterface.MaaInterfaceResource CreateOptionResource(
+        List<MaaInterface.MaaInterfaceSelectOption> selectOptions)
+    {
+        var resource = new MaaInterface.MaaInterfaceResource
+        {
+            Name = "__GlobalOption__",
+            SelectOptions = selectOptions,
+        };
+        resource.InitializeDisplayName();
+        return resource;
     }
-    
 }
 
diff --git a/MFAAvalonia/Views/UserControls/Settings/GuiSettingsUserControl.axaml b/MFAAvalonia/Views/UserControls/Settings/GuiSettingsUserControl.axaml
index 09c282b9..b1187dab 100644
--- a/MFAAvalonia/Views/UserControls/Settings/GuiSettingsUserControl.axaml
+++ b/MFAAvalonia/Views/UserControls/Settings/GuiSettingsUserControl.axaml
@@ -190,29 +190,31 @@
                             Text="{markup:I18n {x:Static helper:LangKeys.CreateCustomTheme}}" />
                         <TextBlock
                             Foreground="{DynamicResource SukiLowText}"
-                            Margin="0,12,70,0"
+                            Margin="0,12,0,0"
                             Text="{markup:I18n {x:Static helper:LangKeys.ConfigurePrimaryAccent}}"
                             TextWrapping="Wrap" />
                     </StackPanel>
                 </DockPanel>
-                <DockPanel>
-                    <ComboBox extensions:ComboBoxExtensions.DisableNavigationOnLostFocus="True"
-                              DockPanel.Dock="Right"
-                              ItemsSource="{Binding AvailableBackgroundStyles}"
-                              SelectedValue="{Binding BackgroundStyle}"
-                              Width="215" />
-                    <StackPanel HorizontalAlignment="Left">
+                <Grid Classes="ResponsiveSettingsField" ColumnDefinitions="1.8*,1*" ColumnSpacing="20">
+                    <StackPanel Grid.Column="0" HorizontalAlignment="Left">
                         <TextBlock
                             FontSize="16"
                             FontWeight="SemiBold"
                             Text="{markup:I18n {x:Static helper:LangKeys.BackgroundStyleTitle}}" />
                         <TextBlock
                             Foreground="{DynamicResource SukiLowText}"
-                            Margin="0,12,70,0"
+                            Margin="0,12,0,0"
                             Text="{markup:I18n {x:Static helper:LangKeys.BackgroundStyleDescription}}"
                             TextWrapping="Wrap" />
                     </StackPanel>
-                </DockPanel>
+                    <ComboBox extensions:ComboBoxExtensions.DisableNavigationOnLostFocus="True"
+                              Grid.Column="1"
+                              HorizontalAlignment="Stretch"
+                              ItemsSource="{Binding AvailableBackgroundStyles}"
+                              MaxWidth="215"
+                              MinWidth="160"
+                              SelectedValue="{Binding BackgroundStyle}" />
+                </Grid>
 
                 <DockPanel>
                     <ToggleSwitch
@@ -227,7 +229,7 @@
                             Text="{markup:I18n {x:Static helper:LangKeys.AnimatedBackgroundTitle}}" />
                         <TextBlock
                             Foreground="{DynamicResource SukiLowText}"
-                            Margin="0,12,70,0"
+                            Margin="0,12,0,0"
                             Text="{markup:I18n {x:Static helper:LangKeys.AnimatedBackgroundDescription}}"
                             TextWrapping="Wrap" />
                     </StackPanel>
@@ -245,7 +247,7 @@
                             Text="{markup:I18n {x:Static helper:LangKeys.BackgroundTransitionsTitle}}" />
                         <TextBlock
                             Foreground="{DynamicResource SukiLowText}"
-                            Margin="0,12,70,0"
+                            Margin="0,12,0,0"
                             Text="{markup:I18n {x:Static helper:LangKeys.BackgroundTransitionsDescription}}"
                             TextWrapping="Wrap" />
                     </StackPanel>
@@ -277,7 +279,7 @@
                             Text="{markup:I18n {x:Static helper:LangKeys.BackgroundImageTitle}}" />
                         <TextBlock
                             Foreground="{DynamicResource SukiLowText}"
-                            Margin="0,12,70,0"
+                            Margin="0,12,12,0"
                             Text="{markup:I18n {x:Static helper:LangKeys.BackgroundImageDescription}}"
                             TextWrapping="Wrap" />
                     </StackPanel>
@@ -300,7 +302,7 @@
                             Text="{markup:I18n {x:Static helper:LangKeys.BackgroundImageOpacityTitle}}" />
                         <TextBlock
                             Foreground="{DynamicResource SukiLowText}"
-                            Margin="0,12,70,0"
+                            Margin="0,12,0,0"
                             Text="{markup:I18n {x:Static helper:LangKeys.BackgroundImageOpacityDescription}}"
                             TextWrapping="Wrap" />
                     </StackPanel>
@@ -308,26 +310,28 @@
             </StackPanel>
         </suki:GlassCard>
         <suki:GlassCard Margin="0,25,0,0" Padding="25">
-            <DockPanel>
-                <ComboBox extensions:ComboBoxExtensions.DisableNavigationOnLostFocus="True"
-                          DisplayMemberBinding="{Binding Name}"
-                          DockPanel.Dock="Right"
-                          ItemsSource="{Binding SupportedLanguages}"
-                          SelectedValue="{Binding CurrentLanguage}"
-                          SelectedValueBinding="{Binding Key}"
-                          Width="215" />
-                <StackPanel HorizontalAlignment="Left">
+            <Grid Classes="ResponsiveSettingsField" ColumnDefinitions="1.8*,1*" ColumnSpacing="20">
+                <StackPanel Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock
                         FontSize="16"
                         FontWeight="DemiBold"
                         Text="{markup:I18n {x:Static helper:LangKeys.LanguageOption}}" />
                     <TextBlock
                         Foreground="{DynamicResource SukiLowText}"
-                        Margin="0,12,70,0"
+                        Margin="0,12,0,0"
                         Text="{markup:I18n {x:Static helper:LangKeys.LanguageOptionDescription}}"
                         TextWrapping="Wrap" />
                 </StackPanel>
-            </DockPanel>
+                <ComboBox extensions:ComboBoxExtensions.DisableNavigationOnLostFocus="True"
+                          DisplayMemberBinding="{Binding Name}"
+                          Grid.Column="1"
+                          HorizontalAlignment="Stretch"
+                          ItemsSource="{Binding SupportedLanguages}"
+                          MaxWidth="215"
+                          MinWidth="160"
+                          SelectedValue="{Binding CurrentLanguage}"
+                          SelectedValueBinding="{Binding Key}" />
+            </Grid>
         </suki:GlassCard>
         <!-- Font Scale Settings -->
         <suki:GlassCard Margin="0,25,0,0" Padding="25">
@@ -347,7 +351,7 @@
                             Text="{markup:I18n {x:Static helper:LangKeys.FontScaleTitle}}" />
                         <TextBlock
                             Foreground="{DynamicResource SukiLowText}"
-                            Margin="0,12,70,0"
+                            Margin="0,12,0,0"
                             Text="{markup:I18n {x:Static helper:LangKeys.FontScaleDescription}}"
                             TextWrapping="Wrap" />
                     </StackPanel>
@@ -375,7 +379,7 @@
                         Text="{markup:I18n {x:Static helper:LangKeys.MinimizeToTray}}" />
                     <TextBlock
                         Foreground="{DynamicResource SukiLowText}"
-                        Margin="0,12,70,0"
+                        Margin="0,12,0,0"
                         Text="{markup:I18n {x:Static helper:LangKeys.MinimizeToTrayDescription}}"
                         TextWrapping="Wrap" />
                 </StackPanel>
@@ -395,7 +399,7 @@
                         Text="{markup:I18n {x:Static helper:LangKeys.Notification}}" />
                     <TextBlock
                         Foreground="{DynamicResource SukiLowText}"
-                        Margin="0,12,70,0"
+                        Margin="0,12,0,0"
                         Text="{markup:I18n {x:Static helper:LangKeys.NotificationDescription}}"
                         TextWrapping="Wrap" />
                 </StackPanel>
diff --git a/MFAAvalonia/Views/UserControls/Settings/PerformanceUserControl.axaml b/MFAAvalonia/Views/UserControls/Settings/PerformanceUserControl.axaml
index d9724e7f..df518569 100644
--- a/MFAAvalonia/Views/UserControls/Settings/PerformanceUserControl.axaml
+++ b/MFAAvalonia/Views/UserControls/Settings/PerformanceUserControl.axaml
@@ -18,26 +18,26 @@
     </Design.DataContext>
     <suki:GlassCard Margin="0,15,0,0" Padding="25,10,25,10">
         <StackPanel Orientation="Vertical" Spacing="10">
-            <DockPanel>
-
-                <ComboBox extensions:ComboBoxExtensions.DisableNavigationOnLostFocus="True" DockPanel.Dock="Right"
-                          DisplayMemberBinding="{Binding Name}"
-
-                          Focusable="False"
-                          HorizontalAlignment="Center"
-                          IsEnabled="{Binding Idle, Source={x:Static helper:Instances.RootViewModel}}"
-                          ItemsSource="{Binding GpuOptions}" SelectedIndex="{Binding GpuIndex}"
-                          VerticalAlignment="Center"
-                          Width="215" />
-
-                <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center">
+            <Grid ColumnDefinitions="1.8*,1*" ColumnSpacing="20">
+                <StackPanel Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center">
                     <TextBlock
                         FontSize="16"
                         FontWeight="DemiBold"
                         Text="{markup:I18n {x:Static helper:LangKeys.UseGpuForInference}}"
                         VerticalAlignment="Center" />
                 </StackPanel>
-            </DockPanel>
+                <ComboBox extensions:ComboBoxExtensions.DisableNavigationOnLostFocus="True"
+                          DisplayMemberBinding="{Binding Name}"
+                          Focusable="False"
+                          Grid.Column="1"
+                          HorizontalAlignment="Stretch"
+                          IsEnabled="{Binding Idle, Source={x:Static helper:Instances.RootViewModel}}"
+                          ItemsSource="{Binding GpuOptions}"
+                          MaxWidth="215"
+                          MinWidth="160"
+                          SelectedIndex="{Binding GpuIndex}"
+                          VerticalAlignment="Center" />
+            </Grid>
             <CheckBox Margin="0 0 0 8" IsChecked="{Binding UseDirectML}" IsVisible="{Binding  IsDirectMLSupported}" HorizontalAlignment="Center"
                       Content="{markup:I18n {x:Static helper:LangKeys.UseDirectMLSupportedDevice}}" VerticalAlignment="Center"> 
             </CheckBox>
@@ -56,4 +56,4 @@
             </DockPanel>
         </StackPanel>
     </suki:GlassCard>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/MFAAvalonia/Views/UserControls/TeachingTipOverlay.axaml.cs b/MFAAvalonia/Views/UserControls/TeachingTipOverlay.axaml.cs
index 4022db6d..5aeb2015 100644
--- a/MFAAvalonia/Views/UserControls/TeachingTipOverlay.axaml.cs
+++ b/MFAAvalonia/Views/UserControls/TeachingTipOverlay.axaml.cs
@@ -8,6 +8,7 @@
 using MFAAvalonia.Helper;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace MFAAvalonia.Views.UserControls;
 
@@ -28,6 +29,11 @@ public partial class TeachingTipOverlay : UserControl
     private DispatcherTimer? _trackingTimer;
     private Rect _lastTargetBounds;
     private Size _lastTipSize;
+    private int _loggedStep = -1;
+    private Rect _lastLoggedBounds;
+    private int _loggedCountForStep;
+    private int _scrollRequestsForStep;
+    private DateTime _lastScrollRequestAt = DateTime.MinValue;
 
     /// <summary>
     /// Indicates whether a tutorial is currently running.
@@ -85,7 +91,7 @@ private void StartTracking()
         if (_trackingTimer != null) return;
         _trackingTimer = new DispatcherTimer
         {
-            Interval = TimeSpan.FromMilliseconds(300)
+            Interval = TimeSpan.FromMilliseconds(100)
         };
         _trackingTimer.Tick += OnTrackingTick;
         _trackingTimer.Start();
@@ -104,16 +110,36 @@ private void OnTrackingTick(object? sender, EventArgs e)
             return;
 
         var step = _steps[_currentStep];
-        var target = step.FindTarget?.Invoke();
-        if (target == null || _overlayRoot == null || _tipBorder == null) return;
+        var targets = ResolveTargets(step);
+        if (targets == null)
+        {
+            ClearCutout();
+            return;
+        }
+
+        if (_overlayRoot == null || _tipBorder == null) return;
 
         try
         {
-            var tb = GetTargetBoundsInOverlay(target);
-            if (tb == null) return;
+            var tb = GetTargetsBoundsInOverlay(targets);
+            if (tb == null)
+            {
+                ClearCutout();
+                return;
+            }
 
             var inflated = tb.Value.Inflate(step.CutoutPadding);
 
+            var overlayBounds = new Rect(0, 0, _overlayRoot.Bounds.Width, _overlayRoot.Bounds.Height);
+            if (!overlayBounds.Intersects(inflated))
+            {
+                ClearCutout();
+                RequestScrollIfNeeded(targets, tb.Value);
+                return;
+            }
+
+            RequestScrollIfNeeded(targets, tb.Value);
+
             // Check if tip size changed (content may have been laid out since last tick)
             _tipBorder.InvalidateMeasure();
             _tipBorder.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
@@ -164,6 +190,9 @@ private void ShowCurrentStep()
 
         // Reset last tip size so tracking timer will re-position after layout settles
         _lastTipSize = default;
+        _loggedStep = -1;
+        _scrollRequestsForStep = 0;
+        _lastTargetBounds = default;
 
         // Defer positioning to after layout pass so tip has correct DesiredSize
         Dispatcher.UIThread.Post(() => PositionTipAtTarget(step), DispatcherPriority.Render);
@@ -201,23 +230,156 @@ private void ShowCurrentStep()
             tbInWindow.Height);
     }
 
+    /// <summary>读取步骤目标；多目标时高亮它们外接矩形的并集。</summary>
+    private static List<Control>? ResolveTargets(TutorialStep step)
+    {
+        var controls = new List<Control>();
+
+        if (step.FindTargets != null)
+        {
+            foreach (var control in step.FindTargets())
+            {
+                if (control != null)
+                    controls.Add(control);
+            }
+        }
+        else if (step.FindTarget?.Invoke() is { } single)
+        {
+            controls.Add(single);
+        }
+
+        return controls.Count > 0 ? controls : null;
+    }
+
+    private Rect? GetTargetsBoundsInOverlay(IReadOnlyList<Control> targets)
+    {
+        Rect? merged = null;
+        foreach (var target in targets)
+        {
+            var bounds = GetTargetBoundsInOverlay(target);
+            if (bounds == null) continue;
+            merged = merged == null ? bounds : merged.Value.Union(bounds.Value);
+        }
+
+        return merged;
+    }
+
+    private void RequestScrollIfNeeded(IReadOnlyList<Control> targets, Rect targetBounds)
+    {
+        if (_overlayRoot == null)
+            return;
+
+        var overlayBounds = new Rect(0, 0, _overlayRoot.Bounds.Width, _overlayRoot.Bounds.Height);
+        if (overlayBounds.Contains(targetBounds))
+        {
+            _scrollRequestsForStep = 0;
+            return;
+        }
+
+        if (_scrollRequestsForStep >= 20
+            || (DateTime.UtcNow - _lastScrollRequestAt).TotalMilliseconds < 300)
+        {
+            return;
+        }
+
+        _lastScrollRequestAt = DateTime.UtcNow;
+        _scrollRequestsForStep++;
+
+        foreach (var target in targets)
+        {
+            try
+            {
+                target.BringIntoView();
+            }
+            catch
+            {
+                // 控件脱离视觉树时忽略滚动请求失败。
+            }
+        }
+    }
+
+    private void ClearCutout()
+    {
+        _lastTargetBounds = default;
+        if (_arrow != null)
+            _arrow.IsVisible = false;
+        if (_overlayMask == null || _overlayRoot == null)
+            return;
+
+        var width = _overlayRoot.Bounds.Width;
+        var height = _overlayRoot.Bounds.Height;
+        if (width < 1 || height < 1)
+            return;
+
+        _overlayMask.Clip = new RectangleGeometry(new Rect(0, 0, width, height));
+    }
+
+    private void LogStepTarget(TutorialStep step, IReadOnlyList<Control> targets, Rect targetBounds, Rect cutout)
+    {
+        if (_loggedStep != _currentStep)
+        {
+            _loggedStep = _currentStep;
+            _loggedCountForStep = 0;
+        }
+
+        if (_loggedCountForStep > 0)
+        {
+            var moved = Math.Abs(cutout.X - _lastLoggedBounds.X) > 8
+                || Math.Abs(cutout.Y - _lastLoggedBounds.Y) > 8
+                || Math.Abs(cutout.Width - _lastLoggedBounds.Width) > 8
+                || Math.Abs(cutout.Height - _lastLoggedBounds.Height) > 8;
+            if (!moved || _loggedCountForStep >= 4)
+                return;
+        }
+
+        _loggedCountForStep++;
+        _lastLoggedBounds = cutout;
+
+        var targetNames = string.Join("，", targets.Select(DescribeControl));
+        var maskSize = $"{_overlayRoot?.Bounds.Width ?? 0}x{_overlayRoot?.Bounds.Height ?? 0}";
+        LoggerHelper.Debug(
+            $"[教学提示] 步骤#{_currentStep + 1} 标题={step.TitleKey}，目标={targetNames}，" +
+            $"目标矩形={targetBounds}，高亮矩形={cutout}，遮罩={maskSize}");
+    }
+
+    private static string DescribeControl(Control control)
+    {
+        var name = string.IsNullOrWhiteSpace(control.Name) ? "<未命名>" : control.Name;
+        return $"{control.GetType().Name}[{name}]";
+    }
+
     private void PositionTipAtTarget(TutorialStep step)
     {
-        var target = step.FindTarget?.Invoke();
-        if (target == null || _tipBorder == null || _overlayRoot == null || _arrow == null || _overlayMask == null)
+        var targets = ResolveTargets(step);
+        if (targets == null)
+        {
+            ClearCutout();
+            return;
+        }
+
+        if (_tipBorder == null || _overlayRoot == null || _arrow == null || _overlayMask == null)
             return;
 
         try
         {
-            var tb = GetTargetBoundsInOverlay(target);
-            if (tb == null) return;
+            var tb = GetTargetsBoundsInOverlay(targets);
+            if (tb == null)
+            {
+                ClearCutout();
+                return;
+            }
 
             var cutout = tb.Value.Inflate(step.CutoutPadding);
+            LogStepTarget(step, targets, tb.Value, cutout);
 
             var maskW = _overlayRoot.Bounds.Width;
             var maskH = _overlayRoot.Bounds.Height;
 
-            if (maskW < 1 || maskH < 1) return;
+            if (maskW < 1 || maskH < 1)
+            {
+                ClearCutout();
+                return;
+            }
 
             _lastTargetBounds = cutout;
 
@@ -482,21 +644,29 @@ private async System.Threading.Tasks.Task WaitForTarget(TutorialStep step, int m
         for (int i = 0; i < maxRetries; i++)
         {
             await System.Threading.Tasks.Task.Delay(delayMs);
-            var target = step.FindTarget?.Invoke();
-            if (target == null || target.Bounds.Width <= 1 || target.Bounds.Height <= 1)
+            var targets = ResolveTargets(step);
+            if (targets == null || targets.Any(target => target.Bounds.Width <= 1 || target.Bounds.Height <= 1))
                 continue;
 
-            // Check if target is within the visible overlay area
-            var tb = GetTargetBoundsInOverlay(target);
+            var tb = GetTargetsBoundsInOverlay(targets);
             if (tb == null || _overlayRoot == null)
-                return; // Can't determine visibility, proceed anyway
+                continue;
 
             var overlayBounds = new Rect(0, 0, _overlayRoot.Bounds.Width, _overlayRoot.Bounds.Height);
-            if (overlayBounds.Intersects(tb.Value))
-                return; // Target is visible within overlay
+            if (overlayBounds.Contains(tb.Value))
+                return;
 
-            // Target exists but is off-screen (e.g. inside a ScrollViewer), scroll it into view
-            target.BringIntoView();
+            foreach (var target in targets)
+            {
+                try
+                {
+                    target.BringIntoView();
+                }
+                catch
+                {
+                    // 控件脱离视觉树时忽略滚动请求失败。
+                }
+            }
         }
     }
 
@@ -519,10 +689,11 @@ public class TutorialStep
     public string TitleKey { get; set; } = string.Empty;
     public string DescriptionKey { get; set; } = string.Empty;
     /// <summary>
-    /// Lazy finder that re-locates the target control each time it's needed.
-    /// This avoids stale references when SukiSideMenu recreates page content.
+    /// 每次需要时重新查找目标控件，避免导航重建页面后继续使用旧引用。
     /// </summary>
     public Func<Control?>? FindTarget { get; set; }
+    /// <summary>需要同时高亮的一组控件；高亮区域取这些控件边界的并集。</summary>
+    public Func<IEnumerable<Control?>>? FindTargets { get; set; }
     public TipPlacement PreferredPlacement { get; set; } = TipPlacement.Bottom;
     /// <summary>
     /// Extra padding around the target control for the cutout highlight area.
diff --git a/MFAAvalonia/Views/Windows/AnnouncementView.axaml b/MFAAvalonia/Views/Windows/AnnouncementView.axaml
index fe73f2e6..a795556a 100644
--- a/MFAAvalonia/Views/Windows/AnnouncementView.axaml
+++ b/MFAAvalonia/Views/Windows/AnnouncementView.axaml
@@ -27,7 +27,7 @@
     <suki:SukiWindow.LogoContent>
         <Image
             Height="25"
-            Source="{x:Static helper:IconHelper.Icon}"
+            Source="{x:Static helper:IconHelper.Logo}"
             Stretch="Uniform"
             Width="25" />
     </suki:SukiWindow.LogoContent>
@@ -112,4 +112,4 @@
             </Grid>
         </Grid>
     </LayoutTransformControl>
-</suki:SukiWindow>
\ No newline at end of file
+</suki:SukiWindow>
diff --git a/MFAAvalonia/Views/Windows/ChangelogView.axaml b/MFAAvalonia/Views/Windows/ChangelogView.axaml
index 811ba5aa..5a8cf029 100644
--- a/MFAAvalonia/Views/Windows/ChangelogView.axaml
+++ b/MFAAvalonia/Views/Windows/ChangelogView.axaml
@@ -37,7 +37,7 @@
     <suki:SukiWindow.LogoContent>
         <Image
             Height="25"
-            Source="{x:Static helper:IconHelper.Icon}"
+            Source="{x:Static helper:IconHelper.Logo}"
             Stretch="Uniform"
             Width="25" />
     </suki:SukiWindow.LogoContent>
@@ -95,4 +95,4 @@
             </Grid>
         </Grid>
     </LayoutTransformControl>
-</suki:SukiWindow>
\ No newline at end of file
+</suki:SukiWindow>
diff --git a/MFAAvalonia/Views/Windows/ErrorView.axaml b/MFAAvalonia/Views/Windows/ErrorView.axaml
index 88d5d10a..ce3b6297 100644
--- a/MFAAvalonia/Views/Windows/ErrorView.axaml
+++ b/MFAAvalonia/Views/Windows/ErrorView.axaml
@@ -22,7 +22,7 @@
     <suki:SukiWindow.LogoContent>
         <Image
             Height="25"
-            Source="{x:Static helper:IconHelper.Icon}"
+            Source="{x:Static helper:IconHelper.Logo}"
             Stretch="Uniform"
             Width="25" />
     </suki:SukiWindow.LogoContent>
@@ -99,4 +99,4 @@
             </Border>
         </Grid>
     </LayoutTransformControl>
-</suki:SukiWindow>
\ No newline at end of file
+</suki:SukiWindow>
diff --git a/MFAAvalonia/Views/Windows/LicenseView.axaml b/MFAAvalonia/Views/Windows/LicenseView.axaml
index c8e3c2d9..4d8a3bed 100644
--- a/MFAAvalonia/Views/Windows/LicenseView.axaml
+++ b/MFAAvalonia/Views/Windows/LicenseView.axaml
@@ -22,7 +22,7 @@
     <suki:SukiWindow.LogoContent>
         <Image
             Height="25"
-            Source="{x:Static helper:IconHelper.Icon}"
+            Source="{x:Static helper:IconHelper.Logo}"
             Stretch="Uniform"
             Width="25" />
     </suki:SukiWindow.LogoContent>
@@ -66,4 +66,4 @@
             </Border>
         </Grid>
     </LayoutTransformControl>
-</suki:SukiWindow>
\ No newline at end of file
+</suki:SukiWindow>
diff --git a/MFAAvalonia/Views/Windows/NotificationView.axaml b/MFAAvalonia/Views/Windows/NotificationView.axaml
index e9921665..7fa0e283 100644
--- a/MFAAvalonia/Views/Windows/NotificationView.axaml
+++ b/MFAAvalonia/Views/Windows/NotificationView.axaml
@@ -66,7 +66,7 @@
                 </Grid.RowDefinitions>
                 <Image Grid.Row="1" Grid.Column="0"
                        Height="45"
-                       Source="{x:Static helper:IconHelper.Icon}"
+                       Source="{x:Static helper:IconHelper.Logo}"
                        Stretch="Uniform" VerticalAlignment="Top" Margin="0 0 10 0"
                        Width="45" />
 
diff --git a/MFAAvalonia/Views/Windows/RootView.axaml b/MFAAvalonia/Views/Windows/RootView.axaml
index 67768fe5..ffeb5991 100644
--- a/MFAAvalonia/Views/Windows/RootView.axaml
+++ b/MFAAvalonia/Views/Windows/RootView.axaml
@@ -7,6 +7,8 @@
     IsVisible="{Binding IsWindowVisible}"
     MinHeight="360"
     MinWidth="700"
+    Width="900"
+    Height="675"
     d:DesignHeight="450"
     d:DesignWidth="800" ShowTitle="False"
     mc:Ignorable="d"
@@ -174,16 +176,12 @@
                 <!--     </MultiBinding> -->
                 <!-- </TextBlock.Text> -->
             </TextBlock>
-            <TextBlock VerticalAlignment="Center" IsVisible="{calcBinding:Binding '!IsCustomTitleVisible' }"
-                       FontSize="13" Text="{markup:I18n {x:Static helper:LangKeys.AppTitle}}" IsHitTestVisible="False"
-                       FontWeight="Bold" />
-
+            <TextBlock VerticalAlignment="Center" IsVisible="{Binding IsResourceNameVisible}"
+                       IsHitTestVisible="False" FontSize="13" FontWeight="Bold"
+                       Text="{Binding ResourceName}" />
             <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" IsVisible="{Binding IsResourceNameVisible}"
-                       Foreground="{DynamicResource SukiLowText}" IsHitTestVisible="False"
-                       FontSize="13" Text="{Binding ResourceName}" />
-            <TextBlock VerticalAlignment="Center" Margin="1 0 0 0" IsVisible="{Binding IsResourceNameVisible}"
-                       Foreground="{DynamicResource SukiLowText}" IsHitTestVisible="False"
-                       FontSize="13" Text="{Binding ResourceVersion}" />
+                       IsHitTestVisible="False" FontSize="13" FontWeight="Bold"
+                       Text="{Binding ResourceVersion}" />
         </StackPanel>
     </suki:SukiWindow.NonClientAreaContent>
     <suki:SukiWindow.Title>
@@ -195,9 +193,7 @@
                     <x:Static Member="helper:LangKeys.AppTitle" />
                 </x:Arguments>
             </markup:I18nBinding>
-            <Binding Path="Version" />
             <Binding Path="ResourceName" />
-            <Binding Path="ResourceVersion" />
             <Binding Path="IsResourceNameVisible" />
         </MultiBinding>
     </suki:SukiWindow.Title>
@@ -215,7 +211,7 @@
     <suki:SukiWindow.LogoContent>
         <Image
             Height="25"
-            Source="{x:Static helper:IconHelper.Icon}"
+            Source="{x:Static helper:IconHelper.Logo}"
             Stretch="Uniform"
             Width="28" />
 
diff --git a/MFAAvalonia/Views/Windows/RootView.axaml.cs b/MFAAvalonia/Views/Windows/RootView.axaml.cs
index 384b86f0..15433fce 100644
--- a/MFAAvalonia/Views/Windows/RootView.axaml.cs
+++ b/MFAAvalonia/Views/Windows/RootView.axaml.cs
@@ -250,8 +250,18 @@ private async Task InitializeAfterLoadedAsync()
     }
 
 #pragma warning disable CS4014 // 由于此调用不会等待，因此在此调用完成之前将会继续执行当前方法。请考虑将 "await" 运算符应用于调用结果。
+    private bool _strategyCloseInProgress;
+
     protected override void OnClosing(WindowClosingEventArgs e)
     {
+        if (Instances.IsResolved<MFAAvalonia.ViewModels.Pages.CombatStrategyViewModel>() &&
+            Instances.CombatStrategyViewModel.Session.HasUnsavedChanges)
+        {
+            e.Cancel = true;
+            if (!_strategyCloseInProgress)
+                _ = ConfirmStrategyCloseAsync();
+            return;
+        }
         if (Instances.RootViewModel.IsRunning && !_exitConfirmed)
         {
             e.Cancel = true;
@@ -264,6 +274,27 @@ protected override void OnClosing(WindowClosingEventArgs e)
         base.OnClosing(e);
     }
 
+    private async Task ConfirmStrategyCloseAsync()
+    {
+        _strategyCloseInProgress = true;
+        try { if (await ConfirmStrategyLeaveAsync()) Close(); }
+        finally { _strategyCloseInProgress = false; }
+    }
+
+    private async Task<bool> ConfirmStrategyLeaveAsync()
+    {
+        if (!Instances.IsResolved<MFAAvalonia.ViewModels.Pages.CombatStrategyViewModel>() ||
+            !Instances.CombatStrategyViewModel.Session.HasUnsavedChanges) return true;
+        if (!IsVisible)
+        {
+            Show();
+            Instances.RootViewModel.IsWindowVisible = true;
+        }
+        if (WindowState == WindowState.Minimized) WindowState = WindowState.Normal;
+        Activate();
+        return await Instances.CombatStrategyView.ConfirmLeaveAsync();
+    }
+
     private async Task ConfirmExitAndShutdownAsync()
     {
         _exitConfirmationInProgress = true;
@@ -346,6 +377,7 @@ public void BeforeClosed()
 
     public async Task<bool> ConfirmExit()
     {
+        if (!await ConfirmStrategyLeaveAsync()) return false;
         if (!Instances.RootViewModel.IsRunning)
             return true;
 
diff --git a/MFAAvalonia/Views/Windows/RuntimeMissingWindow.axaml b/MFAAvalonia/Views/Windows/RuntimeMissingWindow.axaml
index 336771a4..8ecf7638 100644
--- a/MFAAvalonia/Views/Windows/RuntimeMissingWindow.axaml
+++ b/MFAAvalonia/Views/Windows/RuntimeMissingWindow.axaml
@@ -20,7 +20,7 @@
     <suki:SukiWindow.LogoContent>
         <Image
             Height="25"
-            Source="{x:Static helper:IconHelper.Icon}"
+            Source="{x:Static helper:IconHelper.Logo}"
             Stretch="Uniform"
             Width="28" />
     </suki:SukiWindow.LogoContent>
@@ -91,4 +91,4 @@
                     Cursor="Hand" />
         </StackPanel>
     </Grid>
-</suki:SukiWindow>
\ No newline at end of file
+</suki:SukiWindow>
diff --git a/MFAAvalonia/Views/Windows/TempDirWarningWindow.axaml b/MFAAvalonia/Views/Windows/TempDirWarningWindow.axaml
index 3e2f9f6e..a3d80a1e 100644
--- a/MFAAvalonia/Views/Windows/TempDirWarningWindow.axaml
+++ b/MFAAvalonia/Views/Windows/TempDirWarningWindow.axaml
@@ -20,7 +20,7 @@
     <suki:SukiWindow.LogoContent>
         <Image
             Height="25"
-            Source="{x:Static helper:IconHelper.Icon}"
+            Source="{x:Static helper:IconHelper.Logo}"
             Stretch="Uniform"
             Width="28" />
     </suki:SukiWindow.LogoContent>
diff --git a/README.md b/README.md
index 6bc2762a..bd298f0a 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ MFAAvalonia 面向资源发布后的配置与运行。开发和排查 Pipeline 
 MFAAvalonia 支持通过命令行选择实例并执行任务。实例可以使用名称或实例 ID 指定；实例 ID 可在实例标签页的右键菜单中复制。
 
 ```text
-MFAAvalonia.exe [参数]
+MaaPazugiri.exe [参数]
 ```
 
 | 参数 | 作用 |
@@ -124,21 +124,21 @@ MFAAvalonia.exe [参数]
 
 ```powershell
 # 查看帮助
-.\MFAAvalonia.exe --help
+.\MaaPazugiri.exe --help
 
 # 切换到指定实例
-.\MFAAvalonia.exe --instance "日常任务"
-.\MFAAvalonia.exe -i 1a2b3c4d
+.\MaaPazugiri.exe --instance "日常任务"
+.\MaaPazugiri.exe -i 1a2b3c4d
 
 # 自动执行指定实例
-.\MFAAvalonia.exe --autostart -i "日常任务"
+.\MaaPazugiri.exe --autostart -i "日常任务"
 
 # 执行完成后退出
-.\MFAAvalonia.exe --autostart -i 1a2b3c4d -q
+.\MaaPazugiri.exe --autostart -i 1a2b3c4d -q
 
 # 若实例正在运行，则停止后重新执行
-.\MFAAvalonia.exe --autostart -i "日常任务" --forceStart
-.\MFAAvalonia.exe --autostart -c 1a2b3c4d -f
+.\MaaPazugiri.exe --autostart -i "日常任务" --forceStart
+.\MaaPazugiri.exe --autostart -c 1a2b3c4d -f
 ```
 
 ### 参数组合规则
diff --git a/README_en.md b/README_en.md
index c61e75cc..5f5cef31 100644
--- a/README_en.md
+++ b/README_en.md
@@ -109,7 +109,7 @@ The template can also use a `PresetSettings` dictionary to override settings for
 MFAAvalonia can select instances and run tasks from the command line. An instance can be specified by name or instance ID. Copy an instance ID from the context menu of its tab.
 
 ```text
-MFAAvalonia.exe [options]
+MaaPazugiri.exe [options]
 ```
 
 | Option | Description |
@@ -124,21 +124,21 @@ MFAAvalonia.exe [options]
 
 ```powershell
 # Show help
-.\MFAAvalonia.exe --help
+.\MaaPazugiri.exe --help
 
 # Select an instance by name or ID
-.\MFAAvalonia.exe --instance "Daily Tasks"
-.\MFAAvalonia.exe -i 1a2b3c4d
+.\MaaPazugiri.exe --instance "Daily Tasks"
+.\MaaPazugiri.exe -i 1a2b3c4d
 
 # Run the selected instance automatically
-.\MFAAvalonia.exe --autostart -i "Daily Tasks"
+.\MaaPazugiri.exe --autostart -i "Daily Tasks"
 
 # Exit after the run finishes
-.\MFAAvalonia.exe --autostart -i 1a2b3c4d -q
+.\MaaPazugiri.exe --autostart -i 1a2b3c4d -q
 
 # Stop and restart the target instance if it is already running
-.\MFAAvalonia.exe --autostart -i "Daily Tasks" --forceStart
-.\MFAAvalonia.exe --autostart -c 1a2b3c4d -f
+.\MaaPazugiri.exe --autostart -i "Daily Tasks" --forceStart
+.\MaaPazugiri.exe --autostart -c 1a2b3c4d -f
 ```
 
 ### Option combinations
diff --git a/SukiUI/Controls/Settings/SettingsLayout.axaml b/SukiUI/Controls/Settings/SettingsLayout.axaml
index e13e5559..e8508f73 100644
--- a/SukiUI/Controls/Settings/SettingsLayout.axaml
+++ b/SukiUI/Controls/Settings/SettingsLayout.axaml
@@ -155,7 +155,7 @@
             <Setter Property="Background" Value="{DynamicResource SukiLightBackground}" />
         </Style>
         <Style Selector="RadioButton.MenuChipTop  TextBlock">
-            <Setter Property="FontSize" Value="14" />
+            <Setter Property="FontSize" Value="18" />
         </Style>
         <Style Selector="RadioButton.MenuChipTop:checked  TextBlock">
             <Setter Property="FontWeight" Value="{DynamicResource DefaultDemiBold}" />
@@ -173,7 +173,7 @@
             <Setter Property="Opacity" Value="1" />
         </Style>
         <Style Selector="RadioButton.MenuChipTop /template/ Border">
-            <Setter Property="TextBlock.FontSize" Value="14" />
+            <Setter Property="TextBlock.FontSize" Value="18" />
         </Style>
         <Style Selector="RadioButton.MenuChipTop:checked /template/ Border">
             <Setter Property="Transitions">
@@ -249,4 +249,4 @@
             </Setter>
         </Style>
     </UserControl.Styles>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/SukiUI/Controls/Settings/SettingsLayout.axaml.cs b/SukiUI/Controls/Settings/SettingsLayout.axaml.cs
index 7cccc9ac..0d9c5f83 100644
--- a/SukiUI/Controls/Settings/SettingsLayout.axaml.cs
+++ b/SukiUI/Controls/Settings/SettingsLayout.axaml.cs
@@ -60,6 +60,19 @@ public string Title
     private Button? _stackSummaryTopScrollRightButton;
     private Control? _stackSummaryTopContainer;
 
+    /// <summary>
+    /// 顶部分类导航横向拖动的启动阈值，单位为逻辑像素。
+    /// 位移小于该值时仍按点击处理，保证分类跳转不受影响。
+    /// </summary>
+    private const double TopSummaryDragThreshold = 4.0;
+
+    private IPointer? _topSummaryDragPointer;
+    private bool _topSummaryPointerCaptured;
+    private bool _isTopSummaryDragging;
+    private bool _suppressTopSummaryClick;
+    private Point _topSummaryDragStartPoint;
+    private double _topSummaryDragStartOffsetX;
+
     public SettingsLayout()
     {
         InitializeComponent();
@@ -133,6 +146,11 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             _stackSummaryScrollTop.PointerWheelChanged -= OnTopSummaryWheelChanged;
             _stackSummaryScrollTop.ScrollChanged -= OnTopSummaryScrollChanged;
+            _stackSummaryScrollTop.RemoveHandler(InputElement.PointerPressedEvent, OnTopSummaryPointerPressed);
+            _stackSummaryScrollTop.RemoveHandler(InputElement.PointerMovedEvent, OnTopSummaryPointerMoved);
+            _stackSummaryScrollTop.RemoveHandler(InputElement.PointerReleasedEvent, OnTopSummaryPointerReleased);
+            _stackSummaryScrollTop.RemoveHandler(InputElement.PointerCaptureLostEvent, OnTopSummaryPointerCaptureLost);
+            EndTopSummaryDrag();
         }
 
         if (_stackSummaryTopScrollLeftButton != null)
@@ -154,6 +172,15 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             _stackSummaryScrollTop.PointerWheelChanged += OnTopSummaryWheelChanged;
             _stackSummaryScrollTop.ScrollChanged += OnTopSummaryScrollChanged;
+            // 分类按钮会处理指针事件，因此需接收已处理事件，确保拖动逻辑能观察完整手势
+            _stackSummaryScrollTop.AddHandler(InputElement.PointerPressedEvent, OnTopSummaryPointerPressed,
+                Avalonia.Interactivity.RoutingStrategies.Bubble, true);
+            _stackSummaryScrollTop.AddHandler(InputElement.PointerMovedEvent, OnTopSummaryPointerMoved,
+                Avalonia.Interactivity.RoutingStrategies.Bubble, true);
+            _stackSummaryScrollTop.AddHandler(InputElement.PointerReleasedEvent, OnTopSummaryPointerReleased,
+                Avalonia.Interactivity.RoutingStrategies.Bubble, true);
+            _stackSummaryScrollTop.AddHandler(InputElement.PointerCaptureLostEvent, OnTopSummaryPointerCaptureLost,
+                Avalonia.Interactivity.RoutingStrategies.Bubble, true);
         }
 
         if (_stackSummaryTopScrollLeftButton != null)
@@ -207,7 +234,7 @@ private void UpdateItems()
             };
             var contentTop = new TextBlock
             {
-                FontSize = 14
+                FontSize = 18
             };
             header.Bind(TextBlock.TextProperty, new Binding(nameof(SettingsLayoutItem.Header))
             {
@@ -268,6 +295,12 @@ private void UpdateItems()
 
             summaryButtonTop.Click += async (sender, args) =>
             {
+                if (_suppressTopSummaryClick)
+                {
+                    _suppressTopSummaryClick = false;
+                    return;
+                }
+
                 if (isAnimatingScroll)
                     return;
                 var x = border.TranslatePoint(new Point(), stackItems);
@@ -306,6 +339,7 @@ private void UpdateItems()
                 if (stackSummaryTop.Children.Count > minIndex && stackSummaryTop.Children[minIndex] is RadioButton topRadio)
                 {
                     topRadio.IsChecked = true;
+                    topRadio.BringIntoView();
                 }
             }
         };
@@ -357,6 +391,90 @@ private void ScrollTopSummaryBy(double delta)
         UpdateTopSummaryFade();
     }
 
+    private void OnTopSummaryPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (_stackSummaryScrollTop == null)
+        {
+            return;
+        }
+
+        _suppressTopSummaryClick = false;
+        _isTopSummaryDragging = false;
+
+        if (!e.GetCurrentPoint(_stackSummaryScrollTop).Properties.IsLeftButtonPressed)
+        {
+            return;
+        }
+
+        _topSummaryDragStartPoint = e.GetPosition(_stackSummaryScrollTop);
+        _topSummaryDragStartOffsetX = _stackSummaryScrollTop.Offset.X;
+    }
+
+    private void OnTopSummaryPointerMoved(object? sender, PointerEventArgs e)
+    {
+        var scrollTop = _stackSummaryScrollTop;
+        if (scrollTop == null || !e.GetCurrentPoint(scrollTop).Properties.IsLeftButtonPressed)
+        {
+            return;
+        }
+
+        var position = e.GetPosition(scrollTop);
+        var horizontalDelta = position.X - _topSummaryDragStartPoint.X;
+
+        if (!_isTopSummaryDragging)
+        {
+            if (Math.Abs(horizontalDelta) < TopSummaryDragThreshold
+                || Math.Abs(horizontalDelta) <= Math.Abs(position.Y - _topSummaryDragStartPoint.Y)
+                || scrollTop.ScrollBarMaximum.X <= 0.5)
+            {
+                return;
+            }
+
+            _topSummaryDragPointer = e.Pointer;
+            e.Pointer.Capture(scrollTop);
+            _topSummaryPointerCaptured = e.Pointer.Captured == scrollTop;
+            _isTopSummaryDragging = true;
+            _suppressTopSummaryClick = true;
+        }
+
+        if (!_topSummaryPointerCaptured)
+        {
+            return;
+        }
+
+        var maxX = scrollTop.ScrollBarMaximum.X;
+        var nextX = Math.Clamp(_topSummaryDragStartOffsetX - horizontalDelta, 0, maxX);
+        scrollTop.Offset = scrollTop.Offset.WithX(nextX);
+        UpdateTopSummaryFade();
+        e.Handled = true;
+    }
+
+    private void OnTopSummaryPointerReleased(object? sender, PointerReleasedEventArgs e)
+    {
+        var wasDragging = _isTopSummaryDragging;
+        EndTopSummaryDrag();
+
+        if (wasDragging)
+        {
+            e.Handled = true;
+        }
+    }
+
+    private void OnTopSummaryPointerCaptureLost(object? sender, PointerCaptureLostEventArgs e)
+    {
+        _topSummaryDragPointer = null;
+        _topSummaryPointerCaptured = false;
+        _isTopSummaryDragging = false;
+    }
+
+    private void EndTopSummaryDrag()
+    {
+        _topSummaryDragPointer?.Capture(null);
+        _topSummaryDragPointer = null;
+        _topSummaryPointerCaptured = false;
+        _isTopSummaryDragging = false;
+    }
+
     private void UpdateTopSummaryFade()
     {
         if (_stackSummaryScrollTop == null || _stackSummaryTopScrollLeftButton == null || _stackSummaryTopScrollRightButton == null)
diff --git a/docs/examples/combat-strategy-v1.json b/docs/examples/combat-strategy-v1.json
new file mode 100644
index 00000000..476ab82a
--- /dev/null
+++ b/docs/examples/combat-strategy-v1.json
@@ -0,0 +1,34 @@
+{
+  "schema_version": 1,
+  "id": "11111111111111111111111111111111",
+  "name": "奥义依赖示例",
+  "initial_stage_id": "22222222222222222222222222222222",
+  "stages": [{
+    "id": "22222222222222222222222222222222",
+    "name": "全程作战",
+    "actions": {
+      "priority": ["ultimate", "bomb"],
+      "bomb_levels": [3],
+      "ultimates": [
+        {"slot": 2, "enabled": true, "condition": {
+          "type": "group", "match": "all", "children": [
+            {"type": "predicate", "metric": "ultimate_ready", "slots": [3], "slot_match": "all", "expected": true}
+          ]
+        }},
+        {"slot": 1, "enabled": true},
+        {"slot": 3, "enabled": true, "condition": {
+          "type": "group", "match": "all", "children": [
+            {"type": "predicate", "metric": "stage_normal_links", "comparison": "greater_or_equal", "value": 2},
+            {"type": "group", "match": "any", "children": [
+              {"type": "predicate", "metric": "ultimate_released", "slots": [1], "slot_match": "all", "expected": true},
+              {"type": "predicate", "metric": "ultimate_released", "slots": [2], "slot_match": "all", "expected": true}
+            ]}
+          ]
+        }}
+      ],
+      "normal_link": {"prioritize_colors": true, "long_link_threshold": 7, "color_priority": ["red", "blue", "green", "yellow"]}
+    },
+    "frenzy": {"allow_ultimates": false, "allow_bombs": false, "reserved_color": "red"},
+    "transitions": []
+  }]
+}
diff --git a/docs/superpowers/plans/2026-10-19-combat-strategy-editor.md b/docs/superpowers/plans/2026-10-19-combat-strategy-editor.md
new file mode 100644
index 00000000..7cba6901
--- /dev/null
+++ b/docs/superpowers/plans/2026-10-19-combat-strategy-editor.md
@@ -0,0 +1,42 @@
+# 作战策略编辑器实施计划
+
+目标：实现独立策略编辑页，可靠生成和重新加载 JSON。
+架构：独立 DTO、校验器、文件服务、编辑会话，阶段和递归条件控件。
+技术：.NET 10、Avalonia 11.3、SukiUI、System.Text.Json、现有 xUnit。
+设计：docs/superpowers/specs/2026-10-19-combat-strategy-editor-design.md。
+
+## 约束与检查重点
+
+中文文案注释文档；不覆盖已有 RootView.axaml 修改，不提交推送；不接战斗执行。重点覆盖嵌套条件重载、稳定标识与复制重映射、默认只读、保存失败、损坏文件、未来版本、取消离开和无效阶段引用。
+
+## 任务 1：数据契约与存储
+
+- [x] 先编写 CombatStrategyStoreTests，覆盖嵌套条件重载、引用校验、非法百分比、未来版本、默认保护和保存失败。
+- [x] 运行缺失实现测试，随后实现 Features/CombatStrategies 下 StrategyDocument.cs、StrategyJson.cs、StrategyValidator.cs、StrategyStore.cs。
+- [x] 接口为 StrategyDefaults.Create、StrategyJson.Serialize/Deserialize/Clone、StrategyValidator.Validate、StrategyStore.List/Load/Save/Delete，存储接受显式目录，测试不写真实配置。
+- [x] 运行测试并检查样例 JSON。
+
+## 任务 2：编辑会话
+
+- [x] 先写 CombatStrategyEditorTests：保存放弃取消、保存失败保留修改、阶段引用删除、复制独立与重映射。
+- [x] 实现 StrategyEditorSession.cs，管理清单、当前草稿和未保存状态，所有编辑登记 MarkDirty，TryLeaveAsync 接受提示回调。
+- [x] 运行测试。
+
+## 任务 3：界面
+
+- [x] 新建 Views/Pages/CombatStrategyView.axaml 及代码、Features/CombatStrategies/Controls 下阶段、条件和拖动控件。
+- [x] 左列表、右滚动阶段卡片、末尾加号、底部固定工具栏；默认禁用编辑。
+- [x] 阶段菜单、初始阶段、各类行动勾选排序、乱舞、跳转与递归条件全部接入真实草稿。
+- [x] 输入校验就地显示，添加控件编辑测试并构建。
+
+## 任务 4：接入与交付
+
+- [x] 注册页面，接入 RootViewContent 侧边栏与选择切换、RootView 关闭时的修改保护。
+- [x] 更新定制台账、JSON 格式示例与 MAP 总设计对应段落。
+- [x] 全量测试、桌面构建、git diff --check，独立审查并修复关键问题。
+
+## 验证
+
+dotnet test MFAAvalonia.Tests/MFAAvalonia.Tests.csproj -c Debug -r win-x64 --no-restore --nologo
+
+dotnet build MFAAvalonia.Desktop/MFAAvalonia.Desktop.csproj -c Debug -r win-x64 --no-restore --nologo
\ No newline at end of file
diff --git a/docs/superpowers/specs/2026-10-19-combat-strategy-editor-design.md b/docs/superpowers/specs/2026-10-19-combat-strategy-editor-design.md
new file mode 100644
index 00000000..1af27916
--- /dev/null
+++ b/docs/superpowers/specs/2026-10-19-combat-strategy-editor-design.md
@@ -0,0 +1,53 @@
+# 作战策略编辑器设计
+
+日期：2026-10-19。状态：用户已确认交互并授权实现。
+
+## 目标与范围
+
+客户端侧边栏新增“作战策略”，交付可编辑、校验、保存、重新加载的 JSON。先做编辑器与数据契约，后续由 MAP Python Agent 消费。本轮不开发识别、战斗执行、任务策略选择。沿用 Avalonia、SukiUI 主题，无新增运行依赖。中文文案、注释与文档；保留工作区已有标题栏改动，在当前功能分支实施，不自动提交或推送。
+
+## 页面
+
+- 左侧策略列表，支持新建、复制、重命名。内置默认策略只读、可复制。
+- 右侧没有顶部工具栏；阶段卡片纵向堆叠、可命名、拖动展示顺序、多张独立展开与折叠，不生成摘要。
+- 标题栏左键展开折叠，手柄拖动；右键菜单包括重命名、复制、删除、设为初始阶段。
+- 最后阶段下方用加号新增；底部固定保存、删除当前策略、全部展开、全部折叠。
+- 阶段数量自定，至少一个；单阶段可运行全场。初始阶段单独指定，展示顺序不决定执行顺序。
+- 阶段内配置行动、乱舞、可排序的跳转规则；跳转目标可为任意阶段，允许循环。
+- 未保存时切换策略或离页弹窗：保存并继续、放弃修改并继续、取消。保存失败留在原页并保留内容。
+
+## 行动
+
+- 奥义与炸弹可交换优先级，连线最后；普通与乱舞共用顺序。
+- 炸弹仅勾选允许的一二三级，不设各等级条件；执行端在允许且可用等级中优先三级、二级、一级，四级为自动爆炸过渡。
+- 奥义按三个位置勾选、拖动排序、设置各自前置。自身就绪内置，不开放为条件。优先级不满足则跳过，每次成功后重新识别再从头检查。
+- 示例：顺序 2、1、3；2 要求 3 就绪，1 无额外条件，3 要求本阶段 2 已释放。3 未就绪时可先放 1。
+- 普通连线可选四色优先级；存在七连候选时在达到七连的颜色中排序，否则在全部颜色中排序。同色路径交给执行算法。
+- 乱舞分别开关使用奥义、使用炸弹，开启仍受本阶段条件与勾选限制；留色开关最多选择一种颜色。
+
+## 条件与计数
+
+- 可嵌套的全部或任一条件组；叶子用下拉、数字输入编辑，布尔期望值和比较表达否定。首版没有脚本、文本表达式和整组取反。
+- 支持本场或阶段普通连线手数、敌我血量数值与百分比、其他位置奥义就绪、位置奥义已释放、当前是否乱舞。
+- 多位置状态可选全部或任一。进入阶段重置阶段手数和阶段已释放记录，本场手数保留；只统计成功普通连线。
+- 转变先于行动检查，多条命中选排序首条。执行端每次一步后确认，防止无新观察和无行动的跳转循环。
+- 未识别为未知，取反也不是成立。百分比最大血量来源待执行端实机核对。
+
+## 文件契约与实现选择
+
+- 使用统一配置目录下 strategies 文件夹，每策略一个 GUID N 格式文件名加 .json，名称在文件内；阶段和转变同样有稳定标识。
+- UTF-8、缩进、snake_case、schema_version 为 1。顶层为 schema_version、id、name、initial_stage_id、stages。
+- 阶段为 id、name、actions、frenzy、transitions；行动包含两类优先级、允许炸弹等级、按优先级排列的位置规则与普通连线颜色。乱舞包含开关与保留色。
+- 条件用 type 为 group 或 predicate 区分；组有 match 为 all 或 any 和 children；叶子有 metric、比较或期望值、阈值、位置范围。禁用任意 CLR 类型解析。
+- 默认策略一个阶段，奥义优先，三级炸弹，三个位置按 1、2、3 全启用、无额外前置，连线无颜色偏好，乱舞允许奥义炸弹且不留色，无跳转。新建采用可编辑默认配置。
+- 复制策略生成独立策略、阶段与规则标识并重映射内部目标；复制单阶段生成新标识，其他目标不变，自身目标映射副本。
+- 校验至少一个阶段、有效初始阶段与跳转目标、位置等级不重复、合法数值、百分比 0 到 100、手数为非负整数。空转变条件、空嵌套组不可保存，奥义无额外条件合法。条件保护上限 16 层。
+- 保存先校验序列化，同目录临时文件替换。失败不吞异常、不清除修改标记、不破坏旧文件。
+- 损坏文件和未来版本明确报错，不悄悄覆盖。内置默认不可覆盖删除。删除策略可确认后执行，不检查任务引用；任务找不到策略时默认回退是后续执行端契约。
+- 删除被其他阶段引用的阶段时提示来源并阻止，先修改跳转。唯一阶段不能删，初始阶段须先改指定。
+- 运行态血量、手数、释放记录不落盘；编辑折叠状态不进入战斗契约。
+- 条件在阶段内就地展开，局部编辑不重建整页。保存、放弃、取消与窗口关闭、离页都接入保护。
+
+## 验收
+
+侧边栏与策略管理可用；阶段卡片与嵌套条件完整编辑；顺序、跳转和开关保存后重载一致；默认只读、复制独立、引用删除校验、坏文件及保存失败有测试。全量单元测试、桌面构建、差异格式检查通过，未进行的实机交互明确记录。
\ No newline at end of file
diff --git "a/docs/zh/MAP\345\256\242\346\210\267\347\253\257\345\256\232\345\210\266.md" "b/docs/zh/MAP\345\256\242\346\210\267\347\253\257\345\256\232\345\210\266.md"
new file mode 100644
index 00000000..f8dcc689
--- /dev/null
+++ "b/docs/zh/MAP\345\256\242\346\210\267\347\253\257\345\256\232\345\210\266.md"
@@ -0,0 +1,56 @@
+# MAP 客户端定制记录
+
+本仓库用于 MaaPazugiri（MAP）的专属客户端，从 MaaXYZ/MFAAvalonia 建立 fork。定制保留 MFAA 的经典布局、控件与主题，业务资源和战斗策略执行由 MAP 项目维护。
+
+## 上游基线
+
+- 上游仓库：<https://github.com/MaaXYZ/MFAAvalonia>。
+- 当前基线：`450a8f3134d2b5ac3fce4fc8eeb3e745197b1717`，上游版本为 `v2.16.3-beta.1`。
+- 定制仓库：<https://github.com/NotZoruak/MFAAvalonia>。
+
+## 作战策略编辑器（2026-10-19）
+
+- 侧边栏新增“作战策略”。左侧管理策略，右侧纵向排列可命名、拖动和折叠的阶段卡片，末尾加号新增，底部固定保存、删除、全部展开与折叠。
+- 阶段标题右键可重命名、复制、删除和设为初始阶段；转变允许任意目标，以嵌套的全部或任一条件组表达。
+- 支持炸弹等级、奥义位置排序与前置、连线颜色优先级、乱舞开关与留色，手数、血量数值与百分比及奥义状态条件。
+- JSON 保存到统一配置目录的 `strategies/`，默认策略只读可复制；切换策略、离页和关闭窗口有保存、放弃、取消弹窗，保存失败保留原文件与草稿。
+- 实现位于 `Features/CombatStrategies/`、`Views/Pages/CombatStrategyView` 与对应模型，接入 `App`、`Instances`、`RootViewContent` 和窗口关闭处理。
+- 本轮只交付编辑器与文件契约，任务选择和战斗执行后续接入。详见[作战策略 JSON 格式](作战策略JSON格式.md)。
+- 控件编辑及文件重载已纳入测试；真实窗口鼠标拖动、弹窗和不同尺寸仍需交互验收。
+- 2026-10-19 全量测试 58 项通过（35 项策略测试、23 项既有本地测试），桌面构建 0 错误、6 项既有依赖告警。独立复核后修复了缺少必备配置时静默补值的问题，拖动排序也覆盖了原位、上下移动和末尾插入。
+
+## 首页布局（2026-10-17）
+
+- 左列：任务列表，占满可用高度。
+- 中列：上方任务设置，下方任务说明。
+- 右列：日志，占满可用高度。
+- 沿用上游的等宽三列和中间卡片高度比例，保留原有卡片拖拽、缩放和布局保存能力。
+- 移除首页实时视图卡片及其专用动画、可见性同步代码。首页不会因为开启实时视图开关而恢复该卡片。
+- 总控台继续使用共享的实时图像，设置页的实时视图开关和刷新率保留；截图、连接和图像刷新逻辑继续沿用上游实现。
+
+## 总控台实时画面（2026-10-17）
+
+- 实时画面卡片默认尺寸由横向的 360×240 调整为竖向的 240×420，以适配竖屏游戏画面。
+- 保留总控台现有缩放、全屏查看和卡片操作。
+
+### 涉及文件
+
+| 文件 | 定制内容 |
+| --- | --- |
+| `MFAAvalonia/Views/Pages/TaskQueueView.axaml` | 移除首页实时视图，日志默认从第 0 行覆盖全部 8 行；保留其他卡片和工具栏 |
+| `MFAAvalonia/Views/Pages/TaskQueueView.axaml.cs` | 移除首页对实时视图开关的可见性同步 |
+| `docs/zh/自定义布局.md` | 将默认布局示例更新为 MAP 的四卡片布局 |
+
+### 布局配置与升级核对
+
+`mfa_layout.json` 和用户保存的布局继续按上游规则加载。本次修改客户端默认布局，并在 MAP 业务仓库增加 `resource/base/mfa_layout.json`，配套提供日志覆盖右侧整列的四卡片布局。资源布局首次加载或内容哈希变化时，会按上游规则应用到配置；之后继续保存用户的拖拽和缩放结果。更新上游时同时核对首页卡片、总控台共享图像、实时视图设置及布局加载规则。
+
+### 构建核对
+
+```powershell
+dotnet build MFAAvalonia.Desktop/MFAAvalonia.Desktop.csproj -c Debug -r win-x64 --no-restore --nologo
+```
+
+2026-10-17 执行上述命令，构建退出码为 0，0 个错误、23 个上游既有警告（包含依赖安全告警）。客户端差异通过 `git diff --check`。
+
+完整交互仍需在实际客户端中核对，包括任务切换、卡片拖拽和缩放、总控台实时图像，以及设置开关启闭后首页与总控台的表现。
diff --git "a/docs/zh/\344\275\234\346\210\230\347\255\226\347\225\245JSON\346\240\274\345\274\217.md" "b/docs/zh/\344\275\234\346\210\230\347\255\226\347\225\245JSON\346\240\274\345\274\217.md"
new file mode 100644
index 00000000..3aaa7008
--- /dev/null
+++ "b/docs/zh/\344\275\234\346\210\230\347\255\226\347\225\245JSON\346\240\274\345\274\217.md"
@@ -0,0 +1,67 @@
+# 作战策略 JSON 格式
+
+格式版本为 1。客户端已实现编辑、校验、保存和重载；任务选择与 MAP Python 战斗端后续接入。
+
+## 文件与标识
+
+每份自定义策略保存到统一配置目录的 `strategies/`，当前对应安装目录下的 `config/strategies/<策略标识>.json`。使用 UTF-8、缩进与 snake_case。策略、阶段和转变标识均为 32 字符的 GUID N 格式。
+
+名称仅用于显示，重命名和展示排序不改变引用。内置标识 `default` 由客户端生成，不占用户文件，不可覆盖删除。完整数据见[奥义依赖示例](../examples/combat-strategy-v1.json)，测试会实际解析该文件。
+
+## 顶层与阶段
+
+| 字段 | 含义 |
+| --- | --- |
+| `schema_version` | 固定为 `1`，其他版本拒绝加载 |
+| `id` | 稳定标识，必须与文件名一致 |
+| `name` | 非空用户名称 |
+| `initial_stage_id` | 初始阶段标识 |
+| `stages` | 至少一个阶段，数组顺序仅用于展示 |
+
+阶段包含 `id`、`name`、`actions`、`frenzy`、`transitions`。初始阶段和转变目标必须存在，标识不重复。
+
+## 行动与乱舞
+
+`actions.priority` 是恰好包含 `ultimate` 和 `bomb` 的有序数组，连线隐含最后。普通操作与乱舞共用顺序。
+
+- `bomb_levels`：允许的一二三级，可为空，不重复；执行端按可用等级从高到低选择。
+- `ultimates`：包含三个位置的有序规则，每条为 `slot`、`enabled`、可选 `condition`。位置为 1、2、3，自身就绪内置检查，额外条件不满足则检查后面的位置。
+- `normal_link.prioritize_colors`：颜色优先级开关。
+- `normal_link.color_priority`：`red`、`blue`、`green`、`yellow` 的完整排列。
+- `normal_link.long_link_threshold`：版本 1 固定为 `7`；有达标候选时仅在达标颜色中排序，否则在全部候选中排序。
+
+`frenzy.allow_ultimates`、`allow_bombs` 为额外许可，开启后仍受本阶段勾选、顺序和条件限制。`reserved_color` 省略表示不留色，有值时仅一种颜色。
+
+## 条件树
+
+根节点为条件组。`type: group` 包含 `match: all/any` 与 `children`；`type: predicate` 为叶子。可递归嵌套，上限 16 层。奥义条件可省略，空根组表示无额外限制；转变组和嵌套组不可为空。
+
+| `metric` | 数据含义 | 其他字段 |
+| --- | --- | --- |
+| `battle_normal_links` | 本场成功普通连线手数 | `comparison`、`value` |
+| `stage_normal_links` | 本次进入阶段后的成功普通连线手数 | `comparison`、`value` |
+| `enemy_hp`、`ally_hp` | 敌我血量数值 | `comparison`、`value` |
+| `enemy_hp_percent`、`ally_hp_percent` | 敌我血量百分比，0 至 100 | `comparison`、`value` |
+| `ultimate_ready` | 指定位置是否就绪 | `slots`、`slot_match`、`expected` |
+| `ultimate_released` | 指定位置在当前阶段是否已释放 | `slots`、`slot_match`、`expected` |
+| `frenzy_active` | 是否处于乱舞 | `expected` |
+
+比较为 `greater_or_equal`、`less_or_equal`、`greater`、`less`、`equal`、`not_equal`。数值非负，手数为整数。
+
+`slots` 至少一个位置且不重复，`slot_match` 为 `all/any`。先逐位置与 `expected` 比较，再合并；`any` 加 `expected: false` 表示至少一个位置未达到该状态。自身就绪不得写入本位置的奥义前置。
+
+未知数据取反仍是未知，不能因此满足。血量百分比须有可靠的当前与最大血量。
+
+## 转变与运行记录
+
+`transitions` 每条为 `id`、`target_stage_id`、非空条件组 `condition`。按数组顺序检查，取第一条满足的转变，再检查目标阶段行动。任意现有阶段都可为目标。
+
+执行端须防止没有新观察或行动的转变循环；每次执行一步并确认新状态后重判。只计成功普通连线，炸弹、奥义、乱舞连线不计。进入阶段时重置阶段手数和阶段已释放记录，本场手数保留。运行记录与编辑折叠状态不落盘。
+
+## 保存与兼容
+
+保存先校验，在同目录写临时文件再替换。失败保留原文件与草稿。坏 JSON、未知字段、缺少必备配置、无效条件和未来版本明确诊断，不悄悄覆盖。阶段的行动、乱舞、转变清单以及行动内的许可与排序必须显式提供，不能靠缺字段补成默认策略。
+
+复制策略生成新标识并重映射内部阶段目标；复制单阶段生成新标识，其他目标保留，自身目标映射副本。
+
+删除策略不查任务引用；后续任务找不到目标时用默认策略。损坏文件和不兼容版本另行报错。运行任务使用启动快照，之后保存下次启动生效。
diff --git "a/docs/zh/\350\207\252\345\256\232\344\271\211\345\270\203\345\261\200.md" "b/docs/zh/\350\207\252\345\256\232\344\271\211\345\270\203\345\261\200.md"
index 94c54704..60b089f8 100644
--- "a/docs/zh/\350\207\252\345\256\232\344\271\211\345\270\203\345\261\200.md"
+++ "b/docs/zh/\350\207\252\345\256\232\344\271\211\345\270\203\345\261\200.md"
@@ -53,6 +53,8 @@ MFA 会在程序目录下的 `resource` 文件夹中**递归查找**第一个 `m
 
 以下为当前默认布局（`TaskQueueView`）的参考 JSON：
 
+MAP 专属客户端首页采用三列四张卡片：左侧任务列表，中间任务设置与任务说明，右侧整列日志。首页不提供实时视图卡片；设置中的实时视图开关与刷新率仍供侧边栏总控台使用。
+
 ```json
 {
   "rows": 8,
@@ -76,16 +78,10 @@ MFA 会在程序目录下的 `resource` 文件夹中**递归查找**第一个 `m
     "row_span": 3,
     "col_span": 4
   },
-  "live_view": {
-    "row": 0,
-    "col": 8,
-    "row_span": 4,
-    "col_span": 4
-  },
   "log": {
-    "row": 4,
+    "row": 0,
     "col": 8,
-    "row_span": 4,
+    "row_span": 8,
     "col_span": 4
   }
 }
@@ -127,4 +123,4 @@ MFA 会在程序目录下的 `resource` 文件夹中**递归查找**第一个 `m
   1. 先在 `mfa_layout.json` 中调整 `rows` / `columns`
   2. 进入 UI 后按需要拖拽/缩放调整布局
   3. 删除 `mfa_layout.json`
-  4. 重新进入界面后会自动生成一份新的布局文件
\ No newline at end of file
+  4. 重新进入界面后会自动生成一份新的布局文件