fix(alarms): route native alarms by ConditionId (dotted FullName), not bare SourceNodeId (integration review)

src/Server/ZB.MOM.WW.OtOpcUa.Runtime/Drivers/DriverHostActor.cs

@@ -111,7 +111,7 @@ public sealed class DriverHostActor : ReceiveActor, IWithTimers
     private readonly Dictionary<string, (string DriverInstanceId, string FullName)> _driverRefByNodeId =
         new(StringComparer.Ordinal);
 
-    /// <summary>(DriverInstanceId, FullName = alarm SourceNodeId) → folder-scoped condition NodeId(s).
+    /// <summary>(DriverInstanceId, FullName = alarm ConditionId / AlarmFullReference) → folder-scoped condition NodeId(s).
     /// Built from EquipmentTags whose plan carries Alarm, alongside the value maps; resolves a native
     /// alarm transition to the materialised Part 9 condition node(s). Alarm tags are conditions, not
     /// value variables, so they are kept OUT of the value maps + value-subscription set.</summary>
@@ -497,10 +497,11 @@ public sealed class DriverHostActor : ReceiveActor, IWithTimers
     /// <summary>
     ///     Routes a native alarm transition (published by a driver child as
     ///     <see cref="DriverInstanceActor.AttributeAlarmPublished"/>) to its materialised Part 9 condition
-    ///     node(s). The alarm path analogue of <see cref="ForwardToMux"/>: the driver fires keyed by the
-    ///     alarm source's <c>SourceNodeId</c> (the equipment tag's wire-ref FullName), which the
-    ///     <see cref="_alarmNodeIdByDriverRef"/> map — built each apply from the alarm-bearing EquipmentTags —
-    ///     resolves to the folder-scoped condition NodeId(s) the materialiser placed the condition(s) at.
+    ///     node(s). The alarm path analogue of <see cref="ForwardToMux"/>: the transition's <c>ConditionId</c>
+    ///     (the dotted alarm full-reference, which equals the authored equipment-tag FullName — NOT the bare
+    ///     <c>SourceNodeId</c> owning object) is resolved by the <see cref="_alarmNodeIdByDriverRef"/> map —
+    ///     built each apply from the alarm-bearing EquipmentTags — to the folder-scoped condition NodeId(s)
+    ///     the materialiser placed the condition(s) at.
     ///     For each node the <see cref="_nativeAlarmProjector"/> projects the transition delta into a full
     ///     <c>AlarmConditionSnapshot</c>, then this Tells <see cref="ZB.MOM.WW.OtOpcUa.Runtime.OpcUa.OpcUaPublishActor.AlarmStateUpdate"/>
     ///     — the SAME message scripted alarms use, so it routes through <c>WriteAlarmCondition</c>. An
@@ -518,10 +519,13 @@ public sealed class DriverHostActor : ReceiveActor, IWithTimers
     private void ForwardNativeAlarm(DriverInstanceActor.AttributeAlarmPublished msg)
     {
         if (_opcUaPublishActor is null) return;
-        if (!_alarmNodeIdByDriverRef.TryGetValue((msg.DriverInstanceId, msg.Args.SourceNodeId), out var nodeIds))
+        // Resolve on ConditionId, NOT SourceNodeId: for Galaxy the dotted alarm full-reference — which
+        // equals the authored equipment-tag FullName the map is keyed by — is carried in ConditionId
+        // (AlarmFullReference), while SourceNodeId is the bare owning object (SourceObjectReference).
+        if (!_alarmNodeIdByDriverRef.TryGetValue((msg.DriverInstanceId, msg.Args.ConditionId), out var nodeIds))
         {
             _log.Debug("DriverHost {Node}: no alarm condition for ({Driver},{Ref}) — transition dropped",
-                _localNode, msg.DriverInstanceId, msg.Args.SourceNodeId);
+                _localNode, msg.DriverInstanceId, msg.Args.ConditionId);
             return;
         }
         foreach (var nodeId in nodeIds)
@@ -862,7 +866,7 @@ public sealed class DriverHostActor : ReceiveActor, IWithTimers
         // reflected. Each NodeId maps to exactly one driver ref (a variable is backed by a single driver
         // attribute), so last-writer-wins on the rare duplicate is harmless.
         _driverRefByNodeId.Clear();
-        // Alarm condition routing map: (DriverInstanceId, FullName = alarm SourceNodeId) → folder-scoped
+        // Alarm condition routing map: (DriverInstanceId, FullName = alarm ConditionId/AlarmFullReference) → folder-scoped
         // condition NodeId(s). Built from the SAME EquipmentTags pass (alarm-bearing tags only) so
         // ForwardNativeAlarm can land a native transition on the right condition node. Clear-and-rebuild
         // every apply; the projector is Clear()'d too so stale per-condition state never leaks across

tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/Drivers/DriverHostActorNativeAlarmTests.cs

@@ -49,9 +49,11 @@ public sealed class DriverHostActorNativeAlarmTests : RuntimeActorTestBase
     private static readonly RevisionHash RevA = RevisionHash.Parse(new string('a', 64));
     private static readonly DateTime Ts = new(2026, 6, 14, 10, 0, 0, DateTimeKind.Utc);
 
-    /// <summary>A native alarm RAISE published by SourceNodeId (the alarm tag's FullName) lands on the
-    /// condition's folder-scoped NodeId (here <c>eq-1/temp_hi</c>) as an
-    /// <see cref="OpcUaPublishActor.AlarmStateUpdate"/> with <c>State.Active == true</c>.</summary>
+    /// <summary>A native alarm RAISE whose <c>ConditionId</c> equals the alarm tag's <c>FullName</c> lands on
+    /// the condition's folder-scoped NodeId (here <c>eq-1/temp_hi</c>) as an
+    /// <see cref="OpcUaPublishActor.AlarmStateUpdate"/> with <c>State.Active == true</c>. The event carries a
+    /// production-shaped <c>SourceNodeId</c> (the bare owning object, distinct from <c>ConditionId</c>) so the
+    /// lookup is proven to key on <c>ConditionId</c>, not <c>SourceNodeId</c>.</summary>
     [Fact]
     public void Native_alarm_raise_routes_to_folder_scoped_condition_NodeId_active()
     {
@@ -64,8 +66,8 @@ public sealed class DriverHostActorNativeAlarmTests : RuntimeActorTestBase
 
         actor.Tell(new DriverInstanceActor.AttributeAlarmPublished("drv-1", new AlarmEventArgs(
             new StubAlarmHandle(),
-            SourceNodeId: "Temp.HiHi",
-            ConditionId: "cond-1",
+            SourceNodeId: "Temp",        // bare owning object (SourceObjectReference) — NOT the lookup key
+            ConditionId: "Temp.HiHi",    // dotted alarm full-reference = the authored FullName (the lookup key)
             AlarmType: "OffNormalAlarm",
             Message: "temperature high",
             Severity: AlarmSeverity.High,
@@ -79,8 +81,8 @@ public sealed class DriverHostActorNativeAlarmTests : RuntimeActorTestBase
         update.TimestampUtc.ShouldBe(Ts);
     }
 
-    /// <summary>An <see cref="DriverInstanceActor.AttributeAlarmPublished"/> for a SourceNodeId not in the
-    /// alarm map produces NO <see cref="OpcUaPublishActor.AlarmStateUpdate"/> (unknown-ref drop).</summary>
+    /// <summary>An <see cref="DriverInstanceActor.AttributeAlarmPublished"/> whose <c>ConditionId</c> is not in
+    /// the alarm map produces NO <see cref="OpcUaPublishActor.AlarmStateUpdate"/> (unknown-ref drop).</summary>
     [Fact]
     public void Unknown_alarm_ref_produces_no_AlarmStateUpdate()
     {
@@ -92,8 +94,8 @@ public sealed class DriverHostActorNativeAlarmTests : RuntimeActorTestBase
 
         actor.Tell(new DriverInstanceActor.AttributeAlarmPublished("drv-1", new AlarmEventArgs(
             new StubAlarmHandle(),
-            SourceNodeId: "NoSuch.Alarm",
-            ConditionId: "cond-x",
+            SourceNodeId: "Temp",          // owning object exists, but the condition ref below is unmapped
+            ConditionId: "NoSuch.HiHi",    // dotted ref not in the alarm map ⇒ drop
             AlarmType: "OffNormalAlarm",
             Message: "nope",
             Severity: AlarmSeverity.Low,
@@ -122,8 +124,8 @@ public sealed class DriverHostActorNativeAlarmTests : RuntimeActorTestBase
 
         actor.Tell(new DriverInstanceActor.AttributeAlarmPublished("drv-1", new AlarmEventArgs(
             new StubAlarmHandle(),
-            SourceNodeId: "Temp.HiHi",
-            ConditionId: "cond-1",
+            SourceNodeId: "Temp",        // bare owning object (SourceObjectReference) — NOT the lookup key
+            ConditionId: "Temp.HiHi",    // dotted alarm full-reference = the authored FullName (the lookup key)
             AlarmType: "OffNormalAlarm",
             Message: "temperature high",
             Severity: AlarmSeverity.High,
@@ -169,8 +171,8 @@ public sealed class DriverHostActorNativeAlarmTests : RuntimeActorTestBase
 
         actor.Tell(new DriverInstanceActor.AttributeAlarmPublished("drv-1", new AlarmEventArgs(
             new StubAlarmHandle(),
-            SourceNodeId: "Temp.HiHi",
-            ConditionId: "cond-1",
+            SourceNodeId: "Temp",        // bare owning object (SourceObjectReference) — NOT the lookup key
+            ConditionId: "Temp.HiHi",    // dotted alarm full-reference = the authored FullName (the lookup key)
             AlarmType: "OffNormalAlarm",
             Message: "temperature high",
             Severity: AlarmSeverity.High,