fix(discovery): preserve canonical static DataSet authority after live model build

IedCardActionsGearPolicy.cs

@@ -11,13 +11,13 @@ namespace ArIED61850Tester;
 /// <summary>
 /// Adds a dedicated Lucide-style gear button to every IED card. The existing pencil
 /// remains the direct Edit Signals shortcut; the gear is the explicit entry point for
-/// the reusable IED Actions chooser (Static DataSet, Select Signals, RCB Engineering,
+/// the reusable IED Actions chooser (DataSet Signals, Signal Catalog, RCB Engineering,
 /// COMTRADE and Browse Offline).
 /// </summary>
 internal static class IedCardActionsGearPolicy
 {
     private const string GearUid = "ARSAS.IedActionsGear";
-    private const string GearToolTip = "IED Actions — Static DataSet, Select Signals, RCB Engineering, COMTRADE, Browse Offline";
+    private const string GearToolTip = "IED Actions — DataSet Signals, Signal Catalog, RCB Engineering, COMTRADE, Browse Offline";
     private const double GearOpticalSize = 16d;
 
     // Exact Lucide Settings outline supplied by the product owner, translated from the

IedWorkspaceActionsCardBehavior.cs

@@ -14,7 +14,7 @@ namespace ArIED61850Tester;
 internal static class IedWorkspaceActionsCardBehavior
 {
     private const string LegacyToolTip = "Configure Signals";
-    private const string ActionsToolTip = "IED Actions — Static DataSet, Select Signals, RCB Engineering, COMTRADE, Browse Offline";
+    private const string ActionsToolTip = "IED Actions — DataSet Signals, Signal Catalog, RCB Engineering, COMTRADE, Browse Offline";
 
     [ModuleInitializer]
     internal static void Initialize()

MainWindow.xaml.cs

@@ -766,7 +766,7 @@ private async Task<bool> ConnectAndConfigureDeviceAsync(
             if (openWizard && device.SignalCount > 0)
             {
                 if ((selectDevice || ReferenceEquals(SelectedDevice, device)) && !_signalSelectionWizardOpen)
-                    await OpenSignalSelectionWizardAsync(device, restoredCount);
+                    await OpenIedWorkspaceActionsAsync(device);
                 else
                     SetStatus($"{device.Name}: discovery complete. Use the edit icon on its IED card to review {restoredCount} restored selection(s).");
             }

SclSignalSelectionModeWindow.xaml

@@ -52,14 +52,14 @@
                     <Button Grid.Column="0" Style="{StaticResource PrimaryButton}" Padding="14,11"
                             Click="MonitorStaticDataSet_Click" ToolTip="Select authoritative static DataSet members and start online monitoring">
                         <StackPanel>
-                            <TextBlock Text="Static DataSet" FontWeight="SemiBold" HorizontalAlignment="Center"/>
-                            <TextBlock Text="Select + monitor" FontSize="10.5" Opacity="0.82" HorizontalAlignment="Center"/>
+                            <TextBlock Text="DataSet Signals" FontWeight="SemiBold" HorizontalAlignment="Center"/>
+                            <TextBlock Text="Static report-only" FontSize="10.5" Opacity="0.82" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
                     <Button Grid.Column="2" Style="{StaticResource SoftButton}" Padding="14,11"
                             Click="MonitorManual_Click" ToolTip="Choose exact ST, MX and control points, then start monitoring">
                         <StackPanel>
-                            <TextBlock Text="Select Signals" FontWeight="SemiBold" HorizontalAlignment="Center"/>
+                            <TextBlock Text="Signal Catalog" FontWeight="SemiBold" HorizontalAlignment="Center"/>
                             <TextBlock Text="Manual + monitor" FontSize="10.5" Foreground="{StaticResource Muted}" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>

Services/Iec61850DataSetCompletenessDiagnostic.cs

@@ -24,6 +24,8 @@ public sealed record Iec61850DataSetCompletenessSnapshot(
     public bool IsComplete => StaticMemberCount == RepresentedCount && MissingCount == 0;
     public IReadOnlyList<Iec61850DataSetCompletenessDataSetSnapshot> DataSets { get; init; }
         = Array.Empty<Iec61850DataSetCompletenessDataSetSnapshot>();
+    public IReadOnlyList<string> PrimaryUnresolvedReferences { get; init; }
+        = Array.Empty<string>();
 
     public string Summary =>
         $"DataSets={DataSetCount:N0}; static members={StaticMemberCount:N0}; semantic descriptors={MandatoryInventoryCount:N0}; " +
@@ -89,15 +91,28 @@ public static Iec61850DataSetCompletenessSnapshot Evaluate(
                 dataSetMissing));
         }
 
+        var unresolvedPrimaryReferences = mandatory
+            .Where(descriptor => descriptor.ResolutionStatus == Iec61850SignalCatalogResolutionStatus.Unresolved)
+            .SelectMany(descriptor => descriptor.DataSetMemberships.Count > 0
+                ? descriptor.DataSetMemberships.Select(membership =>
+                    $"{membership.DataSetReference}[{membership.MemberIndex}] -> " +
+                    $"{FirstNonEmpty(membership.CanonicalMemberReference, membership.OriginalMemberReference, descriptor.DesignReference)}")
+                : new[] { FirstNonEmpty(descriptor.DesignReference, descriptor.ObservedReference, "<unknown>") })
+            .Where(reference => !string.IsNullOrWhiteSpace(reference))
+            .Distinct(StringComparer.Ordinal)
+            .OrderBy(reference => reference, StringComparer.Ordinal)
+            .ToArray();
+
         return new Iec61850DataSetCompletenessSnapshot(
             model.DataSets.Count,
             staticMemberCount,
             mandatory.Count,
             represented,
-            mandatory.Count(descriptor => descriptor.ResolutionStatus == Iec61850SignalCatalogResolutionStatus.Unresolved),
+            unresolvedPrimaryReferences.Length,
             missing)
         {
-            DataSets = dataSetSnapshots
+            DataSets = dataSetSnapshots,
+            PrimaryUnresolvedReferences = unresolvedPrimaryReferences
         };
     }
 
@@ -117,6 +132,11 @@ public static IEnumerable<string> FormatReportLines(Iec61850DataSetCompletenessS
             yield return $"  {dataSet.Reference}: {dataSet.RepresentedCount:N0}/{dataSet.StaticMemberCount:N0} represented • {dataSet.MissingCount:N0} missing";
         }
 
+        foreach (var reference in snapshot.PrimaryUnresolvedReferences.Take(16))
+            yield return $"  UNRESOLVED PRIMARY : {reference}";
+        if (snapshot.PrimaryUnresolvedReferences.Count > 16)
+            yield return $"  ... unresolved     : {snapshot.PrimaryUnresolvedReferences.Count - 16:N0} more member(s)";
+
         if (snapshot.MissingCount == 0 || maxMissing <= 0)
             yield break;
 
@@ -146,6 +166,9 @@ public static IEnumerable<string> FormatReportLines(Iec61850DataSetCompletenessS
             yield return $"  ...                : {snapshot.MissingCount - emitted:N0} more missing member(s)";
     }
 
+    private static string FirstNonEmpty(params string?[] values)
+        => values.FirstOrDefault(value => !string.IsNullOrWhiteSpace(value))?.Trim() ?? string.Empty;
+
     private static string Literal(string? reference)
         => (reference ?? string.Empty).Trim();
 }

Services/Iec61850MonitorRuntime.cs

@@ -1136,7 +1136,7 @@ private async Task ReceiveReportSlicesAsync(DeviceSession session, CancellationT
             {
                 var effectiveUpdates = session.StaticDataSetReportOnly
                     ? session.StaticReportProjection.Project(
-                        session.Device.LiveDiscoveryModel ?? session.Device.SclWorkspace?.DesignModel,
+                        session.Device.SclWorkspace?.DesignModel ?? session.Device.LiveDiscoveryModel,
                         session.Points.Values.ToArray(),
                         sourceUpdate)
                     : new[] { sourceUpdate };

Services/NativeIec61850Client.SclAssisted.cs

@@ -256,7 +256,7 @@ or ArMms.InitialFcReadExecutionStatus.TimedOut
 
             _liveModel = preparation.InitialReadDesign.Model;
             var reportInventory = BuildTrustedSclReportInventory(_liveModel);
-            var dataSetDirectories = BuildTrustedSclDataSetDirectories(_liveModel);
+            var dataSetDirectories = BuildModelDataSetDirectories(_liveModel, "TrustedScl");
             foreach (var directory in dataSetDirectories)
             {
                 _trustedSclDataSetDirectories[
@@ -455,8 +455,9 @@ private static ArMms.MmsReportInventory BuildTrustedSclReportInventory(
         return inventory;
     }
 
-    private static IReadOnlyList<ArMms.MmsDataSetDirectoryResult> BuildTrustedSclDataSetDirectories(
-        LiveIedModelDiscoveryDocument model)
+    private static IReadOnlyList<ArMms.MmsDataSetDirectoryResult> BuildModelDataSetDirectories(
+        LiveIedModelDiscoveryDocument model,
+        string source)
         => model.DataSets
             .Select(dataSet =>
             {
@@ -467,7 +468,7 @@ private static ArMms.MmsReportInventory BuildTrustedSclReportInventory(
                     dataSet.Name);
                 var members = dataSet.Members
                     .OrderBy(member => member.Index)
-                    .Select(member => BuildTrustedSclDataSetMember(member, domain))
+                    .Select(member => BuildModelDataSetMember(member, domain, source))
                     .ToArray();
                 return new ArMms.MmsDataSetDirectoryResult
                 {
@@ -478,14 +479,15 @@ private static ArMms.MmsReportInventory BuildTrustedSclReportInventory(
                     IsDeletable = dataSet.IsDeletable,
                     Members = members,
                     Message =
-                        $"Trusted SCL DataSet authority: {dataSet.Reference} has {members.Length} ordered member(s); no network directory request was sent."
+                        $"{source} DataSet authority: {dataSet.Reference} has {members.Length} ordered member(s); model order is preserved."
                 };
             })
             .ToArray();
 
-    private static ArMms.MmsDataSetDirectoryMember BuildTrustedSclDataSetMember(
+    private static ArMms.MmsDataSetDirectoryMember BuildModelDataSetMember(
         LiveIedDataSetMemberModel member,
-        string fallbackDomain)
+        string fallbackDomain,
+        string source)
     {
         var mmsReference = member.MmsReference?.Trim() ?? string.Empty;
         var slash = mmsReference.IndexOf('/');
@@ -507,7 +509,7 @@ private static ArMms.MmsDataSetDirectoryMember BuildTrustedSclDataSetMember(
             FunctionalConstraint = member.FunctionalConstraint,
             LogicalNode = logicalNode,
             DataObjectPath = dataObjectPath,
-            Source = "TrustedScl",
+            Source = source,
             Confidence = 100
         };
     }

Services/NativeIec61850Client.StaticDataSetReporting.cs

@@ -60,6 +60,14 @@ public async Task<NativeHybridReportPlanningResult> BuildStaticDataSetReportPlan
             ? "opened SCL design model"
             : "live discovery model (online-only)";
 
+        // The model that created the operator-visible DataSet inventory is also the semantic
+        // member-order authority for InformationReport mapping. Live directory evidence is
+        // verification only; replacing these members with a second raw network projection can
+        // re-introduce positional/type ambiguity after discovery has already canonicalized it.
+        var modelDataSetDirectories = BuildModelDataSetDirectories(
+            projectionModel,
+            device.SclWorkspace?.DesignModel is not null ? "SclDesignModel" : "LiveDiscoveryModel");
+
         // Fresh report discovery is verification, not permission policy. In particular we
         // deliberately do NOT require the adaptive Hybrid availability gate to classify a
         // configured BRCB as Available. Some perfectly usable servers omit enough reservation
@@ -235,20 +243,31 @@ public async Task<NativeHybridReportPlanningResult> BuildStaticDataSetReportPlan
             if (string.IsNullOrWhiteSpace(liveRcb.DataSetReference))
                 liveRcb.DataSetReference = dataSetReference;
 
-            var directories = await RunMmsOperationAsync(
-                () => _session.GetDataSetDirectoriesAsync(
-                    new[] { dataSetReference },
-                    discovery.IedDirectory,
-                    cancellationToken),
-                cancellationToken).ConfigureAwait(false);
-            var directory = directories.SingleOrDefault(result =>
+            var modelDirectory = modelDataSetDirectories.SingleOrDefault(result =>
                 result.IsSuccess && SameStaticReference(result.DataSetReference, dataSetReference));
+            if (modelDirectory is null || modelDirectory.Members.Count == 0)
+            {
+                warnings.Add(
+                    $"{dataSetReference}: canonical model has no ordered DataSet member list. RCB was not armed because report-index mapping would be unsafe; MMS process polling remains disabled.");
+                continue;
+            }
+
+            // Smart Discovery already captured GetNamedVariableListAttributes in this same
+            // association. Reuse that wire evidence instead of issuing a second directory read,
+            // then require exact count/order identity against the canonical model.
+            var liveDirectory = discovery.DataSetDirectories.SingleOrDefault(result =>
+                result.IsSuccess && SameStaticReference(result.DataSetReference, dataSetReference));
+            if (liveDirectory is null || liveDirectory.Members.Count == 0)
+            {
+                warnings.Add(
+                    $"{dataSetReference}: discovery snapshot has no ordered live DataSet directory. RCB was not armed; re-scan is required and MMS process polling remains disabled.");
+                continue;
+            }
 
-            if (directory is null || directory.Members.Count == 0)
+            if (!TryVerifyStaticDataSetMemberOrder(modelDirectory, liveDirectory, out var directoryMismatch))
             {
-                var detail = directories.FirstOrDefault()?.Message ?? "no directory response";
                 warnings.Add(
-                    $"{dataSetReference}: live DataSet directory could not prove an ordered non-empty member list ({detail}). RCB was not armed because report-index mapping would be unsafe; MMS process polling remains disabled.");
+                    $"{dataSetReference}: canonical/live DataSet member order mismatch ({directoryMismatch}). RCB was not armed; unsafe positional report projection and MMS process fallback were both refused.");
                 continue;
             }
 
@@ -307,12 +326,12 @@ public async Task<NativeHybridReportPlanningResult> BuildStaticDataSetReportPlan
                 Status = ArMms.MmsReportSubscriptionPlanStatus.ReadyRequiresWrite,
                 ReportControl = liveRcb,
                 DataSetReference = dataSetReference,
-                Members = directory.Members,
+                Members = modelDirectory.Members,
                 DynamicPoints = Array.Empty<ArMms.MmsFcResolvedPoint>(),
                 Steps = new[]
                 {
                     $"Verify authoritative configured RCB {configured.Reference} as live object {concreteReportReference}.",
-                    $"Use exact ordered live DataSet directory {dataSetReference} ({directory.Members.Count} members).",
+                    $"Use canonical ordered DataSet members {dataSetReference} ({modelDirectory.Members.Count} members), verified against the discovery snapshot.",
                     "Install InformationReport receiver before enabling the RCB.",
                     "Use client-compatible BRCB reservation when ResvTms is exposed, enable RptEna, then request GI after receiver registration.",
                     "Map report values by ordered DataSet member index; never substitute cyclic MMS process reads."
@@ -423,22 +442,18 @@ public async Task<NativeReportMonitorStartResult> StartStaticDataSetReportMonito
         }
 
         var coveredReferences = ExtractSubscriptionMemberReferences(subscription.Members);
-        var attempt = await RunMmsOperationAsync(
-            () => _session.StartPersistentReportMonitorClientCompatibleAsync(
+        var start = await RunMmsOperationAsync(
+            () => _session.StartConfiguredStaticReportMonitorAsync(
                 subscription,
                 triggerGeneralInterrogation: true,
-                deleteDynamicDataSetOnStop: false,
-                discovery.IedDirectory,
                 cancellationToken),
             cancellationToken).ConfigureAwait(false);
-        var start = attempt.StartResult;
         var warnings = start.Warnings
             .Concat(subscription.Warnings)
-            .Concat(attempt.CleanupWarnings)
             .Distinct(StringComparer.OrdinalIgnoreCase)
             .ToArray();
 
-        if (!attempt.IsSuccess || start.Session is null)
+        if (!start.IsSuccess || start.Session is null)
         {
             return new NativeReportMonitorStartResult
             {
@@ -451,9 +466,9 @@ public async Task<NativeReportMonitorStartResult> StartStaticDataSetReportMonito
                 UsedDynamicDataSet = false,
                 DynamicAttempted = false,
                 DynamicAttemptState = "NotApplicable",
-                FailureReason = attempt.FailureReason.ToString(),
-                CleanupAttempted = attempt.CleanupAttempted,
-                CleanupSucceeded = attempt.CleanupSucceeded,
+                FailureReason = "ConfiguredStaticActivationFailed",
+                CleanupAttempted = false,
+                CleanupSucceeded = true,
                 ReportControlReference = plan.ReportControlReference,
                 DataSetReference = plan.DataSetReference,
                 CoveredReferences = coveredReferences,
@@ -508,6 +523,43 @@ private static NativeHybridReportPlanningResult StaticPlanningUnavailable(
             UncoveredSignalCount = points.Count
         };
 
+    private static bool TryVerifyStaticDataSetMemberOrder(
+        ArMms.MmsDataSetDirectoryResult modelDirectory,
+        ArMms.MmsDataSetDirectoryResult liveDirectory,
+        out string mismatch)
+    {
+        mismatch = string.Empty;
+        if (modelDirectory.Members.Count != liveDirectory.Members.Count)
+        {
+            mismatch = $"count model={modelDirectory.Members.Count}, live={liveDirectory.Members.Count}";
+            return false;
+        }
+
+        for (var index = 0; index < modelDirectory.Members.Count; index++)
+        {
+            var modelMember = modelDirectory.Members[index];
+            var liveMember = liveDirectory.Members[index];
+            var mmsMatches =
+                !string.IsNullOrWhiteSpace(modelMember.MmsReference) &&
+                !string.IsNullOrWhiteSpace(liveMember.MmsReference) &&
+                SameStaticReference(modelMember.MmsReference, liveMember.MmsReference);
+            var userMatches =
+                !string.IsNullOrWhiteSpace(modelMember.UserReference) &&
+                !string.IsNullOrWhiteSpace(liveMember.UserReference) &&
+                SameStaticReference(modelMember.UserReference, liveMember.UserReference);
+
+            if (mmsMatches || userMatches)
+                continue;
+
+            mismatch =
+                $"member[{index}] model={modelMember.UserReference} ({modelMember.MmsReference}), " +
+                $"live={liveMember.UserReference} ({liveMember.MmsReference})";
+            return false;
+        }
+
+        return true;
+    }
+
     private static int StaticRcbAvailabilityRank(ArMms.MmsRcbOperationalAvailability availability)
         => availability switch
         {