SSOT v2 Phase 1 — shared IEC model index and canonical multi-workspace change journal

App.xaml.cs

@@ -48,13 +48,22 @@ protected override void OnStartup(StartupEventArgs e)
         // smoke test validate that the vector ResourceDictionary is packaged.
         InstallArvrelMiniIedFascia();
 
+        // Install workstation templates before StartupUri creates its first visual
+        // tree. No theme/style dictionary should be injected on window activation.
+        P2IndustrialWorkstationUx.PreloadResources();
+
         if (Array.Exists(e.Args, argument =>
                 string.Equals(argument, "--portable-smoke-test", StringComparison.OrdinalIgnoreCase)))
         {
             Shutdown(RunPortableSmokeTest());
             return;
         }
 
+        // Loaded runs before the initial ContentRendered frame. Apply the
+        // legacy-only chrome once per real window, not on every focus change.
+        EventManager.RegisterClassHandler(typeof(Window), FrameworkElement.LoadedEvent,
+            new RoutedEventHandler(AppWindow_Loaded), handledEventsToo: true);
+
         GridUxBehavior.Install();
         P2InteractionBehavior.Install();
         FaultRecordUxBehavior.Install();
@@ -71,19 +80,24 @@ protected override void OnStartup(StartupEventArgs e)
             new Action(() => _ = AppUpdateCoordinator.RunLazyAsync(_updateCancellation.Token)));
     }
 
-    protected override void OnActivated(EventArgs e)
+    // Style installation on every Activated/focus return used to overwrite the
+    // bundled Inter font and re-template live controls, causing visible repaint.
+    // The one-time Loaded path handles both MainWindow and independently opened FAT.
+    private readonly System.Runtime.CompilerServices.ConditionalWeakTable<Window, object> _styledWindows = new();
+
+    private void AppWindow_Loaded(object sender, RoutedEventArgs e)
     {
-        base.OnActivated(e);
+        if (sender is not Window window || !ReferenceEquals(e.OriginalSource, window))
+            return;
+        if (_styledWindows.TryGetValue(window, out _))
+            return;
 
-        // A handful of legacy controls own local visual resources. Re-apply the
-        // tiny P2 adapter when windows activate so newly opened FAT workspaces also
-        // inherit the selected industrial theme without touching engine workflows.
         P2BlueSteelGreigeUx.ApplyToOpenWindows(this);
+        _styledWindows.Add(window, new object());
 
-        // Keep onboarding task-first while preserving the existing protocol handlers:
-        // Add IED exposes SCL/CID/ICD or IP discovery, and bulk connect appears only
-        // when multiple loaded IEDs make the action useful. The behavior is dispatcher-safe.
-        if (Current?.MainWindow is MainWindow mainWindow)
+        // One onboarding install per MainWindow: model/collection notifications
+        // continue refreshing after the window is displayed.
+        if (window is MainWindow mainWindow)
             SmartIedOnboardingBehavior.Install(mainWindow);
     }
 

IpConnectWizardWindow.xaml.cs

@@ -36,6 +36,7 @@ public string MmsPortText
     private readonly bool _rememberDiscoveryEndpoint;
     private readonly ICollectionView _historyView;
     private bool _updatingOctets;
+    private bool _rawAddressMode;
     public int MmsPort { get; private set; } = 102;
 
     // UI projection ONLY; UserPreferenceStore remains the sole persistence authority.
@@ -71,13 +72,16 @@ public IpConnectWizardWindow(string initialIp = "", int initialPort = 102,
         }
         MmsPortText = selectedPort.ToString(CultureInfo.InvariantCulture);
         ApplyAddress(selectedIp);
+        // Never conceal a nonstandard port in the collapsed expert section.
+        if (selectedPort != 102)
+            MoreOptionsExpander.IsExpanded = true;
 
         foreach (var box in Octets)
             DataObject.AddPastingHandler(box, Octet_Pasting);
 
         Loaded += (_, _) =>
         {
-            if (ManualAddressCheck.IsChecked == true) RawIpBox.Focus();
+            if (_rawAddressMode) RawIpBox.Focus();
             else Octet1Box.Focus();
         };
     }
@@ -126,7 +130,7 @@ private void ApplyAddress(string address)
         RelayIpAddress = address;
         if (TrySplitIpv4(address, out var parts))
         {
-            ManualAddressCheck.IsChecked = false;
+            _rawAddressMode = false;
             _updatingOctets = true;
             try
             {
@@ -138,13 +142,13 @@ private void ApplyAddress(string address)
         }
         else if (!string.IsNullOrWhiteSpace(address))
         {
-            ManualAddressCheck.IsChecked = true;
+            _rawAddressMode = true;
             RawIpBox.Text = address;
             SetAddressMode(true);
         }
         else
         {
-            ManualAddressCheck.IsChecked = false;
+            _rawAddressMode = false;
             _updatingOctets = true;
             try { foreach (var box in Octets) box.Clear(); }
             finally { _updatingOctets = false; }
@@ -159,41 +163,10 @@ private void SetAddressMode(bool manual)
         OctetEditor.Visibility = manual ? Visibility.Collapsed : Visibility.Visible;
         HistoryButton.Visibility = manual ? Visibility.Collapsed : Visibility.Visible;
         RawIpBox.Visibility = manual ? Visibility.Visible : Visibility.Collapsed;
+        _rawAddressMode = manual;
         AddressHintText.Text = manual
-            ? "Enter a numeric IPv6 or IPv4 address. Connection starts only when you confirm."
-            : "Enter four IPv4 numbers (0–255). Use dot, arrows, Tab or paste a complete address.";
-    }
-
-    private void ManualAddressCheck_Click(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))
-        {
-            _updatingOctets = true;
-            try
-            {
-                var boxes = Octets;
-                for (int i = 0; i < 4; i++) boxes[i].Text = parts[i];
-            }
-            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 = "IPv6 requires Advanced / manual address mode.";
-            return;
-        }
-
-        SetAddressMode(manual);
-        if (manual) RawIpBox.Focus();
-        else Octet1Box.Focus();
-        WizardStatusText.Text = string.Empty;
+            ? "Enter the address exactly as provided."
+            : "Example: 192.168.1.10";
     }
 
     private int OctetIndex(TextBox box) => Array.IndexOf(Octets, box);
@@ -222,7 +195,7 @@ private void Octet_PreviewTextInput(object sender, TextCompositionEventArgs e)
         if (!IsValidPartialOctet(replacement))
         {
             e.Handled = true;
-            WizardStatusText.Text = "Each IPv4 octet must be a number from 0 to 255.";
+            WizardStatusText.Text = "Each number must be between 0 and 255.";
         }
     }
 
@@ -284,7 +257,7 @@ private void Octet_Pasting(object sender, DataObjectPastingEventArgs e)
                 FocusOctet(3, atEnd: true);
             }
             else
-                WizardStatusText.Text = "Paste a complete IPv4 address with four octets (0–255).";
+                WizardStatusText.Text = "Paste a full IP address, for example 192.168.1.10.";
             return;
         }
 
@@ -293,7 +266,7 @@ private void Octet_Pasting(object sender, DataObjectPastingEventArgs e)
         if (!IsValidPartialOctet(next))
         {
             e.CancelCommand();
-            WizardStatusText.Text = "Each IPv4 octet must be a number from 0 to 255.";
+            WizardStatusText.Text = "Each number must be between 0 and 255.";
         }
     }
 
@@ -362,21 +335,23 @@ private void CommitHistorySelection()
         // Selecting history restores the exact saved IP:port, even when unverified.
         // This is recall only; the connection still requires explicit submission.
         MmsPortText = selection.MmsPort.ToString(CultureInfo.InvariantCulture);
+        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.
     }
 
     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 _))
             {
-                WizardStatusText.Text = "Enter a valid IPv4 or IPv6 address.";
+                WizardStatusText.Text = "Enter a valid IP address.";
                 RawIpBox.Focus();
                 return;
             }
@@ -385,7 +360,7 @@ private void Connect_Click(object sender, RoutedEventArgs e)
         {
             if (!TryNormalizeIpv4Octets(Octets.Select(b => b.Text).ToArray(), out submittedAddress))
             {
-                WizardStatusText.Text = "Complete all four IPv4 octets, each between 0 and 255.";
+                WizardStatusText.Text = "Enter all four parts of the IP address (0–255).";
                 return;
             }
         }
@@ -394,7 +369,7 @@ private void Connect_Click(object sender, RoutedEventArgs e)
                 out var port) || port is <= 0 or > 65535)
         {
             WizardStatusText.Text =
-                "MMS port must be between 1 and 65535. Standard IEC 61850 MMS uses TCP 102.";
+                "Port must be between 1 and 65535.";
             return;
         }
 

MainWindow.IedBrowser.Performance.cs

@@ -9,10 +9,7 @@ namespace ArIED61850Tester;
 public partial class MainWindow
 {
     private readonly IedBrowserUnitProjectionCache _iedBrowserUnitCache = new();
-    // Weak model keys: indexed declarations are reused when returning to SG7_BCU,
-    // without retaining replaced engineering models indefinitely.
-    private readonly ConditionalWeakTable<LiveIedModelDiscoveryDocument, Task<IedBrowserSchemaIndex>>
-        _iedBrowserSchemaTasks = new();
+    // Schema tasks are shared with Read bindings through SharedIedSchemaIndex.
     private Task<IedBrowserSchemaIndex>? _iedBrowserAwaitedSchema;
     private Iec61850MonitorDevice? _iedBrowserAwaitedSchemaDevice;
     private Iec61850MonitorDevice? _iedBrowserPreparingDevice;
@@ -71,13 +68,7 @@ private bool TryActivateIedBrowserSchema(
             _iedBrowserValueSchemaIndex = null;
             return true;
         }
-        var task = _iedBrowserSchemaTasks.GetValue(model, source =>
-            Task.Run(() =>
-            {
-                using var measure = IedBrowserPerformanceProbe.Measure(
-                    "Schema.Index", device.Name);
-                return new IedBrowserSchemaIndex(source);
-            }));
+        var task = SharedIedSchemaIndex.PrepareAsync(model);
         if (task.IsCompletedSuccessfully)
         {
             _iedBrowserValueSchemaIndex = task.Result;

MainWindow.IedBrowser.cs

@@ -221,9 +221,8 @@ private void IedBrowserRefresh_Click(object sender, RoutedEventArgs e)
         if (SelectedDevice is { } selected)
         {
             var model = selected.LiveDiscoveryModel ?? selected.SclWorkspace?.DesignModel;
-            if (model is not null && _iedBrowserSchemaTasks.TryGetValue(model, out var indexTask) &&
-                indexTask.IsFaulted)
-                _iedBrowserSchemaTasks.Remove(model);
+            if (model is not null)
+                SharedIedSchemaIndex.ForgetFaulted(model);
         }
         // Explicit refresh deliberately discards cached local SCL inventories.
         // Routine IED switching keeps the bounded per-source cache warm.

MainWindow.TopBarContainerHardening.cs

@@ -67,10 +67,9 @@ private static void Apply(MainWindow window)
 
         if (window.FindName("WorkflowNavShell") is Border shell)
         {
-            shell.Height = 64d;
-            shell.MinHeight = 64d;
+            // NavigationLayoutFix owns shell height (60) and padding. The
+            // container guard only prevents clipping/Z-order mistakes.
             shell.Margin = new Thickness(0, 2, 0, 2);
-            shell.Padding = new Thickness(5, 7, 5, 7);
             shell.ClipToBounds = false;
             Panel.SetZIndex(shell, 60);
         }

MainWindow.xaml

@@ -4,7 +4,7 @@
         xmlns:views="clr-namespace:ArIED61850Tester.Views"
         Title="ARSAS - Smart IEC 61850 Communication Tester"
         Height="900" Width="1480" MinHeight="760" MinWidth="1180"
-        WindowStartupLocation="CenterScreen" Background="{StaticResource AppBackgroundGradient}"
+        WindowStartupLocation="CenterScreen" WindowState="Maximized" Background="{StaticResource AppBackgroundGradient}"
         FontFamily="{StaticResource AppFontFamily}"
         UseLayoutRounding="True" SnapsToDevicePixels="True"
         TextOptions.TextFormattingMode="Ideal"

Models/CanonicalValueChangeJournal.cs

@@ -0,0 +1,77 @@
+namespace ArIED61850Tester.Models;
+
+/// <summary>
+/// Revision-only notification from the canonical ledger. This is NOT another
+/// live-value store, Report decoder, event history, or IEC acquisition channel.
+/// Readers always resolve the current evidence through IedBrowserLiveValues.
+/// </summary>
+public enum CanonicalValueChangeKind
+{
+    AssociationInvalidated,
+    Report,
+    Read,
+    ReportCompanion
+}
+
+public sealed record CanonicalValueChange(
+    long Revision, long Association, string Reference, string FunctionalConstraint,
+    CanonicalValueChangeKind Kind);
+
+public sealed record CanonicalValueChangeBatch(
+    long ThroughRevision, long LatestRevision, bool RequiresFullRefresh,
+    IReadOnlyList<CanonicalValueChange> Changes);
+
+/// <summary>
+/// Constant-memory revision ring shared by arbitrarily many independent cursor
+/// readers. All methods run within the enclosing IedBrowserLiveValues gate:
+/// there is no second lock, cross-thread event handler, UI callback, or queue
+/// consumer that can steal another workspace's notifications.
+/// </summary>
+internal sealed class CanonicalValueChangeJournal
+{
+    private readonly CanonicalValueChange?[] _ring;
+    private int _count;
+    private long _latestRevision;
+
+    internal CanonicalValueChangeJournal(int capacity = 4096)
+    {
+        if (capacity < 2) throw new ArgumentOutOfRangeException(nameof(capacity));
+        _ring = new CanonicalValueChange[capacity];
+    }
+
+    internal void Append(CanonicalValueChange change)
+    {
+        if (change.Revision != _latestRevision + 1)
+            throw new InvalidOperationException("Canonical revision journal must be contiguous.");
+        _latestRevision = change.Revision;
+        _ring[(int)(_latestRevision % _ring.Length)] = change;
+        if (_count < _ring.Length) _count++;
+    }
+
+    internal CanonicalValueChangeBatch Read(long afterRevision, int maxChanges)
+    {
+        if (maxChanges is < 1 or > 4096)
+            throw new ArgumentOutOfRangeException(nameof(maxChanges));
+        if (afterRevision < 0 || afterRevision > _latestRevision)
+            return new(_latestRevision, _latestRevision, true, []);
+        if (afterRevision == _latestRevision)
+            return new(afterRevision, _latestRevision, false, []);
+
+        var earliestRetained = _latestRevision - _count + 1;
+        if (afterRevision < earliestRetained - 1)
+            return new(_latestRevision, _latestRevision, true, []);
+
+        var upper = Math.Min(_latestRevision, afterRevision + maxChanges);
+        var changes = new CanonicalValueChange[(int)(upper - afterRevision)];
+        var invalidated = false;
+        for (long revision = afterRevision + 1; revision <= upper; revision++)
+        {
+            var change = _ring[(int)(revision % _ring.Length)]!;
+            if (change.Revision != revision)
+                return new(_latestRevision, _latestRevision, true, []);
+            changes[(int)(revision - afterRevision - 1)] = change;
+            invalidated |= change.Kind == CanonicalValueChangeKind.AssociationInvalidated;
+        }
+        return new(upper, _latestRevision, invalidated, changes);
+    }
+}