fix(adminui): wire Test Connect probes + live panels on admin-only nodes

Both bugs surfaced only on split-role deployments (the MAIN cluster's
admin-only nodes), where the AdminUI runs without the driver role.

- Test Connect returned "No probe registered" for every driver: the
  IDriverProbe set was registered only under the driver role, but the
  admin-operations singleton that consumes it is pinned to admin. Extract
  AddOtOpcUaDriverProbes() (idempotent via TryAddEnumerable) and call it
  in the hasAdmin path too.

- Live driver-status/alerts/script-log panels showed "SignalR error:
  Connection refused": these Blazor Server components opened a HubConnection
  to their own hub via the browser's public URL, which server-side code
  can't reach behind Traefik (host :9200 -> container :9000). Read the
  in-process source directly instead -- DriverStatus via
  IDriverStatusSnapshotStore.SnapshotChanged, Alerts/ScriptLog via a new
  IInProcessBroadcaster<T>. Fleet status was unaffected (reads DB/ActorSystem).

Adds unit tests for probe registration, the snapshot-store event, and the
broadcaster.

docker-dev/docker-compose.yml

@@ -248,7 +248,7 @@ services:
       - --providers.file.watch=true
       - --api.insecure=true
     ports:
-      - "80:80"
+      - "9200:80"  # host port 9200 → traefik :80 entrypoint (80 conflicts with scadabridge-traefik)
       - "8089:8080"  # 8080 conflicts with the sister scadalink dev stack
     volumes:
       - ./traefik-dynamic.yml:/etc/traefik/dynamic.yml:ro

src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Validation/DraftValidator.cs

@@ -172,8 +172,8 @@ public static class DraftValidator
 
             var compat = ns.Kind switch
             {
-                NamespaceKind.SystemPlatform => di.DriverType == "Galaxy",
-                NamespaceKind.Equipment      => di.DriverType != "Galaxy",
+                NamespaceKind.SystemPlatform => di.DriverType == "GalaxyMxGateway",
+                NamespaceKind.Equipment      => di.DriverType != "GalaxyMxGateway",
                 _                            => true,
             };
 

src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli/Commands/SubscribeCommand.cs

@@ -12,20 +12,20 @@ namespace ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli.Commands;
 [Command("subscribe", Description = "Watch a PCCC file address via polled subscription until Ctrl+C.")]
 public sealed class SubscribeCommand : AbLegacyCommandBase
 {
-    [CommandOption("address", 'a', Description = "PCCC file address — same format as `read`.", IsRequired = true)]
     /// <summary>Gets or sets the PCCC file address to subscribe to.</summary>
+    [CommandOption("address", 'a', Description = "PCCC file address — same format as `read`.", IsRequired = true)]
     public string Address { get; init; } = default!;
 
+    /// <summary>Gets or sets the data type of the address.</summary>
     [CommandOption("type", 't', Description =
         "Bit / Int / Long / Float / AnalogInt / String / TimerElement / CounterElement / " +
         "ControlElement (default Int).")]
-    /// <summary>Gets or sets the data type of the address.</summary>
     public AbLegacyDataType DataType { get; init; } = AbLegacyDataType.Int;
 
+    /// <summary>Gets or sets the polling interval in milliseconds.</summary>
     [CommandOption("interval-ms", 'i', Description =
         "Publishing interval in milliseconds (default 1000). PollGroupEngine floors " +
         "sub-250ms values.")]
-    /// <summary>Gets or sets the polling interval in milliseconds.</summary>
     public int IntervalMs { get; init; } = 1000;
 
     /// <inheritdoc />

src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli/Commands/ProbeCommand.cs

@@ -13,14 +13,14 @@ namespace ZB.MOM.WW.OtOpcUa.Driver.S7.Cli.Commands;
 [Command("probe", Description = "Verify the S7 endpoint is reachable and a sample read succeeds.")]
 public sealed class ProbeCommand : S7CommandBase
 {
+    /// <summary>Gets or sets the S7 address to probe.</summary>
     [CommandOption("address", 'a', Description =
         "Probe address (default MW0 — merker word 0). DB1.DBW0 if your PLC project " +
         "reserves a fingerprint DB.")]
-    /// <summary>Gets or sets the S7 address to probe.</summary>
     public string Address { get; init; } = "MW0";
 
-    [CommandOption("type", Description = "Probe data type (default Int16).")]
     /// <summary>Gets or sets the data type of the probe address.</summary>
+    [CommandOption("type", Description = "Probe data type (default Int16).")]
     public S7DataType DataType { get; init; } = S7DataType.Int16;
 
     /// <inheritdoc />

src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Browser/GalaxyDriverBrowser.cs

@@ -42,8 +42,10 @@ public sealed class GalaxyDriverBrowser : IDriverBrowser
         _logger = logger ?? NullLogger<GalaxyDriverBrowser>.Instance;
     }
 
-    /// <summary>Driver type key — matches the AdminUI's persisted "Galaxy" value.</summary>
-    public string DriverType => "Galaxy";
+    /// <summary>Driver type key — matches the AdminUI's persisted "GalaxyMxGateway" value.</summary>
+    // Hardcoded literal: this project references Driver.Galaxy.Contracts, not Driver.Galaxy,
+    // so GalaxyDriverFactoryExtensions.DriverTypeName isn't available here.
+    public string DriverType => "GalaxyMxGateway";
 
     /// <summary>
     ///     Deserializes a <see cref="GalaxyDriverOptions"/> blob, opens a transient

src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/GalaxyDriverProbe.cs

@@ -25,7 +25,7 @@ public sealed class GalaxyDriverProbe : IDriverProbe
 
     /// <inheritdoc />
     // Matches DriverInstance.DriverType strings set by the AdminUI's GalaxyDriverPage.
-    public string DriverType => "Galaxy";
+    public string DriverType => GalaxyDriverFactoryExtensions.DriverTypeName;
 
     /// <inheritdoc />
     public async Task<DriverProbeResult> ProbeAsync(string configJson, TimeSpan timeout, CancellationToken ct)

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Alerts.razor

@@ -4,11 +4,10 @@
    and the AB CIP ALMD bridge. *@
 @attribute [Microsoft.AspNetCore.Authorization.Authorize]
 @rendermode RenderMode.InteractiveServer
-@using Microsoft.AspNetCore.SignalR.Client
 @using ZB.MOM.WW.OtOpcUa.AdminUI.Hubs
 @using ZB.MOM.WW.OtOpcUa.Commons.Messages.Alerts
-@inject NavigationManager Nav
-@implements IAsyncDisposable
+@inject IInProcessBroadcaster<AlarmTransitionEvent> Alarms
+@implements IDisposable
 
 <div class="d-flex justify-content-between align-items-center mb-3">
     <h4 class="mb-0">Alerts</h4>
@@ -73,36 +72,26 @@ else
     private const int Capacity = 200;
 
     private readonly List<AlarmTransitionEvent> _rows = new();
-    private HubConnection? _hub;
     private bool _connected;
 
-    protected override async Task OnInitializedAsync()
+    protected override void OnInitialized()
     {
-        _hub = new HubConnectionBuilder()
-            .WithUrl(Nav.ToAbsoluteUri(AlertHub.Endpoint))
-            .WithAutomaticReconnect()
-            .Build();
+        // Live alarm tail straight from the in-process broadcaster (fed by AlertSignalRBridge off the
+        // 'alerts' DPS topic). A Blazor Server component can't self-connect a SignalR HubConnection
+        // behind a reverse proxy — see IInProcessBroadcaster — so we subscribe in-process instead.
+        Alarms.Received += OnAlarm;
+        _connected = true;
+    }
 
-        _hub.On<AlarmTransitionEvent>(AlertHub.MethodName, evt =>
+    private void OnAlarm(AlarmTransitionEvent evt) =>
+        // Marshal both the mutation and the re-render onto the circuit sync context so this can't
+        // race ClearAsync (which runs there) over the shared _rows list.
+        InvokeAsync(() =>
         {
             _rows.Insert(0, evt);
             if (_rows.Count > Capacity) _rows.RemoveAt(_rows.Count - 1);
-            InvokeAsync(StateHasChanged);
+            StateHasChanged();
         });
-        _hub.Closed += _ => { _connected = false; return InvokeAsync(StateHasChanged); };
-        _hub.Reconnected += _ => { _connected = true; return InvokeAsync(StateHasChanged); };
-
-        try
-        {
-            await _hub.StartAsync();
-            _connected = true;
-        }
-        catch
-        {
-            // Connection failures (admin-only deployment, hub not mapped, etc.) leave the page
-            // showing "disconnected" — operator action: reload or talk to the host operator.
-        }
-    }
 
     private async Task ClearAsync()
     {
@@ -119,8 +108,5 @@ else
         _ => "chip-idle",
     };
 
-    public async ValueTask DisposeAsync()
-    {
-        if (_hub is not null) await _hub.DisposeAsync();
-    }
+    public void Dispose() => Alarms.Received -= OnAlarm;
 }

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterAcls.razor

@@ -21,9 +21,8 @@ else
 {
     <section class="panel notice rise" style="animation-delay:.02s">
         ACL rows grant LDAP groups specific <span class="mono">NodePermissions</span> on a scope
-        (a folder, an equipment, a tag). Q4 of the AdminUI rebuild plan dropped per-cluster role
-        grants in favour of fleet-wide LDAP-group → role mapping; ACLs here are the finer-grained
-        per-node scope. Live editing lands in a Phase C.2 follow-up.
+        (a folder, an equipment, a tag). Per-cluster role grants were dropped in favour of
+        fleet-wide LDAP-group → role mapping; ACLs here are the finer-grained per-node scope.
     </section>
 
     <section class="panel rise mt-3" style="animation-delay:.08s">

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterDrivers.razor

@@ -19,12 +19,6 @@
 }
 else
 {
-    <section class="panel notice rise" style="animation-delay:.02s">
-        Per Q1 of the AdminUI rebuild plan, typed driver editors (Modbus, FOCAS) are deferred.
-        The expanded view below shows raw JSON config. Live editing — including a generic JSON
-        editor and per-driver-type forms when operators ask — lands in a Phase C.2 follow-up.
-    </section>
-
     <section class="panel rise mt-3" style="animation-delay:.08s">
         <div class="panel-head">@_rows.Count driver instance@(_rows.Count == 1 ? "" : "s")</div>
         @if (_rows.Count == 0)

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterEquipment.razor

@@ -25,7 +25,7 @@ else
     <section class="panel notice rise" style="animation-delay:.02s">
         Equipment rows are scoped to a UNS line and bound to a single driver. EquipmentId is
         system-generated (decision #125); browse identifiers are MachineCode (operator) + ZTag
-        (ERP). Live editing lands in a Phase C.2 follow-up.
+        (ERP).
     </section>
 
     <section class="panel rise mt-3" style="animation-delay:.08s">

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterNamespaces.razor

@@ -21,8 +21,7 @@ else
 {
     <section class="panel notice rise" style="animation-delay:.02s">
         Namespaces are content (decision #123) — they're served at the OPC UA endpoint and bound
-        to driver instances. NamespaceUri must be unique fleet-wide. Live editing lands in a
-        Phase C.2 follow-up.
+        to driver instances. NamespaceUri must be unique fleet-wide.
     </section>
 
     <section class="panel rise mt-3" style="animation-delay:.08s">

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterTags.razor

@@ -21,7 +21,7 @@ else
 {
     <section class="panel notice rise" style="animation-delay:.02s">
         Tags are bound to a driver instance and (optionally) an equipment + poll group. The view
-        below shows the first @PageSize tags by Name; full pagination + search land in Phase C.2.
+        below shows the first @PageSize tags by Name.
     </section>
 
     <div class="d-flex align-items-center mb-3 gap-2 mt-3">

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/ClusterUns.razor

@@ -20,8 +20,7 @@ else
 {
     <section class="panel notice rise" style="animation-delay:.02s">
         UNS levels: Enterprise (cluster) → Site (cluster) → Area → Line → Equipment. Areas and
-        lines are cluster-scoped; equipment hangs under a single line. Live editing lands in a
-        Phase C.2 follow-up.
+        lines are cluster-scoped; equipment hangs under a single line.
     </section>
 
     <section class="panel rise mt-3" style="animation-delay:.08s">

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/DriverEditRouter.razor

@@ -59,7 +59,7 @@ else
             ["TwinCat"]              = typeof(TwinCATDriverPage),
             ["Focas"]                = typeof(FocasDriverPage),
             ["OpcUaClient"]          = typeof(OpcUaClientDriverPage),
-            ["Galaxy"]               = typeof(GalaxyDriverPage),
+            ["GalaxyMxGateway"]      = typeof(GalaxyDriverPage),
             ["Historian.Wonderware"] = typeof(HistorianWonderwareDriverPage),
         };
 

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/Clusters/Drivers/GalaxyDriverPage.razor

@@ -208,13 +208,14 @@ else
     [Parameter] public string ClusterId { get; set; } = "";
     [Parameter] public string? DriverInstanceId { get; set; }
 
-    private const string DriverTypeKey = "Galaxy";
+    private const string DriverTypeKey = "GalaxyMxGateway";
 
     private bool IsNew => string.IsNullOrEmpty(DriverInstanceId);
 
     private static readonly System.Text.Json.JsonSerializerOptions _jsonOpts = new()
     {
         PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase,
+        PropertyNameCaseInsensitive = true,
         UnmappedMemberHandling = System.Text.Json.Serialization.JsonUnmappedMemberHandling.Skip,
         WriteIndented = false,
     };
@@ -408,26 +409,36 @@ else
         // GalaxyDriverOptions top-level
         public int ProbeTimeoutSeconds { get; set; } = 30;
 
-        public static GalaxyFormModel FromRecord(GalaxyDriverOptions r) => new()
+        public static GalaxyFormModel FromRecord(GalaxyDriverOptions r)
         {
-            GatewayEndpoint = r.Gateway.Endpoint,
-            GatewayApiKeySecretRef = r.Gateway.ApiKeySecretRef,
-            GatewayUseTls = r.Gateway.UseTls,
-            GatewayCaCertificatePath = r.Gateway.CaCertificatePath,
-            GatewayConnectTimeoutSeconds = r.Gateway.ConnectTimeoutSeconds,
-            GatewayDefaultCallTimeoutSeconds = r.Gateway.DefaultCallTimeoutSeconds,
-            GatewayStreamTimeoutSeconds = r.Gateway.StreamTimeoutSeconds,
-            MxClientName = r.MxAccess.ClientName,
-            MxPublishingIntervalMs = r.MxAccess.PublishingIntervalMs,
-            MxWriteUserId = r.MxAccess.WriteUserId,
-            MxEventPumpChannelCapacity = r.MxAccess.EventPumpChannelCapacity,
-            RepositoryDiscoverPageSize = r.Repository.DiscoverPageSize,
-            RepositoryWatchDeployEvents = r.Repository.WatchDeployEvents,
-            ReconnectInitialBackoffMs = r.Reconnect.InitialBackoffMs,
-            ReconnectMaxBackoffMs = r.Reconnect.MaxBackoffMs,
-            ReconnectReplayOnSessionLost = r.Reconnect.ReplayOnSessionLost,
-            ProbeTimeoutSeconds = r.ProbeTimeoutSeconds,
-        };
+            // Null-coalesce each nested record to its default so that persisted configs
+            // that pre-date a section (e.g. no Reconnect key, or PascalCase keys that
+            // don't match the camelCase deserializer) don't cause a NullReferenceException.
+            var gw   = r.Gateway    ?? new GalaxyGatewayOptions("https://localhost:5001", "env:MX_API_KEY");
+            var mx   = r.MxAccess   ?? new GalaxyMxAccessOptions("OtOpcUa");
+            var repo = r.Repository ?? new GalaxyRepositoryOptions();
+            var rc   = r.Reconnect  ?? new GalaxyReconnectOptions();
+            return new()
+            {
+                GatewayEndpoint = gw.Endpoint,
+                GatewayApiKeySecretRef = gw.ApiKeySecretRef,
+                GatewayUseTls = gw.UseTls,
+                GatewayCaCertificatePath = gw.CaCertificatePath,
+                GatewayConnectTimeoutSeconds = gw.ConnectTimeoutSeconds,
+                GatewayDefaultCallTimeoutSeconds = gw.DefaultCallTimeoutSeconds,
+                GatewayStreamTimeoutSeconds = gw.StreamTimeoutSeconds,
+                MxClientName = mx.ClientName,
+                MxPublishingIntervalMs = mx.PublishingIntervalMs,
+                MxWriteUserId = mx.WriteUserId,
+                MxEventPumpChannelCapacity = mx.EventPumpChannelCapacity,
+                RepositoryDiscoverPageSize = repo.DiscoverPageSize,
+                RepositoryWatchDeployEvents = repo.WatchDeployEvents,
+                ReconnectInitialBackoffMs = rc.InitialBackoffMs,
+                ReconnectMaxBackoffMs = rc.MaxBackoffMs,
+                ReconnectReplayOnSessionLost = rc.ReplayOnSessionLost,
+                ProbeTimeoutSeconds = r.ProbeTimeoutSeconds,
+            };
+        }
 
         public GalaxyDriverOptions ToRecord() => new(
             Gateway: new GalaxyGatewayOptions(

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/ScriptLog.razor

@@ -3,11 +3,10 @@
    VirtualTagActor / ScriptedAlarmActor script execution. Engine emit lands with F8 + F9. *@
 @attribute [Microsoft.AspNetCore.Authorization.Authorize]
 @rendermode RenderMode.InteractiveServer
-@using Microsoft.AspNetCore.SignalR.Client
 @using ZB.MOM.WW.OtOpcUa.AdminUI.Hubs
 @using ZB.MOM.WW.OtOpcUa.Commons.Messages.Logging
-@inject NavigationManager Nav
-@implements IAsyncDisposable
+@inject IInProcessBroadcaster<ScriptLogEntry> ScriptLogs
+@implements IDisposable
 
 <div class="d-flex justify-content-between align-items-center mb-3">
     <h4 class="mb-0">Script log</h4>
@@ -87,7 +86,6 @@ else
     private const int Capacity = 500;
 
     private readonly List<ScriptLogEntry> _rows = new();
-    private HubConnection? _hub;
     private bool _connected;
     private string _levelFilter = "";
     private string _scriptFilter = "";
@@ -115,32 +113,24 @@ else
         }
     }
 
-    protected override async Task OnInitializedAsync()
+    protected override void OnInitialized()
     {
-        _hub = new HubConnectionBuilder()
-            .WithUrl(Nav.ToAbsoluteUri(ScriptLogHub.Endpoint))
-            .WithAutomaticReconnect()
-            .Build();
+        // Live tail straight from the in-process broadcaster (fed by ScriptLogSignalRBridge off the
+        // 'script-logs' DPS topic). Blazor Server can't self-connect a SignalR HubConnection behind
+        // a reverse proxy — see IInProcessBroadcaster — so we subscribe in-process instead.
+        ScriptLogs.Received += OnEntry;
+        _connected = true;
+    }
 
-        _hub.On<ScriptLogEntry>(ScriptLogHub.MethodName, entry =>
+    private void OnEntry(ScriptLogEntry entry) =>
+        // Marshal both the mutation and the re-render onto the circuit sync context so this can't
+        // race ClearAsync (which runs there) over the shared _rows list.
+        InvokeAsync(() =>
         {
             _rows.Insert(0, entry);
             if (_rows.Count > Capacity) _rows.RemoveAt(_rows.Count - 1);
-            InvokeAsync(StateHasChanged);
+            StateHasChanged();
         });
-        _hub.Closed += _ => { _connected = false; return InvokeAsync(StateHasChanged); };
-        _hub.Reconnected += _ => { _connected = true; return InvokeAsync(StateHasChanged); };
-
-        try
-        {
-            await _hub.StartAsync();
-            _connected = true;
-        }
-        catch
-        {
-            // Connection error — page shows "disconnected".
-        }
-    }
 
     private async Task ClearAsync()
     {
@@ -156,8 +146,5 @@ else
         _ => "chip-idle",
     };
 
-    public async ValueTask DisposeAsync()
-    {
-        if (_hub is not null) await _hub.DisposeAsync();
-    }
+    public void Dispose() => ScriptLogs.Received -= OnEntry;
 }

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Pages/VirtualTags.razor

@@ -20,7 +20,7 @@ else
     <section class="panel notice rise" style="animation-delay:.02s">
         Virtual tags evaluate a script per equipment instance and publish the result as an OPC UA
         variable. ChangeTriggered = re-evaluate when any dependency changes; TimerIntervalMs
-        re-evaluates on a periodic timer. Live editing lands in a Phase C.2-equivalent follow-up.
+        re-evaluates on a periodic timer.
     </section>
 
     <section class="panel rise mt-3" style="animation-delay:.08s">

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Drivers/DriverIdentitySection.razor

@@ -35,7 +35,7 @@
                         <option value="TwinCat">TwinCat</option>
                         <option value="Focas">Focas</option>
                         <option value="OpcUaClient">OpcUaClient</option>
-                        <option value="Galaxy">Galaxy</option>
+                        <option value="GalaxyMxGateway">Galaxy</option>
                         <option value="Historian.Wonderware">Historian.Wonderware</option>
                     </InputSelect>
                     <div class="form-text">Cannot be changed after creation — drives the actor type that owns this instance.</div>

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Drivers/DriverStatusPanel.razor

@@ -4,14 +4,14 @@
    DriverOperator-gated Reconnect/Restart buttons appear for authorised users. *@
 @implements IAsyncDisposable
 @using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.SignalR.Client
+@using ZB.MOM.WW.OtOpcUa.AdminUI.Hubs
 @using ZB.MOM.WW.OtOpcUa.Commons.Interfaces
 @using ZB.MOM.WW.OtOpcUa.Commons.Messages.Admin
 @using ZB.MOM.WW.OtOpcUa.Commons.Messages.Drivers
-@inject NavigationManager Nav
 @inject AuthenticationStateProvider AuthState
 @inject IAuthorizationService AuthorizationService
 @inject IAdminOperationsClient AdminOps
+@inject IDriverStatusSnapshotStore StatusStore
 
 <section class="panel rise mt-3" style="animation-delay:.04s; @(_stale ? "opacity:0.5;" : "")">
     <div class="panel-head d-flex align-items-center gap-2">
@@ -139,7 +139,6 @@
     [Parameter] public string ClusterId { get; set; } = "";
     [Parameter] public bool Enabled { get; set; } = true;
 
-    private HubConnection? _hub;
     private DriverHealthChanged? _snapshot;
     private DateTime _lastUpdateUtc = DateTime.MinValue;
     private bool _stale;
@@ -180,30 +179,44 @@
             InvokeAsync(StateHasChanged);
         }, null, TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(5));
 
-        _hub = new HubConnectionBuilder()
-            .WithUrl(Nav.ToAbsoluteUri("/hubs/driverstatus"))
-            .WithAutomaticReconnect()
-            .Build();
-
-        _hub.On<DriverHealthChanged>("status", snap =>
-        {
-            _snapshot = snap;
-            _lastUpdateUtc = DateTime.UtcNow;
-            _stale = false;
-            InvokeAsync(StateHasChanged);
-        });
-
+        // Read live status straight from the in-process snapshot store rather than opening a
+        // self-targeted SignalR connection. This component runs server-side (Blazor
+        // InteractiveServer), so a HubConnection to the browser's public URL (e.g.
+        // http://localhost:9200 behind Traefik) would dial that port from *inside* the container —
+        // where only Kestrel's :9000 listens — and fail with "Connection refused". The store is fed
+        // on every admin node by DriverStatusSignalRBridge (a per-node DistributedPubSub
+        // subscriber), so the local singleton is always current regardless of which replica serves
+        // this circuit.
         try
         {
-            await _hub.StartAsync();
-            _connecting = false;
-            await _hub.InvokeAsync("JoinDriver", DriverInstanceId);
+            StatusStore.SnapshotChanged += OnSnapshotChanged;
+            if (StatusStore.TryGet(DriverInstanceId, out var snap))
+            {
+                _snapshot = snap;
+                _lastUpdateUtc = DateTime.UtcNow;
+            }
         }
         catch (Exception ex)
         {
-            _connecting = false;
             _error = ex.Message;
         }
+        finally
+        {
+            _connecting = false;
+        }
+    }
+
+    // Invoked by the snapshot store (on the bridge actor's thread) for every driver instance;
+    // ignore snapshots for other instances and marshal onto the render sync context.
+    private void OnSnapshotChanged(DriverHealthChanged snap)
+    {
+        if (!string.Equals(snap.DriverInstanceId, DriverInstanceId, StringComparison.Ordinal))
+            return;
+
+        _snapshot = snap;
+        _lastUpdateUtc = DateTime.UtcNow;
+        _stale = false;
+        InvokeAsync(StateHasChanged);
     }
 
     private async Task ReconnectAsync()
@@ -285,12 +298,13 @@
 
     public async ValueTask DisposeAsync()
     {
-        // Drain BOTH timers first so an in-flight callback can't invoke StateHasChanged on
-        // a component whose hub has already been released. System.Threading.Timer's async
-        // dispose awaits any in-flight callback (.NET 6+).
+        // Unsubscribe first so the singleton store can't invoke a handler on a disposed component.
+        StatusStore.SnapshotChanged -= OnSnapshotChanged;
+        // Drain BOTH timers so an in-flight callback can't invoke StateHasChanged on a component
+        // that's already gone. System.Threading.Timer's async dispose awaits any in-flight
+        // callback (.NET 6+).
         if (_timer is not null) await _timer.DisposeAsync();
         if (_opResultClearTimer is not null) await _opResultClearTimer.DisposeAsync();
-        if (_hub is not null) await _hub.DisposeAsync();
     }
 
     // Map DriverState string → chip CSS class using the 4 defined theme variants.

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Components/Shared/Drivers/Pickers/GalaxyAddressPickerBody.razor

@@ -126,7 +126,7 @@
         try
         {
             var json = GetConfigJson() ?? "{}";
-            var result = await BrowserService.OpenAsync("Galaxy", json, default);
+            var result = await BrowserService.OpenAsync("GalaxyMxGateway", json, default);
             if (result.Ok) _token = result.Token;
             else _openError = result.Message;
         }

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Hubs/AlertSignalRBridge.cs

@@ -17,22 +17,26 @@ public sealed class AlertSignalRBridge : ReceiveActor
     public const string TopicName = "alerts";
 
     private readonly IHubContext<AlertHub> _hub;
+    private readonly IInProcessBroadcaster<AlarmTransitionEvent> _broadcaster;
     private readonly ILoggingAdapter _log = Context.GetLogger();
 
     /// <summary>
     /// Creates actor props for the AlertSignalRBridge.
     /// </summary>
     /// <param name="hub">The SignalR hub context to send alerts to.</param>
-    public static Props Props(IHubContext<AlertHub> hub) =>
-        Akka.Actor.Props.Create(() => new AlertSignalRBridge(hub));
+    /// <param name="broadcaster">In-process fan-out read directly by the Blazor Server Alerts page.</param>
+    public static Props Props(IHubContext<AlertHub> hub, IInProcessBroadcaster<AlarmTransitionEvent> broadcaster) =>
+        Akka.Actor.Props.Create(() => new AlertSignalRBridge(hub, broadcaster));
 
     /// <summary>
     /// Initializes a new instance of the AlertSignalRBridge actor.
     /// </summary>
     /// <param name="hub">The SignalR hub context to send alerts to.</param>
-    public AlertSignalRBridge(IHubContext<AlertHub> hub)
+    /// <param name="broadcaster">In-process fan-out read directly by the Blazor Server Alerts page.</param>
+    public AlertSignalRBridge(IHubContext<AlertHub> hub, IInProcessBroadcaster<AlarmTransitionEvent> broadcaster)
     {
         _hub = hub;
+        _broadcaster = broadcaster;
         ReceiveAsync<AlarmTransitionEvent>(ForwardAsync);
         Receive<SubscribeAck>(_ => { /* DPS confirmation */ });
     }
@@ -43,6 +47,9 @@ public sealed class AlertSignalRBridge : ReceiveActor
 
     private async Task ForwardAsync(AlarmTransitionEvent msg)
     {
+        // In-process fan-out first — this is what the Blazor Server Alerts page reads. The hub push
+        // is kept for any out-of-process (e.g. WASM) SignalR client.
+        _broadcaster.Publish(msg);
         try
         {
             await _hub.Clients.All.SendAsync(AlertHub.MethodName, msg);

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Hubs/HubServiceCollectionExtensions.cs

@@ -13,14 +13,21 @@ public static class HubServiceCollectionExtensions
     public const string DriverStatusSignalRBridgeName = "driver-status-signalr-bridge";
 
     /// <summary>
-    ///     Registers services required by the driver-status hub pipeline:
-    ///     <see cref="IDriverStatusSnapshotStore"/> as a singleton backed by
-    ///     <see cref="InMemoryDriverStatusSnapshotStore"/>.
+    ///     Registers the in-process live-push services the AdminUI's Blazor Server panels read
+    ///     directly (instead of self-connecting a SignalR <c>HubConnection</c>, which fails behind a
+    ///     reverse proxy — see <see cref="IInProcessBroadcaster{T}"/>):
+    ///     <list type="bullet">
+    ///       <item><see cref="IDriverStatusSnapshotStore"/> — last-value snapshot per driver.</item>
+    ///       <item><see cref="IInProcessBroadcaster{T}"/> — append-stream fan-out (alarm
+    ///       transitions, script-log lines). Registered as an open generic so each closed type
+    ///       resolves to its own singleton shared by the bridge actor and the consuming component.</item>
+    ///     </list>
     /// </summary>
     /// <param name="services">The service collection.</param>
     public static IServiceCollection AddOtOpcUaDriverStatusServices(this IServiceCollection services)
     {
         services.AddSingleton<IDriverStatusSnapshotStore, InMemoryDriverStatusSnapshotStore>();
+        services.AddSingleton(typeof(IInProcessBroadcaster<>), typeof(InProcessBroadcaster<>));
         return services;
     }
 
@@ -48,11 +55,13 @@ public static class HubServiceCollectionExtensions
             registry.Register<FleetStatusSignalRBridgeKey>(fleetBridge);
 
             var alertHub = resolver.GetService<IHubContext<AlertHub>>();
-            var alertBridge = system.ActorOf(AlertSignalRBridge.Props(alertHub), AlertSignalRBridgeName);
+            var alertBroadcaster = resolver.GetService<IInProcessBroadcaster<Commons.Messages.Alerts.AlarmTransitionEvent>>();
+            var alertBridge = system.ActorOf(AlertSignalRBridge.Props(alertHub, alertBroadcaster), AlertSignalRBridgeName);
             registry.Register<AlertSignalRBridgeKey>(alertBridge);
 
             var scriptLogHub = resolver.GetService<IHubContext<ScriptLogHub>>();
-            var scriptLogBridge = system.ActorOf(ScriptLogSignalRBridge.Props(scriptLogHub), ScriptLogSignalRBridgeName);
+            var scriptLogBroadcaster = resolver.GetService<IInProcessBroadcaster<Commons.Messages.Logging.ScriptLogEntry>>();
+            var scriptLogBridge = system.ActorOf(ScriptLogSignalRBridge.Props(scriptLogHub, scriptLogBroadcaster), ScriptLogSignalRBridgeName);
             registry.Register<ScriptLogSignalRBridgeKey>(scriptLogBridge);
 
             var driverStatusHub = resolver.GetService<IHubContext<DriverStatusHub>>();

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Hubs/IDriverStatusSnapshotStore.cs

@@ -6,10 +6,21 @@ namespace ZB.MOM.WW.OtOpcUa.AdminUI.Hubs;
 ///     Singleton last-snapshot-per-instance cache. Populated by
 ///     <c>DriverStatusSignalRBridge</c> as it forwards DPS messages; read by
 ///     <see cref="DriverStatusHub.JoinDriver"/> so newly-joined clients see current state
-///     without waiting for the next change event.
+///     without waiting for the next change event, and subscribed to directly by the Blazor
+///     Server <c>DriverStatusPanel</c> via <see cref="SnapshotChanged"/>.
 /// </summary>
 public interface IDriverStatusSnapshotStore
 {
     void Upsert(DriverHealthChanged snapshot);
     bool TryGet(string driverInstanceId, out DriverHealthChanged snapshot);
+
+    /// <summary>
+    ///     Raised after every <see cref="Upsert"/> with the just-stored snapshot. Lets in-process
+    ///     consumers (the Blazor Server <c>DriverStatusPanel</c>) receive live updates by reading
+    ///     this singleton directly instead of opening a self-targeted SignalR connection — which a
+    ///     server-side Blazor component cannot reach when the public URL (e.g. a reverse-proxy port)
+    ///     differs from the local Kestrel bind. Handlers run on the caller's thread (the bridge
+    ///     actor), so subscribers must marshal to their own sync context.
+    /// </summary>
+    event Action<DriverHealthChanged>? SnapshotChanged;
 }

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Hubs/IInProcessBroadcaster.cs

@@ -0,0 +1,41 @@
+namespace ZB.MOM.WW.OtOpcUa.AdminUI.Hubs;
+
+/// <summary>
+///     A singleton, in-process fan-out for live event streams (alarm transitions, script-log
+///     lines). A per-node SignalR bridge actor subscribes to the cluster's DistributedPubSub topic
+///     and calls <see cref="Publish"/>; Blazor Server components subscribe to <see cref="Received"/>
+///     to render the live tail.
+///     <para>
+///     This exists because the AdminUI runs as Blazor <em>Server</em>: a component opening a
+///     SignalR <c>HubConnection</c> to its own hub would dial the browser's public URL from
+///     server-side code, which is unreachable behind a reverse proxy (e.g. Traefik mapping host
+///     :9200 → container :9000) and so fails with "Connection refused". Reading this in-process
+///     broadcaster instead avoids the network hop entirely. Mirrors the
+///     <c>IDriverStatusSnapshotStore.SnapshotChanged</c> pattern for stream (vs. last-value) feeds.
+///     </para>
+/// </summary>
+/// <typeparam name="T">The event payload type (e.g. AlarmTransitionEvent, ScriptLogEntry).</typeparam>
+public interface IInProcessBroadcaster<T>
+{
+    /// <summary>
+    ///     Raised once per <see cref="Publish"/> with the published item. Handlers run on the
+    ///     caller's thread (the bridge actor), so subscribers must marshal to their own sync
+    ///     context (Blazor's <c>InvokeAsync</c>).
+    /// </summary>
+    event Action<T>? Received;
+
+    /// <summary>Fan the item out to all current <see cref="Received"/> subscribers.</summary>
+    void Publish(T item);
+}
+
+/// <summary>Thread-safe singleton implementation of <see cref="IInProcessBroadcaster{T}"/>.</summary>
+/// <typeparam name="T">The event payload type.</typeparam>
+public sealed class InProcessBroadcaster<T> : IInProcessBroadcaster<T>
+{
+    /// <inheritdoc />
+    public event Action<T>? Received;
+
+    /// <inheritdoc />
+    // Capture-then-invoke (via ?.) so a concurrent unsubscribe can't null the delegate mid-raise.
+    public void Publish(T item) => Received?.Invoke(item);
+}

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Hubs/InMemoryDriverStatusSnapshotStore.cs

@@ -11,9 +11,16 @@ public sealed class InMemoryDriverStatusSnapshotStore : IDriverStatusSnapshotSto
 {
     private readonly ConcurrentDictionary<string, DriverHealthChanged> _byInstance = new();
 
+    /// <inheritdoc />
+    public event Action<DriverHealthChanged>? SnapshotChanged;
+
     /// <inheritdoc />
     public void Upsert(DriverHealthChanged snapshot)
-        => _byInstance[snapshot.DriverInstanceId] = snapshot;
+    {
+        _byInstance[snapshot.DriverInstanceId] = snapshot;
+        // Capture-then-invoke so a concurrent unsubscribe can't null the delegate mid-raise.
+        SnapshotChanged?.Invoke(snapshot);
+    }
 
     /// <inheritdoc />
     public bool TryGet(string driverInstanceId, out DriverHealthChanged snapshot)

src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Hubs/ScriptLogSignalRBridge.cs

@@ -15,18 +15,22 @@ public sealed class ScriptLogSignalRBridge : ReceiveActor
     public const string TopicName = "script-logs";
 
     private readonly IHubContext<ScriptLogHub> _hub;
+    private readonly IInProcessBroadcaster<ScriptLogEntry> _broadcaster;
     private readonly ILoggingAdapter _log = Context.GetLogger();
 
     /// <summary>Creates a Props instance for the ScriptLogSignalRBridge.</summary>
     /// <param name="hub">The SignalR hub context for sending messages to clients.</param>
-    public static Props Props(IHubContext<ScriptLogHub> hub) =>
-        Akka.Actor.Props.Create(() => new ScriptLogSignalRBridge(hub));
+    /// <param name="broadcaster">In-process fan-out read directly by the Blazor Server Script log page.</param>
+    public static Props Props(IHubContext<ScriptLogHub> hub, IInProcessBroadcaster<ScriptLogEntry> broadcaster) =>
+        Akka.Actor.Props.Create(() => new ScriptLogSignalRBridge(hub, broadcaster));
 
     /// <summary>Initializes a new instance of the <see cref="ScriptLogSignalRBridge"/> class.</summary>
     /// <param name="hub">The SignalR hub context for sending messages to clients.</param>
-    public ScriptLogSignalRBridge(IHubContext<ScriptLogHub> hub)
+    /// <param name="broadcaster">In-process fan-out read directly by the Blazor Server Script log page.</param>
+    public ScriptLogSignalRBridge(IHubContext<ScriptLogHub> hub, IInProcessBroadcaster<ScriptLogEntry> broadcaster)
     {
         _hub = hub;
+        _broadcaster = broadcaster;
         ReceiveAsync<ScriptLogEntry>(ForwardAsync);
         Receive<SubscribeAck>(_ => { /* DPS confirmation */ });
     }
@@ -37,6 +41,9 @@ public sealed class ScriptLogSignalRBridge : ReceiveActor
 
     private async Task ForwardAsync(ScriptLogEntry msg)
     {
+        // In-process fan-out first — this is what the Blazor Server Script log page reads. The hub
+        // push is kept for any out-of-process (e.g. WASM) SignalR client.
+        _broadcaster.Publish(msg);
         try
         {
             await _hub.Clients.All.SendAsync(ScriptLogHub.MethodName, msg);

src/Server/ZB.MOM.WW.OtOpcUa.Host/Drivers/DriverFactoryBootstrap.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Core.Hosting;
@@ -23,8 +24,10 @@ using HistorianProbe = Driver.Historian.Wonderware.Client.WonderwareHistorianDri
 ///     over it. Replaces the F7 seam's <c>NullDriverFactory</c> default so deploys actually
 ///     materialise real <see cref="IDriver"/> instances on driver-role nodes.
 ///
-///     Skipped entirely on admin-only nodes — they never run drivers, so the registry doesn't
-///     need to exist (Program.cs guards via the <c>hasDriver</c> flag).
+///     The factory registry is skipped on admin-only nodes — they never run drivers, so it doesn't
+///     need to exist (Program.cs guards via the <c>hasDriver</c> flag). The driver <em>probe</em>
+///     set is the exception: it backs the AdminUI Test Connect button and so must also be wired on
+///     admin nodes — see <see cref="AddOtOpcUaDriverProbes"/>.
 /// </summary>
 public static class DriverFactoryBootstrap
 {
@@ -46,16 +49,42 @@ public static class DriverFactoryBootstrap
         services.AddSingleton<IDriverFactory>(sp =>
             new DriverFactoryRegistryAdapter(sp.GetRequiredService<DriverFactoryRegistry>()));
 
-        // One IDriverProbe per driver type — wired into AdminOperationsActor via DI enumeration.
-        services.AddSingleton<IDriverProbe, ModbusProbe>();
-        services.AddSingleton<IDriverProbe, AbCipProbe>();
-        services.AddSingleton<IDriverProbe, AbLegacyProbe>();
-        services.AddSingleton<IDriverProbe, S7Probe>();
-        services.AddSingleton<IDriverProbe, TwinCATProbe>();
-        services.AddSingleton<IDriverProbe, FocasProbe>();
-        services.AddSingleton<IDriverProbe, OpcUaProbe>();
-        services.AddSingleton<IDriverProbe, GalaxyProbe>();
-        services.AddSingleton<IDriverProbe, HistorianProbe>();
+        // Driver nodes also carry the probe set so a fused admin,driver node has it; the admin-only
+        // case is covered by Program.cs calling AddOtOpcUaDriverProbes() in the hasAdmin block.
+        services.AddOtOpcUaDriverProbes();
+
+        return services;
+    }
+
+    /// <summary>
+    ///     Register one <see cref="IDriverProbe"/> per driver type. These back the AdminUI's
+    ///     "Test Connect" button: the <c>admin-operations</c> cluster singleton resolves
+    ///     <see cref="IEnumerable{T}"/> of <see cref="IDriverProbe"/> and dispatches by DriverType.
+    ///     <para>
+    ///     That singleton is role-pinned to <c>admin</c>, so this MUST be wired on admin nodes —
+    ///     including admin-only nodes that lack the <c>driver</c> role (e.g. the MAIN cluster's
+    ///     admin-a/admin-b). Probes are lightweight (cheap connect, no persistent state) and don't
+    ///     need the driver-factory registry, so they register independently of
+    ///     <see cref="AddOtOpcUaDriverFactories"/>.
+    ///     </para>
+    ///     <para>
+    ///     Uses <c>TryAddEnumerable</c> so a fused admin,driver node — which reaches this from both
+    ///     the driver-factory path and the admin path — registers each probe exactly once. A
+    ///     duplicate would make the singleton's <c>ToDictionary(p =&gt; p.DriverType)</c> throw.
+    ///     </para>
+    /// </summary>
+    /// <param name="services">The service collection to register driver probes with.</param>
+    public static IServiceCollection AddOtOpcUaDriverProbes(this IServiceCollection services)
+    {
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IDriverProbe, ModbusProbe>());
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IDriverProbe, AbCipProbe>());
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IDriverProbe, AbLegacyProbe>());
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IDriverProbe, S7Probe>());
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IDriverProbe, TwinCATProbe>());
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IDriverProbe, FocasProbe>());
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IDriverProbe, OpcUaProbe>());
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IDriverProbe, GalaxyProbe>());
+        services.TryAddEnumerable(ServiceDescriptor.Singleton<IDriverProbe, HistorianProbe>());
 
         return services;
     }

src/Server/ZB.MOM.WW.OtOpcUa.Host/Program.cs

@@ -122,6 +122,11 @@ if (hasAdmin)
     // Auth + AdminUI surface only mounted on admin-role nodes. Driver-only nodes have no UI.
     builder.Services.AddOtOpcUaAuth(builder.Configuration);
     builder.Services.AddAdminUI();
+    // Test Connect probes back the AdminUI driver pages. The admin-operations singleton (role-pinned
+    // to admin) resolves IEnumerable<IDriverProbe>, so admin-only nodes — which skip the hasDriver
+    // block above — must wire the probe set here too, or every Test Connect returns "No probe
+    // registered". Idempotent on fused admin,driver nodes (TryAddEnumerable de-dups).
+    builder.Services.AddOtOpcUaDriverProbes();
     // Flow AuthenticationState through cascading parameters so <AuthorizeView/> works
     // inside interactive components (NavSidebar's session block).
     builder.Services.AddCascadingAuthenticationState();

tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftValidatorTests.cs

@@ -122,15 +122,45 @@ public sealed class DraftValidatorTests
         DraftValidator.Validate(draft).ShouldContain(e => e.Code == "EquipmentIdNotDerived");
     }
 
-    /// <summary>Verifies that Galaxy driver cannot be placed in Equipment namespace.</summary>
+    /// <summary>Verifies that the canonical Galaxy driver type (GalaxyMxGateway, per PR 7.2 —
+    /// it was "Galaxy" pre-PR-7.2) is allowed in a SystemPlatform namespace, i.e. produces no
+    /// kind-mismatch error.</summary>
     [Fact]
-    public void Galaxy_driver_in_Equipment_namespace_is_rejected()
+    public void GalaxyMxGateway_driver_in_SystemPlatform_namespace_is_allowed()
+    {
+        var draft = new DraftSnapshot
+        {
+            GenerationId = 1, ClusterId = "c",
+            Namespaces = [new Namespace { NamespaceId = "ns-1", ClusterId = "c", NamespaceUri = "urn:x", Kind = NamespaceKind.SystemPlatform }],
+            DriverInstances = [new DriverInstance { DriverInstanceId = "d-1", ClusterId = "c", NamespaceId = "ns-1", Name = "drv", DriverType = "GalaxyMxGateway", DriverConfig = "{}" }],
+        };
+
+        DraftValidator.Validate(draft).ShouldNotContain(e => e.Code == "DriverNamespaceKindMismatch");
+    }
+
+    /// <summary>Verifies that the canonical Galaxy driver type cannot be placed in an Equipment namespace.</summary>
+    [Fact]
+    public void GalaxyMxGateway_driver_in_Equipment_namespace_is_rejected()
     {
         var draft = new DraftSnapshot
         {
             GenerationId = 1, ClusterId = "c",
             Namespaces = [new Namespace { NamespaceId = "ns-1", ClusterId = "c", NamespaceUri = "urn:x", Kind = NamespaceKind.Equipment }],
-            DriverInstances = [new DriverInstance { DriverInstanceId = "d-1", ClusterId = "c", NamespaceId = "ns-1", Name = "drv", DriverType = "Galaxy", DriverConfig = "{}" }],
+            DriverInstances = [new DriverInstance { DriverInstanceId = "d-1", ClusterId = "c", NamespaceId = "ns-1", Name = "drv", DriverType = "GalaxyMxGateway", DriverConfig = "{}" }],
+        };
+
+        DraftValidator.Validate(draft).ShouldContain(e => e.Code == "DriverNamespaceKindMismatch");
+    }
+
+    /// <summary>Verifies that a non-Galaxy driver cannot be placed in a SystemPlatform namespace.</summary>
+    [Fact]
+    public void NonGalaxy_driver_in_SystemPlatform_namespace_is_rejected()
+    {
+        var draft = new DraftSnapshot
+        {
+            GenerationId = 1, ClusterId = "c",
+            Namespaces = [new Namespace { NamespaceId = "ns-1", ClusterId = "c", NamespaceUri = "urn:x", Kind = NamespaceKind.SystemPlatform }],
+            DriverInstances = [new DriverInstance { DriverInstanceId = "d-1", ClusterId = "c", NamespaceId = "ns-1", Name = "drv", DriverType = "ModbusTcp", DriverConfig = "{}" }],
         };
 
         DraftValidator.Validate(draft).ShouldContain(e => e.Code == "DriverNamespaceKindMismatch");
@@ -145,7 +175,7 @@ public sealed class DraftValidatorTests
         {
             GenerationId = 1, ClusterId = "c-A",
             Namespaces = [new Namespace { NamespaceId = "ns-1", ClusterId = "c-B", NamespaceUri = "urn:x", Kind = NamespaceKind.Equipment }],
-            DriverInstances = [new DriverInstance { DriverInstanceId = "d-1", ClusterId = "c-A", NamespaceId = "ns-1", Name = "drv", DriverType = "Galaxy", DriverConfig = "{}" }],
+            DriverInstances = [new DriverInstance { DriverInstanceId = "d-1", ClusterId = "c-A", NamespaceId = "ns-1", Name = "drv", DriverType = "GalaxyMxGateway", DriverConfig = "{}" }],
             Equipment = [new Equipment { EquipmentUuid = uuid, EquipmentId = "EQ-wrong", Name = "BAD NAME", DriverInstanceId = "d-1", UnsLineId = "line-a", MachineCode = "m" }],
         };
 

tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli.Tests/S7CommandBaseBuildOptionsTests.cs

@@ -2,8 +2,8 @@ using CliFx.Attributes;
 using CliFx.Infrastructure;
 using Shouldly;
 using Xunit;
+using ZB.MOM.WW.OtOpcUa.Driver.S7;
 using ZB.MOM.WW.OtOpcUa.Driver.S7.Cli;
-using S7NetCpuType = global::S7.Net.CpuType;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.S7.Cli.Tests;
 
@@ -41,7 +41,7 @@ public sealed class S7CommandBaseBuildOptionsTests
         {
             Host = "10.0.0.5",
             Port = 102,
-            CpuType = S7NetCpuType.S71500,
+            CpuType = S7CpuType.S71500,
             Rack = 0,
             Slot = 0,
             TimeoutMs = 5000,
@@ -72,7 +72,7 @@ public sealed class S7CommandBaseBuildOptionsTests
         {
             Host = "plc.shop.local",
             Port = 4102,
-            CpuType = S7NetCpuType.S7300,
+            CpuType = S7CpuType.S7300,
             Rack = 1,
             Slot = 2,
             TimeoutMs = 3000,
@@ -82,7 +82,7 @@ public sealed class S7CommandBaseBuildOptionsTests
 
         options.Host.ShouldBe("plc.shop.local");
         options.Port.ShouldBe(4102);
-        options.CpuType.ShouldBe(S7NetCpuType.S7300);
+        options.CpuType.ShouldBe(S7CpuType.S7300);
         options.Rack.ShouldBe((short)1);
         options.Slot.ShouldBe((short)2);
     }

tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Browser.Tests/GalaxyDriverBrowserTests.cs

@@ -16,10 +16,10 @@ public sealed class GalaxyDriverBrowserTests
 {
     private readonly GalaxyDriverBrowser _sut = new();
 
-    /// <summary>The DriverType key must match the AdminUI's persisted "Galaxy" value
+    /// <summary>The DriverType key must match the AdminUI's persisted "GalaxyMxGateway" value
     /// so the factory wire-up picks the right browser implementation.</summary>
     [Fact]
-    public void DriverType_is_Galaxy() => _sut.DriverType.ShouldBe("Galaxy");
+    public void DriverType_is_GalaxyMxGateway() => _sut.DriverType.ShouldBe("GalaxyMxGateway");
 
     /// <summary>An empty Gateway.Endpoint must fail fast with a clear, endpoint-mentioning
     /// message rather than surfacing a downstream gRPC URI parse error.</summary>

tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/DriverStatusSnapshotStoreTests.cs

@@ -0,0 +1,59 @@
+using Shouldly;
+using Xunit;
+using ZB.MOM.WW.OtOpcUa.AdminUI.Hubs;
+using ZB.MOM.WW.OtOpcUa.Commons.Messages.Drivers;
+
+namespace ZB.MOM.WW.OtOpcUa.AdminUI.Tests;
+
+/// <summary>
+///     Covers the in-process push contract the Blazor Server <c>DriverStatusPanel</c> relies on:
+///     <see cref="IDriverStatusSnapshotStore.SnapshotChanged"/> fires on every
+///     <see cref="IDriverStatusSnapshotStore.Upsert"/>, and <c>TryGet</c> returns the latest.
+///     The panel subscribes to this store directly instead of opening a self-targeted SignalR
+///     connection (which a server-side component can't reach behind a reverse proxy).
+/// </summary>
+public sealed class DriverStatusSnapshotStoreTests
+{
+    private static DriverHealthChanged Snap(string instance, string state = "Healthy") =>
+        new("MAIN", instance, state, null, null, 0, new DateTime(2026, 5, 29, 0, 0, 0, DateTimeKind.Utc));
+
+    [Fact]
+    public void Upsert_raises_SnapshotChanged_with_the_stored_snapshot()
+    {
+        var store = new InMemoryDriverStatusSnapshotStore();
+        var received = new List<DriverHealthChanged>();
+        store.SnapshotChanged += received.Add;
+
+        var snap = Snap("drv-1", "Faulted");
+        store.Upsert(snap);
+
+        received.Count.ShouldBe(1);
+        received[0].ShouldBeSameAs(snap);
+    }
+
+    [Fact]
+    public void Upsert_then_TryGet_returns_the_latest_snapshot()
+    {
+        var store = new InMemoryDriverStatusSnapshotStore();
+        store.Upsert(Snap("drv-1", "Healthy"));
+        store.Upsert(Snap("drv-1", "Degraded"));
+
+        store.TryGet("drv-1", out var latest).ShouldBeTrue();
+        latest.State.ShouldBe("Degraded");
+    }
+
+    [Fact]
+    public void Unsubscribed_handler_stops_receiving_after_removal()
+    {
+        var store = new InMemoryDriverStatusSnapshotStore();
+        var count = 0;
+        void Handler(DriverHealthChanged _) => count++;
+
+        store.SnapshotChanged += Handler;
+        store.Upsert(Snap("drv-1"));
+        store.SnapshotChanged -= Handler;
+        store.Upsert(Snap("drv-1"));
+
+        count.ShouldBe(1);
+    }
+}

tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/GalaxyDriverPageFormSerializationTests.cs

@@ -2,18 +2,29 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using Shouldly;
 using Xunit;
+using ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Config;
 
 namespace ZB.MOM.WW.OtOpcUa.AdminUI.Tests;
 
 public sealed class GalaxyDriverPageFormSerializationTests
 {
+    // Matches GalaxyDriverPage._jsonOpts (camelCase, no PropertyNameCaseInsensitive).
     private static readonly JsonSerializerOptions _opts = new()
     {
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
         WriteIndented = false,
     };
 
+    // Matches the page's _jsonOpts exactly: camelCase + case-insensitive read + UnmappedMemberHandling.Skip.
+    private static readonly JsonSerializerOptions _pageOpts = new()
+    {
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+        PropertyNameCaseInsensitive = true,
+        UnmappedMemberHandling = JsonUnmappedMemberHandling.Skip,
+        WriteIndented = false,
+    };
+
     [Fact]
     public void RoundTrip_PreservesKnownFields()
     {
@@ -92,4 +103,135 @@ public sealed class GalaxyDriverPageFormSerializationTests
         back.ProbeTimeoutSeconds.ShouldBe(20);
         back.Gateway.Endpoint.ShouldBe("https://localhost:5001");
     }
+
+    /// <summary>
+    ///     Regression test: the seed SQL stores PascalCase JSON. With
+    ///     <c>PropertyNameCaseInsensitive = true</c> the page must read the real values, not
+    ///     fall back to defaults. FAILS against case-sensitive opts; PASSES with the fix.
+    /// </summary>
+    [Fact]
+    public void Seeded_pascalcase_config_loads_real_values()
+    {
+        // Exact JSON from docker-dev/seed/seed-clusters.sql (lines 130-151).
+        var seededJson = """
+            {
+              "Gateway": {
+                "Endpoint": "http://10.100.0.48:5120",
+                "ApiKeySecretRef": "env:GALAXY_MXGW_API_KEY",
+                "UseTls": false,
+                "ConnectTimeoutSeconds": 10,
+                "DefaultCallTimeoutSeconds": 30
+              },
+              "MxAccess": {
+                "ClientName": "OtOpcUa-MAIN-docker-dev",
+                "PublishingIntervalMs": 1000
+              },
+              "Repository": {
+                "DiscoverPageSize": 5000,
+                "WatchDeployEvents": true
+              },
+              "Reconnect": {
+                "InitialBackoffMs": 500,
+                "MaxBackoffMs": 30000,
+                "ReplayOnSessionLost": true
+              }
+            }
+            """;
+
+        // Deserialize with page-mirrored opts (camelCase + case-insensitive, as fixed).
+        var driverOpts = JsonSerializer.Deserialize<GalaxyDriverOptions>(seededJson, _pageOpts);
+        driverOpts.ShouldNotBeNull();
+
+        var form = GalaxyDriverPage.GalaxyFormModel.FromRecord(driverOpts!);
+
+        // Assert REAL seeded values — not defaults.
+        form.GatewayEndpoint.ShouldBe("http://10.100.0.48:5120");
+        form.GatewayApiKeySecretRef.ShouldBe("env:GALAXY_MXGW_API_KEY");
+        form.GatewayUseTls.ShouldBeFalse();
+        form.MxClientName.ShouldBe("OtOpcUa-MAIN-docker-dev");
+        form.RepositoryDiscoverPageSize.ShouldBe(5000);
+        form.ReconnectInitialBackoffMs.ShouldBe(500);
+    }
+
+    /// <summary>
+    ///     Defence-in-depth: a config that genuinely OMITS a section (no Reconnect key at all)
+    ///     must not throw — <see cref="GalaxyDriverPage.GalaxyFormModel.FromRecord"/> must
+    ///     null-coalesce the missing section to its default value.
+    /// </summary>
+    [Fact]
+    public void FromRecord_with_omitted_section_uses_defaults()
+    {
+        // Only gateway section present — Reconnect intentionally absent.
+        var partialJson = """
+            {
+              "gateway": {
+                "endpoint": "opc://x",
+                "apiKeySecretRef": "env:K"
+              }
+            }
+            """;
+
+        var driverOpts = JsonSerializer.Deserialize<GalaxyDriverOptions>(partialJson, _pageOpts);
+        driverOpts.ShouldNotBeNull();
+
+        // FromRecord must not throw even though Reconnect (and other sections) is null.
+        var form = Should.NotThrow(() => GalaxyDriverPage.GalaxyFormModel.FromRecord(driverOpts!));
+
+        // Omitted Reconnect section falls back to GalaxyReconnectOptions() defaults.
+        var defaultRc = new GalaxyReconnectOptions();
+        form.ReconnectInitialBackoffMs.ShouldBe(defaultRc.InitialBackoffMs);
+        form.ReconnectMaxBackoffMs.ShouldBe(defaultRc.MaxBackoffMs);
+        form.ReconnectReplayOnSessionLost.ShouldBe(defaultRc.ReplayOnSessionLost);
+    }
+
+    /// <summary>
+    ///     Confirms that <see cref="GalaxyDriverPage.GalaxyFormModel.FromRecord"/> still
+    ///     round-trips correctly when all nested records are populated (non-regressed path).
+    /// </summary>
+    [Fact]
+    public void FromRecord_with_fully_populated_options_round_trips()
+    {
+        var original = new GalaxyDriverOptions(
+            Gateway: new GalaxyGatewayOptions(
+                Endpoint: "https://gw.example.com:5001",
+                ApiKeySecretRef: "env:MY_KEY",
+                UseTls: true,
+                CaCertificatePath: null,
+                ConnectTimeoutSeconds: 12,
+                DefaultCallTimeoutSeconds: 40,
+                StreamTimeoutSeconds: 0),
+            MxAccess: new GalaxyMxAccessOptions(
+                ClientName: "OtOpcUa-Test",
+                PublishingIntervalMs: 750,
+                WriteUserId: 2,
+                EventPumpChannelCapacity: 25_000),
+            Repository: new GalaxyRepositoryOptions(
+                DiscoverPageSize: 3000,
+                WatchDeployEvents: false),
+            Reconnect: new GalaxyReconnectOptions(
+                InitialBackoffMs: 800,
+                MaxBackoffMs: 45_000,
+                ReplayOnSessionLost: false))
+        {
+            ProbeTimeoutSeconds = 20,
+        };
+
+        var form = GalaxyDriverPage.GalaxyFormModel.FromRecord(original);
+
+        form.GatewayEndpoint.ShouldBe("https://gw.example.com:5001");
+        form.GatewayApiKeySecretRef.ShouldBe("env:MY_KEY");
+        form.GatewayUseTls.ShouldBeTrue();
+        form.GatewayConnectTimeoutSeconds.ShouldBe(12);
+        form.GatewayDefaultCallTimeoutSeconds.ShouldBe(40);
+        form.MxClientName.ShouldBe("OtOpcUa-Test");
+        form.MxPublishingIntervalMs.ShouldBe(750);
+        form.MxWriteUserId.ShouldBe(2);
+        form.MxEventPumpChannelCapacity.ShouldBe(25_000);
+        form.RepositoryDiscoverPageSize.ShouldBe(3000);
+        form.RepositoryWatchDeployEvents.ShouldBeFalse();
+        form.ReconnectInitialBackoffMs.ShouldBe(800);
+        form.ReconnectMaxBackoffMs.ShouldBe(45_000);
+        form.ReconnectReplayOnSessionLost.ShouldBeFalse();
+        form.ProbeTimeoutSeconds.ShouldBe(20);
+    }
 }

tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/InProcessBroadcasterTests.cs

@@ -0,0 +1,51 @@
+using Shouldly;
+using Xunit;
+using ZB.MOM.WW.OtOpcUa.AdminUI.Hubs;
+
+namespace ZB.MOM.WW.OtOpcUa.AdminUI.Tests;
+
+/// <summary>
+///     Covers the in-process fan-out the Blazor Server Alerts / Script log pages rely on:
+///     <see cref="IInProcessBroadcaster{T}.Publish"/> raises <c>Received</c> for every current
+///     subscriber, and unsubscribing stops delivery. These pages read this broadcaster directly
+///     instead of opening a self-targeted SignalR connection (unreachable behind a reverse proxy).
+/// </summary>
+public sealed class InProcessBroadcasterTests
+{
+    [Fact]
+    public void Publish_raises_Received_for_all_current_subscribers()
+    {
+        var broadcaster = new InProcessBroadcaster<string>();
+        var a = new List<string>();
+        var b = new List<string>();
+        broadcaster.Received += a.Add;
+        broadcaster.Received += b.Add;
+
+        broadcaster.Publish("evt-1");
+
+        a.ShouldBe(["evt-1"]);
+        b.ShouldBe(["evt-1"]);
+    }
+
+    [Fact]
+    public void Unsubscribed_handler_stops_receiving()
+    {
+        var broadcaster = new InProcessBroadcaster<string>();
+        var received = new List<string>();
+        void Handler(string s) => received.Add(s);
+
+        broadcaster.Received += Handler;
+        broadcaster.Publish("first");
+        broadcaster.Received -= Handler;
+        broadcaster.Publish("second");
+
+        received.ShouldBe(["first"]);
+    }
+
+    [Fact]
+    public void Publish_with_no_subscribers_does_not_throw()
+    {
+        var broadcaster = new InProcessBroadcaster<int>();
+        Should.NotThrow(() => broadcaster.Publish(42));
+    }
+}

tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests/DriverProbeRegistrationTests.cs

@@ -0,0 +1,69 @@
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Xunit;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+using ZB.MOM.WW.OtOpcUa.Host.Drivers;
+
+namespace ZB.MOM.WW.OtOpcUa.Host.IntegrationTests;
+
+/// <summary>
+///     Guards the Test Connect wiring contract: every driver type editable in the AdminUI must have
+///     a registered <see cref="IDriverProbe"/>, resolvable from the same DI container that hosts the
+///     <c>admin-operations</c> cluster singleton. The singleton is role-pinned to <c>admin</c>, so on
+///     a split-role deployment (the MAIN cluster's admin-only nodes) the probes must be wired by the
+///     admin path — not only the driver path — or every Test Connect button returns
+///     "No probe registered for driver type X".
+/// </summary>
+public sealed class DriverProbeRegistrationTests
+{
+    // The canonical "all drivers" set — one entry per AdminUI typed driver page's DriverTypeKey.
+    // Keep in sync with the DriverTypeKey constants in
+    // src/Server/.../Components/Pages/Clusters/Drivers/*DriverPage.razor.
+    private static readonly string[] AdminUiDriverTypeKeys =
+    [
+        "ModbusTcp",
+        "AbCip",
+        "AbLegacy",
+        "S7",
+        "TwinCat",               // page key; probe reports "TwinCAT" — must resolve case-insensitively
+        "Focas",                 // page key; probe reports "FOCAS"  — must resolve case-insensitively
+        "OpcUaClient",
+        "GalaxyMxGateway",
+        "Historian.Wonderware",
+    ];
+
+    [Fact]
+    public void AddOtOpcUaDriverProbes_registers_a_probe_for_every_AdminUI_driver_type()
+    {
+        var services = new ServiceCollection();
+        services.AddOtOpcUaDriverProbes();
+
+        using var sp = services.BuildServiceProvider();
+        var probes = sp.GetServices<IDriverProbe>().ToList();
+
+        // No duplicate DriverType — AdminOperationsActor builds a dictionary keyed by DriverType
+        // (case-insensitive) and would throw on a duplicate key, crashing the singleton.
+        var byType = probes.ToDictionary(p => p.DriverType, StringComparer.OrdinalIgnoreCase);
+
+        foreach (var key in AdminUiDriverTypeKeys)
+            byType.ContainsKey(key).ShouldBeTrue($"No IDriverProbe registered for AdminUI driver type '{key}'.");
+    }
+
+    [Fact]
+    public void AddOtOpcUaDriverProbes_is_idempotent()
+    {
+        // A fused admin,driver node calls the registration from both the driver-factory path and the
+        // admin path. TryAddEnumerable must de-dup so the probe set stays unique (else the actor's
+        // ToDictionary throws).
+        var services = new ServiceCollection();
+        services.AddOtOpcUaDriverProbes();
+        services.AddOtOpcUaDriverProbes();
+
+        using var sp = services.BuildServiceProvider();
+        var probes = sp.GetServices<IDriverProbe>().ToList();
+
+        var distinctTypes = probes.Select(p => p.DriverType).Distinct(StringComparer.OrdinalIgnoreCase).Count();
+        probes.Count.ShouldBe(distinctTypes, "Duplicate IDriverProbe registrations — TryAddEnumerable should de-dup.");
+        distinctTypes.ShouldBe(AdminUiDriverTypeKeys.Length);
+    }
+}

tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/DeferredAddressSpaceSinkTests.cs

@@ -84,6 +84,9 @@ public sealed class DeferredAddressSpaceSinkTests
         public void EnsureFolder(string folderNodeId, string? parentNodeId, string displayName)
             => CallQueue.Enqueue($"EF:{folderNodeId}");
         /// <inheritdoc />
+        public void EnsureVariable(string variableNodeId, string? parentFolderNodeId, string displayName, string dataType)
+            => CallQueue.Enqueue($"EV:{variableNodeId}");
+        /// <inheritdoc />
         public void RebuildAddressSpace() => CallQueue.Enqueue("RB");
     }
 }

tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/Phase7ApplierHierarchyTests.cs

@@ -34,7 +34,8 @@ public sealed class Phase7ApplierHierarchyTests : IDisposable
             UnsLines: new[] { new UnsLineProjection("line-1", "area-1", "Cell A") },
             EquipmentNodes: new[] { new EquipmentNode("eq-1", "Pump-1", "line-1") },
             DriverInstancePlans: Array.Empty<DriverInstancePlan>(),
-            ScriptedAlarmPlans: Array.Empty<ScriptedAlarmPlan>());
+            ScriptedAlarmPlans: Array.Empty<ScriptedAlarmPlan>(),
+            GalaxyTags: Array.Empty<GalaxyTagPlan>());
 
         applier.MaterialiseHierarchy(composition);
 
@@ -57,7 +58,8 @@ public sealed class Phase7ApplierHierarchyTests : IDisposable
             UnsLines: Array.Empty<UnsLineProjection>(),
             EquipmentNodes: new[] { new EquipmentNode("eq-orphan", "Orphan", UnsLineId: "") },
             DriverInstancePlans: Array.Empty<DriverInstancePlan>(),
-            ScriptedAlarmPlans: Array.Empty<ScriptedAlarmPlan>());
+            ScriptedAlarmPlans: Array.Empty<ScriptedAlarmPlan>(),
+            GalaxyTags: Array.Empty<GalaxyTagPlan>());
 
         applier.MaterialiseHierarchy(composition);
 
@@ -91,7 +93,8 @@ public sealed class Phase7ApplierHierarchyTests : IDisposable
             UnsLines: new[] { new UnsLineProjection("line-1", "area-A", "Line 1") },
             EquipmentNodes: new[] { new EquipmentNode("eq-1", "Eq 1", "line-1"), new EquipmentNode("eq-2", "Eq 2", "line-1") },
             DriverInstancePlans: Array.Empty<DriverInstancePlan>(),
-            ScriptedAlarmPlans: Array.Empty<ScriptedAlarmPlan>()));
+            ScriptedAlarmPlans: Array.Empty<ScriptedAlarmPlan>(),
+            GalaxyTags: Array.Empty<GalaxyTagPlan>()));
 
         sdkServer.NodeManager!.FolderCount.ShouldBe(5); // 2 areas + 1 line + 2 equipment
 
@@ -101,7 +104,8 @@ public sealed class Phase7ApplierHierarchyTests : IDisposable
             UnsLines: new[] { new UnsLineProjection("line-1", "area-A", "Line 1") },
             EquipmentNodes: new[] { new EquipmentNode("eq-1", "Eq 1", "line-1"), new EquipmentNode("eq-2", "Eq 2", "line-1") },
             DriverInstancePlans: Array.Empty<DriverInstancePlan>(),
-            ScriptedAlarmPlans: Array.Empty<ScriptedAlarmPlan>()));
+            ScriptedAlarmPlans: Array.Empty<ScriptedAlarmPlan>(),
+            GalaxyTags: Array.Empty<GalaxyTagPlan>()));
 
         sdkServer.NodeManager!.FolderCount.ShouldBe(5);
     }
@@ -149,6 +153,12 @@ public sealed class Phase7ApplierHierarchyTests : IDisposable
         /// <param name="displayName">The display name of the folder.</param>
         public void EnsureFolder(string folderNodeId, string? parentNodeId, string displayName)
             => _calls.Enqueue((folderNodeId, parentNodeId, displayName));
+        /// <summary>Ensures a variable exists (stub implementation for testing).</summary>
+        /// <param name="variableNodeId">The node ID of the variable.</param>
+        /// <param name="parentFolderNodeId">The node ID of the parent folder, or null for root.</param>
+        /// <param name="displayName">The display name of the variable.</param>
+        /// <param name="dataType">The OPC UA built-in type name.</param>
+        public void EnsureVariable(string variableNodeId, string? parentFolderNodeId, string displayName, string dataType) { }
         /// <summary>Rebuilds the address space (stub implementation for testing).</summary>
         public void RebuildAddressSpace() { }
     }

tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests/Phase7ApplierTests.cs

@@ -58,7 +58,10 @@ public sealed class Phase7ApplierTests
             ChangedDrivers: Array.Empty<Phase7Plan.DriverDelta>(),
             AddedAlarms: Array.Empty<ScriptedAlarmPlan>(),
             RemovedAlarms: Array.Empty<ScriptedAlarmPlan>(),
-            ChangedAlarms: Array.Empty<Phase7Plan.AlarmDelta>());
+            ChangedAlarms: Array.Empty<Phase7Plan.AlarmDelta>(),
+            AddedGalaxyTags: Array.Empty<GalaxyTagPlan>(),
+            RemovedGalaxyTags: Array.Empty<GalaxyTagPlan>(),
+            ChangedGalaxyTags: Array.Empty<Phase7Plan.GalaxyTagDelta>());
 
         var outcome = applier.Apply(plan);
 
@@ -89,7 +92,10 @@ public sealed class Phase7ApplierTests
             },
             AddedAlarms: Array.Empty<ScriptedAlarmPlan>(),
             RemovedAlarms: Array.Empty<ScriptedAlarmPlan>(),
-            ChangedAlarms: Array.Empty<Phase7Plan.AlarmDelta>());
+            ChangedAlarms: Array.Empty<Phase7Plan.AlarmDelta>(),
+            AddedGalaxyTags: Array.Empty<GalaxyTagPlan>(),
+            RemovedGalaxyTags: Array.Empty<GalaxyTagPlan>(),
+            ChangedGalaxyTags: Array.Empty<Phase7Plan.GalaxyTagDelta>());
 
         var outcome = applier.Apply(plan);
 
@@ -111,10 +117,102 @@ public sealed class Phase7ApplierTests
         outcome.RebuildCalled.ShouldBeTrue();
     }
 
+    /// <summary>Verifies MaterialiseGalaxyTags creates one folder per distinct FolderPath and one
+    /// variable per tag, with root-level tags hung directly under the namespace root.</summary>
+    [Fact]
+    public void MaterialiseGalaxyTags_creates_folder_per_distinct_path_and_variable_per_tag()
+    {
+        var sink = new RecordingSink();
+        var applier = new Phase7Applier(sink, NullLogger<Phase7Applier>.Instance);
+
+        var composition = new Phase7CompositionResult(
+            UnsAreas: Array.Empty<UnsAreaProjection>(),
+            UnsLines: Array.Empty<UnsLineProjection>(),
+            EquipmentNodes: Array.Empty<EquipmentNode>(),
+            DriverInstancePlans: Array.Empty<DriverInstancePlan>(),
+            ScriptedAlarmPlans: Array.Empty<ScriptedAlarmPlan>(),
+            GalaxyTags: new[]
+            {
+                new GalaxyTagPlan("t1", "drv", "section.area", "Temperature", "Float", "section.area.Temperature"),
+                new GalaxyTagPlan("t2", "drv", "", "Pressure", "Int32", "Pressure"),
+            });
+
+        applier.MaterialiseGalaxyTags(composition);
+
+        // One folder for the single distinct non-empty FolderPath; the root-level tag adds none.
+        sink.FolderCalls.ShouldHaveSingleItem().ShouldBe(("section.area", null, "section.area"));
+
+        // Foldered tag → NodeId is its MxAccessRef under the FolderPath parent.
+        // Root-level tag → NodeId is its DisplayName under the root (null parent).
+        sink.VariableCalls.ShouldContain(("section.area.Temperature", "section.area", "Temperature", "Float"));
+        sink.VariableCalls.ShouldContain(("Pressure", (string?)null, "Pressure", "Int32"));
+        sink.VariableCalls.Count.ShouldBe(2);
+    }
+
+    /// <summary>Verifies that two tags sharing a FolderPath produce a single EnsureFolder call
+    /// (deduped) but one EnsureVariable per tag.</summary>
+    [Fact]
+    public void MaterialiseGalaxyTags_dedupes_folders_for_tags_sharing_a_path()
+    {
+        var sink = new RecordingSink();
+        var applier = new Phase7Applier(sink, NullLogger<Phase7Applier>.Instance);
+
+        var composition = new Phase7CompositionResult(
+            UnsAreas: Array.Empty<UnsAreaProjection>(),
+            UnsLines: Array.Empty<UnsLineProjection>(),
+            EquipmentNodes: Array.Empty<EquipmentNode>(),
+            DriverInstancePlans: Array.Empty<DriverInstancePlan>(),
+            ScriptedAlarmPlans: Array.Empty<ScriptedAlarmPlan>(),
+            GalaxyTags: new[]
+            {
+                new GalaxyTagPlan("t1", "drv", "line.cell", "Speed", "Float", "line.cell.Speed"),
+                new GalaxyTagPlan("t2", "drv", "line.cell", "Torque", "Float", "line.cell.Torque"),
+            });
+
+        applier.MaterialiseGalaxyTags(composition);
+
+        sink.FolderCalls.ShouldHaveSingleItem().ShouldBe(("line.cell", null, "line.cell"));
+        sink.VariableCalls.Count.ShouldBe(2);
+        sink.VariableCalls.ShouldContain(("line.cell.Speed", "line.cell", "Speed", "Float"));
+        sink.VariableCalls.ShouldContain(("line.cell.Torque", "line.cell", "Torque", "Float"));
+    }
+
+    /// <summary>Verifies that added Galaxy tags in an otherwise-empty plan trigger an address-space rebuild.</summary>
+    [Fact]
+    public void Added_galaxy_tags_trigger_rebuild()
+    {
+        var sink = new RecordingSink();
+        var applier = new Phase7Applier(sink, NullLogger<Phase7Applier>.Instance);
+
+        var plan = new Phase7Plan(
+            AddedEquipment: Array.Empty<EquipmentNode>(),
+            RemovedEquipment: Array.Empty<EquipmentNode>(),
+            ChangedEquipment: Array.Empty<Phase7Plan.EquipmentDelta>(),
+            AddedDrivers: Array.Empty<DriverInstancePlan>(),
+            RemovedDrivers: Array.Empty<DriverInstancePlan>(),
+            ChangedDrivers: Array.Empty<Phase7Plan.DriverDelta>(),
+            AddedAlarms: Array.Empty<ScriptedAlarmPlan>(),
+            RemovedAlarms: Array.Empty<ScriptedAlarmPlan>(),
+            ChangedAlarms: Array.Empty<Phase7Plan.AlarmDelta>(),
+            AddedGalaxyTags: new[]
+            {
+                new GalaxyTagPlan("t1", "drv", "section.area", "Temperature", "Float", "section.area.Temperature"),
+            },
+            RemovedGalaxyTags: Array.Empty<GalaxyTagPlan>(),
+            ChangedGalaxyTags: Array.Empty<Phase7Plan.GalaxyTagDelta>());
+
+        var outcome = applier.Apply(plan);
+
+        outcome.RebuildCalled.ShouldBeTrue();
+        outcome.AddedNodes.ShouldBe(1);
+        sink.RebuildCalls.ShouldBe(1);
+    }
+
     private static Phase7Plan EmptyPlan => new(
         Array.Empty<EquipmentNode>(), Array.Empty<EquipmentNode>(), Array.Empty<Phase7Plan.EquipmentDelta>(),
         Array.Empty<DriverInstancePlan>(), Array.Empty<DriverInstancePlan>(), Array.Empty<Phase7Plan.DriverDelta>(),
-        Array.Empty<ScriptedAlarmPlan>(), Array.Empty<ScriptedAlarmPlan>(), Array.Empty<Phase7Plan.AlarmDelta>());
+        Array.Empty<ScriptedAlarmPlan>(), Array.Empty<ScriptedAlarmPlan>(), Array.Empty<Phase7Plan.AlarmDelta>(),
+        Array.Empty<GalaxyTagPlan>(), Array.Empty<GalaxyTagPlan>(), Array.Empty<Phase7Plan.GalaxyTagDelta>());
 
     private static Phase7Plan WithEquipmentRemoval(params string[] ids) => new(
         AddedEquipment: Array.Empty<EquipmentNode>(),
@@ -125,7 +223,10 @@ public sealed class Phase7ApplierTests
         ChangedDrivers: Array.Empty<Phase7Plan.DriverDelta>(),
         AddedAlarms: Array.Empty<ScriptedAlarmPlan>(),
         RemovedAlarms: Array.Empty<ScriptedAlarmPlan>(),
-        ChangedAlarms: Array.Empty<Phase7Plan.AlarmDelta>());
+        ChangedAlarms: Array.Empty<Phase7Plan.AlarmDelta>(),
+        AddedGalaxyTags: Array.Empty<GalaxyTagPlan>(),
+        RemovedGalaxyTags: Array.Empty<GalaxyTagPlan>(),
+        ChangedGalaxyTags: Array.Empty<Phase7Plan.GalaxyTagDelta>());
 
     private sealed class RecordingSink : IOpcUaAddressSpaceSink
     {
@@ -133,6 +234,8 @@ public sealed class Phase7ApplierTests
         public ConcurrentQueue<(string NodeId, bool Active, bool Acknowledged)> AlarmQueue { get; } = new();
         /// <summary>Gets the queue of folder creation calls.</summary>
         public ConcurrentQueue<(string NodeId, string? Parent, string DisplayName)> FolderQueue { get; } = new();
+        /// <summary>Gets the queue of variable creation calls.</summary>
+        public ConcurrentQueue<(string NodeId, string? Parent, string DisplayName, string DataType)> VariableQueue { get; } = new();
         /// <summary>Gets the number of rebuild calls made on this sink.</summary>
         public int RebuildCalls;
 
@@ -140,6 +243,8 @@ public sealed class Phase7ApplierTests
         public List<(string NodeId, bool Active, bool Acknowledged)> AlarmWrites => AlarmQueue.ToList();
         /// <summary>Gets the list of recorded folder creation calls.</summary>
         public List<(string NodeId, string? Parent, string DisplayName)> FolderCalls => FolderQueue.ToList();
+        /// <summary>Gets the list of recorded variable creation calls.</summary>
+        public List<(string NodeId, string? Parent, string DisplayName, string DataType)> VariableCalls => VariableQueue.ToList();
 
         /// <summary>Records a value write (no-op in this recording sink).</summary>
         /// <param name="nodeId">The node ID.</param>
@@ -160,6 +265,13 @@ public sealed class Phase7ApplierTests
         /// <param name="displayName">The display name for the folder.</param>
         public void EnsureFolder(string folderNodeId, string? parentNodeId, string displayName)
             => FolderQueue.Enqueue((folderNodeId, parentNodeId, displayName));
+        /// <summary>Records a variable creation call.</summary>
+        /// <param name="variableNodeId">The variable node ID.</param>
+        /// <param name="parentFolderNodeId">The parent folder node ID, if any.</param>
+        /// <param name="displayName">The display name for the variable.</param>
+        /// <param name="dataType">The OPC UA built-in type name.</param>
+        public void EnsureVariable(string variableNodeId, string? parentFolderNodeId, string displayName, string dataType)
+            => VariableQueue.Enqueue((variableNodeId, parentFolderNodeId, displayName, dataType));
         /// <summary>Records a rebuild address space call.</summary>
         public void RebuildAddressSpace() => Interlocked.Increment(ref RebuildCalls);
     }
@@ -192,6 +304,12 @@ public sealed class Phase7ApplierTests
         /// <param name="parentNodeId">The parent folder node ID, if any.</param>
         /// <param name="displayName">The display name for the folder.</param>
         public void EnsureFolder(string folderNodeId, string? parentNodeId, string displayName) { }
+        /// <summary>No-op variable creation call.</summary>
+        /// <param name="variableNodeId">The variable node ID.</param>
+        /// <param name="parentFolderNodeId">The parent folder node ID, if any.</param>
+        /// <param name="displayName">The display name for the variable.</param>
+        /// <param name="dataType">The OPC UA built-in type name.</param>
+        public void EnsureVariable(string variableNodeId, string? parentFolderNodeId, string displayName, string dataType) { }
         /// <summary>No-op rebuild address space call.</summary>
         public void RebuildAddressSpace() { }
     }

tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Observability/OtOpcUaTelemetryHookTests.cs

@@ -206,6 +206,12 @@ public sealed class OtOpcUaTelemetryHookTests : RuntimeActorTestBase
         /// <param name="parentNodeId">The parent folder node identifier.</param>
         /// <param name="displayName">The display name for the folder.</param>
         public void EnsureFolder(string folderNodeId, string? parentNodeId, string displayName) { }
+        /// <summary>Ensures variable exists (stub implementation).</summary>
+        /// <param name="variableNodeId">The variable node identifier.</param>
+        /// <param name="parentFolderNodeId">The parent folder node identifier.</param>
+        /// <param name="displayName">The display name for the variable.</param>
+        /// <param name="dataType">The OPC UA built-in type name.</param>
+        public void EnsureVariable(string variableNodeId, string? parentFolderNodeId, string displayName, string dataType) { }
         /// <summary>Rebuilds address space (recorded via span).</summary>
         public void RebuildAddressSpace() { /* recorded via span */ }
     }

tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/OpcUa/OpcUaPublishActorRebuildTests.cs

@@ -161,6 +161,13 @@ public sealed class OpcUaPublishActorRebuildTests : RuntimeActorTestBase
         /// <param name="displayName">The display name of the folder.</param>
         public void EnsureFolder(string folderNodeId, string? parentNodeId, string displayName)
             => Calls.Enqueue($"EF:{folderNodeId}");
+        /// <summary>Records a variable ensure call.</summary>
+        /// <param name="variableNodeId">The variable node ID.</param>
+        /// <param name="parentFolderNodeId">The parent folder node ID, or null if this is a root variable.</param>
+        /// <param name="displayName">The display name of the variable.</param>
+        /// <param name="dataType">The OPC UA built-in type name.</param>
+        public void EnsureVariable(string variableNodeId, string? parentFolderNodeId, string displayName, string dataType)
+            => Calls.Enqueue($"EV:{variableNodeId}");
         /// <summary>Records a rebuild address space call.</summary>
         public void RebuildAddressSpace() => Interlocked.Increment(ref RebuildCalls);
     }

tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/OpcUa/OpcUaPublishActorTests.cs

@@ -182,6 +182,13 @@ public sealed class OpcUaPublishActorTests : RuntimeActorTestBase
         /// <param name="displayName">The display name of the folder.</param>
         public void EnsureFolder(string folderNodeId, string? parentNodeId, string displayName) { }
 
+        /// <summary>Ensures a variable exists (no-op in test).</summary>
+        /// <param name="variableNodeId">The OPC UA variable node identifier.</param>
+        /// <param name="parentFolderNodeId">The parent folder node identifier, or null for root.</param>
+        /// <param name="displayName">The display name of the variable.</param>
+        /// <param name="dataType">The OPC UA built-in type name.</param>
+        public void EnsureVariable(string variableNodeId, string? parentFolderNodeId, string displayName, string dataType) { }
+
         /// <summary>Records a rebuild call.</summary>
         public void RebuildAddressSpace() => Interlocked.Increment(ref RebuildCalls);
     }