From d92320154f753946e64fd0d24cff9a637e7acc1b Mon Sep 17 00:00:00 2001
From: Pro-Qin <102397304+Pro-Qin@users.noreply.github.com>
Date: Sat, 7 Nov 2026 15:32:22 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix(quickdraw):=20=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=8C=BA=E5=AE=BD=E5=BA=A6=E5=A1=AB=E6=BB=A1=E5=B9=B6=E5=9C=A8?=
 =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E5=B0=BA=E5=AF=B8=E5=8F=98=E5=8C=96=E5=90=8E?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

闪抽窗口用 SizeToContent 随结果自适应大小，名字长短不同会让整组结果偏移：
结果区原先以自然宽度居中，窗口变宽后位置不再重算，视觉上就是"抽到不同人时窗口乱跳"。

- QuickDrawPage.axaml: ScrollViewer/ItemsControl 改为宽度填满，仅 WrapPanel 居中；
  单张结果卡 MaxWidth=360 且 DisplayText 允许换行，避免超长姓名撑爆布局
- QuickDrawPage.axaml.cs: 排版完成后触发 ResultLayoutChanged，把居中时机交给宿主
- App.axaml.cs: SizeChanged 用 e.NewSize 重算位置（Bounds 滞后于触发本次布局的尺寸），
  新增 _positioningQuickDrawWindow 防重入、位置相同则不写 Position，
  并移除 PositionChanged -> 重新居中的反馈环

结果：无论抽到几个字的名字，窗口都在屏幕中央且不再抖动。
---
 SecRandom/App.axaml.cs                        | 92 +++++++++++++------
 SecRandom/Views/MainPages/QuickDrawPage.axaml |  8 +-
 .../Views/MainPages/QuickDrawPage.axaml.cs    | 15 +++
 3 files changed, 87 insertions(+), 28 deletions(-)

diff --git a/SecRandom/App.axaml.cs b/SecRandom/App.axaml.cs
index 36abc616..2290a330 100644
--- a/SecRandom/App.axaml.cs
+++ b/SecRandom/App.axaml.cs
@@ -140,6 +140,7 @@ public partial class App : Application
     private static FloatingWindow? _floatingWindow;
     private static Window? _quickDrawWindow;
     private static NotificationChannelSettings? _quickDrawNotificationSettings;
+    private static bool _positioningQuickDrawWindow;
     private static MainWindow? _mainWindow;
     private static MainWindow? _settingsWindow;
     private static Task? _runtimeServicesStartupTask;
@@ -2672,9 +2673,10 @@ private static Window GetOrCreateQuickDrawWindow()
         if (_quickDrawWindow is { IsLoaded: true })
             return _quickDrawWindow;
 
+        var quickDrawPage = IAppHost.GetService<QuickDrawPage>();
         _quickDrawWindow = new Window
         {
-            Content = IAppHost.GetService<QuickDrawPage>(),
+            Content = quickDrawPage,
             Title = @"SecRandom",
             MinWidth = 280,
             MinHeight = 160,
@@ -2689,41 +2691,73 @@ private static Window GetOrCreateQuickDrawWindow()
             Background = Brushes.Transparent,
             TransparencyLevelHint = [WindowTransparencyLevel.Transparent]
         };
-        _quickDrawWindow.Loaded += (_, _) =>
+        // 结果卡片随名字长短变化时窗口会自适应缩放；每次尺寸变化都必须按新尺寸重新居中，
+        // 否则窗口以左上角为锚点扩张，视觉中心就会漂移——这正是"名字长短不一画面就跑偏"的根因。
+        EventHandler resultLayoutChanged = (_, _) => RequestQuickDrawWindowCentering(_quickDrawWindow);
+        quickDrawPage.ResultLayoutChanged += resultLayoutChanged;
+        _quickDrawWindow.Opened += (_, _) =>
         {
-            _quickDrawWindow.Width = 280;
+            ApplyQuickDrawWindowBounds(_quickDrawWindow);
+            RequestQuickDrawWindowCentering(_quickDrawWindow);
         };
-        _quickDrawWindow.Opened += (_, _) =>
+        _quickDrawWindow.SizeChanged += (_, e) => RepositionQuickDrawWindow(_quickDrawWindow, e.NewSize);
+        _quickDrawWindow.ScalingChanged += (_, _) =>
         {
             ApplyQuickDrawWindowBounds(_quickDrawWindow);
-            Dispatcher.UIThread.Post(
-                () => PositionOrCenterQuickDrawWindow(_quickDrawWindow),
-                DispatcherPriority.Render);
+            RequestQuickDrawWindowCentering(_quickDrawWindow);
         };
-        _quickDrawWindow.SizeChanged += (_, _) => Dispatcher.UIThread.Post(
-            () => PositionOrCenterQuickDrawWindow(_quickDrawWindow),
-            DispatcherPriority.Render);
-        _quickDrawWindow.PositionChanged += (_, _) => ApplyQuickDrawWindowBounds(_quickDrawWindow);
-        _quickDrawWindow.ScalingChanged += (_, _) => ApplyQuickDrawWindowBounds(_quickDrawWindow);
         _quickDrawWindow.Closed += (_, _) =>
         {
+            quickDrawPage.ResultLayoutChanged -= resultLayoutChanged;
             _quickDrawWindow = null;
             _quickDrawNotificationSettings = null;
         };
         return _quickDrawWindow;
     }
 
-    private static void PositionOrCenterQuickDrawWindow(Window? window)
+    /// <summary>
+    /// 结果区布局稳定后请求一次居中：窗口尺寸在动画/换行过程中会分几步落定，
+    /// 单靠 SizeChanged 可能在最后一帧之后还有一次排版变化，因此在 Loaded 优先级补一次。
+    /// </summary>
+    private static void RequestQuickDrawWindowCentering(Window? window)
     {
-        if (_quickDrawNotificationSettings is { } settings)
-            PositionQuickDrawNotificationWindow(window, settings);
-        else
-            CenterQuickDrawWindow(window);
+        if (window is null)
+            return;
+
+        Dispatcher.UIThread.Post(
+            () =>
+            {
+                if (!ReferenceEquals(window, _quickDrawWindow))
+                    return;
+
+                RepositionQuickDrawWindow(window, window.Bounds.Size);
+            },
+            DispatcherPriority.Loaded);
+    }
+
+    private static void RepositionQuickDrawWindow(Window? window, Size logicalSize)
+    {
+        if (window is null || _positioningQuickDrawWindow)
+            return;
+
+        try
+        {
+            _positioningQuickDrawWindow = true;
+            if (_quickDrawNotificationSettings is { } settings)
+                PositionQuickDrawNotificationWindow(window, settings, logicalSize);
+            else
+                CenterQuickDrawWindow(window, logicalSize);
+        }
+        finally
+        {
+            _positioningQuickDrawWindow = false;
+        }
     }
 
     private static void PositionQuickDrawNotificationWindow(
         Window? window,
-        NotificationChannelSettings settings)
+        NotificationChannelSettings settings,
+        Size? logicalSize = null)
     {
         if (window is null)
             return;
@@ -2747,8 +2781,9 @@ private static void PositionQuickDrawNotificationWindow(
             return;
 
         var scale = window.RenderScaling;
-        var width = (int)Math.Round(window.Bounds.Width * scale);
-        var height = (int)Math.Round(window.Bounds.Height * scale);
+        var size = logicalSize ?? window.Bounds.Size;
+        var width = (int)Math.Round(size.Width * scale);
+        var height = (int)Math.Round(size.Height * scale);
         if (width <= 0 || height <= 0)
             return;
 
@@ -2767,9 +2802,11 @@ private static void PositionQuickDrawNotificationWindow(
             3 or 4 => area.Center.Y - height / 2,
             _ => area.Center.Y - height / 2
         };
-        window.Position = new PixelPoint(
+        var target = new PixelPoint(
             Math.Clamp(x + settings.HorizontalOffset, area.X, Math.Max(area.X, area.Right - width)),
             Math.Clamp(y + settings.VerticalOffset, area.Y, Math.Max(area.Y, area.Bottom - height)));
+        if (window.Position != target)
+            window.Position = target;
     }
 
     private static void ApplyQuickDrawWindowBounds(Window? window)
@@ -2787,25 +2824,28 @@ private static void ApplyQuickDrawWindowBounds(Window? window)
         window.MaxHeight = Math.Max(window.MinHeight, screen.WorkingArea.Height / scale - edgePadding);
     }
 
-    private static void CenterQuickDrawWindow(Window? window)
+    private static void CenterQuickDrawWindow(Window? window, Size? logicalSize = null)
     {
         if (window is null)
             return;
 
-        var screen = window.Screens.ScreenFromWindow(window);
+        var screen = window.Screens.ScreenFromWindow(window) ?? window.Screens.Primary;
         if (screen is null)
             return;
 
         var scale = window.RenderScaling;
-        var width = (int)Math.Round(window.Bounds.Width * scale);
-        var height = (int)Math.Round(window.Bounds.Height * scale);
+        var size = logicalSize ?? window.Bounds.Size;
+        var width = (int)Math.Round(size.Width * scale);
+        var height = (int)Math.Round(size.Height * scale);
         if (width <= 0 || height <= 0)
             return;
 
         var area = screen.WorkingArea;
-        window.Position = new PixelPoint(
+        var target = new PixelPoint(
             area.X + (area.Width - width) / 2,
             area.Y + (area.Height - height) / 2);
+        if (window.Position != target)
+            window.Position = target;
     }
 
     #endregion
diff --git a/SecRandom/Views/MainPages/QuickDrawPage.axaml b/SecRandom/Views/MainPages/QuickDrawPage.axaml
index 818c9608..a94d10fb 100644
--- a/SecRandom/Views/MainPages/QuickDrawPage.axaml
+++ b/SecRandom/Views/MainPages/QuickDrawPage.axaml
@@ -56,11 +56,13 @@
                 <ScrollViewer IsVisible="{Binding IsResultVisible}"
                               HorizontalScrollBarVisibility="Disabled"
                               VerticalScrollBarVisibility="Auto"
-                              HorizontalContentAlignment="Center"
+                              HorizontalContentAlignment="Stretch"
                               VerticalContentAlignment="Center">
+                    <!-- 结果区必须一直占满窗口宽度：名字长短只影响单个卡片的宽度，
+                         整组由 WrapPanel 的 Center 居中，短名字不会缩到左边、长名字也不会把整组顶偏。 -->
                     <ItemsControl x:Name="ResultPresenter"
                                   ItemsSource="{Binding ResultItems}"
-                                  HorizontalAlignment="Center"
+                                  HorizontalAlignment="Stretch"
                                   VerticalAlignment="Center">
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
@@ -70,6 +72,7 @@
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="vm:QuickDrawResultItem">
                                 <Border Classes="result-animation-item" Margin="4" Padding="14 10" MinWidth="128"
+                                        MaxWidth="360"
                                         CornerRadius="8" BorderThickness="1"
                                         BorderBrush="{Binding AccentBrush}"
                                         Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
@@ -84,6 +87,7 @@
                                         <StackPanel Spacing="4" HorizontalAlignment="Center" VerticalAlignment="Center">
                                             <TextBlock Text="{Binding DisplayText}"
                                                        TextAlignment="Center"
+                                                       TextWrapping="Wrap"
                                                        Foreground="{Binding TextBrush}"
                                                        FontSize="{Binding #QuickDraw.ViewModel.ResultFontSize}"
                                                        FontFamily="{Binding #QuickDraw.ViewModel.ResultFontFamily}"
diff --git a/SecRandom/Views/MainPages/QuickDrawPage.axaml.cs b/SecRandom/Views/MainPages/QuickDrawPage.axaml.cs
index 9f2a1b4f..8e559748 100644
--- a/SecRandom/Views/MainPages/QuickDrawPage.axaml.cs
+++ b/SecRandom/Views/MainPages/QuickDrawPage.axaml.cs
@@ -43,6 +43,12 @@ public QuickDrawPage()
 
     public QuickDrawPageViewModel ViewModel { get; }
 
+    /// <summary>
+    /// 结果区完成一次排版（预览/揭晓/通知）后触发，宿主窗口据此按最新尺寸重新居中。
+    /// 事件本身不含尺寸：窗口尺寸由宿主读取，避免页面耦合窗口实现。
+    /// </summary>
+    public event EventHandler? ResultLayoutChanged;
+
     public void StartDraw()
     {
         if (ViewModel.StartDrawCommand.CanExecute(null))
@@ -200,6 +206,15 @@ await DrawAnimationHelper.RevealAsync(
         catch
         {
         }
+        finally
+        {
+            RaiseResultLayoutChanged();
+        }
+    }
+
+    private void RaiseResultLayoutChanged()
+    {
+        ResultLayoutChanged?.Invoke(this, EventArgs.Empty);
     }
 
     private Task<bool> TryPresentAsync(DrawPresentationPhase phase)

From a629ed559745ae146ef6c8c827d96327c261cac9 Mon Sep 17 00:00:00 2001
From: Pro-Qin <102397304+Pro-Qin@users.noreply.github.com>
Date: Sat, 7 Nov 2026 15:32:38 +0800
Subject: [PATCH 2/9] =?UTF-8?q?feat(floating-window):=20=E6=82=AC=E6=B5=AE?=
 =?UTF-8?q?=E7=AA=97=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E6=96=87?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

桌面上的悬浮窗除了按钮没有任何可编辑内容，老师想挂一句"本节实验课，先交报告"
只能贴便利贴。新增一条横幅文字，位于按钮面板上方。

- FloatingWindowSettingsConfig: EnableFloatingWindowText / FloatingWindowText，默认关闭
- FloatingWindow.axaml: CustomTextBlock 作为 ExpandedContent 首元素，IsHitTestVisible=False，
  因此不占用按钮命中区域、不参与按钮面板的宽度计算
- ApplyCustomText: 换行折叠为空格并 Trim；字号随 FloatingWindowSize 缩放并 clamp 到 11-20；
  MaxWidth clamp 到面板宽度，长文本以 CharacterEllipsis 省略而不是把窗口撑宽
- 收纳为 docked 手柄时随 ExpandedContent 一起隐藏，32px 手柄不会被文字挤压
- 设置页 个性化 -> 悬浮窗 新增 S_Display_CustomText 分组（TextBox MaxLength=120 + 开关），
  中英日三语资源同步；修改后复用既有 live-apply 链路立即生效
---
 .../FloatingWindowSettingsConfig.cs           |  3 ++
 .../FloatingWindow/Resources.Designer.cs      | 18 ++++++++++
 .../FloatingWindow/Resources.en-US.resx       |  2 +-
 .../FloatingWindow/Resources.ja-JP.resx       |  2 +-
 .../FloatingWindow/Resources.resx             |  6 ++++
 SecRandom/Views/FloatingWindow.axaml          | 11 ++++++
 SecRandom/Views/FloatingWindow.axaml.cs       | 34 ++++++++++++++++++-
 .../FloatingWindowSettingsPage.axaml          | 17 ++++++++++
 8 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/SecRandom.Core/Models/SubConfigs/FloatingWindowSettingsConfig.cs b/SecRandom.Core/Models/SubConfigs/FloatingWindowSettingsConfig.cs
index f0df4945..0c28b1b4 100644
--- a/SecRandom.Core/Models/SubConfigs/FloatingWindowSettingsConfig.cs
+++ b/SecRandom.Core/Models/SubConfigs/FloatingWindowSettingsConfig.cs
@@ -22,6 +22,9 @@ public partial class FloatingWindowSettingsConfig : ObservableObject
     [ObservableProperty] private int _dockedWindowSize = 32;
     [ObservableProperty] private bool _draggable = true;
     [ObservableProperty] private int _floatingWindowSize = 56;
+    // 悬浮窗自定义文字：默认关闭；空字符串等于不显示，旧配置缺字段时按默认值加载
+    [ObservableProperty] private bool _enableFloatingWindowText;
+    [ObservableProperty] private string _floatingWindowText = string.Empty;
     [ObservableProperty] private int _longPressDuration = 500;
     [ObservableProperty] private bool _doNotStealFocus = true;
     [ObservableProperty] private bool _hideOnForeground = false;
diff --git a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.Designer.cs b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.Designer.cs
index 0b3ef1aa..b4c280a4 100644
--- a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.Designer.cs
+++ b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.Designer.cs
@@ -634,5 +634,23 @@ public static string O_StickDisplay_Arrow {
                 return ResourceManager.GetString("O_StickDisplay_Arrow", resourceCulture);
             }
         }
+
+        /// <summary>
+        ///   Looks up a localized string similar to 自定义文字.
+        /// </summary>
+        public static string S_Display_CustomText {
+            get {
+                return ResourceManager.GetString("S_Display_CustomText", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to 在悬浮窗按钮上方显示一行自定义文字，过长时自动省略.
+        /// </summary>
+        public static string S_Display_CustomText_D {
+            get {
+                return ResourceManager.GetString("S_Display_CustomText_D", resourceCulture);
+            }
+        }
     }
 }
diff --git a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.en-US.resx b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.en-US.resx
index 42194658..f67dd719 100644
--- a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.en-US.resx
+++ b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.en-US.resx
@@ -51,5 +51,5 @@
   <data name="S_Interaction_StickToEdgeDisplayStyle"><value>Collapsed handle style</value></data>
   <data name="S_Interaction_StickToEdgeDisplayStyle_D"><value>Choose a roll-call icon, the word “Draw,” or a direction arrow for the edge handle</value></data>
   <data name="S_Dock"><value>Edge Collapse</value></data><data name="S_Dock_Size"><value>Handle size</value></data><data name="S_Dock_Size_D"><value>Adjust the square side length of the edge handle</value></data>
-  <data name="O_StickDisplay_Icon"><value>Icon</value></data><data name="O_StickDisplay_Text"><value>Text</value></data><data name="O_StickDisplay_Arrow"><value>Arrow</value></data>
+  <data name="O_StickDisplay_Icon"><value>Icon</value></data><data name="O_StickDisplay_Text"><value>Text</value></data><data name="O_StickDisplay_Arrow"><value>Arrow</value></data><data name="S_Display_CustomText"><value>Custom text</value></data><data name="S_Display_CustomText_D"><value>Show one line of custom text above the floating buttons, long text is trimmed to fit (120 characters max)</value></data>
 </root>
diff --git a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.ja-JP.resx b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.ja-JP.resx
index 64722778..9fa6b950 100644
--- a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.ja-JP.resx
+++ b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.ja-JP.resx
@@ -3,5 +3,5 @@
   <data name="Page_Title"><value>フローティングウィンドウ</value></data><data name="S_Display"><value>ウィンドウ表示</value></data><data name="S_Display_StartupDisplay"><value>起動時に表示</value></data><data name="S_Display_StartupDisplay_D"><value>起動後にフローティングウィンドウを自動で開きます</value></data><data name="S_Display_Opacity"><value>不透明度</value></data><data name="S_Display_Opacity_D"><value>メインとクイック抽選の両方に適用します</value></data><data name="S_Display_TopmostMode"><value>最前面表示モード</value></data><data name="S_Display_TopmostMode_D"><value>他のウィンドウより前に表示するか選択します</value></data><data name="S_Display_TopmostMode_Windows_D"><value>フローティングウィンドウの最前面方法を選択します、UIAccess は再起動時に管理者権限を要求し、取り消しまたは失敗した場合は今回の起動で通常の最前面表示を使用します</value></data><data name="O_TopmostMode_None"><value>最前面にしない</value></data><data name="O_TopmostMode_Topmost"><value>最前面</value></data><data name="O_TopmostMode_UIAccess"><value>UIAccess 最前面</value></data>
   <data name="S_Buttons"><value>フローティング操作</value></data><data name="S_Buttons_RollCall"><value>点呼</value></data><data name="S_Buttons_RollCall_D"><value>点呼の入口を表示します</value></data><data name="S_Buttons_QuickDraw"><value>クイック抽選</value></data><data name="S_Buttons_QuickDraw_D"><value>クイック抽選の入口を表示します</value></data><data name="S_Buttons_Lottery"><value>抽選</value></data><data name="S_Buttons_Lottery_D"><value>抽選の入口を表示します</value></data><data name="S_Buttons_Timer"><value>タイマー</value></data>
   <data name="S_Interaction"><value>移動と端への吸着</value></data><data name="S_Interaction_StickToEdge"><value>端に吸着</value></data><data name="S_Interaction_StickToEdge_D"><value>ドラッグ終了時に現在の画面の左右どちらか近い端へ吸着します</value></data><data name="S_Interaction_Draggable"><value>ドラッグ可能</value></data><data name="S_Interaction_Draggable_D"><value>無効にすると本体とハンドルをドラッグできません</value></data><data name="S_Interaction_DoNotStealFocus"><value>フォーカスを奪わない</value></data><data name="S_Interaction_DoNotStealFocus_D"><value>クリック時に現在のウィンドウからフォーカスを奪わないようにします</value></data><data name="S_Interaction_HideOnForegroundProcessNames_D"><value>セミコロン ; で区切り、プロセス名が一致したら非表示にします（例: WeChat.exe）</value></data><data name="S_Interaction_LongPressDuration"><value>長押し判定時間</value></data><data name="S_Interaction_HideOnForegroundProcessNames"><value>前面プロセス名</value></data><data name="S_Interaction_HideOnForeground_D"><value>前面ウィンドウのタイトルまたはプロセス名が一致したら自動で非表示にします</value></data><data name="S_Interaction_StickToEdgeRecoverSeconds"><value>自動収納までの遅延</value></data><data name="S_Interaction_LongPressDuration_D"><value>長押し操作に必要なミリ秒数</value></data><data name="S_Interaction_HideOnForeground"><value>前面ウィンドウで非表示</value></data><data name="S_Interaction_StickToEdgeRecoverSeconds_D"><value>吸着後に収納するまでの秒数で、0 で展開したままにします</value></data><data name="S_Interaction_HideOnForegroundWindowTitles_D"><value>セミコロン ; で区切り、タイトルに一致する文字があれば非表示にします</value></data><data name="S_Interaction_HideOnForegroundWindowTitles"><value>前面ウィンドウタイトル</value></data>
-  <data name="S_Buttons_EnabledItems"><value>表示する操作</value></data><data name="S_Buttons_EnabledItems_D"><value>メインウィンドウに表示する機能を選択します</value></data><data name="S_Buttons_Placement"><value>操作の配置</value></data><data name="S_Buttons_Placement_D"><value>矩形は2列、縦と横は1列で配置します</value></data><data name="O_Placement_Rectangle"><value>矩形</value></data><data name="O_Placement_Vertical"><value>縦</value></data><data name="O_Placement_Horizontal"><value>横</value></data><data name="S_Buttons_DisplayStyle"><value>表示形式</value></data><data name="S_Buttons_DisplayStyle_D"><value>アイコン、文字、または両方を選択します</value></data><data name="O_DisplayStyle_IconText"><value>アイコンと文字</value></data><data name="O_DisplayStyle_Icon"><value>アイコンのみ</value></data><data name="O_DisplayStyle_Text"><value>文字のみ</value></data><data name="S_Buttons_Size"><value>操作のサイズ</value></data><data name="S_Buttons_Size_D"><value>各操作の正方形サイズを調整します</value></data><data name="O_Size_XXS"><value>極小</value></data><data name="O_Size_XS"><value>とても小さい</value></data><data name="O_Size_S"><value>小</value></data><data name="O_Size_M"><value>中</value></data><data name="O_Size_L"><value>大</value></data><data name="O_Size_XL"><value>とても大きい</value></data><data name="O_Size_XXL"><value>極大</value></data><data name="S_Interaction_StickToEdgeDisplayStyle"><value>収納ハンドルの表示</value></data><data name="S_Interaction_StickToEdgeDisplayStyle_D"><value>点呼アイコン、「抽選」の文字、または矢印を選択します</value></data><data name="S_Dock"><value>端への収納</value></data><data name="S_Dock_Size"><value>ハンドルサイズ</value></data><data name="S_Dock_Size_D"><value>収納ハンドルの正方形サイズを調整します</value></data><data name="O_StickDisplay_Icon"><value>アイコン</value></data><data name="O_StickDisplay_Text"><value>文字</value></data><data name="O_StickDisplay_Arrow"><value>矢印</value></data>
+  <data name="S_Buttons_EnabledItems"><value>表示する操作</value></data><data name="S_Buttons_EnabledItems_D"><value>メインウィンドウに表示する機能を選択します</value></data><data name="S_Buttons_Placement"><value>操作の配置</value></data><data name="S_Buttons_Placement_D"><value>矩形は2列、縦と横は1列で配置します</value></data><data name="O_Placement_Rectangle"><value>矩形</value></data><data name="O_Placement_Vertical"><value>縦</value></data><data name="O_Placement_Horizontal"><value>横</value></data><data name="S_Buttons_DisplayStyle"><value>表示形式</value></data><data name="S_Buttons_DisplayStyle_D"><value>アイコン、文字、または両方を選択します</value></data><data name="O_DisplayStyle_IconText"><value>アイコンと文字</value></data><data name="O_DisplayStyle_Icon"><value>アイコンのみ</value></data><data name="O_DisplayStyle_Text"><value>文字のみ</value></data><data name="S_Buttons_Size"><value>操作のサイズ</value></data><data name="S_Buttons_Size_D"><value>各操作の正方形サイズを調整します</value></data><data name="O_Size_XXS"><value>極小</value></data><data name="O_Size_XS"><value>とても小さい</value></data><data name="O_Size_S"><value>小</value></data><data name="O_Size_M"><value>中</value></data><data name="O_Size_L"><value>大</value></data><data name="O_Size_XL"><value>とても大きい</value></data><data name="O_Size_XXL"><value>極大</value></data><data name="S_Interaction_StickToEdgeDisplayStyle"><value>収納ハンドルの表示</value></data><data name="S_Interaction_StickToEdgeDisplayStyle_D"><value>点呼アイコン、「抽選」の文字、または矢印を選択します</value></data><data name="S_Dock"><value>端への収納</value></data><data name="S_Dock_Size"><value>ハンドルサイズ</value></data><data name="S_Dock_Size_D"><value>収納ハンドルの正方形サイズを調整します</value></data><data name="O_StickDisplay_Icon"><value>アイコン</value></data><data name="O_StickDisplay_Text"><value>文字</value></data><data name="O_StickDisplay_Arrow"><value>矢印</value></data><data name="S_Display_CustomText"><value>カスタムテキスト</value></data><data name="S_Display_CustomText_D"><value>フローティングウィンドウのボタン上に 1 行のカスタムテキストを表示し、長い場合は省略します（最大 120 文字）</value></data>
 </root>
diff --git a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.resx b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.resx
index f3251725..3927f453 100644
--- a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.resx
+++ b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.resx
@@ -213,4 +213,10 @@
   <data name="O_StickDisplay_Arrow" xml:space="preserve">
     <value>箭头</value>
   </data>
+  <data name="S_Display_CustomText" xml:space="preserve">
+    <value>自定义文字</value>
+  </data>
+  <data name="S_Display_CustomText_D" xml:space="preserve">
+    <value>在悬浮窗按钮上方显示一行自定义文字，过长时自动省略（最多 120 字）</value>
+  </data>
 </root>
diff --git a/SecRandom/Views/FloatingWindow.axaml b/SecRandom/Views/FloatingWindow.axaml
index bb954678..d0e5090f 100644
--- a/SecRandom/Views/FloatingWindow.axaml
+++ b/SecRandom/Views/FloatingWindow.axaml
@@ -30,6 +30,17 @@
 
         <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Margin="4">
             <StackPanel x:Name="ExpandedContent">
+                <!-- 自定义文字：位于按钮上方，不参与命中测试，随 ExpandedContent 一起收纳隐藏 -->
+                <TextBlock x:Name="CustomTextBlock"
+                           IsVisible="False"
+                           IsHitTestVisible="False"
+                           TextTrimming="CharacterEllipsis"
+                           TextWrapping="NoWrap"
+                           TextAlignment="Center"
+                           HorizontalAlignment="Center"
+                           FontSize="12"
+                           Margin="2 0 2 4"
+                           Foreground="{DynamicResource TextFillColorPrimaryBrush}" />
                 <WrapPanel x:Name="ButtonsPanel" HorizontalAlignment="Center" />
             </StackPanel>
             <Button x:Name="DockButton" IsVisible="False" Click="DockButton_OnClick" />
diff --git a/SecRandom/Views/FloatingWindow.axaml.cs b/SecRandom/Views/FloatingWindow.axaml.cs
index 566e7137..bbdcf1a7 100644
--- a/SecRandom/Views/FloatingWindow.axaml.cs
+++ b/SecRandom/Views/FloatingWindow.axaml.cs
@@ -168,6 +168,7 @@ private void ApplyWindowSettings(FloatingWindowSettingsConfig settings)
             ? Orientation.Vertical
             : Orientation.Horizontal;
         ButtonsPanel.Width = double.NaN;
+        ApplyCustomText(settings, 0);
 
         if (!settings.StickToEdge && _isDocked)
             RestoreFromDock();
@@ -357,6 +358,7 @@ private void UpdateButtonsPanelWidth(FloatingWindowSettingsConfig settings)
         if (buttons.Length == 0)
         {
             ButtonsPanel.Width = double.NaN;
+            ApplyCustomText(settings, 0);
             return;
         }
 
@@ -364,9 +366,39 @@ private void UpdateButtonsPanelWidth(FloatingWindowSettingsConfig settings)
         foreach (var button in buttons)
             button.Width = buttonWidth;
 
+        var rowCount = settings.FloatingWindowPlacement switch
+        {
+            0 => Math.Min(2, buttons.Length),
+            2 => buttons.Length,
+            _ => 1
+        };
         ButtonsPanel.Width = settings.FloatingWindowPlacement == 0
-            ? (buttonWidth + buttons[0].Margin.Left + buttons[0].Margin.Right) * Math.Min(2, buttons.Length)
+            ? (buttonWidth + buttons[0].Margin.Left + buttons[0].Margin.Right) * rowCount
             : double.NaN;
+
+        ApplyCustomText(settings, buttonWidth * rowCount);
+    }
+
+    // 自定义文字是按钮上方的一行横幅：换行折叠成空格，超长按字符省略；字号随控件尺寸缩放，
+    // 宽度以按钮面板为上限，避免长文本把悬浮窗撑开。收纳态下 ExpandedContent 隐藏，文字随之隐藏。
+    private void ApplyCustomText(FloatingWindowSettingsConfig settings, double contentWidth)
+    {
+        var text = (settings.FloatingWindowText ?? string.Empty)
+            .Replace("\r\n", " ")
+            .Replace('\r', ' ')
+            .Replace('\n', ' ')
+            .Trim();
+        var show = settings.EnableFloatingWindowText && text.Length > 0;
+        CustomTextBlock.IsVisible = show;
+        if (!show)
+        {
+            CustomTextBlock.Text = string.Empty;
+            return;
+        }
+
+        CustomTextBlock.Text = text;
+        CustomTextBlock.FontSize = Math.Clamp(settings.FloatingWindowSize * 0.25, 11, 20);
+        CustomTextBlock.MaxWidth = Math.Clamp(contentWidth > 1 ? contentWidth : 160, 120, 360);
     }
 
     private static double GetButtonWidth(int size, string label, int displayStyle, Thickness padding)
diff --git a/SecRandom/Views/SettingsPages/Personalized/FloatingWindowSettingsPage.axaml b/SecRandom/Views/SettingsPages/Personalized/FloatingWindowSettingsPage.axaml
index 182c24d4..5402bc60 100644
--- a/SecRandom/Views/SettingsPages/Personalized/FloatingWindowSettingsPage.axaml
+++ b/SecRandom/Views/SettingsPages/Personalized/FloatingWindowSettingsPage.axaml
@@ -51,6 +51,23 @@
                 </fa:FASettingsExpander.Footer>
             </fa:FASettingsExpander>
 
+            <fa:FASettingsExpander x:Name="S_Display_CustomText"
+                                   Header="{x:Static lsp:Resources.S_Display_CustomText}"
+                                   Description="{x:Static lsp:Resources.S_Display_CustomText_D}"
+                                   IconSource="{sr:FluentIconSource {sr:Fi TextFontFilled}}">
+                <fa:FASettingsExpander.Footer>
+                    <Grid ColumnDefinitions="260,Auto" ColumnSpacing="12">
+                        <TextBox Text="{Binding Settings.FloatingWindowText}"
+                                 IsEnabled="{Binding Settings.EnableFloatingWindowText}"
+                                 MaxLength="120"
+                                 AcceptsReturn="False"
+                                 TextWrapping="NoWrap" />
+                        <ToggleSwitch Grid.Column="1"
+                                      IsChecked="{Binding Settings.EnableFloatingWindowText}" />
+                    </Grid>
+                </fa:FASettingsExpander.Footer>
+            </fa:FASettingsExpander>
+
             <Separator Margin="0 12 0 4" />
             <sr:IconText x:Name="S_Buttons"
                          Text="{x:Static lsp:Resources.S_Buttons}"

From e66033efeaf582a02864040a12c422d6b01ea17a Mon Sep 17 00:00:00 2001
From: Pro-Qin <102397304+Pro-Qin@users.noreply.github.com>
Date: Sat, 7 Nov 2026 15:32:41 +0800
Subject: [PATCH 3/9] =?UTF-8?q?fix(linkage):=20=E8=AF=BE=E9=97=B4=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E6=8B=A6=E6=88=AA=E6=97=B6=E7=BB=99=E5=87=BA=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

开启"课间/放学禁用"但关闭"抽取前校验"时，LinkageDrawCoordinator 的硬拦截分支
直接 return false：按钮点了没反应，用户只会以为程序卡死。

- 硬拦截分支改为先弹一条节流 toast 说明当前处于上课时间，再拒绝
- 新增 ClassTimeDrawRestrictionNotice：复用通知服务，同一条提示 5 秒内只弹一次，
  避免连点按钮刷屏；无快照时回退到通用文案
- 远程 draw.trigger 走的 EvaluateGate 保持静默（拒绝原因写在回执里），
  教室机不会被对话框淹没
- 中英日三语补充 M_ClassTimeDrawBlocked / M_ClassTimeDrawBlockedGeneric
---
 .../Linkage/Resources.en-US.resx              |  6 +-
 .../Linkage/Resources.ja-JP.resx              |  6 +-
 .../SettingsPages/Linkage/Resources.resx      |  6 +-
 .../Linkage/ClassTimeDrawRestrictionNotice.cs | 73 +++++++++++++++++++
 .../Services/Linkage/CourseLinkageService.cs  |  7 ++
 .../Linkage/LinkageDrawCoordinator.cs         |  5 ++
 6 files changed, 97 insertions(+), 6 deletions(-)
 create mode 100644 SecRandom/Services/Linkage/ClassTimeDrawRestrictionNotice.cs

diff --git a/SecRandom/Langs/SettingsPages/Linkage/Resources.en-US.resx b/SecRandom/Langs/SettingsPages/Linkage/Resources.en-US.resx
index b959fe0d..eae12f3d 100644
--- a/SecRandom/Langs/SettingsPages/Linkage/Resources.en-US.resx
+++ b/SecRandom/Langs/SettingsPages/Linkage/Resources.en-US.resx
@@ -10,13 +10,13 @@
     <value>Allow verified continuation</value>
   </data>
   <data name="S_External_VerificationRequired_D">
-    <value>When off-class restrictions are enabled, allow temporary drawing or reset after configured security verification; otherwise block directly</value>
+    <value>When off-class restrictions are enabled, allow temporary drawing or reset after configured security verification; when disabled, breaks are blocked outright with a notice</value>
   </data>
   <data name="S_External_InstantDrawDisable">
     <value>Restrict off-class operations</value>
   </data>
   <data name="S_External_InstantDrawDisable_D">
-    <value>Restrict drawing and reset when course data confirms a break or non-class period; disable for no restriction</value>
+    <value>Block drawing and reset in roll-call, quick draw and lottery while the course source confirms a break or after-class period; an unavailable or unknown source is not blocked; turn off for no restriction</value>
   </data>
   <data name="S_External_DataSource">
     <value>Data source</value>
@@ -123,6 +123,8 @@
   <data name="S_ClassTime_PreClassEnableTime_D">
     <value>Enable operations this many seconds before class</value>
   </data>
+  <data name="M_ClassTimeDrawBlocked"><value>Drawing is blocked during breaks and after class; the next class “{0}” starts in {1} minutes</value></data>
+  <data name="M_ClassTimeDrawBlockedGeneric"><value>Drawing is blocked during breaks and after class</value></data>
   <data name="M_CsesSummary"><value>{0} classes, from {1:HH:mm} to {2:HH:mm}</value></data>
   <data name="M_CsesErrorEmpty"><value>The CSES timetable file is empty</value></data>
   <data name="M_CsesErrorRoot"><value>The CSES timetable file root must be an object</value></data>
diff --git a/SecRandom/Langs/SettingsPages/Linkage/Resources.ja-JP.resx b/SecRandom/Langs/SettingsPages/Linkage/Resources.ja-JP.resx
index d7c08696..cf8740b5 100644
--- a/SecRandom/Langs/SettingsPages/Linkage/Resources.ja-JP.resx
+++ b/SecRandom/Langs/SettingsPages/Linkage/Resources.ja-JP.resx
@@ -10,13 +10,13 @@
     <value>認証後の続行を許可</value>
   </data>
   <data name="S_External_VerificationRequired_D">
-    <value>授業外制限が有効な場合、設定したセキュリティ認証後に一時的な抽選やリセットを許可します</value>
+    <value>授業外制限が有効な場合、設定したセキュリティ認証後に一時的な抽選やリセットを許可します（オフの場合は休み時間を直接阻止して通知を表示します）</value>
   </data>
   <data name="S_External_InstantDrawDisable">
     <value>授業外の操作を制限</value>
   </data>
   <data name="S_External_InstantDrawDisable_D">
-    <value>休み時間や授業外と確認された場合に抽選とリセットを制限します</value>
+    <value>データソースが休み時間や下校後と確認している間は点名・即時抽選・抽選の開始とリセットを禁止します（データソースが切断または状態不明の場合は制限しません／オフにすると制限しません）</value>
   </data>
   <data name="S_External_DataSource">
     <value>データソース</value>
@@ -123,6 +123,8 @@
   <data name="S_ClassTime_PreClassEnableTime_D">
     <value>授業の何秒前に制限を解除するか指定します</value>
   </data>
+  <data name="M_ClassTimeDrawBlocked"><value>休み時間または下校後のため抽選できません。次の「{0}」まであと {1} 分です</value></data>
+  <data name="M_ClassTimeDrawBlockedGeneric"><value>休み時間または下校後のため抽選できません</value></data>
   <data name="M_CsesSummary"><value>授業は {0} 件（{1:HH:mm}～{2:HH:mm}）です</value></data>
   <data name="M_CsesErrorEmpty"><value>CSES 時間割ファイルが空です</value></data>
   <data name="M_CsesErrorRoot"><value>CSES 時間割ファイルのルートはオブジェクトである必要があります</value></data>
diff --git a/SecRandom/Langs/SettingsPages/Linkage/Resources.resx b/SecRandom/Langs/SettingsPages/Linkage/Resources.resx
index 2acaa5e5..3a220f46 100644
--- a/SecRandom/Langs/SettingsPages/Linkage/Resources.resx
+++ b/SecRandom/Langs/SettingsPages/Linkage/Resources.resx
@@ -25,13 +25,13 @@
     <value>允许验证后继续</value>
   </data>
   <data name="S_External_VerificationRequired_D" xml:space="preserve">
-    <value>仅在已启用非上课时段限制时生效；开启后，通过已配置的安全验证可以临时继续抽取或重置；关闭后将直接阻止</value>
+    <value>仅在已启用非上课时段限制时生效；开启后，通过已配置的安全验证可以临时继续抽取或重置；关闭后课间直接阻止并给出提示</value>
   </data>
   <data name="S_External_InstantDrawDisable" xml:space="preserve">
     <value>限制非上课时段操作</value>
   </data>
   <data name="S_External_InstantDrawDisable_D" xml:space="preserve">
-    <value>课程数据源明确显示处于课间或非上课时段时，限制抽取和重置；关闭后不作限制</value>
+    <value>课程数据源确认处于课间或下课期间时，禁止点名、即时抽取与抽奖的抽取和重置；数据源断开或状态未知时不拦截；关闭后不作限制</value>
   </data>
   <data name="S_External_DataSource" xml:space="preserve">
     <value>数据源</value>
@@ -138,6 +138,8 @@
   <data name="S_ClassTime_PreClassEnableTime_D" xml:space="preserve">
     <value>上课前多少秒提前解除课间禁用</value>
   </data>
+  <data name="M_ClassTimeDrawBlocked" xml:space="preserve"><value>当前处于课间或下课期间，暂时不能抽取；下一节“{0}”还有 {1} 分钟</value></data>
+  <data name="M_ClassTimeDrawBlockedGeneric" xml:space="preserve"><value>当前处于课间或下课期间，暂时不能抽取</value></data>
   <data name="M_CsesSummary" xml:space="preserve"><value>共 {0} 节课，最早 {1:HH:mm}，最晚 {2:HH:mm}</value></data>
   <data name="M_CsesErrorEmpty" xml:space="preserve"><value>CSES 课程表文件为空</value></data>
   <data name="M_CsesErrorRoot" xml:space="preserve"><value>CSES 课程表文件的根节点必须是对象</value></data>
diff --git a/SecRandom/Services/Linkage/ClassTimeDrawRestrictionNotice.cs b/SecRandom/Services/Linkage/ClassTimeDrawRestrictionNotice.cs
new file mode 100644
index 00000000..31c7e711
--- /dev/null
+++ b/SecRandom/Services/Linkage/ClassTimeDrawRestrictionNotice.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Globalization;
+using FluentAvalonia.UI.Controls;
+using SecRandom.Core.Models.Linkage;
+using SecRandom.Views;
+using LR = SecRandom.Langs.SettingsPages.Linkage.Resources;
+
+namespace SecRandom.Services.Linkage;
+
+/// <summary>
+///     “课间与下课禁止抽取”被拦下时的用户提示。
+/// </summary>
+/// <remarks>
+///     点名、即时抽取、抽奖三处入口都只经过 <see cref="LinkageDrawCoordinator.AuthorizeAsync" /> 这一道门，
+///     所以提示也只在这里发一次，不往各页面里散写判空。集控远程路径走
+///     <see cref="LinkageDrawCoordinator.EvaluateGate" />，它刻意不提示 —— 教室机可能没人，
+///     弹提示只会让远程命令一直挂在没人看的窗口上。
+///     <para>
+///         没有活动主壳（手机单视图、浮窗单独抽、宿主尚未建窗口）时 <see cref="MainView.Current" /> 为空，
+///         提示静默跳过，拦截结果不受影响；<see cref="MainView.ShowToast" /> 内部会自己切到 UI 线程。
+///     </para>
+///     <para>
+///         节流窗口 <see cref="ThrottleWindow" /> 内的重复拦截只提示一次，按住按钮连点不会刷屏。
+///     </para>
+/// </remarks>
+internal static class ClassTimeDrawRestrictionNotice
+{
+    private static readonly TimeSpan ThrottleWindow = TimeSpan.FromSeconds(5);
+    private static readonly object ThrottleGate = new();
+    private static long _lastShownAt = long.MinValue;
+
+    /// <summary>提示一次“当前不能抽取”，并带上下一节课的恢复时间。</summary>
+    public static void Show(CourseScheduleSnapshot snapshot)
+    {
+        ArgumentNullException.ThrowIfNull(snapshot);
+
+        if (!TryEnterThrottleWindow())
+            return;
+
+        MainView.ShowToast(BuildMessage(snapshot), FAInfoBarSeverity.Warning);
+    }
+
+    internal static string BuildMessage(CourseScheduleSnapshot snapshot)
+    {
+        var nextCourseName = snapshot.NextCourse?.Name;
+        var minutesUntilNext = snapshot.TimeUntilNextCourse is { } untilNext && untilNext > TimeSpan.Zero
+            ? (int)Math.Ceiling(untilNext.TotalMinutes)
+            : 0;
+
+        if (!string.IsNullOrWhiteSpace(nextCourseName) && minutesUntilNext > 0)
+            return string.Format(CultureInfo.CurrentCulture, Text("M_ClassTimeDrawBlocked"), nextCourseName,
+                minutesUntilNext);
+
+        return Text("M_ClassTimeDrawBlockedGeneric");
+    }
+
+    private static string Text(string key)
+    {
+        return LR.ResourceManager.GetString(key, LR.Culture) ?? key;
+    }
+
+    private static bool TryEnterThrottleWindow()
+    {
+        var now = Environment.TickCount64;
+        lock (ThrottleGate)
+        {
+            if (_lastShownAt != long.MinValue && now - _lastShownAt < (long)ThrottleWindow.TotalMilliseconds)
+                return false;
+            _lastShownAt = now;
+            return true;
+        }
+    }
+}
diff --git a/SecRandom/Services/Linkage/CourseLinkageService.cs b/SecRandom/Services/Linkage/CourseLinkageService.cs
index 4028630c..d171b40c 100644
--- a/SecRandom/Services/Linkage/CourseLinkageService.cs
+++ b/SecRandom/Services/Linkage/CourseLinkageService.cs
@@ -105,6 +105,13 @@ private static bool SnapshotsEqual(CourseScheduleSnapshot a, CourseScheduleSnaps
         && _snapshot.State == CourseTimeState.Breaking
         && !IsWithinEnableWindow(_snapshot);
 
+    /// <summary>
+    ///     “课间与下课禁止抽取”此刻是否正在生效：设置开启，快照确认处于课间，且不在课前解禁/课后延迟窗口内。
+    /// </summary>
+    /// <remarks>
+    ///     <see cref="CourseScheduleSnapshot.IsAvailable" /> 为假（ClassIsland 断连、计时器停、课表未加载、
+    ///     CSES 课表缺失）时这里恒为假——断连不是“下课”，不可用必须放行，否则会让人在教室外白等一整天。
+    /// </remarks>
     public bool IsConfirmedNonClassTime => Settings.InstantDrawDisable
         && IsConfirmedBreakTime;
 
diff --git a/SecRandom/Services/Linkage/LinkageDrawCoordinator.cs b/SecRandom/Services/Linkage/LinkageDrawCoordinator.cs
index 83413fa6..66021ae9 100644
--- a/SecRandom/Services/Linkage/LinkageDrawCoordinator.cs
+++ b/SecRandom/Services/Linkage/LinkageDrawCoordinator.cs
@@ -53,7 +53,12 @@ public async Task<bool> AuthorizeAsync(
             return await securityService.AuthorizeAsync(operations, action, cancellationToken).ConfigureAwait(false);
 
         if (!linkageService.Settings.VerificationRequired)
+        {
+            // 不允许验证绕过时这里是课间唯一的人机拒绝点：页面调用方拿到 false 只会静默收手，
+            // 所以提示必须在这里发，否则用户点了按钮毫无反应。
+            ClassTimeDrawRestrictionNotice.Show(linkageService.Snapshot);
             return false;
+        }
 
         return await securityService.AuthorizeAsync(
             [.. operations, SecurityOperation.BypassClassTimeRestriction],

From 8bdc5a8d9bb7d6f9b522fc63331588fe3a7498ae Mon Sep 17 00:00:00 2001
From: Pro-Qin <102397304+Pro-Qin@users.noreply.github.com>
Date: Sat, 7 Nov 2026 15:33:15 +0800
Subject: [PATCH 4/9] =?UTF-8?q?test(draw):=20=E5=9B=BA=E5=AE=9A=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E5=8A=A8=E7=94=BB=E4=B8=8D=E6=B1=A1=E6=9F=93=E5=85=AC?=
 =?UTF-8?q?=E5=B9=B3=E8=AE=A1=E6=95=B0=E7=9A=84=E5=A5=91=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"抽签时好几个人闪过"的动画如果被计入次数，公平抽取就会把没抽到的人当成已抽到。
这里用回归测试把结论钉死，而不是只写在注释里：

- 40 帧预览后临时记录与持久历史均为空，且每帧成员都来自抽取前冻结的候选池
- 预览前后 CalculateStudentWeight 逐项 bit-identical（权重面零漂移）
- 一次真实 CommitStudentDraw 必须让中签者权重下降（反向灵敏度对照，
  证明上面两条不是恒真断言）
- 呈现契约只暴露 Preview/Reveal 两个相位，不携带 ProofId/DrawRoundId，
  且反射守卫确认 IDrawResultPresenter/DrawPresentationRequest 不出现任何提交
  或临时记录类型

测试用真实 DI 组合与独立临时数据根，不替换服务，避免把结论测成同义反复。
---
 .../PreviewAnimationFairnessTests.cs          | 278 ++++++++++++++++++
 1 file changed, 278 insertions(+)
 create mode 100644 SecRandom.Core.Tests/PreviewAnimationFairnessTests.cs

diff --git a/SecRandom.Core.Tests/PreviewAnimationFairnessTests.cs b/SecRandom.Core.Tests/PreviewAnimationFairnessTests.cs
new file mode 100644
index 00000000..38563312
--- /dev/null
+++ b/SecRandom.Core.Tests/PreviewAnimationFairnessTests.cs
@@ -0,0 +1,278 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using SecRandom.Core.Abstraction.Services;
+using SecRandom.Core.Abstraction.Services.Presentation;
+using SecRandom.Core.Services;
+using SecRandom.Core.Services.Config;
+using SecRandom.Core.Services.Draw;
+using SecRandom.Shared;
+using SecRandom.Shared.Models.Profile;
+
+namespace SecRandom.Core.Tests;
+
+/// <summary>
+///     预览（滚动）动画的公平性防线。
+///     <para>
+///         预览帧在 QuickDrawPageViewModel.ShowPreviewAsync 里只做
+///         <c>candidates.OrderBy(_ =&gt; Random.Shared.Next()).Take(count)</c> 这类内存洗牌，渲染只经
+///         DataTemplate / RenderTransform；写临时记录的入口只有 DrawCommitCoordinator
+///         （RecordStudents / RecordPrizes），而它只在真实一轮抽取结束后被调用一次。
+///         因此反复预览既不抬高临时记录计数，也不写历史，后续权重与「是否已抽到」判定保持不变。
+///     </para>
+///     <para>
+///         这些测试用真实 DI 运行时（AddCoreRuntimeServices）+ 临时 data root，避免 fake 把结论证成同义反复；
+///         同时保留一个「提交确实会改变同一测量面」的对照，证明断言灵敏。
+///     </para>
+/// </summary>
+public sealed class PreviewAnimationFairnessTests : IDisposable
+{
+    private const int PreviewFrameCount = 40;
+    private const int SampledPerFrame = 2;
+
+    private readonly string _dataRoot = Path.Combine(
+        Path.GetTempPath(),
+        "SecRandom",
+        "preview-animation-fairness",
+        Guid.NewGuid().ToString("N"));
+
+    public PreviewAnimationFairnessTests()
+    {
+        ResetDataRoot();
+        ConfigureDataRoot(_dataRoot);
+    }
+
+    [Fact]
+    public void PreviewFrames_OnlyReshuffleTheFrozenPool_AndWriteNoFairnessState()
+    {
+        using var provider = CreateProvider();
+        var profile = provider.GetRequiredService<IProfileService>();
+        var students = SeedStudents(profile, 6);
+        var listName = profile.StudentListConfig!.Name;
+        var temporary = provider.GetRequiredService<IDrawTemporaryRecordService>();
+
+        var frames = SimulatePreviewFrames(students, SampledPerFrame, listName);
+
+        Assert.Equal(PreviewFrameCount, frames.Count);
+        Assert.All(frames, frame => Assert.Equal(SampledPerFrame, frame.Count));
+        // 每一帧都只能来自抽取开始前冻结的候选池，永远不会包含池外记录。
+        Assert.All(frames, frame => Assert.All(frame, student => Assert.Contains(student, students)));
+
+        // 临时记录 = 公平计数（重复限制 / 平均间隔 / 权重都经它或历史读取），预览后必须仍是空的。
+        Assert.Empty(temporary.GetStudentCounts(listName, string.Empty, string.Empty));
+        // 持久历史同样一条都不能有。
+        Assert.Empty(profile.CurrentStudentHistory!.Students);
+        Assert.Equal(0, profile.CurrentStudentHistory.TotalRounds);
+        Assert.Equal(0, profile.CurrentStudentHistory.TotalStats);
+    }
+
+    [Fact]
+    public void RepeatedPreviewFrames_LeaveFairnessWeightsBitIdentical()
+    {
+        using var provider = CreateProvider();
+        var profile = provider.GetRequiredService<IProfileService>();
+        var students = SeedStudents(profile, 5);
+        var listName = profile.StudentListConfig!.Name;
+        var engine = CreateEngine(provider);
+
+        var before = engine.CalculateStudentWeight(students);
+        SimulatePreviewFrames(students, SampledPerFrame, listName);
+        var after = engine.CalculateStudentWeight(students);
+
+        Assert.Equal(before.Count, after.Count);
+        for (var index = 0; index < before.Count; index++)
+        {
+            Assert.Same(before[index].Candidate, after[index].Candidate);
+            // 精确相等：权重是历史上计数的纯函数，预览没有可写入的路径。
+            Assert.Equal(before[index].Weight, after[index].Weight);
+        }
+
+        Assert.All(after, weighted => Assert.True(weighted.Weight > 0));
+    }
+
+    [Fact]
+    public void OneRealCommit_DoesMoveTheSameWeightSurface_SoTheGuardIsSensitive()
+    {
+        using var provider = CreateProvider();
+        var profile = provider.GetRequiredService<IProfileService>();
+        var students = SeedStudents(profile, 5);
+        var listName = profile.StudentListConfig!.Name;
+        var engine = CreateEngine(provider);
+        var temporary = provider.GetRequiredService<IDrawTemporaryRecordService>();
+        var winner = students[0];
+
+        var before = engine.CalculateStudentWeight(students);
+        var roundId = provider.GetRequiredService<IDrawCommitService>()
+            .CommitStudentDraw(new StudentDrawCommit([winner], DateTime.Now, 1, listName));
+        var after = engine.CalculateStudentWeight(students);
+
+        Assert.False(string.IsNullOrWhiteSpace(roundId));
+        var beforeWinner = before.Single(weighted => ReferenceEquals(weighted.Candidate, winner)).Weight;
+        var afterWinner = after.Single(weighted => ReferenceEquals(weighted.Candidate, winner)).Weight;
+        Assert.True(afterWinner < beforeWinner,
+            $"一次真实提交必须降低中签者权重（before={beforeWinner}, after={afterWinner}），否则上一条断言没有灵敏度。");
+
+        Assert.Equal(1, temporary.GetStudentCounts(listName, string.Empty, string.Empty)[winner.RecordId.ToString("D")]);
+        Assert.Equal(1, profile.CurrentStudentHistory!.TotalRounds);
+    }
+
+    [Fact]
+    public void PreviewPresentationRequests_CarryNoRoundIdentity_AndThePhaseEnumHasNoCommitPhase()
+    {
+        // 相位只有「滚动中」与「已提交结果」两种：不存在“预览已提交”这种半状态。
+        Assert.Equal([DrawPresentationPhase.Preview, DrawPresentationPhase.Reveal], Enum.GetValues<DrawPresentationPhase>());
+
+        var student = new Student { Name = "Ada", RecordId = Guid.NewGuid() };
+        var preview = new DrawPresentationRequest
+        {
+            Channel = DrawPresentationChannel.QuickDraw,
+            Phase = DrawPresentationPhase.Preview,
+            Students = [student],
+            ListName = "class-a",
+            RequestedCount = 1
+        };
+
+        Assert.True(preview.IsPreview);
+        Assert.Equal(1, preview.ItemCount);
+        // 预览请求天然没有轮次身份（ResultPresentationBridge.BuildRequest 从不填这两个字段），
+        // 呈现器即使想“按轮次反查历史”也无从下手。
+        Assert.Equal(Guid.Empty, preview.ProofId);
+        Assert.Equal(string.Empty, preview.DrawRoundId);
+
+        var revealed = preview with
+        {
+            Phase = DrawPresentationPhase.Reveal,
+            ProofId = Guid.NewGuid(),
+            DrawRoundId = "round-1"
+        };
+        Assert.False(revealed.IsPreview);
+        Assert.True(preview.IsPreview); // with 表达式产出新快照，不改原件
+
+        // init-only：呈现器拿到的快照无法在构造后被逐属性改写（init 访问器带 IsExternalInit 修饰符，不算可变 setter）。
+        Assert.True(typeof(DrawPresentationRequest).IsSealed);
+        var mutableSetters = typeof(DrawPresentationRequest)
+            .GetProperties(BindingFlags.Public | BindingFlags.Instance)
+            .Where(property => property.SetMethod is { IsPublic: true } &&
+                               !property.SetMethod.ReturnParameter.GetRequiredCustomModifiers()
+                                   .Contains(typeof(IsExternalInit)))
+            .Select(property => property.Name)
+            .ToArray();
+        Assert.Empty(mutableSetters);
+    }
+
+    [Fact]
+    public void PresentationContracts_ExposeNoCommitOrTemporaryRecordSurface()
+    {
+        var presenterTypes = typeof(IDrawResultPresenter)
+            .GetMethods()
+            .SelectMany(method => method.GetParameters()
+                .Select(parameter => parameter.ParameterType)
+                .Append(method.ReturnType))
+            .ToArray();
+
+        Assert.DoesNotContain(typeof(IDrawCommitService), presenterTypes);
+        Assert.DoesNotContain(typeof(IDrawTemporaryRecordService), presenterTypes);
+
+        var requestTypes = typeof(DrawPresentationRequest)
+            .GetProperties(BindingFlags.Public | BindingFlags.Instance)
+            .Select(property => property.PropertyType)
+            .ToArray();
+
+        Assert.DoesNotContain(typeof(IDrawCommitService), requestTypes);
+        Assert.DoesNotContain(typeof(IDrawTemporaryRecordService), requestTypes);
+    }
+
+    public void Dispose()
+    {
+        ResetDataRoot();
+        if (Directory.Exists(_dataRoot))
+            Directory.Delete(_dataRoot, recursive: true);
+    }
+
+    /// <summary>
+    ///     复刻 QuickDrawPageViewModel.ShowPreviewAsync 的帧循环（洗牌冻结池 + 生成 Preview 请求），
+    ///     但不触碰任何服务：这正是产品代码里预览分支的全部行为。
+    /// </summary>
+    private static List<IReadOnlyList<Student>> SimulatePreviewFrames(
+        IReadOnlyList<Student> frozenPool,
+        int count,
+        string listName,
+        int frames = PreviewFrameCount)
+    {
+        var rendered = new List<IReadOnlyList<Student>>(frames);
+        var previewAnimationRevision = 0;
+
+        for (var frame = 0; frame < frames; frame++)
+        {
+            var frameStudents = frozenPool.OrderBy(_ => Random.Shared.Next()).Take(count).ToList();
+            rendered.Add(frameStudents);
+
+            var request = new DrawPresentationRequest
+            {
+                Channel = DrawPresentationChannel.QuickDraw,
+                Phase = DrawPresentationPhase.Preview,
+                Students = frameStudents,
+                ListName = listName,
+                RequestedCount = count
+            };
+            Assert.True(request.IsPreview);
+
+            previewAnimationRevision++;
+        }
+
+        Assert.Equal(frames, previewAnimationRevision);
+        return rendered;
+    }
+
+    private static List<Student> SeedStudents(IProfileService profile, int count)
+    {
+        var students = Enumerable.Range(1, count)
+            .Select(index => new Student
+            {
+                Name = $"Preview-{index:00}",
+                Id = index.ToString("00"),
+                RecordId = Guid.NewGuid()
+            })
+            .ToList();
+
+        foreach (var student in students)
+            profile.CurrentStudentList!.Students.Add(student);
+
+        profile.SaveProfile();
+        return students;
+    }
+
+    private static DrawEngine CreateEngine(ServiceProvider provider)
+    {
+        return new DrawEngine(
+            provider.GetRequiredService<MainConfigHandler>(),
+            provider.GetRequiredService<IProfileService>(),
+            NullLogger<DrawEngine>.Instance);
+    }
+
+    private static ServiceProvider CreateProvider()
+    {
+        var services = new ServiceCollection();
+        services.AddLogging(builder => builder.SetMinimumLevel(LogLevel.None));
+        services.AddCoreRuntimeServices();
+        return services.BuildServiceProvider();
+    }
+
+    private static void ConfigureDataRoot(string dataRoot)
+    {
+        GetUtilsMethod("ConfigureDataRoot").Invoke(null, [dataRoot]);
+    }
+
+    private static void ResetDataRoot()
+    {
+        GetUtilsMethod("ResetDataRootForTests").Invoke(null, null);
+    }
+
+    private static MethodInfo GetUtilsMethod(string name)
+    {
+        return typeof(Utils).GetMethod(name, BindingFlags.Static | BindingFlags.NonPublic)
+               ?? throw new InvalidOperationException($"Utils.{name} was not found.");
+    }
+}

From c79134caf92b9be504239e62cd2d7dcdfec5ec76 Mon Sep 17 00:00:00 2001
From: Pro-Qin <102397304+Pro-Qin@users.noreply.github.com>
Date: Sat, 7 Nov 2026 15:33:18 +0800
Subject: [PATCH 5/9] =?UTF-8?q?docs(agents):=20=E8=AE=B0=E5=BD=95=E5=B1=85?=
 =?UTF-8?q?=E4=B8=AD=E3=80=81=E8=87=AA=E5=AE=9A=E4=B9=89=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E3=80=81=E8=81=94=E5=8A=A8=E6=8F=90=E7=A4=BA=E4=B8=8E=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E5=85=AC=E5=B9=B3=E6=80=A7=E7=BA=A6=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 根 AGENTS.md: 预览帧不写临时记录/历史，公平计数只有 DrawCommitCoordinator 一个写入口；
  预览洗牌用 Random.Shared，抽取走注入 IRandomSource，两条随机流不得混用
- SecRandom/AGENTS.md: 闪抽窗口在每次尺寸变化后重新居中（SizeChanged 用 e.NewSize，
  PositionChanged 不得接回该路径）；自定义文字的字段与渲染约束
- Views/SettingsPages/AGENTS.md: 联动硬拦截必须自解释，远程触发保持静默
- 新增 Services/Linkage/AGENTS.md 记录联动服务边界
---
 AGENTS.md                               |  2 +-
 SecRandom/AGENTS.md                     |  5 +-
 SecRandom/Services/Linkage/AGENTS.md    | 68 +++++++++++++++++++++++++
 SecRandom/Views/SettingsPages/AGENTS.md |  4 +-
 4 files changed, 74 insertions(+), 5 deletions(-)
 create mode 100644 SecRandom/Services/Linkage/AGENTS.md

diff --git a/AGENTS.md b/AGENTS.md
index 25ebb56d..b9fadf5b 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -175,7 +175,7 @@ Keep this map short and stable. When code moves, AI agents should re-read the mo
 - Full IPC/URL compatibility is app-layer routed through `ProtocolCommandRouter`: structured current-user named-pipe IPC is additive to legacy `ShowMainWindow`/`Restart`/`Url:` delivery, and all external mutations must use `ISecurityService`. `data/*` queries must use non-mutating profile snapshots, never active-profile loading APIs.
 - `HistoryItem.DrawRoundId` identifies every record committed by one logical draw. Populate it for new history writes; IPC history projections group by it and must never expose internal `RecordId`.
 - History record groups (历史记录组) are an optional second history dimension beside `HistoryItem.CourseName`, never a replacement: on the record `HistoryGroup` (empty marker = the default group) is set when the record is written and both filters apply together, so a gated draw reads and writes the intersection. The scope parameter is deliberately **tri-state** (`string? historyGroup`): `null` means do not filter on the group axis at all (feature off or selector hidden = the pre-#294 behaviour, every record counts), `""` means the default group only (records whose marker is empty, which is what the panel's 默认记录组 option selects), and a name means that one group. Collapsing `null` and `""` re-introduces the original unfairness in the other direction, because the option labelled 默认记录组 would then count records that were explicitly sorted into another group. `DrawEngine`'s history caches, `IProfileService.Record*History`, `IDrawCommitService` commit records, and `VerificationDrawCoordinator` carry the value as a trailing optional parameter — nothing in the weight calculator changes, because filtering the cache already yields the group-local counts. Deliberate limits: temporary draw records stay one bucket per student list (splitting them per group would let switching groups reset the repeat limit), the group name is the identity (renaming rewrites markers, and `HistoryGroupName` rejects blank/over-long/control/reserved names such as the `__break__` course sentinel), and the group *selection* is transient UI state — it is never persisted, and hiding the selector always means "no group scope" (`null`, i.e. every record counts again), so a stale selection can never silently keep filtering. The switch and the group create/rename/delete management live on the history-management settings page (`SecRandom/Views/SettingsPages/History/HistoryManagementSettingsPage.axaml(.cs)`), not on a draw-settings page, and the main panels expose only the selector. Moving records between groups goes through `IProfileCatalogManager.Move{Student,Prize}HistoryGroup` (marker-only, no new record, no `DrawRoundId`) and never through `IDrawCommitService`. Enabling the feature is not a protected operation, the switch is readable-but-not-writable through the control plane, and downgrading to a build without it silently folds grouped records back into the global history.
-- Draw commits must go through `IDrawCommitService` (`DrawCommitCoordinator`): one logical draw gets exactly one `DrawRoundId` (a caller may supply one), temporary records commit before persistent history, a mid-commit failure rolls back through snapshot compensation, and commits serialize behind the coordinator gate. Never reintroduce bare two-step writes of `IProfileService.Record*History` plus temporary-record calls; the optional `drawRoundId` parameter (and `drawMethod` on `RecordPrizeHistory`) exists for coordinator use.
+- Draw commits must go through `IDrawCommitService` (`DrawCommitCoordinator`): one logical draw gets exactly one `DrawRoundId` (a caller may supply one), temporary records commit before persistent history, a mid-commit failure rolls back through snapshot compensation, and commits serialize behind the coordinator gate. Never reintroduce bare two-step writes of `IProfileService.Record*History` plus temporary-record calls; the optional `drawRoundId` parameter (and `drawMethod` on `RecordPrizeHistory`) exists for coordinator use. Preview frames write no temporary record and no history: the coordinator is the only writer of the fairness surface, and the weight/filter/verification layers read persistent history only, so an animation that flickers through a hundred names can neither record a hit nor shift a weight. A preview shuffles with `Random.Shared` while the draw samples through the injected `IRandomSource` (`CryptoRandomSource`), so animation frames cannot consume or bias the draw's random stream. `SecRandom.Core.Tests/PreviewAnimationFairnessTests.cs` pins all three claims, including a reflection guard that the presentation contracts expose no commit or temporary-record surface.
 - File persistence saves are atomic replacements: `FileConfigService.SaveConfig` and `DrawTemporaryRecordService.SaveState` write a temporary file and atomically replace the target; new file-persistence code must follow the same pattern instead of overwriting files in place.
 - Draw proofs use the SecRandom v3 algorithm ID and an `algorithmEngineVersion`. Engine v3.1 commits the sampling mode into the request: student draws use history-balanced weighted sampling, count-based lottery inventory uses equal-probability partial permutation when no internal rule applies, and pan or internal-rule lottery draws use weighted sampling without replacement. Keep the verifier's replay logic byte-compatible with each supported proof engine version. Engine v3.4.0 does not change the replay mathematics at all — it only marks that the `fairness` block may carry `historyScope` — but the service side must be deployed **before** a client build sends that generation, exactly like a new audit field: a 3.3-generation verifier replays the same proof and reads the narrowed per-candidate `historyCount` values as global history. `fair.sectl.cn` accepts 3.4/3.3/3.2 as the current algorithm family, 3.1 as the previous family, and 3.0 as the oldest, and keeps replaying every previously issued generation.
 - Ordinary draws immediately save an `OfflineReproducible` proof, then submit that newly generated proof to `fair.sectl.cn` for background replay/signing. A submission must use the proof object captured at draw time and never a re-read of the proof file: `DrawProofAttestationService` keeps the pending item in memory, persists only its path, proof ID, and canonical proof hash to `data/proofs/attestation-queue.json`, retries failures with bounded exponential backoff, resumes queued items after a restart, and refuses plus reports an item whose file no longer matches the recorded hash (it then keeps the receipt in the queue instead of overwriting the changed file). Startup must never scan or re-attest historical proof files that were never queued. A current server receipt signs a canonical hash of all proof fields except the receipt itself, plus the proof ID, input hash, payload hash, anonymous audit-payload hash, and mode; public sharing requires that receipt. This detects changes after the signed submission, but it does not attest to an unmodified local executable, an authentic real-world candidate pool, or absence of pre-draw result selection. Do not call it a pre-draw server witness. Local proof retention applies both the configured age and total storage limits; after every new save, delete oldest `.srproof.json` files until the configured storage cap is met.
diff --git a/SecRandom/AGENTS.md b/SecRandom/AGENTS.md
index 32907798..efcb8982 100644
--- a/SecRandom/AGENTS.md
+++ b/SecRandom/AGENTS.md
@@ -176,9 +176,10 @@ SecRandom/
 - More settings includes roll-call and lottery page management options for the control panel side and per-control visibility; wire built-in draw pages through `MainConfigModel.MoreSettings` instead of duplicating local UI flags.
 - History record groups (历史记录组, issue #294) add a fourth selector to the roll-call and lottery control panels. `RollCallPageViewModel`/`LotteryPageViewModel` own `SelectedHistoryGroup`, `HistoryGroupOptions`, and the derived `CurrentHistoryGroup`, and they freeze it at the same moment the candidate pool is snapshotted (`StartDrawCoreAsync`) so a mid-draw change cannot split weights from the record marker. Two rules are load-bearing: (1) `CurrentHistoryGroup` is a **tri-state** `string?` and returns `null` whenever the selector is not visible (`Config.General.HistoryGroups.Enabled` off, or the per-page `MoreSettings.{RollCall,Lottery}HistoryGroupSelector` off), so hiding the control can never leave a stale hidden value silently scoping draws — while the panel's first option (默认记录组) maps to the empty string, i.e. "only records that carry no group marker", and a name maps to that one group; (2) selecting a group stays an ordinary page state and is deliberately **not** a `SecurityOperation` — it is the same class of action as switching list/group/gender, and the feature only changes which history the fairness weights read. The main panels deliberately show the selector and nothing else: no locked-group chip, no "this group has no records yet" hint, and no clear-selection button, so picking a group is a plain `ComboBox` choice. The lottery page scopes the *student* history axis (`HistoryGroupKind.RollCall`) because prize history does not feed draw weights on the production path; the chosen name is still stamped onto the prize records for viewing/export. Group management (create/rename/two-step delete) lives on the history-management settings page (`Views/SettingsPages/History/HistoryManagementSettingsPage`), not in the main pages and not in the draw settings, which is also why its search entries are no longer in `SettingsSearchService.PickingPageSettingIds`.
 - Quick Draw has no group selector of its own, so `QuickDrawSettingsConfig.HistoryGroup` is its *default* record group: `QuickDrawPageViewModel.ResolveQuickDrawHistoryGroup()` re-validates that name on every draw against `IHistoryGroupCatalog.GetGroupNames(HistoryGroupKind.RollCall)` and returns a **tri-state** `string?`: `null` (no group scope at all) when the feature switch is off or the configured name was renamed/deleted, `""` (the default record group) when no group is configured, and the name otherwise — never draw against a ghost group name, because that would silently equalize weights while the user believes the lock is on, and never turn "feature off" into `""`, because that would silently narrow the weights to ungrouped records. The resolved value is frozen next to the candidate snapshot and flows into both `DrawStudentsAsync` and `StudentDrawCommit`. `QuickDrawPage.axaml` has no draw button (the floating window generates it), so the lock is disclosed as a small hint line under the result area, and `QuickDrawSettingsPage` shows the picker plus an explanation instead of hiding the whole card when the feature switch is off.
+- The quick-draw window re-centers on every size change, not just when it opens. `QuickDrawPage` raises `ResultLayoutChanged` after each result layout pass and `App` answers it with `RequestQuickDrawWindowCentering`; `SizeChanged` repositions from `e.NewSize` (window `Bounds` lags the layout that raised it) and `_positioningQuickDrawWindow` keeps a position write from re-entering. Never write `Position` when the computed target already equals the current one, and never subscribe `PositionChanged` back into this path — both turn a one-shot correction into a jitter loop. The window is `SizeToContent` driven, so any fixed `Width`/`Height` write conflicts with it; the result area must also be width-filling with a single-card `MaxWidth`, otherwise a long name widens the whole row and visually drags the group off center.
 - Global shortcuts are an app-layer hosted service. `GlobalShortcutService` registers the nine V2-parity actions through Windows `RegisterHotKey`, dispatches them to Avalonia's UI thread, and degrades without registrations on other platforms. Changes to `MoreSettings.EnableShortcut` or a binding apply without restarting.
-- Floating window settings are live-applied to an open `FloatingWindow`: button selection, layout, display style, size, opacity, topmost mode, and dragging must not require reopening the window.
-- Course linkage is app-layer only. `CourseLinkageHostedService` is the sole course-boundary scheduler; CSES parsing/file access stays behind `ICsesScheduleStore`, and ClassIsland types stay inside `ClassIslandScheduleSource`. Use `LinkageDrawCoordinator` for every local, protocol, or shortcut draw/reset path so confirmed non-class restrictions cannot be bypassed. Unknown/unavailable sources are permissive.
+- Floating window settings are live-applied to an open `FloatingWindow`: button selection, layout, display style, size, opacity, topmost mode, custom text, and dragging must not require reopening the window. `FloatingWindowSettingsConfig.EnableFloatingWindowText`/`FloatingWindowText` drive one non-hit-testable line above `ButtonsPanel`; the text is folded to a single line, trimmed with `CharacterEllipsis`, sized from `FloatingWindowSize`, and lives inside `ExpandedContent` so the docked handle never shows it.
+- Course linkage is app-layer only. `CourseLinkageHostedService` is the sole course-boundary scheduler; CSES parsing/file access stays behind `ICsesScheduleStore`, and ClassIsland types stay inside `ClassIslandScheduleSource`. Use `LinkageDrawCoordinator` for every local, protocol, or shortcut draw/reset path so confirmed non-class restrictions cannot be bypassed. Unknown/unavailable sources are permissive. A local refusal must explain itself: the `VerificationRequired == false` branch (there is no prompt to carry the reason) calls `ClassTimeDrawRestrictionNotice.Show`, a throttled toast built from `M_ClassTimeDrawBlocked`/`M_ClassTimeDrawBlockedGeneric`, while `EvaluateGate` stays silent because a remote `draw.trigger` is answered in its receipt and an unattended classroom machine must not collect dialogs.
 - The control node (集控, `docs/client-protocol.md`) is the only remote-control ingress. Its device-owned switch, node identity, group id, endpoint, applied `desired_state` revision, and draw lock live in `data/config/control/node-state.json` through `IControlNodeStateStore` — never in `settings.json`, because a settings import must not be able to enable remote control. `LinkageDrawCoordinator.AuthorizeAsync` refuses every draw while that gate is locked, and `EvaluateGate` answers "would this raise a local password prompt?" so a remote command can be refused instead of leaving an unattended classroom machine waiting on a dialog. Read the endpoint through `ControlEndpointPolicy` (wss, or plaintext ws only to loopback). Declared capabilities must stay honest: only declare what `ControlCommandDispatcher` implements, and never implement `node.restart` (the service refuses it on purpose). A phone is only the console side (`MobileRemoteDrawViewModel` sends `draw.trigger` to nodes) and has no outbound node channel, so its branch of `BuildHost()` registers the neutral `UnlockedControlDrawGate` instead. That registration is mandatory, not cosmetic — `LinkageDrawCoordinator` is shared by both hosts, and a missing gate fails inside `Host.StartAsync` (it constructs `GlobalShortcutService`, whose draw-page ViewModels reach the gate) and takes the whole mobile host down. Do not register the unlocked gate for desktop: a real gate that disappears must fail loudly instead of silently unlocking every draw. **Which host runs the node is decided in exactly one place**, `AppHostShape.Resolve(isMobile, MobilePlatformServiceRoot.UsesDesktopMainView)` in `Mobile/AppHostShape.cs`, and `BuildHost()` reads only its result — the node runs on desktop **or tablet** (`RunsControlNode`), while a phone (`UsesUnlockedDrawGate`) has no outbound node channel. A tablet is both sides: it registers the **real** `ControlDrawGateService` plus the node services and the `settings.general.control` page, and reaches the *same* `MobileRemoteDrawViewModel` as the phone — desktop and tablet register the **desktop-layout view** as a `MainView` sidebar entry (`AddMainPage<RemoteDrawPage>`), the phone keeps its keyed bottom-bar registration of `MobileRemoteDrawPage` (`MobilePageIds.RemoteDraw`), and **one ViewModel serves both views** (never a second VM; see the 远程抽取页的宿主矩阵 bullet below). Never give a tablet the unlocked gate (its remote lock would silently stop working and local draws would be let through), and never give a phone the real one. Remote draws on a tablet have no `MainWindow`: `App.ShowMainWindowCoreAsync` only creates a desktop window when `App.IsDesktop`, and `RemoteDrawFocusPlan.Resolve` returns `RemoteDrawSurface.SingleViewHost` so no window code runs — the target page is selected in `MainView` instead. Raising the app from the background is an OS restriction on Android/iPadOS, not something the client can do.
 - Floating-window course hiding records linkage-owned prior visibility and current user intent. Do not restore a window that the user hid manually while a course break was active.
 - **远程抽取页的宿主矩阵（一份 VM + 两个视图）**：`MobileRemoteDrawViewModel` 是**唯一一份** ViewModel（设备列表、读名单/奖池、条件、抽取、重置、回执解析与四态文案）——协议逻辑分叉就是这个项目吃过两次亏的地方，谁都不许为某个宿主复制一份。**UI 则按宿主分叉**：桌面/平板用桌面主页面版式的 `Views/MainPages/RemoteDrawPage.axaml(.cs)`（左侧结果区 + 右侧控制区，与点名/抽奖同一套观感），手机保持 `Views/Mobile/MobileRemoteDrawPage.axaml(.cs)` 的竖排表单。视图只做展示与绑定：需要的新展示态加进共享 VM（例如 `DrawnCountText`），绝不在视图里自己算，否则两侧同一天会说两句话。手机页的版式是**上结果、下控制**：结果/失败文案只出现在顶部结果区，抽取按钮下方只留"正在下发"这类临时进行态；结果区封顶 200 且内部可滚动，未抽时空态只有两行，不能把控制项顶出屏幕。**设备列表要标出本机**：`DeviceRow.IsSelf` 由 `DeviceRow.IsSameNode(本机 node_id, 行 node_id)` 在共享 VM 里算出（大小写与空白差异不算两台；本机没配置身份、或手机没有节点时一台都不标），行内给一个次级样式的徽章，选中本机时给出说明但**不禁用**选择，且本机**不得从列表里过滤掉**。**设备加载态只能在共享 VM 里收口**（`BeginDeviceLoad`/`EndDeviceLoad` + 序号取代）：成功、失败、0 台、异常、被更新的请求取代都必须清掉 `IsLoadingDevices` **以及那句"正在读取设备"进度文案**——这条流程曾在成功路径上只清布尔量，把"正在读取设备"的残影留在状态行上（三端同错，因为状态在共享层）。**结果区只显示远端回执里真的返回了什么**（`detail.drawn` → `DrawnMembers`）：没有回执就不列成员，只显示状态文案（还没抽/失败/超时/被拒），前端不造结果。`AppHostShape` 负责回答"怎么挂"：桌面与平板没有底部导航栏，注册为 **`MainView` 侧栏主页面**（`UsesRemoteDrawSidebarPage` → `AddMainPage<RemoteDrawPage>`），手机注册为 **底部第 5 档 keyed 页面**（`UsesRemoteDrawBottomTab` → `AddKeyedTransient<UserControl, MobileRemoteDrawPage>(MobilePageIds.RemoteDraw)`），两者恰好一个为真，两个视图共用同一个页面 id `main.remoteDraw`。**侧栏顺序**：桌面/平板上「远程抽取」必须排在**「抽奖」下面**——顺序由 `AddMainPage` 的注册顺序 + `PageLocation` 决定（桌面主页都在 `Bottom` 组，`Top` 组是空的），因此那条注册紧跟在 `AddMainPage<LotteryPage>` 之后、`AddMainPage<HistoryPage>` 之前，并由 `TabletControlHostTests.侧栏顺序_远程抽取紧跟在抽奖之后` 钉住；手机底部顺序不受此影响。
diff --git a/SecRandom/Services/Linkage/AGENTS.md b/SecRandom/Services/Linkage/AGENTS.md
new file mode 100644
index 00000000..15b2c65a
--- /dev/null
+++ b/SecRandom/Services/Linkage/AGENTS.md
@@ -0,0 +1,68 @@
+# SecRandom/Services/Linkage/ AGENTS.md
+
+<!--
+Supplement to ../../AGENTS.md. Update this file when a source, the course-state
+runtime, the draw gate, the restriction notice, or the pre-class reset changes.
+-->
+
+## OVERVIEW
+
+课程联动运行层：CSES 课表解析/存储、ClassIsland IPC 适配、课程边界调度、
+抽取授权闸门、课前重置。**课间与课下的抽取禁用就在这一层判定**，页面只问
+`LinkageDrawCoordinator`，不自己读课表状态。
+
+## STRUCTURE
+
+```
+SecRandom/Services/Linkage/
+|-- ICourseScheduleSource.cs        # 课表源契约：快照 + StateChanged
+|-- CourseScheduleMath.cs           # 纯函数：按课表算当前/上节/下节与倒计时
+|-- CsesScheduleParser.cs           # CSES YAML -> 课程列表（纯解析）
+|-- CsesScheduleStore.cs            # data/CSES/cses_schedule.yml 的读写与校验
+|-- CsesScheduleSource.cs           # CSES 源：存储变更 -> 快照
+|-- ICsesScheduleStore.cs           # CSES 存储契约（页面只认这个）
+|-- ClassIslandIpcConnection.cs     # 唯一 IPC 管道：课程查询 + 上下课通知 + 重连退避
+|-- ClassIslandScheduleSource.cs    # ClassIsland -> CourseScheduleSnapshot
+|-- CourseLinkageService.cs         # 单例状态：快照、闸门判定、刷新调度、科目过滤
+|-- CourseLinkageHostedService.cs   # 唯一课程边界调度器 + 课前重置执行
+|-- LinkageDrawCoordinator.cs       # 抽取授权闸门（本地/协议/快捷键共用）
+|-- ClassTimeDrawRestrictionNotice.cs # 课间被拦时的本地化 toast（5 秒节流）
+```
+
+## WHERE TO LOOK
+
+| Task | Location | Notes |
+|------|----------|-------|
+| 课间/课下禁令是否在生效 | `CourseLinkageService.IsConfirmedNonClassTime` | `InstantDrawDisable` 开 **且** `IsConfirmedBreakTime`（快照确认 `CourseTimeState.Breaking`、且不在课前解禁/课后延迟窗口内）。 |
+| 数据源是否给不出判定 | `CourseScheduleSnapshot.IsAvailable` / `Unavailable(...)` | ClassIsland 断连、计时器停、课表未加载、CSES 课表缺失都会返回 `IsAvailable == false` 的快照；`IsConfirmedBreakTime` 因此恒为假，禁令自动放行。 |
+| 为什么点不动 | `LinkageDrawCoordinator.AuthorizeAsync` | `VerificationRequired == false` 时课间是硬拒绝，拒绝前调 `ClassTimeDrawRestrictionNotice.Show(snapshot)` 发提示。 |
+| 远程命令的判定 | `LinkageDrawCoordinator.EvaluateGate` | 无交互判定，**刻意不弹提示**：教室机可能无人，弹窗会让远程命令挂死。`BlockedByClassTime` 由 `ControlDrawTriggerHandler` 转成 `denied(blocked_by_class_time)`。 |
+| 上下课事件 | `ClassIslandIpcConnection` | 订阅 `OnClassNotifyId` / `OnBreakingTimeNotifyId` / `OnAfterSchoolNotifyId`，`StateChanged` → 两个源 → `CourseLinkageService.RefreshAsync`。 |
+| 课前重置 | `CourseLinkageHostedService.TryPerformPreClassReset` | `IsPreClassResetDue` 给出的 key 去重，清临时记录并让三个页面 `ResetForCourseLinkage()`。 |
+| 提示节流 | `ClassTimeDrawRestrictionNotice.ThrottleWindow` | 5 秒一次，连点按钮不刷屏；`MainView.Current` 为空时静默跳过。 |
+
+## CONVENTIONS
+
+- 上课/下课/课间/放学的时间判定只在 `CourseScheduleMath`（CSES）与
+  `ClassIslandScheduleSource`（IPC 状态映射）里做，别在调用点重算时间窗。
+- 课间禁令的开关是 `LinkageSettingsConfig.InstantDrawDisable`（默认 `false`），
+  与之配套的 `VerificationRequired`（默认 `true`）决定课间是"验证后放行"还是"直接阻止"。
+  新增开关一律默认关闭，并在 `LinkageSettingsPage` 与三语资源同步暴露。
+- 数据源不可用（`CourseScheduleSnapshot.Unavailable`）必须放行。断连不是下课，
+  把不可用当禁课会让人在教室外白等一整天——这条在 issue 里被反复踩过。
+- 用户可见的拦截文案放 `SecRandom/Langs/SettingsPages/Linkage/Resources*.resx`：
+  `M_ClassTimeDrawBlocked`（带下一节课与分钟数）与 `M_ClassTimeDrawBlockedGeneric`。
+  取值走 `Resources.ResourceManager.GetString(key, Resources.Culture)`，不要手改
+  `Resources.Designer.cs`。
+- 快照比较只看语义字段（`SnapshotsEqual`），排除倒计时，否则每次刷新都会自激（issue #274）。
+- ClassIsland 类型只允许出现在 `ClassIslandScheduleSource` 与 `ClassIslandIpcConnection`；
+  其他文件接触它就是把 IPC 依赖漏进业务层。
+
+## ANTI-PATTERNS
+
+- 不要在页面 ViewModel 里写 `if (在课间) return;`：三个抽取入口（点名/即时抽取/抽奖）
+  已经全部经过 `LinkageDrawCoordinator`，散写判断迟早漏掉协议与快捷键路径。
+- 不要用 `EvaluateGate` 代替 `AuthorizeAsync` 执行抽取：它只回答"会不会弹验证框"。
+- 不要因为 `PeerConnectionBroken` 就把状态钉成 `Breaking` 或永久禁用；重连退避是
+  5 秒到 5 分钟，期间的快照必须是 `Unavailable`。
+- 不要在这里直接调平台窗口 API（浮窗隐藏归浮窗服务，见 ../../AGENTS.md）。
diff --git a/SecRandom/Views/SettingsPages/AGENTS.md b/SecRandom/Views/SettingsPages/AGENTS.md
index 249f5b56..dcd2d759 100644
--- a/SecRandom/Views/SettingsPages/AGENTS.md
+++ b/SecRandom/Views/SettingsPages/AGENTS.md
@@ -41,13 +41,13 @@ SecRandom/Views/SettingsPages/
 | Backup settings UI | `General/BackupSettingsPage.axaml(.cs)` | The page is one `TabStrip` + `Carousel` pair. The 本地备份 tab lists real backup ZIPs under app data and delegates create/restore to `IImportExportService`, which validates archives and creates the required pre-restore snapshot. The 云端备份 tab (desktop and mobile) owns account state, cloud quota (auto-fetched on page entry, after sign-in, and after an automatic backup, with its own refresh command and 正在获取 loading label), an 打开 思拓创联 云储存页面 row that opens `https://sectl.cn/dashboard/cloud` through `IExternalLauncher.TryOpenUri`, 立即备份到云端 with a transient 上传中ing~ status plus cancel instead of a part-progress card, its own 云端备份内容 rows (`CloudInclude*`; no log or theme row because logs, the device identity, the voice cache, and theme resources can never be uploaded, while 抽取证明文件 has a row backed by `BackupConfig.CloudIncludeProofs` that defaults to off because a cloud copy is the last resort once the local chain has been deleted), a 设备别名 row (`BackupConfig.CloudDeviceAlias`, persisted through the page's existing `Settings.PropertyChanged` save boundary and shown in the cloud file names; empty means the host name), no 云端备份加密 row (client-side encryption and its passphrase were removed, so the archive is uploaded with account access as its only key), and 云端备份管理 columns (file name, 上传时间, size, actions) where a package the removed feature uploaded is flagged 旧版加密，无法恢复 in the file-name cell because `CanRestore` is false for it), with 云端自动备份 rows (switch/interval/limit persisted as `BackupConfig.CloudAutoBackup*`, independent of the local auto backup; the limit is per device, while an exhausted quota still deletes the account-wide oldest backup), and cloud backup management (download-restore/delete/cleanup) behind a separator with a left-aligned 刷新中ing~/清理中ing~ status label; an upload refreshes the cloud list whether it succeeds or fails. The cloud tab item carries the `S_CloudBackup` search anchor. The page resolves `SectlAuthService`/`CloudBackupService` with `TryGetService`, hides the entire cloud tab when either is missing (mobile), delegates all cloud work to `CloudBackupService`, and must not cache cloud state in configuration. |
 | Security settings | `General/SecuritySettingsPage.axaml(.cs)` | Page ID `settings.general.security`; belongs to the General navigation group. Its Sudo card is one expandable `FASettingsExpander` (`x:Name="S_SudoMode"`) holding the Sudo switch (`S_SudoMode_Enabled`, tag `SudoModeEnabled`), the duration row (`S_SudoMode_Duration`), and three explanation lines that spell out the operation scope, the settings-window scope, and the operations Sudo never covers; the duration control is disabled while Sudo is off and both rows write through `UpdateSecuritySettingsAsync`. Its 防篡改 section holds the settings-file integrity switch, the 篡改处理方式 picker (`SettingsIntegrityAction`: password confirmation or automatic restore), and the restore-source picker (`SettingsIntegrityRestoreSource`, shown only while automatic restore is selected); both pickers are plain `SettingOption<T>` ComboBoxes persisted through the security-gated update boundary. The credential section keeps its password commands and pairs the TOTP command button (`C_SetTotp`/`C_ResetTotp`) with a `C_RemoveTotp` button that is visible only while TOTP is configured; removal calls `ISecurityService.RemoveTotpAsync` (fresh password, deletes the seed and the standalone copy) instead of clearing the factor switch. Cloud candidates stay restricted to this device's own uploads (`CloudBackupService.IsOwnBackup`), so another machine's cloud backup is never used to restore this machine's settings file. The page binds its model to `SecuritySettingsStore.Data` (not `ViewModel.Config`): these switches live in the encrypted `data/config/security/settings.json`, so the store — not the main config handler — is what persists them. |
 | Managed draw music | `SecRandom/Services/Music/`, `SecRandom/Services/Draw/DrawAudioService.cs` | Library files live under `data/audio/music`; app-layer service resolves selections and owns cross-platform playback. |
-| Course linkage | `SecRandom/Services/Linkage/` | CSES schedule storage/parsing, ClassIsland IPC adapter, course-boundary runtime, draw authorization, and pre-class reset. |
+| Course linkage | `SecRandom/Services/Linkage/` | CSES schedule storage/parsing, ClassIsland IPC adapter, course-boundary runtime, draw authorization, and pre-class reset. Break/after-class drawing is decided only here: `CourseLinkageService.IsConfirmedNonClassTime` (setting on + confirmed `CourseTimeState.Breaking` + outside the pre-class enable / post-class delay windows), while an unavailable snapshot (`IsAvailable == false`) always stays permissive; `LinkageDrawCoordinator.AuthorizeAsync` is the single gate for roll-call, quick draw, lottery, protocol and shortcut paths, and its hard-block branch (`VerificationRequired == false`) fires `ClassTimeDrawRestrictionNotice` so the button never dies silently. ClassIsland connect/disconnect flows through the same snapshot, so a broken IPC link degrades to "no restriction" instead of a permanent lock. |
 | List management settings | `ListManagement/RollCallListSettingsPage.axaml(.cs)`, `ListManagement/LotteryListSettingsPage.axaml(.cs)`, `ListManagement/RosterImportRegionSelector.axaml(.cs)` | Point-call list and lottery prize-pool viewing/import. Spreadsheet imports let the user pick the import range (worksheet, header row, data row range) through the shared `RosterImportRegionSelector`, which shows a clickable raw row preview and hands the region back through `RegionChanged`; the drawers keep the raw grid, rebuild column mapping on every region change, and re-read the file by name on `SheetSelectionChanged`. |
 | Draw settings | `Picking/DefaultDrawSettingsPage.axaml(.cs)` etc. | Default, roll-call, quick-draw, and lottery draw settings are registered; visible effects must reflect on built-in draw pages. |
 | Personalized appearance settings | `Personalized/AppearanceSettingsPage.axaml(.cs)` | Mutations call `App.Current.RefreshPersonalizedSettings()`. |
 | Personalized music library | `Personalized/MusicSettingsPage.axaml(.cs)` | Page ID `settings.personalized.music`; imports, deletes, and previews managed MP3/WAV/FLAC tracks. |
 | Timer settings | `Personalized/TimerSettingsPage.axaml(.cs)` | Page ID `settings.personalized.timer`, registered only for desktop (`!isMobile`, right after the floating-window page whose window hosts the timer entry); localization lives in `Langs/SettingsPages/Personalized/Timer/`. Four rows under one `S_AutoMiniWindow` heading: `AutoMiniWindowCountdownEnabled` (on by default), `AutoMiniWindowStopwatchEnabled` / `AutoMiniWindowClockEnabled` (both off by default) and the shared `AutoMiniWindowAfterSeconds` (how long the page may sit untouched, NumericUpDown bounded by the model constants, plus 30 s / 1 min / 5 min quick-fill buttons whose `Tag` is the second count). Persist through the page's `Settings.PropertyChanged` → `ConfigHandler.Save()` boundary and clamp the stored threshold in the constructor, so a hand-edited settings file cannot leave an out-of-range value; the runtime behavior stays in `TimerViewModel`/`TimerViewService`, and all four `timer.*` paths are remotely readable/writable through the control-plane settings catalog. |
-| Linkage settings | `Linkage/LinkageSettingsPage.axaml(.cs)` | Top-level `settings.linkage` entry. |
+| Linkage settings | `Linkage/LinkageSettingsPage.axaml(.cs)` | Top-level `settings.linkage` entry. Its first card owns the break ban (`S_External_InstantDrawDisable` → `LinkageSettingsConfig.InstantDrawDisable`, off by default) and its exemption switch (`S_External_VerificationRequired`: on = verify then continue, off = block with the `M_ClassTimeDrawBlocked*` toast); both descriptions must keep stating that an unavailable or unknown source is never blocked. Copy lives in `Langs/SettingsPages/Linkage/` in all three languages, and runtime strings are read through `Resources.ResourceManager.GetString(key, Resources.Culture)` so `Resources.Designer.cs` stays generated. |
 | More settings | `More/MoreSettingsPage.axaml(.cs)` | `settings.more` top-level entry. |
 | Plugins | `Plugins/PluginsSettingsPage.axaml(.cs)` | Desktop-only `settings.plugin` page; left list splits into 已安装/市场, stages local `.srpx` packages, shows load status, toggles plugin enablement, and uninstalls selected plugins for the next restart (config directory preserved). Plugin README renders through Core `MarkdownConvertHelper` + `Styles/RichTextStyles.axaml`. |
 | Update settings | `Update/UpdateSettingsPage.axaml(.cs)` | Shared `settings.update` bottom-nav entry for desktop and mobile. |

From 7668517bd6f71058b4b208d2e7585db69353e5b5 Mon Sep 17 00:00:00 2001
From: Pro-Qin <849806583@qq.com>
Date: Sat, 7 Nov 2026 23:51:58 +0800
Subject: [PATCH 6/9] =?UTF-8?q?fix(quickdraw):=20=E9=97=AA=E6=8A=BD?=
 =?UTF-8?q?=E7=AA=97=E4=B8=8D=E5=86=8D=E6=8A=A2=E7=84=A6=E7=82=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=8A=BD=E5=8F=96=E4=B8=AD=E7=8A=B6=E6=80=81=E5=8F=AF=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

闪抽窗是被悬浮窗按钮叫出来的结果提示，之前 Show 后紧跟 Activate，会把正在放映的 PPT/播放器顶到后台。改为 ShowActivated=false 并在句柄就绪后补 WindowFeatures.NoActivate，与 FloatingWindow 同一套机制；三处 Activate 调用删除，重复触发只保留已有窗口。

同时新增 QuickDrawSettingsConfig.ShowDrawingStatus（默认开），只关掉进行中的「正在抽取」提示行，结果、取消与错误文案照旧显示。
---
 .../Picking/QuickDrawSettingsConfig.cs         | 11 +++++++++++
 .../ControlNode/ControlSettingsLabels.cs       |  8 ++++++++
 SecRandom/App.axaml.cs                         | 14 ++++++++++----
 .../Picking/Resources.Designer.cs              | 18 ++++++++++++++++++
 .../SettingsPages/Picking/Resources.en-US.resx |  2 ++
 .../SettingsPages/Picking/Resources.ja-JP.resx |  6 ++++++
 .../Langs/SettingsPages/Picking/Resources.resx |  2 ++
 .../Services/Settings/SettingsSearchService.cs |  2 +-
 .../MainPages/QuickDrawPageViewModel.cs        |  3 ++-
 SecRandom/Views/MainPages/QuickDrawPage.axaml  |  4 +++-
 .../Picking/QuickDrawSettingsPage.axaml        | 10 ++++++++++
 11 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/SecRandom.Core/Models/SubConfigs/Picking/QuickDrawSettingsConfig.cs b/SecRandom.Core/Models/SubConfigs/Picking/QuickDrawSettingsConfig.cs
index af2092e1..6db88bff 100644
--- a/SecRandom.Core/Models/SubConfigs/Picking/QuickDrawSettingsConfig.cs
+++ b/SecRandom.Core/Models/SubConfigs/Picking/QuickDrawSettingsConfig.cs
@@ -12,6 +12,17 @@ public partial class QuickDrawSettingsConfig : OverridableDrawSettings
     [ObservableProperty] private string _defaultClass = string.Empty;
     [ObservableProperty] private int _disableAfterClick = 1;
 
+    /// <summary>
+    ///     Whether the take-over window shows the "drawing" status line while a draw is running.
+    /// </summary>
+    /// <remarks>
+    ///     The animation itself already tells the class that a draw is in progress, so a text line on top of it
+    ///     costs a re-layout in the middle of a lesson. Turning it off keeps the overlay steady from the moment
+    ///     the button is pressed until the result lands; every other status (no members, draw failed, result
+    ///     count) stays as it is, because those carry information the animation cannot.
+    /// </remarks>
+    [ObservableProperty] private bool _showDrawingStatus = true;
+
     /// <summary>
     ///     The history record group Quick Draw uses by default (an empty string means "use global history").
     /// </summary>
diff --git a/SecRandom.Core/Services/ControlNode/ControlSettingsLabels.cs b/SecRandom.Core/Services/ControlNode/ControlSettingsLabels.cs
index 854322d5..d9a4cb3e 100644
--- a/SecRandom.Core/Services/ControlNode/ControlSettingsLabels.cs
+++ b/SecRandom.Core/Services/ControlNode/ControlSettingsLabels.cs
@@ -340,6 +340,7 @@ private static readonly (string Key, CultureInfo[] Fallback)[] PublishedLanguage
         ["default_class"] = R(Picking, "S_DefaultClass"),
         ["default_pool"] = R(Picking, "S_DefaultPool"),
         ["disable_after_click"] = R(Picking, "S_DisableAfterClick"),
+        ["show_drawing_status"] = R(Picking, "S_ShowDrawingStatus"),
         ["use_global_font"] = R(Picking, "S_FontSource"),
         ["custom_font"] = R(Picking, "S_CustomFont"),
         ["font_size"] = R(Picking, "S_FontSize"),
@@ -436,6 +437,13 @@ private static readonly (string Key, CultureInfo[] Fallback)[] PublishedLanguage
         ["hide_on_foreground"] = R(FloatingWindow, "S_Interaction_HideOnForeground"),
         ["hide_on_foreground_window_titles"] = R(FloatingWindow, "S_Interaction_HideOnForegroundWindowTitles"),
         ["hide_on_foreground_process_names"] = R(FloatingWindow, "S_Interaction_HideOnForegroundProcessNames"),
+        // 自定义文字：内容没有设置页标题可借，故就地三语；开关与字号复用设置页资源。
+        ["enable_floating_window_text"] = R(FloatingWindow, "S_Display_CustomText"),
+        ["floating_window_text"] = L(
+            "悬浮窗自定义文字", "Floating window custom text", "フローティングウィンドウのカスタムテキスト",
+            "显示在悬浮窗上的自定义文字内容", "Custom text shown on the floating window",
+            "フローティングウィンドウに表示するカスタムテキスト"),
+        ["floating_window_text_font_size"] = R(FloatingWindow, "S_Display_CustomTextSize"),
 
         // ---------------- 联动
         ["data_source"] = R(Linkage, "S_External_DataSource"),
diff --git a/SecRandom/App.axaml.cs b/SecRandom/App.axaml.cs
index 2290a330..1c8792ef 100644
--- a/SecRandom/App.axaml.cs
+++ b/SecRandom/App.axaml.cs
@@ -79,6 +79,7 @@
 using SecRandom.Services.Desktop;
 using SecRandom.Services.Draw;
 using SecRandom.Services.Notification;
+using SecRandom.Services.Platform;
 using SecRandom.Services.Profiles;
 using SecRandom.Services.RosterTransfer;
 using SecRandom.Services.Ipc;
@@ -2581,9 +2582,9 @@ public static Task ShowQuickDrawNotificationPreviewWindowAsync(NotificationChann
             quickDraw.NotificationOpacity = Math.Clamp(windowSettings.Transparency, 20, 100);
             var window = GetOrCreateQuickDrawWindow();
             window.Opacity = 1;
+            // 不 Activate：闪抽是覆盖在课堂画面之上的提示，抢焦点会把 PPT/播放器顶到后台
             if (!window.IsVisible)
                 window.Show();
-            window.Activate();
             Dispatcher.UIThread.Post(
                 () => PositionQuickDrawNotificationWindow(window, windowSettings),
                 DispatcherPriority.Render);
@@ -2612,9 +2613,9 @@ private static async Task ShowQuickDrawNotificationWindowAsync(
         quickDraw.NotificationOpacity = Math.Clamp(windowSettings.Transparency, 20, 100);
         var window = GetOrCreateQuickDrawWindow();
         window.Opacity = 1;
+        // 同上：结果窗只做视觉提示，激活它会打断正在演示的前台程序
         if (!window.IsVisible)
             window.Show();
-        window.Activate();
         if (showPreview)
         {
             quickDraw.ShowNotificationPreview(items, preserveQuickDrawResult);
@@ -2656,8 +2657,7 @@ private static async Task ShowQuickDrawWindowAsync()
 
             if (!quickDraw.IsDrawing)
                 await quickDraw.StartAuthorizedTriggeredDrawAsync();
-            else if (_quickDrawWindow is { IsVisible: true })
-                _quickDrawWindow.Activate();
+            // 重复触发时只把已有结果窗留在原位，不再 Activate 夺走前台焦点
             transaction?.Finish(SpanStatus.Ok);
         }
         catch (Exception ex)
@@ -2682,6 +2682,9 @@ private static Window GetOrCreateQuickDrawWindow()
             MinHeight = 160,
             SizeToContent = SizeToContent.WidthAndHeight,
             Topmost = true,
+            // 闪抽窗是被悬浮窗按钮叫出来的结果提示，绝不能把前台窗口（PPT、播放器）顶下去：
+            // 首次 Show 不激活，窗口特性里再补 NoActivate，连后续 Show/Hide 循环也不抢焦点。
+            ShowActivated = false,
             WindowStartupLocation = WindowStartupLocation.CenterScreen,
             WindowDecorations = WindowDecorations.None,
             CanMinimize = false,
@@ -2697,6 +2700,9 @@ private static Window GetOrCreateQuickDrawWindow()
         quickDrawPage.ResultLayoutChanged += resultLayoutChanged;
         _quickDrawWindow.Opened += (_, _) =>
         {
+            // ShowActivated 只作用于首次显示；原生句柄就绪后补上 NoActivate，
+            // 之后每次复用窗口（Hide 再 Show）都不会再夺焦点。
+            _quickDrawWindow.ApplyPlatformFeatures(WindowFeatures.NoActivate, enabled: true);
             ApplyQuickDrawWindowBounds(_quickDrawWindow);
             RequestQuickDrawWindowCentering(_quickDrawWindow);
         };
diff --git a/SecRandom/Langs/SettingsPages/Picking/Resources.Designer.cs b/SecRandom/Langs/SettingsPages/Picking/Resources.Designer.cs
index 34e28217..e17bcca7 100644
--- a/SecRandom/Langs/SettingsPages/Picking/Resources.Designer.cs
+++ b/SecRandom/Langs/SettingsPages/Picking/Resources.Designer.cs
@@ -743,6 +743,24 @@ public static string S_DisableAfterClick_D {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 显示抽取中状态.
+        /// </summary>
+        public static string S_ShowDrawingStatus {
+            get {
+                return ResourceManager.GetString("S_ShowDrawingStatus", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 在闪抽窗口显示“正在抽取”，关闭后抽取期间画面保持上一轮内容，结果落定才刷新.
+        /// </summary>
+        public static string S_ShowDrawingStatus_D {
+            get {
+                return ResourceManager.GetString("S_ShowDrawingStatus_D", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 显示格式.
         /// </summary>
diff --git a/SecRandom/Langs/SettingsPages/Picking/Resources.en-US.resx b/SecRandom/Langs/SettingsPages/Picking/Resources.en-US.resx
index bb49106a..2cea3773 100644
--- a/SecRandom/Langs/SettingsPages/Picking/Resources.en-US.resx
+++ b/SecRandom/Langs/SettingsPages/Picking/Resources.en-US.resx
@@ -31,6 +31,8 @@
   <data name="S_DefaultPool_D" xml:space="preserve"><value>The prize pool used by default when opening the lottery page</value></data>
   <data name="S_DisableAfterClick" xml:space="preserve"><value>Disable After Click</value></data>
   <data name="S_DisableAfterClick_D" xml:space="preserve"><value>Seconds to disable the button after a Quick Draw</value></data>
+  <data name="S_ShowDrawingStatus" xml:space="preserve"><value>Show drawing status</value></data>
+  <data name="S_ShowDrawingStatus_D" xml:space="preserve"><value>Show the drawing status line while a Quick Draw is running; when off the window stays steady until the result lands</value></data>
   <data name="S_FontSource" xml:space="preserve"><value>Font Source</value></data>
   <data name="S_FontSource_D" xml:space="preserve"><value>Follow the global font or specify a font for draw results</value></data>
   <data name="S_CustomFont" xml:space="preserve"><value>Custom Font</value></data>
diff --git a/SecRandom/Langs/SettingsPages/Picking/Resources.ja-JP.resx b/SecRandom/Langs/SettingsPages/Picking/Resources.ja-JP.resx
index 517f1224..2865bf19 100644
--- a/SecRandom/Langs/SettingsPages/Picking/Resources.ja-JP.resx
+++ b/SecRandom/Langs/SettingsPages/Picking/Resources.ja-JP.resx
@@ -93,6 +93,12 @@
   <data name="S_DisableAfterClick_D" xml:space="preserve">
     <value>クイック抽選後にボタンを無効にする秒数</value>
   </data>
+  <data name="S_ShowDrawingStatus" xml:space="preserve">
+    <value>抽選中のステータスを表示</value>
+  </data>
+  <data name="S_ShowDrawingStatus_D" xml:space="preserve">
+    <value>クイック抽選の実行中に「抽選中」を表示します。オフにすると結果が出るまで画面は前回の内容のまま変わりません</value>
+  </data>
   <data name="S_FontSource" xml:space="preserve">
     <value>フォントの指定元</value>
   </data>
diff --git a/SecRandom/Langs/SettingsPages/Picking/Resources.resx b/SecRandom/Langs/SettingsPages/Picking/Resources.resx
index cfd1cb8e..8a2c81b3 100644
--- a/SecRandom/Langs/SettingsPages/Picking/Resources.resx
+++ b/SecRandom/Langs/SettingsPages/Picking/Resources.resx
@@ -41,6 +41,8 @@
   <data name="S_DefaultPool_D" xml:space="preserve"><value>打开抽奖页时默认使用的奖池</value></data>
   <data name="S_DisableAfterClick" xml:space="preserve"><value>点击后禁用时间</value></data>
   <data name="S_DisableAfterClick_D" xml:space="preserve"><value>点击一次闪抽后禁用按钮的秒数</value></data>
+  <data name="S_ShowDrawingStatus" xml:space="preserve"><value>显示抽取中状态</value></data>
+  <data name="S_ShowDrawingStatus_D" xml:space="preserve"><value>在闪抽窗口显示“正在抽取”，关闭后抽取期间画面保持上一轮内容，结果落定才刷新</value></data>
   <data name="S_FontSource" xml:space="preserve"><value>字体来源</value></data>
   <data name="S_FontSource_D" xml:space="preserve"><value>跟随全局字体或为抽取结果单独指定字体</value></data>
   <data name="S_CustomFont" xml:space="preserve"><value>自定义字体</value></data>
diff --git a/SecRandom/Services/Settings/SettingsSearchService.cs b/SecRandom/Services/Settings/SettingsSearchService.cs
index 9545fb11..82e87165 100644
--- a/SecRandom/Services/Settings/SettingsSearchService.cs
+++ b/SecRandom/Services/Settings/SettingsSearchService.cs
@@ -88,7 +88,7 @@ public class SettingsSearchService
             ["settings.picking.quickDraw"] = new HashSet<string>
             {
                 "S_DrawMode", "S_HalfRepeat", "S_DrawType", "S_DefaultClass", "S_DisableAfterClick",
-                "S_QuickDrawHistoryGroup", "S_FontSource",
+                "S_ShowDrawingStatus", "S_QuickDrawHistoryGroup", "S_FontSource",
                 "S_CustomFont", "S_FontSize", "S_DisplayFormat", "S_ShowTags", "S_Animation", "S_AnimationInterval",
                 "S_AutoplayCount", "S_AnimationStyle", "S_ColorTheme", "S_FixedColor", "S_StudentImage",
                 "S_StudentImagePosition", "S_StudentImageSize", "S_AnimationMusic", "S_ResultMusic",
diff --git a/SecRandom/ViewModels/MainPages/QuickDrawPageViewModel.cs b/SecRandom/ViewModels/MainPages/QuickDrawPageViewModel.cs
index 4680007d..881c96df 100644
--- a/SecRandom/ViewModels/MainPages/QuickDrawPageViewModel.cs
+++ b/SecRandom/ViewModels/MainPages/QuickDrawPageViewModel.cs
@@ -237,7 +237,8 @@ private async Task StartDrawCoreAsync(
         const int count = 1;
         ResultItems.Clear();
         IsResultVisible = false;
-        StatusText = QuickDrawResources.M_Drawing;
+        // 关闭后抽取期间不显示"正在抽取"：动画已经在动，多一行字反而会在结果落定前跳一次版
+        StatusText = Config.QuickDrawSettings.ShowDrawingStatus ? QuickDrawResources.M_Drawing : string.Empty;
         _notificationAutoCloseTime = null;
         SetDrawCommandRunning(true);
         try
diff --git a/SecRandom/Views/MainPages/QuickDrawPage.axaml b/SecRandom/Views/MainPages/QuickDrawPage.axaml
index a94d10fb..b67f43f1 100644
--- a/SecRandom/Views/MainPages/QuickDrawPage.axaml
+++ b/SecRandom/Views/MainPages/QuickDrawPage.axaml
@@ -72,7 +72,6 @@
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="vm:QuickDrawResultItem">
                                 <Border Classes="result-animation-item" Margin="4" Padding="14 10" MinWidth="128"
-                                        MaxWidth="360"
                                         CornerRadius="8" BorderThickness="1"
                                         BorderBrush="{Binding AccentBrush}"
                                         Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
@@ -85,9 +84,12 @@
                                                         VerticalAlignment="Center"
                                                         IsVisible="{Binding IsImageBeforeText}" />
                                         <StackPanel Spacing="4" HorizontalAlignment="Center" VerticalAlignment="Center">
+                                            <!-- 折行宽度必须挂在文字上：卡片所在的水平 StackPanel 测量子元素时给出无限宽度，
+                                                 只在 Border 上设 MaxWidth 会让长姓名被裁切而不是换行。 -->
                                             <TextBlock Text="{Binding DisplayText}"
                                                        TextAlignment="Center"
                                                        TextWrapping="Wrap"
+                                                       MaxWidth="360"
                                                        Foreground="{Binding TextBrush}"
                                                        FontSize="{Binding #QuickDraw.ViewModel.ResultFontSize}"
                                                        FontFamily="{Binding #QuickDraw.ViewModel.ResultFontFamily}"
diff --git a/SecRandom/Views/SettingsPages/Picking/QuickDrawSettingsPage.axaml b/SecRandom/Views/SettingsPages/Picking/QuickDrawSettingsPage.axaml
index 5a556d5f..3e7fca17 100644
--- a/SecRandom/Views/SettingsPages/Picking/QuickDrawSettingsPage.axaml
+++ b/SecRandom/Views/SettingsPages/Picking/QuickDrawSettingsPage.axaml
@@ -71,6 +71,16 @@
                 </fa:FASettingsExpander.Footer>
             </fa:FASettingsExpander>
 
+            <!-- 抽取期间的状态行会在结果落定前跳一次版，关掉后画面从按下按钮到出结果保持稳定 -->
+            <fa:FASettingsExpander x:Name="S_ShowDrawingStatus"
+                                   Header="{x:Static lp:Resources.S_ShowDrawingStatus}"
+                                   Description="{x:Static lp:Resources.S_ShowDrawingStatus_D}"
+                                   IconSource="{sr:FluentIconSource {sr:Fi TextFontFilled}}">
+                <fa:FASettingsExpander.Footer>
+                    <ToggleSwitch IsChecked="{Binding Settings.ShowDrawingStatus}" />
+                </fa:FASettingsExpander.Footer>
+            </fa:FASettingsExpander>
+
             <!-- 闪抽没有自己的记录组选择器，所以这里选定的组就是它的默认值：锁定后权重只读该组历史，
                  写出的记录也只进该组。总开关关闭时不显示选择器，改为说明为什么不可用。 -->
             <fa:FASettingsExpander x:Name="S_QuickDrawHistoryGroup"

From cbf76e888a608cfe81ad7cd6dd2756467330cf9a Mon Sep 17 00:00:00 2001
From: Pro-Qin <849806583@qq.com>
Date: Sat, 7 Nov 2026 23:52:01 +0800
Subject: [PATCH 7/9] =?UTF-8?q?feat(floating-window):=20=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=96=87=E5=AD=97=E6=94=AF=E6=8C=81=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=AD=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

FloatingWindowTextFontSize 为 0 时沿用按悬浮窗尺寸自动缩放（11-20px），正数即像素字号（限制 8-72px）。设置页在自定义文字卡片内增加数字框，随开关启用；字号变更经既有 PropertyChanged -> RefreshItems 链路实时生效。
---
 .../FloatingWindowSettingsConfig.cs           |  2 ++
 .../FloatingWindow/Resources.Designer.cs      | 18 ++++++++++++
 .../FloatingWindow/Resources.en-US.resx       |  2 +-
 .../FloatingWindow/Resources.ja-JP.resx       |  2 +-
 .../FloatingWindow/Resources.resx             |  6 ++++
 SecRandom/Views/FloatingWindow.axaml.cs       |  6 +++-
 .../FloatingWindowSettingsPage.axaml          | 29 +++++++++++++------
 7 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/SecRandom.Core/Models/SubConfigs/FloatingWindowSettingsConfig.cs b/SecRandom.Core/Models/SubConfigs/FloatingWindowSettingsConfig.cs
index 0c28b1b4..3e432dee 100644
--- a/SecRandom.Core/Models/SubConfigs/FloatingWindowSettingsConfig.cs
+++ b/SecRandom.Core/Models/SubConfigs/FloatingWindowSettingsConfig.cs
@@ -25,6 +25,8 @@ public partial class FloatingWindowSettingsConfig : ObservableObject
     // 悬浮窗自定义文字：默认关闭；空字符串等于不显示，旧配置缺字段时按默认值加载
     [ObservableProperty] private bool _enableFloatingWindowText;
     [ObservableProperty] private string _floatingWindowText = string.Empty;
+    // 自定义文字字号（像素）：0 表示跟随悬浮窗尺寸自动缩放，与按钮字号保持同一比例
+    [ObservableProperty] private int _floatingWindowTextFontSize;
     [ObservableProperty] private int _longPressDuration = 500;
     [ObservableProperty] private bool _doNotStealFocus = true;
     [ObservableProperty] private bool _hideOnForeground = false;
diff --git a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.Designer.cs b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.Designer.cs
index b4c280a4..128c68ca 100644
--- a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.Designer.cs
+++ b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.Designer.cs
@@ -652,5 +652,23 @@ public static string S_Display_CustomText_D {
                 return ResourceManager.GetString("S_Display_CustomText_D", resourceCulture);
             }
         }
+
+        /// <summary>
+        ///   Looks up a localized string similar to 自定义文字字号.
+        /// </summary>
+        public static string S_Display_CustomTextSize {
+            get {
+                return ResourceManager.GetString("S_Display_CustomTextSize", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to 自定义文字的像素字号，0 表示跟随悬浮窗尺寸自动缩放.
+        /// </summary>
+        public static string S_Display_CustomTextSize_D {
+            get {
+                return ResourceManager.GetString("S_Display_CustomTextSize_D", resourceCulture);
+            }
+        }
     }
 }
diff --git a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.en-US.resx b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.en-US.resx
index f67dd719..2cd4f26a 100644
--- a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.en-US.resx
+++ b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.en-US.resx
@@ -51,5 +51,5 @@
   <data name="S_Interaction_StickToEdgeDisplayStyle"><value>Collapsed handle style</value></data>
   <data name="S_Interaction_StickToEdgeDisplayStyle_D"><value>Choose a roll-call icon, the word “Draw,” or a direction arrow for the edge handle</value></data>
   <data name="S_Dock"><value>Edge Collapse</value></data><data name="S_Dock_Size"><value>Handle size</value></data><data name="S_Dock_Size_D"><value>Adjust the square side length of the edge handle</value></data>
-  <data name="O_StickDisplay_Icon"><value>Icon</value></data><data name="O_StickDisplay_Text"><value>Text</value></data><data name="O_StickDisplay_Arrow"><value>Arrow</value></data><data name="S_Display_CustomText"><value>Custom text</value></data><data name="S_Display_CustomText_D"><value>Show one line of custom text above the floating buttons, long text is trimmed to fit (120 characters max)</value></data>
+  <data name="O_StickDisplay_Icon"><value>Icon</value></data><data name="O_StickDisplay_Text"><value>Text</value></data><data name="O_StickDisplay_Arrow"><value>Arrow</value></data><data name="S_Display_CustomText"><value>Custom text</value></data><data name="S_Display_CustomText_D"><value>Show one line of custom text above the floating buttons, long text is trimmed to fit (120 characters max)</value></data><data name="S_Display_CustomTextSize"><value>Custom text size</value></data><data name="S_Display_CustomTextSize_D"><value>Font size of the custom text in pixels, 0 scales with the floating window</value></data>
 </root>
diff --git a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.ja-JP.resx b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.ja-JP.resx
index 9fa6b950..f063eed5 100644
--- a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.ja-JP.resx
+++ b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.ja-JP.resx
@@ -3,5 +3,5 @@
   <data name="Page_Title"><value>フローティングウィンドウ</value></data><data name="S_Display"><value>ウィンドウ表示</value></data><data name="S_Display_StartupDisplay"><value>起動時に表示</value></data><data name="S_Display_StartupDisplay_D"><value>起動後にフローティングウィンドウを自動で開きます</value></data><data name="S_Display_Opacity"><value>不透明度</value></data><data name="S_Display_Opacity_D"><value>メインとクイック抽選の両方に適用します</value></data><data name="S_Display_TopmostMode"><value>最前面表示モード</value></data><data name="S_Display_TopmostMode_D"><value>他のウィンドウより前に表示するか選択します</value></data><data name="S_Display_TopmostMode_Windows_D"><value>フローティングウィンドウの最前面方法を選択します、UIAccess は再起動時に管理者権限を要求し、取り消しまたは失敗した場合は今回の起動で通常の最前面表示を使用します</value></data><data name="O_TopmostMode_None"><value>最前面にしない</value></data><data name="O_TopmostMode_Topmost"><value>最前面</value></data><data name="O_TopmostMode_UIAccess"><value>UIAccess 最前面</value></data>
   <data name="S_Buttons"><value>フローティング操作</value></data><data name="S_Buttons_RollCall"><value>点呼</value></data><data name="S_Buttons_RollCall_D"><value>点呼の入口を表示します</value></data><data name="S_Buttons_QuickDraw"><value>クイック抽選</value></data><data name="S_Buttons_QuickDraw_D"><value>クイック抽選の入口を表示します</value></data><data name="S_Buttons_Lottery"><value>抽選</value></data><data name="S_Buttons_Lottery_D"><value>抽選の入口を表示します</value></data><data name="S_Buttons_Timer"><value>タイマー</value></data>
   <data name="S_Interaction"><value>移動と端への吸着</value></data><data name="S_Interaction_StickToEdge"><value>端に吸着</value></data><data name="S_Interaction_StickToEdge_D"><value>ドラッグ終了時に現在の画面の左右どちらか近い端へ吸着します</value></data><data name="S_Interaction_Draggable"><value>ドラッグ可能</value></data><data name="S_Interaction_Draggable_D"><value>無効にすると本体とハンドルをドラッグできません</value></data><data name="S_Interaction_DoNotStealFocus"><value>フォーカスを奪わない</value></data><data name="S_Interaction_DoNotStealFocus_D"><value>クリック時に現在のウィンドウからフォーカスを奪わないようにします</value></data><data name="S_Interaction_HideOnForegroundProcessNames_D"><value>セミコロン ; で区切り、プロセス名が一致したら非表示にします（例: WeChat.exe）</value></data><data name="S_Interaction_LongPressDuration"><value>長押し判定時間</value></data><data name="S_Interaction_HideOnForegroundProcessNames"><value>前面プロセス名</value></data><data name="S_Interaction_HideOnForeground_D"><value>前面ウィンドウのタイトルまたはプロセス名が一致したら自動で非表示にします</value></data><data name="S_Interaction_StickToEdgeRecoverSeconds"><value>自動収納までの遅延</value></data><data name="S_Interaction_LongPressDuration_D"><value>長押し操作に必要なミリ秒数</value></data><data name="S_Interaction_HideOnForeground"><value>前面ウィンドウで非表示</value></data><data name="S_Interaction_StickToEdgeRecoverSeconds_D"><value>吸着後に収納するまでの秒数で、0 で展開したままにします</value></data><data name="S_Interaction_HideOnForegroundWindowTitles_D"><value>セミコロン ; で区切り、タイトルに一致する文字があれば非表示にします</value></data><data name="S_Interaction_HideOnForegroundWindowTitles"><value>前面ウィンドウタイトル</value></data>
-  <data name="S_Buttons_EnabledItems"><value>表示する操作</value></data><data name="S_Buttons_EnabledItems_D"><value>メインウィンドウに表示する機能を選択します</value></data><data name="S_Buttons_Placement"><value>操作の配置</value></data><data name="S_Buttons_Placement_D"><value>矩形は2列、縦と横は1列で配置します</value></data><data name="O_Placement_Rectangle"><value>矩形</value></data><data name="O_Placement_Vertical"><value>縦</value></data><data name="O_Placement_Horizontal"><value>横</value></data><data name="S_Buttons_DisplayStyle"><value>表示形式</value></data><data name="S_Buttons_DisplayStyle_D"><value>アイコン、文字、または両方を選択します</value></data><data name="O_DisplayStyle_IconText"><value>アイコンと文字</value></data><data name="O_DisplayStyle_Icon"><value>アイコンのみ</value></data><data name="O_DisplayStyle_Text"><value>文字のみ</value></data><data name="S_Buttons_Size"><value>操作のサイズ</value></data><data name="S_Buttons_Size_D"><value>各操作の正方形サイズを調整します</value></data><data name="O_Size_XXS"><value>極小</value></data><data name="O_Size_XS"><value>とても小さい</value></data><data name="O_Size_S"><value>小</value></data><data name="O_Size_M"><value>中</value></data><data name="O_Size_L"><value>大</value></data><data name="O_Size_XL"><value>とても大きい</value></data><data name="O_Size_XXL"><value>極大</value></data><data name="S_Interaction_StickToEdgeDisplayStyle"><value>収納ハンドルの表示</value></data><data name="S_Interaction_StickToEdgeDisplayStyle_D"><value>点呼アイコン、「抽選」の文字、または矢印を選択します</value></data><data name="S_Dock"><value>端への収納</value></data><data name="S_Dock_Size"><value>ハンドルサイズ</value></data><data name="S_Dock_Size_D"><value>収納ハンドルの正方形サイズを調整します</value></data><data name="O_StickDisplay_Icon"><value>アイコン</value></data><data name="O_StickDisplay_Text"><value>文字</value></data><data name="O_StickDisplay_Arrow"><value>矢印</value></data><data name="S_Display_CustomText"><value>カスタムテキスト</value></data><data name="S_Display_CustomText_D"><value>フローティングウィンドウのボタン上に 1 行のカスタムテキストを表示し、長い場合は省略します（最大 120 文字）</value></data>
+  <data name="S_Buttons_EnabledItems"><value>表示する操作</value></data><data name="S_Buttons_EnabledItems_D"><value>メインウィンドウに表示する機能を選択します</value></data><data name="S_Buttons_Placement"><value>操作の配置</value></data><data name="S_Buttons_Placement_D"><value>矩形は2列、縦と横は1列で配置します</value></data><data name="O_Placement_Rectangle"><value>矩形</value></data><data name="O_Placement_Vertical"><value>縦</value></data><data name="O_Placement_Horizontal"><value>横</value></data><data name="S_Buttons_DisplayStyle"><value>表示形式</value></data><data name="S_Buttons_DisplayStyle_D"><value>アイコン、文字、または両方を選択します</value></data><data name="O_DisplayStyle_IconText"><value>アイコンと文字</value></data><data name="O_DisplayStyle_Icon"><value>アイコンのみ</value></data><data name="O_DisplayStyle_Text"><value>文字のみ</value></data><data name="S_Buttons_Size"><value>操作のサイズ</value></data><data name="S_Buttons_Size_D"><value>各操作の正方形サイズを調整します</value></data><data name="O_Size_XXS"><value>極小</value></data><data name="O_Size_XS"><value>とても小さい</value></data><data name="O_Size_S"><value>小</value></data><data name="O_Size_M"><value>中</value></data><data name="O_Size_L"><value>大</value></data><data name="O_Size_XL"><value>とても大きい</value></data><data name="O_Size_XXL"><value>極大</value></data><data name="S_Interaction_StickToEdgeDisplayStyle"><value>収納ハンドルの表示</value></data><data name="S_Interaction_StickToEdgeDisplayStyle_D"><value>点呼アイコン、「抽選」の文字、または矢印を選択します</value></data><data name="S_Dock"><value>端への収納</value></data><data name="S_Dock_Size"><value>ハンドルサイズ</value></data><data name="S_Dock_Size_D"><value>収納ハンドルの正方形サイズを調整します</value></data><data name="O_StickDisplay_Icon"><value>アイコン</value></data><data name="O_StickDisplay_Text"><value>文字</value></data><data name="O_StickDisplay_Arrow"><value>矢印</value></data><data name="S_Display_CustomText"><value>カスタムテキスト</value></data><data name="S_Display_CustomText_D"><value>フローティングウィンドウのボタン上に 1 行のカスタムテキストを表示し、長い場合は省略します（最大 120 文字）</value></data><data name="S_Display_CustomTextSize"><value>カスタムテキストの文字サイズ</value></data><data name="S_Display_CustomTextSize_D"><value>カスタムテキストのピクセル文字サイズで、0 はフローティングウィンドウのサイズに合わせて自動調整します</value></data>
 </root>
diff --git a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.resx b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.resx
index 3927f453..c1b8dc5d 100644
--- a/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.resx
+++ b/SecRandom/Langs/SettingsPages/FloatingWindow/Resources.resx
@@ -219,4 +219,10 @@
   <data name="S_Display_CustomText_D" xml:space="preserve">
     <value>在悬浮窗按钮上方显示一行自定义文字，过长时自动省略（最多 120 字）</value>
   </data>
+  <data name="S_Display_CustomTextSize" xml:space="preserve">
+    <value>自定义文字字号</value>
+  </data>
+  <data name="S_Display_CustomTextSize_D" xml:space="preserve">
+    <value>自定义文字的像素字号，0 表示跟随悬浮窗尺寸自动缩放</value>
+  </data>
 </root>
diff --git a/SecRandom/Views/FloatingWindow.axaml.cs b/SecRandom/Views/FloatingWindow.axaml.cs
index bbdcf1a7..765652a0 100644
--- a/SecRandom/Views/FloatingWindow.axaml.cs
+++ b/SecRandom/Views/FloatingWindow.axaml.cs
@@ -397,7 +397,11 @@ private void ApplyCustomText(FloatingWindowSettingsConfig settings, double conte
         }
 
         CustomTextBlock.Text = text;
-        CustomTextBlock.FontSize = Math.Clamp(settings.FloatingWindowSize * 0.25, 11, 20);
+        // 0 = 跟随悬浮窗尺寸自动缩放（旧行为）；显式配置时按像素取值，仍夹在可读区间内
+        var configuredFontSize = settings.FloatingWindowTextFontSize;
+        CustomTextBlock.FontSize = configuredFontSize > 0
+            ? Math.Clamp(configuredFontSize, 8, 72)
+            : Math.Clamp(settings.FloatingWindowSize * 0.25, 11, 20);
         CustomTextBlock.MaxWidth = Math.Clamp(contentWidth > 1 ? contentWidth : 160, 120, 360);
     }
 
diff --git a/SecRandom/Views/SettingsPages/Personalized/FloatingWindowSettingsPage.axaml b/SecRandom/Views/SettingsPages/Personalized/FloatingWindowSettingsPage.axaml
index 5402bc60..ccecfae2 100644
--- a/SecRandom/Views/SettingsPages/Personalized/FloatingWindowSettingsPage.axaml
+++ b/SecRandom/Views/SettingsPages/Personalized/FloatingWindowSettingsPage.axaml
@@ -56,15 +56,26 @@
                                    Description="{x:Static lsp:Resources.S_Display_CustomText_D}"
                                    IconSource="{sr:FluentIconSource {sr:Fi TextFontFilled}}">
                 <fa:FASettingsExpander.Footer>
-                    <Grid ColumnDefinitions="260,Auto" ColumnSpacing="12">
-                        <TextBox Text="{Binding Settings.FloatingWindowText}"
-                                 IsEnabled="{Binding Settings.EnableFloatingWindowText}"
-                                 MaxLength="120"
-                                 AcceptsReturn="False"
-                                 TextWrapping="NoWrap" />
-                        <ToggleSwitch Grid.Column="1"
-                                      IsChecked="{Binding Settings.EnableFloatingWindowText}" />
-                    </Grid>
+                    <StackPanel Spacing="8">
+                        <Grid ColumnDefinitions="260,Auto" ColumnSpacing="12">
+                            <TextBox Text="{Binding Settings.FloatingWindowText}"
+                                     IsEnabled="{Binding Settings.EnableFloatingWindowText}"
+                                     MaxLength="120"
+                                     AcceptsReturn="False"
+                                     TextWrapping="NoWrap" />
+                            <ToggleSwitch Grid.Column="1"
+                                          IsChecked="{Binding Settings.EnableFloatingWindowText}" />
+                        </Grid>
+                        <!-- 0 = 跟随悬浮窗尺寸自动缩放，与按钮字号同一比例 -->
+                        <StackPanel Orientation="Horizontal" Spacing="12"
+                                    IsEnabled="{Binding Settings.EnableFloatingWindowText}">
+                            <TextBlock Text="{x:Static lsp:Resources.S_Display_CustomTextSize}"
+                                       VerticalAlignment="Center" />
+                            <NumericUpDown Value="{Binding Settings.FloatingWindowTextFontSize}"
+                                           Minimum="0" Maximum="72" Increment="1"
+                                           FormatString="0" MinWidth="140" />
+                        </StackPanel>
+                    </StackPanel>
                 </fa:FASettingsExpander.Footer>
             </fa:FASettingsExpander>
 

From 59f3b83259aae3c41aaca0c470b4eed1e8db7fb1 Mon Sep 17 00:00:00 2001
From: Pro-Qin <849806583@qq.com>
Date: Sat, 7 Nov 2026 23:52:02 +0800
Subject: [PATCH 8/9] =?UTF-8?q?docs(agents):=20=E8=AE=B0=E5=BD=95=E9=97=AA?=
 =?UTF-8?q?=E6=8A=BD=E7=AA=97=E7=A6=81=E6=BF=80=E6=B4=BB=E3=80=81=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=BC=80=E5=85=B3=E3=80=81=E5=AD=97=E5=8F=B7=E4=B8=8E?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E7=BD=AE=E9=A1=B9=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SecRandom/AGENTS.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SecRandom/AGENTS.md b/SecRandom/AGENTS.md
index efcb8982..273ad907 100644
--- a/SecRandom/AGENTS.md
+++ b/SecRandom/AGENTS.md
@@ -177,6 +177,10 @@ SecRandom/
 - History record groups (历史记录组, issue #294) add a fourth selector to the roll-call and lottery control panels. `RollCallPageViewModel`/`LotteryPageViewModel` own `SelectedHistoryGroup`, `HistoryGroupOptions`, and the derived `CurrentHistoryGroup`, and they freeze it at the same moment the candidate pool is snapshotted (`StartDrawCoreAsync`) so a mid-draw change cannot split weights from the record marker. Two rules are load-bearing: (1) `CurrentHistoryGroup` is a **tri-state** `string?` and returns `null` whenever the selector is not visible (`Config.General.HistoryGroups.Enabled` off, or the per-page `MoreSettings.{RollCall,Lottery}HistoryGroupSelector` off), so hiding the control can never leave a stale hidden value silently scoping draws — while the panel's first option (默认记录组) maps to the empty string, i.e. "only records that carry no group marker", and a name maps to that one group; (2) selecting a group stays an ordinary page state and is deliberately **not** a `SecurityOperation` — it is the same class of action as switching list/group/gender, and the feature only changes which history the fairness weights read. The main panels deliberately show the selector and nothing else: no locked-group chip, no "this group has no records yet" hint, and no clear-selection button, so picking a group is a plain `ComboBox` choice. The lottery page scopes the *student* history axis (`HistoryGroupKind.RollCall`) because prize history does not feed draw weights on the production path; the chosen name is still stamped onto the prize records for viewing/export. Group management (create/rename/two-step delete) lives on the history-management settings page (`Views/SettingsPages/History/HistoryManagementSettingsPage`), not in the main pages and not in the draw settings, which is also why its search entries are no longer in `SettingsSearchService.PickingPageSettingIds`.
 - Quick Draw has no group selector of its own, so `QuickDrawSettingsConfig.HistoryGroup` is its *default* record group: `QuickDrawPageViewModel.ResolveQuickDrawHistoryGroup()` re-validates that name on every draw against `IHistoryGroupCatalog.GetGroupNames(HistoryGroupKind.RollCall)` and returns a **tri-state** `string?`: `null` (no group scope at all) when the feature switch is off or the configured name was renamed/deleted, `""` (the default record group) when no group is configured, and the name otherwise — never draw against a ghost group name, because that would silently equalize weights while the user believes the lock is on, and never turn "feature off" into `""`, because that would silently narrow the weights to ungrouped records. The resolved value is frozen next to the candidate snapshot and flows into both `DrawStudentsAsync` and `StudentDrawCommit`. `QuickDrawPage.axaml` has no draw button (the floating window generates it), so the lock is disclosed as a small hint line under the result area, and `QuickDrawSettingsPage` shows the picker plus an explanation instead of hiding the whole card when the feature switch is off.
 - The quick-draw window re-centers on every size change, not just when it opens. `QuickDrawPage` raises `ResultLayoutChanged` after each result layout pass and `App` answers it with `RequestQuickDrawWindowCentering`; `SizeChanged` repositions from `e.NewSize` (window `Bounds` lags the layout that raised it) and `_positioningQuickDrawWindow` keeps a position write from re-entering. Never write `Position` when the computed target already equals the current one, and never subscribe `PositionChanged` back into this path — both turn a one-shot correction into a jitter loop. The window is `SizeToContent` driven, so any fixed `Width`/`Height` write conflicts with it; the result area must also be width-filling with a single-card `MaxWidth`, otherwise a long name widens the whole row and visually drags the group off center.
+- The quick-draw window never takes focus. It is constructed with `ShowActivated = false` and, once its handle exists, requests `WindowFeatures.NoActivate` through `ApplyPlatformFeatures` — the same mechanism `FloatingWindow` uses. The former `Show()`/`Activate()` calls on this path were removed on purpose; re-adding one steals the teacher's focus while they are mid-sentence, and the window needs no keyboard input (only clicks: 连续点击关闭).
+- Quick-draw status text is optional. `QuickDrawSettingsConfig.ShowDrawingStatus` (default on) gates only the in-progress «正在抽取» line, so a class-time draw does not spend a second on decoration; the committed-result, cancelled, and error lines must keep showing regardless.
+- Floating-window custom text size is user-owned. `FloatingWindowTextFontSize == 0` means auto (`FloatingWindowSize * 0.25`, clamped 11–20), any positive value is the pixel size (clamped 8–72); it reaches an open window through the existing `FloatingWindowSettings.PropertyChanged` → `RefreshItems` path, so do not add a second apply route.
+- A new user-facing setting needs the full quartet: the `ObservableProperty` on the config model, three-language keys in `Langs/SettingsPages/**` **plus** the hand-written designer property, a search-registration entry when that page's ids are whitelisted (`SettingsSearchService.PickingPageSettingIds`; excluded-mode pages need none), and a `ControlSettingsLabels` row when the value should carry a name in the remote control catalog.
 - Global shortcuts are an app-layer hosted service. `GlobalShortcutService` registers the nine V2-parity actions through Windows `RegisterHotKey`, dispatches them to Avalonia's UI thread, and degrades without registrations on other platforms. Changes to `MoreSettings.EnableShortcut` or a binding apply without restarting.
 - Floating window settings are live-applied to an open `FloatingWindow`: button selection, layout, display style, size, opacity, topmost mode, custom text, and dragging must not require reopening the window. `FloatingWindowSettingsConfig.EnableFloatingWindowText`/`FloatingWindowText` drive one non-hit-testable line above `ButtonsPanel`; the text is folded to a single line, trimmed with `CharacterEllipsis`, sized from `FloatingWindowSize`, and lives inside `ExpandedContent` so the docked handle never shows it.
 - Course linkage is app-layer only. `CourseLinkageHostedService` is the sole course-boundary scheduler; CSES parsing/file access stays behind `ICsesScheduleStore`, and ClassIsland types stay inside `ClassIslandScheduleSource`. Use `LinkageDrawCoordinator` for every local, protocol, or shortcut draw/reset path so confirmed non-class restrictions cannot be bypassed. Unknown/unavailable sources are permissive. A local refusal must explain itself: the `VerificationRequired == false` branch (there is no prompt to carry the reason) calls `ClassTimeDrawRestrictionNotice.Show`, a throttled toast built from `M_ClassTimeDrawBlocked`/`M_ClassTimeDrawBlockedGeneric`, while `EvaluateGate` stays silent because a remote `draw.trigger` is answered in its receipt and an unattended classroom machine must not collect dialogs.

From 8ea8d200e8b086b2a50ae090b3b2a1d384359e44 Mon Sep 17 00:00:00 2001
From: Pro-Qin <849806583@qq.com>
Date: Sun, 8 Nov 2026 00:28:55 +0800
Subject: [PATCH 9/9] =?UTF-8?q?fix(verification):=20=E8=AF=81=E6=98=8E?=
 =?UTF-8?q?=E9=98=9F=E5=88=97=E5=85=A8=E9=83=A8=E4=B8=BA=E7=BB=88=E6=80=81?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=86=8D=E6=8B=96=E5=9E=AE=20Host?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

达到重试上限或冲突的证明项会把 NextAttemptUtc 停在 DateTimeOffset.MaxValue，表示不再自动重试。后台循环却对它取最小值算等待时长，得到约八千年的 TimeSpan，SemaphoreSlim.WaitAsync 的直接把它判为非法参数抛出；BackgroundService 异常会按 StopHost 处理，整台机器的后台服务随之停止。只要历史上有一条提交失败到上限，之后每次启动都会崩在这里。

改为跳过终态项求最小值，全部终态时直接无限等待；同时对等待时长再加一层一天的上限钳制，任何来源的超长间隔都不会再走到信号量里。
---
 .../DrawProofAttestationService.cs            | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/SecRandom/Services/Verification/DrawProofAttestationService.cs b/SecRandom/Services/Verification/DrawProofAttestationService.cs
index 00923876..06764424 100644
--- a/SecRandom/Services/Verification/DrawProofAttestationService.cs
+++ b/SecRandom/Services/Verification/DrawProofAttestationService.cs
@@ -37,6 +37,10 @@ public sealed class DrawProofAttestationService(
     private static readonly TimeSpan MaximumRetryDelay = TimeSpan.FromMinutes(15);
     private static readonly TimeSpan DisabledModePollInterval = TimeSpan.FromSeconds(30);
 
+    // SemaphoreSlim.WaitAsync(TimeSpan) only accepts -1ms, 0, or up to int.MaxValue milliseconds.
+    // A terminal queue item parks on DateTimeOffset.MaxValue, so the loop's own delay must be capped.
+    private static readonly TimeSpan MaximumWaitDelay = TimeSpan.FromDays(1);
+
     private static readonly JsonSerializerOptions JsonOptions = new(JsonSerializerDefaults.Web)
     {
         WriteIndented = true,
@@ -145,7 +149,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
         while (!stoppingToken.IsCancellationRequested)
         {
-            var delay = GetNextDelay();
+            var delay = ClampWaitDelay(GetNextDelay());
             try
             {
                 await _wake.WaitAsync(delay, stoppingToken).ConfigureAwait(false);
@@ -172,11 +176,32 @@ private TimeSpan GetNextDelay()
             if (!IsEnabled)
                 return DisabledModePollInterval;
 
-            var delay = _pending.Values.Min(item => item.NextAttemptUtc) - DateTimeOffset.UtcNow;
+            // Terminal items (retry exhausted / conflict) park on DateTimeOffset.MaxValue to mean
+            // "never retry automatically". Taking the minimum over them would otherwise ask the
+            // loop for a wait of roughly eight thousand years and take the whole host down.
+            var next = DateTimeOffset.MaxValue;
+            foreach (var item in _pending.Values)
+            {
+                if (item.NextAttemptUtc < next)
+                    next = item.NextAttemptUtc;
+            }
+
+            if (next == DateTimeOffset.MaxValue)
+                return Timeout.InfiniteTimeSpan;
+
+            var delay = next - DateTimeOffset.UtcNow;
             return delay <= TimeSpan.Zero ? TimeSpan.Zero : delay;
         }
     }
 
+    private static TimeSpan ClampWaitDelay(TimeSpan delay)
+    {
+        if (delay == Timeout.InfiniteTimeSpan || delay <= MaximumWaitDelay)
+            return delay;
+
+        return MaximumWaitDelay;
+    }
+
     private async Task ProcessDueAsync(bool force, CancellationToken stoppingToken)
     {
         if (!IsEnabled)