FAT P5.4: semantic structured report projection

.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.ContextUx.cs

@@ -12,6 +12,8 @@ namespace ArIED61850Tester;
 public partial class IoListTestingWindow
 {
     private bool _selectedIedContextInstalled;
+    private bool _contextRefreshScheduled;
+    private bool _contextRowRefreshScheduled;
 
     public bool SelectedCanStartWorkflow =>
         SelectedIed != null && !SelectedIed.IsPreparing && Session.CanStart;
@@ -168,19 +170,10 @@ private async void ConnectIed_Click(object sender, RoutedEventArgs e)
         if (targetIed == null || targetIed.IsPreparing)
             return;
 
-        var enabledReady = targetIed.TestPoints
-            .Where(point => point.IsIncludedInFat && point.TestEnabled && point.ImportReady)
-            .ToList();
-        if (enabledReady.Count == 0)
-        {
-            ShowActionResult(
-                IoTestSessionActionResult.Failure("No import-ready operator-selected signal is enabled in the active FAT scope for this IED."),
-                "IED connection scope is not ready");
-            return;
-        }
-
-        IReadOnlyCollection<IoTestPointPlan> connectionScope = enabledReady;
-
+        // P1: Connect owns endpoint/MMS/live-acquisition state, never FAT evidence
+        // selection. The preparation path receives no checkbox scope here and therefore
+        // acquires every shared-workspace-selected included import-ready SCL row for this
+        // IED. TEST remains authoritative only when Start FAT builds captureScope below.
         if (ReferenceEquals(SelectedIed, targetIed))
             PreparationStatusText = $"Connecting {targetIed.IedName} · {targetIed.IpAddress}:102";
         RaisePreparationProperties();
@@ -202,8 +195,7 @@ private async void ConnectIed_Click(object sender, RoutedEventArgs e)
             var preparation = await PrepareIndependentIedConnectionAsync(
                 engineeringWindow,
                 targetIed,
-                progress,
-                connectionScope);
+                progress);
 
             RaiseStatusProperties();
             RaiseSelectedIedContextProperties();
@@ -259,8 +251,11 @@ private async void StartSelectedIedSafely_Click(object sender, RoutedEventArgs e
             return;
         }
 
+        // TEST is evidence authority only. Keep this selected capture scope for the
+        // evidence controller, while connection/live acquisition below remains the full
+        // shared-workspace-selected included import-ready IED scope.
         var captureScope = selectedIed.TestPoints
-            .Where(point => point.IsIncludedInFat && point.TestEnabled && point.ImportReady)
+            .Where(point => point.WorkspaceSelected && point.IsIncludedInFat && point.TestEnabled && point.ImportReady)
             .ToList();
 
         try
@@ -277,8 +272,7 @@ private async void StartSelectedIedSafely_Click(object sender, RoutedEventArgs e
                 var preparation = await engineeringWindow.PrepareIoTestIedForFatAsync(
                     Project,
                     selectedIed,
-                    progress,
-                    captureScope);
+                    progress);
                 RaiseStatusProperties();
                 RaiseSelectedIedContextProperties();
                 if (!preparation.Succeeded)
@@ -291,7 +285,7 @@ private async void StartSelectedIedSafely_Click(object sender, RoutedEventArgs e
                 await CaptureTimeSyncEvidenceAfterPreparationAsync(engineeringWindow, selectedIed);
             }
 
-            // Operator selection remains authoritative. A selected static DataSet row that
+            // Operator selection remains authoritative. A selected SCL workspace row that
             // has no unique live point stays checked/included and visible, but it cannot be
             // allowed to manufacture evidence. Arm only the currently proven live subset.
             // Legacy source-contract spelling retained only as documentation:
@@ -347,41 +341,57 @@ private async void StartSelectedIedSafely_Click(object sender, RoutedEventArgs e
     private Task<IoTestSessionActionResult> PrepareIndependentIedConnectionAsync(
         MainWindow engineeringWindow,
         IoTestIedPlan targetIed,
-        IProgress<string> progress,
-        IReadOnlyCollection<IoTestPointPlan> connectionScope)
+        IProgress<string> progress)
         => engineeringWindow.PrepareIoTestIedForFatAsync(
             Project,
             targetIed,
-            progress,
-            connectionScope);
+            progress);
 
     private void ContextWindow_PropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
         if (e.PropertyName is nameof(SelectedIed) or nameof(IsPreparingIed) or nameof(PreparationStatusText))
         {
             RaiseSelectedIedContextProperties();
             if (e.PropertyName == nameof(SelectedIed))
-                Dispatcher.BeginInvoke(new Action(RefreshFatV2WorkspaceUx), DispatcherPriority.DataBind);
+                Dispatcher.BeginInvoke(
+                    new Action(() => RefreshFatV2WorkspaceUx(refreshRows: true)),
+                    DispatcherPriority.Background);
         }
     }
 
     private void ContextSession_PropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
-        RaiseSelectedIedContextProperties();
-        RefreshFatV2WorkspaceUx();
+        ScheduleContextRefresh();
     }
 
     private void ContextIed_PropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
         if (e.PropertyName == nameof(IoTestIedPlan.IsPreparing))
             RaisePreparationProperties();
 
-        RefreshFatV2WorkspaceUx();
-        if (!ReferenceEquals(sender, SelectedIed))
-            return;
+        ScheduleContextRefresh(e.PropertyName is
+            nameof(IoTestIedPlan.EnabledCount) or
+            nameof(IoTestIedPlan.RemovedCount));
+    }
 
-        Raise(nameof(SelectedIedSummary));
-        RaiseSelectedIedContextProperties();
+    private void ScheduleContextRefresh(bool refreshRows = false)
+    {
+        _contextRowRefreshScheduled |= refreshRows;
+        if (_contextRefreshScheduled)
+            return;
+        _contextRefreshScheduled = true;
+        Dispatcher.BeginInvoke(new Action(() =>
+        {
+            _contextRefreshScheduled = false;
+            var refreshFilteredRows = _contextRowRefreshScheduled;
+            _contextRowRefreshScheduled = false;
+            // Session/runtime notifications update summaries and visible cells through
+            // normal bindings. Re-filter only when shared selection/disposition changes;
+            // live value traffic must never interrupt scrolling or Capture clicks.
+            RefreshFatV2WorkspaceUx(refreshFilteredRows);
+            Raise(nameof(SelectedIedSummary));
+            RaiseSelectedIedContextProperties();
+        }), DispatcherPriority.Background);
     }
 
     private void RaiseSelectedIedContextProperties()
@@ -409,7 +419,9 @@ private void ContextWindow_Closed(object? sender, EventArgs e)
     }
 
     private static List<IoTestPointPlan> EnabledPoints(IoTestIedPlan ied)
-        => ied.TestPoints.Where(point => point.IsIncludedInFat && point.TestEnabled).ToList();
+        => ied.TestPoints
+            .Where(point => point.WorkspaceSelected && point.IsIncludedInFat && point.TestEnabled)
+            .ToList();
 }
 
 public sealed class IoFatAllPassedVisibilityConverter : IMultiValueConverter