From 56f41dc75da9a94a63b9ac3e6c981a1dde09615d Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Tue, 20 Oct 2026 16:59:10 +0700
Subject: [PATCH 1/3] fix(p0-f): reserve 2.5px inline Browser Read progress
 below IED address without card overlay

---
 MainWindow.xaml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index c14ff0b23..cc4e97c30 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -335,6 +335,7 @@
                                             <Grid x:Name="CardContent">
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition Height="Auto"/>
+                                                    <RowDefinition Height="5"/>
                                                     <RowDefinition Height="Auto"/>
                                                 </Grid.RowDefinitions>
                                                 <Grid.ColumnDefinitions>
@@ -342,7 +343,7 @@
                                                     <ColumnDefinition Width="*"/>
                                                 </Grid.ColumnDefinitions>
                                                 <!-- Static protection-relay fascia with a dedicated status label below it. -->
-                                                <StackPanel Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Width="60"
+                                                <StackPanel Grid.Row="0" Grid.RowSpan="3" Grid.Column="0" Width="60"
                                                             Margin="-2,0,-2,0" VerticalAlignment="Center"
                                                             HorizontalAlignment="Center" Panel.ZIndex="2">
                                                     <Viewbox Width="50" Height="50" Stretch="Uniform"
@@ -378,8 +379,18 @@
                                                         </TextBlock.ContextMenu>
                                                     </TextBlock>
                                                 </StackPanel>
+                                      <!-- Permanently reserved slot: Browser Read never inserts a row or masks the IEDCard.
+                                           This indicator tracks the existing association-bound progress, without
+                                           changing MMS work or reporting. Zero opacity preserves geometry. -->
+                                      <ProgressBar x:Name="BrowserReadCardLine" Grid.Row="1" Grid.Column="1"
+                                                   Height="2.5" Margin="4,1,12,1"
+                                                   HorizontalAlignment="Stretch" VerticalAlignment="Center"
+                                                   Minimum="0" Maximum="100"
+                                                   Value="{Binding DiscoveryProgressPercent, Mode=OneWay}"
+                                                   Style="{StaticResource DiscoveryProgressBar}" Opacity="0"
+                                                   IsHitTestVisible="False"/>
                                       <!-- Adaptive five-slot action bar. It spans the card and reserves the relay-icon area so Play/Stop never clip. -->
-                                      <Grid Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="62,4,1,0" Panel.ZIndex="10">
+                                      <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="62,4,1,0" Panel.ZIndex="10">
                                           <UniformGrid Rows="1" Columns="5" HorizontalAlignment="Stretch">
                                               <Button Style="{StaticResource IedIconButton}" Width="27" Height="27" Margin="0" Tag="{Binding}" Click="IedPlayAction_Click"
                                                       IsEnabled="{Binding CanPlayAction}" ToolTip="{Binding PlayToolTip}">
@@ -481,7 +492,7 @@
                                                 <Setter TargetName="BusyOverlay" Property="Visibility" Value="Visible"/>
                                             </DataTrigger>
                                             <DataTrigger Binding="{Binding IsBrowserReading}" Value="True">
-                                                <Setter TargetName="BusyOverlay" Property="Visibility" Value="Visible"/>
+                                                <Setter TargetName="BrowserReadCardLine" Property="Opacity" Value="1"/>
                                             </DataTrigger>
                                         </DataTemplate.Triggers>
                                     </DataTemplate>

From 163fa6c146f2578bef5a3c6949edb42023c4ec09 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Tue, 20 Oct 2026 17:00:09 +0700
Subject: [PATCH 2/3] fix(p0-f): include model-verified SV OR BL attributes in
 explicit read-only Browser FC plans

---
 Models/IedBrowserReadPlan.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Models/IedBrowserReadPlan.cs b/Models/IedBrowserReadPlan.cs
index 0ce1bf267..635efb226 100644
--- a/Models/IedBrowserReadPlan.cs
+++ b/Models/IedBrowserReadPlan.cs
@@ -29,7 +29,7 @@ public static IedBrowserReadSelectionKind SelectionKind(IedBrowserTreeRow? page)
         };
 
     private static readonly HashSet<string> ReadableFc = new(
-        ["ST", "MX", "CF", "DC", "SP", "SG", "SE", "EX"], StringComparer.OrdinalIgnoreCase);
+        ["ST", "MX", "CF", "DC", "SP", "SG", "SE", "EX", "SV", "OR", "BL"], StringComparer.OrdinalIgnoreCase);
 
     /// <summary>
     /// FC CO denotes command parameters, not scalar MMS Read targets.

From d6bbb357873a97a90b7f3fbd16176afdf87a6055 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Tue, 20 Oct 2026 17:00:46 +0700
Subject: [PATCH 3/3] test(p0-f): protect typed SV OR BL read admission and
 fixed IP progress slot

---
 ...ubstitutionOperateBlockingReadPlanTests.cs | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 tests/ARSAS.Tests/P0FSubstitutionOperateBlockingReadPlanTests.cs

diff --git a/tests/ARSAS.Tests/P0FSubstitutionOperateBlockingReadPlanTests.cs b/tests/ARSAS.Tests/P0FSubstitutionOperateBlockingReadPlanTests.cs
new file mode 100644
index 000000000..d3906aca3
--- /dev/null
+++ b/tests/ARSAS.Tests/P0FSubstitutionOperateBlockingReadPlanTests.cs
@@ -0,0 +1,79 @@
+using AR.Iec61850.Discovery;
+using ArIED61850Tester.Models;
+
+namespace ARSAS.Tests;
+
+public sealed class P0FSubstitutionOperateBlockingReadPlanTests
+{
+    private static LiveIedModelDiscoveryDocument BuildModel()
+    {
+        var root = "SIEBCUCTRL/XCBR1.Pos";
+        var attributes = new[]
+        {
+            ("subEna", "SV"), ("subVal", "SV"), ("subQ", "SV"), ("subID", "SV"),
+            ("opRcvd", "OR"), ("opOk", "OR"), ("tOpOk", "OR"),
+            ("blkEna", "BL"), ("stVal", "ST"), ("ctlVal", "CO")
+        }.Select(x => new LiveIedDataAttributeModel
+        {
+            ObjectReference = root,
+            AttributePath = "Pos." + x.Item1,
+            MmsReference = "SIEBCUCTRL/XCBR1$" + x.Item2 + "$Pos$" + x.Item1,
+            FunctionalConstraint = x.Item2,
+            MmsType = "Boolean",
+            TypeSource = "LiveTypeSpecification"
+        }).ToArray();
+        return new LiveIedModelDiscoveryDocument
+        {
+            LogicalDevices = [new LiveIedLogicalDeviceModel
+            {
+                LogicalNodes = [new LiveIedLogicalNodeModel
+                {
+                    DataObjects = [new LiveIedDataObjectModel
+                    {
+                        Name = "Pos", Reference = root, InferredCdc = "DPC",
+                        Attributes = attributes
+                    }]
+                }]
+            }]
+        };
+    }
+
+    [Fact]
+    public void ExplicitReadAllIncludesVerifiedSvOrBlButNeverControl()
+    {
+        var targets = IedBrowserReadPlan.Build(BuildModel(), null, readAll: true);
+        Assert.Equal(9, targets.Count);
+        foreach (var fc in new[] { "SV", "OR", "BL", "ST" })
+            Assert.Contains(targets, t => t.FunctionalConstraint == fc);
+        Assert.DoesNotContain(targets, t => t.FunctionalConstraint == "CO");
+        Assert.Contains(targets, t => t.Reference.EndsWith("$SV$Pos$subEna", StringComparison.Ordinal));
+        Assert.Contains(targets, t => t.Reference.EndsWith("$SV$Pos$subVal", StringComparison.Ordinal));
+        Assert.Contains(targets, t => t.Reference.EndsWith("$OR$Pos$opRcvd", StringComparison.Ordinal));
+        Assert.Contains(targets, t => t.Reference.EndsWith("$BL$Pos$blkEna", StringComparison.Ordinal));
+    }
+
+    [Fact]
+    public void NoLiveModelMeansNoReadTargets()
+    {
+        Assert.Empty(IedBrowserReadPlan.Build(null, null, readAll: true));
+        Assert.Equal("Control only", IedBrowserReadPlan.UnobservedValue("CO"));
+        Assert.Equal("Not read", IedBrowserReadPlan.UnobservedValue("SV"));
+    }
+
+    [Fact]
+    public void InlineReadProgressHasFixedCardSlotAndDoesNotInvokeBusyOverlay()
+    {
+        var directory = new DirectoryInfo(AppContext.BaseDirectory);
+        string xaml;
+        while (true)
+        {
+            var path = Path.Combine(directory.FullName, "MainWindow.xaml");
+            if (File.Exists(path)) { xaml = File.ReadAllText(path); break; }
+            directory = directory.Parent ?? throw new FileNotFoundException("MainWindow.xaml");
+        }
+        Assert.Contains("<RowDefinition Height=\"5\"/>", xaml);
+        Assert.Contains("x:Name=\"BrowserReadCardLine\" Grid.Row=\"1\" Grid.Column=\"1\"", xaml);
+        Assert.Contains("<Setter TargetName=\"BrowserReadCardLine\" Property=\"Opacity\" Value=\"1\"/>", xaml);
+        Assert.DoesNotContain("<Setter TargetName=\"BusyOverlay\" Property=\"Visibility\" Value=\"Visible\"/>\n                                            </DataTrigger>\n                                        </DataTemplate.Triggers>", xaml);
+    }
+}