From f6a1aa058e8af8248ae734ef794bbd0d51d4737a Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:12:35 +0700
Subject: [PATCH 01/27] ux(ip): 256px compact IP editor, shared material circle
 chevrons, rounded port, remove full address checkbox

---
 IpConnectWizardWindow.xaml | 122 +++++++++++++++++++------------------
 1 file changed, 62 insertions(+), 60 deletions(-)

diff --git a/IpConnectWizardWindow.xaml b/IpConnectWizardWindow.xaml
index 79993b27e..59efc2062 100644
--- a/IpConnectWizardWindow.xaml
+++ b/IpConnectWizardWindow.xaml
@@ -1,8 +1,9 @@
 <Window x:Class="ArIED61850Tester.IpConnectWizardWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Add IEC 61850 IED" Width="480" MinWidth="460" MaxHeight="390"
-        SizeToContent="Height" WindowStartupLocation="CenterOwner"
+        Title="Add IEC 61850 IED" Width="480" Height="323" MinWidth="460" MaxHeight="390"
+        SizeToContent="Manual" WindowStartupLocation="Manual"
+        SourceInitialized="Wizard_SourceInitialized"
         ResizeMode="NoResize" ShowInTaskbar="False"
         Background="{DynamicResource TaskDialogCanvas}"
         FontFamily="{DynamicResource AppFontFamily}" Icon="Assets/app-icon.ico">
@@ -39,27 +40,31 @@
                 <Setter Property="Width" Value="7"/>
                 <Setter Property="Margin" Value="0"/>
             </Style>
+            <!-- Same circular Material/operator chevrons as Command Dock.
+                 Reuse the shared, already-proven glyph geometry instead of drawing
+                 a second miniature stroke icon with a different appearance. -->
             <Style x:Key="SmartIpHistoryButton" TargetType="{x:Type Button}">
                 <Setter Property="Cursor" Value="Hand"/>
                 <Setter Property="Background" Value="Transparent"/>
                 <Setter Property="BorderThickness" Value="0"/>
+                <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type Button}">
-                            <Border x:Name="HistoryChrome" Background="{TemplateBinding Background}"
-                                    CornerRadius="0,8,8,0">
-                                <Path Data="M 2,5 L 7,10 L 12,5" Width="14" Height="14"
-                                      Stretch="Uniform" Stroke="{StaticResource TaskDialogMuted}"
-                                      StrokeThickness="1.7" StrokeStartLineCap="Round"
-                                      StrokeEndLineCap="Round" StrokeLineJoin="Round"
-                                      HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                            <Border x:Name="HistoryChrome" Width="31" Height="31"
+                                    CornerRadius="16" Background="Transparent"
+                                    HorizontalAlignment="Center" VerticalAlignment="Center">
+                                <Viewbox Width="19" Height="19" HorizontalAlignment="Center" VerticalAlignment="Center">
+                                    <Path Data="{StaticResource OperatorCommandDockChevronDownIcon}"
+                                          Fill="{StaticResource TaskDialogMuted}" Stretch="Uniform"/>
+                                </Viewbox>
                             </Border>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter TargetName="HistoryChrome" Property="Background" Value="#ECF3FF"/>
+                                    <Setter TargetName="HistoryChrome" Property="Background" Value="#EAF2FF"/>
                                 </Trigger>
                                 <Trigger Property="IsKeyboardFocused" Value="True">
-                                    <Setter TargetName="HistoryChrome" Property="Background" Value="#ECF3FF"/>
+                                    <Setter TargetName="HistoryChrome" Property="Background" Value="#EAF2FF"/>
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -75,30 +80,34 @@
                             <StackPanel>
                                 <ToggleButton x:Name="AdvancedToggle"
                                               AutomationProperties.Name="Advanced settings"
-                                              HorizontalAlignment="Left" Cursor="Hand"
+                                              HorizontalAlignment="Left" VerticalAlignment="Center"
+                                              FocusVisualStyle="{x:Null}" Cursor="Hand"
                                               IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
                                     <ToggleButton.Template>
                                         <ControlTemplate TargetType="{x:Type ToggleButton}">
-                                            <Border x:Name="Chrome" CornerRadius="6" Padding="2,5"
+                                            <Border x:Name="Chrome" CornerRadius="7" Padding="4,4"
                                                     Background="Transparent">
-                                                <StackPanel Orientation="Horizontal">
-                                                    <Path x:Name="AdvancedChevron" Data="M 2,3 L 6,7 L 10,3" Width="12" Height="12"
-                                                          Stretch="Uniform" Stroke="{StaticResource TaskDialogMuted}"
-                                                          StrokeThickness="1.5" StrokeStartLineCap="Round" StrokeEndLineCap="Round"
-                                                          VerticalAlignment="Center"/>
-                                                    <TextBlock Text="Advanced settings"
-                                                               Margin="8,0,0,0" FontSize="11.5"
+                                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                                                    <Viewbox x:Name="ChevronClosed" Width="19" Height="19"
+                                                             VerticalAlignment="Center">
+                                                        <Path Data="{StaticResource OperatorCommandDockChevronDownIcon}"
+                                                              Fill="{StaticResource TaskDialogMuted}" Stretch="Uniform"/>
+                                                    </Viewbox>
+                                                    <Viewbox x:Name="ChevronOpen" Width="19" Height="19"
+                                                             VerticalAlignment="Center" Visibility="Collapsed">
+                                                        <Path Data="{StaticResource OperatorCommandDockChevronUpIcon}"
+                                                              Fill="{StaticResource TaskDialogMuted}" Stretch="Uniform"/>
+                                                    </Viewbox>
+                                                    <TextBlock Text="Advanced settings" FontSize="11.5"
+                                                               Margin="8,0,0,0"
                                                                Foreground="{StaticResource TaskDialogMuted}"
                                                                VerticalAlignment="Center"/>
                                                 </StackPanel>
                                             </Border>
                                             <ControlTemplate.Triggers>
                                                 <Trigger Property="IsChecked" Value="True">
-                                                    <Setter TargetName="AdvancedChevron" Property="RenderTransform">
-                                                        <Setter.Value>
-                                                            <RotateTransform Angle="180" CenterX="6" CenterY="6"/>
-                                                        </Setter.Value>
-                                                    </Setter>
+                                                    <Setter TargetName="ChevronClosed" Property="Visibility" Value="Collapsed"/>
+                                                    <Setter TargetName="ChevronOpen" Property="Visibility" Value="Visible"/>
                                                 </Trigger>
                                                 <Trigger Property="IsMouseOver" Value="True">
                                                     <Setter TargetName="Chrome" Property="Background" Value="#EAF2FF"/>
@@ -146,7 +155,7 @@
                 <TextBlock Text="IP address" FontSize="12" FontWeight="SemiBold"
                            Foreground="{StaticResource TaskDialogInk}" Margin="0,0,0,8"/>
                 <Grid>
-                    <Border x:Name="IpEditorHost" Height="43" CornerRadius="9"
+                    <Border x:Name="IpEditorHost" Width="256" Height="43" HorizontalAlignment="Left" CornerRadius="9"
                             BorderThickness="1" Background="{StaticResource TaskDialogCard}">
                         <Border.Style>
                             <Style TargetType="Border">
@@ -165,10 +174,10 @@
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="1"/>
-                                <ColumnDefinition Width="40"/>
+                                <ColumnDefinition Width="37"/>
                             </Grid.ColumnDefinitions>
                             <StackPanel x:Name="OctetEditor" Orientation="Horizontal"
-                                        HorizontalAlignment="Center"
+                                        HorizontalAlignment="Left" Margin="11,0,0,0"
                                         VerticalAlignment="Center">
                                 <TextBox x:Name="Octet1Box" Style="{StaticResource SmartIpOctet}"
                                          AutomationProperties.Name="IP address, group 1"/>
@@ -182,7 +191,15 @@
                                 <TextBox x:Name="Octet4Box" Style="{StaticResource SmartIpOctet}"
                                          AutomationProperties.Name="IP address, group 4"/>
                             </StackPanel>
-                            <Border Grid.Column="1" Height="20"
+                            <TextBox x:Name="RawIpBox" Grid.Column="0" Height="40"
+                                         Margin="8,0,1,0" Padding="4,6"
+                                         VerticalContentAlignment="Center" Visibility="Collapsed"
+                                         FontSize="12.5" FontWeight="Medium" BorderThickness="0"
+                                         Foreground="{StaticResource TaskDialogInk}" Background="Transparent"
+                                         Text="{Binding RelayIpAddress, RelativeSource={RelativeSource AncestorType=Window}, UpdateSourceTrigger=LostFocus}"
+                                         ToolTip="Enter a full IP address"
+                                         AutomationProperties.Name="IP address"/>
+                                <Border Grid.Column="1" Height="20"
                                     Background="{StaticResource TaskDialogBorder}"
                                     VerticalAlignment="Center"/>
                             <Button x:Name="HistoryButton" Grid.Column="2"
@@ -192,15 +209,6 @@
                                     Click="HistoryButton_Click"/>
                         </Grid>
                     </Border>
-                    <TextBox x:Name="RawIpBox" Height="43" Padding="12,7"
-                             VerticalContentAlignment="Center" Visibility="Collapsed"
-                             FontSize="13"
-                             Foreground="{StaticResource TaskDialogInk}"
-                             Background="{StaticResource TaskDialogCard}"
-                             BorderBrush="{StaticResource TaskDialogBorder}"
-                             Text="{Binding RelayIpAddress, RelativeSource={RelativeSource AncestorType=Window}, UpdateSourceTrigger=LostFocus}"
-                             ToolTip="Enter an IP address manually"
-                             AutomationProperties.Name="Manual IP address"/>
                 </Grid>
 
                 <Popup x:Name="HistoryPopup" PlacementTarget="{Binding ElementName=IpEditorHost}"
@@ -259,32 +267,26 @@
 
                 <Expander x:Name="MoreOptionsExpander" Margin="0,12,0,0"
                           Style="{StaticResource SmartIpOptionsExpander}"
+                          Expanded="MoreOptionsExpander_ExpandedCollapsed"
+                          Collapsed="MoreOptionsExpander_ExpandedCollapsed"
                           AutomationProperties.Name="Advanced connection settings">
-                    <Grid Margin="2,9,0,0">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="126"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <StackPanel>
-                            <TextBlock Text="Port" FontSize="11"
-                                       Foreground="{StaticResource TaskDialogMuted}"
-                                       Margin="0,0,0,5"/>
-                            <TextBox x:Name="MmsPortBox" Width="94" Height="34"
-                                     HorizontalAlignment="Left" Padding="10,5"
+                    <StackPanel Margin="4,8,0,0">
+                        <TextBlock Text="Port" FontSize="11"
+                                   Foreground="{StaticResource TaskDialogMuted}"
+                                   Margin="0,0,0,6"/>
+                        <Border Width="100" Height="36" HorizontalAlignment="Left"
+                                CornerRadius="9" BorderThickness="1"
+                                Background="{StaticResource TaskDialogCard}"
+                                BorderBrush="{StaticResource TaskDialogBorder}">
+                            <TextBox x:Name="MmsPortBox"
+                                     Height="34" Margin="2,0" Padding="8,5"
+                                     BorderThickness="0" Background="Transparent"
                                      FontSize="12" VerticalContentAlignment="Center"
                                      Foreground="{StaticResource TaskDialogInk}"
-                                     Background="{StaticResource TaskDialogCard}"
-                                     BorderBrush="{StaticResource TaskDialogBorder}"
-                                     ToolTip="Default port: 102"
+                                     ToolTip="Default MMS port: 102"
                                      Text="{Binding MmsPortText, RelativeSource={RelativeSource AncestorType=Window}, UpdateSourceTrigger=PropertyChanged}"/>
-                        </StackPanel>
-                        <CheckBox x:Name="ManualAddressCheck" Grid.Column="1"
-                                  Content="Use full address" Margin="2,17,0,0"
-                                  VerticalAlignment="Center" FontSize="11.5"
-                                  Foreground="{StaticResource TaskDialogMuted}"
-                                  ToolTip="Use this for other address formats"
-                                  Click="ManualAddressCheck_Click"/>
-                    </Grid>
+                        </Border>
+                    </StackPanel>
                 </Expander>
 
                 <TextBlock x:Name="WizardStatusText" Margin="2,9,0,0"

From e3ce74c7c882bf7be607a84841a31f91b79c92fc Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:14:14 +0700
Subject: [PATCH 02/27] fix(ip): prepaint DPI-aware owner centering, fixed
 heights, automatic IPv6 fallback and shared history

---
 IpConnectWizardWindow.xaml.cs | 86 +++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 38 deletions(-)

diff --git a/IpConnectWizardWindow.xaml.cs b/IpConnectWizardWindow.xaml.cs
index 0ffa2216c..1a0f89ce6 100644
--- a/IpConnectWizardWindow.xaml.cs
+++ b/IpConnectWizardWindow.xaml.cs
@@ -7,6 +7,7 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;
+using System.Windows.Media;
 using ArIED61850Tester.Services;
 
 namespace ArIED61850Tester;
@@ -36,6 +37,9 @@ public string MmsPortText
     private readonly bool _rememberDiscoveryEndpoint;
     private readonly ICollectionView _historyView;
     private bool _updatingOctets;
+    private bool _rawAddressMode;
+    private const double CollapsedDialogHeight = 323;
+    private const double ExpandedDialogHeight = 378;
     public int MmsPort { get; private set; } = 102;
 
     // UI projection ONLY; UserPreferenceStore remains the sole persistence authority.
@@ -75,12 +79,15 @@ public IpConnectWizardWindow(string initialIp = "", int initialPort = 102,
         if (selectedPort != 102)
             MoreOptionsExpander.IsExpanded = true;
 
+        // Set final dimensions before WPF creates the HWND.
+        Height = MoreOptionsExpander.IsExpanded ? ExpandedDialogHeight : CollapsedDialogHeight;
+
         foreach (var box in Octets)
             DataObject.AddPastingHandler(box, Octet_Pasting);
 
         Loaded += (_, _) =>
         {
-            if (ManualAddressCheck.IsChecked == true) RawIpBox.Focus();
+            if (_rawAddressMode) RawIpBox.Focus();
             else Octet1Box.Focus();
         };
     }
@@ -129,7 +136,6 @@ private void ApplyAddress(string address)
         RelayIpAddress = address;
         if (TrySplitIpv4(address, out var parts))
         {
-            ManualAddressCheck.IsChecked = false;
             _updatingOctets = true;
             try
             {
@@ -141,13 +147,12 @@ private void ApplyAddress(string address)
         }
         else if (!string.IsNullOrWhiteSpace(address))
         {
-            ManualAddressCheck.IsChecked = true;
+            // Existing IPv6 history stays available without a visible mode toggle.
             RawIpBox.Text = address;
             SetAddressMode(true);
         }
         else
         {
-            ManualAddressCheck.IsChecked = false;
             _updatingOctets = true;
             try { foreach (var box in Octets) box.Clear(); }
             finally { _updatingOctets = false; }
@@ -156,49 +161,47 @@ private void ApplyAddress(string address)
         WizardStatusText.Text = string.Empty;
     }
 
-    private void SetAddressMode(bool manual)
+    private void SetAddressMode(bool raw)
     {
-        IpEditorHost.Visibility = manual ? Visibility.Collapsed : Visibility.Visible;
-        OctetEditor.Visibility = manual ? Visibility.Collapsed : Visibility.Visible;
-        HistoryButton.Visibility = manual ? Visibility.Collapsed : Visibility.Visible;
-        RawIpBox.Visibility = manual ? Visibility.Visible : Visibility.Collapsed;
-        if (manual)
-            MoreOptionsExpander.IsExpanded = true;
-        AddressHintText.Text = manual
+        _rawAddressMode = raw;
+        // One field and one history dropdown remain visible in both modes.
+        OctetEditor.Visibility = raw ? Visibility.Collapsed : Visibility.Visible;
+        RawIpBox.Visibility = raw ? Visibility.Visible : Visibility.Collapsed;
+        AddressHintText.Text = raw
             ? "Enter the address exactly as provided."
             : "Example: 192.168.1.10";
     }
 
-    private void ManualAddressCheck_Click(object sender, RoutedEventArgs e)
+    private void MoreOptionsExpander_ExpandedCollapsed(object sender, RoutedEventArgs e)
     {
-        var manual = ManualAddressCheck.IsChecked == true;
-        if (manual && TryNormalizeIpv4Octets(Octets.Select(b => b.Text).ToArray(), out var ip))
-        {
-            RelayIpAddress = ip;
-            RawIpBox.Text = ip;
-        }
-        else if (!manual && TrySplitIpv4(RawIpBox.Text, out var parts))
+        // User disclosure may grow the dialog. No startup positioning here.
+        if (IsLoaded && ReferenceEquals(e.OriginalSource, MoreOptionsExpander))
+            Height = MoreOptionsExpander.IsExpanded ? ExpandedDialogHeight : CollapsedDialogHeight;
+    }
+
+    private void Wizard_SourceInitialized(object? sender, EventArgs e)
+    {
+        // HWND exists but is not yet painted. Position before ShowDialog displays.
+        if (Owner is { IsVisible: true } owner &&
+            owner.ActualWidth > 0 && owner.ActualHeight > 0)
         {
-            _updatingOctets = true;
-            try
+            var centerPx = owner.PointToScreen(
+                new Point(owner.ActualWidth / 2, owner.ActualHeight / 2));
+            var target = PresentationSource.FromVisual(this)?.CompositionTarget
+                      ?? PresentationSource.FromVisual(owner)?.CompositionTarget;
+            if (target is not null)
             {
-                var boxes = Octets;
-                for (int i = 0; i < 4; i++) boxes[i].Text = parts[i];
+                var centerDip = target.TransformFromDevice.Transform(centerPx);
+                Left = centerDip.X - Width / 2;
+                Top = centerDip.Y - Height / 2;
+                return;
             }
-            finally { _updatingOctets = false; }
-        }
-        else if (!manual && !string.IsNullOrWhiteSpace(RawIpBox.Text))
-        {
-            // Never silently truncate a valid IPv6 literal into four octets.
-            ManualAddressCheck.IsChecked = true;
-            WizardStatusText.Text = "Keep manual entry enabled for this address format.";
-            return;
         }
 
-        SetAddressMode(manual);
-        if (manual) RawIpBox.Focus();
-        else Octet1Box.Focus();
-        WizardStatusText.Text = string.Empty;
+        // Standalone test/no owner: use work area.
+        var workArea = SystemParameters.WorkArea;
+        Left = workArea.Left + (workArea.Width - Width) / 2;
+        Top = workArea.Top + (workArea.Height - Height) / 2;
     }
 
     private int OctetIndex(TextBox box) => Array.IndexOf(Octets, box);
@@ -288,6 +291,13 @@ private void Octet_Pasting(object sender, DataObjectPastingEventArgs e)
                 ApplyAddress(pasted);
                 FocusOctet(3, atEnd: true);
             }
+            else if (IPAddress.TryParse(pasted, out var parsed) &&
+                     parsed.AddressFamily == AddressFamily.InterNetworkV6)
+            {
+                ApplyAddress(pasted);
+                RawIpBox.Focus();
+                RawIpBox.CaretIndex = RawIpBox.Text.Length;
+            }
             else
                 WizardStatusText.Text = "Paste a full IP address, for example 192.168.1.10.";
             return;
@@ -370,7 +380,7 @@ private void CommitHistorySelection()
         if (selection.MmsPort != 102)
             MoreOptionsExpander.IsExpanded = true;
         HistoryPopup.IsOpen = false;
-        if (ManualAddressCheck.IsChecked == true) RawIpBox.Focus();
+        if (_rawAddressMode) RawIpBox.Focus();
         else Octet1Box.Focus();
         // Recalling an endpoint is UI-only. Only Connect_Click submits.
     }
@@ -378,7 +388,7 @@ private void CommitHistorySelection()
     private void Connect_Click(object sender, RoutedEventArgs e)
     {
         string submittedAddress;
-        if (ManualAddressCheck.IsChecked == true)
+        if (_rawAddressMode)
         {
             submittedAddress = RawIpBox.Text.Trim();
             if (!IPAddress.TryParse(submittedAddress, out _))

From 4a04bf348b7d53cc98eac0d50405a99aad1ea6cd Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:16:11 +0700
Subject: [PATCH 03/27] test(ip): lock 256px Material chevrons, rounded port,
 automated IPv6 fallback and fixed prepaint dialog

---
 .../ARSAS.Tests/PremiumSmartIpWizardTests.cs  | 52 +++++++++++++------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs b/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
index 2626678d2..667f800c0 100644
--- a/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
+++ b/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
@@ -1,4 +1,3 @@
-using System.Reflection;
 using System.Text.Json;
 using System.Windows;
 using System.Windows.Controls;
@@ -89,13 +88,20 @@ public void DefaultDialog_IsCompactUsesAppTypography_AndKeepsExpertControlsColla
         Assert.InRange(int.Parse(root.Attribute("Width")!.Value), 460, 530);
         Assert.True(int.Parse(root.Attribute("MaxHeight")!.Value) <= 480);
         Assert.Contains("AppFontFamily", root.Attribute("FontFamily")!.Value);
-        Assert.Equal("Height", root.Attribute("SizeToContent")?.Value);
+        Assert.Equal("Manual", root.Attribute("SizeToContent")?.Value);
+        Assert.Equal("Manual", root.Attribute("WindowStartupLocation")?.Value);
+        Assert.Equal("Wizard_SourceInitialized", root.Attribute("SourceInitialized")?.Value);
+        Assert.InRange(int.Parse(root.Attribute("Height")!.Value), 300, 340);
 
         var octetStyle = doc.Descendants(w + "Style")
             .Single(style => style.Attribute(x + "Key")?.Value == "SmartIpOctet");
         var setters = octetStyle.Elements(w + "Setter")
             .ToDictionary(e => e.Attribute("Property")!.Value, e => e.Attribute("Value")!.Value);
         Assert.True(double.Parse(setters["Width"], System.Globalization.CultureInfo.InvariantCulture) <= 46);
+        var host = doc.Descendants(w + "Border")
+            .Single(element => element.Attribute(x + "Name")?.Value == "IpEditorHost");
+        Assert.InRange(int.Parse(host.Attribute("Width")!.Value), 240, 270);
+        Assert.Equal("Left", host.Attribute("HorizontalAlignment")?.Value);
         Assert.True(double.Parse(setters["FontSize"], System.Globalization.CultureInfo.InvariantCulture) <= 13);
         Assert.True(double.Parse(setters["Height"], System.Globalization.CultureInfo.InvariantCulture) <= 34);
 
@@ -104,14 +110,22 @@ public void DefaultDialog_IsCompactUsesAppTypography_AndKeepsExpertControlsColla
         Assert.NotEqual("True", options.Attribute("IsExpanded")?.Value);
         Assert.Contains(options.Descendants(w + "TextBox"),
             box => box.Attribute(x + "Name")?.Value == "MmsPortBox");
-        Assert.Contains(options.Descendants(w + "CheckBox"),
-            box => box.Attribute(x + "Name")?.Value == "ManualAddressCheck");
+        Assert.DoesNotContain(options.Descendants(w + "CheckBox"));
+        var roundedPort = options.Descendants(w + "Border")
+            .Single(node => node.Elements(w + "TextBox")
+                .Any(box => box.Attribute(x + "Name")?.Value == "MmsPortBox"));
+        Assert.Equal("9", roundedPort.Attribute("CornerRadius")?.Value);
 
         var xaml = File.ReadAllText(Find("IpConnectWizardWindow.xaml"));
         Assert.DoesNotContain("Smart discovery", xaml, StringComparison.Ordinal);
         Assert.DoesNotContain("DataSets", xaml, StringComparison.Ordinal);
         Assert.DoesNotContain("RCBs", xaml, StringComparison.Ordinal);
         Assert.DoesNotContain("IPv6", xaml, StringComparison.Ordinal);
+        Assert.DoesNotContain("ManualAddressCheck", xaml, StringComparison.Ordinal);
+        Assert.DoesNotContain("Use full address", xaml, StringComparison.Ordinal);
+        Assert.Contains("OperatorCommandDockChevronDownIcon", xaml, StringComparison.Ordinal);
+        Assert.Contains("OperatorCommandDockChevronUpIcon", xaml, StringComparison.Ordinal);
+        Assert.Contains("Expanded=\"MoreOptionsExpander_ExpandedCollapsed\"", xaml, StringComparison.Ordinal);
         Assert.Contains("x:Name=\"HistoryPopup\"", xaml, StringComparison.Ordinal);
         Assert.Contains("Content=\"Connect\"", xaml, StringComparison.Ordinal);
     }
@@ -152,19 +166,27 @@ public void WpfEditor_ConstructsOnSta_AndHasReachableKeyboardFocusAndIPv6Mode()
 
                     var options = Assert.IsType<Expander>(wizard.FindName("MoreOptionsExpander"));
                     Assert.False(options.IsExpanded);
-                    var advanced = Assert.IsType<CheckBox>(wizard.FindName("ManualAddressCheck"));
                     var raw = Assert.IsType<TextBox>(wizard.FindName("RawIpBox"));
                     var host = Assert.IsType<Border>(wizard.FindName("IpEditorHost"));
-                    var mode = typeof(IpConnectWizardWindow).GetMethod(
-                        "ManualAddressCheck_Click", BindingFlags.Instance | BindingFlags.NonPublic);
-                    Assert.NotNull(mode);
-                    advanced.IsChecked = true;
-                    mode.Invoke(wizard, [advanced, new RoutedEventArgs()]);
-                    Assert.True(options.IsExpanded);
-                    Assert.Equal(Visibility.Visible, raw.Visibility);
-                    Assert.Equal(Visibility.Collapsed, host.Visibility);
-                    raw.Text = "2001:db8::2";
-                    Assert.True(System.Net.IPAddress.TryParse(raw.Text, out _));
+                    Assert.Equal(Visibility.Visible, host.Visibility);
+                    Assert.Equal(Visibility.Collapsed, raw.Visibility);
+                    Assert.NotNull(wizard.FindName("HistoryButton"));
+
+                    var ipv6Wizard = new IpConnectWizardWindow("2001:db8::2");
+                    try
+                    {
+                        var ipv6Raw = Assert.IsType<TextBox>(ipv6Wizard.FindName("RawIpBox"));
+                        var ipv6Host = Assert.IsType<Border>(ipv6Wizard.FindName("IpEditorHost"));
+                        Assert.Equal("2001:db8::2", ipv6Raw.Text);
+                        Assert.Equal(Visibility.Visible, ipv6Raw.Visibility);
+                        Assert.Equal(Visibility.Visible, ipv6Host.Visibility);
+                        Assert.Equal(Visibility.Collapsed,
+                            Assert.IsType<StackPanel>(ipv6Wizard.FindName("OctetEditor")).Visibility);
+                        Assert.NotNull(ipv6Wizard.FindName("HistoryButton"));
+                        Assert.False(Assert.IsType<Expander>(
+                            ipv6Wizard.FindName("MoreOptionsExpander")).IsExpanded);
+                    }
+                    finally { ipv6Wizard.Close(); }
 
                     Assert.NotNull(wizard.FindName("HistorySearchBox"));
                     Assert.NotNull(wizard.FindName("HistoryListBox"));

From 57bfca5cf8f8bcefea0b222bd25a3e02b857c235 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:16:31 +0700
Subject: [PATCH 04/27] test(wpf): honor fixed prepaint IP dialog sizing while
 preserving SCL natural sizing

---
 .../IedTaskDialogVisualRegressionTests.cs         | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/ARSAS.Tests/IedTaskDialogVisualRegressionTests.cs b/tests/ARSAS.Tests/IedTaskDialogVisualRegressionTests.cs
index c2133356c..e6da2708a 100644
--- a/tests/ARSAS.Tests/IedTaskDialogVisualRegressionTests.cs
+++ b/tests/ARSAS.Tests/IedTaskDialogVisualRegressionTests.cs
@@ -21,11 +21,22 @@ public void BothDialogs_UseIsolatedHighContrastSurfaceAndBoundedNaturalHeight()
             var document = XDocument.Load(Find(file));
             var root = Assert.IsType<XElement>(document.Root);
             Assert.Equal("Window", root.Name.LocalName);
-            Assert.Equal("Height", (string?)root.Attribute("SizeToContent"));
+            if (file == "IpConnectWizardWindow.xaml")
+            {
+                // Compact IP popup uses fixed initial dimensions, positioned in
+                // SourceInitialized before it can be shown at (0,0).
+                Assert.Equal("Manual", (string?)root.Attribute("SizeToContent"));
+                Assert.Equal("Manual", (string?)root.Attribute("WindowStartupLocation"));
+                Assert.NotNull(root.Attribute("Height"));
+            }
+            else
+            {
+                Assert.Equal("Height", (string?)root.Attribute("SizeToContent"));
+                Assert.Null(root.Attribute("Height"));
+            }
             Assert.Equal("TaskDialogCanvas", ResourceRef((string?)root.Attribute("Background"), "DynamicResource"));
             Assert.True(double.TryParse((string?)root.Attribute("MaxHeight"),
                 NumberStyles.Float, CultureInfo.InvariantCulture, out var max) && max <= 700);
-            Assert.Null(root.Attribute("Height"));
             Assert.Contains(root.Descendants(Presentation + "ResourceDictionary"),
                 element => element.Attribute("Source")?.Value == "Styles/IedTaskDialogStyles.xaml");
             Assert.Contains(root.Descendants(Presentation + "ScrollViewer"),

From 3ab4cf86ed68e29b9fa50eac8e6624178c459f17 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:16:49 +0700
Subject: [PATCH 05/27] test(startup): assert single compact Material field and
 prepaint manual window location

---
 .../StartupVisualStabilityRegressionTests.cs           | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/ARSAS.Tests/StartupVisualStabilityRegressionTests.cs b/tests/ARSAS.Tests/StartupVisualStabilityRegressionTests.cs
index 06db77b8d..344df84e2 100644
--- a/tests/ARSAS.Tests/StartupVisualStabilityRegressionTests.cs
+++ b/tests/ARSAS.Tests/StartupVisualStabilityRegressionTests.cs
@@ -71,10 +71,15 @@ public void IpDialog_UsesSingleInputSurfaceAndLowNoiseAdvancedDisclosure()
         var host = doc.Descendants(presentation + "Border")
             .Single(node => node.Attribute(xaml + "Name")?.Value == "IpEditorHost");
         Assert.Equal("43", (string?)host.Attribute("Height"));
+        Assert.Equal("256", (string?)host.Attribute("Width"));
+        Assert.Equal("Left", (string?)host.Attribute("HorizontalAlignment"));
+        Assert.Equal("Manual", (string?)doc.Root.Attribute("WindowStartupLocation"));
+        Assert.Equal("Manual", (string?)doc.Root.Attribute("SizeToContent"));
+        Assert.Equal("Wizard_SourceInitialized", (string?)doc.Root.Attribute("SourceInitialized"));
 
         var editor = doc.Descendants(presentation + "StackPanel")
             .Single(node => node.Attribute(xaml + "Name")?.Value == "OctetEditor");
-        Assert.Equal("Center", (string?)editor.Attribute("HorizontalAlignment"));
+        Assert.Equal("Left", (string?)editor.Attribute("HorizontalAlignment"));
 
         var popup = doc.Descendants(presentation + "Popup")
             .Single(node => node.Attribute(xaml + "Name")?.Value == "HistoryPopup");
@@ -88,6 +93,9 @@ public void IpDialog_UsesSingleInputSurfaceAndLowNoiseAdvancedDisclosure()
         Assert.DoesNotContain("Smart discovery", source, StringComparison.Ordinal);
         Assert.DoesNotContain("TaskDialogCardStyle", source, StringComparison.Ordinal);
         Assert.DoesNotContain("IPv6", source, StringComparison.Ordinal);
+        Assert.DoesNotContain("ManualAddressCheck", source, StringComparison.Ordinal);
+        Assert.Contains("OperatorCommandDockChevronDownIcon", source, StringComparison.Ordinal);
+        Assert.Contains("OperatorCommandDockChevronUpIcon", source, StringComparison.Ordinal);
         Assert.Contains("Content=\"Connect\"", source, StringComparison.Ordinal);
 
         var behavior = Read("IpConnectWizardWindow.xaml.cs");

From 783493e159d9525561bb4bc0b27e4e43a5d9aa31 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:18:06 +0700
Subject: [PATCH 06/27] style(ip): compact vertical rhythm without initial
 scrollbar and bind shared chevrons safely

---
 IpConnectWizardWindow.xaml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/IpConnectWizardWindow.xaml b/IpConnectWizardWindow.xaml
index 59efc2062..e689fc104 100644
--- a/IpConnectWizardWindow.xaml
+++ b/IpConnectWizardWindow.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="ArIED61850Tester.IpConnectWizardWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Add IEC 61850 IED" Width="480" Height="323" MinWidth="460" MaxHeight="390"
+        Title="Add IEC 61850 IED" Width="480" Height="308" MinWidth="460" MaxHeight="390"
         SizeToContent="Manual" WindowStartupLocation="Manual"
         SourceInitialized="Wizard_SourceInitialized"
         ResizeMode="NoResize" ShowInTaskbar="False"
@@ -55,7 +55,7 @@
                                     CornerRadius="16" Background="Transparent"
                                     HorizontalAlignment="Center" VerticalAlignment="Center">
                                 <Viewbox Width="19" Height="19" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                    <Path Data="{StaticResource OperatorCommandDockChevronDownIcon}"
+                                    <Path Data="{DynamicResource OperatorCommandDockChevronDownIcon}"
                                           Fill="{StaticResource TaskDialogMuted}" Stretch="Uniform"/>
                                 </Viewbox>
                             </Border>
@@ -90,12 +90,12 @@
                                                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                                                     <Viewbox x:Name="ChevronClosed" Width="19" Height="19"
                                                              VerticalAlignment="Center">
-                                                        <Path Data="{StaticResource OperatorCommandDockChevronDownIcon}"
+                                                        <Path Data="{DynamicResource OperatorCommandDockChevronDownIcon}"
                                                               Fill="{StaticResource TaskDialogMuted}" Stretch="Uniform"/>
                                                     </Viewbox>
                                                     <Viewbox x:Name="ChevronOpen" Width="19" Height="19"
                                                              VerticalAlignment="Center" Visibility="Collapsed">
-                                                        <Path Data="{StaticResource OperatorCommandDockChevronUpIcon}"
+                                                        <Path Data="{DynamicResource OperatorCommandDockChevronUpIcon}"
                                                               Fill="{StaticResource TaskDialogMuted}" Stretch="Uniform"/>
                                                     </Viewbox>
                                                     <TextBlock Text="Advanced settings" FontSize="11.5"
@@ -136,7 +136,7 @@
 
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled"
                   Focusable="False">
-        <Grid Margin="24,19,24,18">
+        <Grid Margin="24,13,24,12">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
@@ -151,9 +151,9 @@
                            Foreground="{StaticResource TaskDialogMuted}"/>
             </StackPanel>
 
-            <StackPanel Grid.Row="1" Margin="0,21,0,0">
+            <StackPanel Grid.Row="1" Margin="0,11,0,0">
                 <TextBlock Text="IP address" FontSize="12" FontWeight="SemiBold"
-                           Foreground="{StaticResource TaskDialogInk}" Margin="0,0,0,8"/>
+                           Foreground="{StaticResource TaskDialogInk}" Margin="0,0,0,6"/>
                 <Grid>
                     <Border x:Name="IpEditorHost" Width="256" Height="43" HorizontalAlignment="Left" CornerRadius="9"
                             BorderThickness="1" Background="{StaticResource TaskDialogCard}">
@@ -262,10 +262,10 @@
                 </Popup>
 
                 <TextBlock x:Name="AddressHintText" Text="Example: 192.168.1.10"
-                           FontSize="11" Margin="2,7,0,0"
+                           FontSize="11" Margin="2,4,0,0"
                            Foreground="{StaticResource TaskDialogMuted}"/>
 
-                <Expander x:Name="MoreOptionsExpander" Margin="0,12,0,0"
+                <Expander x:Name="MoreOptionsExpander" Margin="0,7,0,0"
                           Style="{StaticResource SmartIpOptionsExpander}"
                           Expanded="MoreOptionsExpander_ExpandedCollapsed"
                           Collapsed="MoreOptionsExpander_ExpandedCollapsed"
@@ -289,19 +289,19 @@
                     </StackPanel>
                 </Expander>
 
-                <TextBlock x:Name="WizardStatusText" Margin="2,9,0,0"
+                <TextBlock x:Name="WizardStatusText" Margin="2,3,0,0"
                            Style="{StaticResource TaskDialogError}"
                            AutomationProperties.LiveSetting="Assertive"/>
             </StackPanel>
 
-            <Grid Grid.Row="2" Margin="0,20,0,0">
+            <Grid Grid.Row="2" Margin="0,9,0,0">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="1"/>
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
                 <Border Background="{StaticResource TaskDialogBorder}" Opacity="0.7"/>
                 <StackPanel Grid.Row="1" Orientation="Horizontal"
-                            HorizontalAlignment="Right" Margin="0,13,0,0">
+                            HorizontalAlignment="Right" Margin="0,8,0,0">
                     <Button Content="Cancel" Style="{StaticResource TaskDialogFooterButton}"
                             MinHeight="36" MinWidth="92" Padding="14,7"
                             Click="Cancel_Click" IsCancel="True" Margin="0,0,9,0"/>

From 7b38bc37e73a32419dbfc16afbf0c81e0f3a4223 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:18:09 +0700
Subject: [PATCH 07/27] fix(ip): match explicit non-scrolling first-paint
 dialog heights

---
 IpConnectWizardWindow.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IpConnectWizardWindow.xaml.cs b/IpConnectWizardWindow.xaml.cs
index 1a0f89ce6..eddaf4a5d 100644
--- a/IpConnectWizardWindow.xaml.cs
+++ b/IpConnectWizardWindow.xaml.cs
@@ -38,8 +38,8 @@ public string MmsPortText
     private readonly ICollectionView _historyView;
     private bool _updatingOctets;
     private bool _rawAddressMode;
-    private const double CollapsedDialogHeight = 323;
-    private const double ExpandedDialogHeight = 378;
+    private const double CollapsedDialogHeight = 308;
+    private const double ExpandedDialogHeight = 372;
     public int MmsPort { get; private set; } = 102;
 
     // UI projection ONLY; UserPreferenceStore remains the sole persistence authority.

From c8f5c747bb20eb7809a58aac70a3c6307276adac Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:20:47 +0700
Subject: [PATCH 08/27] fix(ip): paste full IPv6 literals without dots into
 automatic raw editor, no manual switch

---
 IpConnectWizardWindow.xaml.cs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/IpConnectWizardWindow.xaml.cs b/IpConnectWizardWindow.xaml.cs
index eddaf4a5d..396b0f62e 100644
--- a/IpConnectWizardWindow.xaml.cs
+++ b/IpConnectWizardWindow.xaml.cs
@@ -283,6 +283,17 @@ private void Octet_Pasting(object sender, DataObjectPastingEventArgs e)
         }
 
         var pasted = (e.SourceDataObject.GetData(DataFormats.UnicodeText) as string ?? "").Trim();
+        // A complete IPv6 paste switches editor automatically; IPv6 literals
+        // without dots must not be processed as invalid single IPv4 octets.
+        if (IPAddress.TryParse(pasted, out var fullAddress) &&
+            fullAddress.AddressFamily == AddressFamily.InterNetworkV6)
+        {
+            e.CancelCommand();
+            ApplyAddress(pasted);
+            RawIpBox.Focus();
+            RawIpBox.CaretIndex = RawIpBox.Text.Length;
+            return;
+        }
         if (pasted.Contains('.'))
         {
             e.CancelCommand();
@@ -291,13 +302,6 @@ private void Octet_Pasting(object sender, DataObjectPastingEventArgs e)
                 ApplyAddress(pasted);
                 FocusOctet(3, atEnd: true);
             }
-            else if (IPAddress.TryParse(pasted, out var parsed) &&
-                     parsed.AddressFamily == AddressFamily.InterNetworkV6)
-            {
-                ApplyAddress(pasted);
-                RawIpBox.Focus();
-                RawIpBox.CaretIndex = RawIpBox.Text.Length;
-            }
             else
                 WizardStatusText.Text = "Paste a full IP address, for example 192.168.1.10.";
             return;

From 01b703be3b443958aa059876cb665272d18a92d2 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:21:08 +0700
Subject: [PATCH 09/27] test(ip): assert full IPv6 clipboard paste bypasses
 IPv4-only octet rejection

---
 tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs b/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
index 667f800c0..fb2ae922d 100644
--- a/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
+++ b/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
@@ -201,6 +201,23 @@ public void WpfEditor_ConstructsOnSta_AndHasReachableKeyboardFocusAndIPv6Mode()
         Assert.Null(failure);
     }
 
+    [Fact]
+    public void FullIpv6Paste_SwitchesToRawBeforeAnySingleOctetValidation()
+    {
+        var source = File.ReadAllText(Find("IpConnectWizardWindow.xaml.cs"));
+        var method = source.IndexOf("private void Octet_Pasting(", StringComparison.Ordinal);
+        var next = source.IndexOf("private void HistoryButton_Click(", method, StringComparison.Ordinal);
+        Assert.True(method >= 0 && next > method);
+        var paste = source[method..next];
+        var fullIpv6 = paste.IndexOf(
+            "fullAddress.AddressFamily == AddressFamily.InterNetworkV6", StringComparison.Ordinal);
+        var decimalPath = paste.IndexOf("if (pasted.Contains('.'))", StringComparison.Ordinal);
+        Assert.True(fullIpv6 >= 0 && decimalPath > fullIpv6,
+            "Full IPv6 paste must bypass IPv4 octet validation.");
+        Assert.Contains("ApplyAddress(pasted)", paste, StringComparison.Ordinal);
+        Assert.Contains("RawIpBox.Focus()", paste, StringComparison.Ordinal);
+    }
+
     [Fact]
     public void HistorySelection_AndKeyboardHandlers_DoNotDirectlyInitiateConnections()
     {

From 2405b32e4e81863a0ebcd707d290635e9cddc90b Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:22:44 +0700
Subject: [PATCH 10/27] test(ip): use proper empty CheckBox collection
 assertion

---
 tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs b/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
index fb2ae922d..2edd94f40 100644
--- a/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
+++ b/tests/ARSAS.Tests/PremiumSmartIpWizardTests.cs
@@ -110,7 +110,7 @@ public void DefaultDialog_IsCompactUsesAppTypography_AndKeepsExpertControlsColla
         Assert.NotEqual("True", options.Attribute("IsExpanded")?.Value);
         Assert.Contains(options.Descendants(w + "TextBox"),
             box => box.Attribute(x + "Name")?.Value == "MmsPortBox");
-        Assert.DoesNotContain(options.Descendants(w + "CheckBox"));
+        Assert.Empty(options.Descendants(w + "CheckBox"));
         var roundedPort = options.Descendants(w + "Border")
             .Single(node => node.Elements(w + "TextBox")
                 .Any(box => box.Attribute(x + "Name")?.Value == "MmsPortBox"));

From 137efb6c409f66116fe4a0b494fd1d506873ab3e Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:24:10 +0700
Subject: [PATCH 11/27] feat(control): redesign compact ARSAS popup with pinned
 actions and progressive detail

---
 ControlCommandWindow.xaml | 278 ++++++++++++++++++++------------------
 1 file changed, 150 insertions(+), 128 deletions(-)

diff --git a/ControlCommandWindow.xaml b/ControlCommandWindow.xaml
index a3d4082cf..9f53843c0 100644
--- a/ControlCommandWindow.xaml
+++ b/ControlCommandWindow.xaml
@@ -1,171 +1,193 @@
 <Window x:Class="ArIED61850Tester.ControlCommandWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="IEC 61850 Control"
-        Width="630" Height="590" MinWidth="490" MinHeight="385"
-        WindowStartupLocation="CenterOwner"
-        Background="{StaticResource Bg}"
-        FontFamily="{StaticResource AppFontFamily}"
-        Icon="Assets/app-icon.ico"
-        Loaded="Window_Loaded"
-        Closing="Window_Closing">
+        Title="Control · IEC 61850" Width="565" Height="500"
+        MinWidth="505" MinHeight="390" MaxHeight="670"
+        WindowStartupLocation="CenterOwner" ResizeMode="CanResize"
+        Background="{StaticResource Bg}" FontFamily="{StaticResource AppFontFamily}"
+        FontSize="11.5" Icon="Assets/app-icon.ico"
+        Loaded="Window_Loaded" Closing="Window_Closing">
     <Window.Resources>
-        <Style x:Key="CommandOptionCheckBox" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
-            <Setter Property="Margin" Value="0,0,18,0"/>
+        <Style x:Key="ControlCheckBox" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
+            <Setter Property="Margin" Value="0,0,17,0"/>
             <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="FontSize" Value="12.2"/>
-            <Setter Property="Foreground" Value="#344054"/>
+            <Setter Property="Foreground" Value="{StaticResource Ink}"/>
+            <Setter Property="FontSize" Value="11.5"/>
+        </Style>
+        <Style x:Key="ControlFieldLabel" TargetType="TextBlock">
+            <Setter Property="Foreground" Value="{StaticResource Muted}"/>
+            <Setter Property="FontSize" Value="10.5"/>
+            <Setter Property="Margin" Value="0,0,0,5"/>
         </Style>
     </Window.Resources>
-
-    <Grid Margin="18">
+    <Grid Margin="17,13,17,13">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="*" MinHeight="75"/>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <Grid Margin="2,0,2,14">
+        <!-- Compact identity bar: one current association and exact control object. -->
+        <Grid Grid.Row="0" Margin="0,0,0,11">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <Border Width="42" Height="42" CornerRadius="13" ClipToBounds="True" Margin="0,0,13,0">
-                <Image Source="Assets/app-icon.png" Width="42" Height="42" RenderOptions.BitmapScalingMode="HighQuality"/>
-            </Border>
-            <StackPanel Grid.Column="1" VerticalAlignment="Center">
-                <TextBlock Text="IEC 61850 Control" FontSize="17" FontWeight="SemiBold" Foreground="{StaticResource Ink}"/>
-                <TextBlock Text="{Binding DeviceSummary}" Style="{StaticResource Caption}" Margin="0,3,0,0"/>
+            <StackPanel>
+                <TextBlock Text="Control" Foreground="{StaticResource Ink}"
+                           FontWeight="SemiBold" FontSize="15"/>
+                <TextBlock Text="{Binding DeviceSummary}" Foreground="{StaticResource Muted}"
+                           TextTrimming="CharacterEllipsis" FontSize="10.5" Margin="0,3,0,0"/>
+                <TextBlock Text="{Binding Telegram}" Foreground="{StaticResource Ink}"
+                           TextTrimming="CharacterEllipsis" FontWeight="Medium"
+                           FontSize="11.5" Margin="0,4,0,0"/>
             </StackPanel>
-            <Border Grid.Column="2" Background="#F3F0FF" BorderBrush="#DDD6FE" BorderThickness="1" CornerRadius="13" Padding="11,7" VerticalAlignment="Center">
-                <TextBlock Text="{Binding ControlCdcText}" Foreground="#6941C6" FontWeight="SemiBold" FontSize="12"/>
+            <Border Grid.Column="1" Background="#EAF1FA" BorderBrush="#CCDCEF"
+                    BorderThickness="1" CornerRadius="6" Padding="9,5"
+                    Margin="12,0,0,0" VerticalAlignment="Center">
+                <TextBlock Text="{Binding ControlCdcText}" FontWeight="SemiBold"
+                           Foreground="#245480" FontSize="10.5"/>
             </Border>
         </Grid>
 
-        <Border Grid.Row="1" Style="{StaticResource Card}" Padding="15" Margin="0,0,0,12">
+        <Border Grid.Row="1" Background="White" BorderBrush="{StaticResource Line}"
+                BorderThickness="1" CornerRadius="7" Padding="11,9" Margin="0,0,0,11">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
                 <StackPanel>
-                    <TextBlock Text="{Binding SignalName}" FontSize="17" FontWeight="SemiBold" Foreground="{StaticResource Ink}"/>
-                    <TextBlock Text="{Binding Telegram}" FontSize="12" Foreground="#475467" Margin="0,5,0,0" TextWrapping="Wrap"/>
-                    <TextBlock Text="Control model is read live from ctlModel; Direct Operate or SBO is selected automatically."
-                               FontSize="11.7" Foreground="{StaticResource Muted}" Margin="0,6,0,0" TextWrapping="Wrap"/>
+                    <TextBlock Text="CONTROL MODEL" FontSize="9" Foreground="{StaticResource Muted}"/>
+                    <TextBlock Text="{Binding ModelShortText}" FontSize="11.5"
+                               FontWeight="SemiBold" Foreground="{StaticResource Ink}"
+                               Margin="0,3,0,0"/>
+                </StackPanel>
+                <StackPanel Grid.Column="1" HorizontalAlignment="Right">
+                    <TextBlock Text="CURRENT" FontSize="9" Foreground="{StaticResource Muted}"
+                               HorizontalAlignment="Right"/>
+                    <TextBlock Text="{Binding CurrentValue}" FontWeight="SemiBold"
+                               Foreground="{StaticResource Ink}" FontSize="12.5"
+                               HorizontalAlignment="Right" Margin="0,2,0,0"/>
                 </StackPanel>
-                <Border Grid.Column="1" Background="#F8FAFC" BorderBrush="{StaticResource Line}" BorderThickness="1" CornerRadius="12" Padding="11,8" Margin="14,0,0,0" VerticalAlignment="Center">
-                    <StackPanel>
-                        <TextBlock Text="CURRENT" FontSize="9.5" FontWeight="SemiBold" Foreground="#667085" HorizontalAlignment="Center"/>
-                        <TextBlock Text="{Binding CurrentValue}" FontSize="15" FontWeight="SemiBold" Foreground="{StaticResource Ink}" Margin="0,3,0,0" HorizontalAlignment="Center"/>
-                    </StackPanel>
-                </Border>
             </Grid>
         </Border>
 
-        <Border Grid.Row="2" Style="{StaticResource Card}" Padding="16">
-            <ScrollViewer VerticalScrollBarVisibility="Auto">
-                <StackPanel>
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="145"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Text="Control model" FontSize="12" Foreground="{StaticResource Muted}" VerticalAlignment="Center"/>
-                        <Border Grid.Column="1" Background="#EEF4FF" BorderBrush="#C7D7FE" BorderThickness="1" CornerRadius="10" Padding="10,7">
-                            <TextBlock Text="{Binding ControlModelText}" FontWeight="SemiBold" Foreground="#1849A9" TextWrapping="Wrap"/>
-                        </Border>
-                    </Grid>
-
-                    <Grid Margin="0,12,0,0">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="145"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Text="Control engine" FontSize="12" Foreground="{StaticResource Muted}" VerticalAlignment="Top" Margin="0,8,0,0"/>
-                        <Border Grid.Column="1" Background="#ECFDF3" BorderBrush="#86EFAC" BorderThickness="1" CornerRadius="10" Padding="10,8">
-                            <StackPanel>
-                                <TextBlock Text="SMART CONTROL ENGINE" FontSize="9.5" FontWeight="Bold" Foreground="#067647"/>
-                                <TextBlock Text="{Binding EngineStatusText}" FontSize="11.4" Foreground="#05603A" TextWrapping="Wrap" Margin="0,3,0,0"/>
-                            </StackPanel>
-                        </Border>
-                    </Grid>
-
-                    <Grid Margin="0,12,0,0">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="145"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Text="Sequence" FontSize="12" Foreground="{StaticResource Muted}" VerticalAlignment="Top" Margin="0,7,0,0"/>
-                        <Border Grid.Column="1" Background="#F8FAFC" BorderBrush="{StaticResource Line}" BorderThickness="1" CornerRadius="10" Padding="10,8">
-                            <TextBlock Text="{Binding SequenceText}" FontSize="11.7" Foreground="#344054" TextWrapping="Wrap"/>
-                        </Border>
-                    </Grid>
+        <!-- Scrollable details; status and actions never disappear below the screen. -->
+        <ScrollViewer Grid.Row="2" VerticalScrollBarVisibility="Auto"
+                      HorizontalScrollBarVisibility="Disabled" MinHeight="0">
+            <StackPanel Margin="1,0,6,1">
+                <TextBlock Text="Command value" Style="{StaticResource ControlFieldLabel}"/>
+                <ComboBox x:Name="CommandValueBox" Height="34"
+                          ItemsSource="{Binding ValueOptions}"
+                          Text="{Binding SelectedValue, UpdateSourceTrigger=PropertyChanged}"
+                          IsEditable="True" IsEnabled="{Binding IsReady}"
+                          Padding="8,4" VerticalContentAlignment="Center"
+                          ToolTip="Control value according to the live CDC and MMS ctlVal type"/>
 
-                    <Grid Margin="0,14,0,0">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="145"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Text="Command value" FontSize="12" Foreground="{StaticResource Muted}" VerticalAlignment="Center"/>
-                        <ComboBox Grid.Column="1" ItemsSource="{Binding ValueOptions}" Text="{Binding SelectedValue, UpdateSourceTrigger=PropertyChanged}"
-                                  IsEditable="True" Height="38" Padding="9,4" IsEnabled="{Binding IsReady}"
-                                  ToolTip="Open/Close, On/Off, Raise/Lower, or a numeric setpoint according to the discovered CDC"/>
-                    </Grid>
+                <WrapPanel Margin="0,12,0,9">
+                    <CheckBox Content="Interlock" IsChecked="{Binding InterlockCheck}"
+                              Style="{StaticResource ControlCheckBox}"
+                              ToolTip="IEC 61850 interlock-check bit"/>
+                    <CheckBox Content="Synchrocheck" IsChecked="{Binding SynchroCheck}"
+                              Style="{StaticResource ControlCheckBox}"
+                              ToolTip="IEC 61850 synchrocheck bit"/>
+                    <CheckBox Content="Test" IsChecked="{Binding TestMode}"
+                              Style="{StaticResource ControlCheckBox}"
+                              ToolTip="Test flag is sent to the IED; it does not simulate success"/>
+                </WrapPanel>
 
-                    <Border Background="#F8FAFC" BorderBrush="{StaticResource Line}" BorderThickness="1" CornerRadius="12" Padding="12" Margin="0,15,0,0"
-                            IsEnabled="{Binding IsReady}">
-                        <StackPanel>
-                            <TextBlock Text="Command checks" FontSize="12.5" FontWeight="SemiBold" Foreground="{StaticResource Ink}"/>
-                            <WrapPanel Margin="0,10,0,0">
-                                <CheckBox Content="Interlock check" IsChecked="{Binding InterlockCheck}" Style="{StaticResource CommandOptionCheckBox}"
-                                          ToolTip="Set the IEC 61850 interlock-check bit"/>
-                                <CheckBox Content="Synchrocheck" IsChecked="{Binding SynchroCheck}" Style="{StaticResource CommandOptionCheckBox}"
-                                          ToolTip="Set the IEC 61850 synchrocheck bit"/>
-                                <CheckBox Content="Test" IsChecked="{Binding TestMode}" Style="{StaticResource CommandOptionCheckBox}"
-                                          ToolTip="Set Test=true in the IEC 61850 control request"/>
-                            </WrapPanel>
-                        </StackPanel>
-                    </Border>
-
-                    <Border x:Name="LiveCommandWarning" Background="#FFF4ED" BorderBrush="#FDB022" BorderThickness="1" CornerRadius="12" Padding="12" Margin="0,13,0,0">
-                        <StackPanel>
-                            <TextBlock Text="LIVE COMMAND" FontSize="10" FontWeight="Bold" Foreground="#B54708"/>
-                            <TextBlock Text="This can operate primary equipment. Confirm the selected IED, object, value, and site safety conditions before sending."
-                                       FontSize="11.7" Foreground="#7A2E0E" TextWrapping="Wrap" Margin="0,4,0,8"/>
-                            <CheckBox Content="I confirm this live IEC 61850 command is authorized" IsChecked="{Binding ConfirmLiveCommand}"
-                                      FontWeight="SemiBold" Foreground="#7A2E0E"/>
-                        </StackPanel>
-                    </Border>
+                <Border x:Name="LiveCommandWarning" Background="#FFF7EA"
+                        BorderBrush="#EBD7B9" BorderThickness="1"
+                        CornerRadius="6" Padding="10,9" Margin="0,0,0,9">
+                    <CheckBox Content="I am authorized to operate this IED"
+                              IsChecked="{Binding ConfirmLiveCommand}"
+                              Foreground="#795321" FontSize="11.5"
+                              ToolTip="Live command may operate primary equipment"/>
+                </Border>
 
-                    <Expander Header="Technical control evidence" Margin="0,13,0,0" Foreground="#475467">
-                        <Border Background="#F8FAFC" BorderBrush="{StaticResource Line}" BorderThickness="1" CornerRadius="10" Padding="11" Margin="0,7,0,0">
-                            <TextBlock Text="{Binding ControlEvidenceText}" FontFamily="{StaticResource AppCodeFontFamily}" FontSize="10.8" Foreground="#344054" TextWrapping="Wrap"/>
-                        </Border>
-                    </Expander>
+                <!-- Advanced information is still accessible, never mixed into the primary task. -->
+                <Expander Header="Advanced · originator &amp; diagnostics"
+                          Foreground="{StaticResource Ink}" FontSize="11"
+                          Margin="0,3,0,0">
+                    <StackPanel Margin="3,10,2,5">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <StackPanel Margin="0,0,7,0">
+                                <TextBlock Text="Origin category" Style="{StaticResource ControlFieldLabel}"/>
+                                <ComboBox ItemsSource="{Binding OriginCategories}"
+                                          SelectedItem="{Binding SelectedOriginCategory}"
+                                          Height="30" Padding="5,3"/>
+                            </StackPanel>
+                            <StackPanel Grid.Column="1" Margin="7,0,0,0">
+                                <TextBlock Text="Originator ID" Style="{StaticResource ControlFieldLabel}"/>
+                                <TextBox Text="{Binding OriginatorId, UpdateSourceTrigger=PropertyChanged}"
+                                         MaxLength="64" Height="30" Padding="7,5"/>
+                            </StackPanel>
+                        </Grid>
+                        <Grid Margin="0,9,0,0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <StackPanel Margin="0,0,7,0">
+                                <TextBlock Text="ctlNum" Style="{StaticResource ControlFieldLabel}"/>
+                                <TextBox Text="{Binding ControlNumberText}" IsReadOnly="True"
+                                         Height="30" Padding="7,5"
+                                         ToolTip="Assigned by the native IEC control service; never guessed"/>
+                            </StackPanel>
+                            <StackPanel Grid.Column="1" Margin="7,0,0,0">
+                                <TextBlock Text="Termination" Style="{StaticResource ControlFieldLabel}"/>
+                                <TextBox Text="{Binding TerminationText}" IsReadOnly="True"
+                                         Height="30" Padding="7,5"/>
+                            </StackPanel>
+                        </Grid>
+                        <TextBlock Text="{Binding SequenceText}" Foreground="{StaticResource Muted}"
+                                   TextWrapping="Wrap" FontSize="10.5" Margin="0,9,0,0"/>
+                        <TextBlock Text="{Binding OriginValidationText}" Foreground="#A43B32"
+                                   TextWrapping="Wrap" FontSize="10.5" Margin="0,6,0,0"/>
+                        <Expander Header="Wire response · LastApplError" Margin="0,9,0,0">
+                            <TextBlock Text="{Binding ControlEvidenceText}" FontFamily="{StaticResource AppCodeFontFamily}"
+                                       Foreground="{StaticResource Ink}" TextWrapping="Wrap"
+                                       FontSize="10" Margin="5,7,0,0"/>
+                        </Expander>
+                    </StackPanel>
+                </Expander>
+            </StackPanel>
+        </ScrollViewer>
 
-                    <Border x:Name="ResultPanel" Background="#F8FAFC" BorderBrush="{StaticResource Line}" BorderThickness="1" CornerRadius="12" Padding="12" Margin="0,13,0,0">
-                        <StackPanel>
-                            <TextBlock Text="{Binding CommandStage}" FontSize="12.5" FontWeight="SemiBold" Foreground="{StaticResource Ink}"/>
-                            <TextBlock Text="{Binding CommandStatus}" FontSize="11.7" Foreground="#475467" TextWrapping="Wrap" Margin="0,4,0,0"/>
-                        </StackPanel>
-                    </Border>
-                </StackPanel>
-            </ScrollViewer>
+        <Border x:Name="ResultPanel" Grid.Row="3" Background="#F2F6FA"
+                BorderBrush="{StaticResource Line}" BorderThickness="1"
+                CornerRadius="7" Padding="10,9" Margin="0,10,0,0">
+            <StackPanel>
+                <TextBlock Text="{Binding CommandStage}" Foreground="{StaticResource Ink}"
+                           FontWeight="SemiBold" FontSize="11.5"/>
+                <TextBlock Text="{Binding CommandStatus}" Foreground="#50647A"
+                           TextWrapping="Wrap" MaxHeight="38" FontSize="10.5"
+                           Margin="0,3,0,0"/>
+            </StackPanel>
         </Border>
 
-        <Grid Grid.Row="3" Margin="0,13,0,0">
+        <Grid Grid.Row="4" Margin="0,11,0,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <TextBlock Text="The IED response and process feedback are recorded in Diagnostics." Style="{StaticResource Caption}" VerticalAlignment="Center" TextWrapping="Wrap"/>
-            <StackPanel Grid.Column="1" Orientation="Horizontal">
-                <Button Content="Close" Style="{StaticResource SoftButton}" Click="Close_Click" Margin="0,0,8,0"/>
-                <Button Content="{Binding SendButtonText}" Style="{StaticResource PrimaryButton}" Click="SendCommand_Click" IsEnabled="{Binding CanSend}" MinWidth="126"/>
-            </StackPanel>
+            <TextBlock Text="{Binding SequenceHint}" Foreground="{StaticResource Muted}"
+                       FontSize="10.5" VerticalAlignment="Center"
+                       TextWrapping="Wrap" Margin="0,0,10,0"/>
+            <Button Grid.Column="1" Content="Close" Style="{StaticResource SoftButton}"
+                    Click="Close_Click" Width="75" Height="32" Margin="0,0,7,0"/>
+            <Button x:Name="SendCommandButton" Grid.Column="2"
+                    Content="{Binding SendButtonText}" Style="{StaticResource PrimaryButton}"
+                    Click="SendCommand_Click" IsEnabled="{Binding CanSend}"
+                    MinWidth="145" Height="32"/>
         </Grid>
     </Grid>
-</Window>
+</Window>
\ No newline at end of file

From ce3a991d1f7f09e88d75833065adc2697ff2d62a Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:25:35 +0700
Subject: [PATCH 12/27] feat(control): compact SBO-aware UX, originator
 settings, ctlNum and termination evidence

---
 ControlCommandWindow.xaml.cs | 114 ++++++++++++++++++++++++++++++-----
 1 file changed, 99 insertions(+), 15 deletions(-)

diff --git a/ControlCommandWindow.xaml.cs b/ControlCommandWindow.xaml.cs
index 882debfe2..158c77fa8 100644
--- a/ControlCommandWindow.xaml.cs
+++ b/ControlCommandWindow.xaml.cs
@@ -21,6 +21,13 @@ public partial class ControlCommandWindow : Window, INotifyPropertyChanged
     private string _sequenceText = "Detecting the required IEC 61850 control sequence…";
     private string _controlEvidenceText = string.Empty;
     private string _selectedValue = string.Empty;
+    private string _modelShortText = "Inspecting…";
+    private string _sequenceHint = "Inspecting control…";
+    private string _originatorId = "ARSAS";
+    private string _selectedOriginCategory = "StationControl";
+    private string _controlNumberText = "Auto";
+    private string _terminationText = "—";
+    private Iec61850ControlModelKind _liveControlModel = Iec61850ControlModelKind.Unknown;
     private bool _interlockCheck = true;
     private bool _synchroCheck;
     private bool _testMode;
@@ -33,6 +40,11 @@ public partial class ControlCommandWindow : Window, INotifyPropertyChanged
     public event PropertyChangedEventHandler? PropertyChanged;
 
     public ObservableCollection<string> ValueOptions { get; } = new();
+    public IReadOnlyList<string> OriginCategories { get; } = new[]
+    {
+        "StationControl", "BayControl", "RemoteControl", "AutomaticBay",
+        "AutomaticStation", "AutomaticRemote", "Maintenance", "Process"
+    };
     public string DeviceSummary => $"{_device.Name} • {_device.EndpointText}";
     public string SignalName => _signal.Name;
     public string Telegram => Iec61850MonitorPoint.StripIedNamePrefix(_signal.ObjectReference, _device.Name);
@@ -43,6 +55,38 @@ public partial class ControlCommandWindow : Window, INotifyPropertyChanged
     public string SequenceText { get => _sequenceText; private set => Set(ref _sequenceText, value); }
     public string ControlEvidenceText { get => _controlEvidenceText; private set => Set(ref _controlEvidenceText, value); }
     public string SelectedValue { get => _selectedValue; set { if (Set(ref _selectedValue, value)) Raise(nameof(CanSend)); } }
+    public string ModelShortText { get => _modelShortText; private set => Set(ref _modelShortText, value); }
+    public string SequenceHint { get => _sequenceHint; private set => Set(ref _sequenceHint, value); }
+    public string ControlNumberText { get => _controlNumberText; private set => Set(ref _controlNumberText, value); }
+    public string TerminationText { get => _terminationText; private set => Set(ref _terminationText, value); }
+    public string SelectedOriginCategory
+    {
+        get => _selectedOriginCategory;
+        set
+        {
+            if (Set(ref _selectedOriginCategory, value)) Raise(nameof(CanSend));
+        }
+    }
+    public string OriginatorId
+    {
+        get => _originatorId;
+        set
+        {
+            if (Set(ref _originatorId, value))
+            {
+                Raise(nameof(OriginValidationText));
+                Raise(nameof(CanSend));
+            }
+        }
+    }
+    public string OriginValidationText => IsValidOriginator(OriginatorId)
+        ? string.Empty : "Originator ID requires 1–64 printable ASCII characters.";
+    internal static bool IsValidOriginator(string? id) =>
+        !string.IsNullOrWhiteSpace(id) && id.Length <= 64 &&
+        id.All(c => c is >= ' ' and <= '~');
+    public bool AllowCustomValue
+        => _controlCdcText is "APC" or "INC" or "ISC" or "INC/ISC";
+
     public bool InterlockCheck { get => _interlockCheck; set => Set(ref _interlockCheck, value); }
     public bool SynchroCheck { get => _synchroCheck; set => Set(ref _synchroCheck, value); }
     public bool TestMode
@@ -86,8 +130,12 @@ private set
     }
     public string CommandStage { get => _commandStage; private set => Set(ref _commandStage, value); }
     public string CommandStatus { get => _commandStatus; private set => Set(ref _commandStatus, value); }
-    public string SendButtonText => IsBusy ? "Sending…" : TestMode ? "Send Test" : "Send Command";
-    public bool CanSend => IsReady && !IsBusy && !string.IsNullOrWhiteSpace(SelectedValue) && (TestMode || ConfirmLiveCommand);
+    public string SendButtonText => IsBusy ? "Working…" : TestMode ? "Send test" :
+        _liveControlModel is Iec61850ControlModelKind.SboNormal or
+            Iec61850ControlModelKind.SboEnhanced ? "Select → Operate" : "Operate";
+    public bool CanSend => IsReady && !IsBusy && !string.IsNullOrWhiteSpace(SelectedValue) &&
+        IsValidOriginator(OriginatorId) && OriginCategories.Contains(SelectedOriginCategory) &&
+        (TestMode || ConfirmLiveCommand);
 
     public ControlCommandWindow(
         Iec61850MonitorRuntime runtime,
@@ -107,8 +155,8 @@ private async void Window_Loaded(object sender, RoutedEventArgs e)
         // Honor the actual DPI-aware working area. All details scroll while
         // the command confirmation footer stays on-screen at 1366x768/150%.
         var work = SystemParameters.WorkArea;
-        Height = Math.Max(MinHeight, Math.Min(590, work.Height - 28));
-        Width = Math.Max(MinWidth, Math.Min(630, work.Width - 28));
+        Height = Math.Max(MinHeight, Math.Min(500, work.Height - 24));
+        Width = Math.Max(MinWidth, Math.Min(565, work.Width - 24));
         await InspectAsync();
     }
 
@@ -126,7 +174,22 @@ private async Task InspectAsync()
                 _cancellation.Token);
 
             ControlModelText = capabilities.ControlModelText;
+            _liveControlModel = capabilities.ControlModel;
+            ModelShortText = capabilities.ControlModel switch
+            {
+                Iec61850ControlModelKind.DirectNormal => "Direct · normal",
+                Iec61850ControlModelKind.DirectEnhanced => "Direct · enhanced",
+                Iec61850ControlModelKind.SboNormal => "SBO · normal",
+                Iec61850ControlModelKind.SboEnhanced => "SBO · enhanced",
+                Iec61850ControlModelKind.StatusOnly => "Status only",
+                _ => "Unverified"
+            };
+            SequenceHint = capabilities.UsesSelectBeforeOperate
+                ? "Native sequence: Select → Operate"
+                : "Native sequence: Operate";
+            Raise(nameof(SendButtonText));
             ControlCdcText = string.IsNullOrWhiteSpace(capabilities.ControlCdc) ? "CONTROL" : capabilities.ControlCdc;
+            Raise(nameof(AllowCustomValue));
             CurrentValue = capabilities.CurrentValue;
             EngineStatusText = capabilities.EngineControlServiceStatus;
             SequenceText = capabilities.SequenceText;
@@ -143,7 +206,7 @@ private async Task InspectAsync()
             {
                 CommandStage = capabilities.SupportsOperate ? "Ready" : "Control unavailable";
                 CommandStatus = capabilities.SupportsOperate
-                    ? $"{capabilities.ControlModelText}. {capabilities.SequenceText}. Select a command value and required check flags."
+                    ? "Choose a value and verify the checks before sending."
                     : capabilities.EngineControlServiceStatus;
                 SetResultTone(capabilities.SupportsOperate ? "Ready" : "Error");
             }
@@ -171,6 +234,17 @@ private async void SendCommand_Click(object sender, RoutedEventArgs e)
         if (!CanSend)
             return;
 
+        // Keep explicit staged safety confirmation without cluttering the main popup.
+        // SBO selection is part of the native one-shot sequence, NOT an already-held lease.
+        var confirm = MessageBox.Show(this,
+            $"IED: {_device.Name}\nObject: {Telegram}\nValue: {SelectedValue}\n" +
+            $"Sequence: {ModelShortText}\nOrigin: {SelectedOriginCategory}/{OriginatorId.Trim()}\n\n" +
+            (TestMode ? "Send an IEC 61850 command with Test=true?" :
+                        "Send a LIVE IEC 61850 command to this IED?"),
+            "Confirm control", MessageBoxButton.YesNo,
+            MessageBoxImage.Warning, MessageBoxResult.No);
+        if (confirm != MessageBoxResult.Yes) return;
+
         IsBusy = true;
         CommandStage = TestMode ? "Sending test command" : "Sending live command";
         CommandStatus = "Executing the IEC 61850 control sequence selected from ctlModel…";
@@ -188,22 +262,32 @@ private async void SendCommand_Click(object sender, RoutedEventArgs e)
                     TestMode = TestMode,
                     FeedbackTimeoutMs = _signal.IsPositionControl ? 12000 : 8000,
                     CommandTerminationTimeoutMs = 10000,
-                    OriginCategory = "StationControl"
+                    Originator = OriginatorId.Trim(),
+                    OriginCategory = SelectedOriginCategory
                 },
                 _cancellation.Token);
 
-            CommandStage = result.IsSuccess && !TestMode ? "Command accepted" : result.Stage;
-            CommandStatus = BuildCommandResultText(result);
-            if (result.IsSuccess && !TestMode)
-            {
-                CommandStatus += " Command accepted by the IEC 61850 control service. Waiting for independent IED process feedback; monitored stVal is not changed from the command path.";
-            }
+            ControlNumberText = result.ControlNumber;
+            TerminationText = result.CommandTerminationReceived
+                ? result.PositiveTermination ? "Positive" : "Negative" : "Not reported";
+            CommandStage = result.IsSuccess
+                ? result.FeedbackConfirmed ? "Feedback confirmed" : "Command accepted"
+                : result.CompletionState.Equals("NotSent", StringComparison.OrdinalIgnoreCase)
+                    ? "Not sent" : "Control unsuccessful";
+            CommandStatus = result.IsSuccess
+                ? result.FeedbackConfirmed
+                    ? "IED response and independent process feedback verified."
+                    : "IED accepted; waiting for independent IED process feedback."
+                : Iec61850ControlFailureReason.Explain(result).Summary;
+            // Accepted MMS response is not process-image authority. Full stage,
+            // LastApplError, termination and wire details stay in diagnostics.
+            ControlEvidenceText += "\n\nRESULT\n" + BuildCommandResultText(result);
             SetResultTone(result.IsSuccess ? "Success" : "Error");
         }
         catch (OperationCanceledException)
         {
-            CommandStage = "Cancelled";
-            CommandStatus = "The command operation was cancelled.";
+            CommandStage = "Outcome uncertain";
+            CommandStatus = "Request may have reached the IED. Verify before another attempt.";
             SetResultTone("Neutral");
         }
         catch (InvalidOperationException ex) when (
@@ -217,7 +301,7 @@ private async void SendCommand_Click(object sender, RoutedEventArgs e)
         }
         catch (Exception ex)
         {
-            CommandStage = "Command failed";
+            CommandStage = "Control unsuccessful";
             CommandStatus = $"{ex.GetType().Name}: {ex.Message}";
             SetResultTone("Error");
         }

From f8d64ee49743bcc639f7e77211aa2e0a0a6ed88b Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:26:34 +0700
Subject: [PATCH 13/27] test(control): verify default station origin and
 explicit user-selected category mapping

---
 tests/ARSAS.Tests/G1ControlCorrectnessRegressionTests.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/ARSAS.Tests/G1ControlCorrectnessRegressionTests.cs b/tests/ARSAS.Tests/G1ControlCorrectnessRegressionTests.cs
index 50141a253..cf8bf1d97 100644
--- a/tests/ARSAS.Tests/G1ControlCorrectnessRegressionTests.cs
+++ b/tests/ARSAS.Tests/G1ControlCorrectnessRegressionTests.cs
@@ -129,7 +129,9 @@ public void G11_FieldRejection_IsExplicitAndManualOriginIsStationControl()
         var runtime = File.ReadAllText(Path.Combine(RepoRoot(), "Services", "Iec61850MonitorRuntime.cs"));
 
         Assert.Contains("OriginCategory { get; init; } = \"StationControl\"", model, StringComparison.Ordinal);
-        Assert.Contains("OriginCategory = \"StationControl\"", dialog, StringComparison.Ordinal);
+        Assert.Contains("_selectedOriginCategory = \"StationControl\"", dialog, StringComparison.Ordinal);
+        Assert.Contains("OriginCategory = SelectedOriginCategory", dialog, StringComparison.Ordinal);
+        Assert.Contains("Originator = OriginatorId.Trim()", dialog, StringComparison.Ordinal);
         Assert.Contains("OriginCategory = \"StationControl\"", main, StringComparison.Ordinal);
         Assert.DoesNotContain("OriginCategory = \"Maintenance\"", dialog, StringComparison.Ordinal);
         Assert.DoesNotContain("OriginCategory = \"Maintenance\"", main, StringComparison.Ordinal);

From c44b8f2284b0931906180fa0aee7ae82a7454252 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:26:44 +0700
Subject: [PATCH 14/27] fix(control): preserve explicit independent feedback
 warning in concise result

---
 ControlCommandWindow.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ControlCommandWindow.xaml.cs b/ControlCommandWindow.xaml.cs
index 158c77fa8..be3d10612 100644
--- a/ControlCommandWindow.xaml.cs
+++ b/ControlCommandWindow.xaml.cs
@@ -277,7 +277,7 @@ private async void SendCommand_Click(object sender, RoutedEventArgs e)
             CommandStatus = result.IsSuccess
                 ? result.FeedbackConfirmed
                     ? "IED response and independent process feedback verified."
-                    : "IED accepted; waiting for independent IED process feedback."
+                    : "IED accepted. Waiting for independent IED process feedback."
                 : Iec61850ControlFailureReason.Explain(result).Summary;
             // Accepted MMS response is not process-image authority. Full stage,
             // LastApplError, termination and wire details stay in diagnostics.

From 9bbcfeb74ed44812efaee2a527eda7c386e06cb7 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:27:25 +0700
Subject: [PATCH 15/27] fix(control): use a strict choice selector for discrete
 DPC/SPC/BSC values

---
 ControlCommandWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ControlCommandWindow.xaml b/ControlCommandWindow.xaml
index 9f53843c0..01213fe9d 100644
--- a/ControlCommandWindow.xaml
+++ b/ControlCommandWindow.xaml
@@ -83,7 +83,7 @@
                 <ComboBox x:Name="CommandValueBox" Height="34"
                           ItemsSource="{Binding ValueOptions}"
                           Text="{Binding SelectedValue, UpdateSourceTrigger=PropertyChanged}"
-                          IsEditable="True" IsEnabled="{Binding IsReady}"
+                          IsEditable="{Binding AllowCustomValue}" IsEnabled="{Binding IsReady}"
                           Padding="8,4" VerticalContentAlignment="Center"
                           ToolTip="Control value according to the live CDC and MMS ctlVal type"/>
 

From 6791b2cbdf37764782eb921db8c6d2fa3882c787 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:27:45 +0700
Subject: [PATCH 16/27] fix(control): keep popup open during in-flight native
 command and avoid false-cancel outcome

---
 ControlCommandWindow.xaml.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ControlCommandWindow.xaml.cs b/ControlCommandWindow.xaml.cs
index be3d10612..e73e1a715 100644
--- a/ControlCommandWindow.xaml.cs
+++ b/ControlCommandWindow.xaml.cs
@@ -115,9 +115,11 @@ private set
         {
             if (!Set(ref _isBusy, value)) return;
             Raise(nameof(CanSend));
+            Raise(nameof(CanClose));
             Raise(nameof(SendButtonText));
         }
     }
+    public bool CanClose => !IsBusy;
     public bool IsReady
     {
         get => _isReady;
@@ -184,9 +186,9 @@ private async Task InspectAsync()
                 Iec61850ControlModelKind.StatusOnly => "Status only",
                 _ => "Unverified"
             };
-            SequenceHint = capabilities.UsesSelectBeforeOperate
-                ? "Native sequence: Select → Operate"
-                : "Native sequence: Operate";
+            SequenceHint = !capabilities.SupportsOperate ? "Not operable" :
+                capabilities.UsesSelectBeforeOperate
+                ? "Native: Select → Operate" : "Native: Operate";
             Raise(nameof(SendButtonText));
             ControlCdcText = string.IsNullOrWhiteSpace(capabilities.ControlCdc) ? "CONTROL" : capabilities.ControlCdc;
             Raise(nameof(AllowCustomValue));
@@ -465,6 +467,14 @@ private void Close_Click(object sender, RoutedEventArgs e)
 
     private void Window_Closing(object? sender, CancelEventArgs e)
     {
+        // Never abandon a dispatched native control flight by simply closing
+        // its UI. Late responses need the owning session to resolve/quarantine.
+        if (IsBusy)
+        {
+            e.Cancel = true;
+            CommandStatus = "IED operation still resolving. Close after the result is known.";
+            return;
+        }
         _cancellation.Cancel();
         _cancellation.Dispose();
     }

From 2292058b725a45660b257f23c6dbadbac2a37df0 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:27:59 +0700
Subject: [PATCH 17/27] feat(control): disable modal close during in-flight
 command ownership

---
 ControlCommandWindow.xaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ControlCommandWindow.xaml b/ControlCommandWindow.xaml
index 01213fe9d..991851fa7 100644
--- a/ControlCommandWindow.xaml
+++ b/ControlCommandWindow.xaml
@@ -183,7 +183,8 @@
                        FontSize="10.5" VerticalAlignment="Center"
                        TextWrapping="Wrap" Margin="0,0,10,0"/>
             <Button Grid.Column="1" Content="Close" Style="{StaticResource SoftButton}"
-                    Click="Close_Click" Width="75" Height="32" Margin="0,0,7,0"/>
+                    Click="Close_Click" IsEnabled="{Binding CanClose}"
+                    Width="75" Height="32" Margin="0,0,7,0"/>
             <Button x:Name="SendCommandButton" Grid.Column="2"
                     Content="{Binding SendButtonText}" Style="{StaticResource PrimaryButton}"
                     Click="SendCommand_Click" IsEnabled="{Binding CanSend}"

From ee83a2b96186118d6f80c6760d9352a691fdbc36 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:28:35 +0700
Subject: [PATCH 18/27] test(control): verify compact WPF layout, SBO action
 truth, origin/termination bindings and native safety

---
 .../ARSAS.Tests/ControlPopupCompactUxTests.cs | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 tests/ARSAS.Tests/ControlPopupCompactUxTests.cs

diff --git a/tests/ARSAS.Tests/ControlPopupCompactUxTests.cs b/tests/ARSAS.Tests/ControlPopupCompactUxTests.cs
new file mode 100644
index 000000000..04e044ece
--- /dev/null
+++ b/tests/ARSAS.Tests/ControlPopupCompactUxTests.cs
@@ -0,0 +1,91 @@
+using System.Xml.Linq;
+using ArIED61850Tester;
+
+namespace ARSAS.Tests;
+
+public sealed class ControlPopupCompactUxTests
+{
+    private static string Source(string name)
+    {
+        DirectoryInfo? directory = new(AppContext.BaseDirectory);
+        while (directory is not null)
+        {
+            var file = Path.Combine(directory.FullName, name);
+            if (File.Exists(file)) return File.ReadAllText(file);
+            directory = directory.Parent;
+        }
+        throw new FileNotFoundException(name);
+    }
+
+    [Fact]
+    public void CompactPopup_UsesArsasTypographyBoundedScrollableContentAndPinnedActionRow()
+    {
+        var xml = XDocument.Parse(Source("ControlCommandWindow.xaml"));
+        XNamespace p = "http://schemas.microsoft.com/winfx/2006/xaml/presentation";
+        XNamespace x = "http://schemas.microsoft.com/winfx/2006/xaml";
+        Assert.Equal("565", xml.Root!.Attribute("Width")?.Value);
+        Assert.Equal("{StaticResource AppFontFamily}", xml.Root.Attribute("FontFamily")?.Value);
+        var scroll = xml.Descendants(p + "ScrollViewer").Single();
+        Assert.Equal("2", scroll.Attribute("Grid.Row")?.Value);
+        Assert.Equal("Auto", scroll.Attribute("VerticalScrollBarVisibility")?.Value);
+        var send = xml.Descendants(p + "Button").Single(b => (string?)b.Attribute(x + "Name") == "SendCommandButton");
+        Assert.Equal("4", send.Attribute("Grid.Column")?.Value is null
+            ? send.Parent?.Attribute("Grid.Row")?.Value : send.Parent?.Attribute("Grid.Row")?.Value);
+        Assert.Equal("{Binding CanSend}", send.Attribute("IsEnabled")?.Value);
+        var footer = send.Parent!;
+        Assert.Equal("4", footer.Attribute("Grid.Row")?.Value);
+        Assert.Contains(footer.Elements(p + "Button"), b => b.Attribute("Content")?.Value == "Close" &&
+            b.Attribute("IsEnabled")?.Value == "{Binding CanClose}");
+        Assert.Contains(xml.Descendants(p + "Border"), n => (string?)n.Attribute(x + "Name") == "LiveCommandWarning");
+        Assert.Contains(xml.Descendants(p + "Border"), n => (string?)n.Attribute(x + "Name") == "ResultPanel" &&
+            n.Attribute("Grid.Row")?.Value == "3");
+    }
+
+    [Fact]
+    public void AdvancedParameters_AreCollapsedButBoundToNativeRequestAndResponse()
+    {
+        var xml = XDocument.Parse(Source("ControlCommandWindow.xaml"));
+        XNamespace p = "http://schemas.microsoft.com/winfx/2006/xaml/presentation";
+        var advanced = xml.Descendants(p + "Expander").Single(e =>
+            ((string?)e.Attribute("Header"))?.StartsWith("Advanced", StringComparison.Ordinal) == true);
+        var markup = advanced.ToString();
+        Assert.Contains("SelectedOriginCategory", markup);
+        Assert.Contains("OriginatorId", markup);
+        Assert.Contains("ControlNumberText", markup);
+        Assert.Contains("TerminationText", markup);
+        Assert.Contains("ControlEvidenceText", markup);
+        var code = Source("ControlCommandWindow.xaml.cs");
+        Assert.Contains("Originator = OriginatorId.Trim()", code);
+        Assert.Contains("OriginCategory = SelectedOriginCategory", code);
+        Assert.Contains("ControlNumberText = result.ControlNumber", code);
+        Assert.Contains("result.CommandTerminationReceived", code);
+        Assert.Contains("BuildCommandResultText(result)", code);
+    }
+
+    [Fact]
+    public void SinglePrimaryAction_PreservesNativeSboSequenceAndDoesNotFakeSelectCancel()
+    {
+        var markup = Source("ControlCommandWindow.xaml");
+        var source = Source("ControlCommandWindow.xaml.cs");
+        Assert.Contains("Native: Select → Operate", source);
+        Assert.Contains("Select → Operate", source);
+        Assert.Contains("new Iec61850ControlCommandRequest", source);
+        Assert.Contains("_runtime.ExecuteControlAsync(", source);
+        Assert.Contains("MessageBoxResult.Yes", source);
+        Assert.DoesNotContain("SelectAsync(", source);
+        Assert.DoesNotContain("CancelAsync(", source);
+        Assert.Contains("IsBusy", source);
+        Assert.Contains("e.Cancel = true;", source);
+        Assert.Contains("IsEnabled=\"{Binding CanClose}\"", markup);
+    }
+
+    [Theory]
+    [InlineData("ARSAS", true)]
+    [InlineData("Station-Engineer_1", true)]
+    [InlineData("", false)]
+    [InlineData("   ", false)]
+    [InlineData("é", false)]
+    [InlineData("line\nfeed", false)]
+    public void OriginIdentifier_IsPrintableAsciiOnly(string value, bool expected)
+        => Assert.Equal(expected, ControlCommandWindow.IsValidOriginator(value));
+}

From dcceb5a0f79fab7b373d282b95ac6b139615a09b Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:29:38 +0700
Subject: [PATCH 19/27] fix(control): allow closing slow read-only inspection
 while protecting dispatched control flight

---
 ControlCommandWindow.xaml.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ControlCommandWindow.xaml.cs b/ControlCommandWindow.xaml.cs
index e73e1a715..068f5848a 100644
--- a/ControlCommandWindow.xaml.cs
+++ b/ControlCommandWindow.xaml.cs
@@ -33,6 +33,7 @@ public partial class ControlCommandWindow : Window, INotifyPropertyChanged
     private bool _testMode;
     private bool _confirmLiveCommand;
     private bool _isBusy;
+    private bool _commandFlightActive;
     private bool _isReady;
     private string _commandStage = "Ready to inspect";
     private string _commandStatus = "ArIED will read the live control model and current status before enabling Send Command.";
@@ -119,7 +120,7 @@ private set
             Raise(nameof(SendButtonText));
         }
     }
-    public bool CanClose => !IsBusy;
+    public bool CanClose => !_commandFlightActive;
     public bool IsReady
     {
         get => _isReady;
@@ -247,6 +248,8 @@ private async void SendCommand_Click(object sender, RoutedEventArgs e)
             MessageBoxImage.Warning, MessageBoxResult.No);
         if (confirm != MessageBoxResult.Yes) return;
 
+        _commandFlightActive = true;
+        Raise(nameof(CanClose));
         IsBusy = true;
         CommandStage = TestMode ? "Sending test command" : "Sending live command";
         CommandStatus = "Executing the IEC 61850 control sequence selected from ctlModel…";
@@ -309,6 +312,8 @@ private async void SendCommand_Click(object sender, RoutedEventArgs e)
         }
         finally
         {
+            _commandFlightActive = false;
+            Raise(nameof(CanClose));
             IsBusy = false;
         }
     }
@@ -469,7 +474,7 @@ private void Window_Closing(object? sender, CancelEventArgs e)
     {
         // Never abandon a dispatched native control flight by simply closing
         // its UI. Late responses need the owning session to resolve/quarantine.
-        if (IsBusy)
+        if (_commandFlightActive)
         {
             e.Cancel = true;
             CommandStatus = "IED operation still resolving. Close after the result is known.";

From 7d1f9b40418fae5315a8c5126c85247d6fb9891c Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:30:16 +0700
Subject: [PATCH 20/27] testability(control): expose side-effect-free
 originator ID validator for Windows regression tests

---
 ControlCommandWindow.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ControlCommandWindow.xaml.cs b/ControlCommandWindow.xaml.cs
index 068f5848a..dc869a008 100644
--- a/ControlCommandWindow.xaml.cs
+++ b/ControlCommandWindow.xaml.cs
@@ -82,7 +82,7 @@ public string OriginatorId
     }
     public string OriginValidationText => IsValidOriginator(OriginatorId)
         ? string.Empty : "Originator ID requires 1–64 printable ASCII characters.";
-    internal static bool IsValidOriginator(string? id) =>
+    public static bool IsValidOriginator(string? id) =>
         !string.IsNullOrWhiteSpace(id) && id.Length <= 64 &&
         id.All(c => c is >= ' ' and <= '~');
     public bool AllowCustomValue

From 7ed9aa7560562d47c668f8b3bfb5b5d2a6edd8c6 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:31:32 +0700
Subject: [PATCH 21/27] fix(control): require operator authorization for
 Test=true as well as live control

---
 ControlCommandWindow.xaml.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ControlCommandWindow.xaml.cs b/ControlCommandWindow.xaml.cs
index dc869a008..ce11ec0d0 100644
--- a/ControlCommandWindow.xaml.cs
+++ b/ControlCommandWindow.xaml.cs
@@ -138,7 +138,7 @@ _liveControlModel is Iec61850ControlModelKind.SboNormal or
             Iec61850ControlModelKind.SboEnhanced ? "Select → Operate" : "Operate";
     public bool CanSend => IsReady && !IsBusy && !string.IsNullOrWhiteSpace(SelectedValue) &&
         IsValidOriginator(OriginatorId) && OriginCategories.Contains(SelectedOriginCategory) &&
-        (TestMode || ConfirmLiveCommand);
+        ConfirmLiveCommand;
 
     public ControlCommandWindow(
         Iec61850MonitorRuntime runtime,
@@ -440,7 +440,9 @@ private void UpdateLiveWarning()
     {
         if (LiveCommandWarning == null)
             return;
-        LiveCommandWarning.Visibility = IsReady && !TestMode ? Visibility.Visible : Visibility.Collapsed;
+        // Test=true is an MMS control flag, not an offline simulator.
+        // Some servers may still change equipment: authorization is mandatory.
+        LiveCommandWarning.Visibility = IsReady ? Visibility.Visible : Visibility.Collapsed;
         if (TestMode)
             ConfirmLiveCommand = false;
     }

From 177b872690593ab6491b3a845725dd89c808ca60 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:32:04 +0700
Subject: [PATCH 22/27] test(control): verify Test=true still requires explicit
 authorization and simplify pinned-footer test

---
 tests/ARSAS.Tests/ControlPopupCompactUxTests.cs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/tests/ARSAS.Tests/ControlPopupCompactUxTests.cs b/tests/ARSAS.Tests/ControlPopupCompactUxTests.cs
index 04e044ece..e4f7aecdc 100644
--- a/tests/ARSAS.Tests/ControlPopupCompactUxTests.cs
+++ b/tests/ARSAS.Tests/ControlPopupCompactUxTests.cs
@@ -29,8 +29,7 @@ public void CompactPopup_UsesArsasTypographyBoundedScrollableContentAndPinnedAct
         Assert.Equal("2", scroll.Attribute("Grid.Row")?.Value);
         Assert.Equal("Auto", scroll.Attribute("VerticalScrollBarVisibility")?.Value);
         var send = xml.Descendants(p + "Button").Single(b => (string?)b.Attribute(x + "Name") == "SendCommandButton");
-        Assert.Equal("4", send.Attribute("Grid.Column")?.Value is null
-            ? send.Parent?.Attribute("Grid.Row")?.Value : send.Parent?.Attribute("Grid.Row")?.Value);
+        Assert.Equal("4", send.Parent?.Attribute("Grid.Row")?.Value);
         Assert.Equal("{Binding CanSend}", send.Attribute("IsEnabled")?.Value);
         var footer = send.Parent!;
         Assert.Equal("4", footer.Attribute("Grid.Row")?.Value);
@@ -79,6 +78,20 @@ public void SinglePrimaryAction_PreservesNativeSboSequenceAndDoesNotFakeSelectCa
         Assert.Contains("IsEnabled=\"{Binding CanClose}\"", markup);
     }
 
+    [Fact]
+    public void TestFlag_NeverBypassesExplicitControlAuthorization()
+    {
+        var code = Source("ControlCommandWindow.xaml.cs");
+        var start = code.IndexOf("public bool CanSend =>", StringComparison.Ordinal);
+        Assert.True(start >= 0);
+        var section = code[start..code.IndexOf("public ControlCommandWindow(", start, StringComparison.Ordinal)];
+        Assert.Contains("ConfirmLiveCommand;", section);
+        Assert.DoesNotContain("TestMode || ConfirmLiveCommand", section);
+        Assert.Contains("LiveCommandWarning.Visibility = IsReady ?", code);
+        Assert.Contains("if (TestMode)", code);
+        Assert.Contains("ConfirmLiveCommand = false;", code);
+    }
+
     [Theory]
     [InlineData("ARSAS", true)]
     [InlineData("Station-Engineer_1", true)]

From aaf9562903b6befbe4f632cfff238ba1cbf3b901 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:33:13 +0700
Subject: [PATCH 23/27] fix(control): update primary action label immediately
 on Test toggle

---
 ControlCommandWindow.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ControlCommandWindow.xaml.cs b/ControlCommandWindow.xaml.cs
index ce11ec0d0..0e3790d2e 100644
--- a/ControlCommandWindow.xaml.cs
+++ b/ControlCommandWindow.xaml.cs
@@ -98,6 +98,7 @@ public bool TestMode
             if (!Set(ref _testMode, value)) return;
             UpdateLiveWarning();
             Raise(nameof(CanSend));
+            Raise(nameof(SendButtonText));
         }
     }
     public bool ConfirmLiveCommand

From 29d5eff8acb9a42d73e6e75d9a79892cc6817bee Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:35:29 +0700
Subject: [PATCH 24/27] fix(control): freeze editable command parameters
 throughout a native control flight

---
 ControlCommandWindow.xaml.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ControlCommandWindow.xaml.cs b/ControlCommandWindow.xaml.cs
index 0e3790d2e..0ebf5b882 100644
--- a/ControlCommandWindow.xaml.cs
+++ b/ControlCommandWindow.xaml.cs
@@ -118,10 +118,12 @@ private set
             if (!Set(ref _isBusy, value)) return;
             Raise(nameof(CanSend));
             Raise(nameof(CanClose));
+            Raise(nameof(CanEdit));
             Raise(nameof(SendButtonText));
         }
     }
     public bool CanClose => !_commandFlightActive;
+    public bool CanEdit => IsReady && !IsBusy;
     public bool IsReady
     {
         get => _isReady;
@@ -130,6 +132,7 @@ private set
             if (!Set(ref _isReady, value)) return;
             UpdateLiveWarning();
             Raise(nameof(CanSend));
+            Raise(nameof(CanEdit));
         }
     }
     public string CommandStage { get => _commandStage; private set => Set(ref _commandStage, value); }

From 1f857bb96834c4243e998e5dbb9abdf5599df420 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:35:47 +0700
Subject: [PATCH 25/27] fix(control): disable value, checks and origin edits
 while executing

---
 ControlCommandWindow.xaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ControlCommandWindow.xaml b/ControlCommandWindow.xaml
index 991851fa7..3c2992e22 100644
--- a/ControlCommandWindow.xaml
+++ b/ControlCommandWindow.xaml
@@ -83,11 +83,11 @@
                 <ComboBox x:Name="CommandValueBox" Height="34"
                           ItemsSource="{Binding ValueOptions}"
                           Text="{Binding SelectedValue, UpdateSourceTrigger=PropertyChanged}"
-                          IsEditable="{Binding AllowCustomValue}" IsEnabled="{Binding IsReady}"
+                          IsEditable="{Binding AllowCustomValue}" IsEnabled="{Binding CanEdit}"
                           Padding="8,4" VerticalContentAlignment="Center"
                           ToolTip="Control value according to the live CDC and MMS ctlVal type"/>
 
-                <WrapPanel Margin="0,12,0,9">
+                <WrapPanel Margin="0,12,0,9" IsEnabled="{Binding CanEdit}">
                     <CheckBox Content="Interlock" IsChecked="{Binding InterlockCheck}"
                               Style="{StaticResource ControlCheckBox}"
                               ToolTip="IEC 61850 interlock-check bit"/>
@@ -101,7 +101,8 @@
 
                 <Border x:Name="LiveCommandWarning" Background="#FFF7EA"
                         BorderBrush="#EBD7B9" BorderThickness="1"
-                        CornerRadius="6" Padding="10,9" Margin="0,0,0,9">
+                        CornerRadius="6" Padding="10,9" Margin="0,0,0,9"
+                        IsEnabled="{Binding CanEdit}">
                     <CheckBox Content="I am authorized to operate this IED"
                               IsChecked="{Binding ConfirmLiveCommand}"
                               Foreground="#795321" FontSize="11.5"
@@ -110,7 +111,7 @@
 
                 <!-- Advanced information is still accessible, never mixed into the primary task. -->
                 <Expander Header="Advanced · originator &amp; diagnostics"
-                          Foreground="{StaticResource Ink}" FontSize="11"
+                          IsEnabled="{Binding CanEdit}" Foreground="{StaticResource Ink}" FontSize="11"
                           Margin="0,3,0,0">
                     <StackPanel Margin="3,10,2,5">
                         <Grid>

From 183734877aed72e4acf17deaf82f196f4d95e1f6 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:37:52 +0700
Subject: [PATCH 26/27] fix(control): distinguish ambiguous wire/timeout
 outcomes from confirmed rejections

---
 ControlCommandWindow.xaml.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ControlCommandWindow.xaml.cs b/ControlCommandWindow.xaml.cs
index 0ebf5b882..2e4ade1fe 100644
--- a/ControlCommandWindow.xaml.cs
+++ b/ControlCommandWindow.xaml.cs
@@ -282,7 +282,9 @@ private async void SendCommand_Click(object sender, RoutedEventArgs e)
             CommandStage = result.IsSuccess
                 ? result.FeedbackConfirmed ? "Feedback confirmed" : "Command accepted"
                 : result.CompletionState.Equals("NotSent", StringComparison.OrdinalIgnoreCase)
-                    ? "Not sent" : "Control unsuccessful";
+                    ? "Not sent"
+                    : result.CompletionState is "Unknown" or "TimedOut" or "AssociationLost"
+                        ? "Outcome uncertain" : "Control rejected";
             CommandStatus = result.IsSuccess
                 ? result.FeedbackConfirmed
                     ? "IED response and independent process feedback verified."
@@ -310,9 +312,10 @@ private async void SendCommand_Click(object sender, RoutedEventArgs e)
         }
         catch (Exception ex)
         {
-            CommandStage = "Control unsuccessful";
-            CommandStatus = $"{ex.GetType().Name}: {ex.Message}";
-            SetResultTone("Error");
+            // An unexpected failure after dispatch cannot prove the command was NOT sent.
+            CommandStage = "Outcome unresolved";
+            CommandStatus = $"{ex.GetType().Name}: {ex.Message}. Verify IED state before retry.";
+            SetResultTone("Warning");
         }
         finally
         {

From 5e66acc948d2a167f3e8b72e302be242bf6c3580 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Fri, 23 Oct 2026 13:40:38 +0700
Subject: [PATCH 27/27] test(control): retain strict local NOT SENT vs
 uncertain/unresolved safety stages

---
 tests/ARSAS.Tests/P0CommandStopRaceAdmissionTests.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/ARSAS.Tests/P0CommandStopRaceAdmissionTests.cs b/tests/ARSAS.Tests/P0CommandStopRaceAdmissionTests.cs
index ad20917fd..5a31b0205 100644
--- a/tests/ARSAS.Tests/P0CommandStopRaceAdmissionTests.cs
+++ b/tests/ARSAS.Tests/P0CommandStopRaceAdmissionTests.cs
@@ -114,9 +114,13 @@ public void QuickCommandDock_ClassifiesLocalBusyBeforeGenericFailure()
         var dialog = File.ReadAllText(
             Path.Combine(current!.FullName, "ControlCommandWindow.xaml.cs"));
         var dialogLocal = dialog.IndexOf("CommandStage = \"Command not sent\"", StringComparison.Ordinal);
-        var dialogGeneric = dialog.IndexOf("CommandStage = \"Command failed\"", StringComparison.Ordinal);
-        Assert.True(dialogLocal >= 0 && dialogGeneric > dialogLocal,
-            "The control dialog must also separate local busy from possible wire failure.");
+        var dialogUncertain = dialog.IndexOf("CommandStage = \"Outcome uncertain\"", StringComparison.Ordinal);
+        var dialogUnresolved = dialog.IndexOf("CommandStage = \"Outcome unresolved\"", StringComparison.Ordinal);
+        Assert.True(dialogLocal >= 0 && dialogUnresolved > dialogLocal,
+            "A pre-wire local rejection must be separate from an unresolved dispatched control.");
+        Assert.True(dialogUncertain >= 0,
+            "Transport ambiguity must remain visible rather than being reported as a failed operate.");
+        Assert.DoesNotContain("CommandStage = \"Command failed\"", dialog, StringComparison.Ordinal);
     }
 
     private static object Slot(UiRuntime runtime, string deviceId)