FAT v2 consolidated: shared SCL workspace, V1/V2 capture and report

.github/workflows/validate-io-testing.yml

@@ -10,6 +10,9 @@ on:
       - "Services/IoTesting/**"
       - "tests/ARSAS.Tests/IoTest*"
       - "tests/ARSAS.Tests/IoList*"
+      - "tests/ARSAS.Tests/IoFat*"
+      - "tests/ARSAS.Tests/FatDataSet*"
+      - "tests/ARSAS.Tests/FatScl*"
       - "engines/ARIEC61850.lock.json"
       - ".github/workflows/validate-io-testing.yml"
   workflow_dispatch:
@@ -85,7 +88,7 @@ jobs:
           if-no-files-found: error
 
       - name: Run IO testing regression tests
-        run: dotnet test .\ARSAS\tests\ARSAS.Tests\ARSAS.Tests.csproj -c Release --no-build --no-restore --filter "FullyQualifiedName~IoTest|FullyQualifiedName~IoList" --logger "trx;LogFileName=io-testing-tests.trx" --results-directory .\ARSAS\TestResults
+        run: dotnet test .\ARSAS\tests\ARSAS.Tests\ARSAS.Tests.csproj -c Release --no-build --no-restore --filter "FullyQualifiedName~IoTest|FullyQualifiedName~IoList|FullyQualifiedName~IoFat|FullyQualifiedName~FatDataSet|FullyQualifiedName~FatScl" --logger "trx;LogFileName=io-testing-tests.trx" --results-directory .\ARSAS\TestResults
 
       - name: Upload IO testing test results
         if: always()

.release/windows.json

@@ -1,7 +1,7 @@
 {
-  "version": "1.6.32",
+  "version": "1.6.33",
   "channel": "stable",
   "platform": "windows-x64",
   "primaryAsset": "ARSAS-Windows-x64-Setup.exe",
-  "publicationRequest": 20
+  "publicationRequest": 21
 }

App.WindowsIdentity.cs

@@ -0,0 +1,21 @@
+using System.Runtime.InteropServices;
+
+namespace ArIED61850Tester;
+
+internal static class WindowsApplicationIdentity
+{
+    private const string AppUserModelId = "masarray.ARSAS.IEC61850";
+
+    internal static void Apply()
+    {
+        if (!OperatingSystem.IsWindows())
+            return;
+
+        // A stable explicit identity makes Windows use the ARSAS executable icon for
+        // taskbar grouping even when the app was launched by dotnet or a portable host.
+        _ = SetCurrentProcessExplicitAppUserModelID(AppUserModelId);
+    }
+
+    [DllImport("shell32.dll", CharSet = CharSet.Unicode)]
+    private static extern int SetCurrentProcessExplicitAppUserModelID(string appId);
+}

App.xaml.cs

@@ -19,6 +19,7 @@ public partial class App : Application
 
     protected override void OnStartup(StartupEventArgs e)
     {
+        WindowsApplicationIdentity.Apply();
         base.OnStartup(e);
 
         // P2 installs one calm industrial visual system before StartupUri materializes.

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.32</Version>
-    <AssemblyVersion>1.6.32.0</AssemblyVersion>
-    <FileVersion>1.6.32.0</FileVersion>
+    <Version>1.6.33</Version>
+    <AssemblyVersion>1.6.33.0</AssemblyVersion>
+    <FileVersion>1.6.33.0</FileVersion>
     <PackageProjectUrl>https://github.com/masarray/arsas</PackageProjectUrl>
     <RepositoryUrl>https://github.com/masarray/arsas</RepositoryUrl>
     <RepositoryType>git</RepositoryType>

CHANGELOG.md

@@ -4,6 +4,21 @@ Notable public changes to ARSAS are recorded here. Application releases must ide
 
 ## Unreleased
 
+## 1.6.33 — 2026-09-02
+
+### Added
+
+- FAT workspaces can import additional CID/SCD/ICD/IID sources without replacing the current project, including while another IED evidence session remains active.
+- Engineering and FAT workspaces now share imported SCL signal selection, so operator selection remains consistent when switching modes.
+
+### Fixed
+
+- Direct-SCL FAT connection now reuses the imported model and returns after the MMS association and bounded point setup instead of rediscovering or waiting through the legacy settle path.
+- Structured THD current/voltage aggregates and demand-energy values retain exact parent and phase identities and use authoritative MMS projections instead of remaining `Unknown`.
+- FAT live updates are coalesced below operator input priority; steady telemetry no longer refreshes the whole collection or schedules autosave for every sample, restoring smooth scrolling and reliable Capture clicks.
+- The Add IED action is independent from the active evidence-session edit lock while preserving the running IED's immutable capture mapping.
+- Windows receives a stable ARSAS AppUserModelID in addition to the embedded executable icon, fixing generic taskbar grouping for portable and `dotnet`-hosted launches.
+
 ## 1.6.31 — 2026-08-15
 
 ### Fixed

Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
-    <Version>1.6.32</Version>
-    <AssemblyVersion>1.6.32.0</AssemblyVersion>
-    <FileVersion>1.6.32.0</FileVersion>
-    <InformationalVersion>1.6.32</InformationalVersion>
+    <Version>1.6.33</Version>
+    <AssemblyVersion>1.6.33.0</AssemblyVersion>
+    <FileVersion>1.6.33.0</FileVersion>
+    <InformationalVersion>1.6.33</InformationalVersion>
   </PropertyGroup>
 </Project>

IoListTestingWindow.AddIed.cs

@@ -0,0 +1,82 @@
+using System.IO;
+using System.Windows;
+using ArIED61850Tester.Models.IoTesting;
+using ArIED61850Tester.Services.IoTesting;
+using Microsoft.Win32;
+
+namespace ArIED61850Tester;
+
+public partial class IoListTestingWindow
+{
+    private async void AddFatIedFromScl_Click(object sender, RoutedEventArgs e)
+    {
+        if (!CanAddFatIed || Owner is not MainWindow engineeringWindow)
+            return;
+
+        var dialog = new OpenFileDialog
+        {
+            Title = "Add IEC 61850 IED to current FAT workspace",
+            Filter = "IEC 61850 SCL (*.scd;*.cid;*.icd;*.iid;*.ssd)|*.scd;*.cid;*.icd;*.iid;*.ssd|XML SCL (*.xml)|*.xml|All files (*.*)|*.*",
+            CheckFileExists = true,
+            Multiselect = true
+        };
+        if (dialog.ShowDialog(this) != true)
+            return;
+
+        var result = await ImportAdditionalSclSourcesAsync(engineeringWindow, dialog.FileNames);
+        if (!result.Succeeded)
+            ShowActionResult(result, "IED could not be added");
+    }
+
+    internal async Task<IoTestSessionActionResult> ImportAdditionalSclSourcesAsync(
+        MainWindow engineeringWindow,
+        IReadOnlyCollection<string> sclPaths)
+    {
+        ArgumentNullException.ThrowIfNull(engineeringWindow);
+        ArgumentNullException.ThrowIfNull(sclPaths);
+        if (_isAddingFatIeds)
+            return IoTestSessionActionResult.Failure("Another SCL append is already being prepared for this FAT workspace.");
+
+        SetAddingFatIeds(true);
+        PreparationStatusText = $"Importing {sclPaths.Count} SCL source(s) into the current FAT workspace…";
+        try
+        {
+            var result = await engineeringWindow.AppendSclIedsToLoadedFatAsync(this, sclPaths);
+            PreparationStatusText = result.Message;
+            return result;
+        }
+        catch (OperationCanceledException)
+        {
+            const string message = "SCL append was cancelled.";
+            PreparationStatusText = message;
+            return IoTestSessionActionResult.Failure(message);
+        }
+        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or InvalidDataException or InvalidOperationException or ArgumentException)
+        {
+            PreparationStatusText = ex.Message;
+            return IoTestSessionActionResult.Failure(ex.Message);
+        }
+        finally
+        {
+            SetAddingFatIeds(false);
+        }
+    }
+
+    internal void RegisterAddedIeds(IReadOnlyCollection<Models.IoTesting.IoTestIedPlan> addedIeds)
+    {
+        Project.InitializeRuntimeNotifications();
+        foreach (var ied in addedIeds)
+        {
+            if (_selectedIedContextInstalled)
+                ied.PropertyChanged += ContextIed_PropertyChanged;
+            Storage?.TrackAddedIed(ied);
+        }
+
+        FatIedList.Items.Refresh();
+        SelectedIed = addedIeds.FirstOrDefault() ?? SelectedIed;
+        Raise(nameof(ProjectSummary));
+        RaiseStatusProperties();
+        RaiseSelectedIedContextProperties();
+        Storage?.ScheduleSave();
+    }
+}

IoListTestingWindow.CommissioningStatus.cs

@@ -0,0 +1,100 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Threading;
+using ArIED61850Tester.Models.IoTesting;
+
+namespace ArIED61850Tester;
+
+public partial class IoListTestingWindow
+{
+    private DispatcherTimer? _commissioningConnectionBadgeTimer;
+
+    protected override void OnSourceInitialized(EventArgs e)
+    {
+        base.OnSourceInitialized(e);
+        if (_commissioningConnectionBadgeTimer != null)
+            return;
+
+        _commissioningConnectionBadgeTimer = new DispatcherTimer(DispatcherPriority.Background)
+        {
+            Interval = TimeSpan.FromMilliseconds(200)
+        };
+        _commissioningConnectionBadgeTimer.Tick += CommissioningConnectionBadgeTimer_Tick;
+        _commissioningConnectionBadgeTimer.Start();
+        Closed += (_, _) =>
+        {
+            if (_commissioningConnectionBadgeTimer == null)
+                return;
+            _commissioningConnectionBadgeTimer.Stop();
+            _commissioningConnectionBadgeTimer.Tick -= CommissioningConnectionBadgeTimer_Tick;
+            _commissioningConnectionBadgeTimer = null;
+        };
+    }
+
+    private void CommissioningConnectionBadgeTimer_Tick(object? sender, EventArgs e)
+    {
+        foreach (var plan in FatIedList.Items.OfType<IoTestIedPlan>())
+        {
+            if (FatIedList.ItemContainerGenerator.ContainerFromItem(plan) is not ListBoxItem container)
+                continue;
+
+            var badge = FindNamedVisual<Border>(container, "StateBadge");
+            var text = FindNamedVisual<TextBlock>(container, "StateText");
+            if (badge == null || text == null)
+                continue;
+
+            var state = plan.IsPreparing
+                ? "CONNECTING"
+                : plan.IsLiveConnected
+                    ? "ONLINE"
+                    : plan.IsLiveMonitoring
+                        ? "RECONNECTING"
+                        : "OFFLINE";
+
+            var palette = state switch
+            {
+                "ONLINE" => new BadgePalette("#EAF8F1", "#8FD1B1", "#16845A"),
+                "RECONNECTING" => new BadgePalette("#FFF8E8", "#E9C46A", "#A56D00"),
+                "CONNECTING" => new BadgePalette("#EDF3FF", "#9CB8F5", "#315DBF"),
+                _ => new BadgePalette("#FFF1F2", "#F0B7BC", "#C53A45")
+            };
+
+            // Connection health is independent from FAT PASS/FAIL. A previous XAML
+            // visibility binding hid StateBadge when all rows passed; a local value here
+            // intentionally keeps ONLINE / RECONNECTING / OFFLINE visible at all times.
+            badge.Visibility = Visibility.Visible;
+            badge.Background = ConnectionBadgeBrushFromHex(palette.Background);
+            badge.BorderBrush = ConnectionBadgeBrushFromHex(palette.Border);
+            badge.ToolTip = string.IsNullOrWhiteSpace(plan.LiveStatusText)
+                ? state
+                : $"{state} · {plan.LiveStatusText}";
+            text.Text = state;
+            text.Foreground = ConnectionBadgeBrushFromHex(palette.Foreground);
+
+            if (FindNamedVisual<Control>(container, "RelayIcon") is { } relayIcon)
+                relayIcon.Foreground = ConnectionBadgeBrushFromHex(palette.Foreground);
+        }
+    }
+
+    private static T? FindNamedVisual<T>(DependencyObject root, string name)
+        where T : FrameworkElement
+    {
+        var count = VisualTreeHelper.GetChildrenCount(root);
+        for (var index = 0; index < count; index++)
+        {
+            var child = VisualTreeHelper.GetChild(root, index);
+            if (child is T element && element.Name.Equals(name, StringComparison.Ordinal))
+                return element;
+            var nested = FindNamedVisual<T>(child, name);
+            if (nested != null)
+                return nested;
+        }
+        return null;
+    }
+
+    private static Brush ConnectionBadgeBrushFromHex(string value)
+        => new SolidColorBrush((Color)ColorConverter.ConvertFromString(value));
+
+    private sealed record BadgePalette(string Background, string Border, string Foreground);
+}