P10.9U: targeted CSWI Pos status recovery for truncated MMS NameList

.github/workflows/release-windows.yml

@@ -63,11 +63,11 @@ jobs:
           python-version: '3.12'
 
       - name: Run offline release-ready and installer-verifier fixtures
+        shell: bash
         run: |
-          python .\ArIED61850Tester\scripts\test-ci-release-ready.py
-          if ($LASTEXITCODE -ne 0) { throw 'Release-ready metadata gate fixtures failed.' }
-          python .\ArIED61850Tester\scripts\test-ci-installer-reuse.py
-          if ($LASTEXITCODE -ne 0) { throw 'Validated-installer verifier fixtures failed.' }
+          set -euo pipefail
+          python ./ArIED61850Tester/scripts/test-ci-release-ready.py
+          python ./ArIED61850Tester/scripts/test-ci-installer-reuse.py
 
       - name: Wait for exact immutable release dependencies
         id: ready
@@ -76,9 +76,9 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
         run: |
           $proofPath = Join-Path $env:RUNNER_TEMP 'arsas-release-ready.json'
-          python .\ArIED61850Tester\scripts\wait-ci-release-ready.py `
+          python ./ArIED61850Tester/scripts/wait-ci-release-ready.py `
             --repository $env:GITHUB_REPOSITORY `
-            --source-dir .\ArIED61850Tester `
+            --source-dir ./ArIED61850Tester `
             --source-sha $env:GITHUB_SHA `
             --ref-type $env:GITHUB_REF_TYPE `
             --ref-name $env:GITHUB_REF_NAME `

.release/windows.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.6.40",
+  "version": "1.6.41",
   "channel": "stable",
   "platform": "windows-x64",
   "primaryAsset": "ARSAS-Windows-x64-Setup.exe",

App.xaml

@@ -476,9 +476,9 @@
         <Style x:Key="CommandActionButtonBase" TargetType="Button">
             <Setter Property="Foreground" Value="White"/>
             <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Padding" Value="15,7"/>
-            <Setter Property="MinWidth" Value="66"/>
-            <Setter Property="MinHeight" Value="33"/>
+            <Setter Property="Padding" Value="10,3"/>
+            <Setter Property="MinWidth" Value="58"/>
+            <Setter Property="MinHeight" Value="29"/>
             <Setter Property="FontWeight" Value="SemiBold"/>
             <Setter Property="Cursor" Value="Hand"/>
             <Setter Property="SnapsToDevicePixels" Value="True"/>
@@ -490,15 +490,12 @@
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="{TemplateBinding BorderBrush}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="11">
-                                <Border.Effect>
-                                    <DropShadowEffect BlurRadius="11" ShadowDepth="3" Opacity="0.22" Color="#31445F"/>
-                                </Border.Effect>
+                                    CornerRadius="9">
                                 <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"
                                                   Margin="{TemplateBinding Padding}"
                                                   TextElement.Foreground="{TemplateBinding Foreground}"/>
                             </Border>
-                            <Border x:Name="InteractionSurface" Background="Transparent" CornerRadius="11"
+                            <Border x:Name="InteractionSurface" Background="Transparent" CornerRadius="9"
                                     BorderBrush="Transparent" BorderThickness="1" IsHitTestVisible="False"/>
                         </Grid>
                         <ControlTemplate.Triggers>
@@ -524,6 +521,36 @@
             </Setter>
         </Style>
 
+        <!-- One semantic palette for tap direction and the corresponding confirmation. -->
+        <SolidColorBrush x:Key="CommandRaiseFill" Color="#526AE8"/>
+        <SolidColorBrush x:Key="CommandRaiseStroke" Color="#4058C5"/>
+        <SolidColorBrush x:Key="CommandLowerFill" Color="#E9B451"/>
+        <SolidColorBrush x:Key="CommandLowerStroke" Color="#C28C2C"/>
+        <SolidColorBrush x:Key="CommandLowerInk" Color="#4A3108"/>
+
+        <Style x:Key="CommandRaiseButton" TargetType="Button" BasedOn="{StaticResource CommandActionButtonBase}">
+            <Setter Property="Background" Value="{StaticResource CommandRaiseFill}"/>
+            <Setter Property="BorderBrush" Value="{StaticResource CommandRaiseStroke}"/>
+            <Setter Property="MinWidth" Value="56"/>
+        </Style>
+        <Style x:Key="CommandLowerButton" TargetType="Button" BasedOn="{StaticResource CommandActionButtonBase}">
+            <Setter Property="Background" Value="{StaticResource CommandLowerFill}"/>
+            <Setter Property="BorderBrush" Value="{StaticResource CommandLowerStroke}"/>
+            <Setter Property="Foreground" Value="{StaticResource CommandLowerInk}"/>
+            <Setter Property="MinWidth" Value="56"/>
+        </Style>
+
+        <Style x:Key="CommandDockPrimaryButton" TargetType="Button" BasedOn="{StaticResource CommandActionButtonBase}">
+            <Setter Property="Background" Value="{StaticResource AccentGradient}"/>
+            <Setter Property="BorderBrush" Value="#4B83DF"/>
+            <Setter Property="MinWidth" Value="56"/>
+        </Style>
+        <Style x:Key="CommandDockSoftButton" TargetType="Button" BasedOn="{StaticResource CommandActionButtonBase}">
+            <Setter Property="Foreground" Value="{StaticResource Ink}"/>
+            <Setter Property="Background" Value="#F7F9FC"/>
+            <Setter Property="BorderBrush" Value="#CDD8E5"/>
+            <Setter Property="MinWidth" Value="56"/>
+        </Style>
         <Style x:Key="CommandOpenButton" TargetType="Button" BasedOn="{StaticResource CommandActionButtonBase}">
             <Setter Property="Background" Value="{StaticResource CommandOpenGradient}"/>
             <Setter Property="BorderBrush" Value="#69D2A1"/>
@@ -543,6 +570,16 @@
                     <Setter Property="Background" Value="{StaticResource CommandCloseGradient}"/>
                     <Setter Property="BorderBrush" Value="#FF9A9A"/>
                 </DataTrigger>
+                <DataTrigger Binding="{Binding ControlPendingAction}" Value="Raise">
+                    <Setter Property="Background" Value="{StaticResource CommandRaiseFill}"/>
+                    <Setter Property="BorderBrush" Value="{StaticResource CommandRaiseStroke}"/>
+                    <Setter Property="Foreground" Value="White"/>
+                </DataTrigger>
+                <DataTrigger Binding="{Binding ControlPendingAction}" Value="Lower">
+                    <Setter Property="Background" Value="{StaticResource CommandLowerFill}"/>
+                    <Setter Property="BorderBrush" Value="{StaticResource CommandLowerStroke}"/>
+                    <Setter Property="Foreground" Value="{StaticResource CommandLowerInk}"/>
+                </DataTrigger>
             </Style.Triggers>
         </Style>
 
@@ -1010,7 +1047,7 @@
         </Style>
 
         <Style x:Key="CommandDataGridCell" TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
-            <Setter Property="Padding" Value="10,4"/>
+            <Setter Property="Padding" Value="8,2"/>
             <Setter Property="BorderBrush" Value="#E5ECF5"/>
             <Setter Property="BorderThickness" Value="0,0,0,1"/>
         </Style>

ArIED61850Tester.csproj

@@ -15,9 +15,9 @@
     <Product>ARSAS</Product>
     <AssemblyTitle>ARSAS - IEC 61850 Engineering Workstation</AssemblyTitle>
     <Description>Open-source Windows IEC 61850 engineering workstation for MMS model discovery, reporting, independent multi-IED monitoring, GOOSE subscription, fault-record file transfer, Sampled Values engineering and evidence export, SCL workflows, diagnostics, sequence of events, and guarded control validation.</Description>
-    <Version>1.6.40</Version>
-    <AssemblyVersion>1.6.40.0</AssemblyVersion>
-    <FileVersion>1.6.40.0</FileVersion>
+    <Version>1.6.41</Version>
+    <AssemblyVersion>1.6.41.0</AssemblyVersion>
+    <FileVersion>1.6.41.0</FileVersion>
     <PackageProjectUrl>https://github.com/masarray/arsas</PackageProjectUrl>
     <RepositoryUrl>https://github.com/masarray/arsas</RepositoryUrl>
     <RepositoryType>git</RepositoryType>

ControlModelWriteWindow.xaml

@@ -0,0 +1,53 @@
+<Window x:Class="ArIED61850Tester.ControlModelWriteWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Write Data to IED" Width="510" Height="290" MinWidth="490"
+        ResizeMode="NoResize" WindowStartupLocation="CenterOwner"
+        Background="#F4F7FB" FontFamily="{StaticResource AppFontFamily}"
+        Icon="Assets/app-icon.ico" Loaded="Window_Loaded" Closing="Window_Closing">
+    <Grid Margin="16">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <TextBlock x:Name="ReferenceLabel" Grid.Row="0" FontSize="11.5"
+                   Foreground="{StaticResource Ink}" FontFamily="{StaticResource AppCodeFontFamily}"
+                   TextTrimming="CharacterEllipsis" Margin="0,0,0,12"/>
+        <Border Grid.Row="1" BorderThickness="1" BorderBrush="{StaticResource Line}"
+                CornerRadius="8" Background="#F8FAFC" Padding="10,12">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="105"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="ctlModel [CF]" VerticalAlignment="Center"
+                           Foreground="{StaticResource Ink}" FontSize="12"/>
+                <ComboBox x:Name="ModelPicker" Grid.Column="1" Height="31"
+                          ItemsSource="{Binding Choices}" DisplayMemberPath="Label"
+                          SelectionChanged="ModelPicker_SelectionChanged" IsEnabled="False"/>
+                <Button x:Name="ReadButton" Grid.Column="2" Content="Read" Click="Read_Click"
+                        Style="{StaticResource SoftButton}" Height="29" MinHeight="29"
+                        Padding="10,3" Margin="8,0,0,0"/>
+            </Grid>
+        </Border>
+        <StackPanel Grid.Row="2" Margin="2,10,0,5">
+            <TextBlock x:Name="StatusLabel" FontSize="11" TextWrapping="Wrap"
+                       Foreground="{StaticResource Muted}" Text="Reading ctlModel from IED…"/>
+            <TextBox x:Name="FailureDetails" Visibility="Collapsed" Margin="0,7,0,0"
+                     IsReadOnly="True" IsTabStop="False" TextWrapping="Wrap"
+                     VerticalScrollBarVisibility="Auto" MaxHeight="73" MinHeight="48"
+                     FontSize="11" Padding="8,6" BorderThickness="1" BorderBrush="#E7C4C4"
+                     Background="#FFF8F8" Foreground="#923C3C"/>
+        </StackPanel>
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button x:Name="WriteButton" Content="Write" Click="Write_Click"
+                    Style="{StaticResource PrimaryButton}" Width="93" Height="31"
+                    MinHeight="31" Padding="10,4" IsEnabled="False" Margin="0,0,8,0"/>
+            <Button Content="Cancel" Click="Close_Click" Style="{StaticResource SoftButton}"
+                    Width="85" Height="31" MinHeight="31" Padding="10,4"/>
+        </StackPanel>
+    </Grid>
+</Window>

ControlModelWriteWindow.xaml.cs

@@ -0,0 +1,176 @@
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using ArIED61850Tester.Models;
+using ArIED61850Tester.Services;
+using AR.Iec61850.Control;
+
+namespace ArIED61850Tester;
+
+/// <summary>
+/// One CF value editor. Read → select → Write → exact readback.
+/// No typed phrases, extra checkboxes, command-service Operate, or retries.
+/// </summary>
+public partial class ControlModelWriteWindow : Window
+{
+    public sealed record ModelChoice(Iec61850ControlModelKind Model, string Label);
+    private readonly Iec61850MonitorRuntime _runtime;
+    private readonly Iec61850MonitorDevice _device;
+    private readonly SignalDefinition _signal;
+    private readonly CancellationTokenSource _cancellation = new();
+    private bool _busy;
+    private bool _liveModelReady;
+    private Iec61850ControlModelKind _liveModel = Iec61850ControlModelKind.Unknown;
+
+    public ObservableCollection<ModelChoice> Choices { get; } = new()
+    {
+        new(Iec61850ControlModelKind.StatusOnly, "0  [status-only]"),
+        new(Iec61850ControlModelKind.DirectNormal, "1  [direct-with-normal-security]"),
+        new(Iec61850ControlModelKind.SboNormal, "2  [sbo-with-normal-security]"),
+        new(Iec61850ControlModelKind.DirectEnhanced, "3  [direct-with-enhanced-security]"),
+        new(Iec61850ControlModelKind.SboEnhanced, "4  [sbo-with-enhanced-security]")
+    };
+
+    public ControlModelWriteWindow(
+        Iec61850MonitorRuntime runtime, Iec61850MonitorDevice device, SignalDefinition signal)
+    {
+        _runtime = runtime ?? throw new ArgumentNullException(nameof(runtime));
+        _device = device ?? throw new ArgumentNullException(nameof(device));
+        _signal = signal ?? throw new ArgumentNullException(nameof(signal));
+        InitializeComponent();
+        DataContext = this;
+        ReferenceLabel.Text = _signal.ObjectReference + ".ctlModel";
+    }
+
+    private async void Window_Loaded(object sender, RoutedEventArgs e)
+        => await ReadModelAsync();
+
+    private void ModelPicker_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        => UpdateWriteButton();
+
+    private void UpdateWriteButton()
+    {
+        ReadButton.IsEnabled = !_busy;
+        WriteButton.IsEnabled = !_busy && _device.IsConnected && _liveModelReady &&
+            ModelPicker.SelectedItem is ModelChoice choice && choice.Model != _liveModel;
+    }
+
+    private async Task ReadModelAsync()
+    {
+        _busy = true;
+        _liveModelReady = false;
+        ModelPicker.IsEnabled = false;
+        UpdateWriteButton();
+        StatusLabel.Text = "Reading current ctlModel…";
+        FailureDetails.Visibility = Visibility.Collapsed;
+        FailureDetails.Text = string.Empty;
+        try
+        {
+            var capabilities = await _runtime.InspectControlAsync(
+                _device.DeviceId, _signal, _cancellation.Token);
+            _liveModel = capabilities.ControlModel;
+            _liveModelReady = _liveModel != Iec61850ControlModelKind.Unknown &&
+                capabilities.EngineControlServiceAvailable;
+            if (_liveModelReady)
+            {
+                ModelPicker.SelectedItem = Choices.FirstOrDefault(x => x.Model == _liveModel);
+                ModelPicker.IsEnabled = true;
+                StatusLabel.Text = $"Current: {(int)_liveModel} · {capabilities.ControlModelText}";
+            }
+            else
+            {
+                StatusLabel.Text = "ctlModel could not be read. Write disabled; check Diagnostics.";
+            }
+        }
+        catch (OperationCanceledException)
+        {
+            StatusLabel.Text = "Read cancelled.";
+        }
+        catch (Exception ex)
+        {
+            StatusLabel.Text = $"Read failed: {ex.Message}";
+        }
+        finally
+        {
+            _busy = false;
+            UpdateWriteButton();
+        }
+    }
+
+    private async void Read_Click(object sender, RoutedEventArgs e)
+    {
+        if (!_busy) await ReadModelAsync();
+    }
+
+    private async void Write_Click(object sender, RoutedEventArgs e)
+    {
+        if (_busy || !_liveModelReady || !_device.IsConnected ||
+            ModelPicker.SelectedItem is not ModelChoice selected || selected.Model == _liveModel)
+            return;
+        // Exact expected value is confirmed again by ARIEC immediately before
+        // the one permitted CF Write. No automatic mode trials.
+        var expected = _liveModel;
+        _busy = true;
+        _liveModelReady = false;
+        ModelPicker.IsEnabled = false;
+        UpdateWriteButton();
+        StatusLabel.Text = "Writing ctlModel and checking readback…";
+        try
+        {
+            var result = await ConfigureExactModelAsync(expected, selected.Model, _cancellation.Token);
+            if (!result.WriteAccepted || !result.ReadbackVerified ||
+                (int)result.AfterModel != (int)selected.Model)
+            {
+                ShowWriteFailure(result.Detail, (int)selected.Model, (int)result.AfterModel, result.ReadbackVerified);
+                return;
+            }
+
+            // The engine has completed the exact CF write and authoritative MMS readback.
+            // Do not issue a second inspection or keep the commissioning dialog open.
+            if (!_cancellation.IsCancellationRequested && IsLoaded)
+                DialogResult = true;
+        }
+        catch (OperationCanceledException)
+        {
+            ShowWriteFailure("Connection interrupted or operation cancelled. Read actual ctlModel before retrying.");
+        }
+        catch (Exception ex)
+        {
+            ShowWriteFailure($"Write not verified: {ex.Message}. Read actual ctlModel.");
+        }
+        finally
+        {
+            _busy = false;
+            UpdateWriteButton();
+        }
+    }
+
+    private void ShowWriteFailure(string? detail,
+        int? expected = null,
+        int? actual = null, bool readbackVerified = false)
+    {
+        if (_cancellation.IsCancellationRequested || !IsLoaded)
+            return;
+
+        var reason = string.IsNullOrWhiteSpace(detail)
+            ? "IED did not provide a verified write result."
+            : detail.Trim();
+        if (readbackVerified && expected.HasValue && actual.HasValue && expected != actual)
+            reason = $"Readback mismatch • Expected {expected.Value}, actual {actual.Value}. {reason}";
+
+        FailureDetails.Text = reason;
+        FailureDetails.Visibility = Visibility.Visible;
+        StatusLabel.Text = "Write not verified • no further write will be sent automatically.";
+    }
+
+    // Compile-time transport bridge; no reflection or ad-hoc MMS Write.
+    private Task<Iec61850ControlModelConfigurationResult> ConfigureExactModelAsync(
+        Iec61850ControlModelKind expected, Iec61850ControlModelKind selected,
+        CancellationToken cancellationToken)
+        => Iec61850ControlModelWriteDispatcher.ConfigureAsync(
+            _runtime, _device.DeviceId, _signal, expected, selected, cancellationToken);
+
+    private void Close_Click(object sender, RoutedEventArgs e) => Close();
+    private void Window_Closing(object? sender, CancelEventArgs e) => _cancellation.Cancel();
+}

Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
-    <Version>1.6.40</Version>
-    <AssemblyVersion>1.6.40.0</AssemblyVersion>
-    <FileVersion>1.6.40.0</FileVersion>
-    <InformationalVersion>1.6.40</InformationalVersion>
+    <Version>1.6.41</Version>
+    <AssemblyVersion>1.6.41.0</AssemblyVersion>
+    <FileVersion>1.6.41.0</FileVersion>
+    <InformationalVersion>1.6.41</InformationalVersion>
   </PropertyGroup>
 </Project>