diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml
index 1246a203..f7bdd071 100644
--- a/.github/workflows/release-package.yml
+++ b/.github/workflows/release-package.yml
@@ -4,9 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: Version label, for example 1.4.1
+        description: Version label, for example 1.4.2
         required: true
-        default: 1.4.1
+        default: 1.4.2
       publish_release:
         description: Publish GitHub Release after successful validation (manual only)
         required: true
@@ -25,7 +25,7 @@ on:
       release_notes_file:
         description: Markdown file used as release body
         required: true
-        default: docs/RELEASE_NOTES_v1.4.1.md
+        default: docs/RELEASE_NOTES_v1.4.2.md
   push:
     tags:
       - "v*"
@@ -183,7 +183,7 @@ jobs:
           $sha = "artifacts/release/SHA256SUMS.txt"
           $manifest = "artifacts/release/release-manifest.json"
           $notesFile = '${{ github.event.inputs.release_notes_file }}'
-          if ([string]::IsNullOrWhiteSpace($notesFile)) { $notesFile = 'docs/RELEASE_NOTES_v1.4.1.md' }
+          if ([string]::IsNullOrWhiteSpace($notesFile)) { $notesFile = 'docs/RELEASE_NOTES_v1.4.2.md' }
           if (-not (Test-Path $notesFile)) { throw "Release notes file not found: $notesFile" }
 
           $releaseArgs = @('release', 'create', $tag, $installer, $zip, $sha, $manifest, '--title', "Process Bus Insight $tag", '--notes-file', $notesFile, '--target', '${{ github.sha }}')
diff --git a/Directory.Build.props b/Directory.Build.props
index 216f8573..f00caefa 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,7 +10,7 @@
     <NeutralLanguage>en</NeutralLanguage>
 
     <!-- Public release version. Pre-release versions may set VersionSuffix explicitly. -->
-    <VersionPrefix Condition="'$(VersionPrefix)' == ''">1.4.1</VersionPrefix>
+    <VersionPrefix Condition="'$(VersionPrefix)' == ''">1.4.2</VersionPrefix>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
     <Version Condition="'$(Version)' == '' and '$(VersionSuffix)' == ''">$(VersionPrefix)</Version>
     <Version Condition="'$(Version)' == '' and '$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</Version>
diff --git a/README.md b/README.md
index 62f8b76f..f6dc2f75 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ The application can record what was configured in SCL, what the selected capture
 
 ## Download and run
 
-1. Download the latest **Windows Inno Setup installer** from [GitHub Releases](https://github.com/masarray/DigSubAnalyzer/releases): `ProcessBusInsight-v1.4.1-win-x64-setup.exe`.
+1. Download the latest published **Windows Inno Setup installer** (v1.4.2 after its public release) from [GitHub Releases](https://github.com/masarray/DigSubAnalyzer/releases): `ProcessBusInsight-v1.4.2-win-x64-setup.exe`.
 2. Run the installer. Its stable app identity supports in-place updates, same-version repair, Windows uninstall, and optional desktop shortcut.
 3. **Offline manuals are installed directly inside the app folder** (`User Manual.pdf`, `Quick Start.pdf`, and `Install and Update.md`), with Start Menu shortcuts.
 4. Install **Npcap separately** when live raw Ethernet capture is required; it is not bundled. Offline PCAP analysis remains available without it.
@@ -58,8 +58,8 @@ An optional **portable ZIP** is also available for manual extraction. The commun
 Current Windows distribution naming:
 
 ```text
-ProcessBusInsight-v1.4.1-win-x64-setup.exe
-ProcessBusInsight-v1.4.1-win-x64-portable.zip  (optional)
+ProcessBusInsight-v1.4.2-win-x64-setup.exe
+ProcessBusInsight-v1.4.2-win-x64-portable.zip  (optional)
 SHA256SUMS.txt
 release-manifest.json
 ```
@@ -100,8 +100,8 @@ dotnet run --project .\src\ProcessBus.App.Wpf\ProcessBus.App.Wpf.csproj -c Relea
 Create and verify a portable package:
 
 ```powershell
-.\scripts\publish-windows-portable.ps1 -Version "1.4.1"
-.\scripts\verify-release-package.ps1 -PackageZip ".\artifacts\release\ProcessBusInsight-v1.4.1-win-x64-portable.zip"
+.\scripts\publish-windows-portable.ps1 -Version "1.4.2"
+.\scripts\verify-release-package.ps1 -PackageZip ".\artifacts\release\ProcessBusInsight-v1.4.2-win-x64-portable.zip"
 ```
 
 Run the repository-quality gate:
diff --git a/docs/RELEASE_NOTES_v1.4.2.md b/docs/RELEASE_NOTES_v1.4.2.md
new file mode 100644
index 00000000..57b27e78
--- /dev/null
+++ b/docs/RELEASE_NOTES_v1.4.2.md
@@ -0,0 +1,16 @@
+# Process Bus Insight v1.4.2 — GOOSE Selection Hotfix Candidate
+
+This hotfix follows published v1.4.1 and is **not** an IEC 61850 certification or a claim of completed physical Windows field acceptance.
+
+## Operator-visible changes
+- Publisher explorer holds a stable selected publisher when GOOSE snapshots update rapidly.
+- Inspector live values use the latest coherent selected-publisher frame; clicking a timeline row deliberately pins historical evidence without overwriting the chosen live publisher.
+- Explicit selection persists across retransmissions, filtering, and temporary publisher absence. STALE retains last valid values and last-received time.
+- Publisher identity includes source MAC, APPID, VLAN, and GoCBRef, preventing collisions between similarly named control blocks.
+- Typed DataSet values still use generic MMS decode when SCL is unavailable, and resolve matching SCL mapping when supplied.
+- No layout spacing, phasor, waveform, PTP, or SV decoder changes.
+
+## Verification before public release
+A Windows hotfix candidate must pass repository health, Windows CI/test, Runtime Stability, Runtime Architecture, CodeQL, verified Inno installation/repair and exact-SHA BuildInfo provenance. A physical click/selection stream test remains a separate required check (100%, 125%, 150% DPI; sustained retransmissions, multiple publishers and filters).
+
+**Distribution:** candidate artifacts produced by the PR workflow are not a published stable v1.4.2 release. Preserve v1.4.1 tag and published assets. Explicit approval required to release the hotfix.
diff --git a/docs/index.html b/docs/index.html
index d1aa805b..3e80cef7 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -37,7 +37,7 @@
     "applicationCategory": "EngineeringApplication",
     "applicationSubCategory": "Digital substation and process bus analysis",
     "operatingSystem": "Windows 10, Windows 11",
-    "softwareVersion": "1.4.1",
+    "softwareVersion": "1.4.2",
     "license": "https://spdx.org/licenses/GPL-3.0-or-later.html",
     "isAccessibleForFree": true,
     "url": "https://masarray.github.io/DigSubAnalyzer/",
diff --git a/src/ProcessBus.App.Wpf/MainWindow.xaml b/src/ProcessBus.App.Wpf/MainWindow.xaml
index 98612882..a03eab09 100644
--- a/src/ProcessBus.App.Wpf/MainWindow.xaml
+++ b/src/ProcessBus.App.Wpf/MainWindow.xaml
@@ -1407,13 +1407,15 @@
                                            FontWeight="SemiBold"
                                            Margin="0,0,0,8"/>
 
-                                <ListView ItemsSource="{Binding GooseMessages}"
-                                          SelectedItem="{Binding SelectedGooseMessage, Mode=TwoWay}"
+                                <ListView ItemsSource="{Binding GoosePublisherRowsView}"
+                                          SelectedItem="{Binding SelectedGoosePublisherRow, Mode=TwoWay}"
                                           Background="Transparent"
                                           BorderThickness="0"
                                           ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                                     <ListView.ItemContainerStyle>
                                         <Style TargetType="ListViewItem">
+                                            <!-- Re-clicking the already selected publisher must exit pinned-event mode. -->
+                                            <EventSetter Event="PreviewMouseLeftButtonDown" Handler="GoosePublisherRow_PreviewMouseLeftButtonDown"/>
                                             <Setter Property="Padding" Value="0"/>
                                             <Setter Property="Margin" Value="0,0,0,8"/>
                                             <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -3176,18 +3178,18 @@
                                                        Foreground="#F4FAFF"
                                                        FontSize="16"
                                                        FontWeight="SemiBold"/>
-                                            <TextBlock Text="Selected publisher and typed DataSet values"
+                                            <TextBlock Text="{Binding GooseInspectorModeText}"
                                                        Foreground="#7FA8CC"
                                                        FontSize="11"
                                                        Margin="0,3,0,14"/>
-                                            <TextBlock Text="Select a GOOSE event to inspect publisher identity, network and values."
+                                            <TextBlock Text="Select a GOOSE publisher to inspect live identity, network and values."
                                                        Foreground="#9FC0DA" FontSize="11.5" TextWrapping="Wrap"
                                                        Margin="0,12,0,0">
                                                 <TextBlock.Style>
                                                     <Style TargetType="TextBlock">
                                                         <Setter Property="Visibility" Value="Collapsed"/>
                                                         <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding SelectedGooseTrafficRow}" Value="{x:Null}">
+                                                            <DataTrigger Binding="{Binding GooseInspectorMessage}" Value="{x:Null}">
                                                                 <Setter Property="Visibility" Value="Visible"/>
                                                             </DataTrigger>
                                                         </Style.Triggers>
@@ -3204,7 +3206,7 @@
                                                 <Border.Style>
                                                     <Style TargetType="Border">
                                                         <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding SelectedGooseTrafficRow}" Value="{x:Null}">
+                                                            <DataTrigger Binding="{Binding GooseInspectorMessage}" Value="{x:Null}">
                                                                 <Setter Property="Visibility" Value="Collapsed"/>
                                                             </DataTrigger>
                                                         </Style.Triggers>
@@ -3222,17 +3224,17 @@
                                                         <RowDefinition Height="Auto"/>
                                                     </Grid.RowDefinitions>
                                                     <TextBlock Grid.Row="0" Grid.Column="0" Text="GOOSE ID" Foreground="#7FA8CC" FontSize="11" Margin="0,3,10,3"/>
-                                                    <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding SelectedGooseTrafficRow.GoId}" Foreground="#F4FAFF" FontWeight="SemiBold" TextTrimming="CharacterEllipsis" Margin="0,3,0,3"/>
+                                                    <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding GooseInspectorMessage.GoId}" Foreground="#F4FAFF" FontWeight="SemiBold" TextTrimming="CharacterEllipsis" Margin="0,3,0,3"/>
                                                     <TextBlock Grid.Row="1" Grid.Column="0" Text="Publisher" Foreground="#7FA8CC" FontSize="11" Margin="0,3,10,3"/>
-                                                    <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding SelectedGooseTrafficRow.GoCbRef}" Foreground="#DDEEFF" TextWrapping="Wrap" Margin="0,3,0,3"/>
+                                                    <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding GooseInspectorMessage.GoCbRef}" Foreground="#DDEEFF" TextWrapping="Wrap" Margin="0,3,0,3"/>
                                                     <TextBlock Grid.Row="2" Grid.Column="0" Text="APPID" Foreground="#7FA8CC" FontSize="11" Margin="0,3,10,3"/>
-                                                    <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding SelectedGooseTrafficRow.AppId}" Foreground="#DDEEFF" Margin="0,3,0,3"/>
+                                                    <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding GooseInspectorMessage.AppId}" Foreground="#DDEEFF" Margin="0,3,0,3"/>
                                                     <TextBlock Grid.Row="3" Grid.Column="0" Text="stNum / sqNum" Foreground="#7FA8CC" FontSize="11" Margin="0,3,10,3"/>
                                                     <TextBlock Grid.Row="3" Grid.Column="1" Foreground="#DDEEFF" FontWeight="SemiBold" Margin="0,3,0,3">
                                                         <TextBlock.Text>
                                                             <MultiBinding StringFormat="{}{0} / {1}">
-                                                                <Binding Path="SelectedGooseTrafficRow.StNum"/>
-                                                                <Binding Path="SelectedGooseTrafficRow.SqNum"/>
+                                                                <Binding Path="GooseInspectorMessage.StNum"/>
+                                                                <Binding Path="GooseInspectorMessage.SqNum"/>
                                                             </MultiBinding>
                                                         </TextBlock.Text>
                                                     </TextBlock>
@@ -3248,7 +3250,7 @@
                                                 <Border.Style>
                                                     <Style TargetType="Border">
                                                         <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding SelectedGooseTrafficRow}" Value="{x:Null}">
+                                                            <DataTrigger Binding="{Binding GooseInspectorMessage}" Value="{x:Null}">
                                                                 <Setter Property="Visibility" Value="Collapsed"/>
                                                             </DataTrigger>
                                                         </Style.Triggers>
@@ -3275,30 +3277,30 @@
                                                             <RowDefinition Height="Auto"/>
                                                         </Grid.RowDefinitions>
                                                         <TextBlock Grid.Row="0" Grid.Column="0" Text="Src MAC" Foreground="#7FA8CC" FontSize="11" Margin="0,3,10,3"/>
-                                                        <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding SelectedGooseTrafficRow.SourceMac}" Foreground="#DDEEFF" Margin="0,3,0,3"/>
+                                                        <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding GooseInspectorMessage.SourceMac}" Foreground="#DDEEFF" Margin="0,3,0,3"/>
                                                         <TextBlock Grid.Row="1" Grid.Column="0" Text="Dst MAC" Foreground="#7FA8CC" FontSize="11" Margin="0,3,10,3"/>
-                                                        <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding SelectedGooseTrafficRow.DestinationMac}" Foreground="#DDEEFF" Margin="0,3,0,3"/>
+                                                        <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding GooseInspectorMessage.DestinationMac}" Foreground="#DDEEFF" Margin="0,3,0,3"/>
                                                         <TextBlock Grid.Row="2" Grid.Column="0" Text="VLAN" Foreground="#7FA8CC" FontSize="11" Margin="0,3,10,3"/>
                                                         <TextBlock Grid.Row="2" Grid.Column="1" Foreground="#DDEEFF" Margin="0,3,0,3">
                                                             <TextBlock.Text>
                                                                 <MultiBinding StringFormat="{}ID {0} · Priority {1}">
-                                                                    <Binding Path="SelectedGooseTrafficRow.VlanId"/>
-                                                                    <Binding Path="SelectedGooseTrafficRow.VlanPriority"/>
+                                                                    <Binding Path="GooseInspectorMessage.VlanId"/>
+                                                                    <Binding Path="GooseInspectorMessage.VlanPriority"/>
                                                                 </MultiBinding>
                                                             </TextBlock.Text>
                                                         </TextBlock>
                                                         <TextBlock Grid.Row="3" Grid.Column="0" Text="DataSet" Foreground="#7FA8CC" FontSize="11" Margin="0,3,10,3"/>
-                                                        <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding SelectedGooseTrafficRow.DataSet}" Foreground="#DDEEFF" TextWrapping="Wrap" Margin="0,3,0,3"/>
+                                                        <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding GooseInspectorMessage.DataSet}" Foreground="#DDEEFF" TextWrapping="Wrap" Margin="0,3,0,3"/>
                                                         <TextBlock Grid.Row="4" Grid.Column="0" Text="ConfRev" Foreground="#7FA8CC" FontSize="11" Margin="0,3,10,3"/>
-                                                        <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding SelectedGooseMessage.ConfRev}" Foreground="#DDEEFF" Margin="0,3,0,3"/>
+                                                        <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding GooseInspectorMessage.ConfRev}" Foreground="#DDEEFF" Margin="0,3,0,3"/>
                                                         <TextBlock Grid.Row="5" Grid.Column="0" Text="TTL" Foreground="#7FA8CC" FontSize="11" Margin="0,3,10,3"/>
-                                                        <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding SelectedGooseMessage.TimeAllowedToLiveMilliseconds, StringFormat={}{0} ms}" Foreground="#DDEEFF" Margin="0,3,0,3"/>
+                                                        <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding GooseInspectorMessage.TimeAllowedToLiveMilliseconds, StringFormat={}{0} ms}" Foreground="#DDEEFF" Margin="0,3,0,3"/>
                                                         <TextBlock Grid.Row="6" Grid.Column="0" Text="Flags" Foreground="#7FA8CC" FontSize="11" Margin="0,3,10,3"/>
                                                         <TextBlock Grid.Row="6" Grid.Column="1" Foreground="#DDEEFF" Margin="0,3,0,3">
                                                             <TextBlock.Text>
                                                                 <MultiBinding StringFormat="{}Test {0} · NdsCom {1}">
-                                                                    <Binding Path="SelectedGooseTrafficRow.TestText"/>
-                                                                    <Binding Path="SelectedGooseTrafficRow.NeedsCommissionText"/>
+                                                                    <Binding Path="GooseInspectorMessage.IsTest"/>
+                                                                    <Binding Path="GooseInspectorMessage.NeedsCommission"/>
                                                                 </MultiBinding>
                                                             </TextBlock.Text>
                                                         </TextBlock>
@@ -3314,7 +3316,7 @@
                                                 <Border.Style>
                                                     <Style TargetType="Border">
                                                         <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding SelectedGooseTrafficRow}" Value="{x:Null}">
+                                                            <DataTrigger Binding="{Binding GooseInspectorMessage}" Value="{x:Null}">
                                                                 <Setter Property="Visibility" Value="Collapsed"/>
                                                             </DataTrigger>
                                                         </Style.Triggers>
@@ -3328,7 +3330,7 @@
                                                                    FontSize="13.5"
                                                                    FontWeight="SemiBold"/>
                                                         <TextBlock DockPanel.Dock="Right"
-                                                                   Text="{Binding SelectedGooseTrafficRow.DatasetEntryCountText, StringFormat=({0})}"
+                                                                   Text="{Binding GooseInspectorDatasetCountText, StringFormat=({0})}"
                                                                    Foreground="#FFBE52"
                                                                    FontSize="11"
                                                                    FontWeight="SemiBold"/>
diff --git a/src/ProcessBus.App.Wpf/MainWindow.xaml.cs b/src/ProcessBus.App.Wpf/MainWindow.xaml.cs
index 1ed73670..63c5fa64 100644
--- a/src/ProcessBus.App.Wpf/MainWindow.xaml.cs
+++ b/src/ProcessBus.App.Wpf/MainWindow.xaml.cs
@@ -259,6 +259,16 @@ private void SvPill_MouseLeave(object sender, MouseEventArgs e)
         }
     }
 
+    private void GoosePublisherRow_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        // WPF SelectionChanged does not fire when the operator clicks an item
+        // that is already selected. The explicit click still means "inspect live"
+        // after a historical timeline event had been pinned.
+        if (DataContext is MainWindowViewModel viewModel &&
+            sender is ListViewItem { DataContext: ProcessBus.Core.Presentation.GoosePublisherRow row })
+            viewModel.SelectedGoosePublisherRow = row;
+    }
+
     private void GooseTraffic_Interaction(object sender, MouseEventArgs e)
     {
         DeferGooseTrafficFlush();
diff --git a/src/ProcessBus.App.Wpf/ViewModels/MainWindowViewModel.cs b/src/ProcessBus.App.Wpf/ViewModels/MainWindowViewModel.cs
index 24a460a1..01b247f6 100644
--- a/src/ProcessBus.App.Wpf/ViewModels/MainWindowViewModel.cs
+++ b/src/ProcessBus.App.Wpf/ViewModels/MainWindowViewModel.cs
@@ -43,8 +43,11 @@ public sealed class MainWindowViewModel : INotifyPropertyChanged, IDisposable
     private bool _relaxDestinationCheck = true;
     private string _selectedAdapterId = string.Empty;
     private SvStreamItem? _selectedStream;
-    private GooseMessageItem? _selectedGooseMessage;
+    private readonly GoosePublisherCatalog _gooseCatalog = new();
+    private GoosePublisherKey? _selectedGoosePublisherKey;
     private GooseTrafficRow? _selectedGooseTrafficRow;
+    private bool _gooseInspectHistoricalEvent;
+    private IReadOnlyList<string> _gooseIdFilterOptions = ["All"];
     private IReadOnlyList<GooseMessageItem> _gooseMessages = Array.Empty<GooseMessageItem>();
     private GooseMonitorSnapshot _gooseSnapshot = new();
     private IReadOnlyList<PhasorDisplayItem> _phasors = Array.Empty<PhasorDisplayItem>();
@@ -123,7 +126,7 @@ private set
         ? invalid.Description : "Select a real Npcap capture adapter.";
 
     private readonly ObservableCollection<GooseTrafficRow> _gooseHistory = new();
-    private readonly Dictionary<string, GooseMessageItem> _lastGooseState = new();
+    private readonly Dictionary<GoosePublisherKey, GooseMessageItem> _lastGooseState = new();
     private readonly Queue<GooseTrafficRow> _pendingGooseRows = new();
     private readonly Queue<DiagnosticEventItem> _pendingDiagnosticEvents = new();
     private readonly ObservableCollection<DiagnosticEventItem> _calmDiagnosticEvents = new();
@@ -151,6 +154,7 @@ private set
     private string _goosePublisherFilterText = string.Empty;
     private string _selectedGooseIdFilter = "All";
     private readonly ICollectionView _gooseHistoryView;
+    private readonly ICollectionView _goosePublisherRowsView;
 
     private readonly ObservableCollection<TrafficHealthTargetRow> _diagnosticTargets = new();
     private TrafficHealthTargetRow? _selectedDiagnosticTarget;
@@ -171,6 +175,7 @@ public DiagnosticEventItem? SelectedDiagnosticEvent
 
     public ObservableCollection<GooseTrafficRow> GooseHistory => _gooseHistory;
     public ICollectionView GooseHistoryView => _gooseHistoryView;
+    public ICollectionView GoosePublisherRowsView => _goosePublisherRowsView;
     public ObservableCollection<TrafficHealthTargetRow> DiagnosticTargets => _diagnosticTargets;
 
     public TrafficHealthTargetRow? SelectedDiagnosticTarget
@@ -230,23 +235,27 @@ public string GoosePublisherFilterText
             OnPropertyChanged(nameof(GooseFilterSummaryText));
             OnPropertyChanged(nameof(GooseEmptyGuidance));
             _gooseHistoryView.Refresh();
+            _goosePublisherRowsView.Refresh();
+            OnPropertyChanged(nameof(SelectedGoosePublisherRow));
         }
     }
 
-    public IReadOnlyList<string> GooseIdFilterOptions
-    {
-        get
-        {
-            var values = _gooseMessages
-                .Select(m => string.IsNullOrWhiteSpace(m.GoId) ? m.GoCbRef : m.GoId)
-                .Where(v => !string.IsNullOrWhiteSpace(v) && !string.Equals(v, "N/A", StringComparison.OrdinalIgnoreCase))
-                .Distinct(StringComparer.OrdinalIgnoreCase)
-                .OrderBy(v => v, StringComparer.OrdinalIgnoreCase)
-                .ToList();
+    // Replace ComboBox options only if identities change, not with each UI tick.
+    public IReadOnlyList<string> GooseIdFilterOptions => _gooseIdFilterOptions;
 
-            values.Insert(0, "All");
-            return values;
-        }
+    private void UpdateGooseIdFilterOptions()
+    {
+        var values = _gooseMessages
+            .Select(m => string.IsNullOrWhiteSpace(m.GoId) ? m.GoCbRef : m.GoId)
+            .Where(v => !string.IsNullOrWhiteSpace(v) && !string.Equals(v, "N/A", StringComparison.OrdinalIgnoreCase))
+            .Distinct(StringComparer.OrdinalIgnoreCase)
+            .OrderBy(v => v, StringComparer.OrdinalIgnoreCase)
+            .Prepend("All")
+            .ToArray();
+        if (_gooseIdFilterOptions.SequenceEqual(values, StringComparer.Ordinal))
+            return;
+        _gooseIdFilterOptions = values;
+        OnPropertyChanged(nameof(GooseIdFilterOptions));
     }
 
     public string SelectedGooseIdFilter
@@ -254,7 +263,11 @@ public string SelectedGooseIdFilter
         get => _selectedGooseIdFilter;
         set
         {
-            var next = string.IsNullOrWhiteSpace(value) ? "All" : value;
+            // WPF can write null while replacing a ComboBox ItemsSource.
+            // Clear is the explicit "All" option, never a transient null.
+            if (string.IsNullOrWhiteSpace(value))
+                return;
+            var next = value;
             if (string.Equals(_selectedGooseIdFilter, next, StringComparison.Ordinal))
                 return;
 
@@ -263,6 +276,8 @@ public string SelectedGooseIdFilter
             OnPropertyChanged(nameof(GooseFilterSummaryText));
             OnPropertyChanged(nameof(GooseEmptyGuidance));
             _gooseHistoryView.Refresh();
+            _goosePublisherRowsView.Refresh();
+            OnPropertyChanged(nameof(SelectedGoosePublisherRow));
         }
     }
 
@@ -286,16 +301,17 @@ public string GooseFilterSummaryText
     }
 
     public IReadOnlyList<GooseDatasetValueDisplayItem> SelectedGooseDatasetValues =>
-        BuildGooseDatasetValues(SelectedGooseMessage);
+        BuildGooseDatasetValues(GooseInspectorMessage);
 
     public string SelectedGooseSemanticText
     {
         get
         {
-            if (SelectedGooseMessage is null)
-                return "Select a GOOSE publisher to inspect semantic DataSet values.";
+            var inspected = GooseInspectorMessage;
+            if (inspected is null)
+                return "Select a GOOSE publisher or timeline event to inspect typed DataSet values.";
 
-            var match = ResolveSclGooseStream(SelectedGooseMessage);
+            var match = ResolveSclGooseStream(inspected);
             if (match is null)
                 return HasSclProject
                     ? "Semantic source: generic typed decode; no matching SCL GOOSE DataSet found."
@@ -737,6 +753,8 @@ public MainWindowViewModel()
 
         _gooseHistoryView = CollectionViewSource.GetDefaultView(_gooseHistory);
         _gooseHistoryView.Filter = FilterGooseHistory;
+        _goosePublisherRowsView = CollectionViewSource.GetDefaultView(_gooseCatalog.Rows);
+        _goosePublisherRowsView.Filter = FilterGoosePublisher;
 
         StartCommand = new AsyncRelayCommand(StartAsync);
         StopCommand = new AsyncRelayCommand(StopAsync);
@@ -817,46 +835,97 @@ public SvStreamItem? SelectedStream
         }
     }
 
+    // Stable ListView containers: snapshot messages never own WPF selection.
     public IReadOnlyList<GooseMessageItem> GooseMessages => _gooseMessages;
+    public ObservableCollection<GoosePublisherRow> GoosePublisherRows => _gooseCatalog.Rows;
 
-    public GooseMessageItem? SelectedGooseMessage
+    public GoosePublisherRow? SelectedGoosePublisherRow
     {
-        get => _selectedGooseMessage;
+        get => _gooseCatalog.Find(_selectedGoosePublisherKey);
         set
         {
-            if (ReferenceEquals(_selectedGooseMessage, value))
+            // Ignore WPF's transient null during view/container recycling.
+            // ClearAsync is the explicit reset path.
+            if (value is null)
+                return;
+            if (value.Key == _selectedGoosePublisherKey && !_gooseInspectHistoricalEvent)
                 return;
 
+            _selectedGoosePublisherKey = value.Key;
+            _gooseInspectHistoricalEvent = false;
             BeginWorkspaceTargetTransition();
-            _selectedGooseMessage = value;
             OnPropertyChanged();
-            OnPropertyChanged(nameof(SelectedGooseDatasetValues));
-            OnPropertyChanged(nameof(SelectedGooseSemanticText));
+            RaiseGooseInspectorProperties();
             RaiseDiagnosticScopeProperties();
             RaiseAdvancedProperties();
         }
     }
 
+    public GooseMessageItem? SelectedGooseMessage
+    {
+        get => SelectedGoosePublisherRow?.Current;
+        set
+        {
+            if (value is null)
+                return;
+            var row = _gooseCatalog.Find(GoosePublisherKey.From(value));
+            if (row is not null)
+                SelectedGoosePublisherRow = row;
+        }
+    }
+
+    // Independent user intent: selecting a timeline event pins its historical
+    // coherent frame; clicking a publisher returns the inspector to live mode.
     public GooseTrafficRow? SelectedGooseTrafficRow
     {
         get => _selectedGooseTrafficRow;
         set
         {
-            if (ReferenceEquals(_selectedGooseTrafficRow, value))
+            if (value is null || ReferenceEquals(_selectedGooseTrafficRow, value))
                 return;
-
-            BeginWorkspaceTargetTransition();
             _selectedGooseTrafficRow = value;
-            _selectedGooseMessage = value?.Source;
-
+            _gooseInspectHistoricalEvent = true;
+            BeginWorkspaceTargetTransition();
             OnPropertyChanged();
-            OnPropertyChanged(nameof(SelectedGooseMessage));
-            OnPropertyChanged(nameof(SelectedGooseDatasetValues));
-            OnPropertyChanged(nameof(SelectedGooseSemanticText));
+            RaiseGooseInspectorProperties();
             RaiseAdvancedProperties();
         }
     }
 
+    public GooseMessageItem? GooseInspectorMessage =>
+        _gooseInspectHistoricalEvent ? _selectedGooseTrafficRow?.Source : SelectedGooseMessage;
+
+    public string GooseInspectorDatasetCountText =>
+        (GooseInspectorMessage?.DataValues.Count ?? 0).ToString();
+
+    public string GooseInspectorModeText
+    {
+        get
+        {
+            var item = GooseInspectorMessage;
+            if (item is null)
+                return "Select a publisher for live values or an event for historical evidence.";
+            if (_gooseInspectHistoricalEvent)
+                return $"Pinned event · {item.LastSeenUtc.ToLocalTime():HH:mm:ss.fff} · historical values";
+            var ttl = Math.Max(1000.0, item.TimeAllowedToLiveMilliseconds);
+            var stale = SelectedGoosePublisherRow?.IsStale == true ||
+                        DateTime.UtcNow - item.LastSeenUtc > TimeSpan.FromMilliseconds(ttl);
+            return stale
+                ? $"STALE · last received {item.LastSeenUtc.ToLocalTime():HH:mm:ss.fff} · last valid values retained"
+                : "Live publisher · latest received typed DataSet values";
+        }
+    }
+
+    private void RaiseGooseInspectorProperties()
+    {
+        OnPropertyChanged(nameof(SelectedGooseMessage));
+        OnPropertyChanged(nameof(GooseInspectorMessage));
+        OnPropertyChanged(nameof(GooseInspectorDatasetCountText));
+        OnPropertyChanged(nameof(GooseInspectorModeText));
+        OnPropertyChanged(nameof(SelectedGooseDatasetValues));
+        OnPropertyChanged(nameof(SelectedGooseSemanticText));
+    }
+
     public GooseMonitorSnapshot GooseSnapshot => _gooseSnapshot;
     public ProtocolMonitorSnapshot ProtocolMonitor => _state.ProtocolMonitor;
     public ObservableCollection<PtpEventItem> PtpEvents => _state.PtpEvents;
@@ -895,8 +964,6 @@ public int CurrentWorkspaceTabIndex
             if (IsGooseTabActive)
             {
                 FlushBufferedGooseRows();
-                if (SelectedGooseTrafficRow is null && _gooseHistory.Count > 0)
-                    SelectedGooseTrafficRow = _gooseHistory[^1];
             }
             if (IsDebugTabActive)
                 UpdateDebugDisplaySnapshot();
@@ -2086,15 +2153,12 @@ private async Task RefreshAsync()
 
             _gooseSnapshot = gooseSnapshot;
             _gooseMessages = _gooseSnapshot.Messages;
-            if (_selectedGooseMessage is not null)
-            {
-                _selectedGooseMessage = _gooseMessages.FirstOrDefault(x => string.Equals(x.MessageId, _selectedGooseMessage.MessageId, StringComparison.OrdinalIgnoreCase))
-                    ?? _selectedGooseMessage;
-            }
+            _gooseCatalog.Reconcile(_gooseMessages, _selectedGoosePublisherKey);
+            UpdateGooseIdFilterOptions();
 
             foreach (var msg in _gooseSnapshot.Messages)
             {
-                var key = $"{msg.GoId}|{msg.GoCbRef}|{msg.DataSet}";
+                var key = GoosePublisherKey.From(msg);
 
                 if (!_lastGooseState.TryGetValue(key, out var last))
                 {
@@ -2166,11 +2230,6 @@ private async Task RefreshAsync()
             SynchronizeSelectedStreamRow();
             var selectedStreamId = _selectedStream?.StreamId;
 
-            if (IsGooseTabActive && SelectedGooseTrafficRow is null && _gooseHistory.Count > 0)
-            {
-                SelectedGooseTrafficRow = _gooseHistory[^1];
-            }
-
             if (IsAnalyzerTabActive)
             {
                 // ARSVIN-style contract: render the actual runtime stream snapshot that the
@@ -2755,18 +2814,15 @@ private void RaiseDiagnosticsProperties()
     private void RaiseGooseProperties()
     {
         OnPropertyChanged(nameof(GooseSnapshot));
-        OnPropertyChanged(nameof(GooseMessages));
         OnPropertyChanged(nameof(GooseStatusText));
         OnPropertyChanged(nameof(GooseTotalMessagesText));
         OnPropertyChanged(nameof(GooseDetectedCountText));
         OnPropertyChanged(nameof(GoosePublisherCountText));
-        OnPropertyChanged(nameof(GooseIdFilterOptions));
         OnPropertyChanged(nameof(GooseFilterSummaryText));
         OnPropertyChanged(nameof(GooseEmptyTitle));
         OnPropertyChanged(nameof(GooseEmptyGuidance));
-        OnPropertyChanged(nameof(SelectedGooseDatasetValues));
-        OnPropertyChanged(nameof(SelectedGooseSemanticText));
-        _gooseHistoryView.Refresh();
+        if (!_gooseInspectHistoricalEvent && _selectedGoosePublisherKey.HasValue)
+            RaiseGooseInspectorProperties();
     }
 
     private void RaiseTimingProperties()
@@ -4262,8 +4318,12 @@ private async Task StopAsync()
             s.StatusSoftBrush = "#1C2A38";
         }
 
+        // Stop keeps the last selected publisher as STALE; Clear removes it.
         _gooseMessages = Array.Empty<GooseMessageItem>();
+        _gooseCatalog.Reconcile(_gooseMessages, _selectedGoosePublisherKey);
         _gooseSnapshot = new GooseMonitorSnapshot();
+        UpdateGooseIdFilterOptions();
+        RaiseGooseInspectorProperties();
 
         OnPropertyChanged(nameof(Streams));
         OnPropertyChanged(nameof(SelectedStream));
@@ -4281,12 +4341,15 @@ private async Task ClearAsync()
         _state.ClearRuntimeData();
         _gooseSnapshot = new GooseMonitorSnapshot { StatusText = "Cleared" };
         _gooseMessages = Array.Empty<GooseMessageItem>();
+        _gooseCatalog.Clear();
+        _selectedGoosePublisherKey = null;
+        _gooseInspectHistoricalEvent = false;
+        UpdateGooseIdFilterOptions();
         _gooseHistory.Clear();
         _lastGooseState.Clear();
         _pendingGooseRows.Clear();
         _pendingDiagnosticEvents.Clear();
         _lastGooseHistoryTimeUtc = null;
-        _selectedGooseMessage = null;
         _selectedGooseTrafficRow = null;
         _selectedStream = null;
         _phasors = Array.Empty<PhasorDisplayItem>();
@@ -4307,10 +4370,9 @@ private async Task ClearAsync()
         _frequencyStable = true;
         UpdateDebugDisplaySnapshot();
         RaiseAll(DateTime.UtcNow, force: true);
-        OnPropertyChanged(nameof(SelectedGooseMessage));
+        OnPropertyChanged(nameof(SelectedGoosePublisherRow));
         OnPropertyChanged(nameof(SelectedGooseTrafficRow));
-        OnPropertyChanged(nameof(SelectedGooseDatasetValues));
-        OnPropertyChanged(nameof(SelectedGooseSemanticText));
+        RaiseGooseInspectorProperties();
     }
 
     private void UpdateRefreshCadence()
@@ -4368,6 +4430,10 @@ private static PhasorDisplayItem CreatePhasor(string name, PhasorFamily family,
             Freshness = channel.Freshness
         };
 
+    private bool FilterGoosePublisher(object item) =>
+        item is GoosePublisherRow row &&
+        GoosePublisherCatalog.MatchesFilter(row.Current, SelectedGooseIdFilter, GoosePublisherFilterText);
+
     private bool FilterGooseHistory(object item)
     {
         if (item is not GooseTrafficRow row)
@@ -4627,7 +4693,8 @@ private void FlushBufferedGooseRows(bool flushAll = false)
                 _gooseHistory.RemoveAt(0);
         }
 
-        _gooseHistoryView.Refresh();
+        // CollectionView observes ObservableCollection adds/removes and filters
+        // each new row automatically. Refresh() here resets DataGrid selection.
     }
 
     private void TryFlushBufferedGooseRows()
diff --git a/src/ProcessBus.Core/Presentation/GoosePublisherCatalog.cs b/src/ProcessBus.Core/Presentation/GoosePublisherCatalog.cs
new file mode 100644
index 00000000..65e935cf
--- /dev/null
+++ b/src/ProcessBus.Core/Presentation/GoosePublisherCatalog.cs
@@ -0,0 +1,168 @@
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using ProcessBus.Core.Models;
+
+namespace ProcessBus.Core.Presentation;
+
+/// <summary>
+/// Protocol identity of a GOOSE control block on a particular captured LAN.
+/// Sequence numbers, reception time, ConfRev and DataSet values are NOT identity.
+/// GoCB references are case-sensitive IEC 61850 object references.
+/// </summary>
+public readonly record struct GoosePublisherKey(string SourceMac, string AppId, string GoCbRef, string VlanId)
+{
+    public static GoosePublisherKey From(GooseMessageItem message) => new(
+        NormalizeMac(message.SourceMac),
+        (message.AppId ?? string.Empty).Trim().ToUpperInvariant(),
+        string.Equals(message.GoCbRef, "N/A", StringComparison.OrdinalIgnoreCase)
+            ? $"fallback:{message.GoId}|{message.DataSet}"
+            : (message.GoCbRef ?? string.Empty).Trim(),
+        (message.VlanId ?? string.Empty).Trim());
+
+    private static string NormalizeMac(string? mac) =>
+        (mac ?? string.Empty).Trim().Replace('-', ':').ToUpperInvariant();
+}
+
+/// <summary>
+/// Stable WPF item container identity. The receive snapshot is replaced atomically,
+/// while the row instance is preserved; only changed visible fields are notified.
+/// </summary>
+public sealed class GoosePublisherRow : INotifyPropertyChanged
+{
+    public GoosePublisherRow(GoosePublisherKey key, GooseMessageItem current)
+    {
+        Key = key;
+        Current = current;
+    }
+
+    public GoosePublisherKey Key { get; }
+    public GooseMessageItem Current { get; private set; }
+    public bool IsStale { get; private set; }
+    public string GoId => Current.GoId;
+    public string GoCbRef => Current.GoCbRef;
+    public string AppId => Current.AppId;
+    public uint StNum => Current.StNum;
+    public uint SqNum => Current.SqNum;
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    public bool Update(GooseMessageItem message)
+    {
+        if (Key != GoosePublisherKey.From(message))
+            throw new ArgumentException("Publisher identity mismatch.", nameof(message));
+
+        var before = Current;
+        var changed = !ReferenceEquals(before, message);
+        Current = message;
+        if (IsStale)
+        {
+            IsStale = false;
+            OnPropertyChanged(nameof(IsStale));
+        }
+        if (!changed)
+            return false;
+
+        if (before.GoId != message.GoId) OnPropertyChanged(nameof(GoId));
+        if (before.GoCbRef != message.GoCbRef) OnPropertyChanged(nameof(GoCbRef));
+        if (before.AppId != message.AppId) OnPropertyChanged(nameof(AppId));
+        if (before.StNum != message.StNum) OnPropertyChanged(nameof(StNum));
+        if (before.SqNum != message.SqNum) OnPropertyChanged(nameof(SqNum));
+        return true;
+    }
+
+    internal void MarkStale()
+    {
+        if (IsStale) return;
+        IsStale = true;
+        OnPropertyChanged(nameof(IsStale));
+    }
+
+    private void OnPropertyChanged([CallerMemberName] string? propertyName = null) =>
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+}
+
+/// <summary>
+/// Bounded keyed reconciliation on the UI dispatcher, never on the capture hot path.
+/// An absent selected publisher retains its last coherent frame as stale; unrelated
+/// evicted publishers are removed without resetting the selected item container.
+/// </summary>
+public sealed class GoosePublisherCatalog
+{
+    private const int MaxPublisherRows = 256;
+    private readonly Dictionary<GoosePublisherKey, GoosePublisherRow> _byKey = new();
+    public ObservableCollection<GoosePublisherRow> Rows { get; } = new();
+
+    public GoosePublisherRow? Find(GoosePublisherKey? key) =>
+        key.HasValue && _byKey.TryGetValue(key.Value, out var row) ? row : null;
+
+    public bool Reconcile(IReadOnlyList<GooseMessageItem> messages, GoosePublisherKey? selected)
+    {
+        var seen = new HashSet<GoosePublisherKey>();
+        var changed = false;
+        foreach (var message in messages)
+        {
+            var key = GoosePublisherKey.From(message);
+            seen.Add(key);
+            if (_byKey.TryGetValue(key, out var row))
+            {
+                changed |= row.Update(message);
+            }
+            else if (Rows.Count < MaxPublisherRows)
+            {
+                row = new GoosePublisherRow(key, message);
+                _byKey.Add(key, row);
+                Rows.Add(row);
+                changed = true;
+            }
+        }
+
+        // Only remove truly absent non-selected rows. Do not rebuild the whole list.
+        for (var i = Rows.Count - 1; i >= 0; i--)
+        {
+            var row = Rows[i];
+            if (seen.Contains(row.Key)) continue;
+            if (selected.HasValue && selected.Value == row.Key)
+            {
+                row.MarkStale();
+                continue;
+            }
+            _byKey.Remove(row.Key);
+            Rows.RemoveAt(i);
+            changed = true;
+        }
+        return changed;
+    }
+
+    /// <summary>Same deterministic filter for publisher exploration; filtering
+    /// never changes the operator's selected publisher key.</summary>
+    public static bool MatchesFilter(GooseMessageItem message, string? gooseId, string? search)
+    {
+        if (!string.IsNullOrWhiteSpace(gooseId) &&
+            !string.Equals(gooseId, "All", StringComparison.OrdinalIgnoreCase) &&
+            !string.Equals(message.GoId, gooseId, StringComparison.OrdinalIgnoreCase) &&
+            !string.Equals(message.GoCbRef, gooseId, StringComparison.OrdinalIgnoreCase))
+            return false;
+
+        if (string.IsNullOrWhiteSpace(search))
+            return true;
+
+        var text = search.Trim();
+        return Contains(message.GoId, text) ||
+               Contains(message.GoCbRef, text) ||
+               Contains(message.AppId, text) ||
+               Contains(message.DataSet, text) ||
+               Contains(message.SourceMac, text) ||
+               Contains(message.DestinationMac, text);
+
+        static bool Contains(string? field, string text) =>
+            !string.IsNullOrWhiteSpace(field) &&
+            field.Contains(text, StringComparison.OrdinalIgnoreCase);
+    }
+
+    public void Clear()
+    {
+        _byKey.Clear();
+        Rows.Clear();
+    }
+}
diff --git a/src/ProcessBus.Iec61850.Raw/Analysis/RawProcessBusAnalyzer.cs b/src/ProcessBus.Iec61850.Raw/Analysis/RawProcessBusAnalyzer.cs
index c0c61d1c..8c13dd2a 100644
--- a/src/ProcessBus.Iec61850.Raw/Analysis/RawProcessBusAnalyzer.cs
+++ b/src/ProcessBus.Iec61850.Raw/Analysis/RawProcessBusAnalyzer.cs
@@ -23,7 +23,7 @@ public sealed class RawProcessBusAnalyzer
     // Mapping eligibility is stable until the operator reloads SCL/mapping context.
     // Avoid scoring + LINQ allocations for every 4,000/4,800 Hz ASDU.
     private readonly Dictionary<string, SvChannelMappingProfile?> _resolvedSvMappings = new(StringComparer.OrdinalIgnoreCase);
-    private readonly Dictionary<string, GooseState> _gooseStates = new(StringComparer.OrdinalIgnoreCase);
+    private readonly Dictionary<string, GooseState> _gooseStates = new(StringComparer.Ordinal);
     private readonly Dictionary<string, AggregatedEventState> _aggregatedEvents = new(StringComparer.OrdinalIgnoreCase);
     private readonly PtpHealthTracker _ptpTracker = new();
     private readonly Queue<PtpEventItem> _recentPtpEvents = new();
@@ -706,9 +706,15 @@ private static GooseMessageItem BuildGooseItem(GoosePacket packet)
         var goCbRef = ValueOrFallback(packet.GoCbRef, "N/A");
         var goId = ValueOrFallback(packet.GoId, "N/A");
         var dataSet = ValueOrFallback(packet.DataSet, "N/A");
-        var messageId = goCbRef != "N/A"
-            ? goCbRef
-            : $"{packet.Frame.AppId:X4}:{goId}:{dataSet}";
+        // A GoCB reference alone is not globally unique: separate IEDs may
+        // publish the same name. Include physical source, APPID and VLAN.
+        // Never include stNum/sqNum, ConfRev or last-seen in publisher identity.
+        var sourceMac = packet.Frame.Ethernet.SourceMac.Trim().Replace('-', ':').ToUpperInvariant();
+        var vlanId = packet.Frame.Ethernet.Vlan.HasValue
+            ? packet.Frame.Ethernet.Vlan.Value.VlanId.ToString()
+            : "N/A";
+        var blockIdentity = goCbRef != "N/A" ? goCbRef : $"fallback:{goId}|{dataSet}";
+        var messageId = $"{sourceMac}|{packet.Frame.AppId:X4}|{vlanId}|{blockIdentity}";
 
         var dataValues = packet.DataValues
             .Select(x => new GooseDatasetValueItem
diff --git a/tests/ProcessBus.Tests/GoosePublisherSelectionTests.cs b/tests/ProcessBus.Tests/GoosePublisherSelectionTests.cs
new file mode 100644
index 00000000..c66b80fc
--- /dev/null
+++ b/tests/ProcessBus.Tests/GoosePublisherSelectionTests.cs
@@ -0,0 +1,136 @@
+using ProcessBus.Core.Models;
+using ProcessBus.Core.Presentation;
+using Xunit;
+
+namespace ProcessBus.Tests;
+
+public sealed class GoosePublisherSelectionTests
+{
+    private static GooseMessageItem Frame(
+        string source = "02:00:4C:4E:4E:50",
+        string goCb = "IED/LLN0$GO$gcb",
+        uint st = 1, uint sq = 1, string vlan = "0") => new()
+    {
+        MessageId = $"{source}|{goCb}",
+        SourceMac = source,
+        GoCbRef = goCb,
+        GoId = "SharedGoID",
+        AppId = "0x0001",
+        VlanId = vlan,
+        StNum = st,
+        SqNum = sq,
+        DataValues = [new GooseDatasetValueItem { Index = 1, Name = "stVal", Type = "Boolean", Value = st.ToString() }],
+        LastSeenUtc = new DateTime(2026, 10, 21, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(sq)
+    };
+
+    [Fact]
+    public void RetransmissionsKeepSameRowAndExposeLatestTypedFrame()
+    {
+        var catalog = new GoosePublisherCatalog();
+        var first = Frame();
+        var key = GoosePublisherKey.From(first);
+        catalog.Reconcile([first], null);
+        var selected = Assert.Single(catalog.Rows);
+        var resets = 0;
+        catalog.Rows.CollectionChanged += (_, _) => resets++;
+
+        for (uint sq = 2; sq <= 1000; sq++)
+            catalog.Reconcile([Frame(sq: sq)], key);
+
+        Assert.Same(selected, catalog.Find(key));
+        Assert.Equal((uint)1000, selected.Current.SqNum);
+        Assert.Single(selected.Current.DataValues);
+        Assert.Equal(0, resets);
+        Assert.False(selected.IsStale);
+    }
+
+    [Fact]
+    public void SameGoIdAcrossMacAndVlanNeverCoalesces()
+    {
+        var catalog = new GoosePublisherCatalog();
+        catalog.Reconcile([Frame(), Frame(source: "02:00:4C:4E:4E:51"), Frame(vlan: "7")], null);
+        Assert.Equal(3, catalog.Rows.Count);
+    }
+
+    [Fact]
+    public void SelectedPublisherSurvivesAlternatingTrafficAndTemporaryAbsence()
+    {
+        var catalog = new GoosePublisherCatalog();
+        var a = Frame();
+        var b = Frame(source: "02:00:4C:4E:4E:51");
+        var key = GoosePublisherKey.From(a);
+        catalog.Reconcile([a,b], null);
+        var selected = catalog.Find(key);
+        catalog.Reconcile([Frame(source: b.SourceMac, sq: 10)], key);
+        Assert.Same(selected, catalog.Find(key));
+        Assert.True(selected!.IsStale);
+        Assert.Equal(2, catalog.Rows.Count); // A is retained STALE while B stays live.
+        Assert.False(catalog.Find(GoosePublisherKey.From(b))!.IsStale);
+        catalog.Reconcile([Frame(sq: 30), Frame(source: b.SourceMac, sq: 11)], key);
+        Assert.Same(selected, catalog.Find(key));
+        Assert.False(selected!.IsStale);
+        Assert.Equal((uint)30, selected.Current.SqNum);
+    }
+
+    [Fact]
+    public void StateNumbersAndDataSetDoNotBecomePublisherIdentity()
+    {
+        var catalog = new GoosePublisherCatalog();
+        var a = Frame(st: 1, sq: 2);
+        var k = GoosePublisherKey.From(a);
+        catalog.Reconcile([a], null);
+        var same = catalog.Find(k);
+        catalog.Reconcile([Frame(st: 15, sq: 5)], k);
+        Assert.Same(same, catalog.Find(k));
+        Assert.Equal((uint)15, same!.Current.StNum);
+        Assert.Equal("15", same.Current.DataValues[0].Value);
+    }
+
+    [Fact]
+    public void ExplicitClearIsDifferentFromTransientEmptySnapshot()
+    {
+        var catalog = new GoosePublisherCatalog();
+        var a = Frame();
+        var key = GoosePublisherKey.From(a);
+        catalog.Reconcile([a], key);
+        catalog.Reconcile([], key);
+        Assert.True(catalog.Find(key)!.IsStale);
+        catalog.Clear();
+        Assert.Empty(catalog.Rows);
+        Assert.Null(catalog.Find(key));
+    }
+
+    [Fact]
+    public void SearchAndGoIdFiltersNeverMutateSelectedPublisher()
+    {
+        var catalog = new GoosePublisherCatalog();
+        var a = Frame(source: "02:00:4C:4E:4E:50");
+        var b = Frame(source: "02:00:4C:4E:4E:51", goCb: "IED/LLN0$GO$other");
+        var key = GoosePublisherKey.From(a);
+        catalog.Reconcile([a, b], null);
+        var selected = catalog.Find(key);
+
+        Assert.True(GoosePublisherCatalog.MatchesFilter(a, "All", "IED"));
+        Assert.False(GoosePublisherCatalog.MatchesFilter(a, "OtherGoId", ""));
+        Assert.False(GoosePublisherCatalog.MatchesFilter(a, "All", "no-match"));
+        Assert.True(GoosePublisherCatalog.MatchesFilter(b, "All", "other"));
+
+        // Filtering is a view concern, not a selection/catalog mutation.
+        catalog.Reconcile([Frame(sq: 11), b], key);
+        Assert.Same(selected, catalog.Find(key));
+        Assert.Equal((uint)11, selected!.Current.SqNum);
+    }
+
+    [Fact]
+    public void HighTrafficDoesNotCauseUnboundedRows()
+    {
+        var catalog = new GoosePublisherCatalog();
+        var frames = Enumerable.Range(0, 500)
+            .Select(i => Frame(source: $"02:00:00:{i / 65536:X2}:{i / 256 % 256:X2}:{i % 256:X2}"))
+            .ToArray();
+        catalog.Reconcile(frames, null);
+        Assert.InRange(catalog.Rows.Count, 1, 256);
+        catalog.Reconcile([], null);
+        Assert.Empty(catalog.Rows);
+    }
+}
diff --git a/tests/ProcessBus.Tests/M4GooseRetentionTests.cs b/tests/ProcessBus.Tests/M4GooseRetentionTests.cs
index 36176afe..06eac8e9 100644
--- a/tests/ProcessBus.Tests/M4GooseRetentionTests.cs
+++ b/tests/ProcessBus.Tests/M4GooseRetentionTests.cs
@@ -15,6 +15,26 @@ private static byte[] Goose(int id)
             GoldenFrames.ProcessBusPayload(0x0001, apdu));
     }
 
+
+    [Fact]
+    public void SameGoCbRefOnTwoSourceMacsRemainsTwoIndependentPublishers()
+    {
+        var analyzer = new RawProcessBusAnalyzer();
+        var first = Goose(1);
+        var second = (byte[])first.Clone();
+        // Ethernet II source MAC occupies bytes 6..11.
+        second[11] ^= 0x01;
+
+        analyzer.ObserveFrame(first, DateTime.UtcNow);
+        analyzer.ObserveFrame(second, DateTime.UtcNow.AddMilliseconds(1));
+
+        var publishers = analyzer.GetGooseSnapshot().Messages;
+        Assert.Equal(2, publishers.Count);
+        Assert.Equal(2, publishers.Select(x => x.MessageId).Distinct().Count());
+        Assert.Equal(2, publishers.Select(x => x.SourceMac).Distinct().Count());
+        Assert.All(publishers, x => Assert.Equal("LABLD0/LLN0$GO$CB001", x.GoCbRef));
+    }
+
     [Fact]
     public void ChurningPublisherIdentitiesCannotAllocateUnboundedGooseStates()
     {