docs(alarms): record native alarms verified working; add D.1 smoke

The 2026-04-30 alarm plan banners claimed worker-side native alarm subscription was blocked on a COM-bitness finding. That's stale: the mxaccessgw .NET client now has true MxAccess alarm-event support, and a live StreamAlarms check (+ new Skip-gated GatewayGalaxyAlarmFeedLiveTests through the lmxopcua consumer) confirms native alarms — operator comment, category, severity, timestamps — flow end-to-end. Reconcile both plan docs to reality and add docs/plans/alarms-d1-smoke-artifact.md as the D.1 alarm-source deliverable. Historian-write live smoke + full server->A&C round-trip remain (Windows parity rig only).
fix(adminui): wire Test Connect probes + live panels on admin-only nodes
2026-05-31 09:59:01 -04:00 · 2026-05-29 16:38:32 -04:00 · 2026-05-29 12:45:44 -04:00 · 2026-05-29 12:31:55 -04:00 · 2026-05-29 12:18:01 -04:00 · 2026-05-29 12:09:21 -04:00
80 changed files with 4478 additions and 564 deletions
@@ -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
@@ -0,0 +1,132 @@
 # Design — Complete AdminUI deferred follow-ups
 **Date:** 2026-05-29
 **Status:** Approved (design); implementation plan to follow
 **Author:** Joseph Doherty (with Claude Code)
 ## Background
 The AdminUI carried a family of "deferred / Phase C.2 follow-up" notes. A prior
 change stripped the stale *rendered roadmap banners* from the cluster list pages.
 Three remaining note groups were investigated to decide what real work they hide:
 - **Group 1 — driver-page inline notes** ("list-editor coming in a follow-up
  phase" for tags/devices/endpoints; "typed-form-ifying Polly is a follow-up").
  → **Real pending UI work.**
 - **Group 2 — RoleGrants** ("UI-driven editing of the mapping is deferred — it
  implies a config-reload mechanism that doesn't exist yet"). → **Real work; half
  the infra already exists.**
 - **Group 3 — source comments** (F15 Razor migration, F16 FleetStatusHub bridge,
  "Phase 4" identity section, `TODO(3.3/3.4)` route collision). → **~90% stale**;
  the referenced work already shipped (the F16 bridge is wired; the legacy
  `DriverEdit.razor` no longer exists). Only the Polly typed form is real, and it
  is already counted in Group 1.
 ### Key facts established during exploration
 - **Driver-embedded tag/device lists in `DriverConfig` JSON are the runtime source
  of truth.** Driver factories deserialize them and poll exactly those rows; the
  canonical `Tag` table is orthogonal (OPC UA browse-tree only, never read by
  drivers). So inline editors are meaningful, not redundant — editing them changes
  what the driver polls on the next publish/reinitialize.
 - **Resilience** already has a strongly-typed model: `DriverResilienceOptions`
  (`BulkheadMaxConcurrent`, `BulkheadMaxQueue`, `RecycleIntervalSeconds`,
  `CapabilityPolicies: {DriverCapability → (TimeoutSeconds, RetryCount,
  BreakerFailureThreshold)}`) with tier A/B/C defaults via `GetTierDefaults(tier)`
  and a `DriverResilienceOptionsParser`. The stored JSON is an *override* shape;
  null/absent keys fall back to tier defaults.
 - **LDAP role map**: the `LdapGroupRoleMapping` entity + migration +
  `ILdapGroupRoleMappingService` (CRUD) already exist but are **not wired** into
  login. `LdapAuthService` still reads the static appsettings `GroupToRole`
  (`Dictionary<string,string>`). `RoleGrants.razor` is read-only.
 - **Testing**: no bUnit. Established pattern = test `FromOptions`/`ToOptions`
  round-trips (xUnit + Shouldly in `AdminUI.Tests`) and services with in-memory EF
  (`Configuration.Tests`).
 ## Decisions
 - **Scope:** full build — all real follow-ups in Groups 1 & 2, plus Group 3
  comment cleanup.
 - **List-editor UX:** modal-per-row with a shared shell component.
 - **LDAP reload semantics:** DB-backed, **live on the user's next sign-in**
  (per-login DB query; no restart, no new infra). appsettings `GroupToRole` becomes
  a bootstrap **fallback** layer.
 - **Roles are GLOBAL.** No cluster-level permissions / no per-cluster enforcement
  (explicitly chosen for simplicity, reversing an earlier cluster-scoping answer).
  Every `LdapGroupRoleMapping` row is `IsSystemWide=true`, `ClusterId=null`.
 ## Workstreams
 ### WS1 — Driver collection editors (modal-per-row + shared shell)
 - New generic `CollectionEditor<TRow>` component in `Components/Shared/Drivers/`:
  compact read-only table + `[+ Add]` / per-row `Edit` / `Delete`, and a Bootstrap
  modal editing a **working copy** of a row (commit on modal-Save, discard on
  Cancel). Parameters: `List<TRow> Items` (bound), header fragment, read-only-cells
  fragment, modal-body fragment, `NewRow` factory, optional `Validate` delegate.
 - Each driver page swaps its read-only `<pre>` for a `CollectionEditor` supplying
  its own columns + modal fields. Edits mutate the in-memory `List<T>` already in
  the page's `FormModel`; the page's existing **Save** serializes it into
  `DriverConfig` — no new persistence path.
 - Coverage: tags (Modbus, AbCip, AbLegacy, TwinCAT, S7, FOCAS); devices (AbCip,
  AbLegacy, TwinCAT, FOCAS); endpoints (OpcUaClient).
 - **Errors/validation:** required fields, duplicate Name within list,
  driver-specific address format; delete confirm; list mutates only on valid commit.
 - **Testing:** per-driver `NewRow` factories + `Validate` methods unit-tested
  directly; existing `*FormSerializationTests` extended for add/remove via the form
  model. Modal interaction verified manually via `/run`.
 ### WS2 — Resilience typed form
 - Replace the textarea in `DriverResilienceSection.razor` with a typed form bound to
  a new mutable `ResilienceFormModel` (all fields nullable; null = tier default):
  bulkhead concurrent/queue, recycle interval, and an 8-capability grid (Read,
  Write, Discover, Subscribe, Probe, AlarmSubscribe, AlarmAcknowledge, HistoryRead)
  of (timeout / retry / breaker-threshold).
 - `FromJson`/`ToJson` emit only non-null overrides (blank → `null`, preserving the
  current "null = tier defaults" contract). The section gains a `DriverTier`
  parameter; each driver page passes its known tier so `GetTierDefaults(tier)`
  renders as placeholders. A collapsible "raw JSON" view remains as escape hatch.
 - **Errors:** non-negative / sane-range numeric validation; emitted JSON must
  re-parse cleanly through `DriverResilienceOptionsParser`.
 - **Testing:** `ResilienceFormModel` round-trip tests in `AdminUI.Tests` —
  blank→null, partial-override-preserved, emit→parse-back compatibility.
 ### WS3 — Editable LDAP→role map (DB-backed, global, live on next sign-in)
 - `RoleGrants.razor` → full CRUD over `LdapGroupRoleMapping` via the existing
  `ILdapGroupRoleMappingService`. **Global only**: `IsSystemWide=true`,
  `ClusterId=null`; no cluster UI. Fields: LDAP group, `AdminRole`
  (ConfigViewer/ConfigEditor/FleetAdmin), notes. A group may carry several roles
  (multiple rows). Edit page gated to **FleetAdmin** (add a minimal FleetAdmin
  authorization policy; confirm existing role-policy plumbing during plan-writing).
 - Wire the service into `LdapAuthService`: at login → resolve groups →
  `GetByGroupsAsync` (indexed) → map roles → **merge appsettings `GroupToRole` as a
  fallback layer** (used when no DB row covers a group). Edits take effect on the
  user's next sign-in. DB rows authoritative + editable; appsettings entries shown
  read-only as "fallback."
 - **Errors:** DB unreachable at login → catch, log, fall back to appsettings;
  login never blocks. CRUD: no duplicate `(LdapGroup, Role)`; group/role required.
 - **Testing:** extend `LdapGroupRoleMappingServiceTests` (in-memory EF) for CRUD +
  dedupe; new `RoleMapper` overload `Map(groups, dbRows, fallbackDict)` unit-tested
  for merge + fallback precedence + DB-error fallback.
 ### WS4 — Cleanup (runs last, after the features exist)
 - **Delete stale comments:** `FleetStatusHub.cs` ("passive channel / until the
  bridge lands"), `EndpointRouteBuilderExtensions.cs` (F15), `DriverIdentitySection.razor`
  ("Phase 4 / generic DriverEdit"), `DriverEditRouter.razor` + `DriverTypePicker.razor`
  (`TODO(3.3/3.4)` + the "falls back to legacy DriverEdit" path — verify & clean,
  legacy file is gone), and update `DriverResilienceSection.razor`'s comment.
 - **Strip rendered notes** now true: per-driver "list-editor coming in a follow-up
  phase" notes, the OpcUaClient endpoint note, the resilience "typed-form-ifying
  Polly is a follow-up" note, and the RoleGrants "UI-driven editing is deferred" note.
 ## Cross-cutting
 - **No DB schema change** — `LdapGroupRoleMapping` migration already applied;
  `DriverConfig`/`ResilienceConfig` columns unchanged.
 - **Definition of done:** build clean + `dotnet test` green + a `/run` pass
  exercising the modal editors and role-map CRUD.
 - **Suggested sequence:** WS1 shared shell + Modbus tags as proof → remaining
  drivers → WS2 → WS3 → WS4.
@@ -0,0 +1,26 @@
 {
  "planPath": "docs/plans/2026-05-29-adminui-followups.md",
  "branch": "feat/adminui-followups",
  "tasks": [
    {"id": 11, "plan": 1, "subject": "Task 1: Generic CollectionEditor<TRow> component", "status": "pending"},
    {"id": 12, "plan": 2, "subject": "Task 2: Modbus tag editor (proof) + tests", "status": "pending", "blockedBy": [11]},
    {"id": 13, "plan": 3, "subject": "Task 3: AbCip device+tag editors + tests", "status": "pending", "blockedBy": [11]},
    {"id": 14, "plan": 4, "subject": "Task 4: AbLegacy device+tag editors + tests", "status": "pending", "blockedBy": [11]},
    {"id": 15, "plan": 5, "subject": "Task 5: TwinCAT device+tag editors + tests", "status": "pending", "blockedBy": [11]},
    {"id": 16, "plan": 6, "subject": "Task 6: FOCAS device+tag editors + tests", "status": "pending", "blockedBy": [11]},
    {"id": 17, "plan": 7, "subject": "Task 7: S7 tag editor + tests", "status": "pending", "blockedBy": [11]},
    {"id": 18, "plan": 8, "subject": "Task 8: OpcUaClient endpoint-URL editor + tests", "status": "pending", "blockedBy": [11]},
    {"id": 19, "plan": 9, "subject": "Task 9: ResilienceFormModel + tests", "status": "pending"},
    {"id": 20, "plan": 10, "subject": "Task 10: Typed resilience form in DriverResilienceSection", "status": "pending", "blockedBy": [19]},
    {"id": 21, "plan": 11, "subject": "Task 11: RoleMapper.Merge overload + tests", "status": "pending"},
    {"id": 22, "plan": 12, "subject": "Task 12: Register ILdapGroupRoleMappingService in DI", "status": "pending"},
    {"id": 23, "plan": 13, "subject": "Task 13: Wire DB merge into AuthEndpoints.LoginAsync", "status": "pending", "blockedBy": [21, 22]},
    {"id": 24, "plan": 14, "subject": "Task 14: Add FleetAdmin authorization policy", "status": "pending"},
    {"id": 25, "plan": 15, "subject": "Task 15: RoleGrants.razor global CRUD (FleetAdmin-gated)", "status": "pending", "blockedBy": [22, 24]},
    {"id": 26, "plan": 16, "subject": "Task 16: LdapGroupRoleMapping service tests (global CRUD)", "status": "pending"},
    {"id": 27, "plan": 17, "subject": "Task 17: Delete stale source comments", "status": "pending", "blockedBy": [12, 13, 14, 15, 16, 17, 18, 20, 25]},
    {"id": 28, "plan": 18, "subject": "Task 18: Strip now-true rendered notes", "status": "pending", "blockedBy": [12, 13, 14, 15, 16, 17, 18, 25]},
    {"id": 29, "plan": 19, "subject": "Task 19: Full verification (build + test + /run)", "status": "pending", "blockedBy": [20, 23, 26, 27, 28]}
  ],
  "lastUpdated": "2026-05-29"
 }
@@ -0,0 +1,100 @@
 # Alarms D.1 — smoke artifact
 > **Status (2026-05-29): alarm-source leg VERIFIED. Historian-write leg still
 > pending the Windows sidecar + live AVEVA Historian.**
 >
 > This is the D.1 deliverable called for by `docs/plans/alarms-worker-wiring-plan.md`
 > — captured evidence that a live Galaxy alarm reaches lmxopcua through the native
 > gateway path (not the sub-attribute fallback). It supersedes the "A.2 blocked"
 > banners in `alarms-over-gateway.md` / `alarms-worker-wiring-plan.md`, which were
 > written 2026-04-30 before the gateway's alarm feed was working.
 ## What was verified
 The mxaccessgw gateway **does** serve native MxAccess alarms today, and the lmxopcua
 consumer ingests them with full fidelity — **including operator-comment**, the field
 the 2026-04-30 plan flagged as "the only v1 regression."
 Verified from the macOS dev box against the live gateway at `http://10.100.0.48:5120`
 (reachable; `nc -z` succeeds). No acknowledge / no writes were issued — read-only
 `StreamAlarms`.
 ### 1. Gateway boundary — raw `StreamAlarms` (`ZB.MOM.WW.MxGateway.Client`)
 A standalone client streamed the active-alarm snapshot: **20 active alarms**, each
 carrying native metadata. Sample (one of 20):
 ```json
 { "alarmFullReference": "Galaxy!TestArea.TestMachine_001.TestAlarm001",
  "sourceObjectReference": "TestMachine_001.TestAlarm001",
  "alarmTypeName": "DSC", "severity": 500,
  "currentState": "ALARM_CONDITION_STATE_ACTIVE", "category": "TestArea",
  "lastTransitionTimestamp": "2026-05-24T16:04:10.856Z",
  "operatorComment": "Test alarm #1" }
 ```
 Followed by the `SnapshotComplete` marker. `operatorComment`, `category`, `severity`,
 `currentState`, and `lastTransitionTimestamp` are all populated.
 ### 2. lmxopcua consumer — `GatewayGalaxyAlarmFeed` → `GalaxyAlarmTransition`
 The Skip-gated live test
 `Runtime/GatewayGalaxyAlarmFeedLiveTests.Live_gateway_delivers_native_alarm_transitions_through_the_consumer`
 wires the real `MxGatewayClient.StreamAlarmsAsync` into the production consumer seam
 and **passes**. Captured output (`D1_SMOKE_OUT`):
 ```
 # consumer transitions observed: 2+
 Raise  Galaxy!TestArea.TestMachine_001.TestAlarm001 | sev=750(High) raw=500 | cat=TestArea | comment='Test alarm #1' | xitionUtc=2026-05-24T16:04:10.856Z
 Raise  Galaxy!TestArea.TestMachine_003.TestAlarm001 | sev=750(High) raw=500 | cat=TestArea | comment='Test alarm #1' | xitionUtc=2026-05-07T18:14:00.594Z
 ```
 The consumer preserves `operatorComment` + `category` + transition timestamp and
 applies the OPC UA severity-bucket mapping (`MxAccessSeverityMapper`: raw 500 →
 OPC UA 750, bucket `High`).
 ### 3. Full chain to the OPC UA Part 9 surface (code-path verified)
 `GalaxyDriver.OnAlarmFeedTransition` maps `GalaxyAlarmTransition` →
 `AlarmEventArgs`, carrying `OperatorComment`, `OriginalRaiseTimestampUtc`,
 `AlarmCategory`, and the severity bucket onto `IAlarmSource.OnAlarmEvent`.
 `AlarmEventArgs` already declares those fields — so the **E.7 contract extension is
 done**, not pending. The server's Part-9 condition layer consumes `IAlarmSource`
 via `AlarmSurfaceInvoker` → `GenericDriverNodeManager`. Unit coverage:
 `GalaxyDriverAlarmSourceTests`, `GatewayGalaxyAlarmFeedTests`.
 ## How to re-run
 ```bash
 export MXGW_ENDPOINT="http://10.100.0.48:5120"
 export GALAXY_MXGW_API_KEY="<dev key from docker-dev/docker-compose.yml>"
 export D1_SMOKE_OUT="/tmp/d1-consumer-transitions.txt"   # optional capture
 dotnet test tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests \
  --filter "FullyQualifiedName~GatewayGalaxyAlarmFeedLiveTests"
 ```
 Without the env vars the test `Skip`s, so normal `dotnet test` runs are unaffected.
 ## Not covered here (still open)
 1. **Scripted-alarm historian write-back → AVEVA Historian** (C.1's live leg). The
   `SdkAlarmHistorianWriteBackend` (real `HistorianAccess.AddStreamedValue` path) is
   implemented and unit-tested, but its `Live_*` write smoke needs the Windows
   historian sidecar + a live AVEVA Historian — neither reachable from the macOS dev
   box. Capture this leg on the Windows parity rig.
 2. **Running-server → OPC UA A&C client round-trip.** This artifact proves the driver
   consumer end; it does not exercise a full OtOpcUa server surfacing the condition to
   an OPC UA client, because the docker-dev stack stubs the Galaxy driver on Linux
   (`DriverInstanceActor.ShouldStub`). Capture on the Windows parity rig (or a Linux
   host with `ShouldStub` overridden to point the real driver at the gateway).
 ## Mechanism — true MxAccess alarm-event support
 The gateway delivers these alarms via **true MxAccess alarm-event support** in the
 mxaccessgw .NET client — a real alarm-event subscription, **not** the value-driven
 sub-attribute fallback. (Confirmed by the gateway maintainer; the client-side stream
 check above can only observe the resulting feed, which is why this artifact records the
 mechanism here rather than inferring it.) So A.2 is implemented as originally specified:
 `MX_EVENT_FAMILY_ON_ALARM_TRANSITION` carries genuine native alarm-event metadata, and
 the operator-comment / original-raise-time / category fields are first-class — not
 reconstructed from attribute reads.
@@ -9,24 +9,41 @@
 > the new RPCs; the sub-attribute fallback path keeps Galaxy alarms
 > functional today.
 >
-> ⚠️ **Worker-side native alarm subscription blocked on a dev-rig
+> ✅ **UPDATE 2026-05-29 — native alarm feed VERIFIED working; the
-> finding (2026-04-30):** the MXAccess COM Toolkit at
+> 2026-04-30 "blocked" finding below is superseded.** A live
 > `StreamAlarms` check against the gateway at `10.100.0.48:5120`
 > returned the active-alarm snapshot (20 alarms) with full native
 > metadata — `severity`, `category`, `currentState`,
 > `lastTransitionTimestamp`, **and `operatorComment`** (the field the
 > note below called "the only v1 regression"). The lmxopcua consumer
 > (`GatewayGalaxyAlarmFeed` → `GalaxyAlarmTransition` →
 > `AlarmEventArgs` → `IAlarmSource`) ingests it with full fidelity and
 > the OPC UA severity-bucket mapping applied — proven by the passing
 > Skip-gated live test `GatewayGalaxyAlarmFeedLiveTests`. `AlarmEventArgs`
 > already carries operator-comment / original-raise-time / category, so
 > **E.7 is done too**. See `docs/plans/alarms-d1-smoke-artifact.md` for
 > the captured evidence. The gateway delivers this via **true MxAccess
 > alarm-event support** in the mxaccessgw .NET client (a real
 > alarm-event subscription — **not** the sub-attribute fallback), so A.2
 > is implemented as originally specified. Still open: the scripted-alarm
 > → AVEVA Historian write-back live smoke (C.1's `Live_*` leg) and a full
 > running-server → OPC UA A&C round-trip — both need the Windows parity rig.
 >
 > ⚠️ **[SUPERSEDED — kept for history] Worker-side native alarm
 > subscription blocked on a dev-rig finding (2026-04-30):** the MXAccess
 > COM Toolkit at
 > `C:\Program Files (x86)\ArchestrA\Framework\Bin\ArchestrA.MXAccess.dll`
-> exposes no alarm-event family — only `OnDataChange`,
+> exposed no alarm-event family — only `OnDataChange`,
-> `OnWriteComplete`, `OperationComplete`, `OnBufferedDataChange`.
+> `OnWriteComplete`, `OperationComplete`, `OnBufferedDataChange` — and
 > AVEVA's `aaAlarmManagedClient` / `ArchestrAAlarmsAndEvents.SDK`
-> assemblies are x64-only and incompatible with the worker's x86
+> assemblies are x64-only vs. the worker's x86 bitness. The operator
-> bitness. **Operator decision needed before
+> decision (accept the value-driven sub-attribute path, or add an x64
-> `MX_EVENT_FAMILY_ON_ALARM_TRANSITION` carries any events:** either
+> alarm-helper sub-process) has since been resolved on the gateway side
-> accept the value-driven sub-attribute path as the production
+> — `MX_EVENT_FAMILY_ON_ALARM_TRANSITION` now carries events (verified
-> architecture (operator-comment fidelity is the only v1 regression)
+> above). The C.1 `SdkAlarmHistorianWriteBackend` is **no longer a
-> or add an x64 alarm-helper sub-process alongside the worker. See
+> placeholder** — it writes through the real
-> `src/MxGateway.Worker/MxAccess/MxAccessAlarmEventSink.cs` in the
+> `HistorianAccess.AddStreamedValue` path (only its live-rig write
-> mxaccessgw repo for the architectural notes. Live
+> smoke remains).
 > `aahClientManaged` alarm-event write call site
 > (`SdkAlarmHistorianWriteBackend` placeholder from PR C.1) and the
 > D.1 smoke artifact ship once those decisions resolve. The
 > remainder of this document is preserved as the design record.
 Coordinated epic across two repos:
@@ -1,5 +1,18 @@
 # Alarms Worker Wiring Plan
 > ✅ **UPDATE 2026-05-29 — the blocker below is RESOLVED on the gateway side; this
 > plan is largely complete.** A live `StreamAlarms` check against `10.100.0.48:5120`
 > returns the active-alarm snapshot with full native metadata **including
 > `operatorComment`**, and the lmxopcua consumer ingests it end-to-end (passing live
 > test `GatewayGalaxyAlarmFeedLiveTests`). So **A.2 / A.3 / A.4** are functionally done
 > at the gateway boundary (the worker now emits native alarm transitions and the client
 > exposes `AcknowledgeAlarm` / `QueryActiveAlarms` RPCs). **C.1** ships real code
 > (`SdkAlarmHistorianWriteBackend` → `HistorianAccess.AddStreamedValue`). **D.1**'s
 > alarm-source leg is captured in `docs/plans/alarms-d1-smoke-artifact.md`. Only two
 > things remain, both needing the Windows parity rig: C.1's live historian-write smoke
 > and a full running-server → OPC UA A&C round-trip. The per-item detail below is kept
 > as the historical record of the original blocked state.
 >
 > **Context**: The alarms-over-gateway epic shipped 19 PRs across the
 > `lmxopcua` and `mxaccessgw` repos (merged 2026-04-30). Contracts are live;
 > the sub-attribute fallback path keeps Galaxy alarms functional today. Four
@@ -16,7 +29,7 @@
 ---
-## Dev-rig finding that blocks everything (2026-04-30)
+## Dev-rig finding that blocks everything (2026-04-30) — [SUPERSEDED 2026-05-29]
 During PR A.2 work the following was discovered on the dev box:
@@ -318,16 +331,20 @@ fallback as production).
 ## Summary of blocks
-| Item | Blocked by | Estimated effort once unblocked |
+> **Resolved as of 2026-05-29** — see the update banner at the top and
-|------|-----------|--------------------------------|
+> `docs/plans/alarms-d1-smoke-artifact.md`. Original status table kept for history.
 | A.2 | Architectural decision (x64 alarm-helper vs. sub-attribute fallback as production) | 2–3 days implementation; 1 day tests |
 | A.3 | A.2 delivering WorkerEvent bodies | 1–2 days |
 | A.4 | A.2 (active-alarm query needs AlarmClient session) | 1 day |
 | C.1 | aahClientManaged SDK access (available on dev box); NOT blocked by A.2 | 1–2 days |
 | D.1 | A.2 + A.3 + C.1 all passing on parity rig | 0.5 day (smoke + artifact capture) |
-C.1 can proceed in parallel with A.2 / A.3 since the sidecar's `aahClientManaged`
+| Item | Status (2026-05-29) | Original block |
-is x64 and does not share the worker bitness constraint.
+|------|--------------------|----------------|
 | A.2 | ✅ **True MxAccess alarm-event support** in the gateway client (real alarm-event subscription, not the sub-attribute fallback); verified via live `StreamAlarms` with operator-comment fidelity | Architectural decision (x64 alarm-helper vs. sub-attribute fallback) |
 | A.3 | ✅ Dispatch + `AcknowledgeAlarm` RPC present on the client surface | A.2 delivering WorkerEvent bodies |
 | A.4 | ✅ `QueryActiveAlarms` RPC present on the client surface | A.2 (active-alarm query needs AlarmClient session) |
 | C.1 | ✅ Code shipped (`AddStreamedValue` path); ⏳ live historian-write smoke needs the Windows rig | aahClientManaged SDK access |
 | D.1 | ◑ Alarm-source leg captured (`alarms-d1-smoke-artifact.md`); ⏳ historian-write leg + full server→A&C round-trip need the Windows rig | A.2 + A.3 + C.1 all passing on parity rig |
 The gateway delivers operator-comment fidelity through **true MxAccess alarm-event
 support** in the mxaccessgw .NET client — a real alarm-event subscription, not the
 value-driven sub-attribute path. The sub-attribute fallback is now legacy.
 ---
@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using ZB.MOM.WW.OtOpcUa.Configuration.Services;
 namespace ZB.MOM.WW.OtOpcUa.Configuration;
@@ -22,6 +23,16 @@ public static class ServiceCollectionExtensions
                $"Connection string '{ConnectionStringName}' is required. Add it to appsettings.json or the OTOPCUA_CONFIG_CONNECTION env var.");
        services.AddDbContextFactory<OtOpcUaConfigDbContext>(opt => opt.UseSqlServer(connectionString));
        // AddDbContextFactory registers only the IDbContextFactory<> — it does NOT also register
        // a scoped OtOpcUaConfigDbContext. Config services that take the context directly (e.g.
        // LdapGroupRoleMappingService) need a scoped instance, so bridge one off the factory.
        services.AddScoped(sp => sp.GetRequiredService<IDbContextFactory<OtOpcUaConfigDbContext>>().CreateDbContext());
        // Config-DB services consumed by both the AdminUI (RoleGrants page) and the auth/login
        // host (AuthEndpoints.LoginAsync). Scoped to match the request/render scope of both callers.
        services.AddScoped<ILdapGroupRoleMappingService, LdapGroupRoleMappingService>();
        return services;
    }
 }
@@ -172,8 +172,8 @@ public static class DraftValidator
            var compat = ns.Kind switch
            {
-                NamespaceKind.SystemPlatform => di.DriverType == "Galaxy",
+                NamespaceKind.SystemPlatform => di.DriverType == "GalaxyMxGateway",
-                NamespaceKind.Equipment      => di.DriverType != "Galaxy",
+                NamespaceKind.Equipment      => di.DriverType != "GalaxyMxGateway",
                _                            => true,
            };
@@ -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 />
@@ -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 />
@@ -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>
+    /// <summary>Driver type key — matches the AdminUI's persisted "GalaxyMxGateway" value.</summary>
-    public string DriverType => "Galaxy";
+    // 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
@@ -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)
@@ -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
+@inject IInProcessBroadcaster<AlarmTransitionEvent> Alarms
-@implements IAsyncDisposable
+@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()
+        // Live alarm tail straight from the in-process broadcaster (fed by AlertSignalRBridge off the
-            .WithUrl(Nav.ToAbsoluteUri(AlertHub.Endpoint))
+        // 'alerts' DPS topic). A Blazor Server component can't self-connect a SignalR HubConnection
-            .WithAutomaticReconnect()
+        // behind a reverse proxy — see IInProcessBroadcaster — so we subscribe in-process instead.
-            .Build();
+        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()
+    public void Dispose() => Alarms.Received -= OnAlarm;
    {
        if (_hub is not null) await _hub.DisposeAsync();
    }
 }
@@ -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
+        (a folder, an equipment, a tag). Per-cluster role grants were dropped in favour of
-        grants in favour of fleet-wide LDAP-group → role mapping; ACLs here are the finer-grained
+        fleet-wide LDAP-group → role mapping; ACLs here are the finer-grained per-node scope.
        per-node scope. Live editing lands in a Phase C.2 follow-up.
    </section>
    <section class="panel rise mt-3" style="animation-delay:.08s">
@@ -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)
@@ -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">
@@ -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
+        to driver instances. NamespaceUri must be unique fleet-wide.
        Phase C.2 follow-up.
    </section>
    <section class="panel rise mt-3" style="animation-delay:.08s">
@@ -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">
@@ -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
+        lines are cluster-scoped; equipment hangs under a single line.
        Phase C.2 follow-up.
    </section>
    <section class="panel rise mt-3" style="animation-delay:.08s">
@@ -146,27 +146,65 @@ else
                </div>
            </section>
-            @* Devices — read-only JSON view *@
+            @* Devices *@
-            <section class="panel rise mt-3" style="animation-delay:.12s">
+            <CollectionEditor TRow="AbCipDeviceRow" Items="_devices" Title="Devices" ItemNoun="device"
-                <div class="panel-head">Devices</div>
+                              AnimationDelay=".12s"
-                <div style="padding:1rem">
+                              NewRow="@(() => new AbCipDeviceRow())" Clone="@(r => r.Clone())"
-                    <p class="form-text mb-2">
+                              Validate="AbCipDeviceRow.ValidateRow">
-                        Device list (host addresses, PLC family, packing overrides) — full list-editor coming in a follow-up phase. Each entry: <code>{ "hostAddress": "ab://gateway/1,0", "plcFamily": "ControlLogix" }</code>.
+                <HeaderTemplate>
-                    </p>
+                    <tr><th>Host address</th><th>PLC family</th><th>Device name</th><th></th></tr>
-                    <pre class="form-control form-control-sm mono" style="min-height:4rem;overflow:auto;white-space:pre-wrap;">@_devicesJson</pre>
+                </HeaderTemplate>
-                </div>
+                <RowTemplate Context="d">
-            </section>
+                    <td class="mono">@d.HostAddress</td><td>@d.PlcFamily</td>
                    <td>@(string.IsNullOrWhiteSpace(d.DeviceName) ? "—" : d.DeviceName)</td>
                </RowTemplate>
                <EditTemplate Context="d">
                    <div class="row g-3">
                        <div class="col-md-6"><label class="form-label">Host address</label>
                            <input class="form-control form-control-sm mono" @bind="d.HostAddress"
                                   placeholder="ab://gateway/1,0" /></div>
                        <div class="col-md-3"><label class="form-label">PLC family</label>
                            <select class="form-select form-select-sm" @bind="d.PlcFamily">
                                @foreach (var e in Enum.GetValues<AbCipPlcFamily>()) { <option value="@e">@e</option> }
                            </select></div>
                        <div class="col-md-3"><label class="form-label">Device name</label>
                            <input class="form-control form-control-sm" @bind="d.DeviceName" /></div>
                    </div>
                </EditTemplate>
            </CollectionEditor>
-            @* Tags — read-only JSON view *@
+            @* Tags *@
-            <section class="panel rise mt-3" style="animation-delay:.14s">
+            <CollectionEditor TRow="AbCipTagRow" Items="_tags" Title="Tags" ItemNoun="tag"
-                <div class="panel-head">Tags</div>
+                              AnimationDelay=".14s"
-                <div style="padding:1rem">
+                              NewRow="@(() => new AbCipTagRow())" Clone="@(r => r.Clone())"
-                    <p class="form-text mb-2">
+                              Validate="AbCipTagRow.ValidateRow">
-                        Tag list — full list-editor coming in a follow-up phase. Edit via the Tag editor pages or export/import the driver config JSON.
+                <HeaderTemplate>
-                    </p>
+                    <tr><th>Name</th><th>Device</th><th>Tag path</th><th>Type</th><th>Writable</th><th></th></tr>
-                    <pre class="form-control form-control-sm mono" style="min-height:4rem;overflow:auto;white-space:pre-wrap;">@_tagsJson</pre>
+                </HeaderTemplate>
-                </div>
+                <RowTemplate Context="t">
-            </section>
+                    <td class="mono">@t.Name</td><td class="mono">@t.DeviceHostAddress</td>
                    <td class="mono">@t.TagPath</td><td>@t.DataType</td><td>@(t.Writable ? "yes" : "no")</td>
                </RowTemplate>
                <EditTemplate Context="t">
                    <div class="row g-3">
                        <div class="col-md-6"><label class="form-label">Name</label>
                            <input class="form-control form-control-sm" @bind="t.Name" /></div>
                        <div class="col-md-6"><label class="form-label">Device host address</label>
                            <input class="form-control form-control-sm mono" @bind="t.DeviceHostAddress"
                                   placeholder="ab://gateway/1,0" /></div>
                        <div class="col-md-6"><label class="form-label">Tag path</label>
                            <input class="form-control form-control-sm mono" @bind="t.TagPath"
                                   placeholder="e.g. Program:Main.SomeTag" /></div>
                        <div class="col-md-3"><label class="form-label">Data type</label>
                            <select class="form-select form-select-sm" @bind="t.DataType">
                                @foreach (var e in Enum.GetValues<AbCipDataType>()) { <option value="@e">@e</option> }
                            </select></div>
                        <div class="col-md-3"><div class="form-check form-switch mt-4">
                            <input type="checkbox" class="form-check-input" @bind="t.Writable" id="tagWritable" />
                            <label class="form-check-label" for="tagWritable">Writable</label></div></div>
                    </div>
                </EditTemplate>
            </CollectionEditor>
            <DriverResilienceSection @bind-ResilienceConfig="_form.ResilienceConfig" />
        </DriverFormShell>
@@ -202,11 +240,9 @@ else
    private void OnAddressPicked(string address) => _pickedAddress = address;
-    // Collections are preserved through round-trip and shown as read-only JSON.
+    // Held separately because Devices/Tags are collections — edited via the CollectionEditor modal.
-    private IReadOnlyList<AbCipDeviceOptions> _devices = [];
+    private List<AbCipDeviceRow> _devices = [];
-    private IReadOnlyList<AbCipTagDefinition> _tags = [];
+    private List<AbCipTagRow> _tags = [];
    private string _devicesJson = "[]";
    private string _tagsJson = "[]";
    protected override async Task OnInitializedAsync()
    {
@@ -246,12 +282,10 @@ else
                _form = FormModel.FromOptions(opts);
                _form.ResilienceConfig = _existing.ResilienceConfig;
                _form.RowVersion = _existing.RowVersion;
-                _devices = opts.Devices;
+                _devices = opts.Devices.Select(AbCipDeviceRow.FromDefinition).ToList();
-                _tags = opts.Tags;
+                _tags = opts.Tags.Select(AbCipTagRow.FromDefinition).ToList();
            }
        }
        _devicesJson = System.Text.Json.JsonSerializer.Serialize(_devices, _jsonOpts);
        _tagsJson = System.Text.Json.JsonSerializer.Serialize(_tags, _jsonOpts);
        _loaded = true;
    }
@@ -260,7 +294,11 @@ else
        _busy = true; _error = null;
        try
        {
-            var configJson = System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(_devices, _tags), _jsonOpts);
+            var configJson = System.Text.Json.JsonSerializer.Serialize(
                _form.ToOptions(
                    _devices.Select(r => r.ToDefinition()).ToList(),
                    _tags.Select(r => r.ToDefinition()).ToList()),
                _jsonOpts);
            await using var db = await DbFactory.CreateDbContextAsync();
            if (IsNew)
            {
@@ -331,7 +369,11 @@ else
    }
    private string SerializeCurrentConfig()
-        => System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(_devices, _tags), _jsonOpts);
+        => System.Text.Json.JsonSerializer.Serialize(
            _form.ToOptions(
                _devices.Select(r => r.ToDefinition()).ToList(),
                _tags.Select(r => r.ToDefinition()).ToList()),
            _jsonOpts);
    private static AbCipDriverOptions? TryDeserialize(string json)
    {
@@ -339,6 +381,91 @@ else
        catch { return null; }
    }
    // Mutable VM for the modal editor — AbCipDeviceOptions is an immutable record.
    public sealed class AbCipDeviceRow
    {
        public string HostAddress { get; set; } = "";
        public AbCipPlcFamily PlcFamily { get; set; } = AbCipPlcFamily.ControlLogix;
        public string? DeviceName { get; set; }
        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
        // (AllowPacking, ConnectionSize) across a load→save.
        private AbCipDeviceOptions? _source;
        public AbCipDeviceRow Clone() => (AbCipDeviceRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
        public static AbCipDeviceRow FromDefinition(AbCipDeviceOptions d) => new()
        {
            HostAddress = d.HostAddress, PlcFamily = d.PlcFamily, DeviceName = d.DeviceName,
            _source = d,
        };
        public AbCipDeviceOptions ToDefinition()
        {
            var baseDef = _source ?? new AbCipDeviceOptions(HostAddress.Trim(), PlcFamily);
            return baseDef with
            {
                HostAddress = HostAddress.Trim(),
                PlcFamily = PlcFamily,
                DeviceName = string.IsNullOrWhiteSpace(DeviceName) ? null : DeviceName.Trim(),
            };
        }
        public static string? ValidateRow(AbCipDeviceRow row, IReadOnlyList<AbCipDeviceRow> all, int? editIndex)
        {
            if (string.IsNullOrWhiteSpace(row.HostAddress)) return "Host address is required.";
            for (var i = 0; i < all.Count; i++)
                if (i != editIndex && string.Equals(all[i].HostAddress, row.HostAddress, StringComparison.OrdinalIgnoreCase))
                    return $"Duplicate device host address '{row.HostAddress}'.";
            return null;
        }
    }
    // Mutable VM for the modal editor — AbCipTagDefinition is an immutable record.
    public sealed class AbCipTagRow
    {
        public string Name { get; set; } = "";
        public string DeviceHostAddress { get; set; } = "";
        public string TagPath { get; set; } = "";
        public AbCipDataType DataType { get; set; } = AbCipDataType.DInt;
        public bool Writable { get; set; } = true;
        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
        // (WriteIdempotent, Members, SafetyTag) across a load→save.
        private AbCipTagDefinition? _source;
        public AbCipTagRow Clone() => (AbCipTagRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
        public static AbCipTagRow FromDefinition(AbCipTagDefinition d) => new()
        {
            Name = d.Name, DeviceHostAddress = d.DeviceHostAddress, TagPath = d.TagPath,
            DataType = d.DataType, Writable = d.Writable,
            _source = d,
        };
        public AbCipTagDefinition ToDefinition()
        {
            var baseDef = _source ?? new AbCipTagDefinition(Name.Trim(), DeviceHostAddress.Trim(), TagPath.Trim(), DataType);
            return baseDef with
            {
                Name = Name.Trim(),
                DeviceHostAddress = DeviceHostAddress.Trim(),
                TagPath = TagPath.Trim(),
                DataType = DataType,
                Writable = Writable,
            };
        }
        public static string? ValidateRow(AbCipTagRow row, IReadOnlyList<AbCipTagRow> all, int? editIndex)
        {
            if (string.IsNullOrWhiteSpace(row.Name)) return "Name is required.";
            for (var i = 0; i < all.Count; i++)
                if (i != editIndex && string.Equals(all[i].Name, row.Name, StringComparison.OrdinalIgnoreCase))
                    return $"Duplicate tag name '{row.Name}'.";
            return null;
        }
    }
    // Flat mutable model — all scalar properties settable for Blazor @bind-Value.
    // Collections (Devices, Tags) are kept on the component and passed in on ToOptions().
    public sealed class FormModel
@@ -112,30 +112,65 @@ else
                </div>
            </section>
-            @* Devices — read-only JSON view *@
+            @* Devices *@
-            <section class="panel rise mt-3" style="animation-delay:.10s">
+            <CollectionEditor TRow="AbLegacyDeviceRow" Items="_devices" Title="Devices" ItemNoun="device"
-                <div class="panel-head">Devices</div>
+                              AnimationDelay=".10s"
-                <div style="padding:1rem">
+                              NewRow="@(() => new AbLegacyDeviceRow())" Clone="@(r => r.Clone())"
-                    <p class="form-text mb-2">
+                              Validate="AbLegacyDeviceRow.ValidateRow">
-                        Device list (host addresses, PLC family) — full list-editor coming in a follow-up phase.
+                <HeaderTemplate>
-                        Each entry: <code>{ "hostAddress": "...", "plcFamily": "Slc500" }</code>.
+                    <tr><th>Host address</th><th>PLC family</th><th>Device name</th><th></th></tr>
-                        PLC families: <code>Slc500</code>, <code>MicroLogix</code>, <code>Plc5</code>, <code>LogixPccc</code>.
+                </HeaderTemplate>
-                    </p>
+                <RowTemplate Context="d">
-                    <pre class="form-control form-control-sm mono" style="min-height:4rem;overflow:auto;white-space:pre-wrap;">@_devicesJson</pre>
+                    <td class="mono">@d.HostAddress</td><td>@d.PlcFamily</td>
-                </div>
+                    <td>@(string.IsNullOrWhiteSpace(d.DeviceName) ? "—" : d.DeviceName)</td>
-            </section>
+                </RowTemplate>
                <EditTemplate Context="d">
                    <div class="row g-3">
                        <div class="col-md-6"><label class="form-label">Host address</label>
                            <input class="form-control form-control-sm mono" @bind="d.HostAddress"
                                   placeholder="10.0.0.10" /></div>
                        <div class="col-md-3"><label class="form-label">PLC family</label>
                            <select class="form-select form-select-sm" @bind="d.PlcFamily">
                                @foreach (var e in Enum.GetValues<AbLegacyPlcFamily>()) { <option value="@e">@e</option> }
                            </select></div>
                        <div class="col-md-3"><label class="form-label">Device name</label>
                            <input class="form-control form-control-sm" @bind="d.DeviceName" /></div>
                    </div>
                </EditTemplate>
            </CollectionEditor>
-            @* Tags — read-only JSON view *@
+            @* Tags *@
-            <section class="panel rise mt-3" style="animation-delay:.12s">
+            <CollectionEditor TRow="AbLegacyTagRow" Items="_tags" Title="Tags" ItemNoun="tag"
-                <div class="panel-head">Tags</div>
+                              AnimationDelay=".12s"
-                <div style="padding:1rem">
+                              NewRow="@(() => new AbLegacyTagRow())" Clone="@(r => r.Clone())"
-                    <p class="form-text mb-2">
+                              Validate="AbLegacyTagRow.ValidateRow">
-                        Tag list — full list-editor coming in a follow-up phase. Edit via the Tag editor pages or export/import the driver config JSON.
+                <HeaderTemplate>
-                        Each tag has a PCCC file address (e.g. <code>N7:0</code>, <code>F8:0</code>, <code>B3:0/0</code>).
+                    <tr><th>Name</th><th>Device</th><th>Address</th><th>Type</th><th>Writable</th><th></th></tr>
-                    </p>
+                </HeaderTemplate>
-                    <pre class="form-control form-control-sm mono" style="min-height:4rem;overflow:auto;white-space:pre-wrap;">@_tagsJson</pre>
+                <RowTemplate Context="t">
-                </div>
+                    <td class="mono">@t.Name</td><td class="mono">@t.DeviceHostAddress</td>
-            </section>
+                    <td class="mono">@t.Address</td><td>@t.DataType</td><td>@(t.Writable ? "yes" : "no")</td>
                </RowTemplate>
                <EditTemplate Context="t">
                    <div class="row g-3">
                        <div class="col-md-6"><label class="form-label">Name</label>
                            <input class="form-control form-control-sm" @bind="t.Name" /></div>
                        <div class="col-md-6"><label class="form-label">Device host address</label>
                            <input class="form-control form-control-sm mono" @bind="t.DeviceHostAddress"
                                   placeholder="10.0.0.10" /></div>
                        <div class="col-md-6"><label class="form-label">Address</label>
                            <input class="form-control form-control-sm mono" @bind="t.Address"
                                   placeholder="e.g. N7:0, F8:0, B3:0/0" /></div>
                        <div class="col-md-3"><label class="form-label">Data type</label>
                            <select class="form-select form-select-sm" @bind="t.DataType">
                                @foreach (var e in Enum.GetValues<AbLegacyDataType>()) { <option value="@e">@e</option> }
                            </select></div>
                        <div class="col-md-3"><div class="form-check form-switch mt-4">
                            <input type="checkbox" class="form-check-input" @bind="t.Writable" id="tagWritable" />
                            <label class="form-check-label" for="tagWritable">Writable</label></div></div>
                    </div>
                </EditTemplate>
            </CollectionEditor>
            <DriverResilienceSection @bind-ResilienceConfig="_form.ResilienceConfig" />
        </DriverFormShell>
@@ -171,11 +206,9 @@ else
    private void OnAddressPicked(string address) => _pickedAddress = address;
-    // Collections are preserved through round-trip and shown as read-only JSON.
+    // Held separately because Devices/Tags are collections — edited via the CollectionEditor modal.
-    private IReadOnlyList<AbLegacyDeviceOptions> _devices = [];
+    private List<AbLegacyDeviceRow> _devices = [];
-    private IReadOnlyList<AbLegacyTagDefinition> _tags = [];
+    private List<AbLegacyTagRow> _tags = [];
    private string _devicesJson = "[]";
    private string _tagsJson = "[]";
    protected override async Task OnInitializedAsync()
    {
@@ -215,12 +248,10 @@ else
                _form = FormModel.FromOptions(opts);
                _form.ResilienceConfig = _existing.ResilienceConfig;
                _form.RowVersion = _existing.RowVersion;
-                _devices = opts.Devices;
+                _devices = opts.Devices.Select(AbLegacyDeviceRow.FromDefinition).ToList();
-                _tags = opts.Tags;
+                _tags = opts.Tags.Select(AbLegacyTagRow.FromDefinition).ToList();
            }
        }
        _devicesJson = System.Text.Json.JsonSerializer.Serialize(_devices, _jsonOpts);
        _tagsJson = System.Text.Json.JsonSerializer.Serialize(_tags, _jsonOpts);
        _loaded = true;
    }
@@ -229,7 +260,11 @@ else
        _busy = true; _error = null;
        try
        {
-            var configJson = System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(_devices, _tags), _jsonOpts);
+            var configJson = System.Text.Json.JsonSerializer.Serialize(
                _form.ToOptions(
                    _devices.Select(r => r.ToDefinition()).ToList(),
                    _tags.Select(r => r.ToDefinition()).ToList()),
                _jsonOpts);
            await using var db = await DbFactory.CreateDbContextAsync();
            if (IsNew)
            {
@@ -300,7 +335,11 @@ else
    }
    private string SerializeCurrentConfig()
-        => System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(_devices, _tags), _jsonOpts);
+        => System.Text.Json.JsonSerializer.Serialize(
            _form.ToOptions(
                _devices.Select(r => r.ToDefinition()).ToList(),
                _tags.Select(r => r.ToDefinition()).ToList()),
            _jsonOpts);
    private static AbLegacyDriverOptions? TryDeserialize(string json)
    {
@@ -308,6 +347,91 @@ else
        catch { return null; }
    }
    // Mutable VM for the modal editor — AbLegacyDeviceOptions is an immutable record.
    public sealed class AbLegacyDeviceRow
    {
        public string HostAddress { get; set; } = "";
        public AbLegacyPlcFamily PlcFamily { get; set; } = AbLegacyPlcFamily.Slc500;
        public string? DeviceName { get; set; }
        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
        // across a load→save.
        private AbLegacyDeviceOptions? _source;
        public AbLegacyDeviceRow Clone() => (AbLegacyDeviceRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
        public static AbLegacyDeviceRow FromDefinition(AbLegacyDeviceOptions d) => new()
        {
            HostAddress = d.HostAddress, PlcFamily = d.PlcFamily, DeviceName = d.DeviceName,
            _source = d,
        };
        public AbLegacyDeviceOptions ToDefinition()
        {
            var baseDef = _source ?? new AbLegacyDeviceOptions(HostAddress.Trim(), PlcFamily);
            return baseDef with
            {
                HostAddress = HostAddress.Trim(),
                PlcFamily = PlcFamily,
                DeviceName = string.IsNullOrWhiteSpace(DeviceName) ? null : DeviceName.Trim(),
            };
        }
        public static string? ValidateRow(AbLegacyDeviceRow row, IReadOnlyList<AbLegacyDeviceRow> all, int? editIndex)
        {
            if (string.IsNullOrWhiteSpace(row.HostAddress)) return "Host address is required.";
            for (var i = 0; i < all.Count; i++)
                if (i != editIndex && string.Equals(all[i].HostAddress, row.HostAddress, StringComparison.OrdinalIgnoreCase))
                    return $"Duplicate device host address '{row.HostAddress}'.";
            return null;
        }
    }
    // Mutable VM for the modal editor — AbLegacyTagDefinition is an immutable record.
    public sealed class AbLegacyTagRow
    {
        public string Name { get; set; } = "";
        public string DeviceHostAddress { get; set; } = "";
        public string Address { get; set; } = "";
        public AbLegacyDataType DataType { get; set; } = AbLegacyDataType.Int;
        public bool Writable { get; set; } = true;
        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
        // (WriteIdempotent) across a load→save.
        private AbLegacyTagDefinition? _source;
        public AbLegacyTagRow Clone() => (AbLegacyTagRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
        public static AbLegacyTagRow FromDefinition(AbLegacyTagDefinition d) => new()
        {
            Name = d.Name, DeviceHostAddress = d.DeviceHostAddress, Address = d.Address,
            DataType = d.DataType, Writable = d.Writable,
            _source = d,
        };
        public AbLegacyTagDefinition ToDefinition()
        {
            var baseDef = _source ?? new AbLegacyTagDefinition(Name.Trim(), DeviceHostAddress.Trim(), Address.Trim(), DataType);
            return baseDef with
            {
                Name = Name.Trim(),
                DeviceHostAddress = DeviceHostAddress.Trim(),
                Address = Address.Trim(),
                DataType = DataType,
                Writable = Writable,
            };
        }
        public static string? ValidateRow(AbLegacyTagRow row, IReadOnlyList<AbLegacyTagRow> all, int? editIndex)
        {
            if (string.IsNullOrWhiteSpace(row.Name)) return "Name is required.";
            for (var i = 0; i < all.Count; i++)
                if (i != editIndex && string.Equals(all[i].Name, row.Name, StringComparison.OrdinalIgnoreCase))
                    return $"Duplicate tag name '{row.Name}'.";
            return null;
        }
    }
    // Flat mutable model — all scalar properties settable for Blazor @bind-Value.
    // Collections (Devices, Tags) are kept on the component and passed in on ToOptions().
    public sealed class FormModel
@@ -1,8 +1,6 @@
-@* Dispatch page: reads DriverInstance.DriverType and renders the matching typed editor
+@* Dispatch page: reads DriverInstance.DriverType and dispatches to the matching typed editor
-   via <DynamicComponent>. Falls back to the legacy DriverEdit for any type not yet in
+   via <DynamicComponent> using _componentMap. Shows an error panel when the driver type has
-   the map. The route collides with DriverEdit.razor's identical directive — that's
+   no registered typed page. *@
   intentional. Task 3.4 removes the route from DriverEdit.razor. Blazor route conflicts
   are runtime, not build-time, so the build succeeds now. *@
@page "/clusters/{ClusterId}/drivers/{DriverInstanceId}"
@attribute [Microsoft.AspNetCore.Authorization.Authorize]
@rendermode RenderMode.InteractiveServer
@@ -61,7 +59,7 @@ else
            ["TwinCat"]              = typeof(TwinCATDriverPage),
            ["Focas"]                = typeof(FocasDriverPage),
            ["OpcUaClient"]          = typeof(OpcUaClientDriverPage),
-            ["Galaxy"]               = typeof(GalaxyDriverPage),
+            ["GalaxyMxGateway"]      = typeof(GalaxyDriverPage),
            ["Historian.Wonderware"] = typeof(HistorianWonderwareDriverPage),
        };
@@ -1,6 +1,5 @@
-@* TODO(3.3): This route collides with DriverEdit.razor's @page "/clusters/{ClusterId}/drivers/new".
+@* Driver type picker — presents a card grid of registered driver types and links to the
-   Task 3.3 removes the /drivers/new directive from DriverEdit.razor so this page takes over.
+   per-type new-driver creation page (/clusters/{ClusterId}/drivers/new/{slug}). *@
   Blazor resolves route conflicts at runtime, not compile time, so the build succeeds now. *@
@page "/clusters/{ClusterId}/drivers/new"
@attribute [Microsoft.AspNetCore.Authorization.Authorize]
@@ -189,43 +189,65 @@ else
                </div>
            </section>
-            @* Devices — read-only JSON view *@
+            @* Devices *@
-            <section class="panel rise mt-3" style="animation-delay:.20s">
+            <CollectionEditor TRow="FocasDeviceRow" Items="_devices" Title="Devices" ItemNoun="device"
-                <div class="panel-head">Devices</div>
+                              AnimationDelay=".20s"
-                <div style="padding:1rem">
+                              NewRow="@(() => new FocasDeviceRow())" Clone="@(r => r.Clone())"
-                    <div class="form-text mb-2">
+                              Validate="FocasDeviceRow.ValidateRow">
-                        Each device represents one CNC. Device list editor (with CNC series selector) coming in a follow-up phase.
+                <HeaderTemplate>
-                        Format: <code>[{"hostAddress":"192.168.0.10:8193","deviceName":"CNC1","series":"Thirty_i"}]</code>
+                    <tr><th>Host address</th><th>CNC series</th><th>Device name</th><th></th></tr>
                </HeaderTemplate>
                <RowTemplate Context="d">
                    <td class="mono">@d.HostAddress</td><td>@d.Series</td>
                    <td>@(string.IsNullOrWhiteSpace(d.DeviceName) ? "—" : d.DeviceName)</td>
                </RowTemplate>
                <EditTemplate Context="d">
                    <div class="row g-3">
                        <div class="col-md-6"><label class="form-label">Host address</label>
                            <input class="form-control form-control-sm mono" @bind="d.HostAddress"
                                   placeholder="192.168.0.10:8193" /></div>
                        <div class="col-md-3"><label class="form-label">CNC series</label>
                            <select class="form-select form-select-sm" @bind="d.Series">
                                @foreach (var e in Enum.GetValues<FocasCncSeries>()) { <option value="@e">@e</option> }
                            </select></div>
                        <div class="col-md-3"><label class="form-label">Device name</label>
                            <input class="form-control form-control-sm" @bind="d.DeviceName" /></div>
                    </div>
-                    @if (_form.DevicesJson is not null)
+                </EditTemplate>
-                    {
+            </CollectionEditor>
                        <pre class="form-control form-control-sm mono" style="min-height:4rem;max-height:12rem;overflow:auto;white-space:pre-wrap">@_form.DevicesJson</pre>
                    }
                    else
                    {
                        <p class="text-muted"><em>No devices configured.</em></p>
                    }
                </div>
            </section>
-            @* Tags — read-only JSON view *@
+            @* Tags *@
-            <section class="panel rise mt-3" style="animation-delay:.23s">
+            <CollectionEditor TRow="FocasTagRow" Items="_tags" Title="Tags" ItemNoun="tag"
-                <div class="panel-head">Tags</div>
+                              AnimationDelay=".23s"
-                <div style="padding:1rem">
+                              NewRow="@(() => new FocasTagRow())" Clone="@(r => r.Clone())"
-                    <div class="form-text mb-2">
+                              Validate="FocasTagRow.ValidateRow">
-                        Tag list editor coming in a follow-up phase. Tags reference device host addresses and FOCAS address strings
+                <HeaderTemplate>
-                        (e.g. <code>X0.0</code>, <code>R100</code>, <code>PARAM:1815/0</code>, <code>MACRO:500</code>).
+                    <tr><th>Name</th><th>Device</th><th>Address</th><th>Type</th><th>Writable</th><th></th></tr>
                </HeaderTemplate>
                <RowTemplate Context="t">
                    <td class="mono">@t.Name</td><td class="mono">@t.DeviceHostAddress</td>
                    <td class="mono">@t.Address</td><td>@t.DataType</td><td>@(t.Writable ? "yes" : "no")</td>
                </RowTemplate>
                <EditTemplate Context="t">
                    <div class="row g-3">
                        <div class="col-md-6"><label class="form-label">Name</label>
                            <input class="form-control form-control-sm" @bind="t.Name" /></div>
                        <div class="col-md-6"><label class="form-label">Device host address</label>
                            <input class="form-control form-control-sm mono" @bind="t.DeviceHostAddress"
                                   placeholder="192.168.0.10:8193" /></div>
                        <div class="col-md-6"><label class="form-label">Address</label>
                            <input class="form-control form-control-sm mono" @bind="t.Address"
                                   placeholder="e.g. X0.0, R100, PARAM:1815/0, MACRO:500" /></div>
                        <div class="col-md-3"><label class="form-label">Data type</label>
                            <select class="form-select form-select-sm" @bind="t.DataType">
                                @foreach (var e in Enum.GetValues<FocasDataType>()) { <option value="@e">@e</option> }
                            </select></div>
                        <div class="col-md-3"><div class="form-check form-switch mt-4">
                            <input type="checkbox" class="form-check-input" @bind="t.Writable" id="tagWritable" />
                            <label class="form-check-label" for="tagWritable">Writable</label></div></div>
                    </div>
-                    @if (_form.TagsJson is not null)
+                </EditTemplate>
-                    {
+            </CollectionEditor>
                        <pre class="form-control form-control-sm mono" style="min-height:4rem;max-height:12rem;overflow:auto;white-space:pre-wrap">@_form.TagsJson</pre>
                    }
                    else
                    {
                        <p class="text-muted"><em>No tags configured.</em></p>
                    }
                </div>
            </section>
            <DriverResilienceSection @bind-ResilienceConfig="_form.ResilienceConfig" />
        </DriverFormShell>
@@ -260,6 +282,10 @@ else
    private void OnAddressPicked(string address) => _pickedAddress = address;
    // Held separately because Devices/Tags are collections — edited via the CollectionEditor modal.
    private List<FocasDeviceRow> _devices = [];
    private List<FocasTagRow> _tags = [];
    protected override async Task OnInitializedAsync()
    {
        await using var db = await DbFactory.CreateDbContextAsync();
@@ -290,6 +316,8 @@ else
                _form = FormModel.FromOptions(opts);
                _form.ResilienceConfig = _existing.ResilienceConfig;
                _form.RowVersion = _existing.RowVersion;
                _devices = opts.Devices.Select(FocasDeviceRow.FromDefinition).ToList();
                _tags = opts.Tags.Select(FocasTagRow.FromDefinition).ToList();
            }
        }
        _loaded = true;
@@ -300,7 +328,9 @@ else
        _busy = true; _error = null;
        try
        {
-            var opts = _form.ToOptions();
+            var opts = _form.ToOptions(
                _devices.Select(r => r.ToDefinition()).ToList(),
                _tags.Select(r => r.ToDefinition()).ToList());
            var configJson = System.Text.Json.JsonSerializer.Serialize(opts, _jsonOpts);
            await using var db = await DbFactory.CreateDbContextAsync();
            if (IsNew)
@@ -371,7 +401,11 @@ else
    }
    private string SerializeCurrentConfig()
-        => System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(), _jsonOpts);
+        => System.Text.Json.JsonSerializer.Serialize(
            _form.ToOptions(
                _devices.Select(r => r.ToDefinition()).ToList(),
                _tags.Select(r => r.ToDefinition()).ToList()),
            _jsonOpts);
    private static FocasDriverOptions? TryDeserialize(string json)
    {
@@ -379,6 +413,93 @@ else
        catch { return null; }
    }
    // Mutable VM for the modal editor — FocasDeviceOptions is an immutable record.
    public sealed class FocasDeviceRow
    {
        public string HostAddress { get; set; } = "";
        public FocasCncSeries Series { get; set; } = FocasCncSeries.Unknown;
        public string? DeviceName { get; set; }
        // Original record (null for newly-added rows). Preserves any fields the editor doesn't
        // expose across a load→save.
        private FocasDeviceOptions? _source;
        public FocasDeviceRow Clone() => (FocasDeviceRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
        public static FocasDeviceRow FromDefinition(FocasDeviceOptions d) => new()
        {
            HostAddress = d.HostAddress, Series = d.Series, DeviceName = d.DeviceName,
            _source = d,
        };
        public FocasDeviceOptions ToDefinition()
        {
            var baseDef = _source ?? new FocasDeviceOptions(HostAddress.Trim());
            return baseDef with
            {
                HostAddress = HostAddress.Trim(),
                Series = Series,
                DeviceName = string.IsNullOrWhiteSpace(DeviceName) ? null : DeviceName.Trim(),
            };
        }
        public static string? ValidateRow(FocasDeviceRow row, IReadOnlyList<FocasDeviceRow> all, int? editIndex)
        {
            if (string.IsNullOrWhiteSpace(row.HostAddress)) return "Host address is required.";
            for (var i = 0; i < all.Count; i++)
                if (i != editIndex && string.Equals(all[i].HostAddress, row.HostAddress, StringComparison.OrdinalIgnoreCase))
                    return $"Duplicate device host address '{row.HostAddress}'.";
            return null;
        }
    }
    // Mutable VM for the modal editor — FocasTagDefinition is an immutable record.
    public sealed class FocasTagRow
    {
        public string Name { get; set; } = "";
        public string DeviceHostAddress { get; set; } = "";
        public string Address { get; set; } = "";
        public FocasDataType DataType { get; set; } = FocasDataType.Int32;
        public bool Writable { get; set; } = true;
        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
        // (WriteIdempotent) across a load→save.
        private FocasTagDefinition? _source;
        public FocasTagRow Clone() => (FocasTagRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
        public static FocasTagRow FromDefinition(FocasTagDefinition d) => new()
        {
            Name = d.Name, DeviceHostAddress = d.DeviceHostAddress, Address = d.Address,
            DataType = d.DataType, Writable = d.Writable,
            _source = d,
        };
        public FocasTagDefinition ToDefinition()
        {
            var baseDef = _source ?? new FocasTagDefinition(Name.Trim(), DeviceHostAddress.Trim(), Address.Trim(), DataType);
            return baseDef with
            {
                Name = Name.Trim(),
                DeviceHostAddress = DeviceHostAddress.Trim(),
                Address = Address.Trim(),
                DataType = DataType,
                Writable = Writable,
            };
        }
        public static string? ValidateRow(FocasTagRow row, IReadOnlyList<FocasTagRow> all, int? editIndex)
        {
            if (string.IsNullOrWhiteSpace(row.Name)) return "Name is required.";
            for (var i = 0; i < all.Count; i++)
                if (i != editIndex && string.Equals(all[i].Name, row.Name, StringComparison.OrdinalIgnoreCase))
                    return $"Duplicate tag name '{row.Name}'.";
            return null;
        }
    }
    // Flat mutable model — all scalar properties settable for Blazor @bind-Value.
    // Collections (Devices, Tags) are kept on the component and passed in on ToOptions().
    public sealed class FormModel
    {
        // Connection
@@ -404,52 +525,30 @@ else
        public int FixedTreeProgramPollIntervalSeconds { get; set; } = 1;
        public int FixedTreeTimerPollIntervalSeconds { get; set; } = 30;
        // Collections JSON view (read-only)
        public string? DevicesJson { get; set; }
        public string? TagsJson { get; set; }
        // Preserved originals (round-tripped unchanged)
        private IReadOnlyList<FocasDeviceOptions> _devices = [];
        private IReadOnlyList<FocasTagDefinition> _tags = [];
        // Common
        public string? ResilienceConfig { get; set; }
        public byte[] RowVersion { get; set; } = [];
-        private static readonly System.Text.Json.JsonSerializerOptions _displayOpts = new()
+        public static FormModel FromOptions(FocasDriverOptions o) => new()
        {
-            WriteIndented = true,
+            TimeoutSeconds = (int)o.Timeout.TotalSeconds,
-            PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase,
+            ProbeEnabled = o.Probe.Enabled,
            ProbeIntervalSeconds = (int)o.Probe.Interval.TotalSeconds,
            ProbeTimeoutSeconds = (int)o.Probe.Timeout.TotalSeconds,
            AdminProbeTimeoutSeconds = o.ProbeTimeoutSeconds,
            AlarmProjectionEnabled = o.AlarmProjection.Enabled,
            AlarmProjectionPollIntervalSeconds = (int)o.AlarmProjection.PollInterval.TotalSeconds,
            HandleRecycleEnabled = o.HandleRecycle.Enabled,
            HandleRecycleIntervalMinutes = (int)o.HandleRecycle.Interval.TotalMinutes,
            FixedTreeEnabled = o.FixedTree.Enabled,
            FixedTreePollIntervalMs = (int)o.FixedTree.PollInterval.TotalMilliseconds,
            FixedTreeProgramPollIntervalSeconds = (int)o.FixedTree.ProgramPollInterval.TotalSeconds,
            FixedTreeTimerPollIntervalSeconds = (int)o.FixedTree.TimerPollInterval.TotalSeconds,
        };
-        public static FormModel FromOptions(FocasDriverOptions o)
+        public FocasDriverOptions ToOptions(
-        {
+            IReadOnlyList<FocasDeviceOptions> devices,
-            var m = new FormModel
+            IReadOnlyList<FocasTagDefinition> tags) => new()
            {
                TimeoutSeconds = (int)o.Timeout.TotalSeconds,
                ProbeEnabled = o.Probe.Enabled,
                ProbeIntervalSeconds = (int)o.Probe.Interval.TotalSeconds,
                ProbeTimeoutSeconds = (int)o.Probe.Timeout.TotalSeconds,
                AdminProbeTimeoutSeconds = o.ProbeTimeoutSeconds,
                AlarmProjectionEnabled = o.AlarmProjection.Enabled,
                AlarmProjectionPollIntervalSeconds = (int)o.AlarmProjection.PollInterval.TotalSeconds,
                HandleRecycleEnabled = o.HandleRecycle.Enabled,
                HandleRecycleIntervalMinutes = (int)o.HandleRecycle.Interval.TotalMinutes,
                FixedTreeEnabled = o.FixedTree.Enabled,
                FixedTreePollIntervalMs = (int)o.FixedTree.PollInterval.TotalMilliseconds,
                FixedTreeProgramPollIntervalSeconds = (int)o.FixedTree.ProgramPollInterval.TotalSeconds,
                FixedTreeTimerPollIntervalSeconds = (int)o.FixedTree.TimerPollInterval.TotalSeconds,
                _devices = o.Devices,
                _tags = o.Tags,
            };
            m.DevicesJson = o.Devices.Count == 0 ? null
                : System.Text.Json.JsonSerializer.Serialize(o.Devices, _displayOpts);
            m.TagsJson = o.Tags.Count == 0 ? null
                : System.Text.Json.JsonSerializer.Serialize(o.Tags, _displayOpts);
            return m;
        }
        public FocasDriverOptions ToOptions() => new()
        {
            Timeout = TimeSpan.FromSeconds(TimeoutSeconds),
            Probe = new FocasProbeOptions
@@ -476,8 +575,8 @@ else
                ProgramPollInterval = TimeSpan.FromSeconds(FixedTreeProgramPollIntervalSeconds),
                TimerPollInterval = TimeSpan.FromSeconds(FixedTreeTimerPollIntervalSeconds),
            },
-            Devices = _devices,
+            Devices = devices,
-            Tags = _tags,
+            Tags = tags,
        };
    }
 }
@@ -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,
+            // Null-coalesce each nested record to its default so that persisted configs
-            GatewayApiKeySecretRef = r.Gateway.ApiKeySecretRef,
+            // that pre-date a section (e.g. no Reconnect key, or PascalCase keys that
-            GatewayUseTls = r.Gateway.UseTls,
+            // don't match the camelCase deserializer) don't cause a NullReferenceException.
-            GatewayCaCertificatePath = r.Gateway.CaCertificatePath,
+            var gw   = r.Gateway    ?? new GalaxyGatewayOptions("https://localhost:5001", "env:MX_API_KEY");
-            GatewayConnectTimeoutSeconds = r.Gateway.ConnectTimeoutSeconds,
+            var mx   = r.MxAccess   ?? new GalaxyMxAccessOptions("OtOpcUa");
-            GatewayDefaultCallTimeoutSeconds = r.Gateway.DefaultCallTimeoutSeconds,
+            var repo = r.Repository ?? new GalaxyRepositoryOptions();
-            GatewayStreamTimeoutSeconds = r.Gateway.StreamTimeoutSeconds,
+            var rc   = r.Reconnect  ?? new GalaxyReconnectOptions();
-            MxClientName = r.MxAccess.ClientName,
+            return new()
-            MxPublishingIntervalMs = r.MxAccess.PublishingIntervalMs,
+            {
-            MxWriteUserId = r.MxAccess.WriteUserId,
+                GatewayEndpoint = gw.Endpoint,
-            MxEventPumpChannelCapacity = r.MxAccess.EventPumpChannelCapacity,
+                GatewayApiKeySecretRef = gw.ApiKeySecretRef,
-            RepositoryDiscoverPageSize = r.Repository.DiscoverPageSize,
+                GatewayUseTls = gw.UseTls,
-            RepositoryWatchDeployEvents = r.Repository.WatchDeployEvents,
+                GatewayCaCertificatePath = gw.CaCertificatePath,
-            ReconnectInitialBackoffMs = r.Reconnect.InitialBackoffMs,
+                GatewayConnectTimeoutSeconds = gw.ConnectTimeoutSeconds,
-            ReconnectMaxBackoffMs = r.Reconnect.MaxBackoffMs,
+                GatewayDefaultCallTimeoutSeconds = gw.DefaultCallTimeoutSeconds,
-            ReconnectReplayOnSessionLost = r.Reconnect.ReplayOnSessionLost,
+                GatewayStreamTimeoutSeconds = gw.StreamTimeoutSeconds,
-            ProbeTimeoutSeconds = r.ProbeTimeoutSeconds,
+                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(
@@ -273,16 +273,44 @@ else
                </div>
            </section>
-            @* Tags — read-only JSON view *@
+            <CollectionEditor TRow="ModbusTagRow" Items="_tags" Title="Tags" ItemNoun="tag"
-            <section class="panel rise mt-3" style="animation-delay:.18s">
+                              NewRow="@(() => new ModbusTagRow())" Clone="@(r => r.Clone())"
-                <div class="panel-head">Tags</div>
+                              Validate="ModbusTagRow.ValidateRow">
-                <div style="padding:1rem">
+                <HeaderTemplate>
-                    <p class="form-text mb-2">
+                    <tr><th>Name</th><th>Region</th><th>Address</th><th>Type</th><th>Writable</th><th></th></tr>
-                        Tag list — full list-editor coming in a follow-up phase. Edit tags via the Tag editor pages or by exporting/importing the driver config JSON.
+                </HeaderTemplate>
-                    </p>
+                <RowTemplate Context="t">
-                    <pre class="form-control form-control-sm mono" style="min-height:4rem;overflow:auto;white-space:pre-wrap;">@_tagsJson</pre>
+                    <td class="mono">@t.Name</td><td>@t.Region</td><td class="mono">@t.Address</td>
-                </div>
+                    <td>@t.DataType</td><td>@(t.Writable ? "yes" : "no")</td>
-            </section>
+                </RowTemplate>
                <EditTemplate Context="t">
                    <div class="row g-3">
                        <div class="col-md-6"><label class="form-label">Name</label>
                            <input class="form-control form-control-sm" @bind="t.Name" /></div>
                        <div class="col-md-3"><label class="form-label">Region</label>
                            <select class="form-select form-select-sm" @bind="t.Region">
                                @foreach (var e in Enum.GetValues<ModbusRegion>()) { <option value="@e">@e</option> }
                            </select></div>
                        <div class="col-md-3"><label class="form-label">Address</label>
                            <input type="number" class="form-control form-control-sm" @bind="t.Address" /></div>
                        <div class="col-md-3"><label class="form-label">Data type</label>
                            <select class="form-select form-select-sm" @bind="t.DataType">
                                @foreach (var e in Enum.GetValues<ModbusDataType>()) { <option value="@e">@e</option> }
                            </select></div>
                        <div class="col-md-3"><label class="form-label">Byte order</label>
                            <select class="form-select form-select-sm" @bind="t.ByteOrder">
                                @foreach (var e in Enum.GetValues<ModbusByteOrder>()) { <option value="@e">@e</option> }
                            </select></div>
                        <div class="col-md-2"><label class="form-label">Bit index</label>
                            <input type="number" class="form-control form-control-sm" @bind="t.BitIndex" /></div>
                        <div class="col-md-2"><label class="form-label">String len</label>
                            <input type="number" class="form-control form-control-sm" @bind="t.StringLength" /></div>
                        <div class="col-md-2"><div class="form-check form-switch mt-4">
                            <input type="checkbox" class="form-check-input" @bind="t.Writable" id="tagWritable" />
                            <label class="form-check-label" for="tagWritable">Writable</label></div></div>
                    </div>
                </EditTemplate>
            </CollectionEditor>
            <DriverResilienceSection @bind-ResilienceConfig="_form.ResilienceConfig" />
        </DriverFormShell>
@@ -318,9 +346,8 @@ else
    private void OnAddressPicked(string address) => _pickedAddress = address;
-    // Held separately because Tags is a collection — rendered as read-only JSON.
+    // Held separately because Tags is a collection — edited via the CollectionEditor modal.
-    private IReadOnlyList<ModbusTagDefinition> _tags = [];
+    private List<ModbusTagRow> _tags = [];
    private string _tagsJson = "[]";
    protected override async Task OnInitializedAsync()
    {
@@ -360,10 +387,9 @@ else
                _form = FormModel.FromOptions(opts);
                _form.ResilienceConfig = _existing.ResilienceConfig;
                _form.RowVersion = _existing.RowVersion;
-                _tags = opts.Tags;
+                _tags = opts.Tags.Select(ModbusTagRow.FromDefinition).ToList();
            }
        }
        _tagsJson = System.Text.Json.JsonSerializer.Serialize(_tags, _jsonOpts);
        _loaded = true;
    }
@@ -372,7 +398,7 @@ else
        _busy = true; _error = null;
        try
        {
-            var configJson = System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(_tags), _jsonOpts);
+            var configJson = System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(_tags.Select(r => r.ToDefinition()).ToList()), _jsonOpts);
            await using var db = await DbFactory.CreateDbContextAsync();
            if (IsNew)
            {
@@ -443,7 +469,7 @@ else
    }
    private string SerializeCurrentConfig()
-        => System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(_tags), _jsonOpts);
+        => System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(_tags.Select(r => r.ToDefinition()).ToList()), _jsonOpts);
    private static ModbusDriverOptions? TryDeserialize(string json)
    {
@@ -451,6 +477,60 @@ else
        catch { return null; }
    }
    // Mutable VM for the modal editor — ModbusTagDefinition is an immutable record.
    public sealed class ModbusTagRow
    {
        public string Name { get; set; } = "";
        public ModbusRegion Region { get; set; } = ModbusRegion.HoldingRegisters;
        public int Address { get; set; }
        public ModbusDataType DataType { get; set; } = ModbusDataType.Int16;
        public bool Writable { get; set; } = true;
        public ModbusByteOrder ByteOrder { get; set; } = ModbusByteOrder.BigEndian;
        public int BitIndex { get; set; }
        public int StringLength { get; set; }
        public bool WriteIdempotent { get; set; }
        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
        // (StringByteOrder, ArrayCount, Deadband, UnitId, CoalesceProhibited) across a load→save.
        private ModbusTagDefinition? _source;
        public ModbusTagRow Clone() => (ModbusTagRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
        public static ModbusTagRow FromDefinition(ModbusTagDefinition d) => new()
        {
            Name = d.Name, Region = d.Region, Address = d.Address, DataType = d.DataType,
            Writable = d.Writable, ByteOrder = d.ByteOrder, BitIndex = d.BitIndex,
            StringLength = d.StringLength, WriteIdempotent = d.WriteIdempotent,
            _source = d,
        };
        public ModbusTagDefinition ToDefinition()
        {
            var baseDef = _source ?? new ModbusTagDefinition(Name.Trim(), Region, 0, DataType);
            return baseDef with
            {
                Name = Name.Trim(),
                Region = Region,
                Address = (ushort)Math.Clamp(Address, 0, 65535),
                DataType = DataType,
                Writable = Writable,
                ByteOrder = ByteOrder,
                BitIndex = (byte)Math.Clamp(BitIndex, 0, 255),
                StringLength = (ushort)Math.Clamp(StringLength, 0, 65535),
                WriteIdempotent = WriteIdempotent,
            };
        }
        public static string? ValidateRow(ModbusTagRow row, IReadOnlyList<ModbusTagRow> all, int? editIndex)
        {
            if (string.IsNullOrWhiteSpace(row.Name)) return "Name is required.";
            for (var i = 0; i < all.Count; i++)
                if (i != editIndex && string.Equals(all[i].Name, row.Name, StringComparison.OrdinalIgnoreCase))
                    return $"Duplicate tag name '{row.Name}'.";
            return null;
        }
    }
    // Flat mutable model — all scalars exposed as settable properties so Blazor @bind-Value works.
    // Collection (Tags) is kept on the component (_tags) and passed in when building the final Options.
    public sealed class FormModel
@@ -131,11 +131,25 @@ else
                            <div class="form-text">Default 10.</div>
                        </div>
                    </div>
                    @* Endpoint URLs list — read-only JSON view (full list-editor is a follow-up) *@
                    <div class="row g-3 mt-1">
                        <div class="col-12">
-                            <label class="form-label">Endpoint URLs (failover list — read-only; edit via raw JSON import or use Endpoint URL above)</label>
+                            <CollectionEditor TRow="EndpointUrlRow" Items="_endpoints"
-                            <pre class="form-control form-control-sm mono" style="min-height:3rem;overflow:auto;white-space:pre-wrap;">@_endpointUrlsJson</pre>
+                                              Title="Endpoint URLs" ItemNoun="endpoint" AnimationDelay=".07s"
                                              NewRow="@(() => new EndpointUrlRow())" Clone="@(r => r.Clone())"
                                              Validate="EndpointUrlRow.ValidateRow">
                                <HeaderTemplate>
                                    <tr><th>Endpoint URL (failover list — first reachable wins)</th><th></th></tr>
                                </HeaderTemplate>
                                <RowTemplate Context="e">
                                    <td class="mono">@e.Url</td>
                                </RowTemplate>
                                <EditTemplate Context="e">
                                    <label class="form-label">Endpoint URL</label>
                                    <input class="form-control form-control-sm mono" @bind="e.Url"
                                           placeholder="opc.tcp://plc.internal:4840" />
                                    <div class="form-text">When this list is non-empty, the single Endpoint URL above is ignored.</div>
                                </EditTemplate>
                            </CollectionEditor>
                        </div>
                    </div>
                </div>
@@ -281,8 +295,10 @@ else
    private void OnAddressPicked(string address) => _pickedAddress = address;
-    // Read-only JSON snippets for collections that have no list editor yet.
+    // Held separately because EndpointUrls is a collection — edited via the CollectionEditor modal.
-    private string _endpointUrlsJson = "[]";
+    private List<EndpointUrlRow> _endpoints = [];
    // Read-only JSON snippet for the UnsMappingTable, which has no list editor yet.
    private string _unsMappingTableJson = "{}";
    protected override async Task OnInitializedAsync()
@@ -322,7 +338,7 @@ else
                var opts = TryDeserialize(_existing.DriverConfig) ?? new OpcUaClientDriverOptions();
                _form = new FormModel();
                _form.OpcUa = OpcUaClientFormModel.FromRecord(opts);
-                _endpointUrlsJson = System.Text.Json.JsonSerializer.Serialize(opts.EndpointUrls, _jsonOpts);
+                _endpoints = opts.EndpointUrls.Select(EndpointUrlRow.FromUrl).ToList();
                _unsMappingTableJson = System.Text.Json.JsonSerializer.Serialize(opts.UnsMappingTable, _jsonOpts);
                _form.ResilienceConfig = _existing.ResilienceConfig;
                _form.RowVersion = _existing.RowVersion;
@@ -336,7 +352,7 @@ else
        _busy = true; _error = null;
        try
        {
-            var opts = _form.OpcUa.ToRecord();
+            var opts = _form.OpcUa.ToRecord(_endpoints.Select(r => r.ToUrl()).ToList());
            var configJson = System.Text.Json.JsonSerializer.Serialize(opts, _jsonOpts);
            await using var db = await DbFactory.CreateDbContextAsync();
            if (IsNew)
@@ -407,7 +423,8 @@ else
    }
    private string SerializeCurrentConfig()
-        => System.Text.Json.JsonSerializer.Serialize(_form.OpcUa.ToRecord(), _jsonOpts);
+        => System.Text.Json.JsonSerializer.Serialize(
            _form.OpcUa.ToRecord(_endpoints.Select(r => r.ToUrl()).ToList()), _jsonOpts);
    private static OpcUaClientDriverOptions? TryDeserialize(string json)
    {
@@ -422,11 +439,36 @@ else
        public byte[] RowVersion { get; set; } = [];
    }
    /// <summary>
    ///     Mutable VM for a single endpoint URL row. EndpointUrls is a plain
    ///     <c>List&lt;string&gt;</c> (a failover list) so the row is a thin wrapper the
    ///     <see cref="CollectionEditor{TRow}"/> modal can bind to.
    /// </summary>
    public sealed class EndpointUrlRow
    {
        public string Url { get; set; } = "";
        public EndpointUrlRow Clone() => (EndpointUrlRow)MemberwiseClone();
        public static EndpointUrlRow FromUrl(string u) => new() { Url = u };
        public string ToUrl() => Url.Trim();
        public static string? ValidateRow(EndpointUrlRow row, IReadOnlyList<EndpointUrlRow> all, int? editIndex)
        {
            if (string.IsNullOrWhiteSpace(row.Url)) return "URL is required.";
            if (!row.Url.Trim().StartsWith("opc.tcp://", StringComparison.OrdinalIgnoreCase))
                return "Endpoint URL must start with opc.tcp://";
            for (var i = 0; i < all.Count; i++)
                if (i != editIndex && string.Equals(all[i].Url.Trim(), row.Url.Trim(), StringComparison.OrdinalIgnoreCase))
                    return $"Duplicate endpoint '{row.Url}'.";
            return null;
        }
    }
    /// <summary>
    ///     Mutable mirror of <see cref="OpcUaClientDriverOptions"/> with int wrappers for
    ///     TimeSpan fields so Blazor InputNumber can bind them.
-    ///     EndpointUrls and UnsMappingTable are shown as read-only JSON; they survive round-trip
+    ///     EndpointUrls is edited via the CollectionEditor (held on the page as a row list and
-    ///     via the original deserialized record and are re-serialized unchanged.
+    ///     threaded into <see cref="ToRecord"/>); UnsMappingTable is shown as read-only JSON and
    ///     survives round-trip via the original deserialized record, re-serialized unchanged.
    /// </summary>
    public sealed class OpcUaClientFormModel
    {
@@ -461,8 +503,7 @@ else
        // Diagnostics
        public int ProbeTimeoutSeconds { get; set; } = 15;
-        // Preserved read-only collections (round-tripped unchanged from original record)
+        // Preserved read-only collection (round-tripped unchanged from original record)
        internal IReadOnlyList<string> _endpointUrls = [];
        internal IReadOnlyDictionary<string, string> _unsMappingTable = new System.Collections.Generic.Dictionary<string, string>();
        public static OpcUaClientFormModel FromRecord(OpcUaClientDriverOptions r) => new()
@@ -488,14 +529,13 @@ else
            UserCertificatePassword = r.UserCertificatePassword,
            TargetNamespaceKind = r.TargetNamespaceKind,
            ProbeTimeoutSeconds = r.ProbeTimeoutSeconds,
            _endpointUrls = r.EndpointUrls,
            _unsMappingTable = r.UnsMappingTable,
        };
-        public OpcUaClientDriverOptions ToRecord() => new()
+        public OpcUaClientDriverOptions ToRecord(IReadOnlyList<string> endpointUrls) => new()
        {
            EndpointUrl = EndpointUrl,
-            EndpointUrls = _endpointUrls,
+            EndpointUrls = endpointUrls,
            BrowseRoot = string.IsNullOrWhiteSpace(BrowseRoot) ? null : BrowseRoot,
            ApplicationUri = ApplicationUri,
            SessionName = SessionName,
@@ -145,23 +145,38 @@ else
                </div>
            </section>
-            @* Tags — read-only JSON view *@
+            @* Tags *@
-            <section class="panel rise mt-3" style="animation-delay:.11s">
+            <CollectionEditor TRow="S7TagRow" Items="_tags" Title="Tags" ItemNoun="tag"
-                <div class="panel-head">Tags</div>
+                              AnimationDelay=".11s"
-                <div style="padding:1rem">
+                              NewRow="@(() => new S7TagRow())" Clone="@(r => r.Clone())"
-                    <div class="form-text mb-2">
+                              Validate="S7TagRow.ValidateRow">
-                        Tag list editor coming in a follow-up phase. To add/remove tags, edit the JSON directly in the raw driver config via the generic editor, or deploy via the import tooling.
+                <HeaderTemplate>
                    <tr><th>Name</th><th>Address</th><th>Type</th><th>Writable</th><th></th></tr>
                </HeaderTemplate>
                <RowTemplate Context="t">
                    <td class="mono">@t.Name</td><td class="mono">@t.Address</td>
                    <td>@t.DataType</td><td>@(t.Writable ? "yes" : "no")</td>
                </RowTemplate>
                <EditTemplate Context="t">
                    <div class="row g-3">
                        <div class="col-md-6"><label class="form-label">Name</label>
                            <input class="form-control form-control-sm" @bind="t.Name" /></div>
                        <div class="col-md-6"><label class="form-label">Address</label>
                            <input class="form-control form-control-sm mono" @bind="t.Address"
                                   placeholder="e.g. DB1.DBW0, M0.0, I0.0, QD4" /></div>
                        <div class="col-md-3"><label class="form-label">Data type</label>
                            <select class="form-select form-select-sm" @bind="t.DataType">
                                @foreach (var e in Enum.GetValues<S7DataType>()) { <option value="@e">@e</option> }
                            </select></div>
                        <div class="col-md-3"><label class="form-label">String length</label>
                            <input type="number" class="form-control form-control-sm" @bind="t.StringLength" />
                            <div class="form-text">Only for String type. Max 254.</div></div>
                        <div class="col-md-3"><div class="form-check form-switch mt-4">
                            <input type="checkbox" class="form-check-input" @bind="t.Writable" id="tagWritable" />
                            <label class="form-check-label" for="tagWritable">Writable</label></div></div>
                    </div>
-                    @if (_form.TagsJson is not null)
+                </EditTemplate>
-                    {
+            </CollectionEditor>
                        <pre class="form-control form-control-sm mono" style="min-height:4rem;max-height:12rem;overflow:auto;white-space:pre-wrap">@_form.TagsJson</pre>
                    }
                    else
                    {
                        <p class="text-muted"><em>No tags configured.</em></p>
                    }
                </div>
            </section>
            <DriverResilienceSection @bind-ResilienceConfig="_form.ResilienceConfig" />
        </DriverFormShell>
@@ -196,6 +211,9 @@ else
    private void OnAddressPicked(string address) => _pickedAddress = address;
    // Held separately because Tags is a collection — edited via the CollectionEditor modal.
    private List<S7TagRow> _tags = [];
    protected override async Task OnInitializedAsync()
    {
        await using var db = await DbFactory.CreateDbContextAsync();
@@ -226,6 +244,7 @@ else
                _form = FormModel.FromOptions(opts);
                _form.ResilienceConfig = _existing.ResilienceConfig;
                _form.RowVersion = _existing.RowVersion;
                _tags = opts.Tags.Select(S7TagRow.FromDefinition).ToList();
            }
        }
        _loaded = true;
@@ -236,7 +255,7 @@ else
        _busy = true; _error = null;
        try
        {
-            var opts = _form.ToOptions();
+            var opts = _form.ToOptions(_tags.Select(r => r.ToDefinition()).ToList());
            var configJson = System.Text.Json.JsonSerializer.Serialize(opts, _jsonOpts);
            await using var db = await DbFactory.CreateDbContextAsync();
            if (IsNew)
@@ -307,7 +326,8 @@ else
    }
    private string SerializeCurrentConfig()
-        => System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(), _jsonOpts);
+        => System.Text.Json.JsonSerializer.Serialize(
            _form.ToOptions(_tags.Select(r => r.ToDefinition()).ToList()), _jsonOpts);
    private static S7DriverOptions? TryDeserialize(string json)
    {
@@ -315,6 +335,53 @@ else
        catch { return null; }
    }
    // Mutable VM for the modal editor — S7TagDefinition is an immutable record.
    public sealed class S7TagRow
    {
        public string Name { get; set; } = "";
        public string Address { get; set; } = "";
        public S7DataType DataType { get; set; } = S7DataType.Int16;
        public bool Writable { get; set; } = true;
        public int StringLength { get; set; } = 254;
        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
        // (WriteIdempotent) across a load→save.
        private S7TagDefinition? _source;
        public S7TagRow Clone() => (S7TagRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
        public static S7TagRow FromDefinition(S7TagDefinition d) => new()
        {
            Name = d.Name, Address = d.Address, DataType = d.DataType,
            Writable = d.Writable, StringLength = d.StringLength,
            _source = d,
        };
        public S7TagDefinition ToDefinition()
        {
            var baseDef = _source ?? new S7TagDefinition(Name.Trim(), Address.Trim(), DataType);
            return baseDef with
            {
                Name = Name.Trim(),
                Address = Address.Trim(),
                DataType = DataType,
                Writable = Writable,
                StringLength = StringLength,
            };
        }
        public static string? ValidateRow(S7TagRow row, IReadOnlyList<S7TagRow> all, int? editIndex)
        {
            if (string.IsNullOrWhiteSpace(row.Name)) return "Name is required.";
            for (var i = 0; i < all.Count; i++)
                if (i != editIndex && string.Equals(all[i].Name, row.Name, StringComparison.OrdinalIgnoreCase))
                    return $"Duplicate tag name '{row.Name}'.";
            return null;
        }
    }
    // Flat mutable model — all scalar properties settable for Blazor @bind-Value.
    // Collection (Tags) is kept on the component (_tags) and passed in on ToOptions().
    public sealed class FormModel
    {
        // Connection
@@ -331,43 +398,25 @@ else
        public int ProbeTimeoutSeconds { get; set; } = 2;
        public int AdminProbeTimeoutSeconds { get; set; } = 5;
        // Tags JSON view (read-only)
        public string? TagsJson { get; set; }
        // Preserved originals (round-tripped unchanged from original options)
        private IReadOnlyList<S7TagDefinition> _tags = [];
        // Common
        public string? ResilienceConfig { get; set; }
        public byte[] RowVersion { get; set; } = [];
-        public static FormModel FromOptions(S7DriverOptions o)
+        public static FormModel FromOptions(S7DriverOptions o) => new()
        {
-            string? tagsJson = o.Tags.Count == 0 ? null
+            Host = o.Host,
-                : System.Text.Json.JsonSerializer.Serialize(o.Tags,
+            Port = o.Port,
-                    new System.Text.Json.JsonSerializerOptions
+            CpuType = o.CpuType,
-                    {
+            Rack = o.Rack,
-                        PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase,
+            Slot = o.Slot,
-                        WriteIndented = true,
+            TimeoutSeconds = (int)o.Timeout.TotalSeconds,
-                    });
+            ProbeEnabled = o.Probe.Enabled,
-            return new FormModel
+            ProbeIntervalSeconds = (int)o.Probe.Interval.TotalSeconds,
-            {
+            ProbeTimeoutSeconds = (int)o.Probe.Timeout.TotalSeconds,
-                Host = o.Host,
+            AdminProbeTimeoutSeconds = o.ProbeTimeoutSeconds,
-                Port = o.Port,
+        };
                CpuType = o.CpuType,
                Rack = o.Rack,
                Slot = o.Slot,
                TimeoutSeconds = (int)o.Timeout.TotalSeconds,
                ProbeEnabled = o.Probe.Enabled,
                ProbeIntervalSeconds = (int)o.Probe.Interval.TotalSeconds,
                ProbeTimeoutSeconds = (int)o.Probe.Timeout.TotalSeconds,
                AdminProbeTimeoutSeconds = o.ProbeTimeoutSeconds,
                TagsJson = tagsJson,
                _tags = o.Tags,
            };
        }
-        public S7DriverOptions ToOptions() => new()
+        public S7DriverOptions ToOptions(IReadOnlyList<S7TagDefinition> tags) => new()
        {
            Host = Host,
            Port = Port,
@@ -382,7 +431,7 @@ else
                Timeout = TimeSpan.FromSeconds(ProbeTimeoutSeconds),
            },
            ProbeTimeoutSeconds = AdminProbeTimeoutSeconds,
-            Tags = _tags,
+            Tags = tags,
        };
    }
 }
@@ -132,42 +132,61 @@ else
                </div>
            </section>
-            @* Devices — read-only JSON view *@
+            @* Devices *@
-            <section class="panel rise mt-3" style="animation-delay:.11s">
+            <CollectionEditor TRow="TwinCATDeviceRow" Items="_devices" Title="Devices" ItemNoun="device"
-                <div class="panel-head">Devices</div>
+                              AnimationDelay=".11s"
-                <div style="padding:1rem">
+                              NewRow="@(() => new TwinCATDeviceRow())" Clone="@(r => r.Clone())"
-                    <div class="form-text mb-2">
+                              Validate="TwinCATDeviceRow.ValidateRow">
-                        Each device is identified by AMS Net Id + port. Device list editor coming in a follow-up phase.
+                <HeaderTemplate>
-                        Format: <code>[{"hostAddress":"192.168.0.1.1.1:851","deviceName":"PLC1"}]</code>
+                    <tr><th>Host address</th><th>Device name</th><th></th></tr>
                </HeaderTemplate>
                <RowTemplate Context="d">
                    <td class="mono">@d.HostAddress</td>
                    <td>@(string.IsNullOrWhiteSpace(d.DeviceName) ? "—" : d.DeviceName)</td>
                </RowTemplate>
                <EditTemplate Context="d">
                    <div class="row g-3">
                        <div class="col-md-6"><label class="form-label">Host address (AMS Net Id:port)</label>
                            <input class="form-control form-control-sm mono" @bind="d.HostAddress"
                                   placeholder="192.168.0.1.1.1:851" /></div>
                        <div class="col-md-6"><label class="form-label">Device name</label>
                            <input class="form-control form-control-sm" @bind="d.DeviceName" /></div>
                    </div>
-                    @if (_form.DevicesJson is not null)
+                </EditTemplate>
-                    {
+            </CollectionEditor>
                        <pre class="form-control form-control-sm mono" style="min-height:4rem;max-height:12rem;overflow:auto;white-space:pre-wrap">@_form.DevicesJson</pre>
                    }
                    else
                    {
                        <p class="text-muted"><em>No devices configured.</em></p>
                    }
                </div>
            </section>
-            @* Tags — read-only JSON view *@
+            @* Tags *@
-            <section class="panel rise mt-3" style="animation-delay:.14s">
+            <CollectionEditor TRow="TwinCATTagRow" Items="_tags" Title="Tags" ItemNoun="tag"
-                <div class="panel-head">Tags</div>
+                              AnimationDelay=".14s"
-                <div style="padding:1rem">
+                              NewRow="@(() => new TwinCATTagRow())" Clone="@(r => r.Clone())"
-                    <div class="form-text mb-2">
+                              Validate="TwinCATTagRow.ValidateRow">
-                        Tag list editor coming in a follow-up phase. Tags reference device host addresses and TwinCAT symbol paths.
+                <HeaderTemplate>
                    <tr><th>Name</th><th>Device</th><th>Symbol path</th><th>Type</th><th>Writable</th><th></th></tr>
                </HeaderTemplate>
                <RowTemplate Context="t">
                    <td class="mono">@t.Name</td><td class="mono">@t.DeviceHostAddress</td>
                    <td class="mono">@t.SymbolPath</td><td>@t.DataType</td><td>@(t.Writable ? "yes" : "no")</td>
                </RowTemplate>
                <EditTemplate Context="t">
                    <div class="row g-3">
                        <div class="col-md-6"><label class="form-label">Name</label>
                            <input class="form-control form-control-sm" @bind="t.Name" /></div>
                        <div class="col-md-6"><label class="form-label">Device host address</label>
                            <input class="form-control form-control-sm mono" @bind="t.DeviceHostAddress"
                                   placeholder="192.168.0.1.1.1:851" /></div>
                        <div class="col-md-6"><label class="form-label">Symbol path</label>
                            <input class="form-control form-control-sm mono" @bind="t.SymbolPath"
                                   placeholder="e.g. MAIN.bStart, GVL.Counter" /></div>
                        <div class="col-md-3"><label class="form-label">Data type</label>
                            <select class="form-select form-select-sm" @bind="t.DataType">
                                @foreach (var e in Enum.GetValues<TwinCATDataType>()) { <option value="@e">@e</option> }
                            </select></div>
                        <div class="col-md-3"><div class="form-check form-switch mt-4">
                            <input type="checkbox" class="form-check-input" @bind="t.Writable" id="tagWritable" />
                            <label class="form-check-label" for="tagWritable">Writable</label></div></div>
                    </div>
-                    @if (_form.TagsJson is not null)
+                </EditTemplate>
-                    {
+            </CollectionEditor>
                        <pre class="form-control form-control-sm mono" style="min-height:4rem;max-height:12rem;overflow:auto;white-space:pre-wrap">@_form.TagsJson</pre>
                    }
                    else
                    {
                        <p class="text-muted"><em>No tags configured.</em></p>
                    }
                </div>
            </section>
            <DriverResilienceSection @bind-ResilienceConfig="_form.ResilienceConfig" />
        </DriverFormShell>
@@ -202,6 +221,10 @@ else
    private void OnAddressPicked(string address) => _pickedAddress = address;
    // Held separately because Devices/Tags are collections — edited via the CollectionEditor modal.
    private List<TwinCATDeviceRow> _devices = [];
    private List<TwinCATTagRow> _tags = [];
    protected override async Task OnInitializedAsync()
    {
        await using var db = await DbFactory.CreateDbContextAsync();
@@ -232,6 +255,8 @@ else
                _form = FormModel.FromOptions(opts);
                _form.ResilienceConfig = _existing.ResilienceConfig;
                _form.RowVersion = _existing.RowVersion;
                _devices = opts.Devices.Select(TwinCATDeviceRow.FromDefinition).ToList();
                _tags = opts.Tags.Select(TwinCATTagRow.FromDefinition).ToList();
            }
        }
        _loaded = true;
@@ -242,8 +267,11 @@ else
        _busy = true; _error = null;
        try
        {
-            var opts = _form.ToOptions();
+            var configJson = System.Text.Json.JsonSerializer.Serialize(
-            var configJson = System.Text.Json.JsonSerializer.Serialize(opts, _jsonOpts);
+                _form.ToOptions(
                    _devices.Select(r => r.ToDefinition()).ToList(),
                    _tags.Select(r => r.ToDefinition()).ToList()),
                _jsonOpts);
            await using var db = await DbFactory.CreateDbContextAsync();
            if (IsNew)
            {
@@ -313,7 +341,11 @@ else
    }
    private string SerializeCurrentConfig()
-        => System.Text.Json.JsonSerializer.Serialize(_form.ToOptions(), _jsonOpts);
+        => System.Text.Json.JsonSerializer.Serialize(
            _form.ToOptions(
                _devices.Select(r => r.ToDefinition()).ToList(),
                _tags.Select(r => r.ToDefinition()).ToList()),
            _jsonOpts);
    private static TwinCATDriverOptions? TryDeserialize(string json)
    {
@@ -321,6 +353,91 @@ else
        catch { return null; }
    }
    // Mutable VM for the modal editor — TwinCATDeviceOptions is an immutable record.
    public sealed class TwinCATDeviceRow
    {
        public string HostAddress { get; set; } = "";
        public string? DeviceName { get; set; }
        // Original record (null for newly-added rows). Preserves any fields the editor doesn't
        // expose across a load→save.
        private TwinCATDeviceOptions? _source;
        public TwinCATDeviceRow Clone() => (TwinCATDeviceRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
        public static TwinCATDeviceRow FromDefinition(TwinCATDeviceOptions d) => new()
        {
            HostAddress = d.HostAddress, DeviceName = d.DeviceName,
            _source = d,
        };
        public TwinCATDeviceOptions ToDefinition()
        {
            var baseDef = _source ?? new TwinCATDeviceOptions(HostAddress.Trim());
            return baseDef with
            {
                HostAddress = HostAddress.Trim(),
                DeviceName = string.IsNullOrWhiteSpace(DeviceName) ? null : DeviceName.Trim(),
            };
        }
        public static string? ValidateRow(TwinCATDeviceRow row, IReadOnlyList<TwinCATDeviceRow> all, int? editIndex)
        {
            if (string.IsNullOrWhiteSpace(row.HostAddress)) return "Host address is required.";
            for (var i = 0; i < all.Count; i++)
                if (i != editIndex && string.Equals(all[i].HostAddress, row.HostAddress, StringComparison.OrdinalIgnoreCase))
                    return $"Duplicate device host address '{row.HostAddress}'.";
            return null;
        }
    }
    // Mutable VM for the modal editor — TwinCATTagDefinition is an immutable record.
    public sealed class TwinCATTagRow
    {
        public string Name { get; set; } = "";
        public string DeviceHostAddress { get; set; } = "";
        public string SymbolPath { get; set; } = "";
        public TwinCATDataType DataType { get; set; } = TwinCATDataType.DInt;
        public bool Writable { get; set; } = true;
        // Original record (null for newly-added rows). Preserves fields the editor doesn't expose
        // (WriteIdempotent) across a load→save.
        private TwinCATTagDefinition? _source;
        public TwinCATTagRow Clone() => (TwinCATTagRow)MemberwiseClone(); // _source is an immutable record ref — safe to share
        public static TwinCATTagRow FromDefinition(TwinCATTagDefinition d) => new()
        {
            Name = d.Name, DeviceHostAddress = d.DeviceHostAddress, SymbolPath = d.SymbolPath,
            DataType = d.DataType, Writable = d.Writable,
            _source = d,
        };
        public TwinCATTagDefinition ToDefinition()
        {
            var baseDef = _source ?? new TwinCATTagDefinition(Name.Trim(), DeviceHostAddress.Trim(), SymbolPath.Trim(), DataType);
            return baseDef with
            {
                Name = Name.Trim(),
                DeviceHostAddress = DeviceHostAddress.Trim(),
                SymbolPath = SymbolPath.Trim(),
                DataType = DataType,
                Writable = Writable,
            };
        }
        public static string? ValidateRow(TwinCATTagRow row, IReadOnlyList<TwinCATTagRow> all, int? editIndex)
        {
            if (string.IsNullOrWhiteSpace(row.Name)) return "Name is required.";
            for (var i = 0; i < all.Count; i++)
                if (i != editIndex && string.Equals(all[i].Name, row.Name, StringComparison.OrdinalIgnoreCase))
                    return $"Duplicate tag name '{row.Name}'.";
            return null;
        }
    }
    // Flat mutable model — all scalar properties settable for Blazor @bind-Value.
    // Collections (Devices, Tags) are kept on the component and passed in on ToOptions().
    public sealed class FormModel
    {
        // Options
@@ -335,47 +452,25 @@ else
        public int ProbeTimeoutSeconds { get; set; } = 2;
        public int AdminProbeTimeoutSeconds { get; set; } = 10;
        // Collections JSON view (read-only)
        public string? DevicesJson { get; set; }
        public string? TagsJson { get; set; }
        // Preserved originals (round-tripped unchanged)
        private IReadOnlyList<TwinCATDeviceOptions> _devices = [];
        private IReadOnlyList<TwinCATTagDefinition> _tags = [];
        // Common
        public string? ResilienceConfig { get; set; }
        public byte[] RowVersion { get; set; } = [];
-        private static readonly System.Text.Json.JsonSerializerOptions _displayOpts = new()
+        public static FormModel FromOptions(TwinCATDriverOptions o) => new()
        {
-            WriteIndented = true,
+            TimeoutSeconds = (int)o.Timeout.TotalSeconds,
-            PropertyNamingPolicy = System.Text.Json.JsonNamingPolicy.CamelCase,
+            UseNativeNotifications = o.UseNativeNotifications,
            EnableControllerBrowse = o.EnableControllerBrowse,
            NotificationMaxDelayMs = o.NotificationMaxDelayMs,
            ProbeEnabled = o.Probe.Enabled,
            ProbeIntervalSeconds = (int)o.Probe.Interval.TotalSeconds,
            ProbeTimeoutSeconds = (int)o.Probe.Timeout.TotalSeconds,
            AdminProbeTimeoutSeconds = o.ProbeTimeoutSeconds,
        };
-        public static FormModel FromOptions(TwinCATDriverOptions o)
+        public TwinCATDriverOptions ToOptions(
-        {
+            IReadOnlyList<TwinCATDeviceOptions> devices,
-            var m = new FormModel
+            IReadOnlyList<TwinCATTagDefinition> tags) => new()
            {
                TimeoutSeconds = (int)o.Timeout.TotalSeconds,
                UseNativeNotifications = o.UseNativeNotifications,
                EnableControllerBrowse = o.EnableControllerBrowse,
                NotificationMaxDelayMs = o.NotificationMaxDelayMs,
                ProbeEnabled = o.Probe.Enabled,
                ProbeIntervalSeconds = (int)o.Probe.Interval.TotalSeconds,
                ProbeTimeoutSeconds = (int)o.Probe.Timeout.TotalSeconds,
                AdminProbeTimeoutSeconds = o.ProbeTimeoutSeconds,
                _devices = o.Devices,
                _tags = o.Tags,
            };
            m.DevicesJson = o.Devices.Count == 0 ? null
                : System.Text.Json.JsonSerializer.Serialize(o.Devices, _displayOpts);
            m.TagsJson = o.Tags.Count == 0 ? null
                : System.Text.Json.JsonSerializer.Serialize(o.Tags, _displayOpts);
            return m;
        }
        public TwinCATDriverOptions ToOptions() => new()
        {
            Timeout = TimeSpan.FromSeconds(TimeoutSeconds),
            UseNativeNotifications = UseNativeNotifications,
@@ -388,8 +483,8 @@ else
                Timeout = TimeSpan.FromSeconds(ProbeTimeoutSeconds),
            },
            ProbeTimeoutSeconds = AdminProbeTimeoutSeconds,
-            Devices = _devices,
+            Devices = devices,
-            Tags = _tags,
+            Tags = tags,
        };
    }
 }
@@ -3,5 +3,4 @@
 <PageTitle>OtOpcUa</PageTitle>
 <h1>OtOpcUa Admin</h1>
-<p>v2 fused host. Use the nav above to manage deployments.</p>
+<p>Use the nav above to configure clusters, drivers, and tags, then deploy.</p>
 <p class="text-muted">Most v1 admin pages were removed by the live-edit migration — see follow-up F15 for the per-page restoration plan.</p>
@@ -1,33 +1,21 @@
@page "/role-grants"
-@* Per Q4 of the AdminUI rebuild plan, v2 replaced v1's per-cluster RoleGrants table with a
+@attribute [Microsoft.AspNetCore.Authorization.Authorize(Policy = "FleetAdmin")]
   fleet-wide LDAP-group → role map. This page surfaces the mapping read-only; the source of
   truth is Authentication:Ldap:GroupToRole in appsettings (editable on the host filesystem, not
   from the UI yet). *@
@attribute [Microsoft.AspNetCore.Authorization.Authorize]
@rendermode RenderMode.InteractiveServer
@using Microsoft.Extensions.Options
@using ZB.MOM.WW.OtOpcUa.Configuration.Entities
@using ZB.MOM.WW.OtOpcUa.Configuration.Enums
@using ZB.MOM.WW.OtOpcUa.Configuration.Services
@using ZB.MOM.WW.OtOpcUa.Security.Ldap
@inject IOptionsSnapshot<LdapOptions> Ldap
@inject ILdapGroupRoleMappingService RoleMappings
 <div class="d-flex justify-content-between align-items-center mb-3">
    <h4 class="mb-0">Role grants</h4>
 </div>
-<section class="panel notice rise" style="animation-delay:.02s">
+@if (_options is not null)
    LDAP group membership determines fleet roles. Edit the mapping in
    <span class="mono">appsettings.json</span> under <span class="mono">Authentication:Ldap:GroupToRole</span>
    and restart the admin node (or sign out + back in for cached claims to refresh). UI-driven
    editing of the mapping is deferred — it implies a config-reload mechanism that doesn't exist
    yet.
 </section>
@if (_options is null)
 {
-    <p>Loading…</p>
+    <section class="card-grid rise" style="animation-delay:.02s">
 }
 else
 {
    <section class="card-grid rise mt-3" style="animation-delay:.08s">
        <div class="metric-card">
            <div class="panel-head">LDAP binding</div>
            <div class="kv"><span class="k">Enabled</span><span class="v">@(_options.Enabled ? "yes" : "no")</span></div>
@@ -40,16 +28,61 @@ else
            }
        </div>
    </section>
 }
 <section class="panel rise mt-3" style="animation-delay:.08s">
    <div class="panel-head">Group → role (database)</div>
    <div style="padding:1rem">
        <div class="d-flex gap-2 align-items-center flex-wrap">
            <input class="form-control form-control-sm mono" style="max-width:32rem"
                   @bind="_newGroup" placeholder="cn=fleet-admin,ou=groups,..." />
            <select class="form-select form-select-sm" style="max-width:14rem" @bind="_newRole">
                @foreach (var role in Enum.GetValues<AdminRole>())
                {
                    <option value="@role">@role</option>
                }
            </select>
            <button class="btn btn-sm btn-primary" @onclick="AddAsync" disabled="@_busy">Add</button>
        </div>
        @if (_error is not null)
        {
            <div class="text-danger small mt-2">@_error</div>
        }
    </div>
    <div class="table-wrap">
        <table class="data-table">
            <thead><tr><th>LDAP group</th><th>Role</th><th></th></tr></thead>
            <tbody>
                @if (_rows.Count == 0)
                {
                    <tr><td colspan="3" class="text-muted">No database role grants. Authentication falls back to the appsettings map below.</td></tr>
                }
                else
                {
                    @foreach (var r in _rows)
                    {
                        <tr>
                            <td><span class="mono">@r.LdapGroup</span></td>
                            <td><span class="chip chip-idle">@r.Role</span></td>
                            <td><button class="btn btn-sm btn-link text-danger" @onclick="() => DeleteAsync(r.Id)" disabled="@_busy">Delete</button></td>
                        </tr>
                    }
                }
            </tbody>
        </table>
    </div>
 </section>
@if (_options is not null)
 {
    <section class="panel rise mt-3" style="animation-delay:.14s">
-        <div class="panel-head">Group → role mapping (@(_options.GroupToRole?.Count ?? 0))</div>
+        <div class="panel-head">Fallback (appsettings) (@(_options.GroupToRole?.Count ?? 0))</div>
        <div style="padding:1rem 1rem 0" class="text-muted small">
            These <span class="mono">Authentication:Ldap:GroupToRole</span> entries apply when a group has no database row above.
        </div>
        @if (_options.GroupToRole is null || _options.GroupToRole.Count == 0)
        {
-            <div style="padding:1rem" class="text-muted">
+            <div style="padding:1rem" class="text-muted">No appsettings fallback mapping configured.</div>
                No mapping configured. Every authenticated user lands with zero roles —
                the fallback authorization policy will refuse every request. Add a
                <span class="mono">GroupToRole</span> entry before deploying.
            </div>
        }
        else
        {
@@ -73,9 +106,47 @@ else
@code {
    private LdapOptions? _options;
    private IReadOnlyList<LdapGroupRoleMapping> _rows = [];
    private string _newGroup = "";
    private AdminRole _newRole = AdminRole.ConfigViewer;
    private string? _error;
    private bool _busy;
-    protected override void OnInitialized()
+    protected override async Task OnInitializedAsync()
    {
        _options = Ldap.Value;
        await ReloadAsync();
    }
    private async Task ReloadAsync()
        => _rows = (await RoleMappings.ListAllAsync(default)).Where(r => r.IsSystemWide).ToList();
    private async Task AddAsync()
    {
        _error = null;
        if (string.IsNullOrWhiteSpace(_newGroup)) { _error = "LDAP group is required."; return; }
        _busy = true;
        StateHasChanged();
        try
        {
            await RoleMappings.CreateAsync(new LdapGroupRoleMapping
            {
                LdapGroup = _newGroup.Trim(), Role = _newRole, IsSystemWide = true, ClusterId = null,
            }, default);
            _newGroup = "";
            _newRole = AdminRole.ConfigViewer;
            await ReloadAsync();
        }
        catch (Exception ex) { _error = ex.Message; }
        finally { _busy = false; }
    }
    private async Task DeleteAsync(Guid id)
    {
        _error = null; _busy = true;
        StateHasChanged();
        try { await RoleMappings.DeleteAsync(id, default); await ReloadAsync(); }
        catch (Exception ex) { _error = ex.Message; }
        finally { _busy = false; }
    }
 }
@@ -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
+@inject IInProcessBroadcaster<ScriptLogEntry> ScriptLogs
-@implements IAsyncDisposable
+@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()
+        // Live tail straight from the in-process broadcaster (fed by ScriptLogSignalRBridge off the
-            .WithUrl(Nav.ToAbsoluteUri(ScriptLogHub.Endpoint))
+        // 'script-logs' DPS topic). Blazor Server can't self-connect a SignalR HubConnection behind
-            .WithAutomaticReconnect()
+        // a reverse proxy — see IInProcessBroadcaster — so we subscribe in-process instead.
-            .Build();
+        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()
+    public void Dispose() => ScriptLogs.Received -= OnEntry;
    {
        if (_hub is not null) await _hub.DisposeAsync();
    }
 }
@@ -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">
@@ -0,0 +1,129 @@
@* Generic modal-per-row list editor. The parent owns the List<TRow> (a MUTABLE row VM,
   because driver contracts are immutable records). This renders a read-only table with
   Add/Edit/Delete and a modal that edits a CLONED working copy — commit on Save, discard
   on Cancel. NewRow builds a default VM; Clone copies one for the working copy; Validate
   (optional) returns an error string to block commit or null to allow. *@
@typeparam TRow
 <section class="panel rise mt-3" style="@_styleDelay">
    <div class="panel-head d-flex align-items-center">
        <span>@Title (@Items.Count)</span>
        <button type="button" class="btn btn-sm btn-outline-primary ms-auto" @onclick="Add">+ Add @ItemNoun</button>
    </div>
    @if (Items.Count == 0)
    {
        <div style="padding:1rem" class="text-muted">No @ItemNoun.ToLowerInvariant() rows.</div>
    }
    else
    {
        <div class="table-wrap">
            <table class="data-table">
                <thead>@HeaderTemplate</thead>
                <tbody>
                    @for (var i = 0; i < Items.Count; i++)
                    {
                        var idx = i;
                        <tr @key="Items[idx]">
                            @RowTemplate(Items[idx])
                            <td class="text-end" style="white-space:nowrap">
                                <button type="button" class="btn btn-sm btn-link p-0 me-2" @onclick="() => Edit(idx)">Edit</button>
                                <button type="button" class="btn btn-sm btn-link p-0 text-danger" @onclick="() => Delete(idx)">Delete</button>
                            </td>
                        </tr>
                    }
                </tbody>
            </table>
        </div>
    }
 </section>
@if (_modalOpen && _working is not null)
 {
    <div class="modal-backdrop fade show" style="display:block"></div>
    <div class="modal fade show" tabindex="-1" role="dialog" style="display:block">
        <div class="modal-dialog modal-lg" role="document">
            <div class="modal-content">
                <div class="modal-header">
                    <h5 class="modal-title">@(_editIndex is null ? $"Add {ItemNoun}" : $"Edit {ItemNoun}")</h5>
                    <button type="button" class="btn-close" aria-label="Close" @onclick="Cancel"></button>
                </div>
                <div class="modal-body">
                    @EditTemplate(_working)
                    @if (!string.IsNullOrEmpty(_validationError))
                    {
                        <div class="text-danger small mt-2">@_validationError</div>
                    }
                </div>
                <div class="modal-footer">
                    <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
                    <button type="button" class="btn btn-primary" @onclick="Commit">Save</button>
                </div>
            </div>
        </div>
    </div>
 }
@code {
    [Parameter, EditorRequired] public List<TRow> Items { get; set; } = default!;
    [Parameter] public EventCallback ItemsChanged { get; set; }
    [Parameter] public string Title { get; set; } = "Items";
    [Parameter] public string ItemNoun { get; set; } = "row";
    [Parameter] public string AnimationDelay { get; set; } = ".18s";
    [Parameter, EditorRequired] public RenderFragment HeaderTemplate { get; set; } = default!;
    [Parameter, EditorRequired] public RenderFragment<TRow> RowTemplate { get; set; } = default!;
    [Parameter, EditorRequired] public RenderFragment<TRow> EditTemplate { get; set; } = default!;
    [Parameter, EditorRequired] public Func<TRow> NewRow { get; set; } = default!;
    [Parameter, EditorRequired] public Func<TRow, TRow> Clone { get; set; } = default!;
    [Parameter] public Func<TRow, IReadOnlyList<TRow>, int?, string?>? Validate { get; set; }
    private string _styleDelay => $"animation-delay:{AnimationDelay}";
    private bool _modalOpen;
    private int? _editIndex;
    private TRow? _working;
    private string? _validationError;
    private void Add()
    {
        _editIndex = null;
        _working = NewRow();
        _validationError = null;
        _modalOpen = true;
    }
    private void Edit(int index)
    {
        _editIndex = index;
        _working = Clone(Items[index]);
        _validationError = null;
        _modalOpen = true;
    }
    private async Task Delete(int index)
    {
        Items.RemoveAt(index);
        await ItemsChanged.InvokeAsync();
    }
    private void Cancel()
    {
        _modalOpen = false;
        _working = default;
        _editIndex = null;
        _validationError = null;
    }
    private async Task Commit()
    {
        if (_working is null) return;
        _validationError = Validate?.Invoke(_working, Items, _editIndex);
        if (_validationError is not null) return;
        if (_editIndex is int i) Items[i] = _working;
        else Items.Add(_working);
        _modalOpen = false;
        _working = default;
        _editIndex = null;
        await ItemsChanged.InvokeAsync();
    }
 }
@@ -1,7 +1,5 @@
-@* Identity section shared across the generic DriverEdit page and the typed driver pages (Phase 4).
+@* Identity section shared by the typed driver pages. The parent page owns the <EditForm> and all
-   The parent page owns the <EditForm> and all data loading/persistence — this component is
+   data loading/persistence — this component is purely a section of inputs. *@
   purely a section of inputs.
   Set ShowDriverType=true on the generic editor; typed pages leave it false (type is fixed). *@
@using System.ComponentModel.DataAnnotations
@using ZB.MOM.WW.OtOpcUa.Configuration.Entities
@@ -37,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>
@@ -1,16 +1,42 @@
-@* Resilience overrides — JSON textarea. Typed-form-ifying Polly is a follow-up; for now this
+@using ZB.MOM.WW.OtOpcUa.AdminUI.Components.Shared.Drivers
   matches the legacy DriverEdit.razor behaviour exactly. *@
 <section class="panel rise mt-3" style="animation-delay:.14s">
    <div class="panel-head">Resilience overrides (optional)</div>
    <div style="padding:1rem">
-        <InputTextArea Value="@ResilienceConfig"
+        <p class="form-text mb-3">Blank fields use the driver type's stability-tier defaults
-                       ValueExpression="() => ResilienceConfig"
+            (see <span class="mono">docs/v2/driver-stability.md</span>). Set only what you need to override.</p>
-                       ValueChanged="OnChangedAsync"
+
-                       rows="6"
+        <div class="row g-3">
-                       class="form-control form-control-sm mono"
+            <div class="col-md-4"><label class="form-label">Bulkhead max concurrent</label>
-                       placeholder="Leave blank to use tier defaults" />
+                <input type="number" class="form-control form-control-sm" @bind="_m.BulkheadMaxConcurrent" @bind:after="EmitAsync" placeholder="tier default" /></div>
-        <div class="form-text">Polly pipeline overrides per docs/v2/driver-stability.md — bulkhead, retry counts, breaker thresholds. Null = use the driver type's tier defaults.</div>
+            <div class="col-md-4"><label class="form-label">Bulkhead max queue</label>
                <input type="number" class="form-control form-control-sm" @bind="_m.BulkheadMaxQueue" @bind:after="EmitAsync" placeholder="tier default" /></div>
            <div class="col-md-4"><label class="form-label">Recycle interval (s, Tier C only)</label>
                <input type="number" class="form-control form-control-sm" @bind="_m.RecycleIntervalSeconds" @bind:after="EmitAsync" placeholder="none" /></div>
        </div>
        <div class="table-wrap mt-3">
            <table class="data-table">
                <thead><tr><th>Capability</th><th>Timeout (s)</th><th>Retries</th><th>Breaker threshold</th></tr></thead>
                <tbody>
                    @foreach (var cap in ResilienceFormModel.Capabilities)
                    {
                        var row = _m.Policies[cap];
                        <tr>
                            <td class="mono">@cap</td>
                            <td><input type="number" class="form-control form-control-sm" @bind="row.TimeoutSeconds" @bind:after="EmitAsync" placeholder="default" /></td>
                            <td><input type="number" class="form-control form-control-sm" @bind="row.RetryCount" @bind:after="EmitAsync" placeholder="default" /></td>
                            <td><input type="number" class="form-control form-control-sm" @bind="row.BreakerFailureThreshold" @bind:after="EmitAsync" placeholder="default" /></td>
                        </tr>
                    }
                </tbody>
            </table>
        </div>
        <details class="mt-3">
            <summary class="small text-muted">Raw JSON (advanced)</summary>
            <pre class="form-control form-control-sm mono mt-2" style="white-space:pre-wrap;min-height:3rem;">@(_m.ToJson() ?? "(null — all tier defaults)")</pre>
        </details>
    </div>
 </section>
@@ -18,9 +44,24 @@
    [Parameter] public string? ResilienceConfig { get; set; }
    [Parameter] public EventCallback<string?> ResilienceConfigChanged { get; set; }
-    private async Task OnChangedAsync(string? newValue)
+    private ResilienceFormModel _m = new();
    private string? _lastParsed;
    protected override void OnParametersSet()
    {
-        ResilienceConfig = newValue;
+        // Re-parse only when the inbound value actually changed (avoid clobbering edits on re-render).
-        await ResilienceConfigChanged.InvokeAsync(newValue);
+        if (!string.Equals(_lastParsed, ResilienceConfig, StringComparison.Ordinal))
        {
            _m = ResilienceFormModel.FromJson(ResilienceConfig);
            _lastParsed = ResilienceConfig;
        }
    }
    private async Task EmitAsync()
    {
        var json = _m.ToJson();
        _lastParsed = json;
        ResilienceConfig = json;
        await ResilienceConfigChanged.InvokeAsync(json);
    }
 }
@@ -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()
+        // Read live status straight from the in-process snapshot store rather than opening a
-            .WithUrl(Nav.ToAbsoluteUri("/hubs/driverstatus"))
+        // self-targeted SignalR connection. This component runs server-side (Blazor
-            .WithAutomaticReconnect()
+        // InteractiveServer), so a HubConnection to the browser's public URL (e.g.
-            .Build();
+        // 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
-        _hub.On<DriverHealthChanged>("status", snap =>
+        // on every admin node by DriverStatusSignalRBridge (a per-node DistributedPubSub
-        {
+        // subscriber), so the local singleton is always current regardless of which replica serves
-            _snapshot = snap;
+        // this circuit.
            _lastUpdateUtc = DateTime.UtcNow;
            _stale = false;
            InvokeAsync(StateHasChanged);
        });
        try
        {
-            await _hub.StartAsync();
+            StatusStore.SnapshotChanged += OnSnapshotChanged;
-            _connecting = false;
+            if (StatusStore.TryGet(DriverInstanceId, out var snap))
-            await _hub.InvokeAsync("JoinDriver", DriverInstanceId);
+            {
                _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
+        // Unsubscribe first so the singleton store can't invoke a handler on a disposed component.
-        // a component whose hub has already been released. System.Threading.Timer's async
+        StatusStore.SnapshotChanged -= OnSnapshotChanged;
-        // dispose awaits any in-flight callback (.NET 6+).
+        // 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.
@@ -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;
        }
@@ -0,0 +1,104 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 namespace ZB.MOM.WW.OtOpcUa.AdminUI.Components.Shared.Drivers;
 /// <summary>
 ///     Mutable, all-nullable form model for the driver resilience override. Binds the typed
 ///     fields in DriverResilienceSection; null/blank = "use the driver's tier default", so a
 ///     blank form serializes back to null (preserving DriverInstance.ResilienceConfig = null).
 ///     Emits / reads the exact override JSON shape DriverResilienceOptionsParser consumes.
 /// </summary>
 public sealed class ResilienceFormModel
 {
    public static readonly string[] Capabilities =
        ["Read", "Write", "Discover", "Subscribe", "Probe", "AlarmSubscribe", "AlarmAcknowledge", "HistoryRead"];
    public int? BulkheadMaxConcurrent { get; set; }
    public int? BulkheadMaxQueue { get; set; }
    public int? RecycleIntervalSeconds { get; set; }
    // capability name -> (timeout, retry, breaker), each nullable.
    public Dictionary<string, CapabilityRow> Policies { get; set; } =
        Capabilities.ToDictionary(c => c, _ => new CapabilityRow(), StringComparer.OrdinalIgnoreCase);
    public sealed class CapabilityRow
    {
        public int? TimeoutSeconds { get; set; }
        public int? RetryCount { get; set; }
        public int? BreakerFailureThreshold { get; set; }
        public bool IsEmpty => TimeoutSeconds is null && RetryCount is null && BreakerFailureThreshold is null;
    }
    private static readonly JsonSerializerOptions ReadOpts = new() { PropertyNameCaseInsensitive = true };
    private static readonly JsonSerializerOptions WriteOpts = new()
    {
        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
    };
    public static ResilienceFormModel FromJson(string? json)
    {
        var model = new ResilienceFormModel();
        if (string.IsNullOrWhiteSpace(json)) return model;
        Shape? shape;
        try { shape = JsonSerializer.Deserialize<Shape>(json, ReadOpts); }
        catch (JsonException) { return model; }   // malformed -> empty form; raw view (next task) shows the text
        if (shape is null) return model;
        model.BulkheadMaxConcurrent = shape.BulkheadMaxConcurrent;
        model.BulkheadMaxQueue = shape.BulkheadMaxQueue;
        model.RecycleIntervalSeconds = shape.RecycleIntervalSeconds;
        if (shape.CapabilityPolicies is not null)
            foreach (var (cap, p) in shape.CapabilityPolicies)
                if (model.Policies.TryGetValue(cap, out var row))
                {
                    row.TimeoutSeconds = p.TimeoutSeconds;
                    row.RetryCount = p.RetryCount;
                    row.BreakerFailureThreshold = p.BreakerFailureThreshold;
                }
        return model;
    }
    /// <summary>Emit only the non-null overrides; returns null when nothing is overridden.</summary>
    public string? ToJson()
    {
        var caps = Policies
            .Where(kv => !kv.Value.IsEmpty)
            .ToDictionary(kv => kv.Key, kv => new PolicyShape
            {
                TimeoutSeconds = kv.Value.TimeoutSeconds,
                RetryCount = kv.Value.RetryCount,
                BreakerFailureThreshold = kv.Value.BreakerFailureThreshold,
            });
        var hasAny = BulkheadMaxConcurrent is not null || BulkheadMaxQueue is not null
                     || RecycleIntervalSeconds is not null || caps.Count > 0;
        if (!hasAny) return null;
        var shape = new Shape
        {
            BulkheadMaxConcurrent = BulkheadMaxConcurrent,
            BulkheadMaxQueue = BulkheadMaxQueue,
            RecycleIntervalSeconds = RecycleIntervalSeconds,
            CapabilityPolicies = caps.Count > 0 ? caps : null,
        };
        return JsonSerializer.Serialize(shape, WriteOpts);
    }
    private sealed class Shape
    {
        public int? BulkheadMaxConcurrent { get; set; }
        public int? BulkheadMaxQueue { get; set; }
        public int? RecycleIntervalSeconds { get; set; }
        public Dictionary<string, PolicyShape>? CapabilityPolicies { get; set; }
    }
    private sealed class PolicyShape
    {
        public int? TimeoutSeconds { get; set; }
        public int? RetryCount { get; set; }
        public int? BreakerFailureThreshold { get; set; }
    }
 }
@@ -15,11 +15,6 @@ public static class EndpointRouteBuilderExtensions
    /// <summary>
    /// Mounts the AdminUI Razor components and the AdminUI static asset pipeline at the root.
    /// Call from the fused Host's Program.cs alongside <c>app.MapOtOpcUaAuth()</c>.
    ///
    /// Razor component migration from legacy <c>OtOpcUa.Admin/Components/</c> is staged for
    /// follow-up F15 — 47 .razor files plus codebehind. Until then this extension wires the
    /// Blazor pipeline but the only built-in components are the v2-native ones added in this
    /// library (e.g. <c>Deployments</c>, Task 52).
    /// </summary>
    /// <typeparam name="TApp">The root component type for Razor pages.</typeparam>
    /// <param name="app">The endpoint route builder.</param>
@@ -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) =>
+    /// <param name="broadcaster">In-process fan-out read directly by the Blazor Server Alerts page.</param>
-        Akka.Actor.Props.Create(() => new AlertSignalRBridge(hub));
+    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);
@@ -7,9 +7,8 @@ namespace ZB.MOM.WW.OtOpcUa.AdminUI.Hubs;
 /// Browser-facing fleet-status push channel. Subscribers receive <see cref="FleetStatusChanged"/>
 /// snapshots whenever the admin-role <c>FleetStatusBroadcaster</c> publishes a diff.
 ///
-/// Server-side bridge from <c>FleetStatusBroadcaster.broadcast</c> → <c>IHubContext&lt;FleetStatusHub&gt;</c>
+/// Server pushes fleet-status updates to connected clients via <c>FleetStatusSignalRBridge</c>
-/// is staged for follow-up F16. For now the hub is a passive channel; SignalR clients connect
+/// (DistributedPubSub 'fleet-status' → <c>IHubContext&lt;FleetStatusHub&gt;</c>).
 /// and stay idle until the bridge lands.
 /// </summary>
 public sealed class FleetStatusHub : Hub
 {
@@ -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:
+    ///     Registers the in-process live-push services the AdminUI's Blazor Server panels read
-    ///     <see cref="IDriverStatusSnapshotStore"/> as a singleton backed by
+    ///     directly (instead of self-connecting a SignalR <c>HubConnection</c>, which fails behind a
-    ///     <see cref="InMemoryDriverStatusSnapshotStore"/>.
+    ///     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>>();
@@ -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;
 }
@@ -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);
 }
@@ -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)
@@ -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) =>
+    /// <param name="broadcaster">In-process fan-out read directly by the Blazor Server Script log page.</param>
-        Akka.Actor.Props.Create(() => new ScriptLogSignalRBridge(hub));
+    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);
@@ -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
+///     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).
+///     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.
+        // Driver nodes also carry the probe set so a fused admin,driver node has it; the admin-only
-        services.AddSingleton<IDriverProbe, ModbusProbe>();
+        // case is covered by Program.cs calling AddOtOpcUaDriverProbes() in the hasAdmin block.
-        services.AddSingleton<IDriverProbe, AbCipProbe>();
+        services.AddOtOpcUaDriverProbes();
-        services.AddSingleton<IDriverProbe, AbLegacyProbe>();
+
-        services.AddSingleton<IDriverProbe, S7Probe>();
+        return services;
-        services.AddSingleton<IDriverProbe, TwinCATProbe>();
+    }
-        services.AddSingleton<IDriverProbe, FocasProbe>();
+
-        services.AddSingleton<IDriverProbe, OpcUaProbe>();
+    /// <summary>
-        services.AddSingleton<IDriverProbe, GalaxyProbe>();
+    ///     Register one <see cref="IDriverProbe"/> per driver type. These back the AdminUI's
-        services.AddSingleton<IDriverProbe, HistorianProbe>();
+    ///     "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;
    }
@@ -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();
@@ -6,6 +6,9 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using ZB.MOM.WW.OtOpcUa.Configuration.Services;
 using ZB.MOM.WW.OtOpcUa.Security.Jwt;
 using ZB.MOM.WW.OtOpcUa.Security.Ldap;
@@ -40,6 +43,7 @@ public static class AuthEndpoints
    private static async Task<IResult> LoginAsync(
        HttpContext http,
        ILdapAuthService ldap,
        ILdapGroupRoleMappingService roleMappings,
        CancellationToken ct)
    {
        var isForm = http.Request.HasFormContentType;
@@ -83,13 +87,27 @@ public static class AuthEndpoints
            return Results.Redirect("/login" + qs);
        }
        IReadOnlyList<string> roles = result.Roles;
        try
        {
            var dbRows = await roleMappings.GetByGroupsAsync(result.Groups, ct);
            roles = RoleMapper.Merge(result.Roles, dbRows);
        }
        catch (Exception ex) when (ex is not OperationCanceledException)
        {
            // A DB hiccup must never block sign-in — fall back to the appsettings baseline roles.
            http.RequestServices.GetService<ILoggerFactory>()?
                .CreateLogger("ZB.MOM.WW.OtOpcUa.Security.AuthEndpoints")
                .LogWarning(ex, "DB role-map lookup failed for {User}; using appsettings baseline roles", username);
        }
        var claims = new List<Claim>
        {
            new(ClaimTypes.NameIdentifier, result.Username ?? username),
            new(JwtTokenService.UsernameClaimType, result.Username ?? username),
            new(JwtTokenService.DisplayNameClaimType, result.DisplayName ?? username),
        };
-        foreach (var role in result.Roles)
+        foreach (var role in roles)
            claims.Add(new Claim(ClaimTypes.Role, role));
        var identity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
@@ -1,3 +1,5 @@
 using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
 namespace ZB.MOM.WW.OtOpcUa.Security.Ldap;
 /// <summary>
@@ -24,4 +26,21 @@ public static class RoleMapper
        }
        return [.. roles];
    }
    /// <summary>
    ///     Merge the appsettings-derived baseline roles with system-wide DB grants. DB rows are
    ///     additive; cluster-scoped rows (IsSystemWide == false) are ignored under the global model.
    /// </summary>
    /// <param name="baselineRoles">Roles already resolved from appsettings (or the dev stub).</param>
    /// <param name="dbRows">LdapGroupRoleMapping rows for the user's groups (from GetByGroupsAsync).</param>
    public static IReadOnlyList<string> Merge(
        IReadOnlyCollection<string> baselineRoles,
        IReadOnlyCollection<LdapGroupRoleMapping> dbRows)
    {
        var roles = new HashSet<string>(baselineRoles, StringComparer.OrdinalIgnoreCase);
        foreach (var row in dbRows)
            if (row.IsSystemWide)
                roles.Add(row.Role.ToString());
        return [.. roles];
    }
 }
@@ -89,6 +89,9 @@ public static class ServiceCollectionExtensions
            // appsettings (e.g. "ot-driver-operator": "DriverOperator").
            o.AddPolicy("DriverOperator", policy =>
                policy.RequireRole("DriverOperator", "FleetAdmin"));
            // FleetAdmin: full administrative access; gates fleet-wide pages such as RoleGrants.
            o.AddPolicy("FleetAdmin", policy => policy.RequireRole("FleetAdmin"));
        });
        return services;
@@ -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" }],
        };
@@ -146,4 +146,23 @@ public sealed class LdapGroupRoleMappingServiceTests : IDisposable
        await svc.DeleteAsync(Guid.NewGuid(), CancellationToken.None);
        // no exception
    }
    /// <summary>Verifies that a system-wide row (IsSystemWide=true, ClusterId=null) appears in both ListAllAsync and GetByGroupsAsync.</summary>
    [Fact]
    public async Task SystemWide_Row_AppearsIn_ListAll_And_GetByGroups()
    {
        var svc = new LdapGroupRoleMappingService(_db);
        var saved = await svc.CreateAsync(
            Make("cn=sysadmins,dc=x", AdminRole.FleetAdmin, clusterId: null, isSystemWide: true),
            CancellationToken.None);
        saved.IsSystemWide.ShouldBeTrue();
        saved.ClusterId.ShouldBeNull();
        var all = await svc.ListAllAsync(CancellationToken.None);
        all.ShouldContain(r => r.Id == saved.Id);
        var byGroup = await svc.GetByGroupsAsync(["cn=sysadmins,dc=x"], CancellationToken.None);
        byGroup.ShouldContain(r => r.Id == saved.Id);
    }
 }
@@ -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);
    }
@@ -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>
@@ -0,0 +1,82 @@
 using ZB.MOM.WW.MxGateway.Client;
 using Shouldly;
 using Xunit;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Runtime;
 namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests.Runtime;
 /// <summary>
 ///     D.1 smoke (alarm-source leg): drives the REAL gateway <c>StreamAlarms</c> feed through the
 ///     production lmxopcua consumer (<see cref="GatewayGalaxyAlarmFeed"/>) and asserts native alarm
 ///     transitions — with operator comment, category, original raise time, and the mapped OPC UA
 ///     severity bucket preserved — reach the driver-side boundary that feeds
 ///     <c>IAlarmSource.OnAlarmEvent</c>.
 ///     <para>
 ///     Skip-gated: runs only when <c>MXGW_ENDPOINT</c> + <c>GALAXY_MXGW_API_KEY</c> are set to a
 ///     reachable gateway. Captured 2026-05-29 against <c>10.100.0.48:5120</c> — see
 ///     <c>docs/plans/alarms-d1-smoke-artifact.md</c>. Set <c>D1_SMOKE_OUT</c> to dump the observed
 ///     transitions to a file for artifact capture.
 ///     </para>
 /// </summary>
 [Trait("Category", "Integration")]
 public sealed class GatewayGalaxyAlarmFeedLiveTests
 {
    [Fact]
    public async Task Live_gateway_delivers_native_alarm_transitions_through_the_consumer()
    {
        var endpoint = Environment.GetEnvironmentVariable("MXGW_ENDPOINT");
        var apiKey = Environment.GetEnvironmentVariable("GALAXY_MXGW_API_KEY");
        if (string.IsNullOrWhiteSpace(endpoint) || string.IsNullOrWhiteSpace(apiKey))
            Assert.Skip("Set MXGW_ENDPOINT + GALAXY_MXGW_API_KEY to run the live gateway alarm-feed smoke.");
        var client = MxGatewayClient.Create(new MxGatewayClientOptions
        {
            Endpoint = new Uri(endpoint!, UriKind.Absolute),
            ApiKey = apiKey!,
            UseTls = false,
            ConnectTimeout = TimeSpan.FromSeconds(10),
            DefaultCallTimeout = TimeSpan.FromSeconds(30),
            StreamTimeout = TimeSpan.FromSeconds(30),
        });
        var observed = new List<GalaxyAlarmTransition>();
        var gotOne = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
        // Wire the live client's StreamAlarms method group into the production consumer seam.
        await using var feed = new GatewayGalaxyAlarmFeed(client.StreamAlarmsAsync, clientName: "D1Smoke");
        feed.OnAlarmTransition += (_, t) =>
        {
            lock (observed) { observed.Add(t); }
            gotOne.TrySetResult(true);
        };
        feed.Start();
        // The stream opens with the active-alarm snapshot, so we expect ≥1 transition promptly.
        await Task.WhenAny(gotOne.Task, Task.Delay(TimeSpan.FromSeconds(20), TestContext.Current.CancellationToken));
        List<GalaxyAlarmTransition> snapshot;
        lock (observed) snapshot = observed.ToList();
        snapshot.ShouldNotBeEmpty(
            "Live gateway should deliver at least the active-alarm snapshot through the lmxopcua consumer.");
        var first = snapshot[0];
        first.AlarmFullReference.ShouldNotBeNullOrWhiteSpace();
        first.OpcUaSeverity.ShouldBeGreaterThan(0); // severity bucket mapping applied by the consumer
        foreach (var t in snapshot.Take(8))
            TestContext.Current.SendDiagnosticMessage(
                $"{t.TransitionKind,-11} {t.AlarmFullReference}  sev={t.OpcUaSeverity}({t.SeverityBucket})  cat={t.Category}  comment='{t.OperatorComment}'");
        TestContext.Current.SendDiagnosticMessage($"TOTAL consumer transitions observed: {snapshot.Count}");
        // Deterministic artifact capture (only when D1_SMOKE_OUT is set).
        var outPath = Environment.GetEnvironmentVariable("D1_SMOKE_OUT");
        if (!string.IsNullOrWhiteSpace(outPath))
        {
            var lines = snapshot.Take(50).Select(t =>
                $"{t.TransitionKind,-11} {t.AlarmFullReference} | sev={t.OpcUaSeverity}({t.SeverityBucket}) raw={t.RawMxAccessSeverity} | cat={t.Category} | comment='{t.OperatorComment}' | xitionUtc={t.TransitionTimestampUtc:o}");
            await File.WriteAllLinesAsync(outPath!,
                new[] { $"# consumer transitions observed: {snapshot.Count}" }.Concat(lines),
                TestContext.Current.CancellationToken);
        }
    }
 }
@@ -25,6 +25,9 @@
    <ItemGroup>
        <PackageReference Include="ZB.MOM.WW.MxGateway.Contracts" />
        <!-- Client package: only the Skip-gated live alarm-feed smoke (GatewayGalaxyAlarmFeedLiveTests)
             constructs a real MxGatewayClient. Unit tests use the fake stream-factory seam. -->
        <PackageReference Include="ZB.MOM.WW.MxGateway.Client" />
    </ItemGroup>
 </Project>
@@ -2,6 +2,7 @@ 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.AbCip;
 namespace ZB.MOM.WW.OtOpcUa.AdminUI.Tests;
@@ -14,6 +15,12 @@ public sealed class AbCipDriverPageFormSerializationTests
        WriteIndented = false,
    };
    private static readonly JsonSerializerOptions TestJsonOpts = new()
    {
        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
        UnmappedMemberHandling = JsonUnmappedMemberHandling.Skip,
    };
    [Fact]
    public void RoundTrip_PreservesKnownFields()
    {
@@ -78,4 +85,110 @@ public sealed class AbCipDriverPageFormSerializationTests
        back.ShouldNotBeNull();
        back.ProbeTimeoutSeconds.ShouldBe(10);
    }
    [Fact]
    public void DeviceRow_round_trips_through_definition()
    {
        var row = new AbCipDriverPage.AbCipDeviceRow
        {
            HostAddress = "ab://10.0.0.1/1,0", PlcFamily = AbCipPlcFamily.CompactLogix, DeviceName = "PLC-A",
        };
        var def = row.ToDefinition();
        var back = AbCipDriverPage.AbCipDeviceRow.FromDefinition(def);
        back.HostAddress.ShouldBe("ab://10.0.0.1/1,0");
        back.PlcFamily.ShouldBe(AbCipPlcFamily.CompactLogix);
        back.DeviceName.ShouldBe("PLC-A");
    }
    [Fact]
    public void DeviceRow_preserves_unedited_fields()
    {
        var original = new AbCipDeviceOptions(
            "ab://10.0.0.1/1,0", AbCipPlcFamily.ControlLogix, "PLC-A",
            AllowPacking: true, ConnectionSize: 4002);
        var row = AbCipDriverPage.AbCipDeviceRow.FromDefinition(original);
        row.HostAddress = "ab://10.0.0.2/1,0";
        var back = row.ToDefinition();
        back.HostAddress.ShouldBe("ab://10.0.0.2/1,0");
        back.AllowPacking.ShouldBe(true);
        back.ConnectionSize.ShouldBe(4002);
    }
    [Fact]
    public void TagRow_round_trips_through_definition()
    {
        var row = new AbCipDriverPage.AbCipTagRow
        {
            Name = "Speed", DeviceHostAddress = "ab://10.0.0.1/1,0", TagPath = "Motor1.Speed",
            DataType = AbCipDataType.Real, Writable = true,
        };
        var def = row.ToDefinition();
        var back = AbCipDriverPage.AbCipTagRow.FromDefinition(def);
        back.Name.ShouldBe("Speed");
        back.DeviceHostAddress.ShouldBe("ab://10.0.0.1/1,0");
        back.TagPath.ShouldBe("Motor1.Speed");
        back.DataType.ShouldBe(AbCipDataType.Real);
        back.Writable.ShouldBeTrue();
    }
    [Fact]
    public void TagRow_preserves_unedited_fields()
    {
        var original = new AbCipTagDefinition(
            "Speed", "ab://10.0.0.1/1,0", "Motor1.Speed", AbCipDataType.Structure,
            Writable: true, WriteIdempotent: true,
            Members: [new AbCipStructureMember("Sub", AbCipDataType.DInt)],
            SafetyTag: true);
        var row = AbCipDriverPage.AbCipTagRow.FromDefinition(original);
        row.Name = "Renamed";
        var back = row.ToDefinition();
        back.Name.ShouldBe("Renamed");
        back.WriteIdempotent.ShouldBeTrue();
        back.SafetyTag.ShouldBeTrue();
        back.Members.ShouldNotBeNull();
        back.Members!.Count.ShouldBe(1);
        back.Members[0].Name.ShouldBe("Sub");
    }
    [Fact]
    public void ValidateDeviceRow_rejects_duplicate_host()
    {
        var rows = new List<AbCipDriverPage.AbCipDeviceRow> { new() { HostAddress = "ab://10.0.0.1/1,0" } };
        AbCipDriverPage.AbCipDeviceRow.ValidateRow(new() { HostAddress = "ab://10.0.0.1/1,0" }, rows, null)
            .ShouldNotBeNull();
    }
    [Fact]
    public void ValidateTagRow_rejects_duplicate_name()
    {
        var rows = new List<AbCipDriverPage.AbCipTagRow> { new() { Name = "Speed" } };
        AbCipDriverPage.AbCipTagRow.ValidateRow(new() { Name = "Speed" }, rows, null)
            .ShouldNotBeNull();
    }
    [Fact]
    public void Device_and_tag_lists_survive_options_serialize_round_trip()
    {
        var devices = new List<AbCipDeviceOptions>
        {
            new("ab://10.0.0.1/1,0", AbCipPlcFamily.ControlLogix, "PLC-1"),
            new("ab://10.0.0.2/1,0", AbCipPlcFamily.CompactLogix, "PLC-2"),
        };
        var tags = new List<AbCipTagDefinition>
        {
            new("Speed", "ab://10.0.0.1/1,0", "Motor1.Speed", AbCipDataType.Real),
            new("Run", "ab://10.0.0.2/1,0", "Motor2.Run", AbCipDataType.Bool),
        };
        var opts = new AbCipDriverPage.FormModel().ToOptions(devices, tags);
        var json = JsonSerializer.Serialize(opts, TestJsonOpts);
        var back = JsonSerializer.Deserialize<AbCipDriverOptions>(json, TestJsonOpts)!;
        back.Devices.Count.ShouldBe(2);
        back.Devices[0].HostAddress.ShouldBe("ab://10.0.0.1/1,0");
        back.Tags.Count.ShouldBe(2);
        back.Tags[0].Name.ShouldBe("Speed");
    }
 }
@@ -2,6 +2,7 @@ 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.AbLegacy;
 using ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.PlcFamilies;
@@ -15,6 +16,12 @@ public sealed class AbLegacyDriverPageFormSerializationTests
        WriteIndented = false,
    };
    private static readonly JsonSerializerOptions TestJsonOpts = new()
    {
        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
        UnmappedMemberHandling = JsonUnmappedMemberHandling.Skip,
    };
    [Fact]
    public void RoundTrip_PreservesKnownFields()
    {
@@ -78,4 +85,102 @@ public sealed class AbLegacyDriverPageFormSerializationTests
        back.ShouldNotBeNull();
        back.ProbeTimeoutSeconds.ShouldBe(10);
    }
    [Fact]
    public void DeviceRow_round_trips_through_definition()
    {
        var row = new AbLegacyDriverPage.AbLegacyDeviceRow
        {
            HostAddress = "10.0.0.10", PlcFamily = AbLegacyPlcFamily.MicroLogix, DeviceName = "PLC-A",
        };
        var def = row.ToDefinition();
        var back = AbLegacyDriverPage.AbLegacyDeviceRow.FromDefinition(def);
        back.HostAddress.ShouldBe("10.0.0.10");
        back.PlcFamily.ShouldBe(AbLegacyPlcFamily.MicroLogix);
        back.DeviceName.ShouldBe("PLC-A");
    }
    [Fact]
    public void DeviceRow_preserves_unedited_fields()
    {
        var original = new AbLegacyDeviceOptions("10.0.0.10", AbLegacyPlcFamily.Plc5, "PLC-A");
        var row = AbLegacyDriverPage.AbLegacyDeviceRow.FromDefinition(original);
        row.HostAddress = "10.0.0.20";
        var back = row.ToDefinition();
        back.HostAddress.ShouldBe("10.0.0.20");
        back.PlcFamily.ShouldBe(AbLegacyPlcFamily.Plc5);
        back.DeviceName.ShouldBe("PLC-A");
    }
    [Fact]
    public void TagRow_round_trips_through_definition()
    {
        var row = new AbLegacyDriverPage.AbLegacyTagRow
        {
            Name = "Level", DeviceHostAddress = "10.0.0.10", Address = "N7:5",
            DataType = AbLegacyDataType.Int, Writable = true,
        };
        var def = row.ToDefinition();
        var back = AbLegacyDriverPage.AbLegacyTagRow.FromDefinition(def);
        back.Name.ShouldBe("Level");
        back.DeviceHostAddress.ShouldBe("10.0.0.10");
        back.Address.ShouldBe("N7:5");
        back.DataType.ShouldBe(AbLegacyDataType.Int);
        back.Writable.ShouldBeTrue();
    }
    [Fact]
    public void TagRow_preserves_unedited_fields()
    {
        var original = new AbLegacyTagDefinition(
            "Level", "10.0.0.10", "N7:5", AbLegacyDataType.Int,
            Writable: true, WriteIdempotent: true);
        var row = AbLegacyDriverPage.AbLegacyTagRow.FromDefinition(original);
        row.Name = "Renamed";
        var back = row.ToDefinition();
        back.Name.ShouldBe("Renamed");
        back.WriteIdempotent.ShouldBeTrue();
    }
    [Fact]
    public void ValidateDeviceRow_rejects_duplicate_host()
    {
        var rows = new List<AbLegacyDriverPage.AbLegacyDeviceRow> { new() { HostAddress = "10.0.0.10" } };
        AbLegacyDriverPage.AbLegacyDeviceRow.ValidateRow(new() { HostAddress = "10.0.0.10" }, rows, null)
            .ShouldNotBeNull();
    }
    [Fact]
    public void ValidateTagRow_rejects_duplicate_name()
    {
        var rows = new List<AbLegacyDriverPage.AbLegacyTagRow> { new() { Name = "Level" } };
        AbLegacyDriverPage.AbLegacyTagRow.ValidateRow(new() { Name = "Level" }, rows, null)
            .ShouldNotBeNull();
    }
    [Fact]
    public void Device_and_tag_lists_survive_options_serialize_round_trip()
    {
        var devices = new List<AbLegacyDeviceOptions>
        {
            new("10.0.0.10", AbLegacyPlcFamily.Slc500, "PLC-1"),
            new("10.0.0.11", AbLegacyPlcFamily.MicroLogix, "PLC-2"),
        };
        var tags = new List<AbLegacyTagDefinition>
        {
            new("Level", "10.0.0.10", "N7:5", AbLegacyDataType.Int),
            new("Pump", "10.0.0.11", "B3:0/0", AbLegacyDataType.Bit),
        };
        var opts = new AbLegacyDriverPage.FormModel().ToOptions(devices, tags);
        var json = JsonSerializer.Serialize(opts, TestJsonOpts);
        var back = JsonSerializer.Deserialize<AbLegacyDriverOptions>(json, TestJsonOpts)!;
        back.Devices.Count.ShouldBe(2);
        back.Devices[0].HostAddress.ShouldBe("10.0.0.10");
        back.Tags.Count.ShouldBe(2);
        back.Tags[0].Name.ShouldBe("Level");
    }
 }
@@ -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);
    }
 }
@@ -2,6 +2,7 @@ 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.FOCAS;
 namespace ZB.MOM.WW.OtOpcUa.AdminUI.Tests;
@@ -14,6 +15,12 @@ public sealed class FocasDriverPageFormSerializationTests
        WriteIndented = false,
    };
    private static readonly JsonSerializerOptions TestJsonOpts = new()
    {
        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
        UnmappedMemberHandling = JsonUnmappedMemberHandling.Skip,
    };
    [Fact]
    public void RoundTrip_PreservesKnownFields()
    {
@@ -116,7 +123,7 @@ public sealed class FocasDriverPageFormSerializationTests
        var form = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .FocasDriverPage.FormModel.FromOptions(opts);
-        var roundTripped = form.ToOptions();
+        var roundTripped = form.ToOptions([], []);
        roundTripped.Timeout.ShouldBe(TimeSpan.FromSeconds(4));
        roundTripped.Probe.Enabled.ShouldBeTrue();
@@ -132,4 +139,104 @@ public sealed class FocasDriverPageFormSerializationTests
        roundTripped.FixedTree.ProgramPollInterval.ShouldBe(TimeSpan.FromSeconds(5));
        roundTripped.FixedTree.TimerPollInterval.ShouldBe(TimeSpan.FromSeconds(45));
    }
    [Fact]
    public void DeviceRow_round_trips_through_definition()
    {
        var row = new FocasDriverPage.FocasDeviceRow
        {
            HostAddress = "192.168.0.10:8193", Series = FocasCncSeries.Thirty_i, DeviceName = "CNC1",
        };
        var def = row.ToDefinition();
        var back = FocasDriverPage.FocasDeviceRow.FromDefinition(def);
        back.HostAddress.ShouldBe("192.168.0.10:8193");
        back.Series.ShouldBe(FocasCncSeries.Thirty_i);
        back.DeviceName.ShouldBe("CNC1");
    }
    [Fact]
    public void DeviceRow_preserves_unedited_fields()
    {
        var original = new FocasDeviceOptions("192.168.0.10:8193", "CNC1", FocasCncSeries.Thirty_i);
        var row = FocasDriverPage.FocasDeviceRow.FromDefinition(original);
        row.HostAddress = "192.168.0.20:8193";
        var back = row.ToDefinition();
        back.HostAddress.ShouldBe("192.168.0.20:8193");
        back.DeviceName.ShouldBe("CNC1");
        back.Series.ShouldBe(FocasCncSeries.Thirty_i);
    }
    [Fact]
    public void TagRow_round_trips_through_definition()
    {
        var row = new FocasDriverPage.FocasTagRow
        {
            Name = "MacroVar", DeviceHostAddress = "192.168.0.10:8193", Address = "MACRO:500",
            DataType = FocasDataType.Float64, Writable = true,
        };
        var def = row.ToDefinition();
        var back = FocasDriverPage.FocasTagRow.FromDefinition(def);
        back.Name.ShouldBe("MacroVar");
        back.DeviceHostAddress.ShouldBe("192.168.0.10:8193");
        back.Address.ShouldBe("MACRO:500");
        back.DataType.ShouldBe(FocasDataType.Float64);
        back.Writable.ShouldBeTrue();
    }
    [Fact]
    public void TagRow_preserves_unedited_fields()
    {
        var original = new FocasTagDefinition(
            "MacroVar", "192.168.0.10:8193", "MACRO:500", FocasDataType.Float64,
            Writable: true, WriteIdempotent: true);
        var row = FocasDriverPage.FocasTagRow.FromDefinition(original);
        row.Name = "Renamed";
        var back = row.ToDefinition();
        back.Name.ShouldBe("Renamed");
        back.WriteIdempotent.ShouldBeTrue();
    }
    [Fact]
    public void ValidateDeviceRow_rejects_duplicate_host()
    {
        var rows = new List<FocasDriverPage.FocasDeviceRow> { new() { HostAddress = "192.168.0.10:8193" } };
        FocasDriverPage.FocasDeviceRow.ValidateRow(new() { HostAddress = "192.168.0.10:8193" }, rows, null)
            .ShouldNotBeNull();
    }
    [Fact]
    public void ValidateTagRow_rejects_duplicate_name()
    {
        var rows = new List<FocasDriverPage.FocasTagRow> { new() { Name = "MacroVar" } };
        FocasDriverPage.FocasTagRow.ValidateRow(new() { Name = "MacroVar" }, rows, null)
            .ShouldNotBeNull();
    }
    [Fact]
    public void Device_and_tag_lists_survive_options_serialize_round_trip()
    {
        var devices = new List<FocasDeviceOptions>
        {
            new("192.168.0.10:8193", "CNC1", FocasCncSeries.Thirty_i),
            new("192.168.0.20:8193", "CNC2", FocasCncSeries.Zero_i_F),
        };
        var tags = new List<FocasTagDefinition>
        {
            new("MacroVar", "192.168.0.10:8193", "MACRO:500", FocasDataType.Float64),
            new("Flag", "192.168.0.20:8193", "X0.0", FocasDataType.Bit),
        };
        var opts = new FocasDriverPage.FormModel().ToOptions(devices, tags);
        var json = JsonSerializer.Serialize(opts, TestJsonOpts);
        var back = JsonSerializer.Deserialize<FocasDriverOptions>(json, TestJsonOpts)!;
        back.Devices.Count.ShouldBe(2);
        back.Devices[0].HostAddress.ShouldBe("192.168.0.10:8193");
        back.Devices[0].Series.ShouldBe(FocasCncSeries.Thirty_i);
        back.Tags.Count.ShouldBe(2);
        back.Tags[0].Name.ShouldBe("MacroVar");
        back.Tags[0].Address.ShouldBe("MACRO:500");
    }
 }
@@ -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);
    }
 }
@@ -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));
    }
 }
@@ -2,6 +2,7 @@ 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.Modbus;
 namespace ZB.MOM.WW.OtOpcUa.AdminUI.Tests;
@@ -14,6 +15,12 @@ public sealed class ModbusDriverPageFormSerializationTests
        WriteIndented = false,
    };
    private static readonly JsonSerializerOptions TestJsonOpts = new()
    {
        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
        UnmappedMemberHandling = JsonUnmappedMemberHandling.Skip,
    };
    [Fact]
    public void RoundTrip_PreservesKnownFields()
    {
@@ -104,4 +111,63 @@ public sealed class ModbusDriverPageFormSerializationTests
        back.ShouldNotBeNull();
        back.ProbeTimeoutSeconds.ShouldBe(10);
    }
    [Fact]
    public void TagRow_round_trips_through_definition()
    {
        var row = new ModbusDriverPage.ModbusTagRow
        {
            Name = "Pump1_Speed", Region = ModbusRegion.HoldingRegisters, Address = 40001,
            DataType = ModbusDataType.Int16, Writable = true,
        };
        var def = row.ToDefinition();
        var back = ModbusDriverPage.ModbusTagRow.FromDefinition(def);
        back.Name.ShouldBe("Pump1_Speed");
        back.Address.ShouldBe(40001);
        back.DataType.ShouldBe(ModbusDataType.Int16);
        back.Writable.ShouldBeTrue();
    }
    [Fact]
    public void Tag_list_survives_options_serialize_round_trip()
    {
        var tags = new List<ModbusTagDefinition>
        {
            new("A", ModbusRegion.HoldingRegisters, 1, ModbusDataType.Int16),
            new("B", ModbusRegion.Coils, 2, ModbusDataType.Bool),
        };
        var opts = new ModbusDriverPage.FormModel().ToOptions(tags);
        var json = JsonSerializer.Serialize(opts, TestJsonOpts);
        var back = JsonSerializer.Deserialize<ModbusDriverOptions>(json, TestJsonOpts)!;
        back.Tags.Count.ShouldBe(2);
        back.Tags[0].Name.ShouldBe("A");
    }
    [Fact]
    public void ValidateRow_rejects_duplicate_name()
    {
        var rows = new List<ModbusDriverPage.ModbusTagRow> { new() { Name = "A" } };
        ModbusDriverPage.ModbusTagRow.ValidateRow(new() { Name = "A" }, rows, null)
            .ShouldNotBeNull();
    }
    [Fact]
    public void ToDefinition_preserves_unedited_fields()
    {
        var original = new ModbusTagDefinition(
            "T", ModbusRegion.HoldingRegisters, 5, ModbusDataType.Int16,
            StringByteOrder: ModbusStringByteOrder.LowByteFirst,
            ArrayCount: 10, Deadband: 0.5, UnitId: 3, CoalesceProhibited: true);
        var row = ModbusDriverPage.ModbusTagRow.FromDefinition(original);
        row.Name = "Renamed";
        var back = row.ToDefinition();
        back.Name.ShouldBe("Renamed");
        back.UnitId.ShouldBe((byte)3);
        back.ArrayCount.ShouldBe(10);
        back.Deadband.ShouldBe(0.5);
        back.StringByteOrder.ShouldBe(ModbusStringByteOrder.LowByteFirst);
        back.CoalesceProhibited.ShouldBeTrue();
    }
 }
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Shouldly;
@@ -85,9 +86,10 @@ public sealed class OpcUaClientDriverPageFormSerializationTests
    [Fact]
    public void FormModel_RoundTrip_PreservesAllFields()
    {
-        // Construct options with non-default values for every editable property plus
+        // Construct options with non-default values for every editable property plus a
-        // non-empty EndpointUrls and UnsMappingTable — both are "read-only" in the form
+        // non-empty UnsMappingTable (read-only in the form, round-tripped via the original
-        // but must survive the FormModel translation unchanged.
+        // record). EndpointUrls is now edited via the CollectionEditor on the page and is
        // threaded into ToRecord explicitly; see EndpointUrls_ListRoundTrip_PreservesOrder.
        var endpointUrls = new List<string> { "opc.tcp://primary:4840", "opc.tcp://backup:4840" };
        var unsMappingTable = new Dictionary<string, string>
        {
@@ -123,7 +125,7 @@ public sealed class OpcUaClientDriverPageFormSerializationTests
        };
        var form = OpcUaClientDriverPage.OpcUaClientFormModel.FromRecord(original);
-        var result = form.ToRecord();
+        var result = form.ToRecord(endpointUrls);
        result.EndpointUrl.ShouldBe("opc.tcp://fallback:4840");
        result.EndpointUrls.Count.ShouldBe(2);
@@ -153,4 +155,92 @@ public sealed class OpcUaClientDriverPageFormSerializationTests
        result.UnsMappingTable["Line2/"].ShouldBe("Site/Area1/Line2");
        result.ProbeTimeoutSeconds.ShouldBe(25);
    }
    [Fact]
    public void EndpointUrlRow_FromUrl_ToUrl_Trims()
    {
        var row = OpcUaClientDriverPage.EndpointUrlRow.FromUrl("  opc.tcp://plc:4840  ");
        row.Url.ShouldBe("  opc.tcp://plc:4840  ");
        row.ToUrl().ShouldBe("opc.tcp://plc:4840");
    }
    [Fact]
    public void EndpointUrlRow_ValidateRow_RejectsBlank()
    {
        var all = new List<OpcUaClientDriverPage.EndpointUrlRow>();
        var row = new OpcUaClientDriverPage.EndpointUrlRow { Url = "   " };
        var error = OpcUaClientDriverPage.EndpointUrlRow.ValidateRow(row, all, null);
        error.ShouldBe("URL is required.");
    }
    [Fact]
    public void EndpointUrlRow_ValidateRow_RejectsNonOpcTcpScheme()
    {
        var all = new List<OpcUaClientDriverPage.EndpointUrlRow>();
        var row = new OpcUaClientDriverPage.EndpointUrlRow { Url = "http://plc:4840" };
        var error = OpcUaClientDriverPage.EndpointUrlRow.ValidateRow(row, all, null);
        error.ShouldBe("Endpoint URL must start with opc.tcp://");
    }
    [Fact]
    public void EndpointUrlRow_ValidateRow_RejectsDuplicate()
    {
        var all = new List<OpcUaClientDriverPage.EndpointUrlRow>
        {
            new() { Url = "opc.tcp://primary:4840" },
            new() { Url = "opc.tcp://backup:4840" },
        };
        // Adding a new row (editIndex null) duplicating the first — case-insensitive, whitespace-insensitive.
        var row = new OpcUaClientDriverPage.EndpointUrlRow { Url = "  OPC.TCP://primary:4840 " };
        var error = OpcUaClientDriverPage.EndpointUrlRow.ValidateRow(row, all, null);
        error.ShouldNotBeNull();
        error.ShouldContain("Duplicate endpoint");
    }
    [Fact]
    public void EndpointUrlRow_ValidateRow_AllowsEditingRowInPlace()
    {
        var all = new List<OpcUaClientDriverPage.EndpointUrlRow>
        {
            new() { Url = "opc.tcp://primary:4840" },
            new() { Url = "opc.tcp://backup:4840" },
        };
        // Editing index 0 and keeping the same URL must not flag itself as a duplicate.
        var row = new OpcUaClientDriverPage.EndpointUrlRow { Url = "opc.tcp://primary:4840" };
        var error = OpcUaClientDriverPage.EndpointUrlRow.ValidateRow(row, all, 0);
        error.ShouldBeNull();
    }
    [Fact]
    public void EndpointUrls_ListRoundTrip_PreservesOrder()
    {
        // The page holds endpoints as a List<EndpointUrlRow>; loading from EndpointUrls and
        // converting back must preserve order (the failover list is ordered, primary first).
        var endpointUrls = new List<string> { "opc.tcp://primary:4840", "opc.tcp://secondary:4840", "opc.tcp://tertiary:4840" };
        var rows = endpointUrls
            .Select(OpcUaClientDriverPage.EndpointUrlRow.FromUrl)
            .ToList();
        var roundTripped = rows.Select(r => r.ToUrl()).ToList();
        roundTripped.Count.ShouldBe(3);
        roundTripped[0].ShouldBe("opc.tcp://primary:4840");
        roundTripped[1].ShouldBe("opc.tcp://secondary:4840");
        roundTripped[2].ShouldBe("opc.tcp://tertiary:4840");
        var form = OpcUaClientDriverPage.OpcUaClientFormModel.FromRecord(new OpcUaClientDriverOptions());
        var result = form.ToRecord(roundTripped);
        result.EndpointUrls.Count.ShouldBe(3);
        result.EndpointUrls[0].ShouldBe("opc.tcp://primary:4840");
        result.EndpointUrls[2].ShouldBe("opc.tcp://tertiary:4840");
    }
 }
@@ -0,0 +1,49 @@
 using Shouldly;
 using Xunit;
 using ZB.MOM.WW.OtOpcUa.AdminUI.Components.Shared.Drivers;
 using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
 using ZB.MOM.WW.OtOpcUa.Core.Resilience;
 public class ResilienceFormModelTests
 {
    [Fact]
    public void Blank_form_serializes_to_null()
        => new ResilienceFormModel().ToJson().ShouldBeNull();
    [Fact]
    public void Partial_override_round_trips()
    {
        var m = new ResilienceFormModel { BulkheadMaxConcurrent = 16 };
        m.Policies["Read"].TimeoutSeconds = 5;
        m.Policies["Read"].RetryCount = 5;
        var json = m.ToJson();
        json.ShouldNotBeNull();
        var back = ResilienceFormModel.FromJson(json);
        back.BulkheadMaxConcurrent.ShouldBe(16);
        back.Policies["Read"].TimeoutSeconds.ShouldBe(5);
        back.Policies["Write"].IsEmpty.ShouldBeTrue();
    }
    [Fact]
    public void Malformed_json_yields_empty_model()
    {
        var m = ResilienceFormModel.FromJson("{ not valid json");
        m.BulkheadMaxConcurrent.ShouldBeNull();
        m.Policies["Read"].IsEmpty.ShouldBeTrue();
    }
    [Fact]
    public void Emitted_json_is_consumable_by_the_runtime_parser()
    {
        var m = new ResilienceFormModel { BulkheadMaxConcurrent = 16 };
        m.Policies["Read"].TimeoutSeconds = 7;
        var opts = DriverResilienceOptionsParser.ParseOrDefaults(DriverTier.B, m.ToJson(), out var diag);
        diag.ShouldBeNull();
        opts.BulkheadMaxConcurrent.ShouldBe(16);
        opts.Resolve(DriverCapability.Read).TimeoutSeconds.ShouldBe(7);
        opts.Resolve(DriverCapability.Write).RetryCount.ShouldBe(0);
    }
 }
@@ -2,6 +2,7 @@ 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.S7;
 namespace ZB.MOM.WW.OtOpcUa.AdminUI.Tests;
@@ -95,7 +96,10 @@ public sealed class S7DriverPageFormSerializationTests
        var form = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .S7DriverPage.FormModel.FromOptions(opts);
-        var roundTripped = form.ToOptions();
+        var tagRows = opts.Tags
            .Select(ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers.S7DriverPage.S7TagRow.FromDefinition)
            .ToList();
        var roundTripped = form.ToOptions(tagRows.Select(r => r.ToDefinition()).ToList());
        roundTripped.Host.ShouldBe("192.168.1.50");
        roundTripped.Port.ShouldBe(102);
@@ -117,4 +121,94 @@ public sealed class S7DriverPageFormSerializationTests
        roundTripped.Tags[1].Name.ShouldBe("Status");
        roundTripped.Tags[1].Writable.ShouldBeFalse();
    }
    [Fact]
    public void S7TagRow_RoundTrip_PreservesEditableFields()
    {
        var def = new S7TagDefinition("Speed", "DB1.DBD0", S7DataType.Float32, Writable: true, StringLength: 80);
        var row = S7DriverPage.S7TagRow.FromDefinition(def);
        var back = row.ToDefinition();
        back.Name.ShouldBe("Speed");
        back.Address.ShouldBe("DB1.DBD0");
        back.DataType.ShouldBe(S7DataType.Float32);
        back.Writable.ShouldBeTrue();
        back.StringLength.ShouldBe(80);
    }
    [Fact]
    public void S7TagRow_CarriesThroughUneditedFields()
    {
        // WriteIdempotent is not exposed by the editor; it must survive FromDefinition→edit→ToDefinition.
        var def = new S7TagDefinition("Setpoint", "DB10.DBD0", S7DataType.Float32, Writable: true, WriteIdempotent: true);
        var row = S7DriverPage.S7TagRow.FromDefinition(def);
        row.Name = "SetpointRenamed";
        row.Writable = false;
        var back = row.ToDefinition();
        back.Name.ShouldBe("SetpointRenamed");
        back.Writable.ShouldBeFalse();
        // Un-edited field carried through via _source.
        back.WriteIdempotent.ShouldBeTrue();
    }
    [Fact]
    public void S7TagRow_ValidateRow_RejectsDuplicateNames()
    {
        var all = new List<S7DriverPage.S7TagRow>
        {
            S7DriverPage.S7TagRow.FromDefinition(new S7TagDefinition("Speed", "DB1.DBD0", S7DataType.Float32)),
            S7DriverPage.S7TagRow.FromDefinition(new S7TagDefinition("Status", "DB1.DBW4", S7DataType.Int16)),
        };
        // Editing index 1 to a name that case-insensitively collides with index 0.
        var edited = all[1].Clone();
        edited.Name = "speed";
        S7DriverPage.S7TagRow.ValidateRow(edited, all, editIndex: 1)
            .ShouldBe("Duplicate tag name 'speed'.");
        // Required-name guard.
        var blank = new S7DriverPage.S7TagRow();
        S7DriverPage.S7TagRow.ValidateRow(blank, all, editIndex: null)
            .ShouldBe("Name is required.");
        // Unique name passes.
        var ok = all[1].Clone();
        ok.Name = "Torque";
        S7DriverPage.S7TagRow.ValidateRow(ok, all, editIndex: 1).ShouldBeNull();
    }
    [Fact]
    public void TagList_SerializeRoundTrip_PreservesTags()
    {
        var opts = new S7DriverOptions
        {
            Host = "10.1.1.1",
            Tags =
            [
                new S7TagDefinition("Speed",  "DB1.DBD0", S7DataType.Float32, Writable: true),
                new S7TagDefinition("Name",   "DB2.DBB0", S7DataType.String,  Writable: false, StringLength: 32),
            ],
        };
        var optsSkip = new JsonSerializerOptions(_opts)
        {
            UnmappedMemberHandling = JsonUnmappedMemberHandling.Skip,
        };
        var json = JsonSerializer.Serialize(opts, optsSkip);
        var back = JsonSerializer.Deserialize<S7DriverOptions>(json, optsSkip);
        back.ShouldNotBeNull();
        back.Tags.Count.ShouldBe(2);
        back.Tags[0].Name.ShouldBe("Speed");
        back.Tags[0].Address.ShouldBe("DB1.DBD0");
        back.Tags[0].DataType.ShouldBe(S7DataType.Float32);
        back.Tags[0].Writable.ShouldBeTrue();
        back.Tags[1].Name.ShouldBe("Name");
        back.Tags[1].DataType.ShouldBe(S7DataType.String);
        back.Tags[1].StringLength.ShouldBe(32);
        back.Tags[1].Writable.ShouldBeFalse();
    }
 }
@@ -84,7 +84,7 @@ public sealed class TwinCATDriverPageFormSerializationTests
        var form = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .TwinCATDriverPage.FormModel.FromOptions(opts);
-        var roundTripped = form.ToOptions();
+        var roundTripped = form.ToOptions([], []);
        roundTripped.Timeout.ShouldBe(TimeSpan.FromSeconds(3));
        roundTripped.UseNativeNotifications.ShouldBeTrue();
@@ -95,4 +95,127 @@ public sealed class TwinCATDriverPageFormSerializationTests
        roundTripped.Probe.Timeout.ShouldBe(TimeSpan.FromSeconds(2));
        roundTripped.ProbeTimeoutSeconds.ShouldBe(15);
    }
    [Fact]
    public void DeviceRow_RoundTrip_PreservesEditableFields()
    {
        var def = new TwinCATDeviceOptions("192.168.0.1.1.1:851", "PLC1");
        var row = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .TwinCATDriverPage.TwinCATDeviceRow.FromDefinition(def);
        var back = row.ToDefinition();
        back.HostAddress.ShouldBe("192.168.0.1.1.1:851");
        back.DeviceName.ShouldBe("PLC1");
    }
    [Fact]
    public void DeviceRow_CarriesThroughUneditedSourceFields()
    {
        // Edit only DeviceName; HostAddress on the source must survive the round-trip via _source.
        var def = new TwinCATDeviceOptions("10.0.0.5.1.1:851", "Original");
        var row = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .TwinCATDriverPage.TwinCATDeviceRow.FromDefinition(def);
        row.DeviceName = "Renamed";
        var back = row.ToDefinition();
        back.HostAddress.ShouldBe("10.0.0.5.1.1:851");
        back.DeviceName.ShouldBe("Renamed");
    }
    [Fact]
    public void DeviceRow_ValidateRow_RejectsDuplicateHostAddress()
    {
        var existing = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .TwinCATDriverPage.TwinCATDeviceRow.FromDefinition(new TwinCATDeviceOptions("192.168.0.1.1.1:851"));
        var dup = new ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .TwinCATDriverPage.TwinCATDeviceRow { HostAddress = "192.168.0.1.1.1:851" };
        var all = new[] { existing, dup };
        var error = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .TwinCATDriverPage.TwinCATDeviceRow.ValidateRow(dup, all, editIndex: 1);
        error.ShouldNotBeNull();
        error.ShouldContain("Duplicate");
    }
    [Fact]
    public void TagRow_RoundTrip_PreservesEditableFields()
    {
        var def = new TwinCATTagDefinition("Speed", "192.168.0.1.1.1:851", "MAIN.rSpeed", TwinCATDataType.Real, Writable: false);
        var row = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .TwinCATDriverPage.TwinCATTagRow.FromDefinition(def);
        var back = row.ToDefinition();
        back.Name.ShouldBe("Speed");
        back.DeviceHostAddress.ShouldBe("192.168.0.1.1.1:851");
        back.SymbolPath.ShouldBe("MAIN.rSpeed");
        back.DataType.ShouldBe(TwinCATDataType.Real);
        back.Writable.ShouldBeFalse();
    }
    [Fact]
    public void TagRow_CarriesThroughUneditedWriteIdempotent()
    {
        // WriteIdempotent is not exposed by the editor; it must survive a load→edit→save via _source.
        var def = new TwinCATTagDefinition("Cmd", "192.168.0.1.1.1:851", "GVL.Start", TwinCATDataType.Bool,
            Writable: true, WriteIdempotent: true);
        var row = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .TwinCATDriverPage.TwinCATTagRow.FromDefinition(def);
        row.Name = "CmdRenamed"; // touch an edited field
        var back = row.ToDefinition();
        back.Name.ShouldBe("CmdRenamed");
        back.WriteIdempotent.ShouldBeTrue();
    }
    [Fact]
    public void TagRow_ValidateRow_RejectsDuplicateName()
    {
        var existing = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .TwinCATDriverPage.TwinCATTagRow.FromDefinition(
                new TwinCATTagDefinition("Speed", "192.168.0.1.1.1:851", "MAIN.rSpeed", TwinCATDataType.Real));
        var dup = new ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .TwinCATDriverPage.TwinCATTagRow { Name = "SPEED" }; // case-insensitive collision
        var all = new[] { existing, dup };
        var error = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .TwinCATDriverPage.TwinCATTagRow.ValidateRow(dup, all, editIndex: 1);
        error.ShouldNotBeNull();
        error.ShouldContain("Duplicate");
    }
    [Fact]
    public void FormModel_ToOptions_SerializesDeviceAndTagLists()
    {
        var form = ZB.MOM.WW.OtOpcUa.AdminUI.Components.Pages.Clusters.Drivers
            .TwinCATDriverPage.FormModel.FromOptions(new TwinCATDriverOptions());
        var devices = new[] { new TwinCATDeviceOptions("192.168.0.1.1.1:851", "PLC1") };
        var tags = new[]
        {
            new TwinCATTagDefinition("Speed", "192.168.0.1.1.1:851", "MAIN.rSpeed", TwinCATDataType.Real,
                Writable: true, WriteIdempotent: true),
        };
        var opts = form.ToOptions(devices, tags);
        var json = JsonSerializer.Serialize(opts, _opts);
        var back = JsonSerializer.Deserialize<TwinCATDriverOptions>(json, _opts);
        back.ShouldNotBeNull();
        back.Devices.Count.ShouldBe(1);
        back.Devices[0].HostAddress.ShouldBe("192.168.0.1.1.1:851");
        back.Devices[0].DeviceName.ShouldBe("PLC1");
        back.Tags.Count.ShouldBe(1);
        back.Tags[0].Name.ShouldBe("Speed");
        back.Tags[0].DeviceHostAddress.ShouldBe("192.168.0.1.1.1:851");
        back.Tags[0].SymbolPath.ShouldBe("MAIN.rSpeed");
        back.Tags[0].DataType.ShouldBe(TwinCATDataType.Real);
        back.Tags[0].Writable.ShouldBeTrue();
        back.Tags[0].WriteIdempotent.ShouldBeTrue();
    }
 }
@@ -19,6 +19,7 @@
    <ItemGroup>
        <ProjectReference Include="..\..\..\src\Server\ZB.MOM.WW.OtOpcUa.AdminUI\ZB.MOM.WW.OtOpcUa.AdminUI.csproj"/>
        <ProjectReference Include="..\..\..\src\Core\ZB.MOM.WW.OtOpcUa.Core\ZB.MOM.WW.OtOpcUa.Core.csproj"/>
    </ItemGroup>
    <ItemGroup>
@@ -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);
    }
 }
@@ -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");
    }
 }
@@ -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() { }
    }
@@ -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() { }
    }
@@ -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 */ }
    }
@@ -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);
    }
@@ -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);
    }
@@ -12,6 +12,9 @@ using Microsoft.Extensions.Hosting;
 using Shouldly;
 using Xunit;
 using ZB.MOM.WW.OtOpcUa.Configuration;
 using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
 using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
 using ZB.MOM.WW.OtOpcUa.Configuration.Services;
 using ZB.MOM.WW.OtOpcUa.Security.Endpoints;
 using ZB.MOM.WW.OtOpcUa.Security.Ldap;
@@ -29,6 +32,7 @@ public sealed class AuthEndpointsIntegrationTests : IAsyncLifetime
 {
    private IHost _host = null!;
    private TestServer _server = null!;
    private readonly StubLdapGroupRoleMappingService _roleMappings = new();
    private static CancellationToken Ct => TestContext.Current.CancellationToken;
@@ -58,6 +62,10 @@ public sealed class AuthEndpointsIntegrationTests : IAsyncLifetime
                        }).Build();
                    services.AddOtOpcUaAuth(configuration);
                    services.AddSingleton<ILdapAuthService, StubLdapAuthService>();
                    // The login handler now resolves the DB role-map service via DI to merge
                    // DB-backed grants on top of the appsettings baseline. Register the stub so
                    // the minimal-API handler can be constructed; tests drive its rows.
                    services.AddSingleton<ILdapGroupRoleMappingService>(_roleMappings);
                });
                web.Configure(app =>
                {
@@ -174,6 +182,79 @@ public sealed class AuthEndpointsIntegrationTests : IAsyncLifetime
        token!.Split('.').Length.ShouldBe(3);
    }
    /// <summary>A system-wide DB row for a group the user holds grants an extra role on top of
    /// the appsettings baseline; the merged role surfaces in the issued JWT's Role claims.</summary>
    [Fact]
    public async Task Login_merges_db_role_grant_into_claims()
    {
        // StubLdapAuthService returns Groups ["ReadOnly"], baseline Roles ["ConfigViewer"].
        // A system-wide row maps "ReadOnly" → FleetAdmin, so the merged set is both.
        _roleMappings.Rows.Add(new LdapGroupRoleMapping
        {
            Id = Guid.NewGuid(),
            LdapGroup = "ReadOnly",
            Role = AdminRole.FleetAdmin,
            IsSystemWide = true,
            ClusterId = null,
        });
        var client = NewClient();
        var loginResponse = await client.PostAsJsonAsync("/auth/login",
            new AuthEndpoints.LoginRequest("alice", "valid-password"), Ct);
        loginResponse.EnsureSuccessStatusCode();
        var tokenReq = new HttpRequestMessage(HttpMethod.Post, "/auth/token");
        AttachCookies(tokenReq, loginResponse);
        var tokenResp = await client.SendAsync(tokenReq, Ct);
        tokenResp.StatusCode.ShouldBe(HttpStatusCode.OK);
        var payload = await tokenResp.Content.ReadFromJsonAsync<JsonElement>(Ct);
        var roles = JwtRoleClaims(payload.GetProperty("token").GetString()!);
        roles.ShouldContain("ConfigViewer"); // appsettings baseline preserved
        roles.ShouldContain("FleetAdmin");   // DB grant merged in
    }
    /// <summary>When the DB role-map lookup throws, sign-in still succeeds with the appsettings
    /// baseline roles — a DB hiccup must never block login.</summary>
    [Fact]
    public async Task Login_when_db_role_map_throws_falls_back_to_baseline_roles()
    {
        _roleMappings.Throws = true;
        var client = NewClient();
        var loginResponse = await client.PostAsJsonAsync("/auth/login",
            new AuthEndpoints.LoginRequest("alice", "valid-password"), Ct);
        // Login proceeds despite the simulated DB outage.
        loginResponse.StatusCode.ShouldBe(HttpStatusCode.NoContent);
        var tokenReq = new HttpRequestMessage(HttpMethod.Post, "/auth/token");
        AttachCookies(tokenReq, loginResponse);
        var tokenResp = await client.SendAsync(tokenReq, Ct);
        tokenResp.StatusCode.ShouldBe(HttpStatusCode.OK);
        var payload = await tokenResp.Content.ReadFromJsonAsync<JsonElement>(Ct);
        var roles = JwtRoleClaims(payload.GetProperty("token").GetString()!);
        roles.ShouldContain("ConfigViewer"); // baseline still present
    }
    /// <summary>Extracts the "Role" claim values from a JWT's payload segment.</summary>
    private static IReadOnlyList<string> JwtRoleClaims(string jwt)
    {
        var payloadSegment = jwt.Split('.')[1];
        var padded = payloadSegment.Replace('-', '+').Replace('_', '/');
        switch (padded.Length % 4)
        {
            case 2: padded += "=="; break;
            case 3: padded += "="; break;
        }
        var json = JsonDocument.Parse(Convert.FromBase64String(padded));
        if (!json.RootElement.TryGetProperty("Role", out var roleProp)) return [];
        return roleProp.ValueKind == JsonValueKind.Array
            ? [.. roleProp.EnumerateArray().Select(e => e.GetString()!)]
            : [roleProp.GetString()!];
    }
    /// <summary>Tests that logout clears the cookie.</summary>
    [Fact]
    public async Task Logout_clears_the_cookie()
@@ -260,4 +341,38 @@ public sealed class AuthEndpointsIntegrationTests : IAsyncLifetime
                Error: "Invalid username or password"));
        }
    }
    /// <summary>
    /// In-memory stub for the DB-backed group→role mapping service. Tests seed <see cref="Rows"/>
    /// and the login handler merges any system-wide row whose group the user holds. Set
    /// <see cref="Throws"/> to simulate a DB outage and exercise the baseline-roles fallback.
    /// </summary>
    private sealed class StubLdapGroupRoleMappingService : ILdapGroupRoleMappingService
    {
        public List<LdapGroupRoleMapping> Rows { get; } = [];
        public bool Throws { get; set; }
        /// <summary>Returns seeded rows whose group matches one of <paramref name="ldapGroups"/>.</summary>
        public Task<IReadOnlyList<LdapGroupRoleMapping>> GetByGroupsAsync(
            IEnumerable<string> ldapGroups, CancellationToken cancellationToken)
        {
            if (Throws) throw new InvalidOperationException("simulated DB outage");
            var groups = new HashSet<string>(ldapGroups, StringComparer.OrdinalIgnoreCase);
            IReadOnlyList<LdapGroupRoleMapping> matched =
                [.. Rows.Where(r => groups.Contains(r.LdapGroup))];
            return Task.FromResult(matched);
        }
        /// <summary>Not exercised by these tests.</summary>
        public Task<IReadOnlyList<LdapGroupRoleMapping>> ListAllAsync(CancellationToken cancellationToken) =>
            throw new NotSupportedException();
        /// <summary>Not exercised by these tests.</summary>
        public Task<LdapGroupRoleMapping> CreateAsync(LdapGroupRoleMapping row, CancellationToken cancellationToken) =>
            throw new NotSupportedException();
        /// <summary>Not exercised by these tests.</summary>
        public Task DeleteAsync(Guid id, CancellationToken cancellationToken) =>
            throw new NotSupportedException();
    }
 }
@@ -1,5 +1,7 @@
 using Shouldly;
 using Xunit;
 using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
 using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
 using ZB.MOM.WW.OtOpcUa.Security.Ldap;
 namespace ZB.MOM.WW.OtOpcUa.Security.Tests;
@@ -59,4 +61,22 @@ public sealed class RoleMapperTests
        roles.ShouldBe(new[] { "FleetAdmin" });
    }
    [Fact]
    public void Merge_unions_baseline_and_systemwide_db_roles()
    {
        var rows = new[]
        {
            new LdapGroupRoleMapping { LdapGroup = "g1", Role = AdminRole.FleetAdmin, IsSystemWide = true },
            new LdapGroupRoleMapping { LdapGroup = "g2", Role = AdminRole.ConfigEditor, IsSystemWide = false, ClusterId = "SITE-A" },
        };
        var result = RoleMapper.Merge(["ConfigViewer"], rows);
        result.ShouldContain("ConfigViewer");
        result.ShouldContain("FleetAdmin");
        result.ShouldNotContain("ConfigEditor");   // cluster-scoped row ignored (global-only)
    }
    [Fact]
    public void Merge_with_no_db_rows_returns_baseline()
        => RoleMapper.Merge(["FleetAdmin"], []).ShouldBe(["FleetAdmin"]);
 }
Author	SHA1	Message	Date
Joseph Doherty	695fa6408b	docs(alarms): record native alarms verified working; add D.1 smoke v2-ci / build (push) Failing after 47s Details v2-ci / unit-tests (tests/Core/ZB.MOM.WW.OtOpcUa.Cluster.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Security.Tests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.IntegrationTests) (push) Has been skipped Details The 2026-04-30 alarm plan banners claimed worker-side native alarm subscription was blocked on a COM-bitness finding. That's stale: the mxaccessgw .NET client now has true MxAccess alarm-event support, and a live StreamAlarms check (+ new Skip-gated GatewayGalaxyAlarmFeedLiveTests through the lmxopcua consumer) confirms native alarms — operator comment, category, severity, timestamps — flow end-to-end. Reconcile both plan docs to reality and add docs/plans/alarms-d1-smoke-artifact.md as the D.1 alarm-source deliverable. Historian-write live smoke + full server->A&C round-trip remain (Windows parity rig only).	2026-05-31 09:59:01 -04:00
Joseph Doherty	61193629b6	fix(adminui): wire Test Connect probes + live panels on admin-only nodes v2-ci / build (push) Failing after 36s Details v2-ci / unit-tests (tests/Core/ZB.MOM.WW.OtOpcUa.Cluster.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Security.Tests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.IntegrationTests) (push) Has been skipped Details 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.	2026-05-29 16:38:32 -04:00
Joseph Doherty	e3a27422a1	fix(adminui): Galaxy editor 500 — read DriverConfig case-insensitively + null-safe FromRecord v2-ci / build (push) Failing after 39s Details v2-ci / unit-tests (tests/Core/ZB.MOM.WW.OtOpcUa.Cluster.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Security.Tests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.IntegrationTests) (push) Has been skipped Details GalaxyDriverPage deserialized DriverConfig with case-sensitive camelCase opts, but the persisted/seeded config is PascalCase (the runtime reads it case-insensitively). So all four nested option records read as null -> FromRecord NRE (HTTP 500) on edit, and the form would have shown defaults instead of the real config (risking a clobber on save). Fix: add PropertyNameCaseInsensitive=true (matches the runtime) so real values load, plus null-coalesce the nested records in FromRecord as defense-in-depth. Regression test asserts the seeded PascalCase config loads its real values.	2026-05-29 12:45:44 -04:00
Joseph Doherty	32d7fd7cc9	fix(galaxy): complete PR 7.2 rename — use canonical GalaxyMxGateway driver type v2-ci / build (push) Failing after 48s Details v2-ci / unit-tests (tests/Core/ZB.MOM.WW.OtOpcUa.Cluster.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Security.Tests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.IntegrationTests) (push) Has been skipped Details The driver/factory/seed use 'GalaxyMxGateway' (legacy 'Galaxy' was retired), but the AdminUI editor router, GalaxyDriverPage, address picker, identity dropdown, the Galaxy browser/probe, and DraftValidator still keyed on 'Galaxy'. Result: the seeded GalaxyMxGateway driver couldn't be edited ('no editor registered'), UI-created Galaxy drivers wrote a type with no factory, and a SystemPlatform-bound GalaxyMxGateway driver failed publish validation. Align all stragglers to GalaxyMxGateway (+ failing-test-first DraftValidator coverage). ShouldStub's 'Galaxy' legacy safety-net left intact.	2026-05-29 12:31:55 -04:00
Joseph Doherty	de666b24c3	test: fix Galaxy-tag Phase7 test fixtures + S7 CLI enum; add MaterialiseGalaxyTags coverage v2-ci / build (push) Failing after 38s Details v2-ci / unit-tests (tests/Core/ZB.MOM.WW.OtOpcUa.Cluster.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Security.Tests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.IntegrationTests) (push) Has been skipped Details Completes the test side of the in-progress Galaxy-tag workstream: - Phase7ApplierTests / Phase7ApplierHierarchyTests: supply the now-required Galaxy-tag args to Phase7Plan / Phase7CompositionResult. - Add genuine coverage for Phase7Applier.MaterialiseGalaxyTags (folder-per-distinct-path, variable-per-tag node-id derivation, folder dedupe) + added-Galaxy-tags-trigger-rebuild. - S7.Cli.Tests: use the project's S7CpuType (CLI option type) instead of S7.Net.CpuType. Whole solution now builds 0/0; OpcUaServer.Tests 52, S7.Cli.Tests 36 green.	2026-05-29 12:18:01 -04:00
Joseph Doherty	a4fb97aef8	chore(docker-dev): remap Traefik to host port 9200 v2-ci / build (push) Failing after 2m6s Details v2-ci / unit-tests (tests/Core/ZB.MOM.WW.OtOpcUa.Cluster.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Security.Tests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.IntegrationTests) (push) Has been skipped Details Host :80 collides with the sister scadabridge-traefik dev stack; bind the OtOpcUa Traefik :80 entrypoint to host 9200 instead (admin UI now at http://localhost:9200). Dashboard already on 8089 to avoid the same clash.	2026-05-29 12:09:21 -04:00
Joseph Doherty	da4634d67e	fix(tests,cli): implement IOpcUaAddressSpaceSink.EnsureVariable in test fakes; fix CLI CS1587 v2-ci / build (push) Failing after 44s Details v2-ci / unit-tests (tests/Core/ZB.MOM.WW.OtOpcUa.Cluster.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Security.Tests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.IntegrationTests) (push) Has been skipped Details Resolves the 12 reported build errors (7 CS0535 sink fakes + 5 CLI CS1587). Runtime.Tests green (74). NOTE: OpcUaServer.Tests still has pre-existing CS7036 errors from the in-progress Galaxy-tag workstream (Phase7Plan/Phase7CompositionResult new required params) — separate, test-only, not addressed here.	2026-05-29 10:19:32 -04:00
Joseph Doherty	869be660fd	fix(adminui): strip stale Phase C.2 / rebuild-plan roadmap notes from cluster list pages v2-ci / build (push) Failing after 49s Details v2-ci / unit-tests (tests/Core/ZB.MOM.WW.OtOpcUa.Cluster.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Security.Tests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.IntegrationTests) (push) Has been skipped Details Removes the internal-roadmap deferral banners (the original request that seeded this work); kept the genuinely useful operator descriptions.	2026-05-29 10:12:15 -04:00
Joseph Doherty	a8916c3e08	docs(adminui): correct stale follow-up source comments (F15/F16/Phase4/TODO 3.3-3.4) v2-ci / build (push) Failing after 46s Details v2-ci / unit-tests (tests/Core/ZB.MOM.WW.OtOpcUa.Cluster.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests) (push) Has been skipped Details v2-ci / unit-tests (tests/Server/ZB.MOM.WW.OtOpcUa.Security.Tests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.Host.IntegrationTests) (push) Has been skipped Details v2-ci / integration (tests/Server/ZB.MOM.WW.OtOpcUa.OpcUaServer.IntegrationTests) (push) Has been skipped Details	2026-05-29 10:00:58 -04:00
Joseph Doherty	79b2345834	fix(adminui): disable RoleGrants buttons during save (review)	2026-05-29 09:58:05 -04:00
Joseph Doherty	4df5b849ac	fix(security): let OperationCanceledException propagate from login role merge (review)	2026-05-29 09:56:09 -04:00
Joseph Doherty	a58151e99e	feat(adminui): editable DB-backed LDAP role map (global, FleetAdmin-gated)	2026-05-29 09:55:07 -04:00
Joseph Doherty	1fd093d95d	test(config): global LdapGroupRoleMapping CRUD	2026-05-29 09:52:47 -04:00
Joseph Doherty	f210f09caf	feat(security): merge DB-backed LDAP role grants into login claims	2026-05-29 09:51:22 -04:00
Joseph Doherty	042f3b6a65	feat(security): add FleetAdmin authorization policy	2026-05-29 09:48:31 -04:00
Joseph Doherty	bc40388914	chore(di): register ILdapGroupRoleMappingService	2026-05-29 09:47:10 -04:00
Joseph Doherty	b719194046	feat(security): RoleMapper.Merge — additive DB-backed role grants	2026-05-29 09:43:12 -04:00
Joseph Doherty	7570df76d3	feat(adminui): editable OpcUaClient endpoint URL list via CollectionEditor	2026-05-29 09:41:09 -04:00
Joseph Doherty	244949caa3	feat(adminui): editable S7 tag list via CollectionEditor	2026-05-29 09:37:12 -04:00
Joseph Doherty	a5a0d06dbe	feat(adminui): editable FOCAS device + tag lists via CollectionEditor	2026-05-29 09:33:53 -04:00
Joseph Doherty	6882761f4c	feat(adminui): editable TwinCAT device + tag lists via CollectionEditor	2026-05-29 09:29:57 -04:00
Joseph Doherty	15f3797f1e	feat(adminui): editable AbLegacy device + tag lists via CollectionEditor	2026-05-29 09:26:25 -04:00
Joseph Doherty	534d670b21	feat(adminui): editable AbCip device + tag lists via CollectionEditor	2026-05-29 09:22:51 -04:00
Joseph Doherty	b351a81c8f	fix(adminui): preserve un-edited Modbus tag fields across edit (review) Capture the original ModbusTagDefinition as _source in ModbusTagRow and rewrite ToDefinition() to use 'with {}', so StringByteOrder, ArrayCount, Deadband, UnitId, and CoalesceProhibited survive a load→edit→save cycle.	2026-05-29 09:18:36 -04:00
Joseph Doherty	f655efc570	feat(adminui): typed resilience override form replaces JSON textarea	2026-05-29 09:15:54 -04:00
Joseph Doherty	c4116e54c9	feat(adminui): editable Modbus tag list via CollectionEditor	2026-05-29 09:14:06 -04:00
Joseph Doherty	c3fec1426c	fix(adminui): case-insensitive resilience policy keys + malformed-json test (review)	2026-05-29 09:10:41 -04:00
Joseph Doherty	a2761e4b98	fix(adminui): key CollectionEditor rows by identity (code review)	2026-05-29 09:08:02 -04:00
Joseph Doherty	4a469fbe06	feat(adminui): typed resilience override form model + tests	2026-05-29 09:06:45 -04:00
Joseph Doherty	e2fa6754bb	feat(adminui): add generic CollectionEditor<TRow> modal list editor	2026-05-29 09:03:03 -04:00
Joseph Doherty	b76561a780	docs(adminui): implementation plan + task persistence for deferred follow-ups 19 tasks across WS1 (driver collection editors), WS2 (typed resilience form), WS3 (editable DB-backed LDAP role map, global), WS4 (cleanup).	2026-05-29 08:59:55 -04:00
Joseph Doherty	c49fccbe0c	docs(adminui): design for completing deferred follow-ups Driver collection editors (modal-per-row shared shell), resilience typed form, editable DB-backed LDAP->role map (global roles, live on next sign-in), and stale-comment/note cleanup. Roles intentionally global — no per-cluster permissions.	2026-05-29 08:45:50 -04:00
Joseph Doherty	5622e51006	fix(adminui): clean up dev-migration note on Home page Removed the F15 follow-up annotation that was visible to end users. Replaced with a one-line orientation pointer to the nav.	2026-05-29 08:02:57 -04:00