拆分本地修复调试报告开关

C4AL · C4AL · commit e91004baa92f · 2026-05-14T23:11:52.000+08:00
新增 EnableLocalRepairDebugReport 设置并持久化。
设置页调试开关改为只控制本地修复失败报告。
修复失败报告生成改用独立开关，不再联动 WebView 调试工具。
更新配置、修复模式和导航壳测试。
diff --git a/src/CodexCliPlus.App/MainWindow.EventHandlers.cs b/src/CodexCliPlus.App/MainWindow.EventHandlers.cs
@@ -450,51 +450,37 @@ private async void SettingsFollowSystemCheckBox_Changed(object sender, RoutedEve
         await SetShellThemeAsync(explicitTheme);
     }
 
-    private async void SettingsDebugToolsCheckBox_Changed(object sender, RoutedEventArgs e)
+    private async void SettingsLocalRepairDebugReportCheckBox_Changed(object sender, RoutedEventArgs e)
     {
-        if (_suppressDebugToolsChange)
+        if (_suppressLocalRepairDebugReportChange)
         {
             return;
         }
 
-        var enabled = SettingsDebugToolsCheckBox.IsChecked == true;
-        if (_settings.EnableDebugTools == enabled)
+        var enabled = SettingsLocalRepairDebugReportCheckBox.IsChecked == true;
+        if (_settings.EnableLocalRepairDebugReport == enabled)
         {
             return;
         }
 
-        var previous = _settings.EnableDebugTools;
-        _settings.EnableDebugTools = enabled;
-        ApplyDebugToolsSettings();
+        var previous = _settings.EnableLocalRepairDebugReport;
+        _settings.EnableLocalRepairDebugReport = enabled;
 
         try
         {
             await _appConfigurationService.SaveAsync(_settings);
-            _notificationService.ShowAuto("调试设置已更新。");
+            _notificationService.ShowAuto("修复调试报告设置已更新。");
         }
         catch (Exception exception)
         {
-            _settings.EnableDebugTools = previous;
-            ApplyDebugToolsSettings();
-            _suppressDebugToolsChange = true;
-            SettingsDebugToolsCheckBox.IsChecked = previous;
-            _suppressDebugToolsChange = false;
-            _notificationService.ShowManual("调试设置保存失败", exception.Message);
+            _settings.EnableLocalRepairDebugReport = previous;
+            _suppressLocalRepairDebugReportChange = true;
+            SettingsLocalRepairDebugReportCheckBox.IsChecked = previous;
+            _suppressLocalRepairDebugReportChange = false;
+            _notificationService.ShowManual("修复调试报告设置保存失败", exception.Message);
         }
     }
 
-    private void ApplyDebugToolsSettings()
-    {
-        if (!_webViewConfigured || ManagementWebView.CoreWebView2 is null)
-        {
-            return;
-        }
-
-        var enabled = _settings.EnableDebugTools;
-        ManagementWebView.CoreWebView2.Settings.AreDevToolsEnabled = enabled;
-        ManagementWebView.CoreWebView2.Settings.AreDefaultContextMenusEnabled = enabled;
-    }
-
     private void SettingsOpenMainRepoButton_Click(object sender, RoutedEventArgs e)
     {
         OpenExternal("https://github.com/router-for-me/CLIProxyAPI");
diff --git a/src/CodexCliPlus.App/MainWindow.ShellSettingsPresentation.cs b/src/CodexCliPlus.App/MainWindow.ShellSettingsPresentation.cs
@@ -273,9 +273,9 @@ CancellationToken cancellationToken
     private void UpdateSettingsOverlayBaseline()
     {
         UpdateShellThemePresentation(CreateShellThemeSnapshot(_settings.ThemeMode, 0));
-        _suppressDebugToolsChange = true;
-        SettingsDebugToolsCheckBox.IsChecked = _settings.EnableDebugTools;
-        _suppressDebugToolsChange = false;
+        _suppressLocalRepairDebugReportChange = true;
+        SettingsLocalRepairDebugReportCheckBox.IsChecked = _settings.EnableLocalRepairDebugReport;
+        _suppressLocalRepairDebugReportChange = false;
         SetSettingsUpdateStatus($"当前版本 {CurrentApplicationVersion}");
     }
 
diff --git a/src/CodexCliPlus.App/MainWindow.WebViewHost.cs b/src/CodexCliPlus.App/MainWindow.WebViewHost.cs
@@ -1243,7 +1243,7 @@ private LocalDependencyRepairResult AttachLocalDependencyRepairDebugReportIfNeed
         LocalDependencyRepairProgress? lastProgress
     )
     {
-        if (result.Succeeded || !_settings.EnableDebugTools)
+        if (result.Succeeded || !_settings.EnableLocalRepairDebugReport)
         {
             return result;
         }
diff --git a/src/CodexCliPlus.App/MainWindow.xaml b/src/CodexCliPlus.App/MainWindow.xaml
@@ -1418,19 +1418,19 @@
                     Foreground="{DynamicResource PrimaryTextBrush}"
                   />
                   <TextBlock
-                    Text="修复失败时在桌面生成可交给 Codex 的诊断报告，并启用内置网页调试工具。"
+                    Text="修复失败时在桌面生成可交给 Codex 的诊断报告和修复指南。"
                     Margin="0,10,0,12"
                     FontSize="13"
                     Foreground="{DynamicResource SecondaryTextBrush}"
                     TextWrapping="Wrap"
                   />
                   <CheckBox
-                    x:Name="SettingsDebugToolsCheckBox"
+                    x:Name="SettingsLocalRepairDebugReportCheckBox"
                     VerticalAlignment="Center"
-                    Checked="SettingsDebugToolsCheckBox_Changed"
-                    Unchecked="SettingsDebugToolsCheckBox_Changed"
-                    AutomationProperties.AutomationId="SettingsDebugToolsCheckBox"
-                    Content="启用调试模式"
+                    Checked="SettingsLocalRepairDebugReportCheckBox_Changed"
+                    Unchecked="SettingsLocalRepairDebugReportCheckBox_Changed"
+                    AutomationProperties.AutomationId="SettingsLocalRepairDebugReportCheckBox"
+                    Content="启用修复调试报告"
                   />
                 </StackPanel>
               </Border>
diff --git a/src/CodexCliPlus.App/MainWindow.xaml.cs b/src/CodexCliPlus.App/MainWindow.xaml.cs
@@ -162,7 +162,7 @@ WindowState WindowState
     private bool _isInitializing;
     private bool _webViewConfigured;
     private bool _settingsOverlayOpen;
-    private bool _suppressDebugToolsChange;
+    private bool _suppressLocalRepairDebugReportChange;
     private bool _isShellBrandDockClosing;
     private bool _isAuthenticationCompactWindowMode;
     private bool _initialPresentationRevealed;
diff --git a/src/CodexCliPlus.Core/Models/AppSettings.cs b/src/CodexCliPlus.Core/Models/AppSettings.cs
@@ -33,6 +33,8 @@ public sealed class AppSettings
 
     public bool EnableDebugTools { get; set; }
 
+    public bool EnableLocalRepairDebugReport { get; set; }
+
     public string? LastRepositoryPath { get; set; }
 
     public bool SecurityKeyOnboardingCompleted { get; set; }
diff --git a/src/CodexCliPlus.Infrastructure/Configuration/JsonAppConfigurationService.cs b/src/CodexCliPlus.Infrastructure/Configuration/JsonAppConfigurationService.cs
@@ -333,6 +333,8 @@ private sealed class PersistedAppSettings
 
         public bool EnableDebugTools { get; init; }
 
+        public bool EnableLocalRepairDebugReport { get; init; }
+
         public string? LastRepositoryPath { get; init; }
 
         public bool? SecurityKeyOnboardingCompleted { get; init; }
@@ -361,6 +363,7 @@ public AppSettings ToModel()
                 ThemeMode = ThemeMode,
                 MinimumLogLevel = MinimumLogLevel,
                 EnableDebugTools = EnableDebugTools,
+                EnableLocalRepairDebugReport = EnableLocalRepairDebugReport,
                 LastRepositoryPath = LastRepositoryPath,
                 SecurityKeyOnboardingCompleted = SecurityKeyOnboardingCompleted ?? true,
                 LastSeenApplicationVersion = string.IsNullOrWhiteSpace(LastSeenApplicationVersion)
@@ -411,6 +414,7 @@ public static PersistedAppSettings FromModel(AppSettings settings)
                 ThemeMode = settings.ThemeMode,
                 MinimumLogLevel = settings.MinimumLogLevel,
                 EnableDebugTools = settings.EnableDebugTools,
+                EnableLocalRepairDebugReport = settings.EnableLocalRepairDebugReport,
                 LastRepositoryPath = settings.LastRepositoryPath,
                 SecurityKeyOnboardingCompleted = settings.SecurityKeyOnboardingCompleted,
                 LastSeenApplicationVersion = string.IsNullOrWhiteSpace(
diff --git a/tests/CodexCliPlus.Tests/AppRepairModeTests.cs b/tests/CodexCliPlus.Tests/AppRepairModeTests.cs
@@ -121,7 +121,7 @@ public void DesktopRepairRequestCatchesRepairFlowFailuresAndPostsResult()
             source,
             StringComparison.Ordinal
         );
-        Assert.Contains("_settings.EnableDebugTools", source, StringComparison.Ordinal);
+        Assert.Contains("_settings.EnableLocalRepairDebugReport", source, StringComparison.Ordinal);
         Assert.Contains("DebugReportPath", source, StringComparison.Ordinal);
         Assert.Contains(
             "_changeBroadcastService.Broadcast(\"local-environment\")",
diff --git a/tests/CodexCliPlus.Tests/Configuration/JsonDesktopConfigurationServiceTests.cs b/tests/CodexCliPlus.Tests/Configuration/JsonDesktopConfigurationServiceTests.cs
@@ -32,6 +32,7 @@ public async Task SaveAndLoadAsyncStoresManagementKeyOutsideDesktopJson()
             ThemeMode = AppThemeMode.Dark,
             MinimumLogLevel = AppLogLevel.Warning,
             EnableDebugTools = true,
+            EnableLocalRepairDebugReport = true,
             LastRepositoryPath = @"C:\repo",
             SecurityKeyOnboardingCompleted = true,
             LastSeenApplicationVersion = "1.2.3",
@@ -50,6 +51,7 @@ public async Task SaveAndLoadAsyncStoresManagementKeyOutsideDesktopJson()
         Assert.Equal(AppThemeMode.Dark, actual.ThemeMode);
         Assert.Equal(AppLogLevel.Warning, actual.MinimumLogLevel);
         Assert.True(actual.EnableDebugTools);
+        Assert.True(actual.EnableLocalRepairDebugReport);
         Assert.Equal(@"C:\repo", actual.LastRepositoryPath);
         Assert.True(actual.SecurityKeyOnboardingCompleted);
         Assert.Equal("1.2.3", actual.LastSeenApplicationVersion);
@@ -59,6 +61,7 @@ public async Task SaveAndLoadAsyncStoresManagementKeyOutsideDesktopJson()
         Assert.Contains("managementKeyReference", persistedJson, StringComparison.Ordinal);
         Assert.Contains("\"rememberPassword\": true", persistedJson, StringComparison.Ordinal);
         Assert.Contains("\"autoLogin\": false", persistedJson, StringComparison.Ordinal);
+        Assert.Contains("\"enableLocalRepairDebugReport\": true", persistedJson, StringComparison.Ordinal);
         Assert.DoesNotContain("rememberManagementKey", persistedJson, StringComparison.Ordinal);
         Assert.Contains(
             "\"securityKeyOnboardingCompleted\": true",
@@ -133,6 +136,7 @@ public async Task SaveAndLoadAsyncPreservesShellAndUpdatePreferences()
             ThemeMode = AppThemeMode.White,
             MinimumLogLevel = AppLogLevel.Error,
             EnableDebugTools = true,
+            EnableLocalRepairDebugReport = true,
         };
 
         await service.SaveAsync(expected);
@@ -146,6 +150,7 @@ public async Task SaveAndLoadAsyncPreservesShellAndUpdatePreferences()
         Assert.Equal(AppThemeMode.White, actual.ThemeMode);
         Assert.Equal(AppLogLevel.Error, actual.MinimumLogLevel);
         Assert.True(actual.EnableDebugTools);
+        Assert.True(actual.EnableLocalRepairDebugReport);
     }
 
     [Fact]
diff --git a/tests/CodexCliPlus.Tests/UI/NavigationShellTests.cs b/tests/CodexCliPlus.Tests/UI/NavigationShellTests.cs
@@ -527,19 +527,23 @@ public void MainWindowHostsSingleWebViewAndTrayMenuContract()
         );
         Assert.DoesNotContain("SettingsWindow_Deactivated", hostSource, StringComparison.Ordinal);
         Assert.Contains("x:Name=\"SettingsFollowSystemCheckBox\"", xaml, StringComparison.Ordinal);
-        Assert.Contains("x:Name=\"SettingsDebugToolsCheckBox\"", xaml, StringComparison.Ordinal);
-        Assert.Contains("Content=\"启用调试模式\"", xaml, StringComparison.Ordinal);
         Assert.Contains(
-            "SettingsDebugToolsCheckBox.IsChecked = _settings.EnableDebugTools",
+            "x:Name=\"SettingsLocalRepairDebugReportCheckBox\"",
+            xaml,
+            StringComparison.Ordinal
+        );
+        Assert.Contains("Content=\"启用修复调试报告\"", xaml, StringComparison.Ordinal);
+        Assert.Contains(
+            "SettingsLocalRepairDebugReportCheckBox.IsChecked = _settings.EnableLocalRepairDebugReport",
             hostSource,
             StringComparison.Ordinal
         );
         Assert.Contains(
-            "_settings.EnableDebugTools = enabled",
+            "_settings.EnableLocalRepairDebugReport = enabled",
             hostSource,
             StringComparison.Ordinal
         );
-        Assert.Contains("ApplyDebugToolsSettings", hostSource, StringComparison.Ordinal);
+        Assert.DoesNotContain("ApplyDebugToolsSettings", hostSource, StringComparison.Ordinal);
         Assert.Contains("CornerRadius=\"18,18,0,0\"", xaml, StringComparison.Ordinal);
         Assert.DoesNotContain(
             "x:Name=\"SettingsOverlayCloseButton\"",

Original file line number	Diff line number	Diff line change
`@@ -450,51 +450,37 @@ private async void SettingsFollowSystemCheckBox_Changed(object sender, RoutedEve`
`450`	`450`	`await SetShellThemeAsync(explicitTheme);`
`451`	`451`	`}`
`452`	`452`
`453`		`- private async void SettingsDebugToolsCheckBox_Changed(object sender, RoutedEventArgs e)`
	`453`	`+ private async void SettingsLocalRepairDebugReportCheckBox_Changed(object sender, RoutedEventArgs e)`
`454`	`454`	`{`
`455`		`- if (_suppressDebugToolsChange)`
	`455`	`+ if (_suppressLocalRepairDebugReportChange)`
`456`	`456`	`{`
`457`	`457`	`return;`
`458`	`458`	`}`
`459`	`459`
`460`		`- var enabled = SettingsDebugToolsCheckBox.IsChecked == true;`
`461`		`- if (_settings.EnableDebugTools == enabled)`
	`460`	`+ var enabled = SettingsLocalRepairDebugReportCheckBox.IsChecked == true;`
	`461`	`+ if (_settings.EnableLocalRepairDebugReport == enabled)`
`462`	`462`	`{`
`463`	`463`	`return;`
`464`	`464`	`}`
`465`	`465`
`466`		`- var previous = _settings.EnableDebugTools;`
`467`		`- _settings.EnableDebugTools = enabled;`
`468`		`- ApplyDebugToolsSettings();`
	`466`	`+ var previous = _settings.EnableLocalRepairDebugReport;`
	`467`	`+ _settings.EnableLocalRepairDebugReport = enabled;`
`469`	`468`
`470`	`469`	`try`
`471`	`470`	`{`
`472`	`471`	`await _appConfigurationService.SaveAsync(_settings);`
`473`		`- _notificationService.ShowAuto("调试设置已更新。");`
	`472`	`+ _notificationService.ShowAuto("修复调试报告设置已更新。");`
`474`	`473`	`}`
`475`	`474`	`catch (Exception exception)`
`476`	`475`	`{`
`477`		`- _settings.EnableDebugTools = previous;`
`478`		`- ApplyDebugToolsSettings();`
`479`		`- _suppressDebugToolsChange = true;`
`480`		`- SettingsDebugToolsCheckBox.IsChecked = previous;`
`481`		`- _suppressDebugToolsChange = false;`
`482`		`- _notificationService.ShowManual("调试设置保存失败", exception.Message);`
	`476`	`+ _settings.EnableLocalRepairDebugReport = previous;`
	`477`	`+ _suppressLocalRepairDebugReportChange = true;`
	`478`	`+ SettingsLocalRepairDebugReportCheckBox.IsChecked = previous;`
	`479`	`+ _suppressLocalRepairDebugReportChange = false;`
	`480`	`+ _notificationService.ShowManual("修复调试报告设置保存失败", exception.Message);`
`483`	`481`	`}`
`484`	`482`	`}`
`485`	`483`
`486`		`- private void ApplyDebugToolsSettings()`
`487`		`- {`
`488`		`- if (!_webViewConfigured \|\| ManagementWebView.CoreWebView2 is null)`
`489`		`- {`
`490`		`- return;`
`491`		`- }`
`492`		`-`
`493`		`- var enabled = _settings.EnableDebugTools;`
`494`		`- ManagementWebView.CoreWebView2.Settings.AreDevToolsEnabled = enabled;`
`495`		`- ManagementWebView.CoreWebView2.Settings.AreDefaultContextMenusEnabled = enabled;`
`496`		`- }`
`497`		`-`
`498`	`484`	`private void SettingsOpenMainRepoButton_Click(object sender, RoutedEventArgs e)`
`499`	`485`	`{`
`500`	`486`	`OpenExternal("https://github.com/router-for-me/CLIProxyAPI");`
Original file line number	Diff line number	Diff line change
`@@ -273,9 +273,9 @@ CancellationToken cancellationToken`
`273`	`273`	`private void UpdateSettingsOverlayBaseline()`
`274`	`274`	`{`
`275`	`275`	`UpdateShellThemePresentation(CreateShellThemeSnapshot(_settings.ThemeMode, 0));`
`276`		`- _suppressDebugToolsChange = true;`
`277`		`- SettingsDebugToolsCheckBox.IsChecked = _settings.EnableDebugTools;`
`278`		`- _suppressDebugToolsChange = false;`
	`276`	`+ _suppressLocalRepairDebugReportChange = true;`
	`277`	`+ SettingsLocalRepairDebugReportCheckBox.IsChecked = _settings.EnableLocalRepairDebugReport;`
	`278`	`+ _suppressLocalRepairDebugReportChange = false;`
`279`	`279`	`SetSettingsUpdateStatus($"当前版本 {CurrentApplicationVersion}");`
`280`	`280`	`}`
`281`	`281`
Original file line number	Diff line number	Diff line change
`@@ -1243,7 +1243,7 @@ private LocalDependencyRepairResult AttachLocalDependencyRepairDebugReportIfNeed`
`1243`	`1243`	`LocalDependencyRepairProgress? lastProgress`
`1244`	`1244`	`)`
`1245`	`1245`	`{`
`1246`		`- if (result.Succeeded \|\| !_settings.EnableDebugTools)`
	`1246`	`+ if (result.Succeeded \|\| !_settings.EnableLocalRepairDebugReport)`
`1247`	`1247`	`{`
`1248`	`1248`	`return result;`
`1249`	`1249`	`}`