Merge branch 'feat/ldap-role-grants-signin'

Consume DB-backed LDAP role grants at Admin sign-in, with fleet-wide
and cluster-scoped roles, and fix the role-grants page interactivity.

.gitignore

@@ -37,3 +37,6 @@ src/ZB.MOM.WW.OtOpcUa.Server/config_cache.db
 # E2E sidecar config — NodeIds are specific to each dev's local seed (see scripts/e2e/README.md)
 scripts/e2e/e2e-config.json
 config_cache*.db
+
+# Client CLI/UI runtime scratch (last-connected endpoint cache)
+session.dat

CLAUDE.md

@@ -4,15 +4,38 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## Project Goal
 
-Build an OPC UA server on .NET Framework 4.8 (32-bit) that exposes AVEVA System Platform (Wonderware) Galaxy tags via the MXAccess toolkit. The server mirrors the Galaxy object hierarchy as an OPC UA address space, translating between contained-name browse paths and tag-name runtime references.
+Build an OPC UA server (.NET 10) that exposes AVEVA System Platform
+(Wonderware) Galaxy tags. The server mirrors the Galaxy object
+hierarchy as an OPC UA address space, translating between
+contained-name browse paths and tag-name runtime references. Galaxy
+access flows through the in-process `GalaxyDriver`
+(`src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/`) talking gRPC to a separately
+installed **mxaccessgw** gateway process. The gateway owns the
+MXAccess COM bitness constraint (its worker is x86 net48); everything
+in this repo is .NET 10. PR 7.2 retired the legacy in-process
+`Galaxy.Host` / `Galaxy.Proxy` / `Galaxy.Shared` projects + the
+`OtOpcUaGalaxyHost` Windows service.
+
+See `docs/v2/Galaxy.Performance.md` for the runtime perf surface
+(tracing, metrics, soak harness).
 
 ## Architecture Overview
 
 ### Data Flow
 
-1. **Galaxy Repository DB (ZB)** — SQL Server database holding the deployed object hierarchy and attribute definitions. Queried at startup and on change detection to build/rebuild the OPC UA address space.
-2. **MXAccess COM API** — Runtime data access layer. Subscribes to Galaxy tag attributes for live read/write. Requires a dedicated STA thread with a Win32 message pump for COM callbacks.
-3. **OPC UA Server** — Exposes the hierarchy as browse nodes and attributes as variable nodes. Clients browse via contained names but reads/writes are translated to `tag_name.AttributeName` format for MXAccess.
+1. **Galaxy Repository DB (ZB)** — SQL Server database holding the
+   deployed object hierarchy and attribute definitions. The
+   mxaccessgw's `GalaxyRepositoryClient` queries it via gRPC; the
+   driver consumes the materialised hierarchy through
+   `IGalaxyHierarchySource`.
+2. **MXAccess (via mxaccessgw)** — Live read/write/subscribe over a
+   gRPC session. The gateway owns the COM apartment + STA pump
+   server-side; the driver speaks `MxCommand` / `MxEvent` protos
+   exclusively.
+3. **OPC UA Server** — Exposes the hierarchy as browse nodes and
+   attributes as variable nodes. Clients browse via contained names
+   but reads/writes are translated to `tag_name.AttributeName` format
+   for MXAccess.
 
 ### Key Concept: Contained Name vs Tag Name
 
@@ -22,60 +45,77 @@ Galaxy objects have two names:
 
 Example: browsing `TestMachine_001/DelmiaReceiver/DownloadPath` translates to MXAccess reference `DelmiaReceiver_001.DownloadPath`.
 
-See `gr/layout.md` for the full mapping and target OPC UA structure.
-
 ### Data Type Mapping
 
-Galaxy `mx_data_type` values map to OPC UA types (Boolean, Int32, Float, Double, String, DateTime, etc.). Array attributes use ValueRank=1 with ArrayDimensions from the Galaxy attribute definition. Full mapping in `gr/data_type_mapping.md`.
+Galaxy `mx_data_type` values map to OPC UA types (Boolean, Int32, Float, Double, String, DateTime, etc.). Array attributes use ValueRank=1 with ArrayDimensions from the Galaxy attribute definition. The driver-side mapping lives in `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/Browse/DataTypeMap.cs`.
 
 ### Change Detection
 
-Poll `galaxy.time_of_last_deploy` in the ZB database to detect redeployments, then rebuild the address space. See `gr/build_layout_plan.md` for the step-by-step plan.
+`DeployWatcher` (`src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/Browse/DeployWatcher.cs`) polls the gateway's deploy-event signal and raises `IRediscoverable.OnRediscoveryNeeded` when the Galaxy redeploys. The server's `DriverHost` consumes the signal and rebuilds the address space.
 
-## Reference Implementation
+## mxaccessgw
 
-An existing MXAccess client implementation is at:
-`C:\Users\dohertj2\Desktop\scadalink-design\lmxproxy\src\ZB.MOM.WW.LmxProxy.Host`
-
-Key patterns from that codebase:
-- **StaComThread** — Dedicated STA thread with Win32 message pump (`GetMessage`/`DispatchMessage` loop). All MXAccess COM objects must be created and called on this thread. Uses `PostThreadMessage(WM_APP)` to marshal work items.
-- **LMXProxyServer COM object** — `Register(clientName)` returns a connection handle. `AddItem(handle, address)` + `AdviseSupervisory(handle, itemHandle)` for subscriptions. `OnDataChange`/`OnWriteComplete` events for callbacks.
-- **Reconnect** — Stored subscriptions are replayed after reconnect. A probe tag subscription monitors connection health.
-- **COM cleanup** — `Marshal.ReleaseComObject()` on disconnect. Event handlers must be unwired before unregister.
-
-## MXAccess Documentation
-
-`mxaccess_documentation.md` in the project root contains the full ArchestrA MXAccess Toolkit User's Guide. Key API: `ArchestrA.MxAccess` namespace, `LMXProxyServer` class. The toolkit DLLs are in `Program Files (x86)\ArchestrA\Framework\bin`.
-
-## Galaxy Repository Database
-
-Connection: `sqlcmd -S localhost -d ZB -E` (Windows Auth). See `gr/connectioninfo.md`.
-
-The `gr/` folder contains:
-- `queries/` — SQL for hierarchy extraction, attribute lookup, and change detection
-- `ddl/tables/` and `ddl/views/` — Schema definitions
-- `schema.md` — Full table/view reference
-- `build_layout_plan.md` — Step-by-step plan for building the OPC UA address space from DB queries
-- `gr/CLAUDE.md` — Detailed guidance for working within the `gr/` subfolder
-
-Key tables: `gobject` (hierarchy/deployment), `template_definition` (object categories), `dynamic_attribute` (user-defined attributes), `primitive_instance` (primitive-to-attribute links), `galaxy` (change detection).
+The gateway lives in a sibling repo at `c:\Users\dohertj2\Desktop\mxaccessgw\`. See `docs/v2/Galaxy.ParityRig.md` for the gw setup recipe (build, API key provisioning via `apikey create-key`, env-var overrides for HTTP/2 cleartext + worker path). The gw's MXAccess Toolkit reference (its `gateway.md`) is the canonical MxAccess API doc; the standalone `mxaccess_documentation.md` previously kept in this repo retired in PR 7.3.
 
 ## Build Commands
 
 ```bash
 dotnet restore ZB.MOM.WW.OtOpcUa.slnx
 dotnet build ZB.MOM.WW.OtOpcUa.slnx
-dotnet test ZB.MOM.WW.OtOpcUa.slnx                          # all tests
-dotnet test tests/ZB.MOM.WW.OtOpcUa.Tests                    # unit tests only
-dotnet test tests/ZB.MOM.WW.OtOpcUa.IntegrationTests         # integration tests only
-dotnet test --filter "FullyQualifiedName~MyTestClass.MyMethod"  # single test
+dotnet test ZB.MOM.WW.OtOpcUa.slnx                                # all tests
+dotnet test tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests               # a single test project
+dotnet test --filter "FullyQualifiedName~MyTestClass.MyMethod"    # a single test
 ```
 
+Test projects live under `tests/<module>/` (Core, Server, Drivers,
+Drivers/Cli, Client, Tooling) — there is no single unit-test project.
+Unit suites are named `*.Tests`; integration suites are `*.IntegrationTests`
+and need their Docker fixture up (see Docker Workflow). DB-backed tests in
+`*.Configuration.Tests`, `*.Admin.Tests`, and `*.Server.Tests` require the
+central SQL Server.
+
+## Docker Workflow (driver fixtures + central SQL Server)
+
+> **Migrated 2026-04-28**: Docker config + host moved off this dev VM (DESKTOP-6JL3KKO) onto the shared Linux Docker host (`DOCKER`, 10.100.0.35) so the dev VM could shed WSL2/Hyper-V and have its GPU re-attached via ESXi passthrough. Docker Desktop is no longer installed here. All checked-in `appsettings.json` defaults, fixture-class default endpoints, and `e2e-config.sample.json` were rewritten to target `10.100.0.35`. The driver fixture compose files under `tests/.../Docker/docker-compose.yml` now carry a `project: lmxopcua` label on every service. See `docs/v2/dev-environment.md` for the full rewrite (header dated 2026-04-28).
+
+Docker workloads run on a shared Linux host at **`10.100.0.35`** — not on this VM. Stacks live at `/opt/otopcua-<driver>/` on the host and carry the `project=lmxopcua` label so they're discoverable via `docker ps --filter label=project=lmxopcua`.
+
+**`docker -H ssh://...` does NOT work from this VM.** Windows OpenSSH ↔ docker.exe stdio bridging hangs (`docker system dial-stdio` runs server-side but no API data flows). Use the helper below — it SSHes into the docker host and runs `docker compose` server-side.
+
+**Use `lmxopcua-fix.ps1` (in `~/bin`) to control fixtures from this VM:**
+
+```powershell
+lmxopcua-fix ls                            # list all lmxopcua-tagged containers on the host
+lmxopcua-fix up   modbus      standard     # bring a profile up
+lmxopcua-fix up   abcip       controllogix
+lmxopcua-fix up   s7          s7_1500
+lmxopcua-fix up   opcuaclient                # single-service stack, no profile arg
+lmxopcua-fix down modbus                   # tear stack down
+lmxopcua-fix logs modbus
+lmxopcua-fix sync modbus                   # rsync this repo's tests/.../Docker/ → /opt/otopcua-modbus/
+```
+
+**`sync` is the deployment step.** When you edit a fixture's compose file or Dockerfile under `tests/.../Docker/`, run `lmxopcua-fix sync <driver>` to push the changes to the docker host before bringing the stack up. The repo files are the source of truth; `/opt/otopcua-<driver>/` is a mirrored deployment.
+
+**Endpoints (defaults already point at the docker host):**
+- SQL Server (always-on): `10.100.0.35,14330` — used by `appsettings.json` for `ConfigDb`.
+- Modbus: `10.100.0.35:5020` (`MODBUS_SIM_ENDPOINT`)
+- AB CIP: `10.100.0.35:44818` (`AB_SERVER_ENDPOINT`)
+- S7: `10.100.0.35:1102` (`S7_SIM_ENDPOINT`)
+- OPC UA reference (opc-plc): `opc.tcp://10.100.0.35:50000` (`OPCUA_SIM_ENDPOINT`)
+
+Override any endpoint via the env var to point at a real PLC. The local OtOpcUa server runs on this VM at `opc.tcp://localhost:4840` — **that's not on the docker host**.
+
+See `docs/v2/dev-environment.md` for the full inventory and rationale.
+
 ## Build & Runtime Constraints
 
-- Language: C#, .NET Framework 4.8, **x86 (32-bit)** platform target — required for MXAccess COM interop
-- MXAccess requires a deployed ArchestrA Platform on the machine running the server
-- COM apartment: MXAccess objects must live on an STA thread with a message pump
+- Language: C#, .NET 10, AnyCPU. The MXAccess COM bitness constraint
+  is owned by the mxaccessgw worker (x86 net48), not by anything in
+  this repo.
+- The gateway's MXAccess worker requires a deployed ArchestrA Platform
+  on the machine running the gateway. The OtOpcUa server itself does
+  not.
 
 ## Transport Security
 
@@ -83,18 +123,17 @@ The server supports configurable OPC UA transport security via the `Security` se
 
 ## Redundancy
 
-The server supports non-transparent warm/hot redundancy via the `Redundancy` section in `appsettings.json`. Two instances share the same Galaxy DB and MXAccess runtime but have unique `ApplicationUri` values. Each exposes `RedundancySupport`, `ServerUriArray`, and a dynamic `ServiceLevel` based on role and runtime health. The primary advertises a higher ServiceLevel than the secondary. See `docs/Redundancy.md` for the full guide.
+The server supports non-transparent warm/hot redundancy via the `Redundancy` section in `appsettings.json`. Two instances share the same Galaxy DB and the same mxaccessgw (under distinct `MxAccess.ClientName` values) but have unique `ApplicationUri` values. Each exposes `RedundancySupport`, `ServerUriArray`, and a dynamic `ServiceLevel` based on role and runtime health. The primary advertises a higher ServiceLevel than the secondary. See `docs/Redundancy.md` for the full guide.
 
 ## LDAP Authentication
 
-The server uses LDAP-based user authentication via the `Authentication.Ldap` section in `appsettings.json`. When enabled, credentials are validated by LDAP bind against a GLAuth server (installed at `C:\publish\glauth\`), and LDAP group membership maps to OPC UA permissions: `ReadOnly` (browse/read), `WriteOperate` (write FreeAccess/Operate attributes), `WriteTune` (write Tune attributes), `WriteConfigure` (write Configure attributes), `AlarmAck` (alarm acknowledgment). `LdapUserAuthenticator` (`src/ZB.MOM.WW.OtOpcUa.Server/Security/LdapUserAuthenticator.cs`) implements `IUserAuthenticator`. See `docs/Security.md` for the full guide and `C:\publish\glauth\auth.md` for LDAP user/group reference.
+The server uses LDAP-based user authentication via the `Authentication.Ldap` section in `appsettings.json`. When enabled, credentials are validated by LDAP bind against a GLAuth server (installed at `C:\publish\glauth\`), and LDAP group membership maps to OPC UA permissions: `ReadOnly` (browse/read), `WriteOperate` (write FreeAccess/Operate attributes), `WriteTune` (write Tune attributes), `WriteConfigure` (write Configure attributes), `AlarmAck` (alarm acknowledgment). `LdapUserAuthenticator` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/Security/LdapUserAuthenticator.cs`) implements `IUserAuthenticator`. See `docs/Security.md` for the full guide and `C:\publish\glauth\auth.md` for LDAP user/group reference.
 
 ## Library Preferences
 
 - **Logging**: Serilog with rolling daily file sink
 - **Unit tests**: xUnit + Shouldly for assertions
-- **Service hosting (Server, Admin)**: .NET generic host with `AddWindowsService` (decision #30 — replaced TopShelf in v2; see `src/ZB.MOM.WW.OtOpcUa.Server/OpcUaServerService.cs`)
-- **Service hosting (Galaxy.Host)**: plain console app wrapped by NSSM (`.NET Framework 4.8 x86` — required by MXAccess COM bitness)
+- **Service hosting (Server, Admin)**: .NET generic host with `AddWindowsService` (decision #30 — replaced TopShelf in v2; see `src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUaServerService.cs`)
 - **OPC UA**: OPC Foundation UA .NET Standard stack (https://github.com/opcfoundation/ua-.netstandard) — NuGet: `OPCFoundation.NetStandard.Opc.Ua.Server`
 
 ## OPC UA .NET Standard Documentation
@@ -103,11 +142,11 @@ Use the DeepWiki MCP (`mcp__deepwiki`) to query documentation for the OPC UA .NE
 
 ## Testing
 
-Use the Client CLI at `src/ZB.MOM.WW.OtOpcUa.Client.CLI/` for manual testing against the running OPC UA server. Supports connect, read, write, browse, subscribe, historyread, alarms, and redundancy commands. See `docs/Client.CLI.md` for full documentation.
+Use the Client CLI at `src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI/` for manual testing against the running OPC UA server. Supports connect, read, write, browse, subscribe, historyread, alarms, and redundancy commands. See `docs/Client.CLI.md` for full documentation.
 
 ```bash
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Client.CLI -- connect -u opc.tcp://localhost:4840
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Client.CLI -- browse -u opc.tcp://localhost:4840 -r -d 3
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Client.CLI -- read -u opc.tcp://localhost:4840 -n "ns=2;s=SomeNode"
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Client.CLI -- subscribe -u opc.tcp://localhost:4840 -n "ns=2;s=SomeNode" -i 500
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- connect -u opc.tcp://localhost:4840
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- browse -u opc.tcp://localhost:4840 -r -d 3
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- read -u opc.tcp://localhost:4840 -n "ns=2;s=SomeNode"
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- subscribe -u opc.tcp://localhost:4840 -n "ns=2;s=SomeNode" -i 500
 ```

README.md

@@ -1,200 +1,115 @@
-# LmxOpcUa
+# OtOpcUa
 
-OPC UA server and cross-platform client tools for AVEVA System Platform (Wonderware) Galaxy. The server exposes Galaxy tags via MXAccess as an OPC UA address space. The client stack provides a shared library, CLI tool, and Avalonia desktop application for browsing, reading/writing, subscriptions, alarms, and historical data.
+OPC UA server (.NET 10 AnyCPU) that exposes a fleet of industrial drivers as a single OPC UA address space. Drivers ship in-process for AVEVA System Platform Galaxy (via the sibling `mxaccessgw` repo), Modbus TCP, Siemens S7, Allen-Bradley CIP (ControlLogix / CompactLogix), Allen-Bradley Legacy (SLC 500 / MicroLogix), Beckhoff TwinCAT (ADS), FANUC FOCAS, and OPC UA Client (gateway).
+
+A cross-platform client stack (.NET 10) — shared library, CLI, and Avalonia desktop app — connects to any OPC UA server.
 
 ## Architecture
 
 ```
-                                    OPC UA Clients
-                              (CLI, Desktop UI, 3rd-party)
-                                         |
-                                         v
-+-----------------+     +------------------+     +-----------------+
-| Galaxy Repo DB  |---->|   OPC UA Server  |<--->| MXAccess Client |
-|   (SQL Server)  |     | (address space)  |     | (STA + COM)     |
-+-----------------+     +------------------+     +-----------------+
-                                |                        |
-                        +-------+--------+     +---------+---------+
-                        | Status Dashboard|     | Historian Runtime |
-                        |  (HTTP/JSON)   |     |   (SQL Server)    |
-                        +----------------+     +-------------------+
+                      OPC UA Clients (CLI, Desktop UI, 3rd-party)
+                                       |
+                                       v
+                    +-------------------------------------+
+                    |  OtOpcUa.Server (.NET 10 AnyCPU)    |
+                    |   address space + capability fan-out|
+                    +-------------------------------------+
+                    |    |    |    |    |    |    |    |
+              Galaxy  Modbus  S7  AbCip AbLeg TwinCAT FOCAS OpcUaClient
+                |
+                v
+       mxaccessgw (sibling repo, gRPC)
+                |
+                v
+     MXAccess COM (x86 worker, on AVEVA box)
 ```
 
-## Contained Name vs Tag Name
+Galaxy is the only driver with an external runtime: it speaks gRPC to a separately installed `mxaccessgw` server (sibling repo at `c:\Users\dohertj2\Desktop\mxaccessgw\`) which owns the MXAccess COM apartment and the x86/STA bitness constraint server-side. Everything in this repo is platform-agnostic .NET 10.
 
-| Browse Path (contained names) | Runtime Reference (tag name) |
-|-------------------------------|------------------------------|
-| `TestMachine_001/DelmiaReceiver/DownloadPath` | `DelmiaReceiver_001.DownloadPath` |
-| `TestMachine_001/MESReceiver/MoveInBatchID` | `MESReceiver_001.MoveInBatchID` |
+## Prerequisites
 
----
+- .NET 10 SDK (server, drivers, clients all target .NET 10)
+- SQL Server reachable for the central config DB
+- For Galaxy specifically: a running `mxaccessgw` deployment — see [docs/v2/Galaxy.ParityRig.md](docs/v2/Galaxy.ParityRig.md)
+- For Wonderware Historian read-back: optional `OtOpcUaWonderwareHistorian` sidecar — see [docs/ServiceHosting.md](docs/ServiceHosting.md)
 
-## Server
-
-The OPC UA server runs on .NET Framework 4.8 (x86) and bridges the Galaxy runtime to OPC UA clients.
-
-### Server Prerequisites
-
-- .NET Framework 4.8 SDK
-- AVEVA System Platform with ArchestrA Framework installed
-- Galaxy repository database (SQL Server, Windows Auth)
-- MXAccess COM registered (`LMXProxy.LMXProxyServer`)
-- Wonderware Historian (optional, for historical data access)
-- Windows (required for COM interop and MXAccess)
-
-### Build and Run Server
+## Quick Start
 
 ```bash
-dotnet restore ZB.MOM.WW.LmxOpcUa.slnx
-dotnet build src/ZB.MOM.WW.LmxOpcUa.Host
-dotnet run --project src/ZB.MOM.WW.LmxOpcUa.Host
+dotnet restore ZB.MOM.WW.OtOpcUa.slnx
+dotnet build ZB.MOM.WW.OtOpcUa.slnx
+dotnet test ZB.MOM.WW.OtOpcUa.slnx
+
+# Run the server in dev (foreground)
+dotnet run --project src/Server/ZB.MOM.WW.OtOpcUa.Server
 ```
 
-The server starts on `opc.tcp://localhost:4840/LmxOpcUa` with the `None` security profile by default. Configure `Security.Profiles` in `appsettings.json` to enable `Basic256Sha256-Sign` or `Basic256Sha256-SignAndEncrypt` for transport security. See [Security Guide](docs/security.md).
+The server starts on `opc.tcp://localhost:4840` with the `None` security profile. Configure `Security.Profiles` in `src/Server/ZB.MOM.WW.OtOpcUa.Server/appsettings.json` to enable `Basic256Sha256-Sign` or `Basic256Sha256-SignAndEncrypt`. See [docs/security.md](docs/security.md).
 
-### Install as Windows Service
+## Install as Windows Services
+
+Production deployment is driven by `scripts/install/Install-Services.ps1`, which registers the `OtOpcUa` server service (and optionally the `OtOpcUaWonderwareHistorian` sidecar) under a chosen service account. Galaxy support requires a separately installed `mxaccessgw` — neither this repo nor the install script provisions it.
+
+```powershell
+.\scripts\install\Install-Services.ps1 `
+    -InstallRoot 'C:\Program Files\OtOpcUa' `
+    -ServiceAccount 'DOMAIN\svc-otopcua'
+```
+
+Add `-InstallWonderwareHistorian` for the historian sidecar. See the script header and [docs/ServiceHosting.md](docs/ServiceHosting.md) for full options.
+
+## Client CLI
 
 ```bash
-cd src/ZB.MOM.WW.LmxOpcUa.Host/bin/Debug/net48
-ZB.MOM.WW.LmxOpcUa.Host.exe install
-ZB.MOM.WW.LmxOpcUa.Host.exe start
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- connect -u opc.tcp://localhost:4840
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- browse  -u opc.tcp://localhost:4840 -r -d 3
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- read    -u opc.tcp://localhost:4840 -n "ns=2;s=SomeNode"
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- write   -u opc.tcp://localhost:4840 -n "ns=2;s=SomeNode" -v 42
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- subscribe -u opc.tcp://localhost:4840 -n "ns=2;s=SomeNode" -i 500
 ```
 
-**Service logon requirement:** The service must run under a Windows account that has access to the AVEVA Galaxy and Historian. The default `LocalSystem` account can connect to MXAccess and SQL Server but **cannot authenticate with the Historian SDK** (HCAP). Configure the service to "Log on as" a domain or local user that is a recognized ArchestrA platform user. This can be set in `services.msc` or during install with `ZB.MOM.WW.LmxOpcUa.Host.exe install -username DOMAIN\user -password ***`.
-
-### Run Server Tests
-
-```bash
-dotnet test tests/ZB.MOM.WW.LmxOpcUa.Tests
-dotnet test tests/ZB.MOM.WW.LmxOpcUa.IntegrationTests
-```
-
----
-
-## Client Stack
-
-The client stack is cross-platform (.NET 10) and consists of three projects sharing a common `IOpcUaClientService` abstraction. No AVEVA software or COM is required — the clients connect to any OPC UA server.
-
-### Client Prerequisites
-
-- .NET 10 SDK
-- No platform-specific dependencies (runs on Windows, macOS, Linux)
-
-### Build All Clients
-
-```bash
-dotnet build src/ZB.MOM.WW.LmxOpcUa.Client.Shared
-dotnet build src/ZB.MOM.WW.LmxOpcUa.Client.CLI
-dotnet build src/ZB.MOM.WW.LmxOpcUa.Client.UI
-```
-
-### Run Client Tests
-
-```bash
-dotnet test tests/ZB.MOM.WW.LmxOpcUa.Client.Shared.Tests
-dotnet test tests/ZB.MOM.WW.LmxOpcUa.Client.CLI.Tests
-dotnet test tests/ZB.MOM.WW.LmxOpcUa.Client.UI.Tests
-```
-
-### Client CLI
-
-```bash
-# Connect
-dotnet run --project src/ZB.MOM.WW.LmxOpcUa.Client.CLI -- connect -u opc.tcp://localhost:4840/LmxOpcUa
-
-# Browse Galaxy hierarchy
-dotnet run --project src/ZB.MOM.WW.LmxOpcUa.Client.CLI -- browse -u opc.tcp://localhost:4840/LmxOpcUa -n "ns=3;s=ZB" -r -d 5
-
-# Read a tag
-dotnet run --project src/ZB.MOM.WW.LmxOpcUa.Client.CLI -- read -u opc.tcp://localhost:4840/LmxOpcUa -n "ns=3;s=TestMachine_001.MachineID"
-
-# Write a tag
-dotnet run --project src/ZB.MOM.WW.LmxOpcUa.Client.CLI -- write -u opc.tcp://localhost:4840/LmxOpcUa -n "ns=3;s=TestChildObject.TestString" -v "Hello"
-
-# Subscribe to changes
-dotnet run --project src/ZB.MOM.WW.LmxOpcUa.Client.CLI -- subscribe -u opc.tcp://localhost:4840/LmxOpcUa -n "ns=3;s=TestChildObject.TestInt" -i 500
-
-# Read historical data
-dotnet run --project src/ZB.MOM.WW.LmxOpcUa.Client.CLI -- historyread -u opc.tcp://localhost:4840/LmxOpcUa -n "ns=3;s=TestMachine_001.TestHistoryValue" --start "2026-03-25" --end "2026-03-30"
-
-# Subscribe to alarm events
-dotnet run --project src/ZB.MOM.WW.LmxOpcUa.Client.CLI -- alarms -u opc.tcp://localhost:4840/LmxOpcUa -n "ns=3;s=TestMachine_001" --refresh
-
-# Query redundancy state
-dotnet run --project src/ZB.MOM.WW.LmxOpcUa.Client.CLI -- redundancy -u opc.tcp://localhost:4840/LmxOpcUa
-```
-
-### Client UI
-
-```bash
-dotnet run --project src/ZB.MOM.WW.LmxOpcUa.Client.UI
-```
-
-The desktop application provides browse tree, subscriptions, alarm monitoring, history reads, and write dialogs. See [Client UI Documentation](docs/Client.UI.md) for details.
-
----
-
-## Project Structure
-
-```
-src/
-    ZB.MOM.WW.LmxOpcUa.Host/           OPC UA server (.NET Framework 4.8, x86)
-        Configuration/                   Config binding and validation
-        Domain/                          Interfaces, DTOs, enums, mappers
-        Historian/                       Wonderware Historian data source
-        Metrics/                         Performance tracking (rolling P95)
-        MxAccess/                        STA thread, COM interop, subscriptions
-        GalaxyRepository/                SQL queries, change detection
-        OpcUa/                           Server, node manager, address space, alarms, diff
-        Status/                          HTTP dashboard, health checks
-
-    ZB.MOM.WW.LmxOpcUa.Client.Shared/   Shared OPC UA client library (.NET 10)
-    ZB.MOM.WW.LmxOpcUa.Client.CLI/      Command-line client (.NET 10)
-    ZB.MOM.WW.LmxOpcUa.Client.UI/       Avalonia desktop client (.NET 10)
-
-tests/
-    ZB.MOM.WW.LmxOpcUa.Tests/           Server unit + integration tests
-    ZB.MOM.WW.LmxOpcUa.IntegrationTests/ Server integration tests (live DB)
-    ZB.MOM.WW.LmxOpcUa.Client.Shared.Tests/  Shared library tests
-    ZB.MOM.WW.LmxOpcUa.Client.CLI.Tests/     CLI command tests
-    ZB.MOM.WW.LmxOpcUa.Client.UI.Tests/      UI ViewModel + headless tests
-
-gr/                                      Galaxy repository docs, SQL queries, schema
-```
+See [docs/Client.CLI.md](docs/Client.CLI.md) and [docs/Client.UI.md](docs/Client.UI.md).
 
 ## Documentation
 
-### Server
+### Architecture deep-dives
 
-| Component | Description |
+| Topic | Doc |
 |---|---|
-| [OPC UA Server](docs/OpcUaServer.md) | Endpoint, sessions, security policy, server lifecycle |
-| [Address Space](docs/AddressSpace.md) | Hierarchy nodes, variable nodes, primitive grouping, NodeId scheme |
-| [Galaxy Repository](docs/GalaxyRepository.md) | SQL queries, deployed package chain, change detection |
-| [MXAccess Bridge](docs/MxAccessBridge.md) | STA thread, COM interop, subscriptions, reconnection |
-| [Data Type Mapping](docs/DataTypeMapping.md) | Galaxy to OPC UA types, arrays, security classification |
-| [Read/Write Operations](docs/ReadWriteOperations.md) | Value reads, writes, access level enforcement, array element writes |
-| [Subscriptions](docs/Subscriptions.md) | Ref-counted MXAccess subscriptions, data change dispatch |
-| [Alarm Tracking](docs/AlarmTracking.md) | AlarmConditionState nodes, InAlarm monitoring, event reporting |
-| [Historical Data Access](docs/HistoricalDataAccess.md) | Historian data source, HistoryReadRaw, HistoryReadProcessed |
-| [Incremental Sync](docs/IncrementalSync.md) | Diff computation, subtree teardown/rebuild, subscription preservation |
-| [Configuration](docs/Configuration.md) | appsettings.json binding, feature flags, validation |
-| [Status Dashboard](docs/StatusDashboard.md) | HTTP server, health checks, metrics reporting |
-| [Service Hosting](docs/ServiceHosting.md) | TopShelf, startup/shutdown sequence, error handling |
-| [Security](docs/security.md) | Transport security profiles, certificate trust, production hardening |
-| [Redundancy](docs/Redundancy.md) | Non-transparent warm/hot redundancy, ServiceLevel, paired deployment |
+| OPC UA server composition, namespace fan-out, Polly invoker | [docs/OpcUaServer.md](docs/OpcUaServer.md) |
+| Address space layout | [docs/AddressSpace.md](docs/AddressSpace.md) |
+| Read / Write dispatch (driver vs virtual vs scripted-alarm) | [docs/ReadWriteOperations.md](docs/ReadWriteOperations.md) |
+| Incremental sync (driver-backend rediscovery + config publishes) | [docs/IncrementalSync.md](docs/IncrementalSync.md) |
+| Service hosting (Server + Admin + optional historian sidecar) | [docs/ServiceHosting.md](docs/ServiceHosting.md) |
+| Security (transport, LDAP, certificates) | [docs/security.md](docs/security.md) |
+| Redundancy | [docs/Redundancy.md](docs/Redundancy.md) |
+| Status dashboard | [docs/StatusDashboard.md](docs/StatusDashboard.md) |
 
-### Client
+### Drivers
 
-| Component | Description |
+| Topic | Doc |
 |---|---|
-| [Client CLI](docs/Client.CLI.md) | Connect, browse, read, write, subscribe, historyread, alarms, redundancy commands |
-| [Client UI](docs/Client.UI.md) | Avalonia desktop client: browse, subscribe, alarms, history, write values |
+| Driver specs (per-driver capability surface, config, addressing) | [docs/v2/driver-specs.md](docs/v2/driver-specs.md) |
+| Galaxy driver | [docs/drivers/Galaxy.md](docs/drivers/Galaxy.md) |
+| Modbus / S7 / AbCip / AbLegacy / TwinCAT / FOCAS / OpcUaClient | [docs/drivers/](docs/drivers/) |
+| Galaxy parity rig (mxaccessgw setup) | [docs/v2/Galaxy.ParityRig.md](docs/v2/Galaxy.ParityRig.md) |
+| Galaxy performance + tracing | [docs/v2/Galaxy.Performance.md](docs/v2/Galaxy.Performance.md) |
 
-### Reference
+### Clients
 
-- [Galaxy Repository Queries](gr/CLAUDE.md) — SQL queries for hierarchy, attributes, and change detection
-- [Data Type Mapping](gr/data_type_mapping.md) — Galaxy to OPC UA type mapping with security classification
+| Topic | Doc |
+|---|---|
+| Client CLI | [docs/Client.CLI.md](docs/Client.CLI.md) |
+| Client UI (Avalonia desktop) | [docs/Client.UI.md](docs/Client.UI.md) |
+
+### v1 archive
+
+The original v1 in-process MXAccess docs (Galaxy.Host topology,
+Configuration env vars, AlarmTracking, DataTypeMapping,
+HistoricalDataAccess, Subscriptions, etc.) are preserved under
+[docs/v1/](docs/v1/) — historical reference only. PR 7.2 retired the
+v1 architecture on 2026-04-30; current state is documented in the
+sections above.
 
 ## License
 

ZB.MOM.WW.OtOpcUa.slnx

@@ -1,78 +1,97 @@
 <Solution>
-    <Folder Name="/src/">
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/ZB.MOM.WW.OtOpcUa.Core.Abstractions.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Configuration/ZB.MOM.WW.OtOpcUa.Configuration.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Core/ZB.MOM.WW.OtOpcUa.Core.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Core.Scripting/ZB.MOM.WW.OtOpcUa.Core.Scripting.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/ZB.MOM.WW.OtOpcUa.Core.VirtualTags.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Server/ZB.MOM.WW.OtOpcUa.Server.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Admin/ZB.MOM.WW.OtOpcUa.Admin.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.Modbus/ZB.MOM.WW.OtOpcUa.Driver.Modbus.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.S7/ZB.MOM.WW.OtOpcUa.Driver.S7.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.AbCip/ZB.MOM.WW.OtOpcUa.Driver.AbCip.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Shared/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Shared.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Host/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Host.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Client.Shared/ZB.MOM.WW.OtOpcUa.Client.Shared.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Client.CLI/ZB.MOM.WW.OtOpcUa.Client.CLI.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Client.UI/ZB.MOM.WW.OtOpcUa.Client.UI.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.Cli.Common/ZB.MOM.WW.OtOpcUa.Driver.Cli.Common.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli.csproj"/>
-        <Project Path="src/ZB.MOM.WW.OtOpcUa.Analyzers/ZB.MOM.WW.OtOpcUa.Analyzers.csproj"/>
-    </Folder>
-    <Folder Name="/tests/">
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Core.Abstractions.Tests/ZB.MOM.WW.OtOpcUa.Core.Abstractions.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Configuration.Tests/ZB.MOM.WW.OtOpcUa.Configuration.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Core.Tests/ZB.MOM.WW.OtOpcUa.Core.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Core.Scripting.Tests/ZB.MOM.WW.OtOpcUa.Core.Scripting.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Core.VirtualTags.Tests/ZB.MOM.WW.OtOpcUa.Core.VirtualTags.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms.Tests/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian.Tests/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Server.Tests/ZB.MOM.WW.OtOpcUa.Server.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Admin.Tests/ZB.MOM.WW.OtOpcUa.Admin.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Admin.E2ETests/ZB.MOM.WW.OtOpcUa.Admin.E2ETests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.Tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.TestSupport/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.TestSupport.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy.Tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.E2E/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.E2E.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.Cli.Common.Tests/ZB.MOM.WW.OtOpcUa.Driver.Cli.Common.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli.Tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli.Tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli.Tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli.Tests/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli.Tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Shared.Tests/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Shared.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Host.Tests/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Host.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.IntegrationTests/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.IntegrationTests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Client.Shared.Tests/ZB.MOM.WW.OtOpcUa.Client.Shared.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Client.CLI.Tests/ZB.MOM.WW.OtOpcUa.Client.CLI.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Client.UI.Tests/ZB.MOM.WW.OtOpcUa.Client.UI.Tests.csproj"/>
-        <Project Path="tests/ZB.MOM.WW.OtOpcUa.Analyzers.Tests/ZB.MOM.WW.OtOpcUa.Analyzers.Tests.csproj"/>
-    </Folder>
+  <Folder Name="/src/" />
+  <Folder Name="/src/Core/">
+    <Project Path="src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/ZB.MOM.WW.OtOpcUa.Core.Abstractions.csproj" />
+    <Project Path="src/Core/ZB.MOM.WW.OtOpcUa.Configuration/ZB.MOM.WW.OtOpcUa.Configuration.csproj" />
+    <Project Path="src/Core/ZB.MOM.WW.OtOpcUa.Core/ZB.MOM.WW.OtOpcUa.Core.csproj" />
+    <Project Path="src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting/ZB.MOM.WW.OtOpcUa.Core.Scripting.csproj" />
+    <Project Path="src/Core/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/ZB.MOM.WW.OtOpcUa.Core.VirtualTags.csproj" />
+    <Project Path="src/Core/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms.csproj" />
+    <Project Path="src/Core/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian.csproj" />
+  </Folder>
+  <Folder Name="/src/Server/">
+    <Project Path="src/Server/ZB.MOM.WW.OtOpcUa.Server/ZB.MOM.WW.OtOpcUa.Server.csproj" />
+    <Project Path="src/Server/ZB.MOM.WW.OtOpcUa.Admin/ZB.MOM.WW.OtOpcUa.Admin.csproj" />
+  </Folder>
+  <Folder Name="/src/Drivers/">
+    <Project Path="src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.csproj" />
+    <Project Path="src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.csproj" />
+    <Project Path="src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Client/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Client.csproj" />
+    <Project Path="src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus/ZB.MOM.WW.OtOpcUa.Driver.Modbus.csproj" />
+    <Project Path="src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Addressing/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Addressing.csproj" />
+    <Project Path="src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7/ZB.MOM.WW.OtOpcUa.Driver.S7.csproj" />
+    <Project Path="src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/ZB.MOM.WW.OtOpcUa.Driver.AbCip.csproj" />
+    <Project Path="src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.csproj" />
+    <Project Path="src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.csproj" />
+    <Project Path="src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.csproj" />
+    <Project Path="src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.csproj" />
+  </Folder>
+  <Folder Name="/src/Drivers/Driver CLIs/">
+    <Project Path="src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Cli.Common/ZB.MOM.WW.OtOpcUa.Driver.Cli.Common.csproj" />
+    <Project Path="src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli.csproj" />
+    <Project Path="src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli.csproj" />
+    <Project Path="src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli.csproj" />
+    <Project Path="src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli.csproj" />
+    <Project Path="src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli.csproj" />
+    <Project Path="src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli.csproj" />
+  </Folder>
+  <Folder Name="/src/Client/">
+    <Project Path="src/Client/ZB.MOM.WW.OtOpcUa.Client.Shared/ZB.MOM.WW.OtOpcUa.Client.Shared.csproj" />
+    <Project Path="src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI/ZB.MOM.WW.OtOpcUa.Client.CLI.csproj" />
+    <Project Path="src/Client/ZB.MOM.WW.OtOpcUa.Client.UI/ZB.MOM.WW.OtOpcUa.Client.UI.csproj" />
+  </Folder>
+  <Folder Name="/src/Tooling/">
+    <Project Path="src/Tooling/ZB.MOM.WW.OtOpcUa.Analyzers/ZB.MOM.WW.OtOpcUa.Analyzers.csproj" />
+  </Folder>
+  <Folder Name="/tests/" />
+  <Folder Name="/tests/Core/">
+    <Project Path="tests/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions.Tests/ZB.MOM.WW.OtOpcUa.Core.Abstractions.Tests.csproj" />
+    <Project Path="tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/ZB.MOM.WW.OtOpcUa.Configuration.Tests.csproj" />
+    <Project Path="tests/Core/ZB.MOM.WW.OtOpcUa.Core.Tests/ZB.MOM.WW.OtOpcUa.Core.Tests.csproj" />
+    <Project Path="tests/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting.Tests/ZB.MOM.WW.OtOpcUa.Core.Scripting.Tests.csproj" />
+    <Project Path="tests/Core/ZB.MOM.WW.OtOpcUa.Core.VirtualTags.Tests/ZB.MOM.WW.OtOpcUa.Core.VirtualTags.Tests.csproj" />
+    <Project Path="tests/Core/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms.Tests/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms.Tests.csproj" />
+    <Project Path="tests/Core/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian.Tests/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian.Tests.csproj" />
+  </Folder>
+  <Folder Name="/tests/Server/">
+    <Project Path="tests/Server/ZB.MOM.WW.OtOpcUa.Server.Tests/ZB.MOM.WW.OtOpcUa.Server.Tests.csproj" />
+    <Project Path="tests/Server/ZB.MOM.WW.OtOpcUa.Admin.Tests/ZB.MOM.WW.OtOpcUa.Admin.Tests.csproj" />
+    <Project Path="tests/Server/ZB.MOM.WW.OtOpcUa.Admin.E2ETests/ZB.MOM.WW.OtOpcUa.Admin.E2ETests.csproj" />
+  </Folder>
+  <Folder Name="/tests/Drivers/">
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Tests/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Tests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Client.Tests/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Client.Tests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Tests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Addressing.Tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Addressing.Tests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Tests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests.csproj" />
+    <Project Path="tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.IntegrationTests/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.IntegrationTests.csproj" />
+  </Folder>
+  <Folder Name="/tests/Drivers/Driver CLIs/">
+    <Project Path="tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Cli.Common.Tests/ZB.MOM.WW.OtOpcUa.Driver.Cli.Common.Tests.csproj" />
+    <Project Path="tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli.Tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli.Tests.csproj" />
+    <Project Path="tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli.Tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli.Tests.csproj" />
+    <Project Path="tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli.Tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli.Tests.csproj" />
+    <Project Path="tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli.Tests/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli.Tests.csproj" />
+    <Project Path="tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli.Tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli.Tests.csproj" />
+  </Folder>
+  <Folder Name="/tests/Client/">
+    <Project Path="tests/Client/ZB.MOM.WW.OtOpcUa.Client.Shared.Tests/ZB.MOM.WW.OtOpcUa.Client.Shared.Tests.csproj" />
+    <Project Path="tests/Client/ZB.MOM.WW.OtOpcUa.Client.CLI.Tests/ZB.MOM.WW.OtOpcUa.Client.CLI.Tests.csproj" />
+    <Project Path="tests/Client/ZB.MOM.WW.OtOpcUa.Client.UI.Tests/ZB.MOM.WW.OtOpcUa.Client.UI.Tests.csproj" />
+  </Folder>
+  <Folder Name="/tests/Tooling/">
+    <Project Path="tests/Tooling/ZB.MOM.WW.OtOpcUa.Analyzers.Tests/ZB.MOM.WW.OtOpcUa.Analyzers.Tests.csproj" />
+  </Folder>
 </Solution>

_p54.json

@@ -1 +0,0 @@
-{"title":"Phase 3 PR 54 -- Siemens S7 Modbus TCP quirks research doc","body":"## Summary\n\nAdds `docs/v2/s7.md` (485 lines) covering Siemens SIMATIC S7 family Modbus TCP behavior. Mirrors the `docs/v2/dl205.md` template for future per-quirk implementation PRs.\n\n## Key findings for the implementation track\n\n- **No fixed memory map** — every S7 Modbus server is user-wired via `MB_SERVER`/`MODBUSCP`/`MODBUSPN` library blocks. Driver must accept per-site config, not assume a vendor layout.\n- **MB_SERVER requires non-optimized DBs** (STATUS `0x8383` if optimized). Most common field bug.\n- **Word order default = ABCD** (opposite of DL260). Driver's S7 profile default must be `ByteOrder.BigEndian`, not `WordSwap`.\n- **One port per MB_SERVER instance** — multi-client requires parallel FBs on 503/504/… Most clients assume port 502 multiplexes (wrong on S7).\n- **CP 343-1 Lean is server-only**, requires the `2XV9450-1MB00` license.\n- **FC20/21/22/23/43 all return Illegal Function** on every S7 variant — driver must not attempt FC23 bulk-read optimization for S7.\n- **STOP-mode behavior non-deterministic** across firmware bands — treat both read/write STOP-mode responses as unavailable.\n\nTwo items flagged as unconfirmed rumour (V2.0+ float byte-order claim, STOP-mode caching location).\n\nNo code, no tests — implementation lands in PRs 56+.\n\n## Test plan\n- [x] Doc renders as markdown\n- [x] 31 citations present\n- [x] Section structure matches dl205.md template","head":"phase-3-pr54-s7-research-doc","base":"v2"}

_p55.json

@@ -1 +0,0 @@
-{"title":"Phase 3 PR 55 -- Mitsubishi MELSEC Modbus TCP quirks research doc","body":"## Summary\n\nAdds `docs/v2/mitsubishi.md` (451 lines) covering MELSEC Q/L/iQ-R/iQ-F/FX3U Modbus TCP behavior. Mirrors `docs/v2/dl205.md` template for per-quirk implementation PRs.\n\n## Key findings for the implementation track\n\n- **Module naming trap** — `QJ71MB91` is SERIAL RTU, not TCP. TCP module is `QJ71MT91`. Surface clearly in driver docs.\n- **No canonical mapping** — per-site 'Modbus Device Assignment Parameter' block (up to 16 entries). Treat mapping as runtime config.\n- **X/Y hex vs octal depends on family** — Q/L/iQ-R use HEX (X20 = decimal 32); FX/iQ-F use OCTAL (X20 = decimal 16). Helper must take a family selector.\n- **Word order CDAB default** across all MELSEC families (opposite of Siemens S7). Driver Mitsubishi profile default: `ByteOrder.WordSwap`.\n- **D-registers binary by default** (opposite of DL205's BCD default). Caller opts in to `Bcd16`/`Bcd32` when ladder uses BCD.\n- **FX5U needs firmware ≥ 1.060** for Modbus TCP server — older is client-only.\n- **FX3U-ENET vs FX3U-ENET-P502 vs FX3U-ENET-ADP** — only the middle one binds port 502; the last has no Modbus at all. Common operator mis-purchase.\n- **QJ71MT91 does NOT support FC22 / FC23** — iQ-R / iQ-F do. Bulk-read optimization must gate on capability.\n- **STOP-mode writes configurable** on Q/L/iQ-R/iQ-F (default accept), always rejected on FX3U-ENET.\n\nThree unconfirmed rumours flagged separately.\n\nNo code, no tests — implementation lands in PRs 58+.\n\n## Test plan\n- [x] Doc renders as markdown\n- [x] 17 citations present\n- [x] Per-model test naming matrix included (`Mitsubishi_QJ71MT91_*`, `Mitsubishi_FX5U_*`, `Mitsubishi_FX3U_ENET_*`, shared `Mitsubishi_Common_*`)","head":"phase-3-pr55-mitsubishi-research-doc","base":"v2"}

docs/AddressSpace.md

@@ -1,6 +1,6 @@
 # Address Space
 
-Each driver's browsable subtree is built by streaming nodes from the driver's `ITagDiscovery.DiscoverAsync` implementation into an `IAddressSpaceBuilder`. `GenericDriverNodeManager` (`src/ZB.MOM.WW.OtOpcUa.Core/OpcUa/GenericDriverNodeManager.cs`) owns the shared orchestration; `DriverNodeManager` (`src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs`) implements `IAddressSpaceBuilder` against the OPC Foundation stack's `CustomNodeManager2`. The same code path serves Galaxy object hierarchies, Modbus PLC registers, AB CIP tags, TwinCAT symbols, FOCAS CNC parameters, and OPC UA Client aggregations — Galaxy is one driver of seven, not the driver.
+Each driver's browsable subtree is built by streaming nodes from the driver's `ITagDiscovery.DiscoverAsync` implementation into an `IAddressSpaceBuilder`. `GenericDriverNodeManager` (`src/Core/ZB.MOM.WW.OtOpcUa.Core/OpcUa/GenericDriverNodeManager.cs`) owns the shared orchestration; `DriverNodeManager` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs`) implements `IAddressSpaceBuilder` against the OPC Foundation stack's `CustomNodeManager2`. The same code path serves Galaxy object hierarchies, Modbus PLC registers, AB CIP tags, TwinCAT symbols, FOCAS CNC parameters, and OPC UA Client aggregations — Galaxy is one driver of seven, not the driver.
 
 ## Driver root folder
 
@@ -8,7 +8,7 @@ Every driver's subtree starts with a root `FolderState` under the standard OPC U
 
 ## IAddressSpaceBuilder surface
 
-`IAddressSpaceBuilder` (`src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IAddressSpaceBuilder.cs`) offers three calls:
+`IAddressSpaceBuilder` (`src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IAddressSpaceBuilder.cs`) offers three calls:
 
 - `Folder(browseName, displayName)` — creates a child `FolderState` and returns a child builder scoped to it.
 - `Variable(browseName, displayName, DriverAttributeInfo attributeInfo)` — creates a `BaseDataVariableState` and returns an `IVariableHandle` the driver keeps for alarm wiring.
@@ -18,7 +18,7 @@ Drivers drive ordering. Typical pattern: root → folder per equipment → varia
 
 ## DriverAttributeInfo → OPC UA variable
 
-Each variable carries a `DriverAttributeInfo` (`src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverAttributeInfo.cs`):
+Each variable carries a `DriverAttributeInfo` (`src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverAttributeInfo.cs`):
 
 | Field | OPC UA target |
 |---|---|
@@ -65,8 +65,8 @@ Drivers that implement `IRediscoverable` fire `OnRediscoveryNeeded` when their b
 
 ## Key source files
 
-- `src/ZB.MOM.WW.OtOpcUa.Core/OpcUa/GenericDriverNodeManager.cs` — orchestration + `CapturingBuilder`
-- `src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs` — OPC UA materialization (`IAddressSpaceBuilder` impl + `NestedBuilder`)
-- `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IAddressSpaceBuilder.cs` — builder contract
-- `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/ITagDiscovery.cs` — driver discovery capability
-- `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverAttributeInfo.cs` — per-attribute descriptor
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core/OpcUa/GenericDriverNodeManager.cs` — orchestration + `CapturingBuilder`
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs` — OPC UA materialization (`IAddressSpaceBuilder` impl + `NestedBuilder`)
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IAddressSpaceBuilder.cs` — builder contract
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/ITagDiscovery.cs` — driver discovery capability
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverAttributeInfo.cs` — per-attribute descriptor

docs/AlarmTracking.md

@@ -1,128 +1,129 @@
-# Alarm Tracking
+# Alarm tracking — v2 final architecture
 
-Alarm surfacing is an optional driver capability exposed via `IAlarmSource` (`src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IAlarmSource.cs`). Drivers whose backends have an alarm concept implement it — today: Galaxy (MXAccess alarms), FOCAS (CNC alarms), OPC UA Client (A&C events from the upstream server). Modbus / S7 / AB CIP / AB Legacy / TwinCAT do not implement the interface and the feature is simply absent from their subtrees.
+This document describes how OtOpcUa surfaces alarms to OPC UA Part 9
+clients after the **alarms-over-gateway** epic
+([docs/plans/alarms-over-gateway.md](plans/alarms-over-gateway.md))
+landed. The v1 architecture (Galaxy.Host's COM-side `GalaxyAlarmTracker`)
+is preserved at [docs/v1/AlarmTracking.md](v1/AlarmTracking.md) for
+historical reference.
 
-## IAlarmSource surface
+## Three alarm sources, one OPC UA Part 9 surface
 
-```csharp
-Task<IAlarmSubscriptionHandle> SubscribeAlarmsAsync(
-    IReadOnlyList<string> sourceNodeIds, CancellationToken cancellationToken);
-Task UnsubscribeAlarmsAsync(IAlarmSubscriptionHandle handle, CancellationToken cancellationToken);
-Task AcknowledgeAsync(IReadOnlyList<AlarmAcknowledgeRequest> acknowledgements,
-    CancellationToken cancellationToken);
-event EventHandler<AlarmEventArgs>? OnAlarmEvent;
-```
+| Source                           | Driver capability        | Path |
+|----------------------------------|--------------------------|------|
+| **Galaxy MxAccess (driver-native)** | `GalaxyDriver : IAlarmSource` | gateway → worker → MxAccess alarm sink → `MX_EVENT_FAMILY_ON_ALARM_TRANSITION` → `EventPump` → driver `OnAlarmEvent` → `AlarmConditionService` |
+| **Galaxy sub-attribute fallback**  | `IWritable` writes to `$Alarm*` sub-attributes | gateway data subscription → driver `OnDataChange` → `DriverNodeManager` ConditionSink → `AlarmConditionService` |
+| **Scripted alarms**                | `Phase7EngineComposer` | server-side script evaluator → `Phase7EngineComposer.RouteToHistorianAsync` + `AlarmConditionService` |
 
-The driver fires `OnAlarmEvent` for every transition (`Active`, `Acknowledged`, `Inactive`) with an `AlarmEventArgs` carrying the source node id, condition id, alarm type, message, severity (`AlarmSeverity` enum), and source timestamp.
+All three converge on `AlarmConditionService` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/Alarms/AlarmConditionService.cs`),
+which owns the OPC UA Part 9 state machine and dispatches transitions
+to the OPC UA condition node managers. Driver-native transitions take
+precedence over sub-attribute synthesis when both arrive for the same
+condition — the dedup logic prefers the richer driver-native record
+because it carries the full operator + raise-time + category metadata
+that the value-driven path collapses.
 
-## AlarmSurfaceInvoker
+## Galaxy driver path (driver-native)
 
-`AlarmSurfaceInvoker` (`src/ZB.MOM.WW.OtOpcUa.Core/Resilience/AlarmSurfaceInvoker.cs`) wraps the three mutating surfaces through `CapabilityInvoker`:
+Restored in PR B.2 of the epic. `GalaxyDriver` implements
+`IAlarmSource` with these surfaces:
 
-- `SubscribeAlarmsAsync` / `UnsubscribeAlarmsAsync` run through the `DriverCapability.AlarmSubscribe` pipeline — retries apply under the tier configuration.
-- `AcknowledgeAsync` runs through `DriverCapability.AlarmAcknowledge` which does NOT retry per decision #143. A timed-out ack may have already registered at the plant floor; replay would silently double-acknowledge.
+- `SubscribeAlarmsAsync(sourceNodeIds)` → returns a sentinel handle.
+  The driver doesn't multiplex per source-node-id today; every
+  active handle observes the gateway's alarm-event stream. The
+  server-side `AlarmConditionService` filters by source-node before
+  raising the OPC UA condition.
+- `UnsubscribeAlarmsAsync(handle)` → symmetric handle removal.
+- `AcknowledgeAsync(requests)` → routes one gateway RPC per
+  acknowledgement through `IGalaxyAlarmAcknowledger`. Production
+  uses `GatewayGalaxyAlarmAcknowledger` calling
+  `MxGatewayClient.AcknowledgeAlarmAsync` (PR E.2 SDK method).
+- `OnAlarmEvent` → bridges `EventPump.OnAlarmTransition` (PR B.1)
+  onto `AlarmEventArgs`. Suppressed when no alarm subscription is
+  active so untracked transitions don't leak through.
 
-Multi-host fan-out: when the driver implements `IPerCallHostResolver`, each source node id is resolved individually and batches are grouped by host so a dead PLC inside a multi-device driver doesn't poison sibling breakers. Single-host drivers fall back to `IDriver.DriverInstanceId` as the pipeline-key host.
+The proto contract carries the rich payload — alarm full reference,
+source-object reference, alarm-type-name, transition kind (Raise /
+Acknowledge / Clear / Retrigger), severity (raw MxAccess scale),
+original raise timestamp, transition timestamp, operator user,
+operator comment, alarm category, description. `MxAccessSeverityMapper`
+(PR B.1) translates the raw severity onto the four-bucket
+`AlarmSeverity` ladder — boundaries match v1's `GalaxyAlarmTracker`
+so customers see no surprise re-classification.
 
-## Condition-node creation via CapturingBuilder
+The richer fields surface on `Core.Abstractions.AlarmEventArgs` via
+the optional properties added in PR E.7 (`OperatorComment`,
+`OriginalRaiseTimestampUtc`, `AlarmCategory`). Consumers that don't
+need them are unaffected; consumers that do (Client.UI, Client.CLI
+verbose mode) read the new fields when present.
 
-Alarm-condition nodes are materialized at address-space build time. During `GenericDriverNodeManager.BuildAddressSpaceAsync` the builder is wrapped in a `CapturingBuilder` that observes every `Variable()` call. When a driver calls `IVariableHandle.MarkAsAlarmCondition(AlarmConditionInfo)` on a returned handle, the server-side `DriverNodeManager.VariableHandle` creates a sibling `AlarmConditionState` node and returns an `IAlarmConditionSink`. The wrapper stores the sink in `_alarmSinks` keyed by the variable's full reference, then `GenericDriverNodeManager` registers a forwarder on `IAlarmSource.OnAlarmEvent` that routes each push to the matching sink by `SourceNodeId`. Unknown source ids are dropped silently — they may belong to another driver.
+## Galaxy sub-attribute fallback
 
-The `AlarmConditionState` layout matches OPC UA Part 9:
+For Galaxy templates without `$Alarm*` extensions, the value-driven
+path stays in place: `DriverNodeManager` registers an
+`AlarmConditionState` per Galaxy variable that bears alarm-bearing
+sub-attributes (`InAlarm`, `Acked`, `Priority`, `Description`),
+subscribes to those sub-attributes, and synthesizes Part 9 transitions
+when the values change. This path operated as the only Galaxy alarm
+path between PR 7.2 and the alarms-over-gateway epic; it remains the
+fallback today.
 
-- `SourceNode` → the originating variable
-- `SourceName` / `ConditionName` → from `AlarmConditionInfo.SourceName`
-- Initial state: enabled, inactive, acknowledged, severity per `InitialSeverity`, retain false
-- `HasCondition` references wire the source variable ↔ the condition node bidirectionally
+When both paths report the same condition,
+`AlarmConditionService.AlarmConditionState` keeps the
+driver-native record and discards the duplicate sub-attribute
+synthesis. Driver-native transitions are richer (carry operator
+comment + original raise time) and arrive lower-latency (no
+publishing-interval delay on the sub-attribute reads), so they win
+the dedup.
 
-Drivers flag alarm-bearing variables at discovery time via `DriverAttributeInfo.IsAlarm = true`. The Galaxy driver, for example, sets this on attributes that have an `AlarmExtension` primitive in the Galaxy repository DB; FOCAS sets it on the CNC alarm register.
+## Acknowledge routing
 
-## State transitions
+`DriverNodeManager` picks the acknowledger when registering each
+condition (PR B.3 logic):
 
-`ConditionSink.OnTransition` runs under the node manager's `Lock` and maps the `AlarmEventArgs.AlarmType` string to Part 9 state:
+- Driver implements `IAlarmSource` →
+  `DriverAlarmSourceAcknowledger` routes the operator comment
+  through `IAlarmSource.AcknowledgeAsync` via the existing
+  `AlarmSurfaceInvoker` (Phase 6.1 resilience pipeline; no-retry
+  per decision #143). End-to-end operator-comment fidelity is
+  preserved.
+- Driver doesn't implement `IAlarmSource` →
+  `DriverWritableAcknowledger` writes the comment into the
+  `AckMsgWriteRef` sub-attribute via `IWritable.WriteAsync`. Same
+  resilience pipeline; collapses the comment into a single string
+  write at the wire level.
 
-| AlarmType | Action |
-|---|---|
-| `Active` | `SetActiveState(true)`, `SetAcknowledgedState(false)`, `Retain = true` |
-| `Acknowledged` | `SetAcknowledgedState(true)` |
-| `Inactive` | `SetActiveState(false)`; `Retain = false` once both inactive and acknowledged |
+The OPC UA Part 9 `AlarmConditionState.OnAcknowledge` delegate
+already validates the session's `AlarmAck` role before dispatching,
+so the gateway-side ack RPC only sees authenticated, authorised
+calls.
 
-Severity is remapped: `AlarmSeverity.Low/Medium/High/Critical` → OPC UA numeric 250 / 500 / 700 / 900. `Message.Value` is set from `AlarmEventArgs.Message` on every transition. `ClearChangeMasks(true)` and `ReportEvent(condition)` fire the OPC UA event notification for clients subscribed to any ancestor notifier.
+## Historian write-back (non-Galaxy alarms)
 
-## Acknowledge dispatch
+Scripted alarms (and any future non-Galaxy `IAlarmSource` like
+AB CIP ALMD) route to AVEVA Historian via the Wonderware sidecar:
 
-Alarm acknowledgement initiated by an OPC UA client flows:
+- `Phase7Composer.ResolveHistorianSink` resolves an
+  `IAlarmHistorianWriter` from either a driver that natively
+  implements it or the DI-registered `WonderwareHistorianClient`
+  (the sidecar IPC client). Driver-provided wins when both are
+  present.
+- `SqliteStoreAndForwardSink` queues each transition to a local
+  SQLite database and drains in the background via the resolved
+  writer.
+- Sidecar (PR C.1 + C.2) forwards the events to `aahClientManaged`'s
+  alarm-event write API; the live SDK call site is pinned during
+  PR D.1's deploy-rig validation.
 
-1. The SDK invokes the `AlarmConditionState.OnAcknowledge` method delegate.
-2. The handler checks the session's roles for `AlarmAck` — drivers never see a request the session wasn't entitled to make.
-3. `AlarmSurfaceInvoker.AcknowledgeAsync` is called with the source / condition / comment tuple. The invoker groups by host and runs each batch through the no-retry `AlarmAcknowledge` pipeline.
+Galaxy-native alarms with `$Alarm*` extensions reach AVEVA Historian
+directly via System Platform's `HistorizeToAveva` toggle on the
+alarm primitive — no involvement from OtOpcUa. This sidecar path is
+exclusively for non-Galaxy alarm producers.
 
-Drivers return normally for success or throw to signal the ack failed at the backend.
+## Cross-references
 
-## EventNotifier propagation
-
-Drivers that want hierarchical alarm subscriptions propagate `EventNotifier.SubscribeToEvents` up the containment chain during discovery — the Galaxy driver flips the flag on every ancestor of an alarm-bearing object up to the driver root, mirroring v1 behavior. Clients subscribed at the driver root, a mid-level folder, or the `Objects/` root see alarm events from every descendant with an `AlarmConditionState` sibling. The driver-root `FolderState` is created in `DriverNodeManager.CreateAddressSpace` with `EventNotifier = SubscribeToEvents | HistoryRead` so alarm event subscriptions and alarm history both have a single natural target.
-
-## ConditionRefresh
-
-The OPC UA `ConditionRefresh` service queues the current state of every retained condition back to the requesting monitored items. `DriverNodeManager` iterates the node manager's `AlarmConditionState` collection and queues each condition whose `Retain.Value == true` — matching the Part 9 requirement.
-
-## Alarm historian sink
-
-Distinct from the live `IAlarmSource` stream and the Part 9 `AlarmConditionState` materialization above, qualifying alarm transitions are **also** persisted to a durable event log for downstream AVEVA Historian ingestion. This is a separate subsystem from the `IHistoryProvider` capability used by `HistoryReadEvents` (see [HistoricalDataAccess.md](HistoricalDataAccess.md#alarm-event-history-vs-ihistoryprovider)): the sink is a *producer* path (server → Historian) that runs independently of any client HistoryRead call.
-
-### `IAlarmHistorianSink`
-
-`src/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/IAlarmHistorianSink.cs` defines the intake contract:
-
-```csharp
-Task EnqueueAsync(AlarmHistorianEvent evt, CancellationToken cancellationToken);
-HistorianSinkStatus GetStatus();
-```
-
-`EnqueueAsync` is fire-and-forget from the producer's perspective — it must never block the emitting thread. The event payload (`AlarmHistorianEvent` — same file) is source-agnostic: `AlarmId`, `EquipmentPath`, `AlarmName`, `AlarmTypeName` (Part 9 subtype name), `Severity`, `EventKind` (free-form transition string — `Activated` / `Cleared` / `Acknowledged` / `Confirmed` / `Shelved` / …), `Message`, `User`, `Comment`, `TimestampUtc`.
-
-The sink scope is defined to span every alarm source (plan decision #15: scripted, Galaxy-native, AB CIP ALMD, any future `IAlarmSource`), gated per-alarm by a `HistorizeToAveva` toggle on the producer. Today only `Phase7EngineComposer.RouteToHistorianAsync` (`src/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7EngineComposer.cs`) is wired — it subscribes to `ScriptedAlarmEngine.OnEvent` and marshals each emission into `AlarmHistorianEvent`. Galaxy-native alarms continue to reach AVEVA Historian via the driver's direct `aahClientManaged` path and do not flow through the sink; the AB CIP ALMD path remains unwired pending a producer-side integration.
-
-### `SqliteStoreAndForwardSink`
-
-Default production implementation (`src/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/SqliteStoreAndForwardSink.cs`). A local SQLite queue absorbs every `EnqueueAsync` synchronously; a background `Timer` drains batches asynchronously to an `IAlarmHistorianWriter` so operator actions are never blocked on historian reachability.
-
-Queue schema (single table `Queue`): `RowId PK autoincrement`, `AlarmId`, `EnqueuedUtc`, `PayloadJson` (serialized `AlarmHistorianEvent`), `AttemptCount`, `LastAttemptUtc`, `LastError`, `DeadLettered` (bool), plus `IX_Queue_Drain (DeadLettered, RowId)`. Default capacity `1_000_000` non-dead-lettered rows; oldest rows evict with a WARN log past the cap.
-
-Drain cadence: `StartDrainLoop(tickInterval)` arms a periodic timer. `DrainOnceAsync` reads up to `batchSize` rows (default 100) in `RowId` order and forwards them through `IAlarmHistorianWriter.WriteBatchAsync`, which returns one `HistorianWriteOutcome` per row:
-
-| Outcome | Action |
-|---|---|
-| `Ack` | Row deleted. |
-| `PermanentFail` | Row flipped to `DeadLettered = 1` with reason. Peers in the batch retry independently. |
-| `RetryPlease` | `AttemptCount` bumped; row stays queued. Drain worker enters `BackingOff`. |
-
-Writer-side exceptions treat the whole batch as `RetryPlease`.
-
-Backoff ladder on `RetryPlease` (hard-coded): 1s → 2s → 5s → 15s → 60s cap. Reset to 0 on any batch with no retries. `CurrentBackoff` exposes the current step for instrumentation; the drain timer itself fires on `tickInterval`, so the ladder governs write cadence rather than timer period.
-
-Dead-letter retention defaults to 30 days (plan decision #21). `PurgeAgedDeadLetters` runs each drain pass and deletes rows whose `LastAttemptUtc` is past the cutoff. `RetryDeadLettered()` is an operator action that clears `DeadLettered` + resets `AttemptCount` on every dead-lettered row so they rejoin the main queue.
-
-### Composition and writer resolution
-
-`Phase7Composer.ResolveHistorianSink` (`src/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7Composer.cs`) scans the registered drivers for one that implements `IAlarmHistorianWriter`. Today that is `GalaxyProxyDriver` via `GalaxyHistorianWriter` (`src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy/Ipc/GalaxyHistorianWriter.cs`), which forwards batches over the Galaxy.Host pipe to the `aahClientManaged` alarm schema. When a writer is found, a `SqliteStoreAndForwardSink` is instantiated against `%ProgramData%/OtOpcUa/alarm-historian-queue.db` with a 2 s drain tick and the writer attached. When no driver provides a writer the fallback is the DI-registered `NullAlarmHistorianSink` (`src/ZB.MOM.WW.OtOpcUa.Server/Program.cs`), which silently discards and reports `HistorianDrainState.Disabled`.
-
-### Status and observability
-
-`GetStatus()` returns `HistorianSinkStatus(QueueDepth, DeadLetterDepth, LastDrainUtc, LastSuccessUtc, LastError, DrainState)` — two `COUNT(*)` scalars plus last-drain telemetry. `DrainState` is one of `Disabled` / `Idle` / `Draining` / `BackingOff`.
-
-The Admin UI `/alarms/historian` page surfaces this through `HistorianDiagnosticsService` (`src/ZB.MOM.WW.OtOpcUa.Admin/Services/HistorianDiagnosticsService.cs`), which also exposes `TryRetryDeadLettered` — it calls through to `SqliteStoreAndForwardSink.RetryDeadLettered` when the live sink is the SQLite implementation and returns 0 otherwise.
-
-## Key source files
-
-- `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IAlarmSource.cs` — capability contract + `AlarmEventArgs`
-- `src/ZB.MOM.WW.OtOpcUa.Core/Resilience/AlarmSurfaceInvoker.cs` — per-host fan-out + no-retry ack
-- `src/ZB.MOM.WW.OtOpcUa.Core/OpcUa/GenericDriverNodeManager.cs` — `CapturingBuilder` + alarm forwarder
-- `src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs` — `VariableHandle.MarkAsAlarmCondition` + `ConditionSink`
-- `src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Alarms/GalaxyAlarmTracker.cs` — Galaxy-specific alarm-event production
-- `src/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/IAlarmHistorianSink.cs` — historian sink intake contract + `AlarmHistorianEvent` + `HistorianSinkStatus` + `IAlarmHistorianWriter`
-- `src/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/SqliteStoreAndForwardSink.cs` — durable queue + drain worker + backoff ladder + dead-letter retention
-- `src/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7EngineComposer.cs` — `RouteToHistorianAsync` wires scripted-alarm emissions into the sink
-- `src/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7Composer.cs` — `ResolveHistorianSink` selects `SqliteStoreAndForwardSink` vs `NullAlarmHistorianSink`
-- `src/ZB.MOM.WW.OtOpcUa.Admin/Services/HistorianDiagnosticsService.cs` — Admin UI `/alarms/historian` status + retry-dead-lettered operator action
+- Plan: [docs/plans/alarms-over-gateway.md](plans/alarms-over-gateway.md)
+- v1 archive: [docs/v1/AlarmTracking.md](v1/AlarmTracking.md)
+- Galaxy driver: [docs/drivers/Galaxy.md](drivers/Galaxy.md)
+- Phase 7 scripting + alarming: [docs/v2/implementation/phase-7-scripting-and-alarming.md](v2/implementation/phase-7-scripting-and-alarming.md)
+- Security + ACL: [docs/Security.md](Security.md)

docs/Client.CLI.md

@@ -9,12 +9,12 @@ The CLI is the primary tool for operators and developers to test and interact wi
 ## Build and Run
 
 ```bash
-cd src/ZB.MOM.WW.OtOpcUa.Client.CLI
+cd src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI
 dotnet build
 dotnet run -- <command> [options]
 ```
 
-The executable name is `otopcua-cli`. Dev boxes carrying a pre-task-#208 install may still have the legacy `{LocalAppData}/LmxOpcUaClient/` folder on disk; on first launch of any post-#208 CLI or UI build, `ClientStoragePaths` (`src/ZB.MOM.WW.OtOpcUa.Client.Shared/ClientStoragePaths.cs`) migrates it to `{LocalAppData}/OtOpcUaClient/` automatically so trusted certificates + saved settings survive the rename.
+The executable name is `otopcua-cli`. Dev boxes carrying a pre-task-#208 install may still have the legacy `{LocalAppData}/LmxOpcUaClient/` folder on disk; on first launch of any post-#208 CLI or UI build, `ClientStoragePaths` (`src/Client/ZB.MOM.WW.OtOpcUa.Client.Shared/ClientStoragePaths.cs`) migrates it to `{LocalAppData}/OtOpcUaClient/` automatically so trusted certificates + saved settings survive the rename.
 
 ## Architecture
 
@@ -240,5 +240,5 @@ Application URI:  urn:localhost:OtOpcUa:instance1
 The Client CLI has 52 unit tests covering option parsing, service invocation, output formatting, and cleanup behavior:
 
 ```bash
-dotnet test tests/ZB.MOM.WW.OtOpcUa.Client.CLI.Tests
+dotnet test tests/Client/ZB.MOM.WW.OtOpcUa.Client.CLI.Tests
 ```

docs/Client.UI.md

@@ -9,7 +9,7 @@ The UI provides a single-window interface for browsing the address space, readin
 ## Build and Run
 
 ```bash
-cd src/ZB.MOM.WW.OtOpcUa.Client.UI
+cd src/Client/ZB.MOM.WW.OtOpcUa.Client.UI
 dotnet build
 dotnet run
 ```
@@ -254,7 +254,7 @@ All service event handlers (data changes, alarm events, connection state changes
 The UI has 102 unit tests covering ViewModel logic and headless rendering:
 
 ```bash
-dotnet test tests/ZB.MOM.WW.OtOpcUa.Client.UI.Tests
+dotnet test tests/Client/ZB.MOM.WW.OtOpcUa.Client.UI.Tests
 ```
 
 Tests use:

docs/Driver.AbCip.Cli.md

@@ -10,7 +10,7 @@ TwinCAT). Shares `Driver.Cli.Common` with the others.
 ## Build + run
 
 ```powershell
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli -- --help
+dotnet run --project src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbCip.Cli -- --help
 ```
 
 ## Common flags

docs/Driver.AbLegacy.Cli.md

@@ -10,7 +10,7 @@ others.
 ## Build + run
 
 ```powershell
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli -- --help
+dotnet run --project src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Cli -- --help
 ```
 
 ## Common flags
@@ -99,7 +99,7 @@ otopcua-ablegacy-cli subscribe -g ab://192.168.1.20/1,0 -a N7:10 -t Int -i 500
 
 The integration-fixture `ab_server` Docker container accepts TCP but its PCCC
 dispatcher doesn't actually respond — see
-[`tests/...AbLegacy.IntegrationTests/Docker/README.md`](../tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/Docker/README.md).
+[`tests/...AbLegacy.IntegrationTests/Docker/README.md`](../tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/Docker/README.md).
 Point `--gateway` at real hardware or an RSEmulate 500 box for end-to-end
 wire-level validation. The CLI itself is correct regardless of which endpoint
 you target.

docs/Driver.FOCAS.Cli.md

@@ -5,39 +5,34 @@ protocol. Uses the **same** `FocasDriver` the OtOpcUa server does — PMC R/G/F
 file registers, axis bits, parameters, and macro variables — all through
 `FocasAddressParser` syntax.
 
-Sixth of the driver test-client CLIs, added alongside the Tier-C isolation
-work tracked in task #220.
+Sixth of the driver test-client CLIs.
 
 ## Architecture note
 
-FOCAS is a Tier-C driver: `Fwlib32.dll` is a proprietary 32-bit Fanuc library
-with a documented habit of crashing its hosting process on network errors.
-The target runtime deployment splits the driver into an in-process
-`FocasProxyDriver` (.NET 10 x64) and an out-of-process `Driver.FOCAS.Host`
-(.NET 4.8 x86 Windows service) that owns the DLL — see
-[v2/implementation/focas-isolation-plan.md](v2/implementation/focas-isolation-plan.md)
-and
-[v2/implementation/phase-6-1-resilience-and-observability.md](v2/implementation/phase-6-1-resilience-and-observability.md)
-for topology + supervisor / respawn / back-pressure design.
+FOCAS is an in-process driver. The pure-managed `WireFocasClient`
+speaks the FOCAS2 binary protocol directly over TCP:8193, removing the
+Tier-C process-isolation split that the historical P/Invoke + out-of-
+process Host arrangement required. The CLI loads `FocasDriver` with
+`WireFocasClientFactory` and talks to the CNC without any native
+components.
 
-The CLI skips the proxy and loads `FocasDriver` directly (via
-`FwlibFocasClientFactory`, which P/Invokes `Fwlib32.dll` in the CLI's own
-process). There is **no public simulator** for FOCAS; a meaningful probe
-requires a real CNC + a licensed `Fwlib32.dll` on `PATH` (or next to the
-executable). On a dev box without the DLL, every wire call surfaces as
-`BadCommunicationError` — still useful as a "CLI wire-up is correct" signal.
+A dev-friendly mock is available — start
+`tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Docker/docker-compose.yml`
+and point `--cnc-host` at `localhost` for end-to-end CLI exercises
+without a real CNC. See
+[drivers/FOCAS-Test-Fixture.md](drivers/FOCAS-Test-Fixture.md).
 
 ## Build + run
 
 ```powershell
-dotnet build src/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli -- --help
+dotnet build src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli
+dotnet run --project src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli -- --help
 ```
 
 Or publish a self-contained binary:
 
 ```powershell
-dotnet publish src/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli -c Release -o publish/focas-cli
+dotnet publish src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Cli -c Release -o publish/focas-cli
 publish/focas-cli/otopcua-focas-cli.exe --help
 ```
 
@@ -152,7 +147,8 @@ fails.
 **"Why did this macro flip?"** → `subscribe` to the macro, let the
 operator reproduce the cycle, watch the HH:mm:ss.fff timeline.
 
-**"Is the Fwlib32 DLL wired up?"** → `probe` against any host. A
-`DllNotFoundException` surfacing as `BadCommunicationError` with a
-matching `Last error` line means the driver is loading but the DLL is
-missing; anything else means a transport-layer problem.
+**"Can I reach the CNC on TCP:8193?"** → `probe` against any host. A
+`BadCommunicationError` means the wire client couldn't open a socket
+(firewall / wrong host / FOCAS Ethernet option unlicensed on the CNC).
+`BadDeviceFailure` after a successful connect means the CNC is rejecting
+the session setup — check the CNC's FOCAS option and password settings.

docs/Driver.Modbus.Cli.md

@@ -13,14 +13,14 @@ without copy-paste.
 ## Build + run
 
 ```powershell
-dotnet build src/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli -- --help
+dotnet build src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli
+dotnet run --project src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli -- --help
 ```
 
 Or publish a self-contained binary:
 
 ```powershell
-dotnet publish src/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli -c Release -o publish/modbus-cli
+dotnet publish src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli -c Release -o publish/modbus-cli
 publish/modbus-cli/otopcua-modbus-cli.exe --help
 ```
 
@@ -119,3 +119,37 @@ address.
 **"What's the right byte order for this family?"** → `read` with
 `--byte-order BigEndian`, then with `--byte-order WordSwap`. The one that
 gives plausible values is the correct one for that device.
+
+## v2 addressing grammar
+
+The driver accepts the industry-standard tag-address grammar so you can
+paste tag spreadsheets from Wonderware / Kepware / Ignition without
+per-row manual translation. Full reference + grammar rules:
+[`docs/v2/modbus-addressing.md`](v2/modbus-addressing.md).
+
+Quick examples:
+
+```
+40001                  HoldingRegisters[0], Int16
+400001                 same, 6-digit form
+40001:F                Float32
+40001:F:CDAB           Float32 word-swapped
+40001:STR20            20-char ASCII string
+40001:S:5              Int16[5] array (3-field shorthand)
+40001:F:CDAB:10        Float32[10] with explicit word-swap (4-field strict)
+40001.5                bit 5 of HR[0]
+HR1:I                  Int32 via mnemonic region prefix (matches Wonderware)
+C100                   Coil 100 (mnemonic, 1-based)
+V2000:F:CDAB           DL205 V-memory at PDU 1024 + Float32 + word-swap (Family=DL205)
+D100:I                 MELSEC D-register 100, Int32 (Family=MELSEC)
+```
+
+**Type-code reminder** (post-#146): `:I` is **Int32** (matches Wonderware
+DASMBTCP + Ignition `HRI`). The explicit Int16 code is `:S`. Bare HR/IR
+with no type still defaults to Int16. Pre-#146 codes `:DI` / `:L` /
+`:UDI` / `:UL` / `:LI` / `:ULI` / `:LBCD` are removed; configs that use
+them get a clear "Unknown type code" diagnostic at parse time.
+
+In `DriverConfig` JSON, set the per-tag `addressString` field instead of
+the structured `region` + `address` + `dataType` fields. Both styles can
+coexist within one driver instance.

docs/Driver.S7.Cli.md

@@ -9,7 +9,7 @@ Fourth of four driver test-client CLIs.
 ## Build + run
 
 ```powershell
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli -- --help
+dotnet run --project src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.S7.Cli -- --help
 ```
 
 ## Common flags

docs/Driver.TwinCAT.Cli.md

@@ -1,16 +1,16 @@
 # `otopcua-twincat-cli` — Beckhoff TwinCAT test client
 
-Ad-hoc probe / read / write / subscribe tool for Beckhoff TwinCAT 2 / TwinCAT 3
-runtimes via ADS. Uses the **same** `TwinCATDriver` the OtOpcUa server does
-(`Beckhoff.TwinCAT.Ads` package). Native ADS notifications by default;
-`--poll-only` falls back to the shared `PollGroupEngine`.
+Ad-hoc probe / read / write / subscribe / browse tool for Beckhoff TwinCAT 2 /
+TwinCAT 3 runtimes via ADS. Uses the **same** `TwinCATDriver` the OtOpcUa
+server does (`Beckhoff.TwinCAT.Ads` package). Native ADS notifications by
+default; `--poll-only` falls back to the shared `PollGroupEngine`.
 
 Fifth (final) of the driver test-client CLIs.
 
 ## Build + run
 
 ```powershell
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli -- --help
+dotnet run --project src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Cli -- --help
 ```
 
 ## Prerequisite: AMS router
@@ -50,6 +50,13 @@ caller interpret semantics.
 
 ### `probe`
 
+Per-command flags:
+
+| Flag | Default | Purpose |
+|---|---|---|
+| `-s` / `--symbol` | **required** | Symbol path to probe (e.g. `MAIN.bRunning`) |
+| `--type` | `DInt` | Declared data type — see the [Data types](#data-types) list |
+
 ```powershell
 # Local TwinCAT 3, probe a canonical global
 otopcua-twincat-cli probe -n 127.0.0.1.1.1 -s "TwinCAT_SystemInfoVarList._AppInfo.OnlineChangeCnt"
@@ -89,6 +96,14 @@ Structure writes refused — drop to driver config JSON for those.
 
 ### `subscribe`
 
+Per-command flags:
+
+| Flag | Default | Purpose |
+|---|---|---|
+| `-s` / `--symbol` | **required** | Symbol path — same format as `read` |
+| `-t` / `--type` | `DInt` | Declared data type |
+| `-i` / `--interval-ms` | `1000` | Publishing interval in **milliseconds** — native mode passes this as the ADS `NotificationSettings.CycleTime` |
+
 ```powershell
 # Native ADS notifications (default) — PLC pushes on its own cycle
 otopcua-twincat-cli subscribe -n 192.168.1.40.1.1 -s GVL.Counter -t DInt -i 500
@@ -99,3 +114,23 @@ otopcua-twincat-cli subscribe -n 192.168.1.40.1.1 -s GVL.Counter -t DInt -i 500
 
 The subscribe banner announces which mechanism is in play — "ADS notification"
 or "polling" — so it's obvious in screen-recorded bug reports.
+
+### `browse`
+
+Walks the controller's symbol table via ADS `SymbolLoaderFactory` (same path
+`TwinCATDriver.DiscoverAsync` takes when `EnableControllerBrowse = true`).
+Output filters to symbols whose type maps onto the driver's atomic surface —
+UDTs / function-block instances don't appear.
+
+| Flag | Default | Purpose |
+|---|---|---|
+| `--prefix` | _(none)_ | Case-sensitive instance-path prefix filter (e.g. `GVL_Fixture`) |
+| `--max` | `500` | Max symbols to print. `0` = unbounded |
+
+```powershell
+# Everything under a single GVL
+otopcua-twincat-cli browse -n 192.168.1.40.1.1 --prefix GVL_Fixture
+
+# Full dump (beware: flat-mode walks on a real controller can top 10k symbols)
+otopcua-twincat-cli browse -n 192.168.1.40.1.1 --max 0
+```

docs/DriverClis.md

@@ -37,7 +37,7 @@ Every driver CLI exposes the same four verbs:
 
 ## Shared infrastructure
 
-All six CLIs depend on `src/ZB.MOM.WW.OtOpcUa.Driver.Cli.Common/`:
+All six CLIs depend on `src/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Cli.Common/`:
 
 - `DriverCommandBase` — `--verbose` + Serilog configuration + the abstract
   `Timeout` surface every protocol-specific base overrides with its own
@@ -91,5 +91,5 @@ Tasks #249 / #250 / #251 shipped the original five. The FOCAS CLI followed
 alongside the Tier-C isolation work on task #220 — no CLI-level test
 project (hardware-gated). 122 unit tests cumulative across the first five
 (16 shared-lib + 106 CLI-specific) — run
-`dotnet test tests/ZB.MOM.WW.OtOpcUa.Driver.Cli.Common.Tests` +
+`dotnet test tests/Drivers/Cli/ZB.MOM.WW.OtOpcUa.Driver.Cli.Common.Tests` +
 `tests/ZB.MOM.WW.OtOpcUa.Driver.*.Cli.Tests` to re-verify.

docs/IncrementalSync.md

@@ -4,7 +4,7 @@ Two distinct change-detection paths feed the running server: driver-backend redi
 
 ## Driver-backend rediscovery — IRediscoverable
 
-Drivers whose backend has a native change signal implement `IRediscoverable` (`src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IRediscoverable.cs`):
+Drivers whose backend has a native change signal implement `IRediscoverable` (`src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IRediscoverable.cs`):
 
 ```csharp
 public interface IRediscoverable
@@ -28,7 +28,7 @@ Static drivers (Modbus, S7, AB CIP, AB Legacy, FOCAS) do not implement `IRedisco
 
 Tag-set changes authored in the Admin UI (UNS edits, CSV imports, driver-config edits) accumulate in a draft generation and commit via `sp_PublishGeneration`. The delta between the currently-published generation and the proposed next one is computed by `sp_ComputeGenerationDiff`, which drives:
 
-- The **DiffViewer** in Admin (`src/ZB.MOM.WW.OtOpcUa.Admin/Components/Pages/Clusters/DiffViewer.razor`) so operators can preview what will change before clicking Publish.
+- The **DiffViewer** in Admin (`src/Server/ZB.MOM.WW.OtOpcUa.Admin/Components/Pages/Clusters/DiffViewer.razor`) so operators can preview what will change before clicking Publish.
 - The 409-on-stale-draft flow (decision #161) — a UNS drag-reorder preview carries a `DraftRevisionToken` so Confirm returns `409 Conflict / refresh-required` if the draft advanced between preview and commit.
 
 After publish, the server's generation applier invokes `IDriver.ReinitializeAsync(driverConfigJson, ct)` on every driver whose `DriverInstance.DriverConfig` row changed in the new generation. Reinitialize is the in-process recovery path for Tier A/B drivers; if it fails the driver is marked `DriverState.Faulted` and its nodes go Bad quality — but the server process stays running. See `docs/v2/driver-stability.md`.
@@ -53,7 +53,7 @@ When `RediscoveryEventArgs.ScopeHint` is non-null (e.g. a folder path), Core res
 
 ## Virtual tags in the rebuild
 
-Per [ADR-002](v2/implementation/adr-002-driver-vs-virtual-dispatch.md), virtual (scripted) tags live in the same address space as driver tags and flow through the same rebuild. `EquipmentNodeWalker` (`src/ZB.MOM.WW.OtOpcUa.Core/OpcUa/EquipmentNodeWalker.cs`) emits virtual-tag children alongside driver-tag children with `DriverAttributeInfo.Source = NodeSourceKind.Virtual`, and `DriverNodeManager` registers each variable's source in `_sourceByFullRef` so the dispatch branches correctly after rebuild. Virtual-tag script changes published from the Admin UI land through the same generation-publish path — the `VirtualTagEngine` recompiles its script bundle when its config row changes and `DriverNodeManager` re-registers any added/removed virtual variables through the standard diff path. Subscription restoration after rebuild runs through each source's `ISubscribable` — either the driver's or `VirtualTagSource` — without special-casing.
+Per [ADR-002](v2/implementation/adr-002-driver-vs-virtual-dispatch.md), virtual (scripted) tags live in the same address space as driver tags and flow through the same rebuild. `EquipmentNodeWalker` (`src/Core/ZB.MOM.WW.OtOpcUa.Core/OpcUa/EquipmentNodeWalker.cs`) emits virtual-tag children alongside driver-tag children with `DriverAttributeInfo.Source = NodeSourceKind.Virtual`, and `DriverNodeManager` registers each variable's source in `_sourceByFullRef` so the dispatch branches correctly after rebuild. Virtual-tag script changes published from the Admin UI land through the same generation-publish path — the `VirtualTagEngine` recompiles its script bundle when its config row changes and `DriverNodeManager` re-registers any added/removed virtual variables through the standard diff path. Subscription restoration after rebuild runs through each source's `ISubscribable` — either the driver's or `VirtualTagSource` — without special-casing.
 
 ## Active subscriptions survive rebuild
 
@@ -61,9 +61,9 @@ Subscriptions for unchanged references stay live across rebuilds — their ref-c
 
 ## Key source files
 
-- `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IRediscoverable.cs` — backend-change capability
-- `src/ZB.MOM.WW.OtOpcUa.Core/OpcUa/GenericDriverNodeManager.cs` — discovery orchestration
-- `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IDriver.cs` — `ReinitializeAsync` contract
-- `src/ZB.MOM.WW.OtOpcUa.Admin/Services/GenerationService.cs` — publish-flow driver
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IRediscoverable.cs` — backend-change capability
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core/OpcUa/GenericDriverNodeManager.cs` — discovery orchestration
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IDriver.cs` — `ReinitializeAsync` contract
+- `src/Server/ZB.MOM.WW.OtOpcUa.Admin/Services/GenerationService.cs` — publish-flow driver
 - `docs/v2/config-db-schema.md` — `sp_PublishGeneration` + `sp_ComputeGenerationDiff`
 - `docs/v2/admin-ui.md` — DiffViewer + draft-revision-token flow

docs/OpcUaServer.md

@@ -1,14 +1,14 @@
 # OPC UA Server
 
-The OPC UA server component (`src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/OtOpcUaServer.cs`) hosts the OPC UA stack and exposes one browsable subtree per registered driver. The server itself is driver-agnostic — Galaxy/MXAccess, Modbus, S7, AB CIP, AB Legacy, TwinCAT, FOCAS, and OPC UA Client are all plugged in as `IDriver` implementations via the capability interfaces in `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/`.
+The OPC UA server component (`src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/OtOpcUaServer.cs`) hosts the OPC UA stack and exposes one browsable subtree per registered driver. The server itself is driver-agnostic — Galaxy/MXAccess, Modbus, S7, AB CIP, AB Legacy, TwinCAT, FOCAS, and OPC UA Client are all plugged in as `IDriver` implementations via the capability interfaces in `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/`.
 
 ## Composition
 
 `OtOpcUaServer` subclasses the OPC Foundation `StandardServer` and wires:
 
-- A `DriverHost` (`src/ZB.MOM.WW.OtOpcUa.Core/Hosting/DriverHost.cs`) which registers drivers and holds the per-instance `IDriver` references.
-- One `DriverNodeManager` per registered driver (`src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs`), constructed in `CreateMasterNodeManager`. Each manager owns its own namespace URI (`urn:OtOpcUa:{DriverInstanceId}`) and exposes the driver as a subtree under the standard `Objects` folder.
-- A `CapabilityInvoker` (`src/ZB.MOM.WW.OtOpcUa.Core/Resilience/CapabilityInvoker.cs`) per driver instance, keyed on `(DriverInstanceId, HostName, DriverCapability)` against the shared `DriverResiliencePipelineBuilder`. Every Read/Write/Discovery/Subscribe/HistoryRead/AlarmSubscribe call on the driver flows through this invoker so the Polly pipeline (retry / timeout / breaker / bulkhead) applies. The OTOPCUA0001 Roslyn analyzer enforces the wrapping at compile time.
+- A `DriverHost` (`src/Core/ZB.MOM.WW.OtOpcUa.Core/Hosting/DriverHost.cs`) which registers drivers and holds the per-instance `IDriver` references.
+- One `DriverNodeManager` per registered driver (`src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs`), constructed in `CreateMasterNodeManager`. Each manager owns its own namespace URI (`urn:OtOpcUa:{DriverInstanceId}`) and exposes the driver as a subtree under the standard `Objects` folder.
+- A `CapabilityInvoker` (`src/Core/ZB.MOM.WW.OtOpcUa.Core/Resilience/CapabilityInvoker.cs`) per driver instance, keyed on `(DriverInstanceId, HostName, DriverCapability)` against the shared `DriverResiliencePipelineBuilder`. Every Read/Write/Discovery/Subscribe/HistoryRead/AlarmSubscribe call on the driver flows through this invoker so the Polly pipeline (retry / timeout / breaker / bulkhead) applies. The OTOPCUA0001 Roslyn analyzer enforces the wrapping at compile time.
 - An `IUserAuthenticator` (LDAP in production, injected stub in tests) for `UserName` token validation in the `ImpersonateUser` hook.
 - Optional `AuthorizationGate` + `NodeScopeResolver` (Phase 6.2) that sit in front of every dispatch call. In lax mode the gate passes through when the identity lacks LDAP groups so existing integration tests keep working; strict mode (`Authorization:StrictMode = true`) denies those cases.
 
@@ -50,7 +50,7 @@ The host name fed to the invoker comes from `IPerCallHostResolver.ResolveHost(fu
 
 ## Redundancy
 
-`Redundancy.Enabled = true` on the `ServerInstance` activates the `RedundancyCoordinator` + `ServiceLevelCalculator` (`src/ZB.MOM.WW.OtOpcUa.Server/Redundancy/`). Standard OPC UA redundancy nodes (`Server/ServerRedundancy/RedundancySupport`, `ServerUriArray`, `Server/ServiceLevel`) are populated on startup; `ServiceLevel` recomputes whenever any driver's `DriverHealth` changes. The apply-lease mechanism prevents two instances from concurrently applying a generation. See `docs/Redundancy.md`.
+`Redundancy.Enabled = true` on the `ServerInstance` activates the `RedundancyCoordinator` + `ServiceLevelCalculator` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/Redundancy/`). Standard OPC UA redundancy nodes (`Server/ServerRedundancy/RedundancySupport`, `ServerUriArray`, `Server/ServiceLevel`) are populated on startup; `ServiceLevel` recomputes whenever any driver's `DriverHealth` changes. The apply-lease mechanism prevents two instances from concurrently applying a generation. See `docs/Redundancy.md`.
 
 ## Server class hierarchy
 
@@ -79,10 +79,10 @@ Certificate stores default to `%LOCALAPPDATA%\OPC Foundation\pki\` (directory-ba
 
 ## Key source files
 
-- `src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/OtOpcUaServer.cs` — `StandardServer` subclass + `ImpersonateUser` hook
-- `src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs` — per-driver `CustomNodeManager2` + dispatch surface
-- `src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/OpcUaApplicationHost.cs` — programmatic `ApplicationConfiguration` + lifecycle
-- `src/ZB.MOM.WW.OtOpcUa.Core/Hosting/DriverHost.cs` — driver registration
-- `src/ZB.MOM.WW.OtOpcUa.Core/Resilience/CapabilityInvoker.cs` — Polly pipeline entry point
-- `src/ZB.MOM.WW.OtOpcUa.Core/Authorization/` — Phase 6.2 permission trie + evaluator
-- `src/ZB.MOM.WW.OtOpcUa.Server/Security/AuthorizationGate.cs` — stack-to-evaluator bridge
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/OtOpcUaServer.cs` — `StandardServer` subclass + `ImpersonateUser` hook
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs` — per-driver `CustomNodeManager2` + dispatch surface
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/OpcUaApplicationHost.cs` — programmatic `ApplicationConfiguration` + lifecycle
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core/Hosting/DriverHost.cs` — driver registration
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core/Resilience/CapabilityInvoker.cs` — Polly pipeline entry point
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core/Authorization/` — Phase 6.2 permission trie + evaluator
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/Security/AuthorizationGate.cs` — stack-to-evaluator bridge

docs/README.md

@@ -11,9 +11,8 @@ The project was originally called **LmxOpcUa** (a single-driver Galaxy/MXAccess
 
 - **Core** owns the OPC UA stack, address space, session/security/subscription machinery.
 - **Drivers** plug in via capability interfaces in `ZB.MOM.WW.OtOpcUa.Core.Abstractions`: `IDriver`, `IReadable`, `IWritable`, `ITagDiscovery`, `ISubscribable`, `IHostConnectivityProbe`, `IAlarmSource`, `IHistoryProvider`, `IPerCallHostResolver`. Each driver opts into whichever it supports.
-- **Server** is the OPC UA endpoint process (net10, x64). Hosts every driver except Galaxy in-process; talks to Galaxy via a named pipe because MXAccess COM is 32-bit-only.
+- **Server** is the OPC UA endpoint process (net10, AnyCPU). Hosts every driver in-process. The Galaxy driver reaches MXAccess via gRPC to a separately-installed **mxaccessgw** sidecar (sibling repo); it is no longer hosted from this repo.
 - **Admin** is the Blazor Server operator UI (net10, x64). Owns the Config DB draft/publish flow, ACL + role-grant authoring, fleet status + `/metrics` scrape endpoint.
-- **Galaxy.Host** is a .NET Framework 4.8 x86 Windows service that wraps MXAccess COM on an STA thread for the Galaxy driver.
 
 ## Where to find what
 
@@ -24,11 +23,11 @@ The project was originally called **LmxOpcUa** (a single-driver Galaxy/MXAccess
 | [OpcUaServer.md](OpcUaServer.md) | Top-level server architecture — Core, driver dispatch, Config DB, generations |
 | [AddressSpace.md](AddressSpace.md) | `GenericDriverNodeManager` + `ITagDiscovery` + `IAddressSpaceBuilder` |
 | [ReadWriteOperations.md](ReadWriteOperations.md) | OPC UA Read/Write → `CapabilityInvoker` → `IReadable`/`IWritable` |
-| [Subscriptions.md](Subscriptions.md) | Monitored items → `ISubscribable` + per-driver subscription refcount |
-| [AlarmTracking.md](AlarmTracking.md) | `IAlarmSource` + `AlarmSurfaceInvoker` + OPC UA alarm conditions |
-| [DataTypeMapping.md](DataTypeMapping.md) | Per-driver `DriverAttributeInfo` → OPC UA variable types |
+| [Subscriptions.md](v1/Subscriptions.md) | Monitored items → `ISubscribable` + per-driver subscription refcount (v1 archive) |
+| [AlarmTracking.md](v1/AlarmTracking.md) | `IAlarmSource` + `AlarmSurfaceInvoker` + OPC UA alarm conditions (v1 archive) |
+| [DataTypeMapping.md](v1/DataTypeMapping.md) | Per-driver `DriverAttributeInfo` → OPC UA variable types (v1 archive — live mapping is in `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/Browse/DataTypeMap.cs`) |
 | [IncrementalSync.md](IncrementalSync.md) | Address-space rebuild on redeploy + `sp_ComputeGenerationDiff` |
-| [HistoricalDataAccess.md](HistoricalDataAccess.md) | `IHistoryProvider` as a per-driver optional capability |
+| [HistoricalDataAccess.md](v1/HistoricalDataAccess.md) | `IHistoryProvider` as a per-driver optional capability (v1 archive) |
 | [VirtualTags.md](VirtualTags.md) | `Core.Scripting` + `Core.VirtualTags` — Roslyn script sandbox, engine, dispatch alongside driver tags |
 | [ScriptedAlarms.md](ScriptedAlarms.md) | `Core.ScriptedAlarms` — script-predicate `IAlarmSource` + Part 9 state machine |
 
@@ -36,7 +35,7 @@ Two Core subsystems are shipped without a dedicated top-level doc; see the secti
 
 | Project | See |
 |---------|-----|
-| `Core.AlarmHistorian` | [AlarmTracking.md](AlarmTracking.md) § Alarm historian sink |
+| `Core.AlarmHistorian` | [AlarmTracking.md](v1/AlarmTracking.md) § Alarm historian sink (v1 archive) |
 | `Analyzers` (Roslyn OTOPCUA0001) | [security.md](security.md) § OTOPCUA0001 Analyzer |
 
 ### Drivers
@@ -44,8 +43,8 @@ Two Core subsystems are shipped without a dedicated top-level doc; see the secti
 | Doc | Covers |
 |-----|--------|
 | [drivers/README.md](drivers/README.md) | Index of the eight shipped drivers + capability matrix |
-| [drivers/Galaxy.md](drivers/Galaxy.md) | Galaxy driver — MXAccess bridge, Host/Proxy split, named-pipe IPC |
-| [drivers/Galaxy-Repository.md](drivers/Galaxy-Repository.md) | Galaxy-specific discovery via the ZB SQL database |
+| [drivers/Galaxy.md](drivers/Galaxy.md) | Galaxy driver — in-process gRPC client to the mxaccessgw sidecar |
+| [v1/drivers/Galaxy-Repository.md](v1/drivers/Galaxy-Repository.md) | Galaxy-specific discovery via the ZB SQL database (v1 archive — the gateway owns this path now) |
 
 For Modbus / S7 / AB CIP / AB Legacy / TwinCAT / FOCAS / OPC UA Client specifics, see [v2/driver-specs.md](v2/driver-specs.md).
 
@@ -53,10 +52,10 @@ For Modbus / S7 / AB CIP / AB Legacy / TwinCAT / FOCAS / OPC UA Client specifics
 
 | Doc | Covers |
 |-----|--------|
-| [Configuration.md](Configuration.md) | appsettings bootstrap + Config DB + Admin UI draft/publish |
+| [Configuration.md](v1/Configuration.md) | appsettings bootstrap + Config DB + Admin UI draft/publish (v1 archive — `OTOPCUA_GALAXY_*` env vars now live in mxaccessgw config) |
 | [security.md](security.md) | Transport security profiles, LDAP auth, ACL trie, role grants, OTOPCUA0001 analyzer |
 | [Redundancy.md](Redundancy.md) | `RedundancyCoordinator`, `ServiceLevelCalculator`, apply-lease, Prometheus metrics |
-| [ServiceHosting.md](ServiceHosting.md) | Three-process deploy (Server + Admin + Galaxy.Host) install/uninstall |
+| [ServiceHosting.md](ServiceHosting.md) | Two-process deploy (Server + Admin) install/uninstall, plus the optional `OtOpcUaWonderwareHistorian` sidecar |
 | [StatusDashboard.md](StatusDashboard.md) | Pointer — superseded by [v2/admin-ui.md](v2/admin-ui.md) |
 
 ### Client tooling
@@ -79,10 +78,10 @@ For Modbus / S7 / AB CIP / AB Legacy / TwinCAT / FOCAS / OPC UA Client specifics
 |-----|--------|
 | [reqs/HighLevelReqs.md](reqs/HighLevelReqs.md) | HLRs — numbered system-level requirements |
 | [reqs/OpcUaServerReqs.md](reqs/OpcUaServerReqs.md) | OPC UA server-layer reqs |
-| [reqs/ServiceHostReqs.md](reqs/ServiceHostReqs.md) | Per-process hosting reqs |
+| [v1/reqs/ServiceHostReqs.md](v1/reqs/ServiceHostReqs.md) | Per-process hosting reqs (v1 archive — only `OtOpcUa` server hosting remains in scope post-PR-7.2) |
 | [reqs/ClientRequirements.md](reqs/ClientRequirements.md) | Client CLI + UI reqs |
-| [reqs/GalaxyRepositoryReqs.md](reqs/GalaxyRepositoryReqs.md) | Galaxy-scoped repository reqs |
-| [reqs/MxAccessClientReqs.md](reqs/MxAccessClientReqs.md) | Galaxy-scoped MXAccess reqs |
+| [v1/reqs/GalaxyRepositoryReqs.md](v1/reqs/GalaxyRepositoryReqs.md) | Galaxy-scoped repository reqs (v1 archive — owned by mxaccessgw today) |
+| [v1/reqs/MxAccessClientReqs.md](v1/reqs/MxAccessClientReqs.md) | Galaxy-scoped MXAccess reqs (v1 archive — owned by mxaccessgw today) |
 | [reqs/StatusDashboardReqs.md](reqs/StatusDashboardReqs.md) | Pointer — superseded by Admin UI |
 
 ## Implementation history (`docs/v2/`)
@@ -96,4 +95,11 @@ Design decisions + phase plans + execution notes. Load-bearing cross-references
 - [v2/driver-specs.md](v2/driver-specs.md) — per-driver addressing + quirks for every shipped protocol
 - [v2/dev-environment.md](v2/dev-environment.md) — dev-box bootstrap
 - [v2/test-data-sources.md](v2/test-data-sources.md) — integration-test simulator matrix (includes the pinned libplctag `ab_server` version for AB CIP tests)
+- [v2/multi-host-dispatch.md](v2/multi-host-dispatch.md) — per-PLC circuit breakers (Phase 6.1 decision #144)
+- [v2/v2-release-readiness.md](v2/v2-release-readiness.md) — release-readiness tracker
+- [v2/lmx-followups.md](v2/lmx-followups.md) — historical Galaxy-bridge follow-ups (pre-PR-7.2)
 - [v2/implementation/phase-*-*.md](v2/implementation/) — per-phase execution plans with exit-gate evidence
+
+## v1 archive
+
+The v1 in-process MXAccess architecture (Galaxy.Host + Galaxy.Proxy + Galaxy.Shared, .NET 4.8 x86 COM, the `OtOpcUaGalaxyHost` Windows service) was retired in PR 7.2 (2026-04-30, commit `ae7106d`). Docs that described that shape are kept under [v1/](v1/) as historical record — see [v1/README.md](v1/README.md) for the index.

docs/ReadWriteOperations.md

@@ -1,13 +1,13 @@
 # Read/Write Operations
 
-`DriverNodeManager` (`src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs`) wires the OPC UA stack's per-variable `OnReadValue` and `OnWriteValue` hooks to each driver's `IReadable` and `IWritable` capabilities. Every dispatch flows through `CapabilityInvoker` so the Polly pipeline (retry / timeout / breaker / bulkhead) applies uniformly across Galaxy, Modbus, S7, AB CIP, AB Legacy, TwinCAT, FOCAS, and OPC UA Client drivers.
+`DriverNodeManager` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs`) wires the OPC UA stack's per-variable `OnReadValue` and `OnWriteValue` hooks to each driver's `IReadable` and `IWritable` capabilities. Every dispatch flows through `CapabilityInvoker` so the Polly pipeline (retry / timeout / breaker / bulkhead) applies uniformly across Galaxy, Modbus, S7, AB CIP, AB Legacy, TwinCAT, FOCAS, and OPC UA Client drivers.
 
 ## Driver vs virtual dispatch
 
-Per [ADR-002](v2/implementation/adr-002-driver-vs-virtual-dispatch.md), a single `DriverNodeManager` routes reads and writes across both driver-sourced and virtual (scripted) tags. At discovery time each variable registers a `NodeSourceKind` (`src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverAttributeInfo.cs`) in the manager's `_sourceByFullRef` lookup; the read/write hooks pattern-match on that value to pick the backend:
+Per [ADR-002](v2/implementation/adr-002-driver-vs-virtual-dispatch.md), a single `DriverNodeManager` routes reads and writes across both driver-sourced and virtual (scripted) tags. At discovery time each variable registers a `NodeSourceKind` (`src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverAttributeInfo.cs`) in the manager's `_sourceByFullRef` lookup; the read/write hooks pattern-match on that value to pick the backend:
 
 - `NodeSourceKind.Driver` — dispatches to the driver's `IReadable` / `IWritable` through `CapabilityInvoker` (the rest of this doc).
-- `NodeSourceKind.Virtual` — dispatches to `VirtualTagSource` (`src/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/VirtualTagSource.cs`), which wraps `VirtualTagEngine`. Writes are rejected with `BadUserAccessDenied` before the branch per Phase 7 decision #6 — scripts are the only write path into virtual tags.
+- `NodeSourceKind.Virtual` — dispatches to `VirtualTagSource` (`src/Core/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/VirtualTagSource.cs`), which wraps `VirtualTagEngine`. Writes are rejected with `BadUserAccessDenied` before the branch per Phase 7 decision #6 — scripts are the only write path into virtual tags.
 - `NodeSourceKind.ScriptedAlarm` — dispatches to the Phase 7 `ScriptedAlarmReadable` shim.
 
 ACL enforcement (`WriteAuthzPolicy` + `AuthorizationGate`) runs before the source branch, so the gates below apply uniformly to all three source kinds.
@@ -60,8 +60,8 @@ Per decision #12, exceptions in the driver's capability call are logged and conv
 
 ## Key source files
 
-- `src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs` — `OnReadValue` / `OnWriteValue` hooks
-- `src/ZB.MOM.WW.OtOpcUa.Server/Security/WriteAuthzPolicy.cs` — classification-to-role policy
-- `src/ZB.MOM.WW.OtOpcUa.Server/Security/AuthorizationGate.cs` — Phase 6.2 trie gate
-- `src/ZB.MOM.WW.OtOpcUa.Core/Resilience/CapabilityInvoker.cs` — `ExecuteAsync` / `ExecuteWriteAsync`
-- `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IReadable.cs`, `IWritable.cs`, `WriteIdempotentAttribute.cs`
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs` — `OnReadValue` / `OnWriteValue` hooks
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/Security/WriteAuthzPolicy.cs` — classification-to-role policy
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/Security/AuthorizationGate.cs` — Phase 6.2 trie gate
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core/Resilience/CapabilityInvoker.cs` — `ExecuteAsync` / `ExecuteWriteAsync`
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IReadable.cs`, `IWritable.cs`, `WriteIdempotentAttribute.cs`

docs/Redundancy.md

@@ -4,7 +4,7 @@
 
 OtOpcUa supports OPC UA **non-transparent** warm/hot redundancy. Two (or more) OtOpcUa Server processes run side-by-side, share the same Config DB, the same driver backends (Galaxy ZB, MXAccess runtime, remote PLCs), and advertise the same OPC UA node tree. Each process owns a distinct `ApplicationUri`; OPC UA clients see both endpoints via the standard `ServerUriArray` and pick one based on the `ServiceLevel` that each server publishes.
 
-The redundancy surface lives in `src/ZB.MOM.WW.OtOpcUa.Server/Redundancy/`:
+The redundancy surface lives in `src/Server/ZB.MOM.WW.OtOpcUa.Server/Redundancy/`:
 
 | Class | Role |
 |---|---|
@@ -18,7 +18,7 @@ The redundancy surface lives in `src/ZB.MOM.WW.OtOpcUa.Server/Redundancy/`:
 
 ## Data model
 
-Per-node redundancy state lives in the Config DB `ClusterNode` table (`src/ZB.MOM.WW.OtOpcUa.Configuration/Entities/ClusterNode.cs`):
+Per-node redundancy state lives in the Config DB `ClusterNode` table (`src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/ClusterNode.cs`):
 
 | Column | Role |
 |---|---|
@@ -64,7 +64,7 @@ Because role transitions are **operator-driven** (write `RedundancyRole` in the
 
 ## Metrics
 
-`RedundancyMetrics` in `src/ZB.MOM.WW.OtOpcUa.Admin/Services/RedundancyMetrics.cs` registers the `ZB.MOM.WW.OtOpcUa.Redundancy` meter on the Admin process. Instruments:
+`RedundancyMetrics` in `src/Server/ZB.MOM.WW.OtOpcUa.Admin/Services/RedundancyMetrics.cs` registers the `ZB.MOM.WW.OtOpcUa.Redundancy` meter on the Admin process. Instruments:
 
 | Name | Kind | Tags | Description |
 |---|---|---|---|
@@ -77,7 +77,7 @@ Admin `Program.cs` wires OpenTelemetry to the Prometheus exporter when `Metrics:
 
 ## Real-time notifications (Admin UI)
 
-`FleetStatusPoller` in `src/ZB.MOM.WW.OtOpcUa.Admin/Hubs/` polls the `ClusterNode` table, records role transitions, updates `RedundancyMetrics.SetClusterCounts`, and pushes a `RoleChanged` SignalR event onto `FleetStatusHub` when a transition is observed. `RedundancyTab.razor` subscribes with `_hub.On<RoleChangedMessage>("RoleChanged", …)` so connected Admin sessions see role swaps the moment they happen.
+`FleetStatusPoller` in `src/Server/ZB.MOM.WW.OtOpcUa.Admin/Hubs/` polls the `ClusterNode` table, records role transitions, updates `RedundancyMetrics.SetClusterCounts`, and pushes a `RoleChanged` SignalR event onto `FleetStatusHub` when a transition is observed. `RedundancyTab.razor` subscribes with `_hub.On<RoleChangedMessage>("RoleChanged", …)` so connected Admin sessions see role swaps the moment they happen.
 
 ## Configuring a redundant pair
 
@@ -96,7 +96,7 @@ Role swaps, stand-alone promotions, and base-level adjustments all happen throug
 
 ## Client-side failover
 
-The OtOpcUa Client CLI at `src/ZB.MOM.WW.OtOpcUa.Client.CLI` supports `-F` / `--failover-urls` for automatic client-side failover; for long-running subscriptions the CLI monitors session KeepAlive and reconnects to the next available server, recreating the subscription on the new endpoint. See [`Client.CLI.md`](Client.CLI.md) for the command reference.
+The OtOpcUa Client CLI at `src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI` supports `-F` / `--failover-urls` for automatic client-side failover; for long-running subscriptions the CLI monitors session KeepAlive and reconnects to the next available server, recreating the subscription on the new endpoint. See [`Client.CLI.md`](Client.CLI.md) for the command reference.
 
 ## Depth reference
 

docs/ScriptedAlarms.md

@@ -6,7 +6,7 @@ This file covers the engine internals — predicate evaluation, state machine, p
 
 ## Definition shape
 
-`ScriptedAlarmDefinition` (`src/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/ScriptedAlarmDefinition.cs`) is the runtime contract the engine consumes. The generation-publish path materialises these from the `ScriptedAlarm` + `Script` config tables via `Phase7EngineComposer.ProjectScriptedAlarms`.
+`ScriptedAlarmDefinition` (`src/Core/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/ScriptedAlarmDefinition.cs`) is the runtime contract the engine consumes. The generation-publish path materialises these from the `ScriptedAlarm` + `Script` config tables via `Phase7EngineComposer.ProjectScriptedAlarms`.
 
 | Field | Notes |
 |---|---|
@@ -100,26 +100,26 @@ Emissions map into `AlarmEventArgs` as `AlarmType = Kind.ToString()`, `SourceNod
 
 ## Composition
 
-`Phase7EngineComposer.Compose` (`src/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7EngineComposer.cs`) is the single call site that instantiates the engine. It takes the generation's `Script` / `VirtualTag` / `ScriptedAlarm` rows, the shared `CachedTagUpstreamSource`, an `IAlarmStateStore`, and an `IAlarmHistorianSink`, and returns a `Phase7ComposedSources` the caller owns. When `scriptedAlarms.Count > 0`:
+`Phase7EngineComposer.Compose` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7EngineComposer.cs`) is the single call site that instantiates the engine. It takes the generation's `Script` / `VirtualTag` / `ScriptedAlarm` rows, the shared `CachedTagUpstreamSource`, an `IAlarmStateStore`, and an `IAlarmHistorianSink`, and returns a `Phase7ComposedSources` the caller owns. When `scriptedAlarms.Count > 0`:
 
 1. `ProjectScriptedAlarms` resolves each row's `PredicateScriptId` against the script dictionary and produces a `ScriptedAlarmDefinition` list. Unknown or disabled scripts throw immediately — the DB publish guarantees referential integrity but this is a belt-and-braces check.
 2. A `ScriptedAlarmEngine` is constructed with the upstream source, the store, a shared `ScriptLoggerFactory` keyed to `scripts-*.log`, and the root Serilog logger.
 3. `alarmEngine.OnEvent` is wired to `RouteToHistorianAsync`, which projects each emission into an `AlarmHistorianEvent` and enqueues it on the sink. Fire-and-forget — the SQLite store-and-forward sink is already non-blocking.
 4. `LoadAsync(alarmDefs)` runs synchronously on the startup thread: it compiles every predicate, subscribes to the union of predicate inputs and message-template tokens, seeds the value cache, loads persisted state, re-derives `ActiveState` from a fresh predicate evaluation, and starts the 5s shelving timer. Compile failures are aggregated into one `InvalidOperationException` so operators see every bad predicate in one startup log line rather than one at a time.
-5. A `ScriptedAlarmSource` is created for the event stream, and a `ScriptedAlarmReadable` (`src/ZB.MOM.WW.OtOpcUa.Server/Phase7/ScriptedAlarmReadable.cs`) is created for OPC UA variable reads on the alarm's active-state node (task #245) — unknown alarm ids return `BadNodeIdUnknown` rather than silently reading `false`.
+5. A `ScriptedAlarmSource` is created for the event stream, and a `ScriptedAlarmReadable` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/ScriptedAlarmReadable.cs`) is created for OPC UA variable reads on the alarm's active-state node (task #245) — unknown alarm ids return `BadNodeIdUnknown` rather than silently reading `false`.
 
 Both engine and source are added to `Phase7ComposedSources.Disposables`, which `Phase7Composer` disposes on server shutdown.
 
 ## Key source files
 
-- `src/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/ScriptedAlarmEngine.cs` — orchestrator, cascade wiring, shelving timer, `OnEvent` emission
-- `src/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/ScriptedAlarmSource.cs` — `IAlarmSource` adapter over the engine
-- `src/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/ScriptedAlarmDefinition.cs` — runtime definition record
-- `src/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/Part9StateMachine.cs` — pure-function state machine + `TransitionResult` / `EmissionKind`
-- `src/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/AlarmConditionState.cs` — persisted state record + `AlarmComment` audit entry + `ShelvingState`
-- `src/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/AlarmPredicateContext.cs` — script-side `ScriptContext` (read-only, write rejected)
-- `src/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/AlarmTypes.cs` — `AlarmKind` + the four Part 9 enums
-- `src/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/MessageTemplate.cs` — `{path}` placeholder resolver
-- `src/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/IAlarmStateStore.cs` — persistence contract + `InMemoryAlarmStateStore` default
-- `src/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7EngineComposer.cs` — composition, config-row projection, historian routing
-- `src/ZB.MOM.WW.OtOpcUa.Server/Phase7/ScriptedAlarmReadable.cs` — `IReadable` adapter exposing `ActiveState` to OPC UA variable reads
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/ScriptedAlarmEngine.cs` — orchestrator, cascade wiring, shelving timer, `OnEvent` emission
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/ScriptedAlarmSource.cs` — `IAlarmSource` adapter over the engine
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/ScriptedAlarmDefinition.cs` — runtime definition record
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/Part9StateMachine.cs` — pure-function state machine + `TransitionResult` / `EmissionKind`
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/AlarmConditionState.cs` — persisted state record + `AlarmComment` audit entry + `ShelvingState`
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/AlarmPredicateContext.cs` — script-side `ScriptContext` (read-only, write rejected)
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/AlarmTypes.cs` — `AlarmKind` + the four Part 9 enums
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/MessageTemplate.cs` — `{path}` placeholder resolver
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.ScriptedAlarms/IAlarmStateStore.cs` — persistence contract + `InMemoryAlarmStateStore` default
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7EngineComposer.cs` — composition, config-row projection, historian routing
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/ScriptedAlarmReadable.cs` — `IReadable` adapter exposing `ActiveState` to OPC UA variable reads

docs/ServiceHosting.md

@@ -2,132 +2,61 @@
 
 ## Overview
 
-A production OtOpcUa deployment runs **three processes**, each with a distinct runtime, platform target, and install surface:
+A production OtOpcUa deployment runs **two or three processes**, each
+with a distinct runtime and install surface:
 
 | Process | Project | Runtime | Platform | Responsibility |
 |---|---|---|---|---|
-| **OtOpcUa Server** | `src/ZB.MOM.WW.OtOpcUa.Server` | .NET 10 | x64 | Hosts the OPC UA endpoint; loads every non-Galaxy driver in-process; exposes `/healthz`. |
-| **OtOpcUa Admin** | `src/ZB.MOM.WW.OtOpcUa.Admin` | .NET 10 (ASP.NET Core / Blazor Server) | x64 | Operator UI for Config DB editing + fleet status, SignalR hubs (`FleetStatusHub`, `AlertHub`), Prometheus `/metrics`. |
-| **OtOpcUa Galaxy.Host** | `src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host` | .NET Framework 4.8 | x86 (32-bit) | Hosts MXAccess COM on a dedicated STA thread with a Win32 message pump; exposes a named-pipe IPC surface consumed by `Driver.Galaxy.Proxy` inside the Server process. |
+| **OtOpcUa Server** | `src/Server/ZB.MOM.WW.OtOpcUa.Server` | .NET 10 | x64 | Hosts the OPC UA endpoint; loads every driver in-process (Modbus, S7, AbCip, AbLegacy, TwinCAT, FOCAS, OPC UA Client, Galaxy via mxaccessgw); exposes `/healthz`. |
+| **OtOpcUa Admin** | `src/Server/ZB.MOM.WW.OtOpcUa.Admin` | .NET 10 (ASP.NET Core / Blazor Server) | x64 | Operator UI for Config DB editing + fleet status, SignalR hubs (`FleetStatusHub`, `AlertHub`), Prometheus `/metrics`. |
+| **OtOpcUa Wonderware Historian** *(optional)* | `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware` | .NET Framework 4.8 | x86 (32-bit) | Out-of-process sidecar exposing the Wonderware Historian SDK over a named pipe. Required only when `Historian:Wonderware:Enabled=true` in `appsettings.json`. |
 
-The x86 / .NET Framework 4.8 constraint applies **only** to Galaxy.Host because the MXAccess toolkit DLLs (`Program Files (x86)\ArchestrA\Framework\bin`) are 32-bit-only COM. Every other driver (Modbus, S7, OpcUaClient, AbCip, AbLegacy, TwinCAT, FOCAS) runs in-process in the 64-bit Server.
+Galaxy access uses a separately-installed **mxaccessgw** running out
+of a sibling repo (`c:\Users\dohertj2\Desktop\mxaccessgw\`) — see
+`docs/v2/Galaxy.ParityRig.md` for setup. The mxaccessgw owns the
+MXAccess COM bitness constraint (its worker is x86 net48); nothing
+in the OtOpcUa repo carries that constraint anymore. PR 7.2 retired
+the legacy in-process `Galaxy.Host` / `Galaxy.Proxy` / `Galaxy.Shared`
+projects + the `OtOpcUaGalaxyHost` Windows service.
 
-## Server process
+## OtOpcUa Server
 
-`src/ZB.MOM.WW.OtOpcUa.Server/Program.cs` uses the generic host:
+Hosted via `Microsoft.Extensions.Hosting` with `AddWindowsService`
+(decision #30 — replaced TopShelf in v2). The host's `Build()`
+returns immediately when launched interactively (e.g. `dotnet run`)
+but blocks for SCM signals when running as a Windows service.
 
-```csharp
-var builder = Host.CreateApplicationBuilder(args);
-builder.Services.AddSerilog();
-builder.Services.AddWindowsService(o => o.ServiceName = "OtOpcUa");
-…
-builder.Services.AddHostedService<OpcUaServerService>();
-builder.Services.AddHostedService<HostStatusPublisher>();
-```
+In-process drivers are registered at startup in `Program.cs`'s
+`DriverFactoryRegistry` block; the `DriverInstance` rows in the
+central Config DB select which driver factories materialise into
+live `IDriver` instances. See `docs/v2/driver-specs.md` for the
+per-driver `DriverConfig` JSON shapes.
 
-`OpcUaServerService` is a `BackgroundService` (decision #30 — TopShelf from v1 was replaced by the generic-host `AddWindowsService` wrapper; no TopShelf dependency remains in any csproj). It owns:
+## OtOpcUa Admin
 
-1. Config bootstrap — reads `Node:NodeId`, `Node:ClusterId`, `Node:ConfigDbConnectionString`, `Node:LocalCachePath` from `appsettings.json`.
-2. `NodeBootstrap` — pulls the latest published generation from the Config DB into the LiteDB local cache (`LiteDbConfigCache`) so the node starts even if the central DB is briefly unreachable.
-3. `DriverHost` — instantiates configured driver instances from the generation, wires each through `CapabilityInvoker` resilience pipelines.
-4. `OpcUaApplicationHost` — builds the OPC UA endpoint, applies `OpcUaServerOptions` + `LdapOptions`, registers `AuthorizationGate` at dispatch.
-5. `HostStatusPublisher` — a second hosted service that heartbeats `DriverHostStatus` rows so the Admin UI Fleet view sees the node.
+Same hosting model; runs the Blazor Server UI + SignalR hubs.
+Reads from the same Config DB the Server writes to.
 
-### Installation
+## OtOpcUa Wonderware Historian (optional)
 
-Same executable, different modes driven by the .NET generic-host `AddWindowsService` wrapper:
+When `Historian:Wonderware:Enabled=true`, the Server speaks to a
+sidecar that wraps the Wonderware Historian SDK (which is .NET
+Framework only). The pipe IPC contract is in
+`src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Client/Contracts/`
+and the sidecar's pipe handler lives at
+`src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Pipe/`.
 
-| Mode | Invocation |
-|---|---|
-| Console | `ZB.MOM.WW.OtOpcUa.Server.exe` |
-| Install as Windows service | `sc create OtOpcUa binPath="C:\Program Files\OtOpcUa\Server\ZB.MOM.WW.OtOpcUa.Server.exe" start=auto` |
-| Start | `sc start OtOpcUa` |
-| Stop | `sc stop OtOpcUa` |
-| Uninstall | `sc delete OtOpcUa` |
+Install via the `-InstallWonderwareHistorian` switch on
+`scripts/install/Install-Services.ps1`.
 
-### Health endpoints
+## Install / Uninstall
 
-The Server exposes `/healthz` + `/readyz` used by (a) the Admin `FleetStatusPoller` as input to Fleet status and (b) `PeerReachabilityTracker` in a peer Server process as the HTTP side of the peer-reachability probe.
+- `scripts/install/Install-Services.ps1` — installs `OtOpcUa` and
+  optionally `OtOpcUaWonderwareHistorian`.
+- `scripts/install/Uninstall-Services.ps1` — stops + removes both,
+  plus `OtOpcUaGalaxyHost` if a pre-7.2 rig still carries it.
 
-## Admin process
+## Logging
 
-`src/ZB.MOM.WW.OtOpcUa.Admin/Program.cs` is a stock `WebApplication`. Highlights:
-
-- Cookie auth (`CookieAuthenticationDefaults`, scheme name `OtOpcUa.Admin`) + Blazor Server (`AddInteractiveServerComponents`) + SignalR.
-- Authorization policies gated by `AdminRoles`: `ConfigViewer`, `ConfigEditor`, `FleetAdmin` (see `Services/AdminRoles.cs`). `CanEdit` policy requires `ConfigEditor` or `FleetAdmin`; `CanPublish` requires `FleetAdmin`.
-- `OtOpcUaConfigDbContext` registered against `ConnectionStrings:ConfigDb`.
-- Scoped services: `ClusterService`, `GenerationService`, `EquipmentService`, `UnsService`, `NamespaceService`, `DriverInstanceService`, `NodeAclService`, `PermissionProbeService`, `AclChangeNotifier`, `ReservationService`, `DraftValidationService`, `AuditLogService`, `HostStatusService`, `ClusterNodeService`, `EquipmentImportBatchService`, `ILdapGroupRoleMappingService`.
-- Singleton `RedundancyMetrics` (meter name `ZB.MOM.WW.OtOpcUa.Redundancy`) + `CertTrustService` (promotes rejected client certs in the Server's PKI store to trusted via the Admin Certificates page).
-- `LdapAuthService` bound to `Authentication:Ldap` — same LDAP flow as ScadaLink CentralUI for visual parity.
-- SignalR hubs mapped at `/hubs/fleet` and `/hubs/alerts`; `FleetStatusPoller` runs as a hosted service and pushes `RoleChanged`, host status, and alert events.
-- OpenTelemetry → Prometheus exporter at `/metrics` when `Metrics:Prometheus:Enabled=true` (default). Pull-based means no Collector required in the common K8s deploy.
-
-### Installation
-
-Deployed as an ASP.NET Core service; the generic-host `AddWindowsService` wrapper (or IIS reverse-proxy for multi-node fleets) provides install/uninstall. Listens on whatever `ASPNETCORE_URLS` specifies.
-
-## Galaxy.Host process
-
-`src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Program.cs` is a .NET Framework 4.8 x86 console executable. Configuration comes from environment variables supplied by the supervisor (`Driver.Galaxy.Proxy.Supervisor`):
-
-| Env var | Purpose |
-|---|---|
-| `OTOPCUA_GALAXY_PIPE` | Pipe name the host listens on (default `OtOpcUaGalaxy`). |
-| `OTOPCUA_ALLOWED_SID` | SID of the Server process's principal; anyone else is refused during the handshake. |
-| `OTOPCUA_GALAXY_SECRET` | Per-spawn shared secret the client must present in the Hello frame. |
-| `OTOPCUA_GALAXY_BACKEND` | `mxaccess` (default), `db` (ZB-only, no COM), `stub` (in-memory; for tests). |
-| `OTOPCUA_GALAXY_ZB_CONN` | SQL connection string to the ZB Galaxy repository. |
-| `OTOPCUA_HISTORIAN_*` | Optional Wonderware Historian SDK config if Historian is enabled for this node. |
-
-The host spins up `StaPump` (the STA thread with message pump), creates the MXAccess `LMXProxyServer` COM object on that thread, and handles all COM calls there; the IPC layer marshals work items via `PostThreadMessage`.
-
-### Pipe security
-
-`PipeServer` builds a `PipeAcl` from the provided `SecurityIdentifier` + uses `NamedPipeServerStream` with `maxNumberOfServerInstances: 1`. The handshake requires a matching shared secret in the first Hello frame; callers whose SID doesn't match `OTOPCUA_ALLOWED_SID` are rejected before any frame is processed. **By design the pipe ACL denies BUILTIN\Administrators** — live smoke tests must therefore run from a non-elevated shell that matches the allowed principal. The installed dev host (`OtOpcUaGalaxyHost`) runs as `dohertj2` with the secret at `.local/galaxy-host-secret.txt`.
-
-### Installation
-
-NSSM-wrapped (the Non-Sucking Service Manager) because the executable itself is a plain console app, not a `ServiceBase` Windows service. The supervisor then adopts the child process over the pipe after install. Install/uninstall commands follow the NSSM pattern:
-
-```bash
-nssm install OtOpcUaGalaxyHost "C:\Program Files (x86)\OtOpcUa\Galaxy.Host\ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.exe"
-nssm set OtOpcUaGalaxyHost ObjectName .\dohertj2 <password>
-nssm set OtOpcUaGalaxyHost AppEnvironmentExtra OTOPCUA_GALAXY_BACKEND=mxaccess OTOPCUA_GALAXY_SECRET=… OTOPCUA_ALLOWED_SID=…
-nssm start OtOpcUaGalaxyHost
-```
-
-(Exact values for the environment block are generated by the Admin UI + committed alongside `.local/galaxy-host-secret.txt` on the dev box.)
-
-## Inter-process communication
-
-```
-┌──────────────────────────┐        LDAP bind (Authentication:Ldap)        ┌──────────────────────────┐
-│  OtOpcUa Admin (x64)     │ ─────────────────────────────────────────────▶│     LDAP / AD            │
-│  Blazor Server + SignalR │                                               └──────────────────────────┘
-│  /metrics (Prometheus)   │        FleetStatusPoller → ClusterNode poll
-│                          │ ─────────────────────────────────────────────▶┌──────────────────────────┐
-│                          │        Cluster/Generation/ACL writes          │   Config DB (SQL Server) │
-└──────────────────────────┘ ─────────────────────────────────────────────▶│   OtOpcUaConfigDbContext │
-             ▲                                                             └──────────────────────────┘
-             │ SignalR                                                                 ▲
-             │ (role change,                                                           │ sp_GetCurrentGenerationForCluster
-             │  host status,                                                           │ sp_PublishGeneration
-             │  alerts)                                                                │
-┌──────────────────────────┐                                                           │
-│  OtOpcUa Server (x64)    │ ──────────────────────────────────────────────────────────┘
-│  OPC UA endpoint         │
-│  Non-Galaxy drivers      │       Named pipe (OtOpcUaGalaxy)                ┌──────────────────────────┐
-│  Driver.Galaxy.Proxy     │ ─────────────────────────────────────────────▶│  Galaxy.Host (x86 .NFx)  │
-│                          │       SID + shared-secret handshake           │  STA + message pump      │
-│  /healthz /readyz        │                                               │  MXAccess COM            │
-└──────────────────────────┘                                               │  Historian SDK (opt)     │
-                                                                           └──────────────────────────┘
-```
-
-## appsettings.json boundary
-
-Each process reads its own `appsettings.json` for **bootstrap only** — connection strings, LDAP bind config, transport security profile, redundancy node id, logging. The authoritative configuration tree (drivers, UNS, tags, ACLs) lives in the Config DB and is edited through the Admin UI. See [`Configuration.md`](Configuration.md) for the split.
-
-## Development bootstrap
-
-For the Windows install steps (SQL Server in Docker, .NET 10 SDK, .NET Framework 4.8 SDK, Docker Desktop WSL 2 backend, EF Core CLI, first-run migration), see [`docs/v2/dev-environment.md`](v2/dev-environment.md).
+Serilog with rolling-daily file sinks. Each service writes to
+`%ProgramData%\OtOpcUa\<service>-*.log` plus stdout (NSSM-friendly).

docs/VirtualTags.md

@@ -97,13 +97,13 @@ Per [ADR-002](v2/implementation/adr-002-driver-vs-virtual-dispatch.md) Option B,
 
 `ITagUpstreamSource` and `IHistoryWriter` are the two ports the engine requires from its host. Both live in `Core.VirtualTags`. In the Server process:
 
-- **`CachedTagUpstreamSource`** (`src/ZB.MOM.WW.OtOpcUa.Server/Phase7/CachedTagUpstreamSource.cs`) implements the interface (and the parallel `Core.ScriptedAlarms.ITagUpstreamSource` — identical shape, distinct namespace). A `ConcurrentDictionary<path, DataValueSnapshot>` cache. `Push(path, snapshot)` updates the cache and fans out synchronously to every observer. Reads of never-pushed paths return `BadNodeIdUnknown` quality (`UpstreamNotConfigured = 0x80340000`).
-- **`DriverSubscriptionBridge`** (`src/ZB.MOM.WW.OtOpcUa.Server/Phase7/DriverSubscriptionBridge.cs`) feeds the cache. For each registered `ISubscribable` driver it batches a single `SubscribeAsync` for every fullRef the script graph references, installs an `OnDataChange` handler that translates driver-opaque fullRefs back to UNS paths via a reverse map, and pushes each delta into `CachedTagUpstreamSource`. Unsubscribes on dispose. The bridge suppresses `OTOPCUA0001` (the Roslyn analyzer that requires `ISubscribable` callers to go through `CapabilityInvoker`) on the documented basis that this is a lifecycle wiring, not per-evaluation hot path.
+- **`CachedTagUpstreamSource`** (`src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/CachedTagUpstreamSource.cs`) implements the interface (and the parallel `Core.ScriptedAlarms.ITagUpstreamSource` — identical shape, distinct namespace). A `ConcurrentDictionary<path, DataValueSnapshot>` cache. `Push(path, snapshot)` updates the cache and fans out synchronously to every observer. Reads of never-pushed paths return `BadNodeIdUnknown` quality (`UpstreamNotConfigured = 0x80340000`).
+- **`DriverSubscriptionBridge`** (`src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/DriverSubscriptionBridge.cs`) feeds the cache. For each registered `ISubscribable` driver it batches a single `SubscribeAsync` for every fullRef the script graph references, installs an `OnDataChange` handler that translates driver-opaque fullRefs back to UNS paths via a reverse map, and pushes each delta into `CachedTagUpstreamSource`. Unsubscribes on dispose. The bridge suppresses `OTOPCUA0001` (the Roslyn analyzer that requires `ISubscribable` callers to go through `CapabilityInvoker`) on the documented basis that this is a lifecycle wiring, not per-evaluation hot path.
 - **`IHistoryWriter`** — no production implementation is currently wired for virtual tags; `VirtualTagEngine` gets `NullHistoryWriter` by default from `Phase7EngineComposer`.
 
 ## Composition
 
-`Phase7Composer` (`src/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7Composer.cs`) is an `IAsyncDisposable` injected into `OpcUaServerService`:
+`Phase7Composer` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7Composer.cs`) is an `IAsyncDisposable` injected into `OpcUaServerService`:
 
 1. `PrepareAsync(generationId, ct)` — called after the bootstrap generation loads and before `OpcUaApplicationHost.StartAsync`. Reads the `Script` / `VirtualTag` / `ScriptedAlarm` rows for that generation from the config DB (`OtOpcUaConfigDbContext`). Empty-config fast path returns `Phase7ComposedSources.Empty`.
 2. Constructs a `CachedTagUpstreamSource` + hands it to `Phase7EngineComposer.Compose`.
@@ -117,26 +117,26 @@ Definition reload on config publish: `VirtualTagEngine.Load` is re-entrant — a
 
 ## Key source files
 
-- `src/ZB.MOM.WW.OtOpcUa.Core.Scripting/ScriptContext.cs` — abstract `ctx` API scripts see
-- `src/ZB.MOM.WW.OtOpcUa.Core.Scripting/ScriptGlobals.cs` — generic globals wrapper naming the field `ctx`
-- `src/ZB.MOM.WW.OtOpcUa.Core.Scripting/ScriptSandbox.cs` — assembly allow-list + imports
-- `src/ZB.MOM.WW.OtOpcUa.Core.Scripting/ForbiddenTypeAnalyzer.cs` — post-compile semantic deny-list
-- `src/ZB.MOM.WW.OtOpcUa.Core.Scripting/ScriptEvaluator.cs` — three-step compile pipeline
-- `src/ZB.MOM.WW.OtOpcUa.Core.Scripting/TimedScriptEvaluator.cs` — 250ms default timeout wrapper
-- `src/ZB.MOM.WW.OtOpcUa.Core.Scripting/CompiledScriptCache.cs` — SHA-256-keyed compile cache
-- `src/ZB.MOM.WW.OtOpcUa.Core.Scripting/DependencyExtractor.cs` — static `ctx.GetTag` / `ctx.SetVirtualTag` inference
-- `src/ZB.MOM.WW.OtOpcUa.Core.Scripting/ScriptLoggerFactory.cs` — per-script Serilog logger
-- `src/ZB.MOM.WW.OtOpcUa.Core.Scripting/ScriptLogCompanionSink.cs` — error mirror to main log
-- `src/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/VirtualTagDefinition.cs` — per-tag config record
-- `src/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/VirtualTagContext.cs` — evaluation-scoped `ctx`
-- `src/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/DependencyGraph.cs` — Kahn topo-sort + iterative Tarjan SCC
-- `src/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/VirtualTagEngine.cs` — load / evaluate / cascade pipeline
-- `src/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/TimerTriggerScheduler.cs` — periodic re-evaluation
-- `src/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/ITagUpstreamSource.cs` — driver-tag read + subscribe port
-- `src/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/IHistoryWriter.cs` — historize sink port + `NullHistoryWriter`
-- `src/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/VirtualTagSource.cs` — `IReadable` + `ISubscribable` adapter
-- `src/ZB.MOM.WW.OtOpcUa.Server/Phase7/CachedTagUpstreamSource.cs` — production `ITagUpstreamSource`
-- `src/ZB.MOM.WW.OtOpcUa.Server/Phase7/DriverSubscriptionBridge.cs` — driver `ISubscribable` → cache feed
-- `src/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7EngineComposer.cs` — row projection + engine instantiation
-- `src/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7Composer.cs` — lifecycle host: load rows, compose, wire bridge
-- `src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs` — `SelectReadable` + `IsWriteAllowedBySource` dispatch kernel
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting/ScriptContext.cs` — abstract `ctx` API scripts see
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting/ScriptGlobals.cs` — generic globals wrapper naming the field `ctx`
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting/ScriptSandbox.cs` — assembly allow-list + imports
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting/ForbiddenTypeAnalyzer.cs` — post-compile semantic deny-list
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting/ScriptEvaluator.cs` — three-step compile pipeline
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting/TimedScriptEvaluator.cs` — 250ms default timeout wrapper
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting/CompiledScriptCache.cs` — SHA-256-keyed compile cache
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting/DependencyExtractor.cs` — static `ctx.GetTag` / `ctx.SetVirtualTag` inference
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting/ScriptLoggerFactory.cs` — per-script Serilog logger
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Scripting/ScriptLogCompanionSink.cs` — error mirror to main log
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/VirtualTagDefinition.cs` — per-tag config record
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/VirtualTagContext.cs` — evaluation-scoped `ctx`
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/DependencyGraph.cs` — Kahn topo-sort + iterative Tarjan SCC
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/VirtualTagEngine.cs` — load / evaluate / cascade pipeline
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/TimerTriggerScheduler.cs` — periodic re-evaluation
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/ITagUpstreamSource.cs` — driver-tag read + subscribe port
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/IHistoryWriter.cs` — historize sink port + `NullHistoryWriter`
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/VirtualTagSource.cs` — `IReadable` + `ISubscribable` adapter
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/CachedTagUpstreamSource.cs` — production `ITagUpstreamSource`
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/DriverSubscriptionBridge.cs` — driver `ISubscribable` → cache feed
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7EngineComposer.cs` — row projection + engine instantiation
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7Composer.cs` — lifecycle host: load rows, compose, wire bridge
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs` — `SelectReadable` + `IsWriteAllowedBySource` dispatch kernel

docs/drivers/AbLegacy-Test-Fixture.md

@@ -4,7 +4,7 @@ Coverage map + gap inventory for the AB Legacy (PCCC) driver — SLC 500 /
 MicroLogix / PLC-5 / LogixPccc-mode.
 
 **TL;DR:** Docker integration-test scaffolding lives at
-`tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/` (task #224),
+`tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/` (task #224),
 reusing the AB CIP `ab_server` image in PCCC mode with per-family
 compose profiles (`slc500` / `micrologix` / `plc5`). Scaffold passes
 the skip-when-absent contract cleanly. **Wire-level round-trip against
@@ -19,7 +19,7 @@ via `FakeAbLegacyTag` still carry the contract coverage.
 
 **Integration layer** (task #224, scaffolded with a known ab_server
 gap):
-`tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/` with
+`tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/` with
 `AbLegacyServerFixture` (TCP-probes `localhost:44818`) + three smoke
 tests (parametric read across families, SLC500 write-then-read). Reuses
 the AB CIP `otopcua-ab-server:libplctag-release` image via a relative
@@ -27,7 +27,7 @@ the AB CIP `otopcua-ab-server:libplctag-release` image via a relative
 `--plc` flags. See `Docker/README.md` §Known limitations for the
 ab_server PCCC round-trip gap + resolution paths.
 
-**Unit layer**: `tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/` is
+**Unit layer**: `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/` is
 still the primary coverage. All tests tagged `[Trait("Category", "Unit")]`.
 The driver accepts `IAbLegacyTagFactory` via ctor DI; every test
 supplies a `FakeAbLegacyTag`.
@@ -113,16 +113,16 @@ cover the common ones but uncommon ones (`R` counters, `S` status files,
 
 ## Key fixture / config files
 
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyServerFixture.cs`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyServerFixture.cs`
   — TCP probe + skip attributes + env-var parsing
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyReadSmokeTests.cs`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyReadSmokeTests.cs`
   — wire-level smoke tests; pass against the ab_server Docker fixture
   with `AB_LEGACY_COMPOSE_PROFILE` set to the running container
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/Docker/docker-compose.yml`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/Docker/docker-compose.yml`
   — compose profiles reusing AB CIP Dockerfile
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/Docker/README.md`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/Docker/README.md`
   — known-limitations write-up + resolution paths
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/FakeAbLegacyTag.cs` —
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.Tests/FakeAbLegacyTag.cs` —
   in-process fake + factory
-- `src/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriver.cs` — scope remarks
+- `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy/AbLegacyDriver.cs` — scope remarks
   at the top of the file

docs/drivers/AbServer-Test-Fixture.md

@@ -126,7 +126,7 @@ behaviours from unit-only to end-to-end wire-level coverage:
 ```powershell
 $env:AB_SERVER_PROFILE  = 'emulate'
 $env:AB_SERVER_ENDPOINT = '<emulate-pc-ip>:44818'
-dotnet test tests\ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests
+dotnet test tests\Drivers\ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests
 ```
 
 With `AB_SERVER_PROFILE` unset or `abserver`, the Emulate-tier classes
@@ -154,7 +154,7 @@ via `AbServerProfileGate.SkipUnless`):
   — #177 ALMD projection, verified against the real ALMD instruction
 
 **Required Studio 5000 project state** is documented in
-[`tests/…/AbCip.IntegrationTests/LogixProject/README.md`](../../tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/LogixProject/README.md);
+[`tests/…/AbCip.IntegrationTests/LogixProject/README.md`](../../tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/LogixProject/README.md);
 the `.L5X` export lands there once the Emulate PC is on-site + the
 project is authored.
 
@@ -201,16 +201,16 @@ options are roughly:
 
 See also:
 
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbServerFixture.cs`
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbServerProfile.cs`
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbServerProfileGate.cs`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbServerFixture.cs`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbServerProfile.cs`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbServerProfileGate.cs`
   — `AB_SERVER_PROFILE` tier gate
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbCipReadSmokeTests.cs`
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Docker/` — ab_server
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbCipReadSmokeTests.cs`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Docker/` — ab_server
   image + compose
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Emulate/` — Logix
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Emulate/` — Logix
   Emulate tier tests
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/LogixProject/README.md`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/LogixProject/README.md`
   — L5X project state the Emulate tier expects
 - `docs/v2/test-data-sources.md` §2 — the broader test-data-source picking
   rationale this fixture slots into

docs/drivers/FOCAS-Test-Fixture.md

@@ -2,132 +2,149 @@
 
 Coverage map + gap inventory for the FANUC FOCAS2 CNC driver.
 
-**TL;DR: there is no integration fixture.** Every test uses a
-`FakeFocasClient` injected via `IFocasClientFactory`. Fanuc's FOCAS library
-(`Fwlib32.dll`) is closed-source proprietary with no public simulator;
-CNC-side behavior is trusted from field deployments.
+**Status:** as of 2026-04-24, OtOpcUa speaks FOCAS2 directly over TCP
+via the pure-managed [`Focas.Wire`](https://github.com/Ladder99/focas-mock/tree/main/dotnet/Focas.Wire)
+client. Integration tests run the managed driver end-to-end against the
+vendored `focas-mock` Python server (at
+[`tests/.../Docker/focas-mock/`](../../tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Docker/focas-mock/VENDORED.md))
+whose native FOCAS Ethernet responder is verified PDU-by-PDU against the
+real `fwlibe64.dll`.
 
-## What the fixture is
+No shim DLL, no P/Invoke, no licensed binary — any dev box or CI runner
+with Docker can run the full fixture end-to-end.
 
-Nothing at the integration layer.
-`tests/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/` is unit-only. The driver ships
-as Tier C (process-isolated) per `docs/v2/driver-stability.md` because the
-FANUC DLL has known crash modes; tests can't replicate those in-process.
+Hardware validation against a real CNC is still useful to catch
+series-specific firmware quirks (see [§ Hardware-only gaps](#hardware-only-gaps))
+but the mock's wire responder covers every FOCAS call OtOpcUa issues.
 
-## What it actually covers (unit only)
+## What the fixture covers
 
-- `FocasCapabilityTests` — data-type mapping (PMC bit / word / float,
-  macro variable types, parameter types)
-- `FocasCapabilityMatrixTests` — per-CNC-series range validation (macro
-  / parameter / PMC letter + number) across 16i / 0i-D / 0i-F /
-  30i / PowerMotion. See [`docs/v2/focas-version-matrix.md`](../v2/focas-version-matrix.md)
-  for the authoritative matrix. 46 theory cases lock every documented
-  range boundary — widening a range without updating the doc fails a
-  test.
-- `FocasReadWriteTests` — read + write against the fake, FOCAS native status
-  → OPC UA StatusCode mapping
+### Unit layer (no container required)
+
+`tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/` uses `FakeFocasClient`
+injected via `IFocasClientFactory`:
+
+- `FocasCapabilityTests` — data-type mapping (PMC bit / byte / word /
+  long / float / double, macro variable types, parameter types)
+- `FocasCapabilityMatrixTests` — per-CNC-series range validation across
+  16i / 0i-D / 0i-F / 30i / Power Motion, 46 theory cases locking every
+  documented range boundary. See
+  [`docs/v2/focas-version-matrix.md`](../v2/focas-version-matrix.md).
+- `FocasReadWriteTests` — read / write contract against the fake, FOCAS
+  native status → OPC UA `StatusCode` mapping
 - `FocasScaffoldingTests` — `IDriver` lifecycle + multi-device routing
-- `FocasPmcBitRmwTests` — PMC bit read-modify-write synchronization (per-byte
-  `SemaphoreSlim`, mirrors the AB / Modbus pattern from #181)
-- `FwlibNativeHelperTests` — `Focas32.dll` → `Fwlib32.dll` bridge validation
-  + P/Invoke signature validation
+- `FocasPmcBitRmwTests` — PMC bit read-modify-write synchronisation
+- `FocasAlarmProjectionTests` — raise / clear diffing, severity mapping
+- `FocasHandleRecycleTests` — proactive session recycle cadence
 
 Capability surfaces whose contract is verified: `IDriver`, `IReadable`,
-`IWritable`, `ITagDiscovery`, `ISubscribable`, `IHostConnectivityProbe`,
-`IPerCallHostResolver`.
+`ITagDiscovery`, `ISubscribable`, `IHostConnectivityProbe`,
+`IPerCallHostResolver`, `IAlarmSource`. `IWritable` intentionally
+returns `BadNotWritable` — OtOpcUa is read-only against FOCAS.
 
 Pre-flight validation runs in `FocasDriver.InitializeAsync` — configs
 referencing out-of-range addresses fail at load time with a diagnostic
-message naming the CNC series + documented limit. This closes the
-cheap half of the hardware-free stability gap; Tier-C process
-isolation (task #220) closes the expensive half — see
-[`docs/v2/implementation/focas-isolation-plan.md`](../v2/implementation/focas-isolation-plan.md).
+message naming the CNC series + documented limit.
 
-## What it does NOT cover
+### Integration layer (mock only, no CNC, no shim)
 
-### 1. FOCAS wire traffic
+`tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/` drives the
+managed `FocasDriver` end-to-end. A single gate:
 
-No FOCAS TCP frame is sent. `Fwlib32.dll`'s TCP-to-FANUC-gateway exchange is
-closed-source; the driver trusts the P/Invoke layer per #193. Real CNC
-correctness is trusted from field deployments.
+**Docker compose up** — tests skip when the TCP probe to
+`localhost:8193` fails with a pointer to the compose command.
 
-### 2. Alarm / parameter-change callbacks
+When the mock is up, `WireFocasClient` dials it over TCP exactly like a
+real CNC, and the mock's native FOCAS Ethernet responder replies with
+binary PDUs against the documented command IDs. Covered assertions:
 
-FOCAS has no push model — the driver polls via the shared `PollGroupEngine`.
-There are no CNC-initiated callbacks to test; the absence is by design.
+- Session open / close (`cnc_allclibhndl3` + `cnc_freelibhndl`)
+- Parameter read-back after `mock_patch` seed → `cnc_rdparam`
+- Macro read-back after seed → `cnc_rdmacro` (scaled-decimal
+  translation verified)
+- PMC range read after seed → `pmc_rdpmcrng`
+- `IAlarmSource` raise + clear transitions after `mock_patch`
+  alarm-list changes → `cnc_rdalmmsg2`
+- Fixed-tree bootstrap: identity / axes / spindle / program / timers /
+  servo meters populate via `cnc_sysinfo`, `cnc_rdaxisname`,
+  `cnc_rdspdlname`, `cnc_rddynamic2`, `cnc_exeprgname2`,
+  `cnc_rdblkcount`, `cnc_rdopmode`, `cnc_rdsvmeter`, `cnc_rdspload`,
+  `cnc_rdspmaxrpm`, `cnc_rdtimer`
+- Per-series profile selection via `mock_load_profile` — tests can
+  pin one profile and assert series-gated capability suppression
 
-### 3. Macro / ladder variable types
+### E2E script (CLI)
 
-FANUC has CNC-specific extensions (macro variables `#100-#999`, system
-variables `#1000-#5000`, PMC timers / counters / keep-relays) whose
-per-address semantics differ across 0i-F / 30i / 31i / 32i Series. Driver
-covers the common address shapes; per-model quirks are not stressed.
+`scripts/e2e/test-focas.ps1` drives the Client.CLI against a running
+OtOpcUa server. Accepts:
 
-### 4. Model-specific behavior
+- `-CncHost` / `-CncPort` for real hardware
+- `-ProfileName <compose-profile>` for the Docker mock
+- `-Series <csv>` for per-series matrix mode
+- `-HandleLeakCycles <N>` for handle-leak stress
 
-- Alarm retention across power cycles (model-specific CNC behavior)
-- Parameter range enforcement (CNC rejects out-of-range writes)
-- MTB (machine tool builder) custom screens that expose non-standard data
+## Hardware-only gaps
 
-### 5. Tier-C process isolation — architecture shipped, Fwlib32 integration hardware-gated
+The mock has parity with the real `fwlibe64.dll` for the calls OtOpcUa
+issues, but a real CNC can still surface things a reference
+implementation can't:
 
-The Tier-C architecture is now in place as of PRs #169–#173 (FOCAS
-PR A–E, task #220):
+1. **Series-specific firmware quirks** — alarm retention across power
+   cycles, parameter range enforcement by the CNC (not the driver),
+   MTB custom screens, series-specific option bits. Each series has
+   documented behaviours that only a bench CNC exercises.
+2. **Wire-level stress** — burst reads, concurrent device writes,
+   network-partition recovery under load. The mock handles these
+   correctly but production behaviour is the source of truth.
+3. **Transient operational states** — alarm floods, emergency-stop
+   transitions, power-on resync. These are easy to stub but hard to
+   cover comprehensively in the mock.
 
-- `Driver.FOCAS.Shared` carries MessagePack IPC contracts
-- `Driver.FOCAS.Host` (.NET 4.8 x86 Windows service via NSSM) accepts
-  a connection on a strictly-ACL'd named pipe + dispatches frames to
-  an `IFocasBackend`
-- `Driver.FOCAS.Ipc.IpcFocasClient` implements the `IFocasClient` DI
-  seam by forwarding over IPC — swap the DI registration and the
-  driver runs Tier-C with zero other changes
-- `Driver.FOCAS.Supervisor.FocasHostSupervisor` owns the spawn +
-  heartbeat + respawn + 3-in-5min crash-loop breaker + sticky alert
-- `Driver.FOCAS.Host.Stability.PostMortemMmf` ↔
-  `Driver.FOCAS.Supervisor.PostMortemReader` — ring-buffer of the
-  last ~1000 IPC operations survives a Host crash
+Track the close-out under task #54 (live-CNC smoke). When the rig
+lands, the hardware path runs alongside the mock path; the mock
+stays as the CI quality gate.
 
-The one remaining gap is the production `FwlibHostedBackend`: an
-`IFocasBackend` implementation that wraps the licensed
-`Fwlib32.dll` P/Invoke. That's hardware-gated on task #222 — we
-need a CNC on the bench (or the licensed FANUC developer kit DLL
-with a test harness) to validate it. Until then, the Host ships
-`FakeFocasBackend` + `UnconfiguredFocasBackend`. Setting
-`OTOPCUA_FOCAS_BACKEND=fake` lets operators smoke-test the whole
-Tier-C pipeline end-to-end without any CNC.
+## When to trust each layer
 
-## When to trust FOCAS tests, when to reach for a rig
+| Question | Unit | Integration (mock) | Real CNC |
+| --- | :---: | :---: | :---: |
+| "Does PMC address `R100.3` route to the right bit?" | ✅ | ✅ | ✅ |
+| "Does the Fanuc status → OPC UA StatusCode map cover every documented code?" | ✅ (contract) | ✅ | ✅ |
+| "Does `FocasDriver.ReadAsync` correctly decode a seeded parameter?" | no | ✅ | ✅ |
+| "Does `IAlarmSource` fire raise + clear events?" | ✅ (Fake) | ✅ (wire) | ✅ |
+| "Does a real read against a 30i Series return correct bytes?" | no | ✅ (via profile) | ✅ (required) |
+| "Do series-specific firmware quirks behave as documented?" | no | no | ✅ (required) |
+| "Does the driver survive real network partitions?" | no | partial (socket kill) | ✅ (required) |
 
-| Question | Unit tests | Real CNC |
-| --- | --- | --- |
-| "Does PMC address `R100.3` route to the right bit?" | yes | yes |
-| "Does the FANUC status → OPC UA StatusCode map cover every documented code?" | yes (contract) | yes |
-| "Does a real read against a 30i Series return correct bytes?" | no | yes (required) |
-| "Does `Fwlib32.dll` crash on concurrent reads?" | no | yes (stress) |
-| "Do macro variables round-trip across power cycles?" | no | yes (required) |
+## Running the integration fixture
 
-## Follow-up candidates
+```powershell
+# 1) Start the mock on a chosen profile.
+docker compose -f tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Docker/docker-compose.yml up -d
 
-1. **Nothing public** — Fanuc's FOCAS Developer Kit ships an emulator DLL
-   but it's under NDA + tied to licensed dev-kit installations; can't
-   redistribute for CI.
-2. **Lab rig** — used FANUC 0i-F simulator controller (or a retired machine
-   tool) on a dedicated network; only path that covers real CNC behavior.
-3. **Process isolation first** — before trusting FOCAS in production at
-   scale, shipping the Tier-C out-of-process Host architecture (similar to
-   Galaxy) is higher value than a CI simulator.
+# 2) Run the tests. No shim build, no DLL copy — the driver dials the mock directly.
+dotnet test tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/
+```
+
+Or use `scripts/integration/run-focas.ps1` which wraps compose up / test
+/ compose down and accepts `-Profile <name>` to pin a per-series run.
 
 ## Key fixture / config files
 
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FakeFocasClient.cs` —
-  in-process fake implementing `IFocasClient`
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasCapabilityMatrixTests.cs`
-  — parameterized theories locking the per-series matrix
-- `src/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasDriver.cs` — ctor takes
-  `IFocasClientFactory`
-- `src/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasCapabilityMatrix.cs` —
-  per-CNC-series range validator (the matrix the doc describes)
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Docker/focas-mock/`
+  — vendored `focas-mock` Python source + Dockerfile
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Docker/docker-compose.yml`
+  — per-series compose profiles
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/FocasSimFixture.cs`
+  — collection fixture + mock admin API client
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Series/FixedTreePopulatesTests.cs`
+  — fixed-tree end-to-end tests
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Series/WireBackendTests.cs`
+  — pure-wire-backend end-to-end tests
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FakeFocasClient.cs` —
+  in-process unit fake
+- `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/Wire/WireFocasClient.cs` — the
+  managed wire client backing production deployments
+- `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasCapabilityMatrix.cs` —
+  per-series range validator
 - `docs/v2/focas-version-matrix.md` — authoritative range reference
-- `docs/v2/implementation/focas-isolation-plan.md` — Tier-C isolation
-  plan (task #220)
-- `docs/v2/driver-stability.md` — Tier C scope + process-isolation rationale

docs/drivers/FOCAS.md

@@ -0,0 +1,238 @@
+# FOCAS Driver
+
+Getting-started guide for the FANUC FOCAS2 driver. This is the short path — for
+the exhaustive per-node mapping read [`docs/v2/driver-specs.md §7`](../v2/driver-specs.md),
+for the test-harness map read [FOCAS-Test-Fixture.md](FOCAS-Test-Fixture.md).
+
+## What it talks to
+
+FANUC CNCs (0i-D / 0i-F / 0i-MF / 0i-TF / 16i / 30i / 31i / 32i / Power Motion i)
+over the proprietary FOCAS2 protocol on TCP port 8193. The wire is spoken
+directly by the pure-managed [`Focas.Wire`](https://github.com/Ladder99/focas-mock)
+client — no Fwlib64.dll, no P/Invoke, no out-of-process isolation needed.
+
+OtOpcUa is **read-only** against FOCAS; all reads go over the native wire
+protocol using the documented command IDs. Writes return
+`BadNotWritable` by design.
+
+## Project split
+
+| Project | Target | Role |
+|---------|--------|------|
+| `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/` | net10.0 | In-process driver — hosts `WireFocasClient` which speaks FOCAS2 over TCP directly |
+
+Previous `Driver.FOCAS.Host` / `Driver.FOCAS.Shared` Tier-C split has been
+retired — the managed wire client removes the native-crash blast radius
+that justified the out-of-process service.
+
+## Minimum deployment
+
+Register the driver instance in the main server's `appsettings.json`. No
+separate service, no DLL deployment, no shared-secret handshake:
+
+```jsonc
+"Drivers": {
+  "focas-cnc-1": {
+    "Type": "FOCAS",
+    "Config": {
+      "Backend": "wire",
+      "Devices": [
+        { "HostAddress": "focas://10.20.30.40:8193", "Series": "ThirtyOne_i" }
+      ],
+      "Tags": [
+        { "Name": "Mode",  "DeviceHostAddress": "focas://10.20.30.40:8193",
+          "Address": "PARAM:3402", "DataType": "Int32", "Writable": false },
+        { "Name": "SpndLoad", "DeviceHostAddress": "focas://10.20.30.40:8193",
+          "Address": "MACRO:500", "DataType": "Float64", "Writable": false }
+      ]
+    }
+  }
+}
+```
+
+The main server opens two TCP sockets per configured device and speaks the
+FOCAS2 binary protocol directly. No local privileged components, no
+platform bitness constraint — the driver runs on every host OtOpcUa runs
+on.
+
+## Address forms
+
+| Form | Example | Meaning |
+|------|---------|---------|
+| `X0.0` / `R100` / `R100.3` | PMC bit or byte | Letter + number; optional `.bit` for bit access |
+| `PARAM:1815` / `PARAM:1815/0` | CNC parameter | Number + optional axis index |
+| `MACRO:500` | Custom macro variable | System / user macro variable number |
+
+Addresses are validated against the per-device `Series` at `InitializeAsync` —
+a config referencing a number outside the documented range for that series
+fails at load time with an error message naming the limit. See
+[`docs/v2/focas-version-matrix.md`](../v2/focas-version-matrix.md) for the
+authoritative range table.
+
+## Backend selection
+
+The driver picks its client from `Config.Backend`:
+
+| Value | Client | Use it for |
+|-------|--------|------------|
+| `wire` (default) | `WireFocasClient` | Production — pure-managed FOCAS2 over TCP |
+| `unimplemented` / `none` / `stub` | `UnimplementedFocasClientFactory` | Scaffolding a DriverInstance row before the CNC endpoint is reachable |
+
+Previous backends (`fwlib`, `fwlib32`, `ipc`) have been retired along
+with `Driver.FOCAS.Host` and the Fwlib P/Invoke path. Configs that still
+reference them will throw at startup with a message pointing here.
+
+## Capability surface
+
+| Capability | Wire path | Notes |
+|------------|-----------|-------|
+| `IReadable` | `ReadAsync` → `cnc_rdpmcrng` / `cnc_rdparam` / `cnc_rdmacro` | One TCP request/response per read; `Focas.Wire` serializes requests on socket 2 internally |
+| `IWritable` | returns `BadNotWritable` | OtOpcUa is read-only against FOCAS by design — no `cnc_wrparam` / `pmc_wrpmcrng` / `cnc_wrmacro` path is implemented |
+| `ITagDiscovery` | `DiscoverAsync` | Emits `FOCAS/{device}/{tag}` folders per configured device |
+| `ISubscribable` | polled via shared `PollGroupEngine` | FOCAS has no push model — subscriptions turn into per-tag polling groups |
+| `IHostConnectivityProbe` | periodic `cnc_rdcncstat` | Probe cadence is `Probe.Interval`; transitions fire `OnHostStatusChanged` |
+| `IPerCallHostResolver` | lookup in `_tagsByName` | Each call routes to the device of the referenced tag |
+| `IAlarmSource` | polled `cnc_rdalmmsg2` via `FocasAlarmProjection` | Opt-in — set `AlarmProjection.Enabled=true`; diffs `(AlarmNumber, Type)` between ticks |
+
+Ack is a no-op — FANUC clears alarms on its own once the underlying condition
+resolves, so `AcknowledgeAsync` swallows the batch rather than surfacing
+`BadNotSupported`.
+
+## Fixed node tree
+
+Enable a pre-defined hierarchy of CNC nodes populated automatically from
+`cnc_sysinfo` + `cnc_rdaxisname` + `cnc_rddynamic2` + related FWLIB calls,
+so operators get an out-of-the-box view of identity / axes / program /
+timers without declaring per-address tags.
+
+```jsonc
+"Config": {
+  "Devices": [ ... ],
+  "Tags":    [ ... ],
+  "FixedTree": {
+    "Enabled": true,
+    "PollInterval": "00:00:00.250",       // fast — per-axis dynamic reads
+    "ProgramPollInterval": "00:00:01",    // medium — program + mode changes
+    "TimerPollInterval": "00:00:30"       // slow — cumulative counters
+  }
+}
+```
+
+What gets populated (all under `FOCAS/{deviceHostAddress}/`):
+
+| Subtree | Nodes | Source call |
+|---------|-------|-------------|
+| `Identity/` | `SeriesNumber`, `Version`, `MaxAxes`, `CncType`, `MtType`, `AxisCount` | `cnc_sysinfo` once at bootstrap |
+| `Axes/{name}/` | `AbsolutePosition`, `MachinePosition`, `RelativePosition`, `DistanceToGo`, `ServoLoad` — one folder per discovered axis | `cnc_rdaxisname` once + `cnc_rddynamic2` + `cnc_rdsvmeter` per tick |
+| `Axes/FeedRate/Actual`, `Axes/SpindleSpeed/Actual` | Current feed + spindle RPM | `cnc_rddynamic2` |
+| `Spindle/{name}/` | `Load` (percentage), `MaxRpm` — one folder per discovered spindle | `cnc_rdspdlname` once + `cnc_rdspload` + `cnc_rdspmaxrpm` |
+| `Program/` | `Name` (filename), `ONumber`, `Number`, `MainNumber`, `Sequence`, `BlockCount` | `cnc_exeprgname2` + `cnc_rdblkcount` + cached `cnc_rddynamic2` |
+| `OperationMode/` | `Mode` (int), `ModeText` ("AUTO", "MDI", "EDIT", …) | `cnc_rdopmode` |
+| `Timers/` | `PowerOnSeconds`, `OperatingSeconds`, `CuttingSeconds`, `CycleSeconds` | `cnc_rdtimer` × 4 |
+
+### Per-series node suppression
+
+The driver probes each optional call once at bootstrap. If the target CNC
+returns `EW_FUNC` / `EW_NOOPT` / `EW_VERSION` on the wire, the
+corresponding subtree is **not emitted** — the operator doesn't see nodes
+that will only ever return `BadDeviceFailure`. Capability suppression
+covers `Spindle/`, `Program/` + `OperationMode/`, `Timers/`, and
+per-axis `ServoLoad` independently. Identity + `Axes/*` position reads
+(which every Fanuc CNC supports) are always emitted.
+
+Position values are scaled integers (matching FOCAS's convention). The
+managed side exposes them as `Float64` OPC UA nodes; a future
+`cnc_getfigure` integration will add per-axis decimal scaling. Until
+then, treat the raw integer as the value the CNC reports and scale on
+the client side if decimal precision matters.
+
+**Still user-authored**: `PARAM:6711`, `MACRO:500`, `R100` etc. — specific
+numbers whose meaning is MTB-specific. Those go under the device folder
+alongside the fixed subtree.
+
+## Alarm projection
+
+Alarm surfacing is **disabled by default** because the polling cost is wasted
+on sites that don't consume CNC alarms. Opt in per driver instance:
+
+```jsonc
+"Config": {
+  "Devices": [ ... ],
+  "Tags":    [ ... ],
+  "AlarmProjection": {
+    "Enabled": true,
+    "PollInterval": "00:00:02"
+  }
+}
+```
+
+Every alarm transition fires `OnAlarmEvent` with:
+
+- `SourceNodeId` = the device host address (FOCAS has no per-node alarm model;
+  the CNC exposes a single flat active-alarm list per session)
+- `ConditionId` = `"{host}#{Type}:{AlarmNumber}"`
+- `AlarmType` = projected from FANUC's `ALM_TYPE_*` (e.g. `Overtravel`, `Servo`,
+  `Parameter`, `MacroAlarm`)
+- `Severity` = Overtravel / Servo / PulseCode → `Critical`; Parameter / Macro
+  → `Medium`; everything else → `High`
+
+Cleared alarms fire a second event with `" (cleared)"` appended to the message
+so downstream consumers can ignore the clear if they only care about raises.
+
+## Handle recycling
+
+FANUC CNCs have a finite FWLIB handle pool (~5–10 concurrent connections) and
+certain series have documented handle-leak bugs that manifest after long uptime.
+The driver can proactively close + reopen each device's session on a cadence to
+release its slot back to the pool:
+
+```jsonc
+"Config": {
+  "Devices": [ ... ],
+  "HandleRecycle": {
+    "Enabled": true,
+    "Interval": "01:00:00"
+  }
+}
+```
+
+Disabled by default — a healthy CNC + driver doesn't need it. Enable when field
+experience shows handle exhaustion. Typical tuning: 30 min for sites running
+multiple OtOpcUa instances against the same CNC (they share the pool); 6 h for a
+single-client deployment. Reads / writes during recycle simply wait for the
+reconnect rather than failing — worst case, an operator sees a brief read
+latency spike once per cadence.
+
+## Testing
+
+- **Unit tests** — `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/` cover the
+  driver surface via `FakeFocasClient`. Includes the alarm-projection raise /
+  clear diffing tests.
+- **Integration tests** — `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/`
+  hold the Docker simulator scaffold; see
+  [`docs/v2/implementation/focas-wire-protocol.md`](../v2/implementation/focas-wire-protocol.md)
+  for what the simulator emits vs. real CNC behaviour.
+- **E2E script** — `scripts/e2e/test-focas.ps1` stages Host + Proxy + a real
+  CNC (or the simulator) and exercises connect → read → write → subscribe
+  round-trips. See [`docs/drivers/FOCAS-Test-Fixture.md`](FOCAS-Test-Fixture.md)
+  for the coverage map.
+
+## Troubleshooting
+
+| Symptom | Likely cause | Fix |
+|---------|--------------|-----|
+| `BadCommunicationError` on every read | CNC unreachable on TCP:8193 | Check firewall / LAN reachability; FOCAS Ethernet option must be licensed on the CNC side |
+| Every read returns `BadNotWritable` on writes | Expected — OtOpcUa is read-only against FOCAS | If you actually need writes, open a feature request — the driver's managed wire client doesn't expose the write commands |
+| `BadOutOfRange` on reads for a macro/parameter | Config address outside the declared `Series` range | Check `docs/v2/focas-version-matrix.md` — either fix the address or widen the `Series` |
+| Alarm events never fire | `AlarmProjection.Enabled` left at default (false) | Set it to `true` in the driver config |
+
+## Further reading
+
+- [`docs/v2/driver-specs.md §7`](../v2/driver-specs.md) — full OPC UA node
+  mapping, pre-defined tag set, per-API notes
+- [`docs/v2/focas-version-matrix.md`](../v2/focas-version-matrix.md) —
+  per-series macro / parameter / PMC range table
+- [`docs/v2/implementation/focas-wire-protocol.md`](../v2/implementation/focas-wire-protocol.md)
+  — captured FOCAS2 wire semantics (magic prefix, handshake, command-id table)
+- [upstream `Focas.Wire`](https://github.com/Ladder99/focas-mock/tree/main/dotnet/Focas.Wire)
+  — the managed client implementation OtOpcUa consumes as a NuGet dependency

docs/drivers/Galaxy.md

@@ -1,211 +1,104 @@
 # Galaxy Driver
 
-The Galaxy driver bridges OtOpcUa to AVEVA System Platform (Wonderware) Galaxies through the `ArchestrA.MxAccess` COM API plus the Galaxy Repository SQL database. It is one driver of seven in the OtOpcUa platform (see [drivers/README.md](README.md) for the full list); all other drivers run in-process in the main Server (.NET 10 x64). Galaxy is the exception — it runs as its own Windows service and talks to the Server over a local named pipe.
+The Galaxy driver bridges OtOpcUa to AVEVA System Platform (Wonderware) Galaxies. It is a **Tier-A in-process driver** that runs in the OtOpcUa server's .NET 10 AnyCPU process and speaks gRPC to a separately installed `mxaccessgw` server (sibling repo at `c:\Users\dohertj2\Desktop\mxaccessgw\`). The gateway owns the MXAccess COM apartment, the STA + Win32 message pump, the Galaxy Repository SQL reader, and the Historian SDK — all the bits that need x86 / .NET Framework 4.8 / COM interop. The driver itself is platform-agnostic and contains no COM, no STA thread, and no x86 bitness constraint.
 
-For the decision record on why Galaxy is out-of-process and how the refactor was staged, see [docs/v2/plan.md §4 Galaxy/MXAccess as Out-of-Process Driver](../v2/plan.md). For the full driver spec (addressing, data-type map, config shape), see [docs/v2/driver-specs.md §1](../v2/driver-specs.md).
+For the driver spec (capability surface, config shape, addressing), see [docs/v2/driver-specs.md §1](../v2/driver-specs.md). For the gateway setup recipe, see [docs/v2/Galaxy.ParityRig.md](../v2/Galaxy.ParityRig.md). For tracing, metrics, and soak profile, see [docs/v2/Galaxy.Performance.md](../v2/Galaxy.Performance.md).
 
-## Project Split
+> **Note**: the related drivers `Galaxy-Repository.md` and `Galaxy-Test-Fixture.md` describe the previous v1 / out-of-process topology and are being moved to `docs/v1/` by a parallel cleanup track. Use `Galaxy.ParityRig.md` and the `mxaccessgw` repo for current testing.
 
-Galaxy ships as three projects:
+## Architecture
 
-| Project | Target | Role |
-|---------|--------|------|
-| `src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared/` | .NET Standard 2.0 | IPC contracts (MessagePack records + `MessageKind` enum) referenced by both sides |
-| `src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/` | .NET Framework 4.8 **x86** | Separate Windows service hosting the MXAccess COM objects, STA thread + Win32 message pump, Galaxy Repository reader, Historian SDK, runtime-probe manager |
-| `src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy/` | .NET 10 (matches Server) | `GalaxyProxyDriver : IDriver, ITagDiscovery, IReadable, IWritable, ISubscribable, IAlarmSource, IHistoryProvider, IRediscoverable, IHostConnectivityProbe` — loaded in-process by the Server; every call forwards over the pipe to the Host |
-
-The Shared assembly is the **only** contract between the two runtimes. It carries no COM or SDK references so Proxy (net10) can reference it without dragging x86 code into the Server process.
-
-## Why Out-of-Process
-
-Two reasons drive the split, per `docs/v2/plan.md`:
-
-1. **Bitness constraint.** MXAccess is 32-bit COM only — `ArchestrA.MxAccess.dll` in `Program Files (x86)\ArchestrA\Framework\bin` has no 64-bit variant. The main OtOpcUa Server is .NET 10 x64 (the OPC Foundation stack, SqlClient, and every other non-Galaxy driver target 64-bit). In-process hosting would force the whole Server to x86, which every other driver project would then inherit.
-2. **Tier-C stability isolation.** Galaxy is classified Tier C in [docs/v2/driver-stability.md](../v2/driver-stability.md) — the COM runtime, STA thread, Aveva Historian SDK, and SQL queries all have crash/hang modes that can take down the hosting process. Isolating the driver in its own Windows service means a COM deadlock, AccessViolation in an unmanaged Historian DLL, or a runaway SQL query never takes the Server endpoint down. The Proxy-side supervisor restarts the Host with crash-loop circuit-breaker.
-
-The same Tier-C isolation story applies to FOCAS (decision record in `docs/v2/plan.md` §7), which is the second out-of-process driver.
-
-## IPC Transport
-
-`GalaxyProxyDriver` → `GalaxyIpcClient` → named pipe → `Galaxy.Host` pipe server.
-
-- Pipe name: `otopcua-galaxy-{DriverInstanceId}` (localhost-only, no TCP surface)
-- Wire format: MessagePack-CSharp, length-prefixed frames
-- ACL: pipe is created with a DACL that grants only the Server's service identity; the Admins group is explicitly denied so a live-smoke test running from an elevated shell fails fast rather than silently bypassing the handshake
-- Handshake: Proxy presents a shared secret at `OpenSessionRequest`; Host rejects anything else with `MessageKind.OpenSessionResponse{Success=false}`
-- Heartbeat: Proxy sends a periodic ping; missed heartbeats trigger the Proxy-side crash-loop supervisor to restart the Host
-
-Every capability call on `GalaxyProxyDriver` (Read, Write, Subscribe, HistoryRead*, etc.) serializes a `*Request`, awaits the matching `*Response` via a `CallAsync<TReq, TResp>` helper, and rehydrates the result into the `Core.Abstractions` shape the Server expects.
-
-## STA Thread Requirement (Host-side)
-
-MXAccess COM objects — `LMXProxyServer` instantiation, `Register`, `AddItem`, `AdviseSupervisory`, `Write`, and cleanup calls — must all execute on the same Single-Threaded Apartment. Calling a COM object from the wrong thread causes marshalling failures or silent data corruption.
-
-`StaComThread` in the Host provides that thread with the apartment state set before the thread starts:
-
-```csharp
-_thread = new Thread(ThreadEntry) { Name = "MxAccess-STA", IsBackground = true };
-_thread.SetApartmentState(ApartmentState.STA);
+```
+                    +---------------------------------------+
+                    |  OtOpcUa.Server (.NET 10 AnyCPU)      |
+                    |   GalaxyDriver (in-process)           |
+                    |    ITagDiscovery / IReadable /        |
+                    |    IWritable / ISubscribable /        |
+                    |    IRediscoverable /                  |
+                    |    IHostConnectivityProbe /           |
+                    |    IAlarmSource                       |
+                    +-------------------+-------------------+
+                                        |
+                                       gRPC (default http://localhost:5120)
+                                        |
+                                        v
+                    +---------------------------------------+
+                    |  mxaccessgw  (sibling repo)           |
+                    |    +-------------------------------+  |
+                    |    | MxGateway.Worker (x86 net48)  |  |
+                    |    |   STA + WM_APP pump           |  |
+                    |    |   ArchestrA.MxAccess COM      |  |
+                    |    |   Galaxy Repository SQL       |  |
+                    |    |   Wonderware Historian SDK    |  |
+                    |    +-------------------------------+  |
+                    +---------------------------------------+
 ```
 
-Work items queue via `RunAsync(Action)` or `RunAsync<T>(Func<T>)` into a `ConcurrentQueue<Action>` and post `WM_APP` to wake the pump. Each work item is wrapped in a `TaskCompletionSource` so callers can `await` the result from any thread — including the IPC handler thread that receives the inbound pipe request.
+History reads moved server-side in PR 7.2 (`IHistoryRouter`). Galaxy no longer implements `IHistoryProvider` of its own.
 
-## Win32 Message Pump (Host-side)
+`IAlarmSource` was retired with PR 7.2 and **restored in PR B.2** of the
+alarms-over-gateway epic ([docs/plans/alarms-over-gateway.md](../plans/alarms-over-gateway.md)).
+Alarm transitions arrive on the same gateway `StreamEvents` channel as
+data-change events under the new `MX_EVENT_FAMILY_ON_ALARM_TRANSITION`
+family; acknowledgements route through the gateway's
+`AcknowledgeAlarm` RPC. The previous value-driven sub-attribute path
+remains as a fallback for Galaxy templates without `$Alarm*`
+extensions — the server-side `AlarmConditionService` dedups when both
+paths fire on the same condition. See [docs/AlarmTracking.md](../AlarmTracking.md)
+for the v2-final architecture.
 
-COM callbacks (`OnDataChange`, `OnWriteComplete`) are delivered through the Windows message loop. `StaComThread` runs a standard Win32 message pump via P/Invoke:
+## Project Layout
 
-1. `PeekMessage` primes the message queue (required before `PostThreadMessage` works)
-2. `GetMessage` blocks until a message arrives
-3. `WM_APP` drains the work queue
-4. `WM_APP + 1` drains the queue and posts `WM_QUIT` to exit the loop
-5. All other messages go through `TranslateMessage` / `DispatchMessage` for COM callback delivery
+The driver ships as a single project: `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/` (.NET 10, AnyCPU). Sub-folders:
 
-Without this pump MXAccess callbacks never fire and the driver delivers no live data.
+| Folder | Role |
+|--------|------|
+| `Browse/` | Static-side discovery: `GalaxyDiscoverer` walks the gateway's hierarchy + attribute-set RPCs, `DataTypeMap` and `SecurityMap` translate Galaxy types and security classifications into OPC UA equivalents, `AlarmRefBuilder` extracts alarm-bearing attribute references for the server-layer alarm engine. `IGalaxyHierarchySource` + `GatewayGalaxyHierarchySource` + `TracedGalaxyHierarchySource` decorate the gateway browse RPC; `IGalaxyDeployWatchSource` + `GatewayGalaxyDeployWatchSource` + `DeployWatcher` drive `IRediscoverable`. |
+| `Runtime/` | Live data path: `EventPump` runs the gateway's `StreamEvents` RPC and fans out to subscribers via a bounded channel; `GalaxyMxSession` is the read-side handle; `GatewayGalaxySubscriber` + `GatewayGalaxyDataWriter` (each with a `Traced*` decorator) implement `ISubscribable` / `IWritable`; `SubscriptionRegistry` tracks subscription state for replay; `ReconnectSupervisor` owns the backoff loop and triggers `ReplaySubscriptions` on session loss; `StatusCodeMap` translates gateway StatusCodes to OPC UA; `MxValueDecoder` / `MxValueEncoder` handle scalar + array marshalling; `GalaxyTelemetry` + `GalaxySubscriptionHandle` round out the surface. |
+| `Health/` | `HostStatusAggregator` rolls per-platform probe state into the driver's `IHostConnectivityProbe` view; `PerPlatformProbeWatcher` listens on the gateway's per-host status stream; `HostConnectivityForwarder` pushes transitions out to the server's connectivity bus. |
+| `Config/` | `GalaxyDriverOptions` and the four nested option records (`GalaxyGatewayOptions`, `GalaxyMxAccessOptions`, `GalaxyRepositoryOptions`, `GalaxyReconnectOptions`). |
 
-## LMXProxyServer COM Object
+Project root files:
 
-`MxProxyAdapter` wraps the real `ArchestrA.MxAccess.LMXProxyServer` COM object behind the `IMxProxy` interface so Host unit tests can substitute a fake proxy without requiring the ArchestrA runtime. Lifecycle:
+- `GalaxyDriver.cs` — `IDriver` + capability-interface implementation; composes the Browse / Runtime / Health collaborators.
+- `GalaxyDriverFactoryExtensions.cs` — DI registration helper used by the server's driver bootstrap.
 
-1. **`Register(clientName)`** — Creates a new `LMXProxyServer` instance, wires up `OnDataChange` and `OnWriteComplete` event handlers, calls `Register` to obtain a connection handle
-2. **`Unregister(handle)`** — Unwires event handlers, calls `Unregister`, releases the COM object via `Marshal.ReleaseComObject`
+## Capability Surface
 
-## Register / AddItem / AdviseSupervisory Pattern
+`GalaxyDriver : IDriver, ITagDiscovery, IReadable, IWritable, ISubscribable, IRediscoverable, IHostConnectivityProbe, IDisposable`.
 
-Every MXAccess data operation follows a three-step pattern, all executed on the STA thread:
+| Capability | Implementation entry point |
+|------------|---------------------------|
+| `ITagDiscovery` | `Browse/GalaxyDiscoverer.cs` |
+| `IRediscoverable` | `Browse/DeployWatcher.cs` |
+| `IReadable` | `Runtime/GalaxyMxSession.cs` |
+| `IWritable` | `Runtime/GatewayGalaxyDataWriter.cs` |
+| `ISubscribable` | `Runtime/GatewayGalaxySubscriber.cs` (driven by `EventPump`) |
+| `IHostConnectivityProbe` | `Health/HostStatusAggregator.cs` |
 
-1. **`AddItem(handle, address)`** — Resolves a Galaxy tag reference (e.g., `TestMachine_001.MachineID`) to an integer item handle
-2. **`AdviseSupervisory(handle, itemHandle)`** — Subscribes the item for supervisory data-change callbacks
-3. The runtime begins delivering `OnDataChange` events
+## Configuration
 
-For writes, after `AddItem` + `AdviseSupervisory`, `Write(handle, itemHandle, value, securityClassification)` sends the value; `OnWriteComplete` confirms or rejects. Cleanup reverses: `UnAdviseSupervisory` then `RemoveItem`.
+`DriverConfig` JSON binds to `Config/GalaxyDriverOptions.cs`. The four sections are:
 
-## OnDataChange and OnWriteComplete Callbacks
+- **`Gateway`** — endpoint, API key secret ref, TLS knobs, connect/call/stream timeouts. `StreamTimeoutSeconds = 0` keeps the long-lived `StreamEvents` RPC open for the driver's lifetime.
+- **`MxAccess`** — `ClientName` (must be unique per OtOpcUa instance — redundancy pairs enforce uniqueness at install time), `PublishingIntervalMs` (forwarded as `buffered_update_interval_ms` on subscribe), `WriteUserId` for ArchestrA secured-write, `EventPumpChannelCapacity` (default 50_000 — one second of headroom at 50k tags / 1Hz; tune via the `galaxy.events.dropped` metric).
+- **`Repository`** — `DiscoverPageSize`, `WatchDeployEvents`.
+- **`Reconnect`** — `InitialBackoffMs`, `MaxBackoffMs`, `ReplayOnSessionLost` (calls the gateway's `ReplaySubscriptions` RPC after reconnect rather than re-issuing subscribe-bulk for every tag).
 
-### OnDataChange
+Full per-field descriptions live in `Config/GalaxyDriverOptions.cs`. The full JSON skeleton is reproduced in [docs/v2/driver-specs.md §1](../v2/driver-specs.md).
 
-Fired by the COM runtime on the STA thread when a subscribed tag changes. The handler in `MxAccessClient.EventHandlers.cs`:
+## Reconnect + Replay
 
-1. Maps the integer `phItemHandle` back to a tag address via `_handleToAddress`
-2. Maps the MXAccess quality code to the internal `Quality` enum
-3. Checks `MXSTATUS_PROXY` for error details and adjusts quality
-4. Converts the timestamp to UTC
-5. Constructs a `Vtq` (Value/Timestamp/Quality) and delivers it to:
-   - The stored per-tag subscription callback
-   - Any pending one-shot read completions
-   - The global `OnTagValueChanged` event (consumed by the Host's subscription dispatcher, which packages changes into `DataChangeEventArgs` and forwards them over the pipe to `GalaxyProxyDriver.OnDataChange`)
+`ReconnectSupervisor` owns an exponential-backoff loop bounded by `Reconnect.InitialBackoffMs` / `MaxBackoffMs`. On session loss it tears down the gRPC channel, redials, and — when `ReplayOnSessionLost = true` — calls the gateway's `ReplaySubscriptions` RPC with the cached subscription set from `SubscriptionRegistry` instead of re-subscribing tag-by-tag. The gateway's worker then re-issues `AdviseSupervisory` server-side under the apartment lock.
 
-### OnWriteComplete
+## Testing
 
-Fired when the runtime acknowledges or rejects a write. The handler resolves the pending `TaskCompletionSource<bool>` for the item handle. If `MXSTATUS_PROXY.success == 0` the write is considered failed and the error detail is logged.
+- **Unit tests**: `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Tests/` — fakes the gateway gRPC surface; covers Browse, Runtime, Health, and Config in isolation.
+- **Parity rig + dev-rig walkthrough**: see [docs/v2/Galaxy.ParityRig.md](../v2/Galaxy.ParityRig.md). The rig stands up a real `mxaccessgw` against a live Galaxy and exercises the full read / write / subscribe / rediscover path.
+- **Performance + soak**: see [docs/v2/Galaxy.Performance.md](../v2/Galaxy.Performance.md).
 
-## Reconnection Logic
+## Operational Notes
 
-`MxAccessClient` implements automatic reconnection through two mechanisms.
-
-### Monitor loop
-
-`StartMonitor` launches a background task that polls at `MonitorIntervalSeconds`. On each cycle:
-
-- If the state is `Disconnected` or `Error` and `AutoReconnect` is enabled, it calls `ReconnectAsync`
-- If connected and a probe tag is configured, it checks the probe staleness threshold
-
-### Reconnect sequence
-
-`ReconnectAsync` performs a full disconnect-then-connect cycle:
-
-1. Increment the reconnect counter
-2. `DisconnectAsync` — tear down all active subscriptions (`UnAdviseSupervisory` + `RemoveItem` for each), detach COM event handlers, call `Unregister`, clear all handle mappings
-3. `ConnectAsync` — create a fresh `LMXProxyServer`, register, replay all stored subscriptions, re-subscribe the probe tag
-
-Stored subscriptions (`_storedSubscriptions`) persist across reconnects. `ReplayStoredSubscriptionsAsync` iterates the stored entries and calls `AddItem` + `AdviseSupervisory` for each.
-
-## Probe Tag Health Monitoring
-
-A configurable probe tag (e.g., a frequently updating Galaxy attribute) serves as a connection health indicator. After connecting, the client subscribes to the probe tag and records `_lastProbeValueTime` on every `OnDataChange`. The monitor loop compares `DateTime.UtcNow - _lastProbeValueTime` against `ProbeStaleThresholdSeconds`; if the probe has not updated within the window, the connection is assumed stale and a reconnect is forced. This catches scenarios where the COM connection is technically alive but the runtime has stopped delivering data.
-
-## Per-Host Runtime Status Probes (`<Host>.ScanState`)
-
-Separate from the connection-level probe, the driver advises `<HostName>.ScanState` on every deployed `$WinPlatform` and `$AppEngine` in the Galaxy. These probes track per-host runtime state so the Admin UI dashboard can report "this specific Platform / AppEngine is off scan" and the driver can proactively invalidate every OPC UA variable hosted by the stopped object — preventing MXAccess from serving stale Good-quality cached values to clients who read those tags while the host is down.
-
-Enabled by default via `MxAccess.RuntimeStatusProbesEnabled`; see [Configuration](../Configuration.md#mxaccess) for the two config fields.
-
-### How it works
-
-`GalaxyRuntimeProbeManager` lives in `Driver.Galaxy.Host` alongside the rest of the MXAccess code. It is owned by the Host's subscription dispatcher and runs a three-state machine per host (Unknown / Running / Stopped):
-
-1. **Discovery** — After the Host completes `BuildAddressSpace`, the manager filters the hierarchy to rows where `CategoryId == 1` (`$WinPlatform`) or `CategoryId == 3` (`$AppEngine`) and issues `AdviseSupervisory` for `<TagName>.ScanState` on each one. Probes are driver-owned, not ref-counted against client subscriptions, and persist across address-space rebuilds via a `Sync` diff.
-2. **Transition predicate** — A probe callback is interpreted as `isRunning = vtq.Quality.IsGood() && vtq.Value is bool b && b`. Everything else (explicit `ScanState = false`, bad quality, communication errors) means **Stopped**.
-3. **On-change-only delivery** — `ScanState` is delivered only when the value actually changes. A stably Running host may go hours without a callback. `Tick()` does NOT run a starvation check on Running entries — the only time-based transition is **Unknown → Stopped** when the initial callback hasn't arrived within `RuntimeStatusUnknownTimeoutSeconds` (default 15s). This protects against a probe that fails to resolve at all without incorrectly flipping healthy long-running hosts.
-4. **Transport gating** — When `IMxAccessClient.State != Connected`, `GetSnapshot()` forces every entry to `Unknown`. The dashboard shows the Connection panel as the primary signal in that case rather than misleading operators with "every host stopped".
-5. **Subscribe failure rollback** — If `SubscribeAsync` throws for a new probe (SDK failure, broker rejection, transport error), the manager rolls back both `_byProbe` and `_probeByGobjectId` so the probe never appears in `GetSnapshot()`. Stability review 2026-04-13 Finding 1.
-
-### Subtree quality invalidation on transition
-
-When a host transitions **Running → Stopped**, the probe manager invokes a callback that walks `_hostedVariables[gobjectId]` — the set of every OPC UA variable transitively hosted by that Galaxy object — and sets each variable's `StatusCode` to `BadOutOfService`. **Stopped → Running** calls `ClearHostVariablesBadQuality` to reset each to `Good` so the next on-change MXAccess update repopulates the value.
-
-The hosted-variables map is built once per `BuildAddressSpace` by walking each object's `HostedByGobjectId` chain up to the nearest Platform or Engine ancestor. A variable hosted by an Engine inside a Platform lands in both the Engine's list and the Platform's list, so stopping the Platform transitively invalidates every descendant Engine's variables.
-
-### Read-path short-circuit (`IsTagUnderStoppedHost`)
-
-The Host's Read handler checks `IsTagUnderStoppedHost(tagRef)` (a reverse-index lookup `_hostIdsByTagRef[tagRef]` → `GalaxyRuntimeProbeManager.IsHostStopped(hostId)`) before the MXAccess round-trip. When the owning host is Stopped, the handler returns a synthesized `DataValue { Value = cachedVar.Value, StatusCode = BadOutOfService }` directly without touching MXAccess. This guarantees clients see a uniform `BadOutOfService` on every descendant tag of a stopped host, regardless of whether they're reading or subscribing.
-
-### Deferred dispatch — the STA deadlock
-
-**Critical**: probe transition callbacks must **not** run synchronously on the STA thread that delivered the `OnDataChange`. `MarkHostVariablesBadQuality` takes the subscription dispatcher lock, which may be held by a worker thread currently inside `Read` waiting on an `_mxAccessClient.ReadAsync()` round-trip that is itself waiting for the STA thread. Classic circular wait — the first real deploy of this feature hung inside 30 seconds from exactly this pattern.
-
-The fix is a deferred-dispatch queue: probe callbacks enqueue the transition onto `ConcurrentQueue<(int GobjectId, bool Stopped)>` and set the existing dispatch signal. The dispatch thread drains the queue inside its existing 100ms `WaitOne` loop — outside any locks held by the STA path — and then calls `MarkHostVariablesBadQuality` / `ClearHostVariablesBadQuality` under its own natural lock acquisition. No circular wait, no STA involvement.
-
-### Dashboard and health surface
-
-- Admin UI **Galaxy Runtime** panel shows per-host state with Name / Kind / State / Since / Last Error columns. Panel color is green (all Running), yellow (any Unknown, none Stopped), red (any Stopped), gray (MXAccess transport disconnected)
-- `HealthCheckService.CheckHealth` rolls overall driver health to `Degraded` when any host is Stopped
-
-See [Status Dashboard](../StatusDashboard.md#galaxy-runtime) for the field table and [Configuration](../Configuration.md#mxaccess) for the config fields.
-
-## Request Timeout Safety Backstop
-
-Every sync-over-async site on the OPC UA stack thread that calls into Galaxy (`Read`, `Write`, address-space rebuild probe sync) is wrapped in a bounded `SyncOverAsync.WaitSync(...)` helper with timeout `MxAccess.RequestTimeoutSeconds` (default 30s). Inner `ReadTimeoutSeconds` / `WriteTimeoutSeconds` bounds on the async path are the first line of defense; the outer wrapper is a backstop so a scheduler stall, slow reconnect, or any other non-returning async path cannot park the stack thread indefinitely.
-
-On timeout, the underlying task is **not** cancelled — it runs to completion on the thread pool and is abandoned. This is acceptable because Galaxy IPC clients are shared singletons and the abandoned continuation does not capture request-scoped state. The OPC UA stack receives `StatusCodes.BadTimeout` on the affected operation.
-
-`ConfigurationValidator` enforces `RequestTimeoutSeconds >= 1` and warns when it is set below the inner Read/Write timeouts (operator misconfiguration). Stability review 2026-04-13 Finding 3.
-
-All capability calls at the Server dispatch layer are additionally wrapped by `CapabilityInvoker` (Core/Resilience/) which runs them through a Polly pipeline keyed on `(DriverInstanceId, HostName, DriverCapability)`. `OTOPCUA0001` analyzer enforces the wrap at build time.
-
-## Why Marshal.ReleaseComObject Is Needed
-
-The .NET Framework runtime's garbage collector releases COM references non-deterministically. For MXAccess, delayed release can leave stale COM connections open, preventing clean re-registration. `MxProxyAdapter.Unregister` calls `Marshal.ReleaseComObject(_lmxProxy)` in a `finally` block to immediately drive the COM reference count to zero. This ensures the underlying COM server is freed before a reconnect attempt creates a new instance.
-
-## Tag Discovery and Historical Data
-
-Tag discovery (the Galaxy Repository SQL reader + `LocalPlatform` scope filter) is covered in [Galaxy-Repository.md](Galaxy-Repository.md). The Galaxy driver is `ITagDiscovery` for the Server's bootstrap path and `IRediscoverable` for the on-change-redeploy path.
-
-Historical data access (raw, processed, at-time, events) runs against the Aveva Historian via the `aahClientManaged` SDK and is exposed through the Galaxy driver's `IHistoryProvider` implementation. See [HistoricalDataAccess.md](../HistoricalDataAccess.md).
-
-## Key source files
-
-Host-side (`.NET 4.8 x86`, `src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/`):
-
-- `Backend/MxAccess/StaComThread.cs` — STA thread and Win32 message pump
-- `Backend/MxAccess/MxAccessClient.cs` — Core client (partial)
-- `Backend/MxAccess/MxAccessClient.Connection.cs` — Connect / disconnect / reconnect
-- `Backend/MxAccess/MxAccessClient.Subscription.cs` — Subscribe / unsubscribe / replay
-- `Backend/MxAccess/MxAccessClient.ReadWrite.cs` — Read and write operations
-- `Backend/MxAccess/MxAccessClient.EventHandlers.cs` — `OnDataChange` / `OnWriteComplete` handlers
-- `Backend/MxAccess/MxAccessClient.Monitor.cs` — Background health monitor
-- `Backend/MxAccess/MxProxyAdapter.cs` — COM object wrapper
-- `Backend/MxAccess/GalaxyRuntimeProbeManager.cs` — Per-host `ScanState` probes, state machine, `IsHostStopped` lookup
-- `Backend/Historian/HistorianDataSource.cs` — `aahClientManaged` SDK wrapper (see [HistoricalDataAccess.md](../HistoricalDataAccess.md))
-- `Ipc/GalaxyIpcServer.cs` — Named-pipe server, message dispatch
-- `Domain/IMxAccessClient.cs` — Client interface
-
-Shared (`.NET Standard 2.0`, `src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared/`):
-
-- `Contracts/MessageKind.cs` — IPC message kinds (`ReadRequest`, `HistoryReadRequest`, `OpenSessionResponse`, …)
-- `Contracts/*.cs` — MessagePack DTOs for every request/response pair
-
-Proxy-side (`.NET 10`, `src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy/`):
-
-- `GalaxyProxyDriver.cs` — `IDriver`/`ITagDiscovery`/`IReadable`/`IWritable`/`ISubscribable`/`IAlarmSource`/`IHistoryProvider`/`IRediscoverable`/`IHostConnectivityProbe` implementation; every method forwards via `GalaxyIpcClient`
-- `Ipc/GalaxyIpcClient.cs` — Named-pipe client, `CallAsync<TReq, TResp>`, reconnect on broken pipe
-- `GalaxyProxySupervisor.cs` — Host-process monitor, crash-loop circuit-breaker, Host relaunch
+- **MXAccess `ClientName` collisions**: two OtOpcUa instances sharing a `ClientName` cause the older Wonderware session to lose subscription state. Redundancy pairs (decision #149) enforce uniqueness via install scripts.
+- **Channel saturation**: `galaxy.events.dropped > 0` indicates `EventPump` is back-pressured. Raise `EventPumpChannelCapacity` or investigate downstream slowness in the server-side fan-out.
+- **Connectivity surface**: per-platform probe state is exposed through `IHostConnectivityProbe` and aggregated by the server's connectivity bus — there is no driver-private dashboard surface anymore. The Admin UI's Host Status panel is the consumer.

docs/drivers/Modbus-Test-Fixture.md

@@ -13,7 +13,7 @@ shaped (neither is a Modbus-side concept).
 
 - **Simulator**: `pymodbus` (Python, BSD) launched as a pinned Docker
   container at
-  `tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Docker/`.
+  `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Docker/`.
   Docker is the only supported launch path.
 - **Lifecycle**: `ModbusSimulatorFixture` (collection-scoped) TCP-probes
   `localhost:5020` on first use. `MODBUS_SIM_ENDPOINT` env var overrides the
@@ -115,9 +115,9 @@ Not a Modbus concept. Driver doesn't implement `IAlarmSource` or
 
 ## Key fixture / config files
 
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/ModbusSimulatorFixture.cs`
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205Profile.cs`
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Mitsubishi/MitsubishiProfile.cs`
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/S7/S7_1500Profile.cs`
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Docker/` —
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/ModbusSimulatorFixture.cs`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/DL205/DL205Profile.cs`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Mitsubishi/MitsubishiProfile.cs`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/S7/S7_1500Profile.cs`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Docker/` —
   Dockerfile + compose + per-family JSON profiles

docs/drivers/OpcUaClient-Test-Fixture.md

@@ -18,7 +18,7 @@ image (follow-up).
 ## What the fixture is
 
 **Integration layer** (task #215):
-`tests/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.IntegrationTests/` stands up
+`tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.IntegrationTests/` stands up
 `mcr.microsoft.com/iotedge/opc-plc:2.14.10` via `Docker/docker-compose.yml`
 on `opc.tcp://localhost:50000`. `OpcPlcFixture` probes the port at
 collection init + skips tests with a clear message when the container's
@@ -30,7 +30,7 @@ resets on each spin-up), `--alm` (alarm simulation for IAlarmSource
 follow-up coverage), `--pn=50000` (port).
 
 **Unit layer**:
-`tests/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/` is still the primary
+`tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/` is still the primary
 coverage. Tests inject fakes through the driver's construction path; the
 OPCFoundation.NetStandard `Session` surface is wrapped behind an interface
 the tests mock.
@@ -137,7 +137,7 @@ ConditionType events (non-base `BaseEventType`) is not verified.
 
 The easiest win here is to **wire the client driver tests against this
 repo's own server**. The integration test project
-`tests/ZB.MOM.WW.OtOpcUa.Server.Tests/OpcUaServerIntegrationTests.cs`
+`tests/Server/ZB.MOM.WW.OtOpcUa.Server.Tests/OpcUaServerIntegrationTests.cs`
 already stands up a real OPC UA server on a non-default port with a seeded
 FakeDriver. An `OpcUaClientLiveLoopbackTests` that connects the client
 driver to that server would give:
@@ -161,10 +161,10 @@ Beyond that:
 
 ## Key fixture / config files
 
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/` — unit tests with
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.Tests/` — unit tests with
   mocked `Session`
-- `src/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient/OpcUaClientDriver.cs` — ctor +
+- `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient/OpcUaClientDriver.cs` — ctor +
   session-factory seam tests mock through
-- `tests/ZB.MOM.WW.OtOpcUa.Server.Tests/OpcUaServerIntegrationTests.cs` —
+- `tests/Server/ZB.MOM.WW.OtOpcUa.Server.Tests/OpcUaServerIntegrationTests.cs` —
   the server-side integration harness a future loopback client test could
   piggyback on

docs/drivers/README.md

@@ -1,6 +1,6 @@
 # Drivers
 
-OtOpcUa is a multi-driver OPC UA server. The Core (`ZB.MOM.WW.OtOpcUa.Core` + `Core.Abstractions` + `Server`) owns the OPC UA stack, address space, session/security/subscription machinery, resilience pipeline, and namespace kinds (Equipment + SystemPlatform). Drivers plug in through **capability interfaces** defined in `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/`:
+OtOpcUa is a multi-driver OPC UA server. The Core (`ZB.MOM.WW.OtOpcUa.Core` + `Core.Abstractions` + `Server`) owns the OPC UA stack, address space, session/security/subscription machinery, resilience pipeline, and namespace kinds (Equipment + SystemPlatform). Drivers plug in through **capability interfaces** defined in `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/`:
 
 - `IDriver` — lifecycle (`InitializeAsync`, `ReinitializeAsync`, `ShutdownAsync`, `GetHealth`)
 - `IReadable` / `IWritable` — one-shot reads and writes
@@ -14,7 +14,7 @@ OtOpcUa is a multi-driver OPC UA server. The Core (`ZB.MOM.WW.OtOpcUa.Core` + `C
 
 Each driver opts into only the capabilities it supports. Every async capability call at the Server dispatch layer goes through `CapabilityInvoker` (`Core/Resilience/CapabilityInvoker.cs`), which wraps it in a Polly pipeline keyed on `(DriverInstanceId, HostName, DriverCapability)`. The `OTOPCUA0001` analyzer enforces the wrap at build time. Drivers themselves never depend on Polly; they just implement the capability interface and let the Core wrap it.
 
-Driver type metadata is registered at startup in `DriverTypeRegistry` (`src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverTypeRegistry.cs`). The registry records each type's allowed namespace kinds (`Equipment` / `SystemPlatform` / `Simulated`), its JSON Schema for `DriverConfig` / `DeviceConfig` / `TagConfig` columns, and its stability tier per [docs/v2/driver-stability.md](../v2/driver-stability.md).
+Driver type metadata is registered at startup in `DriverTypeRegistry` (`src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverTypeRegistry.cs`). The registry records each type's allowed namespace kinds (`Equipment` / `SystemPlatform` / `Simulated`), its JSON Schema for `DriverConfig` / `DeviceConfig` / `TagConfig` columns, and its stability tier per [docs/v2/driver-stability.md](../v2/driver-stability.md).
 
 ## Ground-truth driver list
 
@@ -26,7 +26,7 @@ Driver type metadata is registered at startup in `DriverTypeRegistry` (`src/ZB.M
 | AB CIP | `Driver.AbCip` | A | libplctag CIP | IDriver, ITagDiscovery, IReadable, IWritable, ISubscribable, IHostConnectivityProbe, IPerCallHostResolver, IAlarmSource | ControlLogix / CompactLogix. Tag discovery uses the `@tags` walker to enumerate controller-scoped + program-scoped symbols; UDT member resolution via the UDT template reader |
 | AB Legacy | `Driver.AbLegacy` | A | libplctag PCCC | IDriver, ITagDiscovery, IReadable, IWritable, ISubscribable, IHostConnectivityProbe, IPerCallHostResolver | SLC 500 / MicroLogix. File-based addressing (`N7:0`, `F8:0`) — no symbol table, tag list is user-authored in the config DB |
 | TwinCAT | `Driver.TwinCAT` | B | Beckhoff `TwinCAT.Ads` (`TcAdsClient`) | IDriver, ITagDiscovery, IReadable, IWritable, ISubscribable, IHostConnectivityProbe, IPerCallHostResolver | The only native-notification driver outside Galaxy — ADS delivers `ValueChangedCallback` events the driver forwards straight to `ISubscribable.OnDataChange` without polling. Symbol tree uploaded via `SymbolLoaderFactory` |
-| FOCAS | `Driver.FOCAS` | C | FANUC FOCAS2 (`Fwlib32.dll` P/Invoke) | IDriver, ITagDiscovery, IReadable, IWritable, ISubscribable, IHostConnectivityProbe, IPerCallHostResolver | Tier C — FOCAS DLL has crash modes that warrant process isolation. CNC-shaped data model (axes, spindle, PMC, macros, alarms) not a flat tag map |
+| [FOCAS](FOCAS.md) | `Driver.FOCAS` | A | Pure-managed `FocasWireClient` — FOCAS/2 Ethernet binary protocol on TCP:8193, inlined into the driver assembly | IDriver, ITagDiscovery, IReadable, ISubscribable, IHostConnectivityProbe, IPerCallHostResolver, IAlarmSource | Read-only by design (WriteAsync returns `BadNotWritable`). CNC-shaped data model (axes, spindle, PMC, macros, alarms) not a flat tag map. Previously Tier-C (Host + P/Invoke + shim DLL); retired in the 2026-04-24 migration when the managed wire client landed |
 | OPC UA Client | `Driver.OpcUaClient` | B | OPCFoundation `Opc.Ua.Client` | IDriver, ITagDiscovery, IReadable, IWritable, ISubscribable, IAlarmSource, IHistoryProvider, IHostConnectivityProbe | Gateway/aggregation driver. Opens a single `Session` against a remote OPC UA server and re-exposes its address space. Owns its own `ApplicationConfiguration` (distinct from `Client.Shared`) because it's always-on with keep-alive + `TransferSubscriptions` across SDK reconnect, not an interactive CLI |
 
 ## Per-driver documentation
@@ -35,6 +35,9 @@ Driver type metadata is registered at startup in `DriverTypeRegistry` (`src/ZB.M
   - [Galaxy.md](Galaxy.md) — COM bridge, STA pump, IPC, runtime probes
   - [Galaxy-Repository.md](Galaxy-Repository.md) — ZB SQL reader, `LocalPlatform` scope filter, change detection
 
+- **FOCAS** has a short getting-started doc because the Tier-C two-project deployment + backend-selection env var + alarm projection opt-in all need explaining up front:
+  - [FOCAS.md](FOCAS.md) — deployment, config, capability surface, alarm projection, troubleshooting
+
 - **All other drivers** share a single per-driver specification in [docs/v2/driver-specs.md](../v2/driver-specs.md) — addressing, data-type maps, connection settings, and quirks live there. That file is the authoritative per-driver reference; this index points at it rather than duplicating.
 
 ## Test-fixture coverage maps

docs/drivers/S7-Test-Fixture.md

@@ -14,7 +14,7 @@ session types, PUT/GET-disabled enforcement — all need real hardware.
 ## What the fixture is
 
 **Integration layer** (task #216):
-`tests/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/` stands up a
+`tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/` stands up a
 python-snap7 `Server` via `Docker/docker-compose.yml --profile s7_1500`
 on `localhost:1102` (pinned `python:3.12-slim-bookworm` base +
 `python-snap7>=2.0`). Docker is the only supported launch path.
@@ -24,7 +24,7 @@ clear message when unreachable (matches the pymodbus pattern).
 + seeds DB/MB bytes at declared offsets; seeds are typed (`u16` / `i16`
 / `i32` / `f32` / `bool` / `ascii` for S7 STRING).
 
-**Unit layer**: `tests/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/` covers
+**Unit layer**: `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/` covers
 everything the wire-level suite doesn't — address parsing, error
 branches, probe-loop contract. All tests tagged
 `[Trait("Category", "Unit")]`.
@@ -115,7 +115,7 @@ from field deployments, not from the test suite.
 
 ## Key fixture / config files
 
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/` — unit tests only, no harness
-- `src/ZB.MOM.WW.OtOpcUa.Driver.S7/S7Driver.cs` — ctor takes
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.Tests/` — unit tests only, no harness
+- `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7/S7Driver.cs` — ctor takes
   `IS7ClientFactory` which tests fake; docstring lines 8-20 note the deferred
   integration fixture

docs/drivers/TwinCAT-Test-Fixture.md

@@ -2,60 +2,85 @@
 
 Coverage map + gap inventory for the Beckhoff TwinCAT ADS driver.
 
-**TL;DR:** Integration-test scaffolding lives at
-`tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/` (task #221).
-`TwinCATXarFixture` probes TCP 48898 on an operator-supplied VM; three
-smoke tests (read / write / native notification) run end-to-end through
-the real ADS stack when the VM is reachable, skip cleanly otherwise.
-**Remaining operational work**: stand up a TwinCAT 3 XAR runtime in a
-Hyper-V VM, author the `.tsproj` project documented at
-`TwinCatProject/README.md`, rotate the 7-day trial license (or buy a
-paid runtime). Unit tests via `FakeTwinCATClient` still carry the
-exhaustive contract coverage.
+**TL;DR:** Integration-test suite lives at
+`tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/`. `TwinCATXarFixture`
+probes TCP 48898 on an operator-supplied runtime; the suite runs **14
+`[TwinCATFact]` methods + one 16-case `[TwinCATTheory]` = 30 test cases** end-to-end
+through the real ADS stack when the runtime is reachable, skips cleanly
+otherwise. The runtime can be a Hyper-V XAR VM or a TCBSD VM
+(`TwinCatProject/README.md` covers both). Unit tests via `FakeTwinCATClient`
+still carry the exhaustive contract coverage alongside.
 
-TwinCAT is the only driver outside Galaxy that uses **native
-notifications** (no polling) for `ISubscribable`, and the fake exposes a
-fire-event harness so notification routing is contract-tested rigorously
-at the unit layer.
+TwinCAT is the only driver outside Galaxy that uses **native notifications**
+(no polling) for `ISubscribable`. The integration suite verifies that path on
+the wire; the fake exposes a fire-event harness so notification routing is
+also contract-tested rigorously at the unit layer.
 
 ## What the fixture is
 
-**Integration layer** (task #221, scaffolded):
-`tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/` —
-`TwinCATXarFixture` TCP-probes ADS port 48898 on the host specified by
-`TWINCAT_TARGET_HOST` + requires `TWINCAT_TARGET_NETID` (AmsNetId of the
-VM). No fixture-owned lifecycle — XAR can't run in Docker because it
-bypasses the Windows kernel scheduler, so the VM stays
-operator-managed. `TwinCatProject/README.md` documents the required
-`.tsproj` project state; the file itself lands once the XAR VM is up +
-the project is authored. Three smoke tests:
-`Driver_reads_seeded_DINT_through_real_ADS`,
-`Driver_write_then_read_round_trip_on_scratch_REAL`, and
-`Driver_subscribe_receives_native_ADS_notifications_on_counter_changes`
-— all skip cleanly via `[TwinCATFact]` when the runtime isn't
-reachable.
+**Integration layer**: `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/`
+— `TwinCATXarFixture` TCP-probes ADS port 48898 on the host supplied by
+`TWINCAT_TARGET_HOST` (defaults to `localhost`) + requires
+`TWINCAT_TARGET_NETID` (AmsNetId of the runtime). Optionally takes
+`TWINCAT_TARGET_PORT` (default `851` = TC3 PLC runtime 1). No fixture-owned
+lifecycle — XAR / TCBSD can't run in Docker because they bypass the host
+kernel scheduler, so the runtime stays operator-managed.
+`TwinCatProject/README.md` documents the required project state; the tests
+gate on `[TwinCATFact]` / `[TwinCATTheory]` and skip cleanly when
+`TWINCAT_TARGET_NETID` is unset or the probe fails.
 
-**Unit layer**: `tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/` is
-still the primary coverage. `FakeTwinCATClient` also fakes the
-`AddDeviceNotification` flow so tests can trigger callbacks without a
-running runtime.
+**Unit layer**: `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/` remains the
+primary contract coverage. `FakeTwinCATClient` fakes the
+`AddDeviceNotification` flow so tests can trigger callbacks without a running
+runtime.
 
 ## What it actually covers
 
-### Integration (XAR VM, task #221 — code scaffolded, needs VM + project)
+### Integration (live runtime)
 
-- `TwinCAT3SmokeTests.Driver_reads_seeded_DINT_through_real_ADS` — real AMS
-  handshake + ADS read of `GVL_Fixture.nCounter` (seeded at 1234, MAIN
-  increments each cycle)
-- `TwinCAT3SmokeTests.Driver_write_then_read_round_trip_on_scratch_REAL` —
-  real ADS write + read on `GVL_Fixture.rSetpoint`
-- `TwinCAT3SmokeTests.Driver_subscribe_receives_native_ADS_notifications_on_counter_changes`
-  — real `AddDeviceNotification` against the cycle-incrementing counter;
-  observes `OnDataChange` firing within 3 s of subscribe
+Every capability the driver implements is exercised on the wire:
 
-All three gated on `TWINCAT_TARGET_HOST` + `TWINCAT_TARGET_NETID` env
-vars; skip cleanly via `[TwinCATFact]` when the VM isn't reachable or
-vars are unset.
+- **Read** — `Driver_reads_seeded_DINT_through_real_ADS` (AMS handshake +
+  symbolic read of `GVL_Fixture.nCounter`)
+- **Write + read round-trip** — `Driver_write_then_read_round_trip_on_scratch_REAL`
+  on `GVL_Fixture.rSetpoint`
+- **Array element round-trip** — `Driver_round_trips_array_element_write_and_read`
+  on `GVL_Arrays.aReal1D[5]` (exercises `TwinCATSymbolPath` subscript
+  rendering)
+- **Subscribe (native ADS notifications)** —
+  `Driver_subscribe_receives_native_ADS_notifications_on_counter_changes`;
+  observes `OnDataChange` firing within 10 s of subscribe
+- **Symbol browse (direct client path)** —
+  `Driver_browses_committed_symbol_hierarchy_via_real_ADS` via
+  `ITwinCATClient.BrowseSymbolsAsync`
+- **Symbol browse (through DiscoverAsync + `IAddressSpaceBuilder` pipeline)** —
+  `DiscoverAsync_renders_declared_tags_and_controller_browse_hits_address_space_builder`
+  verifies the real `TwinCAT/ → device/ → Discovered/` folder tree
+- **Auto-reconnect** — `Driver_auto_reconnects_after_underlying_client_is_disposed`
+  disposes the `AdsClient` mid-flight; next read must re-establish
+- **Primitive type coverage** — `Driver_reads_every_primitive_type_with_correct_mapping`
+  runs as a `[Theory]` against the 16 primitives in `GVL_Primitives`
+  (Bool, SInt, USInt, Int, UInt, DInt, UDInt, LInt, ULInt, Real, LReal,
+  String, Time, TimeOfDay, Date, DateTime) — asserts status + CLR type +
+  seed value where ergonomic
+- **Bit-indexed BOOL** — `Driver_reads_bit_indexed_BOOL_from_word` against
+  `GVL_Primitives.vWord.3` + `.4` (bits of `0x​BEEF`)
+- **Nested UDT navigation** — `Driver_reads_deeply_nested_UDT_path` reads
+  `GVL_Plant.Line1.Stations[1].Axes[1].Motor.Temperature` (LREAL) + `.Running` (BOOL)
+- **Multi-device routing + isolation** —
+  `Driver_routes_reads_per_device_and_isolates_unreachable_peers` pairs the
+  real runtime with a bogus AmsNetId; healthy device reads still succeed
+- **Probe loop + `IHostConnectivityProbe`** —
+  `Probe_loop_raises_host_status_transition_to_Running_on_reachable_target`
+  asserts `OnHostStatusChanged → Running` and snapshot parity
+- **Negative error mappings** —
+  `Driver_reports_errors_for_unknown_tag_and_nonexistent_symbol_and_readonly_write`
+  covers `BadNodeIdUnknown`, ghost-symbol communication errors, and the
+  `BadNotWritable` short-circuit
+
+All tests gate on `TWINCAT_TARGET_NETID` (required) via `[TwinCATFact]` /
+`[TwinCATTheory]`; `TWINCAT_TARGET_HOST` (default `localhost`) and
+`TWINCAT_TARGET_PORT` (default `851`) are optional overrides.
 
 ### Unit
 
@@ -65,54 +90,69 @@ vars are unset.
 - `TwinCATReadWriteTests` — read + write through the fake, status mapping
 - `TwinCATSymbolPathTests` — symbol-path routing for nested struct members
 - `TwinCATSymbolBrowserTests` — `ITagDiscovery.DiscoverAsync` via
-  `ReadSymbolsAsync` (#188) + system-symbol filtering
-- `TwinCATNativeNotificationTests` — `AddDeviceNotification` (#189)
-  registration, callback-delivery-to-`OnDataChange` wiring, unregister on
-  unsubscribe
+  `BrowseSymbolsAsync` + system-symbol filtering
+- `TwinCATNativeNotificationTests` — `AddDeviceNotification` registration,
+  callback-delivery-to-`OnDataChange` wiring, unregister on unsubscribe
 - `TwinCATDriverTests` — `IDriver` lifecycle
 
-Capability surfaces whose contract is verified: `IDriver`, `IReadable`,
-`IWritable`, `ITagDiscovery`, `ISubscribable`, `IHostConnectivityProbe`,
-`IPerCallHostResolver`.
+Capability surfaces whose contract is verified at the unit layer: `IDriver`,
+`IReadable`, `IWritable`, `ITagDiscovery`, `ISubscribable`,
+`IHostConnectivityProbe`, `IPerCallHostResolver`. The integration suite now
+verifies `ITagDiscovery` + `IHostConnectivityProbe` on the wire as well.
+
+## Bugs caught by live runs
+
+The integration suite surfaced three driver defects that `FakeTwinCATClient`
+couldn't, since each lived below the abstraction boundary:
+
+1. **Notification cycle time unit** — `NotificationSettings(cycleTime, maxDelay)`
+   takes **milliseconds** per Beckhoff InfoSys
+   (`tcadsnetref/7313319051`), but the driver was multiplying by `10_000`
+   under a "100 ns units" assumption. A requested 250 ms cycle was being set
+   to ~41 minutes — subscribe never fired. Fix in `AdsTwinCATClient.AddNotificationAsync`.
+2. **`STRING(N)` / `WSTRING(N)` type mapper** — `MapSymbolTypeName` only
+   matched bare `"STRING"` / `"WSTRING"`, so sized strings (the common case)
+   fell off `BrowseSymbolsAsync` entirely. Fix: strip the `(…)` bound before
+   the switch.
+3. **Bit-indexed BOOL path** — driver was sending `"GVL.vWord.3"` to ADS as
+   a BOOL read. TwinCAT's symbol table doesn't expose bit-access paths; the
+   read returned `DeviceSymbolNotFound`. Fix: strip the `.N` suffix, read
+   the parent word as `uint`, extract the bit locally via `ExtractBit`.
+
+All three paths are now pinned by live-wire tests.
 
 ## What it does NOT cover
 
-### 1. AMS / ADS wire traffic
+### 1. AMS / ADS wire framing
 
-No real AMS router frame is exchanged. Beckhoff's `TwinCAT.Ads` NuGet (their
-own .NET SDK, not libplctag-style OSS) has no in-process fake; tests stub
-the `ITwinCATClient` abstraction above it.
+No raw AMS packet is inspected. Beckhoff's `TwinCAT.Ads` NuGet (their own
+.NET SDK, not libplctag-style OSS) has no in-process fake at the frame
+level; tests run against a real router.
 
 ### 2. Multi-route AMS
 
 ADS supports chained routes (`<localNetId> → <routerNetId> → <targetNetId>`)
 for PLCs behind an EC master / IPC gateway. Parse coverage exists; wire-path
-coverage doesn't.
+coverage is single-hop only.
 
-### 3. Notification reliability under jitter
+### 3. Notification coalescing under jitter
 
-`AddDeviceNotification` delivers at the runtime's cycle boundary; under high
-CPU load or network jitter real notifications can coalesce. The fake fires
-one callback per test invocation — real callback-coalescing behavior is
-untested.
+`AddDeviceNotification` delivers at the runtime's cycle boundary; under
+sustained CPU load or network jitter real notifications can coalesce. The
+live test only asserts at-least-one delivery within a generous window —
+coalescing behavior under stress isn't verified.
 
 ### 4. TC2 vs TC3 variant handling
 
 TwinCAT 2 (ADS v1) and TwinCAT 3 (ADS v2) have subtly different
-`GetSymbolInfoByName` semantics + symbol-table layouts. Driver targets TC3;
-TC2 compatibility is not exercised.
+`GetSymbolInfoByName` semantics + symbol-table layouts. Driver + tests target
+TC3; TC2 compatibility is not exercised.
 
-### 5. Cycle-time alignment for `ISubscribable`
+### 5. Alarms / history
 
-Native ADS notifications fire on the PLC cycle boundary. The fake test
-harness assumes notifications fire on a timer the test controls;
-cycle-aligned firing under real PLC control is not verified.
-
-### 6. Alarms / history
-
-Driver doesn't implement `IAlarmSource` or `IHistoryProvider` — not in
-scope for this driver family. TwinCAT 3's TcEventLogger could theoretically
-back an `IAlarmSource`, but shipping that is a separate feature.
+Driver doesn't implement `IAlarmSource` or `IHistoryProvider` — not in scope
+for this driver family. TwinCAT 3's TcEventLogger could theoretically back
+an `IAlarmSource`, but shipping that is a separate feature.
 
 ## When to trust TwinCAT tests, when to reach for a rig
 
@@ -122,37 +162,25 @@ back an `IAlarmSource`, but shipping that is a separate feature.
 | "Does notification → `OnDataChange` wire correctly?" | yes (contract) | yes |
 | "Does symbol browsing filter TwinCAT internals?" | yes | yes |
 | "Does a real ADS read return correct bytes?" | no | yes (required) |
-| "Do notifications coalesce under load?" | no | yes (required) |
+| "Does auto-reconnect work on router restart?" | no (contract only) | yes (required) |
+| "Do notifications coalesce under sustained load?" | no | yes (required) |
 | "Does a TC2 PLC work the same as TC3?" | no | yes (required) |
 
 ## Follow-up candidates
 
-1. **XAR VM live-population** — scaffolding is in place (this PR); the
-   remaining work is operational: stand up the Hyper-V VM, install XAR,
-   author the `.tsproj` per `TwinCatProject/README.md`, configure the
-   bilateral ADS route, set `TWINCAT_TARGET_HOST` + `TWINCAT_TARGET_NETID`
-   on the dev box. Then the three smoke tests transition skip → pass.
-   Tracked as #221.
-2. **License-rotation automation** — XAR's 7-day trial expires on
-   schedule. Either automate `TcActivate.exe /reactivate` via a
-   scheduled task on the VM (not officially supported; reportedly works
-   for some TC3 builds), or buy a paid runtime license (~$1k one-time
-   per runtime per CPU) to kill the rotation. The doc at
-   `TwinCatProject/README.md` §License rotation walks through both.
-3. **Lab rig** — cheapest IPC (CX7000 / CX9020) on a dedicated network;
-   the only route that covers TC2 + real EtherCAT I/O timing + cycle
-   jitter under CPU load.
+Deferred to v3 — see [`docs/v3/twincat-backlog.md`](../v3/twincat-backlog.md).
+Covers TC2 coverage, notification-coalescing-under-load, multi-hop AMS,
+license-rotation automation, and a dedicated lab IPC.
 
 ## Key fixture / config files
 
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCATXarFixture.cs`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCATXarFixture.cs`
   — TCP probe + skip-attributes + env-var parsing
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCAT3SmokeTests.cs`
-  — three wire-level smoke tests
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCatProject/README.md`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCAT3SmokeTests.cs`
+  — wire-level test suite (14 `[TwinCATFact]` + 16-case `[TwinCATTheory]`)
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCatProject/README.md`
   — project spec + VM setup + license-rotation notes
-- `tests/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/FakeTwinCATClient.cs` —
-  in-process fake with the notification-fire harness used by
-  `TwinCATNativeNotificationTests`
-- `src/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT/TwinCATDriver.cs` — ctor takes
-  `ITwinCATClientFactory`
+- `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.Tests/FakeTwinCATClient.cs` —
+  in-process fake with the notification-fire harness
+- `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT/TwinCATDriver.cs` — ctor is
+  `(TwinCATDriverOptions, string driverInstanceId, ITwinCATClientFactory? = null)`

docs/security.md

@@ -95,7 +95,7 @@ The Server accepts three OPC UA identity-token types:
 | Token | Handler | Notes |
 |---|---|---|
 | Anonymous | `IUserAuthenticator.AuthenticateAsync(username: "", password: "")` | Refused in strict mode unless explicit anonymous grants exist; allowed in lax mode for backward compatibility. |
-| UserName/Password | `LdapUserAuthenticator` (`src/ZB.MOM.WW.OtOpcUa.Server/Security/LdapUserAuthenticator.cs`) | LDAP bind + group lookup; resolved `LdapGroups` flow into the session's identity bearer (`ILdapGroupsBearer`). |
+| UserName/Password | `LdapUserAuthenticator` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/Security/LdapUserAuthenticator.cs`) | LDAP bind + group lookup; resolved `LdapGroups` flow into the session's identity bearer (`ILdapGroupsBearer`). |
 | X.509 Certificate | Stack-level acceptance + role mapping via CN | X.509 identity carries `AuthenticatedUser` + read roles; finer-grain authorization happens through the data-plane ACLs. |
 
 ### LDAP bind flow (`LdapUserAuthenticator`)
@@ -164,7 +164,7 @@ ACLs are evaluated against the UNS path:
 ClusterId → Namespace → UnsArea → UnsLine → Equipment → Tag
 ```
 
-Each level can carry `NodeAcl` rows (`src/ZB.MOM.WW.OtOpcUa.Configuration/Entities/NodeAcl.cs`) that grant a permission bundle to a set of `LdapGroups`.
+Each level can carry `NodeAcl` rows (`src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/NodeAcl.cs`) that grant a permission bundle to a set of `LdapGroups`.
 
 ### Permission flags
 
@@ -196,7 +196,7 @@ The three Write tiers map to Galaxy's v1 `SecurityClassification` — `FreeAcces
 
 ### Evaluator — `PermissionTrie`
 
-`src/ZB.MOM.WW.OtOpcUa.Core/Authorization/`:
+`src/Core/ZB.MOM.WW.OtOpcUa.Core/Authorization/`:
 
 | Class | Role |
 |---|---|
@@ -209,7 +209,7 @@ The three Write tiers map to Galaxy's v1 `SecurityClassification` — `FreeAcces
 
 ### Dispatch gate — `AuthorizationGate`
 
-`src/ZB.MOM.WW.OtOpcUa.Server/Security/AuthorizationGate.cs` bridges the OPC UA stack's `ISystemContext.UserIdentity` to the evaluator. `DriverNodeManager` holds exactly one reference to it and calls `IsAllowed(identity, OpcUaOperation.*, NodeScope)` on every Read, Write, HistoryRead, Browse, Subscribe, AckAlarm, Call path. A false return short-circuits the dispatch with `BadUserAccessDenied`.
+`src/Server/ZB.MOM.WW.OtOpcUa.Server/Security/AuthorizationGate.cs` bridges the OPC UA stack's `ISystemContext.UserIdentity` to the evaluator. `DriverNodeManager` holds exactly one reference to it and calls `IsAllowed(identity, OpcUaOperation.*, NodeScope)` on every Read, Write, HistoryRead, Browse, Subscribe, AckAlarm, Call path. A false return short-circuits the dispatch with `BadUserAccessDenied`.
 
 Key properties:
 
@@ -219,7 +219,7 @@ Key properties:
 
 ### Probe-this-permission (Admin UI)
 
-`PermissionProbeService` (`src/ZB.MOM.WW.OtOpcUa.Admin/Services/PermissionProbeService.cs`) lets an operator ask "if a user with groups X, Y, Z asked to do operation O on node N, would it succeed?" The answer is rendered in the AclsTab "Probe" dialog — same evaluator, same trie, so the Admin UI answer and the live Server answer cannot disagree.
+`PermissionProbeService` (`src/Server/ZB.MOM.WW.OtOpcUa.Admin/Services/PermissionProbeService.cs`) lets an operator ask "if a user with groups X, Y, Z asked to do operation O on node N, would it succeed?" The answer is rendered in the AclsTab "Probe" dialog — same evaluator, same trie, so the Admin UI answer and the live Server answer cannot disagree.
 
 ### Full model
 
@@ -235,7 +235,7 @@ Per decision #150 control-plane roles are **deliberately independent of data-pla
 
 ### Roles
 
-`src/ZB.MOM.WW.OtOpcUa.Admin/Services/AdminRoles.cs`:
+`src/Server/ZB.MOM.WW.OtOpcUa.Admin/Services/AdminRoles.cs`:
 
 | Role | Capabilities |
 |---|---|
@@ -255,17 +255,17 @@ Razor pages and API endpoints gate with `[Authorize(Policy = "CanEdit")]` / `"Ca
 
 ### Role grant source
 
-Admin reads `LdapGroupRoleMapping` rows from the Config DB (`src/ZB.MOM.WW.OtOpcUa.Configuration/Entities/LdapGroupRoleMapping.cs`) — the same pattern as the data-plane `NodeAcl` but scoped to Admin roles + (optionally) cluster scope for multi-site fleets. The `RoleGrants.razor` page lets FleetAdmins edit these mappings without leaving the UI.
+Admin reads `LdapGroupRoleMapping` rows from the Config DB (`src/Core/ZB.MOM.WW.OtOpcUa.Configuration/Entities/LdapGroupRoleMapping.cs`) — the same pattern as the data-plane `NodeAcl` but scoped to Admin roles + (optionally) cluster scope for multi-site fleets. The `RoleGrants.razor` page lets FleetAdmins edit these mappings without leaving the UI.
 
 ---
 
 ## OTOPCUA0001 Analyzer — Compile-Time Guard
 
-Per-capability resilience (retry, timeout, circuit-breaker, bulkhead) is applied by `CapabilityInvoker` in `src/ZB.MOM.WW.OtOpcUa.Core/Resilience/`. A driver-capability call made **outside** the invoker bypasses resilience entirely — which in production looks like inconsistent timeouts, un-wrapped retries, and unbounded blocking.
+Per-capability resilience (retry, timeout, circuit-breaker, bulkhead) is applied by `CapabilityInvoker` in `src/Core/ZB.MOM.WW.OtOpcUa.Core/Resilience/`. A driver-capability call made **outside** the invoker bypasses resilience entirely — which in production looks like inconsistent timeouts, un-wrapped retries, and unbounded blocking.
 
-`OTOPCUA0001` (Roslyn analyzer at `src/ZB.MOM.WW.OtOpcUa.Analyzers/UnwrappedCapabilityCallAnalyzer.cs`) fires as a compile-time **warning** when an `async`/`Task`-returning method on one of the seven guarded capability interfaces (`IReadable`, `IWritable`, `ITagDiscovery`, `ISubscribable`, `IHostConnectivityProbe`, `IAlarmSource`, `IHistoryProvider`) is invoked **outside** a lambda passed to `CapabilityInvoker.ExecuteAsync` / `ExecuteWriteAsync` / `AlarmSurfaceInvoker.*`. The analyzer walks up the syntax tree from the call site, finds any enclosing invoker invocation, and verifies the call lives transitively inside that invocation's anonymous-function argument — a sibling pattern (do the call, then invoke `ExecuteAsync` on something unrelated nearby) does not satisfy the rule.
+`OTOPCUA0001` (Roslyn analyzer at `src/Tooling/ZB.MOM.WW.OtOpcUa.Analyzers/UnwrappedCapabilityCallAnalyzer.cs`) fires as a compile-time **warning** when an `async`/`Task`-returning method on one of the seven guarded capability interfaces (`IReadable`, `IWritable`, `ITagDiscovery`, `ISubscribable`, `IHostConnectivityProbe`, `IAlarmSource`, `IHistoryProvider`) is invoked **outside** a lambda passed to `CapabilityInvoker.ExecuteAsync` / `ExecuteWriteAsync` / `AlarmSurfaceInvoker.*`. The analyzer walks up the syntax tree from the call site, finds any enclosing invoker invocation, and verifies the call lives transitively inside that invocation's anonymous-function argument — a sibling pattern (do the call, then invoke `ExecuteAsync` on something unrelated nearby) does not satisfy the rule.
 
-Five xUnit-v3 + Shouldly tests at `tests/ZB.MOM.WW.OtOpcUa.Analyzers.Tests` cover the common fail/pass shapes + the sibling-pattern regression guard.
+Five xUnit-v3 + Shouldly tests at `tests/Tooling/ZB.MOM.WW.OtOpcUa.Analyzers.Tests` cover the common fail/pass shapes + the sibling-pattern regression guard.
 
 The rule is intentionally scoped to async surfaces — pure in-memory accessors like `IHostConnectivityProbe.GetHostStatuses()` return synchronously and do not require the invoker wrap.
 

docs/v1/AlarmTracking.md

@@ -0,0 +1,136 @@
+# Alarm Tracking — v1 archive
+
+> **Historical record.** This document describes the v1 / pre-PR-7.2
+> Galaxy alarm path that ran inside `Galaxy.Host`'s STA pump as
+> `GalaxyAlarmTracker`. PR 7.2 retired the in-process Galaxy stack; the
+> alarms-over-gateway epic (B.2 / B.3 / E.7) restored Galaxy's
+> `IAlarmSource` capability against the new gateway-mediated transport.
+> See [docs/AlarmTracking.md](../AlarmTracking.md) for the v2 final
+> architecture — that is the document to read for current behaviour.
+
+Alarm surfacing is an optional driver capability exposed via `IAlarmSource` (`src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IAlarmSource.cs`). Drivers whose backends have an alarm concept implement it — today: Galaxy (MXAccess alarms), FOCAS (CNC alarms), OPC UA Client (A&C events from the upstream server). Modbus / S7 / AB CIP / AB Legacy / TwinCAT do not implement the interface and the feature is simply absent from their subtrees.
+
+## IAlarmSource surface
+
+```csharp
+Task<IAlarmSubscriptionHandle> SubscribeAlarmsAsync(
+    IReadOnlyList<string> sourceNodeIds, CancellationToken cancellationToken);
+Task UnsubscribeAlarmsAsync(IAlarmSubscriptionHandle handle, CancellationToken cancellationToken);
+Task AcknowledgeAsync(IReadOnlyList<AlarmAcknowledgeRequest> acknowledgements,
+    CancellationToken cancellationToken);
+event EventHandler<AlarmEventArgs>? OnAlarmEvent;
+```
+
+The driver fires `OnAlarmEvent` for every transition (`Active`, `Acknowledged`, `Inactive`) with an `AlarmEventArgs` carrying the source node id, condition id, alarm type, message, severity (`AlarmSeverity` enum), and source timestamp.
+
+## AlarmSurfaceInvoker
+
+`AlarmSurfaceInvoker` (`src/Core/ZB.MOM.WW.OtOpcUa.Core/Resilience/AlarmSurfaceInvoker.cs`) wraps the three mutating surfaces through `CapabilityInvoker`:
+
+- `SubscribeAlarmsAsync` / `UnsubscribeAlarmsAsync` run through the `DriverCapability.AlarmSubscribe` pipeline — retries apply under the tier configuration.
+- `AcknowledgeAsync` runs through `DriverCapability.AlarmAcknowledge` which does NOT retry per decision #143. A timed-out ack may have already registered at the plant floor; replay would silently double-acknowledge.
+
+Multi-host fan-out: when the driver implements `IPerCallHostResolver`, each source node id is resolved individually and batches are grouped by host so a dead PLC inside a multi-device driver doesn't poison sibling breakers. Single-host drivers fall back to `IDriver.DriverInstanceId` as the pipeline-key host.
+
+## Condition-node creation via CapturingBuilder
+
+Alarm-condition nodes are materialized at address-space build time. During `GenericDriverNodeManager.BuildAddressSpaceAsync` the builder is wrapped in a `CapturingBuilder` that observes every `Variable()` call. When a driver calls `IVariableHandle.MarkAsAlarmCondition(AlarmConditionInfo)` on a returned handle, the server-side `DriverNodeManager.VariableHandle` creates a sibling `AlarmConditionState` node and returns an `IAlarmConditionSink`. The wrapper stores the sink in `_alarmSinks` keyed by the variable's full reference, then `GenericDriverNodeManager` registers a forwarder on `IAlarmSource.OnAlarmEvent` that routes each push to the matching sink by `SourceNodeId`. Unknown source ids are dropped silently — they may belong to another driver.
+
+The `AlarmConditionState` layout matches OPC UA Part 9:
+
+- `SourceNode` → the originating variable
+- `SourceName` / `ConditionName` → from `AlarmConditionInfo.SourceName`
+- Initial state: enabled, inactive, acknowledged, severity per `InitialSeverity`, retain false
+- `HasCondition` references wire the source variable ↔ the condition node bidirectionally
+
+Drivers flag alarm-bearing variables at discovery time via `DriverAttributeInfo.IsAlarm = true`. The Galaxy driver, for example, sets this on attributes that have an `AlarmExtension` primitive in the Galaxy repository DB; FOCAS sets it on the CNC alarm register.
+
+## State transitions
+
+`ConditionSink.OnTransition` runs under the node manager's `Lock` and maps the `AlarmEventArgs.AlarmType` string to Part 9 state:
+
+| AlarmType | Action |
+|---|---|
+| `Active` | `SetActiveState(true)`, `SetAcknowledgedState(false)`, `Retain = true` |
+| `Acknowledged` | `SetAcknowledgedState(true)` |
+| `Inactive` | `SetActiveState(false)`; `Retain = false` once both inactive and acknowledged |
+
+Severity is remapped: `AlarmSeverity.Low/Medium/High/Critical` → OPC UA numeric 250 / 500 / 700 / 900. `Message.Value` is set from `AlarmEventArgs.Message` on every transition. `ClearChangeMasks(true)` and `ReportEvent(condition)` fire the OPC UA event notification for clients subscribed to any ancestor notifier.
+
+## Acknowledge dispatch
+
+Alarm acknowledgement initiated by an OPC UA client flows:
+
+1. The SDK invokes the `AlarmConditionState.OnAcknowledge` method delegate.
+2. The handler checks the session's roles for `AlarmAck` — drivers never see a request the session wasn't entitled to make.
+3. `AlarmSurfaceInvoker.AcknowledgeAsync` is called with the source / condition / comment tuple. The invoker groups by host and runs each batch through the no-retry `AlarmAcknowledge` pipeline.
+
+Drivers return normally for success or throw to signal the ack failed at the backend.
+
+## EventNotifier propagation
+
+Drivers that want hierarchical alarm subscriptions propagate `EventNotifier.SubscribeToEvents` up the containment chain during discovery — the Galaxy driver flips the flag on every ancestor of an alarm-bearing object up to the driver root, mirroring v1 behavior. Clients subscribed at the driver root, a mid-level folder, or the `Objects/` root see alarm events from every descendant with an `AlarmConditionState` sibling. The driver-root `FolderState` is created in `DriverNodeManager.CreateAddressSpace` with `EventNotifier = SubscribeToEvents | HistoryRead` so alarm event subscriptions and alarm history both have a single natural target.
+
+## ConditionRefresh
+
+The OPC UA `ConditionRefresh` service queues the current state of every retained condition back to the requesting monitored items. `DriverNodeManager` iterates the node manager's `AlarmConditionState` collection and queues each condition whose `Retain.Value == true` — matching the Part 9 requirement.
+
+## Alarm historian sink
+
+Distinct from the live `IAlarmSource` stream and the Part 9 `AlarmConditionState` materialization above, qualifying alarm transitions are **also** persisted to a durable event log for downstream AVEVA Historian ingestion. This is a separate subsystem from the `IHistoryProvider` capability used by `HistoryReadEvents` (see [HistoricalDataAccess.md](HistoricalDataAccess.md#alarm-event-history-vs-ihistoryprovider)): the sink is a *producer* path (server → Historian) that runs independently of any client HistoryRead call.
+
+### `IAlarmHistorianSink`
+
+`src/Core/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/IAlarmHistorianSink.cs` defines the intake contract:
+
+```csharp
+Task EnqueueAsync(AlarmHistorianEvent evt, CancellationToken cancellationToken);
+HistorianSinkStatus GetStatus();
+```
+
+`EnqueueAsync` is fire-and-forget from the producer's perspective — it must never block the emitting thread. The event payload (`AlarmHistorianEvent` — same file) is source-agnostic: `AlarmId`, `EquipmentPath`, `AlarmName`, `AlarmTypeName` (Part 9 subtype name), `Severity`, `EventKind` (free-form transition string — `Activated` / `Cleared` / `Acknowledged` / `Confirmed` / `Shelved` / …), `Message`, `User`, `Comment`, `TimestampUtc`.
+
+The sink scope is defined to span every alarm source (plan decision #15: scripted, Galaxy-native, AB CIP ALMD, any future `IAlarmSource`), gated per-alarm by a `HistorizeToAveva` toggle on the producer. Today only `Phase7EngineComposer.RouteToHistorianAsync` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7EngineComposer.cs`) is wired — it subscribes to `ScriptedAlarmEngine.OnEvent` and marshals each emission into `AlarmHistorianEvent`. Galaxy-native alarms continue to reach AVEVA Historian via the driver's direct `aahClientManaged` path and do not flow through the sink; the AB CIP ALMD path remains unwired pending a producer-side integration.
+
+### `SqliteStoreAndForwardSink`
+
+Default production implementation (`src/Core/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/SqliteStoreAndForwardSink.cs`). A local SQLite queue absorbs every `EnqueueAsync` synchronously; a background `Timer` drains batches asynchronously to an `IAlarmHistorianWriter` so operator actions are never blocked on historian reachability.
+
+Queue schema (single table `Queue`): `RowId PK autoincrement`, `AlarmId`, `EnqueuedUtc`, `PayloadJson` (serialized `AlarmHistorianEvent`), `AttemptCount`, `LastAttemptUtc`, `LastError`, `DeadLettered` (bool), plus `IX_Queue_Drain (DeadLettered, RowId)`. Default capacity `1_000_000` non-dead-lettered rows; oldest rows evict with a WARN log past the cap.
+
+Drain cadence: `StartDrainLoop(tickInterval)` arms a periodic timer. `DrainOnceAsync` reads up to `batchSize` rows (default 100) in `RowId` order and forwards them through `IAlarmHistorianWriter.WriteBatchAsync`, which returns one `HistorianWriteOutcome` per row:
+
+| Outcome | Action |
+|---|---|
+| `Ack` | Row deleted. |
+| `PermanentFail` | Row flipped to `DeadLettered = 1` with reason. Peers in the batch retry independently. |
+| `RetryPlease` | `AttemptCount` bumped; row stays queued. Drain worker enters `BackingOff`. |
+
+Writer-side exceptions treat the whole batch as `RetryPlease`.
+
+Backoff ladder on `RetryPlease` (hard-coded): 1s → 2s → 5s → 15s → 60s cap. Reset to 0 on any batch with no retries. `CurrentBackoff` exposes the current step for instrumentation; the drain timer itself fires on `tickInterval`, so the ladder governs write cadence rather than timer period.
+
+Dead-letter retention defaults to 30 days (plan decision #21). `PurgeAgedDeadLetters` runs each drain pass and deletes rows whose `LastAttemptUtc` is past the cutoff. `RetryDeadLettered()` is an operator action that clears `DeadLettered` + resets `AttemptCount` on every dead-lettered row so they rejoin the main queue.
+
+### Composition and writer resolution
+
+`Phase7Composer.ResolveHistorianSink` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7Composer.cs`) scans the registered drivers for one that implements `IAlarmHistorianWriter`. Today that is `GalaxyProxyDriver` via `GalaxyHistorianWriter` (`src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy/Ipc/GalaxyHistorianWriter.cs`), which forwards batches over the Galaxy.Host pipe to the `aahClientManaged` alarm schema. When a writer is found, a `SqliteStoreAndForwardSink` is instantiated against `%ProgramData%/OtOpcUa/alarm-historian-queue.db` with a 2 s drain tick and the writer attached. When no driver provides a writer the fallback is the DI-registered `NullAlarmHistorianSink` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/Program.cs`), which silently discards and reports `HistorianDrainState.Disabled`.
+
+### Status and observability
+
+`GetStatus()` returns `HistorianSinkStatus(QueueDepth, DeadLetterDepth, LastDrainUtc, LastSuccessUtc, LastError, DrainState)` — two `COUNT(*)` scalars plus last-drain telemetry. `DrainState` is one of `Disabled` / `Idle` / `Draining` / `BackingOff`.
+
+The Admin UI `/alarms/historian` page surfaces this through `HistorianDiagnosticsService` (`src/Server/ZB.MOM.WW.OtOpcUa.Admin/Services/HistorianDiagnosticsService.cs`), which also exposes `TryRetryDeadLettered` — it calls through to `SqliteStoreAndForwardSink.RetryDeadLettered` when the live sink is the SQLite implementation and returns 0 otherwise.
+
+## Key source files
+
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IAlarmSource.cs` — capability contract + `AlarmEventArgs`
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core/Resilience/AlarmSurfaceInvoker.cs` — per-host fan-out + no-retry ack
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core/OpcUa/GenericDriverNodeManager.cs` — `CapturingBuilder` + alarm forwarder
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs` — `VariableHandle.MarkAsAlarmCondition` + `ConditionSink`
+- `src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Alarms/GalaxyAlarmTracker.cs` — Galaxy-specific alarm-event production
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/IAlarmHistorianSink.cs` — historian sink intake contract + `AlarmHistorianEvent` + `HistorianSinkStatus` + `IAlarmHistorianWriter`
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/SqliteStoreAndForwardSink.cs` — durable queue + drain worker + backoff ladder + dead-letter retention
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7EngineComposer.cs` — `RouteToHistorianAsync` wires scripted-alarm emissions into the sink
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7Composer.cs` — `ResolveHistorianSink` selects `SqliteStoreAndForwardSink` vs `NullAlarmHistorianSink`
+- `src/Server/ZB.MOM.WW.OtOpcUa.Admin/Services/HistorianDiagnosticsService.cs` — Admin UI `/alarms/historian` status + retry-dead-lettered operator action

docs/v1/Configuration.md

@@ -17,7 +17,7 @@ The rule: if the setting describes *how the process connects to the rest of the
 
 Each of the three processes (Server, Admin, Galaxy.Host) reads its own `appsettings.json` plus environment overrides.
 
-### OtOpcUa Server — `src/ZB.MOM.WW.OtOpcUa.Server/appsettings.json`
+### OtOpcUa Server — `src/Server/ZB.MOM.WW.OtOpcUa.Server/appsettings.json`
 
 Bootstrap-only. `Program.cs` reads four top-level sections:
 
@@ -51,7 +51,7 @@ Minimal example:
 }
 ```
 
-### OtOpcUa Admin — `src/ZB.MOM.WW.OtOpcUa.Admin/appsettings.json`
+### OtOpcUa Admin — `src/Server/ZB.MOM.WW.OtOpcUa.Admin/appsettings.json`
 
 | Section | Purpose |
 |---|---|
@@ -73,7 +73,7 @@ Standard .NET config layering applies: `appsettings.{Environment}.json`, then en
 
 ## Authoritative configuration (Config DB)
 
-The Config DB is the single source of truth for every setting that a v1 deployment used to carry in `appsettings.json` as driver-specific state. `OtOpcUaConfigDbContext` (`src/ZB.MOM.WW.OtOpcUa.Configuration/OtOpcUaConfigDbContext.cs`) is the EF Core context used by both the Admin writer and every Server reader.
+The Config DB is the single source of truth for every setting that a v1 deployment used to carry in `appsettings.json` as driver-specific state. `OtOpcUaConfigDbContext` (`src/Core/ZB.MOM.WW.OtOpcUa.Configuration/OtOpcUaConfigDbContext.cs`) is the EF Core context used by both the Admin writer and every Server reader.
 
 ### Top-level sections operators touch
 
@@ -103,7 +103,7 @@ Old generations are retained; rollback is "publish older generation as new". `Co
 
 ### Offline cache
 
-Each Server process caches the last-seen published generation in `Node:LocalCachePath` via LiteDB (`LiteDbConfigCache` in `src/ZB.MOM.WW.OtOpcUa.Configuration/LocalCache/`). The cache lets a node start without the central DB reachable; once the DB comes back, `NodeBootstrap` syncs to the current generation.
+Each Server process caches the last-seen published generation in `Node:LocalCachePath` via LiteDB (`LiteDbConfigCache` in `src/Core/ZB.MOM.WW.OtOpcUa.Configuration/LocalCache/`). The cache lets a node start without the central DB reachable; once the DB comes back, `NodeBootstrap` syncs to the current generation.
 
 ### Full schema reference
 

docs/v1/DataTypeMapping.md

@@ -1,10 +1,10 @@
 # Data Type Mapping
 
-Data-type mapping is driver-defined. Each driver translates its native attribute metadata into two driver-agnostic enums from `Core.Abstractions` — `DriverDataType` (`src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverDataType.cs`) and `SecurityClassification` (`src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/SecurityClassification.cs`) — and populates the `DriverAttributeInfo` record it hands to `IAddressSpaceBuilder.Variable(...)`. Core doesn't interpret the native types; it trusts the driver's translation.
+Data-type mapping is driver-defined. Each driver translates its native attribute metadata into two driver-agnostic enums from `Core.Abstractions` — `DriverDataType` (`src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverDataType.cs`) and `SecurityClassification` (`src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/SecurityClassification.cs`) — and populates the `DriverAttributeInfo` record it hands to `IAddressSpaceBuilder.Variable(...)`. Core doesn't interpret the native types; it trusts the driver's translation.
 
 ## DriverDataType → OPC UA built-in type
 
-`DriverNodeManager.MapDataType` (`src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs`) is the single translation table for every driver:
+`DriverNodeManager.MapDataType` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs`) is the single translation table for every driver:
 
 | DriverDataType | OPC UA NodeId |
 |---|---|
@@ -23,8 +23,8 @@ The enum also carries `Int16 / Int64 / UInt16 / UInt32 / UInt64 / Reference` mem
 Each driver owns its native → `DriverDataType` translation:
 
 - **Galaxy Proxy** — `GalaxyProxyDriver.MapDataType(int mxDataType)` and `MapSecurity(int mxSec)` (inline in `src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Proxy/GalaxyProxyDriver.cs`). The Galaxy `mx_data_type` integer is sent across the Host↔Proxy pipe and mapped on the Proxy side. Galaxy's full classic 16-entry table (Boolean / Integer / Float / Double / String / Time / ElapsedTime / Reference / Enumeration / Custom / InternationalizedString) is preserved but compressed into the seven-entry `DriverDataType` enum — `ElapsedTime` → `Float64`, `InternationalizedString` → `String`, `Reference` → `Reference`, enumerations → `Int32`.
-- **AB CIP** — `src/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDataType.cs` maps CIP tag type codes.
-- **Modbus** — `src/ZB.MOM.WW.OtOpcUa.Driver.Modbus/ModbusDriver.cs` maps register shapes (16-bit signed, 16-bit unsigned, 32-bit float, etc.) including the DirectLogic quirk table in `DirectLogicAddress.cs`.
+- **AB CIP** — `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip/AbCipDataType.cs` maps CIP tag type codes.
+- **Modbus** — `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus/ModbusDriver.cs` maps register shapes (16-bit signed, 16-bit unsigned, 32-bit float, etc.) including the DirectLogic quirk table in `DirectLogicAddress.cs`.
 - **S7 / AB Legacy / TwinCAT / FOCAS / OPC UA Client** — each has its own inline mapper or `*DataType.cs` file per the same pattern.
 
 The driver's mapping is authoritative — when a field type is ambiguous (a `LREAL` that could be bit-reinterpreted, a BCD counter, a string of a particular encoding), the driver decides the exposed OPC UA shape.
@@ -35,7 +35,7 @@ The driver's mapping is authoritative — when a field type is ambiguous (a `LRE
 
 ## SecurityClassification — metadata, not ACL
 
-`SecurityClassification` is driver-reported metadata only. Drivers never enforce write permissions themselves — the classification flows into the Server project where `WriteAuthzPolicy.IsAllowed(classification, userRoles)` (`src/ZB.MOM.WW.OtOpcUa.Server/Security/WriteAuthzPolicy.cs`) gates the write against the session's LDAP-derived roles, and (Phase 6.2) the `AuthorizationGate` + permission trie apply on top. This is the "ACL at server layer" invariant documented in `docs/security.md`.
+`SecurityClassification` is driver-reported metadata only. Drivers never enforce write permissions themselves — the classification flows into the Server project where `WriteAuthzPolicy.IsAllowed(classification, userRoles)` (`src/Server/ZB.MOM.WW.OtOpcUa.Server/Security/WriteAuthzPolicy.cs`) gates the write against the session's LDAP-derived roles, and (Phase 6.2) the `AuthorizationGate` + permission trie apply on top. This is the "ACL at server layer" invariant documented in `docs/security.md`.
 
 The classification values mirror the v1 Galaxy model so existing Galaxy galaxies keep their published semantics:
 
@@ -57,9 +57,9 @@ Drivers whose backend has no notion of classification (Modbus, most PLCs) defaul
 
 ## Key source files
 
-- `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverDataType.cs` — driver-agnostic type enum
-- `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/SecurityClassification.cs` — write-authz tier metadata
-- `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverAttributeInfo.cs` — per-attribute descriptor
-- `src/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs` — `MapDataType` translation
-- `src/ZB.MOM.WW.OtOpcUa.Server/Security/WriteAuthzPolicy.cs` — classification-to-role policy
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverDataType.cs` — driver-agnostic type enum
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/SecurityClassification.cs` — write-authz tier metadata
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/DriverAttributeInfo.cs` — per-attribute descriptor
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/DriverNodeManager.cs` — `MapDataType` translation
+- `src/Server/ZB.MOM.WW.OtOpcUa.Server/Security/WriteAuthzPolicy.cs` — classification-to-role policy
 - Per-driver mappers in each `Driver.*` project

docs/v1/HistoricalDataAccess.md

@@ -1,6 +1,6 @@
 # Historical Data Access
 
-OPC UA HistoryRead is a **per-driver optional capability** in OtOpcUa. The Core dispatches HistoryRead service calls to the owning driver through the `IHistoryProvider` capability interface (`src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IHistoryProvider.cs`). Drivers that don't implement the interface return `BadHistoryOperationUnsupported` for every history call on their nodes; that is the expected behavior for protocol drivers (Modbus, S7, AB CIP, AB Legacy, TwinCAT, FOCAS) whose wire protocols carry no time-series data.
+OPC UA HistoryRead is a **per-driver optional capability** in OtOpcUa. The Core dispatches HistoryRead service calls to the owning driver through the `IHistoryProvider` capability interface (`src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/IHistoryProvider.cs`). Drivers that don't implement the interface return `BadHistoryOperationUnsupported` for every history call on their nodes; that is the expected behavior for protocol drivers (Modbus, S7, AB CIP, AB Legacy, TwinCAT, FOCAS) whose wire protocols carry no time-series data.
 
 Historian integration is no longer a separate bolt-on assembly, as it was in v1 (`ZB.MOM.WW.LmxOpcUa.Historian.Aveva` plugin). It is now one optional capability any driver can implement. The first implementation is the Galaxy driver's Wonderware Historian integration; OPC UA Client forwards HistoryRead to the upstream server. Every other driver leaves the capability unimplemented and the Core short-circuits history calls on nodes that belong to those drivers.
 
@@ -26,7 +26,7 @@ Supporting DTOs live alongside the interface in `Core.Abstractions`:
 
 `IHistoryProvider.ReadEventsAsync` is the **pull** path: an OPC UA client calls `HistoryReadEvents` against a notifier node and the driver walks its own backend event store to satisfy the request. The Galaxy driver's implementation reads from AVEVA Historian's event schema via `aahClientManaged`; every other driver leaves the default `NotSupportedException` in place.
 
-There is also a separate **push** path for persisting alarm transitions from any `IAlarmSource` (and the Phase 7 scripted-alarm engine) into a durable event log, independent of any client HistoryRead call. That path is covered by `IAlarmHistorianSink` + `SqliteStoreAndForwardSink` in `src/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/` and is documented in [AlarmTracking.md#alarm-historian-sink](AlarmTracking.md#alarm-historian-sink). The two paths are complementary — the sink populates an external historian's alarm schema; `ReadEventsAsync` reads from whatever event store the driver owns — and share neither interface nor dispatch.
+There is also a separate **push** path for persisting alarm transitions from any `IAlarmSource` (and the Phase 7 scripted-alarm engine) into a durable event log, independent of any client HistoryRead call. That path is covered by `IAlarmHistorianSink` + `SqliteStoreAndForwardSink` in `src/Core/ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian/` and is documented in [AlarmTracking.md#alarm-historian-sink](AlarmTracking.md#alarm-historian-sink). The two paths are complementary — the sink populates an external historian's alarm schema; `ReadEventsAsync` reads from whatever event store the driver owns — and share neither interface nor dispatch.
 
 ## Dispatch through `CapabilityInvoker`
 

docs/v1/README.md

@@ -0,0 +1,29 @@
+# v1 documentation archive
+
+This folder contains documentation that described the original v1
+in-process MXAccess architecture (`Galaxy.Host` + `Galaxy.Proxy` +
+`Galaxy.Shared` three-project split, .NET 4.8 x86 + COM apartment, the
+`OtOpcUaGalaxyHost` Windows service). That architecture was retired in
+PR 7.2 (merged 2026-04-30 at commit `ae7106d`). These docs are kept as
+the historical record of how the system worked before the v2-mxgw
+migration; treat their content as accurate at the time of writing, NOT
+as current state.
+
+For current architecture see:
+
+- `CLAUDE.md` — agent-facing v2 overview
+- `docs/drivers/Galaxy.md` — current Galaxy driver doc
+- `docs/v2/Galaxy.ParityRig.md` — current testing setup
+- `docs/v2/Galaxy.Performance.md` — observability + perf
+
+| File | What it covered |
+|---|---|
+| `AlarmTracking.md` | v1 alarm-tracking flow through the in-process MXAccess client |
+| `Configuration.md` | v1 server configuration (`OTOPCUA_GALAXY_*` env vars now live in mxaccessgw config) |
+| `DataTypeMapping.md` | Galaxy `mx_data_type` → OPC UA type mapping (still accurate as a reference; the live mapping logic is in `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/Browse/DataTypeMap.cs`) |
+| `HistoricalDataAccess.md` | v1 IHistoryProvider on the Host side; current path is the server-level HistoryRouter + Wonderware sidecar |
+| `Subscriptions.md` | v1 MXAccess subscription mechanics; current path uses gateway StreamEvents |
+| `drivers/Galaxy-Repository.md` | v1 Host-side ZB SQL repository client; the gateway owns this path now |
+| `drivers/Galaxy-Test-Fixture.md` | v1 test-fixture setup (parity tests + Galaxy.Host EXE spawn) |
+| `reqs/GalaxyRepositoryReqs.md`, `reqs/MxAccessClientReqs.md` | Original Phase 0 requirements; satisfied in mxaccessgw repo today |
+| `reqs/ServiceHostReqs.md` | Service-hosting requirements including `OtOpcUaGalaxyHost` (GHX-* section); only `OtOpcUa` server hosting remains in scope post-7.2 |

docs/v1/Subscriptions.md

@@ -1,13 +1,13 @@
 # Subscriptions
 
-Driver-side data-change subscriptions live behind `ISubscribable` (`src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/ISubscribable.cs`). The interface is deliberately mechanism-agnostic: it covers native subscriptions (Galaxy MXAccess advisory, OPC UA monitored items on an upstream server, TwinCAT ADS notifications) and driver-internal polled subscriptions (Modbus, AB CIP, S7, FOCAS). Core sees the same event shape regardless — drivers fire `OnDataChange` and Core dispatches to the matching OPC UA monitored items.
+Driver-side data-change subscriptions live behind `ISubscribable` (`src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/ISubscribable.cs`). The interface is deliberately mechanism-agnostic: it covers native subscriptions (Galaxy MXAccess advisory, OPC UA monitored items on an upstream server, TwinCAT ADS notifications) and driver-internal polled subscriptions (Modbus, AB CIP, S7, FOCAS). Core sees the same event shape regardless — drivers fire `OnDataChange` and Core dispatches to the matching OPC UA monitored items.
 
 ## Driver vs virtual dispatch
 
 Per [ADR-002](v2/implementation/adr-002-driver-vs-virtual-dispatch.md), `DriverNodeManager` routes subscriptions across both driver tags and virtual (scripted) tags through the same `ISubscribable` contract. The per-variable `NodeSourceKind` (registered from `DriverAttributeInfo` at discovery) selects the backend:
 
 - `NodeSourceKind.Driver` — subscribes via the driver's `ISubscribable`, wrapped by `CapabilityInvoker` (the rest of this doc).
-- `NodeSourceKind.Virtual` — subscribes via `VirtualTagSource` (`src/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/VirtualTagSource.cs`), which forwards change events emitted by `VirtualTagEngine` as `OnDataChange`. The ref-counting, initial-value, and transfer-restoration behaviour below applies identically.
+- `NodeSourceKind.Virtual` — subscribes via `VirtualTagSource` (`src/Core/ZB.MOM.WW.OtOpcUa.Core.VirtualTags/VirtualTagSource.cs`), which forwards change events emitted by `VirtualTagEngine` as `OnDataChange`. The ref-counting, initial-value, and transfer-restoration behaviour below applies identically.
 
 Because both kinds expose `ISubscribable`, Core's dispatch, ref-count map, and monitored-item fan-out are unchanged across the source branch.
 
@@ -63,7 +63,7 @@ When an OPC UA session is resumed (client reconnect with `TransferSubscriptions`
 
 ## Key source files
 
-- `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/ISubscribable.cs` — capability contract
-- `src/ZB.MOM.WW.OtOpcUa.Core/Resilience/CapabilityInvoker.cs` — pipeline wrapping
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/ISubscribable.cs` — capability contract
+- `src/Core/ZB.MOM.WW.OtOpcUa.Core/Resilience/CapabilityInvoker.cs` — pipeline wrapping
 - `src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Sta/StaPump.cs` — Galaxy STA thread + message pump
 - Per-driver subscribe implementations in each `Driver.*` project

docs/v1/drivers/Galaxy-Test-Fixture.md

@@ -35,13 +35,14 @@ Multi-project test topology:
 ## How tests skip
 
 - **E2E parity**: `ParityFixture.SkipIfUnavailable()` runs at class init and
-  checks Windows-only, non-admin user, ZB SQL reachable on
-  `localhost:1433`, Host EXE built in the expected `bin/` folder. Any miss
-  → tests skip.
+  checks Windows-only, ZB SQL reachable on `localhost:1433`, Host EXE built
+  in the expected `bin/` folder. Any miss → tests skip.
 - **Live-smoke** (`GalaxyRepositoryLiveSmokeTests`): `Assert.Skip` when ZB
   unreachable. A `per project_galaxy_host_installed` memory on this repo's
-  dev box notes the MXAccess runtime is installed + pipe ACL denies Admins,
-  so live tests must run from a non-elevated shell.
+  dev box notes the MXAccess runtime is installed. The pipe ACL allows the
+  configured SID outright; elevation of the caller doesn't matter because
+  the per-connection SID check in `PipeServer.VerifyCaller` only compares
+  user SIDs (not group membership or integrity level).
 - **Unit** tests (Shared, Proxy contract, most Host.Tests) have no skip —
   they run anywhere.
 

docs/v2/Galaxy.ParityMatrix.md

@@ -0,0 +1,161 @@
+> **✅ Completed 2026-04-30 — historical record of the parity-rig validation gate for PR 7.2.**
+>
+> The matrix below was the go/no-go gate for retiring the legacy
+> Galaxy.Host backend (PR 7.2). Final run on the dev rig 2026-04-30
+> returned 14 passed / 1 skipped / 0 failed; PR 7.2 (commit `fe91d42`)
+> deleted the legacy projects + service the next day. The "Running
+> the matrix" section is preserved for historical reproducibility but
+> the test projects it references (`Driver.Galaxy.ParityTests`) were
+> deleted alongside the legacy backend; this matrix is no longer
+> runnable. Current Galaxy testing flows through the gateway's own
+> test suite (sibling mxaccessgw repo).
+
+# Galaxy backend parity matrix
+
+This document tracks the scenario × result matrix that the
+`Driver.Galaxy.ParityTests` suite drives against both Galaxy backends —
+the legacy out-of-process **Galaxy.Host** (.NET 4.8 x86 + MXAccess COM,
+fronted by `GalaxyProxyDriver`) and the new in-process **mxgateway**
+backend (`GalaxyDriver`, .NET 10 + gRPC against `mxaccessgw`).
+
+Maintained alongside Phase 5 (PR 5.W). The Phase 7 default flip
+(PR 7.1) consumes this matrix as its go/no-go gate — every row must be
+either green or carry an explicit *accepted-delta* justification.
+
+## Reading the matrix
+
+- **Status: green** — the scenario asserts strict parity and passes
+  (or skips cleanly when the rig isn't up).
+- **Status: yellow** — soft pin only (count or shape parity, not value
+  parity) — acceptable when the underlying COM/gRPC stacks have known
+  divergences in raw payloads but the surface presented to the
+  DriverNodeManager is equivalent.
+- **Status: red** — divergence detected. Row carries a fix or a
+  follow-up task ID.
+
+## Scenarios
+
+Last verified end-to-end on the dev parity rig: **2026-04-30**
+(legacy `OtOpcUaGalaxyHost` mxaccess backend; mxaccessgw v1.x at
+`http://localhost:5120`; sandbox `OtOpcUaParityTest_001` deployed in
+the `ZB` galaxy; 13 passed / 1 skipped / 0 failed in 19 minutes).
+
+| PR | Test class | Scenario | Status | Notes |
+|----|-----------|----------|--------|-------|
+| 5.2 | `BrowseAndReadParityTests` | Same variable set | green | symmetric set diff on full-reference set, after `[]` array-suffix workaround in `GalaxyDiscoverer` |
+| 5.2 | `BrowseAndReadParityTests` | Same DataType / SecurityClass / IsHistorized | green | per-attribute meta triple parity |
+| 5.2 | `BrowseAndReadParityTests` | Same StatusCode-class on a sampled read | yellow | pins status class (Bad/Uncertain/Good); CLR type intentionally not asserted — see "Accepted deltas" #6 |
+| 5.3 | `SubscribeAndEventRateParityTests` | Subscribe returns a handle on each backend | green | symmetric Unsubscribe cleanup |
+| 5.3 | `SubscribeAndEventRateParityTests` | Event rate within ±50% over 3s | yellow | both backends fed by the same upstream MXAccess subscriptions; tolerance absorbs scheduler jitter |
+| 5.4 | `WriteByClassificationParityTests` | FreeAccess / Operate write status-class parity | yellow | pins status class only; legacy flat-maps every failure to BadInternalError, mxgw distinguishes (BadCommunicationError, BadDeviceFailure, etc.) — see "Accepted deltas" #7 |
+| 5.4 | `WriteByClassificationParityTests` | Configure / Tune routes via secured-write | yellow | same status-class pin |
+| 5.5 | `AlarmTransitionParityTests` | Same alarm-condition source-node-id set | green | one-way invariant on sub-attribute refs (legacy populated → mxgw matches; legacy null → mxgw free to populate per AlarmRefBuilder) |
+| 5.5 | `AlarmTransitionParityTests` | IsAlarm-marked variable count parity | green | soft pin — count must match, doesn't have to be non-zero |
+| 5.6 | `HistoryReadParityTests` | Same historized attribute set | green | what HistoryRouter consumes when routing to the Wonderware sidecar |
+| 5.6 | `HistoryReadParityTests` | New mxgw GalaxyDriver does not implement `IHistoryProvider` | green | architectural pin from Phase 1 (PR 1.3) on the *new* path; legacy `GalaxyProxyDriver` keeps the interface for back-compat until PR 7.2 — see "Accepted deltas" #8 |
+| 5.7 | `ReconnectParityTests` | Reinitialize → both Healthy + reads succeed | green | recovery latency is *not* pinned (legacy: pipe + COM client; mxgw: re-Register gw session) |
+| 5.7 | `ReconnectParityTests` | Health diverges only when one side recovers | yellow | soft pin until a toxiproxy-style fault injector lands |
+| 5.8 | `ScanStateProbeParityTests` | Same per-platform host set | n/a — deferred | dev rig is licensed for one `$WinPlatform` only; multi-platform parity deferred to a customer rig (PR 4.7's unit tests pin the state-decoder + member-tracking logic) |
+| 5.8 | `ScanStateProbeParityTests` | Same `HostState` per overlapping platform | n/a — deferred | same single-platform constraint |
+
+## Accepted deltas
+
+These are intentional differences between the two backends — the parity
+suite skips or tolerates them by design.
+
+1. **Transport-entry host name.** The legacy backend's
+   `IHostConnectivityProbe` surface includes a host entry named after
+   the Galaxy.Host process identity; the mxgw backend uses the
+   configured `MxAccess.ClientName`. The names differ, but both are
+   correct for their respective sessions — the parity test compares
+   only the platform-host subset.
+
+2. **Reconnect latency cadence.** Legacy reconnect roundtrips an OS
+   named pipe + an MxAccess COM client + a Galaxy.Host process restart
+   if the host died. The mxgw reconnect re-Registers the gateway session
+   over an existing gRPC channel. Sub-second vs multi-second recoveries
+   are both correct for their own paths; only the eventual `Healthy`
+   convergence is pinned.
+
+3. **Read-value drift.** A read sampled twice on a live Galaxy can
+   return different values legitimately. We pin `StatusCode`-class
+   parity (Bad/Uncertain/Good); value equality is not pinned.
+
+4. **Event-rate variance.** Both backends consume the same upstream
+   MXAccess publish events but route them through different deserializers
+   (LMXProxyServer COM events vs gRPC `MxEvent` protos). Scheduler
+   jitter on either side can shift counts within a 3s window; we pin a
+   ±50% ratio, not strict equality.
+
+5. **`IHistoryProvider` on the new path only.** Phase 1 (PR 1.3) lifted
+   history off the per-driver path onto the server-owned
+   `HistoryRouter` for the *new* in-process `GalaxyDriver`. The legacy
+   `GalaxyProxyDriver` still surfaces `IHistoryProvider` for back-compat
+   with the legacy server bootstrap path — it's an accepted delta
+   retired in PR 7.2 alongside the rest of the legacy projects. The
+   pin we want to enforce is "the new path doesn't regress to per-driver
+   history."
+
+6. **Read value-CLR-type.** Legacy returns the raw VARIANT (e.g.
+   `Byte[]`) for an attribute that hasn't received its first value
+   cycle from MxAccess yet, while mxgw returns the typed value
+   (`Single`, `Int32`, etc.). Once a real value is written or scanned,
+   both converge. Pinning CLR-type equality across the uninitialized
+   window adds noise without a real parity invariant — the
+   `StatusCode`-class assertion already covers the
+   "did the read succeed" question.
+
+7. **Write-failure StatusCode mapping.** Legacy
+   `MxAccessGalaxyBackend.WriteValuesAsync` flat-maps every failure to
+   `BadInternalError` (`0x80020000`); mxgw
+   `GatewayGalaxyDataWriter.TranslateReply` uses
+   `MxStatusProxy.RawDetectedBy` to distinguish gw-layer faults
+   (`BadCommunicationError`, `0x80050000`) from MxAccess HRESULT
+   faults (`BadDeviceFailure`, `BadNotConnected`, etc.). Both yield
+   Bad-status — the parity invariant is the *status class*, not the
+   exact code. Tighter mapping parity isn't worth investing in: the
+   legacy mapping retires alongside `GalaxyProxyDriver` in PR 7.2.
+
+8. **Single-platform scope on the dev rig.** Two
+   `ScanStateProbeParityTests` scenarios are deferred to a customer
+   rig with multiple deployed `$WinPlatform` instances; this dev box
+   is licensed for one. PR 4.7's unit tests (`PerPlatformProbeWatcherTests`)
+   pin the state-decoder + member-tracking logic at the seam level,
+   so the runtime parity check becomes a customer-rig acceptance gate
+   before that customer goes live, not a precondition for retiring
+   the legacy projects on this dev box.
+
+9. **Workaround for the gw `[]` array-suffix bug.**
+   `mxaccessgw/src/MxGateway.Server/Galaxy/GalaxyRepository.cs:173-175`
+   appends `[]` to the `full_tag_reference` of array-typed attributes,
+   which `MxAccess COM IInstance.AddItem` doesn't accept. The lmxopcua
+   discoverer (`GalaxyDiscoverer.StripArraySuffix`) defensively strips
+   the suffix. Tracked in `mxaccessgw/requirements-array-suffix-fix.md`;
+   the workaround is removed when that gw fix lands.
+
+## Outstanding deltas
+
+None as of 2026-04-30. Phase 7 (PR 7.1) flipped the default to
+`mxgw`; PR 7.2 (legacy project deletion) is unblocked — the matrix
+gate is satisfied and no further soak/pilot precondition applies.
+
+## Running the matrix
+
+```bash
+# Both backends must be reachable for any row to run; rows skip
+# cleanly when their backend is unavailable.
+dotnet test tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.ParityTests/
+```
+
+Environment overrides for the mxgw backend:
+
+| Variable | Default | Purpose |
+|----------|---------|---------|
+| `OTOPCUA_PARITY_GW_ENDPOINT` | `http://localhost:5120` | mxaccessgw gRPC endpoint |
+| `OTOPCUA_PARITY_GW_API_KEY` | `parity-suite-key` | API key handed to `MxGatewayClient` |
+| `OTOPCUA_PARITY_CLIENT_NAME` | `OtOpcUa-Parity` | `MxAccess.ClientName` for the session |
+
+The legacy backend reads ZB SQL on `localhost:1433` and spawns
+`OtOpcUa.Driver.Galaxy.Host.exe` from
+`src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/bin/Debug/net48/` — both
+must exist for the legacy half to resolve.

docs/v2/Galaxy.ParityRig.md

@@ -0,0 +1,381 @@
+# Galaxy parity rig — runbook
+
+> ✅ **Completed 2026-04-30 — historical record.** This runbook is the
+> recipe that produced the green parity matrix that gated PR 7.2
+> (retire legacy Galaxy projects, merged at commit `ae7106d`). The
+> matrix it produced is captured in
+> [`Galaxy.ParityMatrix.md`](Galaxy.ParityMatrix.md), also marked
+> historical. The test project this doc drove
+> (`Driver.Galaxy.ParityTests`) was deleted in PR 7.2, along with
+> `Driver.Galaxy.{Host,Proxy,Shared}` and the `OtOpcUaGalaxyHost`
+> Windows service. **You cannot re-run this rig today.** Current
+> Galaxy testing flows through the gateway's own test suite in the
+> sibling `mxaccessgw` repo.
+>
+> The text below is preserved as-written so the migration trail (what
+> was tested, against what shape, with what env vars) stays auditable.
+
+Brings up both Galaxy backends side-by-side against a single live Galaxy
+so the parity matrix in `docs/v2/Galaxy.ParityMatrix.md` and the soak
+scenario in `tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.ParityTests/SoakScenarioTests.cs`
+can run for real. Closing the parity matrix was the gate for PR 7.2
+(retire legacy Galaxy projects).
+
+## Conceptual layout
+
+```
+Galaxy ZB SQL  ──┬──  OtOpcUaGalaxyHost (NSSM service, net48 x86)   [DELETED in PR 7.2]
+                 │       └── MxAccess COM, ClientName "OtOpcUa-Galaxy.Host"
+                 │       └── named pipe "OtOpcUaGalaxy"
+                 │              ▲
+                 │              │ pipe IPC
+                 │              │
+                 │       GalaxyProxyDriver  ◄── parity test (legacy half)
+                 │
+                 └──  mxaccessgw service
+                         └── MxAccess COM, ClientName "OtOpcUa-Parity"
+                         └── gRPC on http://localhost:5120
+                                ▲
+                                │ gRPC
+                                │
+                         GalaxyDriver (in-process)  ◄── parity test (mxgw half)
+```
+
+Both halves talk to the **same Galaxy** through **two distinct MxAccess
+sessions** (different ClientNames so they don't evict each other).
+
+## What was on the dev box at the time
+
+Per `~/.claude/projects/.../memory/` *as of the rig run*:
+
+- **AVEVA System Platform + Galaxy + MXAccess runtime** — `project_aveva_platform_installed.md`.
+- **`OtOpcUaGalaxyHost`** Windows service running as `dohertj2`, NSSM-wrapped,
+  binary at `C:\publish\OtOpcUaGalaxyHost\OtOpcUa.Driver.Galaxy.Host.exe`,
+  shared secret at `.local/galaxy-host-secret.txt`, ZB SQL on `localhost:1433`
+  — `project_galaxy_host_installed.md`. **(Service uninstalled and binary
+  retired as part of PR 7.2; the host source project no longer exists in
+  this repo.)**
+- **Parity test project** (`Driver.Galaxy.ParityTests`) — committed and
+  skip-clean at the time of the rig run. **Deleted in PR 7.2.**
+
+## Setup steps (one-time)
+
+### 1. Build + run mxaccessgw
+
+The gateway source is at `c:\Users\dohertj2\Desktop\mxaccessgw\`.
+Build both halves — the worker has to be x86 net48 (MxAccess COM
+bitness), the server is .NET 10:
+
+```powershell
+cd C:\Users\dohertj2\Desktop\mxaccessgw
+dotnet build src\MxGateway.Worker -c Release   # produces bin\x86\Release\net48\MxGateway.Worker.exe
+dotnet build src\MxGateway.Server -c Release   # produces bin\Release\net10.0\MxGateway.Server.dll
+```
+
+Initialize the auth database and mint an API key. The CLI mode is
+gated by an `apikey` first-arg prefix:
+
+```powershell
+$env:MxGateway__ApiKeyPepper = "parity-rig-dev-pepper"   # any stable string for dev
+$srv = "C:\Users\dohertj2\Desktop\mxaccessgw\src\MxGateway.Server\bin\Release\net10.0\MxGateway.Server.dll"
+
+dotnet $srv apikey init-db                                # → "init-db: initialized"
+
+dotnet $srv apikey create-key `
+  --key-id parity-rig `
+  --display-name "OtOpcUa-Parity" `
+  --scopes "session:open,session:close,invoke:read,invoke:write,invoke:secure,events:read,metadata:read"
+# → "API key: mxgw_parity-rig_<base64suffix>"   ← capture this; you can't list secrets later
+```
+
+Save that exact key string for `OTOPCUA_PARITY_GW_API_KEY` in step 2.
+
+Run the server with three env-var overrides — the defaults don't
+quite match what gRPC + the parity test need:
+
+```powershell
+$env:MxGateway__ApiKeyPepper = "parity-rig-dev-pepper"   # MUST match the create-key invocation
+$env:Kestrel__Endpoints__Http__Url = "http://localhost:5120"
+$env:Kestrel__Endpoints__Http__Protocols = "Http2"        # gRPC needs h2c on plain HTTP
+$env:MxGateway__Worker__ExecutablePath = `
+  "C:\Users\dohertj2\Desktop\mxaccessgw\src\MxGateway.Worker\bin\x86\Release\net48\MxGateway.Worker.exe"
+  # appsettings.json's relative path is missing the \net48 segment; absolute path sidesteps that
+
+dotnet $srv
+# → "Now listening on: http://localhost:5120"
+```
+
+The worker spawns lazily on the first OpenSession RPC — there's no
+worker process visible in Task Manager until the first session. If
+the worker can't spawn, the server returns `Failed to open session
+session-…` with a `WorkerProcessLaunchException` in the server log.
+
+NSSM-wrap it later if the rig becomes long-lived; for first-pass
+provisioning a console window is easier to inspect.
+
+### 2. Set the parity env vars
+
+In the test-runner shell:
+
+```powershell
+$env:OTOPCUA_PARITY_GW_ENDPOINT  = "http://localhost:5120"
+$env:OTOPCUA_PARITY_GW_API_KEY   = "parity-suite-key"   # match the gw config
+$env:OTOPCUA_PARITY_CLIENT_NAME  = "OtOpcUa-Parity"
+```
+
+Elevation status doesn't matter — the legacy Galaxy.Host pipe ACL accepts
+elevated and non-elevated `dohertj2` shells alike (the Administrators deny
+ACE was removed 2026-04-24; see `project_galaxy_host_installed.md`).
+
+### 3. Verify both halves resolve
+
+```powershell
+cd C:\Users\dohertj2\Desktop\lmxopcua
+dotnet test tests\ZB.MOM.WW.OtOpcUa.Driver.Galaxy.ParityTests\ `
+  --filter "FullyQualifiedName~HarnessShapeTests"
+```
+
+`Harness_records_a_skip_reason_for_each_unavailable_backend` is the
+two-line truth-teller:
+
+- Both `LegacyDriver` non-null + both `MxGatewayDriver` non-null → rig is up.
+- One side null → read its `LegacySkipReason` / `MxGatewaySkipReason` and fix.
+
+## Running the matrix
+
+Once both halves resolve:
+
+```powershell
+dotnet test tests\ZB.MOM.WW.OtOpcUa.Driver.Galaxy.ParityTests\ `
+  --filter "Category=ParityE2E"
+```
+
+This runs all 17 scenario tests across the seven scenario classes
+(BrowseAndRead / Subscribe / Write / Alarm / History / Reconnect /
+ScanState). Each scenario class is independent — failures in one don't
+block the rest.
+
+Track the result against `docs/v2/Galaxy.ParityMatrix.md`. Update each
+row to:
+
+- **green** if the scenario passes
+- **yellow** if it skipped because the dev Galaxy doesn't have the right
+  shape (see coverage matrix below)
+- **red** if it asserted a real delta — those are the deltas that block
+  PR 7.2; chase each before retiring the legacy backend
+
+## Galaxy shape needed for full coverage
+
+Skip-on-empty-shape scenarios fail-soft today. To turn a skip into a
+real result, the dev Galaxy needs the shape in the right column:
+
+| Scenario | Needs | Local rig |
+|---|---|---|
+| `BrowseAndReadParityTests` (3 tests) | Any deployed objects with attributes | ✅ existing seed |
+| `SubscribeAndEventRateParityTests` event-rate | ≥5 attributes whose values *change* in 3s | ⚙ scriptable via graccess-cli |
+| `WriteByClassificationParityTests` (FreeAccess/Operate) | A FreeAccess/Operate numeric attribute | ⚙ scriptable via graccess-cli |
+| `WriteByClassificationParityTests` (Configure/Tune) | A Configure/Tune attribute | ⚙ scriptable via graccess-cli |
+| `AlarmTransitionParityTests` (2 tests) | Attributes with the `$Alarm*` extension | ⚙ scriptable via graccess-cli |
+| `HistoryReadParityTests` (historized set) | Attributes with the History extension | ⚙ scriptable via graccess-cli |
+| `ScanStateProbeParityTests` (2 tests) | Multiple `$WinPlatform` / `$AppEngine` objects | ❌ **deferred to customer rig** — this dev box is provisioned for one platform only |
+
+### The single-platform constraint
+
+The dev box at `DESKTOP-6JL3KKO` is licensed / configured for a single
+deployed `$WinPlatform`. Adding a second platform isn't feasible here,
+so `ScanStateProbeParityTests` will skip in a "no overlap" branch on
+this rig. Both of its scenarios already handle that case gracefully
+(`Assert.Skip("no overlapping platform hosts between backends — likely
+the transport names differ but no $WinPlatform was discovered")`), so
+the matrix reports them as **n/a (deferred)** rather than red.
+
+Plan: defer the two ScanState scenarios to a customer rig with multiple
+platforms. The PR 7.2 gate accepts "n/a, deferred" on these rows
+provided the legacy `GalaxyRuntimeProbeManager` and the in-process
+`PerPlatformProbeWatcher` have matching unit-test coverage of the
+state-decoder + member-tracking logic — which they do (PR 4.7's tests).
+Treat the runtime parity check as a customer-rig acceptance gate before
+that customer goes live, not a precondition for retiring the legacy
+projects on this dev box.
+
+### Provisioning the rest via graccess-cli
+
+`C:\Users\dohertj2\Desktop\graccess\graccess_cli\` is a .NET Framework
+4.8 console app over the ArchestrA GRAccess COM API. It can configure
+templates, instances, attributes, UDAs, extensions, and attribute
+security — i.e. every row above marked ⚙ scriptable. Full surface in
+`graccess/graccess_cli/docs/usage.md` and per-area workflow guides
+(`attribute-editing.md`, `template-editing.md`,
+`template-instance-editing.md`).
+
+Reserve a sandbox UDO (e.g. `OtOpcUaParityTest`) to avoid mutating
+attributes on plant-relevant objects. Concrete commands per requirement:
+
+**A FreeAccess/Operate numeric attribute** (covers WriteByClassification
+FreeAccess/Operate scenario):
+
+```powershell
+graccess object uda add `
+  --galaxy ZB --name OtOpcUaParityTest --type template `
+  --uda OperateValue --data-type MxFloat `
+  --category MxCategoryWriteable_C --security MxSecurityOperate `
+  --confirm --confirm-target OtOpcUaParityTest
+```
+
+**A Configure / Tune attribute** (covers WriteByClassification
+Configure/Tune scenario):
+
+```powershell
+# Tune
+graccess object uda add `
+  --galaxy ZB --name OtOpcUaParityTest --type template `
+  --uda TuneValue --data-type MxFloat `
+  --category MxCategoryWriteable_T --security MxSecurityTune `
+  --confirm --confirm-target OtOpcUaParityTest
+
+# Configure
+graccess object uda add `
+  --galaxy ZB --name OtOpcUaParityTest --type template `
+  --uda ConfigValue --data-type MxFloat `
+  --category MxCategoryWriteable_C --security MxSecurityConfigure `
+  --confirm --confirm-target OtOpcUaParityTest
+```
+
+**A changing-value attribute** (covers Subscribe event-rate scenario).
+Two ways:
+
+1. *On-scan increment* — bind a script extension that bumps a counter
+   each scan. Simplest to author with `object extension add` against
+   `ScriptExtension` plus `object attribute set` for the script body
+   (see `attribute-editing.md` §"Edit Extensions" for the pattern).
+2. *External writer loop* — leave the attribute as plain Float and run
+   a one-liner that writes incrementing values from the parity-test
+   shell. Uses the legacy backend path so it's available before the
+   mxgw subscriber is up. This keeps the Galaxy template clean.
+
+For first-pass validation pick #2 — no template surgery needed, and the
+write loop runs only during `dotnet test`.
+
+**Attributes with the `$Alarm*` extension** (covers AlarmTransition
+scenario). Per `attribute-editing.md` §"Edit Alarm Settings" the
+likely-named attributes vary by extension type
+(`Limit`, `RateOfChange`, etc.). Add the extension via:
+
+```powershell
+graccess object extension add `
+  --galaxy ZB --name OtOpcUaParityTest --type template `
+  --extension-type AnalogLimitAlarm --primitive AlarmInput `
+  --object-extension `
+  --confirm --confirm-target OtOpcUaParityTest
+```
+
+Then set HiHi/Hi/Lo/LoLo limit values + priority on the resulting
+attributes via `object attribute set`. Inspect first via
+`object attributes` to see the names the extension introduces — they
+differ across Aveva versions.
+
+**Attributes with the History extension** (covers HistoryRead routing
+scenario). History settings are usually attribute or extension
+attributes; `attribute-editing.md` §"Edit History Settings" covers the
+discovery flow. Quick start:
+
+```powershell
+graccess object extension add `
+  --galaxy ZB --name OtOpcUaParityTest --type template `
+  --extension-type HistoryExtension --primitive HistoryRecord `
+  --object-extension `
+  --confirm --confirm-target OtOpcUaParityTest
+
+# Then enable history on whichever attribute the extension points at
+graccess object attribute set `
+  --galaxy ZB --name OtOpcUaParityTest --type template `
+  --attribute HistoryEnabled --value true --data-type bool `
+  --confirm --confirm-target OtOpcUaParityTest
+```
+
+**Deploy + restart Galaxy.Host after any of the above** so MxAccess
+sees the change:
+
+```powershell
+graccess object deploy --galaxy ZB --name OtOpcUaParityTest_001 `
+  --confirm --confirm-target OtOpcUaParityTest_001
+sc.exe restart OtOpcUaGalaxyHost   # service no longer exists post-PR-7.2; in the modern shape, restart mxaccessgw instead
+```
+
+Then re-run the parity matrix. The previously-skipped scenarios should
+now find a sandbox attribute matching their selector and assert.
+
+## Soak run
+
+The 24h × 50k soak gates the production confidence half of PR 7.2.
+
+```powershell
+$env:OTOPCUA_SOAK_RUN      = "1"
+$env:OTOPCUA_SOAK_TAGS     = "<actual tag count if Galaxy < 50k>"
+$env:OTOPCUA_SOAK_MINUTES  = "1440"   # default 24h; compress for first runs
+$env:OTOPCUA_SOAK_DROP_PCT = "0.5"
+
+dotnet test tests\ZB.MOM.WW.OtOpcUa.Driver.Galaxy.ParityTests\ `
+  --filter "Category=Soak"
+```
+
+The test logs a per-minute CSV-style line to stdout:
+
+```
+soak,1.0,received=51234,dispatched=51234,dropped=0,ws_mb=412
+soak,2.0,received=102468,dispatched=102468,dropped=0,ws_mb=415
+...
+```
+
+Capture stdout to a file for post-run analysis. The three guards
+(`received` growing, `dropped/received` ratio, working-set delta) all
+fire mid-run rather than at end-of-test, so a failure surfaces within
+the first few minutes if the architecture is wrong.
+
+## Compressed-tag soak (when Galaxy isn't 50k tags)
+
+A first-pass validation is fine with the override:
+
+```powershell
+$env:OTOPCUA_SOAK_RUN      = "1"
+$env:OTOPCUA_SOAK_TAGS     = "500"      # whatever the dev Galaxy has
+$env:OTOPCUA_SOAK_MINUTES  = "60"       # one hour is enough to surface plumbing bugs
+$env:OTOPCUA_SOAK_DROP_PCT = "1.0"
+```
+
+This validates the *plumbing* (bounded channel, pump invariants, leak
+guard) but doesn't pin the 50k-tag scaling assertion. Defer the full
+50k validation to a customer rig with that scale, or build a synthetic
+Galaxy with a script that imports 50k attributes onto a generated UDO
+(~2 hours of one-off work).
+
+## Troubleshooting
+
+- **`MxGatewaySkipReason` says "mxaccessgw not reachable"** — the gw
+  isn't listening, or it's on a different port. `Test-NetConnection
+  localhost -Port 5120` is the quick check.
+- **`MxGatewaySkipReason` says "mxgateway backend boot failed:
+  RpcException: Unauthenticated"** — API key mismatch. Verify the
+  `OTOPCUA_PARITY_GW_API_KEY` env var matches the gw's configured key.
+- **`LegacySkipReason` says "Galaxy ZB SQL not reachable on
+  localhost:1433"** — SQL Server isn't running, or its TCP listener is
+  off. Check `services.msc` for the SQL Server (default) instance.
+- **`LegacySkipReason` says "Galaxy.Host EXE not built"** — at rig time
+  the parity harness looked under
+  `src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/bin/Debug/net48/` for the
+  EXE it spawned as a subprocess, separate from the published copy at
+  `C:\publish\OtOpcUaGalaxyHost\` used by the Windows service. **Both
+  the source project and the published binary were removed in PR 7.2,
+  so this troubleshooting branch no longer applies — the legacy half
+  cannot be brought up at all.**
+- **Both halves resolve but parity scenarios assert deltas** — that's
+  the expected outcome the rig exists to surface. Review each delta
+  against `docs/v2/Galaxy.ParityMatrix.md`'s "Accepted deltas" section
+  to decide whether it's a real bug or a pre-accepted divergence.
+
+## After the rig is green
+
+When the matrix is fully green or carries documented accepted-deltas,
+PR 7.2 (legacy project deletion) is unblocked. The only follow-up is
+to promote any newly-discovered accepted-delta to the matrix doc with
+the why so the matrix history stays auditable.

docs/v2/Galaxy.Performance.md

@@ -0,0 +1,152 @@
+# Galaxy backend performance
+
+This document covers the performance surface of the in-process
+`GalaxyDriver` (the v2 mxgw backend) — the ActivitySource it emits, the
+metrics on its EventPump, the soak scenario that validates it, and the
+tuning knobs you can reach for when the dev parity rig surfaces a hot
+spot.
+
+## Tracing surface (PR 6.1)
+
+The driver emits spans on the `ZB.MOM.WW.OtOpcUa.Driver.Galaxy`
+ActivitySource. No package dependency on OpenTelemetry — the host
+process picks the listener (OTLP exporter, dotnet-trace, Application
+Insights). Wire it via `OpenTelemetry.Trace.AddSource(...)` in the
+host's tracing pipeline.
+
+| Span | Source | Tags |
+|------|--------|------|
+| `galaxy.subscribe_bulk` | `TracedGalaxySubscriber` | `galaxy.client`, `galaxy.tag_count`, `galaxy.buffered_interval_ms`, `galaxy.success_count` |
+| `galaxy.unsubscribe_bulk` | `TracedGalaxySubscriber` | `galaxy.client`, `galaxy.tag_count` |
+| `galaxy.stream_events` | `TracedGalaxySubscriber` | `galaxy.client`, `galaxy.event_count` (set on stream end) |
+| `galaxy.write` | `TracedGalaxyDataWriter` | `galaxy.client`, `galaxy.tag_count`, `galaxy.secured_write_count`, `galaxy.success_count` |
+| `galaxy.get_hierarchy` | `TracedGalaxyHierarchySource` | `galaxy.client`, `galaxy.object_count` |
+
+The stream-events span deliberately covers the *entire* stream lifetime
+rather than per-event spans — at 50k tags / 1Hz the per-event volume
+would dominate the trace pipeline. Per-event visibility flows through
+the metrics surface instead.
+
+## Metrics surface (PR 6.2)
+
+`EventPump` publishes three counters on the
+`ZB.MOM.WW.OtOpcUa.Driver.Galaxy` meter, each tagged with
+`galaxy.client` so multi-driver hosts can split by source:
+
+| Counter | Unit | Meaning |
+|---------|------|---------|
+| `galaxy.events.received` | `{event}` | MxEvents read from the gateway StreamEvents stream |
+| `galaxy.events.dispatched` | `{event}` | MxEvents that made it through the bounded channel into `OnDataChange` |
+| `galaxy.events.dropped` | `{event}` | MxEvents discarded because the bounded channel was full (newest-dropped) |
+
+The invariant is `received = dispatched + dropped + (in-flight in the
+channel)`. Watch the dropped counter — it is the leading indicator of
+listener back-pressure. A non-zero dropped rate means a downstream
+consumer (DriverNodeManager → UA notification queue → client) is
+slower than the gw event stream; investigate that consumer before
+raising `EventPump` channel capacity.
+
+### Bounded channel design
+
+The pump runs two background tasks:
+
+1. **Producer** — reads from `IGalaxySubscriber.StreamEventsAsync`,
+   increments `events.received`, and `TryWrite`s into a bounded
+   `Channel<MxEvent>`. When the channel is full, the producer counts
+   the drop and continues reading the gw stream so back-pressure does
+   not propagate upstream (which would stall the gw worker and cascade
+   to *all* driver instances sharing that worker).
+2. **Consumer** — reads from the channel, fans out via
+   `SubscriptionRegistry`, increments `events.dispatched`.
+
+Default channel capacity is 50_000 (one second of headroom at 50k
+tags / 1Hz). Override via the `EventPump` constructor's
+`channelCapacity` parameter; the public-facing wiring path in
+`GalaxyDriver.EnsureEventPumpStarted` does not yet expose this through
+`GalaxyDriverOptions` because no parity scenario has needed it. Add it
+when soak data does.
+
+## Buffered update interval (PR 6.3)
+
+`MxAccess.PublishingIntervalMs` (default 1000) flows through both
+subscribe paths:
+
+- `GalaxyDriver.SubscribeAsync` — the caller's `publishingInterval`
+  wins when non-zero (the server's UA subscription publishingInterval
+  drives this in production). When the caller passes
+  `TimeSpan.Zero`, the configured option is the fallback.
+- `PerPlatformProbeWatcher` — the watcher passes the configured value
+  through `SubscribeBulkAsync` so probe `ScanState` changes publish at
+  the deployment's chosen cadence.
+
+A session-level `SetBufferedUpdateInterval` RPC exists in the gw
+protocol but the .NET client doesn't expose a typed helper yet —
+adjusting an existing subscription's interval mid-flight is a
+follow-up. Today's path subscribes once at the right interval, which
+covers the common case.
+
+## Soak scenario (PR 6.4)
+
+`SoakScenarioTests.Soak_HoldsSubscription_AndKeepsEventStreamFlowing`
+in `Driver.Galaxy.ParityTests` is the long-running validation. It
+subscribes a configurable tag count (default 50_000), holds the
+subscription for a configurable duration (default 24h), polls the
+three counters every minute, and asserts:
+
+- `events.received` continues to grow (gw stream isn't stuck)
+- `events.dropped / events.received` stays under the configured
+  ceiling (default 0.5%)
+- process working-set doesn't grow more than 1 GB above baseline
+  (leak guard)
+
+Always skipped unless the operator opts in:
+
+```bash
+# Full 24h × 50k soak (production validation)
+OTOPCUA_SOAK_RUN=1 dotnet test tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.ParityTests/
+
+# Compressed CI-friendly run (10min × 1k tags, 1% drop ceiling)
+OTOPCUA_SOAK_RUN=1 OTOPCUA_SOAK_MINUTES=10 OTOPCUA_SOAK_TAGS=1000 \
+  OTOPCUA_SOAK_DROP_PCT=1.0 \
+  dotnet test tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.ParityTests/
+```
+
+The scenario writes a per-minute CSV-style row to stdout
+(`soak,<minutes>,received=…,dispatched=…,dropped=…,ws_mb=…`) so an
+operator can grep the test runner output mid-run.
+
+## Tuned defaults (PR 6.5)
+
+| Option | Default | Source | Notes |
+|--------|---------|--------|-------|
+| `Gateway.ConnectTimeoutSeconds` | 10 | unchanged | Cold-start network paths fit comfortably; soak never observed >2s |
+| `Gateway.DefaultCallTimeoutSeconds` | 30 | **bumped from 5** in PR 6.5 | A 50k-tag `SubscribeBulk` can exceed 5s under MxAccess COM apartment lock contention; 30s leaves headroom while still failing fast on a wedged worker |
+| `Gateway.StreamTimeoutSeconds` | 0 (unlimited) | unchanged | The stream must run for the lifetime of the driver |
+| `MxAccess.PublishingIntervalMs` | 1000 | unchanged | Matches the legacy `LMXProxyServer` cadence; deployments needing tighter health visibility can dial down |
+| `Reconnect.InitialBackoffMs` | 500 | unchanged | First retry shouldn't dogpile a recovering gw |
+| `Reconnect.MaxBackoffMs` | 30_000 | unchanged | 30s ceiling so a long-down gw doesn't sit in 5+ min backoff |
+| `Repository.DiscoverPageSize` | 5000 | unchanged | One Galaxy page round-trip per ~5k objects; soak hadn't surfaced pressure |
+| `EventPump` channel capacity | 50_000 | unchanged | One second of headroom at 50k tags / 1Hz |
+
+The unchanged rows are not "definitely correct" — they are "no live
+data argues for changing them." Re-run the soak scenario after every
+substantive driver change, and revise this table when the data does.
+
+## Where to look first when something's slow
+
+1. **Slow `Discover`?** Inspect `galaxy.get_hierarchy` span duration
+   and `galaxy.object_count`. The gw walks the Galaxy DB serially;
+   slow Discovers usually mean a slow ZB SQL.
+2. **Subscribe pile-up?** `galaxy.subscribe_bulk` span duration
+   correlates with `galaxy.tag_count`. If duration ÷ tag_count starts
+   climbing, the gw worker is probably under apartment-lock pressure.
+3. **Events stalled?** Watch `galaxy.events.received`. Flat-lined
+   means the gw stream is wedged — kick the reconnect supervisor by
+   forcing a `ReinitializeAsync`.
+4. **Dropped events?** Non-zero `galaxy.events.dropped` means a slow
+   downstream consumer. Profile `OnDataChange` handlers in
+   `DriverNodeManager` before bumping the channel capacity.
+5. **Memory growing?** Confirm with the soak scenario's working-set
+   leak guard. Likely culprits: lingering subscription handles in
+   `SubscriptionRegistry`, or a downstream consumer retaining
+   `DataValueSnapshot` references past their useful life.

docs/v2/dev-environment.md

@@ -4,6 +4,7 @@
 >
 > **Branch**: `v2`
 > **Created**: 2026-04-17
+> **Updated 2026-04-28**: Docker workloads moved off the Windows dev VM to a shared Linux Docker host at `10.100.0.35` so the dev VM can have its GPU re-attached via ESXi passthrough (Hyper-V/WSL2 was blocking it). The two-tier model below is updated accordingly: per-developer Docker Desktop is gone; SQL Server + driver fixtures all live on the central Linux host, identifiable via `docker ps --filter label=project=lmxopcua`.
 
 ## Scope
 
@@ -13,30 +14,31 @@ Every external resource a developer needs on their machine, plus the dedicated i
 
 ## Two Environment Tiers
 
-Per decision #99:
+Per decision #99 (updated 2026-04-28):
 
 | Tier | Purpose | Where it runs | Resources |
 |------|---------|---------------|-----------|
-| **PR-CI / inner-loop dev** | Fast, runs on minimal Windows + Linux build agents and developer laptops | Each developer's machine; CI runners | Pure-managed in-process simulators (NModbus, OPC Foundation reference server, FOCAS TCP stub from test project). No Docker, no VMs. |
-| **Nightly / integration CI** | Full driver-stack validation against real wire protocols | One dedicated Windows host with Docker Desktop + Hyper-V + a TwinCAT XAR VM | All Docker simulators (`oitc/modbus-server`, `ab_server`, Snap7), TwinCAT XAR VM, Galaxy.Host installer + dev Galaxy access, FOCAS TCP stub binary, FOCAS FaultShim assembly |
+| **PR-CI / inner-loop dev** | Fast, runs on minimal Windows + Linux build agents and developer laptops | Each developer's machine; CI runners | Pure-managed in-process simulators (NModbus, OPC Foundation reference server, FOCAS TCP stub from test project). No Docker, no VMs locally. |
+| **Integration / nightly CI** | Full driver-stack validation against real wire protocols | **Shared Linux Docker host at `10.100.0.35`** (Debian 13, Docker 29.2.1) — one host for all developers; replaces the former per-developer Docker Desktop + Hyper-V model | All Docker simulators (pymodbus, ab_server, python-snap7, opc-plc) + central SQL Server, all running as `/opt/otopcua-<driver>/` stacks with the `project=lmxopcua` label. TwinCAT XAR + the Galaxy/mxaccessgw stack stay on the Windows dev VM (license + Hyper-V constraints unchanged) |
 
-The tier split keeps developer onboarding fast (no Docker required for first build) while concentrating the heavy simulator setup on one machine the team maintains.
+The Linux Docker host is shared because (a) only one team member needs it active at a time, (b) it removes the per-developer Docker Desktop install, and (c) the dev VM no longer needs Hyper-V/WSL2 — freeing it for GPU passthrough.
 
-## Installed Inventory — This Machine
+## Installed Inventory — Dev VM (`DESKTOP-6JL3KKO`)
 
-Running record of every v2 dev service stood up on this developer machine. Updated on every install / config change. Credentials here are **dev-only** per decision #137 — production uses Integrated Security / gMSA per decision #46 and never any value in this table.
+Running record of v2 dev services on the Windows dev VM. Updated on every install / config change. Credentials here are **dev-only** per decision #137 — production uses Integrated Security / gMSA per decision #46 and never any value in this table.
 
-**Last updated**: 2026-04-17
+**Last updated**: 2026-04-28 — Docker Desktop + WSL2 removed; Docker workloads now live on the Linux Docker host (see next section).
 
 ### Host
 
 | Attribute | Value |
 |-----------|-------|
-| Machine name | `DESKTOP-6JL3KKO` |
-| User | `dohertj2` (member of local Administrators + `docker-users`) |
-| VM platform | VMware (`VMware20,1`), nested virtualization enabled |
+| Machine name | `DESKTOP-6JL3KKO` (10.100.0.48) |
+| User | `dohertj2` (local Administrators) |
+| VM platform | VMware ESXi |
 | CPU | Intel Xeon E5-2697 v4 @ 2.30GHz (3 vCPUs) |
-| OS | Windows (WSL2 + Hyper-V Platform features installed) |
+| OS | Windows 10 Enterprise (10.0.19045) |
+| GPU | (Re-attached after WSL2/Hyper-V removal) |
 
 ### Toolchain
 
@@ -46,36 +48,40 @@ Running record of every v2 dev service stood up on this developer machine. Updat
 | .NET AspNetCore runtime | 10.0.5 | `C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App\` | Pre-installed |
 | .NET NETCore runtime | 10.0.5 | `C:\Program Files\dotnet\shared\Microsoft.NETCore.App\` | Pre-installed |
 | .NET WindowsDesktop runtime | 10.0.5 | `C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App\` | Pre-installed |
-| .NET Framework 4.8 SDK | — | Pending (needed for Phase 2 Galaxy.Host; not yet required) | — |
+| .NET Framework 4.8 SDK | — | Optional — only needed when building the mxaccessgw worker (sibling repo, x86 net48) | — |
 | Git | Pre-installed | Standard | — |
 | PowerShell 7 | Pre-installed | Standard | — |
 | winget | v1.28.220 | Standard Windows feature | — |
-| WSL | Default v2, distro `docker-desktop` `STATE Running` | — | `wsl --install --no-launch` (2026-04-17) |
-| Docker Desktop | 29.3.1 (engine) / Docker Desktop 4.68.0 (app) | Standard | `winget install --id Docker.DockerDesktop` (2026-04-17) |
+| Docker CLI (standalone, no daemon) | 29.3.1 | `%USERPROFILE%\bin\docker.exe` | Static binary from download.docker.com (2026-04-28) |
+| Docker Compose CLI plugin | latest | `%USERPROFILE%\.docker\cli-plugins\docker-compose.exe` | Direct download from github.com/docker/compose (2026-04-28) |
+| `lmxopcua-fix.ps1` helper | n/a | `%USERPROFILE%\bin\lmxopcua-fix.ps1` | See "Docker host" section below |
 | `dotnet-ef` CLI | 10.0.6 | `%USERPROFILE%\.dotnet\tools\dotnet-ef.exe` | `dotnet tool install --global dotnet-ef --version 10.0.*` (2026-04-17) |
+| ~~Docker Desktop~~ | — | Removed 2026-04-28 — replaced by remote Linux Docker host | — |
+| ~~WSL2 (`docker-desktop` distro)~~ | — | Removed 2026-04-28 (frees Hyper-V for GPU passthrough) | — |
 
 ### Services
 
 | Service | Container / Process | Version | Host:Port | Credentials (dev-only) | Data location | Status |
 |---------|---------------------|---------|-----------|------------------------|---------------|--------|
-| **Central config DB** | Docker container `otopcua-mssql` (image `mcr.microsoft.com/mssql/server:2022-latest`) | 16.0.4250.1 (RTM-CU24-GDR, KB5083252) | `localhost:14330` (host) → `1433` (container) — remapped from 1433 to avoid collision with the native MSSQL14 instance that hosts the Galaxy `ZB` DB (both bind 0.0.0.0:1433; whichever wins the race gets connections) | User `sa` / Password `OtOpcUaDev_2026!` | Docker named volume `otopcua-mssql-data` (mounted at `/var/opt/mssql` inside container) | ✅ Running — `InitialSchema` migration applied, 16 entity tables live |
+| **Central config DB** | Docker container `otopcua-mssql` on the Linux Docker host (image `mcr.microsoft.com/mssql/server:2022-latest`) | 16.0.4250.1 (RTM-CU24-GDR, KB5083252) | `10.100.0.35:14330` → `1433` (container) — port 14330 retained from the previous local-container setup so connection-string ports don't churn | User `sa` / Password `OtOpcUaDev_2026!` | Docker named volume `otopcua-mssql-data` on the Docker host | ✅ Running on Docker host (`/opt/otopcua-mssql/`) since 2026-04-28; carries `project=lmxopcua` label |
 | Dev Galaxy (AVEVA System Platform) | Local install on this dev box — full ArchestrA + Historian + OI-Server stack | v1 baseline | Local COM via MXAccess (`C:\Program Files (x86)\ArchestrA\Framework\bin\ArchestrA.MXAccess.dll`); Historian via `aaH*` services; SuiteLink via `slssvc` | Windows Auth | Galaxy repository DB `ZB` on local SQL Server (separate instance from `otopcua-mssql` — legacy v1 Galaxy DB, not related to v2 config DB) | ✅ **Fully available — Phase 2 lift unblocked.** 27 ArchestrA / AVEVA / Wonderware services running incl. `aaBootstrap`, `aaGR` (Galaxy Repository), `aaLogger`, `aaUserValidator`, `aaPim`, `ArchestrADataStore`, `AsbServiceManager`, `AutoBuild_Service`; full Historian set (`aahClientAccessPoint`, `aahGateway`, `aahInSight`, `aahSearchIndexer`, `aahSupervisor`, `InSQLStorage`, `InSQLConfiguration`, `InSQLEventSystem`, `InSQLIndexing`, `InSQLIOServer`, `InSQLManualStorage`, `InSQLSystemDriver`, `HistorianSearch-x64`); `slssvc` (Wonderware SuiteLink); `OI-Gateway` install present at `C:\Program Files (x86)\Wonderware\OI-Server\OI-Gateway\` (decision #142 AppServer-via-OI-Gateway smoke test now also unblocked) |
 | GLAuth (LDAP) | Local install at `C:\publish\glauth\` | v2.4.0 | `localhost:3893` (LDAP) / `3894` (LDAPS, disabled) | Direct-bind `cn={user},dc=lmxopcua,dc=local` per `auth.md`; users `readonly`/`writeop`/`writetune`/`writeconfig`/`alarmack`/`admin`/`serviceaccount` (passwords in `glauth.cfg` as SHA-256) | `C:\publish\glauth\` | ✅ Running (NSSM service `GLAuth`). Phase 1 Admin uses GroupToRole map `ReadOnly→ConfigViewer`, `WriteOperate→ConfigEditor`, `AlarmAck→FleetAdmin`. v2-rebrand to `dc=otopcua,dc=local` is a future cosmetic change |
-| OPC Foundation reference server | Not yet built | — | `localhost:62541` (target) | `user1` / `password1` (reference-server defaults) | — | Pending (needed for Phase 5 OPC UA Client driver testing) |
-| FOCAS TCP stub | Not yet built | — | `localhost:8193` (target) | n/a | — | Pending (built in Phase 5) |
-| Modbus simulator (`oitc/modbus-server`) | — | — | `localhost:502` (target) | n/a | — | Pending (needed for Phase 3 Modbus driver; moves to integration host per two-tier model) |
-| libplctag `ab_server` | — | — | `localhost:44818` (target) | n/a | — | Pending (Phase 3/4 AB CIP and AB Legacy drivers) |
-| Snap7 Server | — | — | `localhost:102` (target) | n/a | — | Pending (Phase 4 S7 driver) |
-| TwinCAT XAR VM | — | — | `localhost:48898` (ADS) (target) | TwinCAT default route creds | — | Pending — runs in Hyper-V VM, not on this dev box (per decision #135) |
+| OPC Foundation reference server | Not yet built | — | `10.100.0.35:62541` (target) | `user1` / `password1` (reference-server defaults) | — | Pending (needed for Phase 5 OPC UA Client driver testing) |
+| FOCAS TCP stub | Not yet built | — | `10.100.0.35:8193` (target) | n/a | — | Pending (built in Phase 5; runs on Docker host) |
+| Modbus simulator (`otopcua-pymodbus:3.13.0`) | Docker compose at `/opt/otopcua-modbus/` on Docker host | pinned 3.13.0 | `10.100.0.35:5020` | n/a | n/a | Stack staged; bring up with `lmxopcua-fix up modbus <profile>` from this VM |
+| AB CIP fixture (`otopcua-ab-server:libplctag-release`) | Docker compose at `/opt/otopcua-abcip/` on Docker host | source-pinned `release` tag | `10.100.0.35:44818` | n/a | n/a | Stack staged; bring up with `lmxopcua-fix up abcip <profile>` from this VM |
+| S7 fixture (`otopcua-python-snap7:1.0`) | Docker compose at `/opt/otopcua-s7/` on Docker host | python-snap7 ≥2.0 | `10.100.0.35:1102` | n/a | n/a | Stack staged; bring up with `lmxopcua-fix up s7 s7_1500` from this VM |
+| OPC UA simulator (`mcr.microsoft.com/iotedge/opc-plc:2.14.10`) | Docker compose at `/opt/otopcua-opcuaclient/` on Docker host | pinned 2.14.10 | `10.100.0.35:50000` | anonymous | n/a | Stack staged; bring up with `lmxopcua-fix up opcuaclient` from this VM |
+| TwinCAT XAR VM | — | — | TBD via Hyper-V on a separate Windows host (NOT this dev VM) | TwinCAT default route creds | — | Pending — Hyper-V removed from this dev VM; XAR will live on a separate dedicated Windows machine if needed |
 
 ### Connection strings for `appsettings.Development.json`
 
-Copy-paste-ready. **Never commit these to the repo** — they go in `appsettings.Development.json` (gitignored per the standard .NET convention) or in user-scoped dotnet secrets.
+Copy-paste-ready. The checked-in `appsettings.json` defaults already point at the Docker host (`10.100.0.35,14330`), so `appsettings.Development.json` is only needed for per-developer overrides.
 
 ```jsonc
 {
   "ConfigDatabase": {
-    "ConnectionString": "Server=localhost,14330;Database=OtOpcUaConfig_Dev;User Id=sa;Password=OtOpcUaDev_2026!;TrustServerCertificate=true;Encrypt=false;"
+    "ConnectionString": "Server=10.100.0.35,14330;Database=OtOpcUaConfig_Dev;User Id=sa;Password=OtOpcUaDev_2026!;TrustServerCertificate=true;Encrypt=false;"
   },
   "Authentication": {
     "Ldap": {
@@ -89,29 +95,26 @@ Copy-paste-ready. **Never commit these to the repo** — they go in `appsettings
 }
 ```
 
+LDAP host stays `localhost` because GLAuth still runs as a native NSSM service on this dev VM (not yet migrated to the Docker host).
+
 For xUnit test fixtures that need a throwaway DB per test run, build connection strings with `Database=OtOpcUaConfig_Test_{timestamp}` to avoid cross-run pollution.
 
 ### Container management quick reference
 
+All commands SSH into the Docker host. The standalone Windows `docker.exe` on this VM has no daemon — every operation runs server-side via the helper.
+
 ```powershell
-# Start / stop the SQL Server container (survives reboots via Docker Desktop auto-start)
-docker stop otopcua-mssql
-docker start otopcua-mssql
+# Status / log / lifecycle from this VM
+lmxopcua-fix ls                            # list lmxopcua-tagged containers + status
+lmxopcua-fix logs mssql                    # SQL Server log tail
+ssh dohertj2@10.100.0.35 'docker stop otopcua-mssql; docker start otopcua-mssql'
+ssh dohertj2@10.100.0.35 'docker logs otopcua-mssql --tail 50'
 
-# Logs (useful for diagnosing startup failures or login issues)
-docker logs otopcua-mssql --tail 50
+# sqlcmd inside the container (run on the Docker host)
+ssh dohertj2@10.100.0.35 'docker exec otopcua-mssql /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P "OtOpcUaDev_2026!" -C -Q "SELECT @@VERSION"'
 
-# Shell into the container (rarely needed; sqlcmd is the usual tool)
-docker exec -it otopcua-mssql bash
-
-# Query via sqlcmd inside the container (Git Bash needs MSYS_NO_PATHCONV=1 to avoid path mangling)
-MSYS_NO_PATHCONV=1 docker exec otopcua-mssql /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P "OtOpcUaDev_2026!" -C -Q "SELECT @@VERSION"
-
-# Nuclear reset: drop the container + volume (destroys all DB data)
-docker stop otopcua-mssql
-docker rm otopcua-mssql
-docker volume rm otopcua-mssql-data
-# …then re-run the docker run command from Bootstrap Step 6
+# Nuclear reset (destroys dev DB data)
+ssh dohertj2@10.100.0.35 'cd /opt/otopcua-mssql && docker compose down -v && docker compose up -d'
 ```
 
 ### Credential rotation
@@ -125,7 +128,7 @@ Dev credentials in this inventory are convenience defaults, not secrets. Change
 | Resource | Purpose | Type | Default port | Default credentials | Owner |
 |----------|---------|------|--------------|---------------------|-------|
 | **.NET 10 SDK** | Build all .NET 10 x64 projects | OS install | n/a | n/a | Developer |
-| **.NET Framework 4.8 SDK + targeting pack** | Build `Driver.Galaxy.Host` (Phase 2+) | Windows install | n/a | n/a | Developer |
+| **.NET Framework 4.8 SDK + targeting pack** | Optional — build the mxaccessgw worker (sibling repo, x86 net48) | Windows install | n/a | n/a | Developer |
 | **Visual Studio 2022 17.8+ or Rider 2024+** | IDE (any C# IDE works; these are the supported configs) | OS install | n/a | n/a | Developer |
 | **Git** | Source control | OS install | n/a | n/a | Developer |
 | **PowerShell 7.4+** | Compliance scripts (`phase-N-compliance.ps1`) | OS install | n/a | n/a | Developer |
@@ -144,10 +147,10 @@ Dev credentials in this inventory are convenience defaults, not secrets. Change
 | Resource | Purpose | Type | Default port | Default credentials | Owner |
 |----------|---------|------|--------------|---------------------|-------|
 | **Docker Desktop for Windows** | Host for every driver test-fixture simulator (Modbus / AB CIP / S7 / OpcUaClient) + SQL Server | Install | (Hyper-V required; not compatible with TwinCAT runtime — see TwinCAT row below for the workaround) | n/a | Integration host admin |
-| **Modbus fixture — `otopcua-pymodbus:3.13.0`** | Modbus driver integration tests | Docker image (local build, see `tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Docker/`); 4 compose profiles: `standard` / `dl205` / `mitsubishi` / `s7_1500` | 5020 (non-privileged) | n/a (no auth in protocol) | Developer (per machine) |
-| **AB CIP fixture — `otopcua-ab-server:libplctag-release`** | AB CIP driver integration tests | Docker image (multi-stage build of libplctag's `ab_server` from source, pinned to the `release` tag; see `tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Docker/`); 4 compose profiles: `controllogix` / `compactlogix` / `micro800` / `guardlogix` | 44818 (CIP / EtherNet/IP) | n/a | Developer (per machine) |
-| **S7 fixture — `otopcua-python-snap7:1.0`** | S7 driver integration tests | Docker image (local build, `python-snap7>=2.0`; see `tests/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/Docker/`); 1 compose profile: `s7_1500` | 1102 (non-privileged; driver honours `S7DriverOptions.Port`) | n/a | Developer (per machine) |
-| **OPC UA Client fixture — `mcr.microsoft.com/iotedge/opc-plc:2.14.10`** | OpcUaClient driver integration tests | Docker image (Microsoft-maintained, pinned; see `tests/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.IntegrationTests/Docker/`) | 50000 (OPC UA) | Anonymous (`--daa` off); auto-accept certs (`--aa`) | Developer (per machine) |
+| **Modbus fixture — `otopcua-pymodbus:3.13.0`** | Modbus driver integration tests | Docker image (local build, see `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Docker/`); 4 compose profiles: `standard` / `dl205` / `mitsubishi` / `s7_1500` | 5020 (non-privileged) | n/a (no auth in protocol) | Developer (per machine) |
+| **AB CIP fixture — `otopcua-ab-server:libplctag-release`** | AB CIP driver integration tests | Docker image (multi-stage build of libplctag's `ab_server` from source, pinned to the `release` tag; see `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Docker/`); 4 compose profiles: `controllogix` / `compactlogix` / `micro800` / `guardlogix` | 44818 (CIP / EtherNet/IP) | n/a | Developer (per machine) |
+| **S7 fixture — `otopcua-python-snap7:1.0`** | S7 driver integration tests | Docker image (local build, `python-snap7>=2.0`; see `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/Docker/`); 1 compose profile: `s7_1500` | 1102 (non-privileged; driver honours `S7DriverOptions.Port`) | n/a | Developer (per machine) |
+| **OPC UA Client fixture — `mcr.microsoft.com/iotedge/opc-plc:2.14.10`** | OpcUaClient driver integration tests | Docker image (Microsoft-maintained, pinned; see `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.IntegrationTests/Docker/`) | 50000 (OPC UA) | Anonymous (`--daa` off); auto-accept certs (`--aa`) | Developer (per machine) |
 | **TwinCAT XAR runtime VM** | TwinCAT ADS testing (per `test-data-sources.md` §5; Beckhoff XAR cannot coexist with Hyper-V on the same OS) | Hyper-V VM with Windows + TwinCAT XAR installed under 7-day renewable trial | 48898 (ADS over TCP) | TwinCAT default route credentials configured per Beckhoff docs | Integration host admin |
 | **Rockwell Studio 5000 Logix Emulate** | AB CIP golden-box tier — closes UDT / ALMD / AOI / GuardLogix-safety / CompactLogix-ConnectionSize gaps the ab_server simulator can't cover. Loads the L5X project documented at `tests/.../AbCip.IntegrationTests/LogixProject/README.md`. Tests gated on `AB_SERVER_PROFILE=emulate` + `AB_SERVER_ENDPOINT=<ip>:44818`; see `docs/drivers/AbServer-Test-Fixture.md` §Logix Emulate golden-box tier | Windows-only install; **Hyper-V conflict** — can't coexist with Docker Desktop's WSL 2 backend on the same OS, same story as TwinCAT XAR. Runs on a dedicated Windows PC reachable on the LAN | 44818 (CIP / EtherNet/IP) | None required at the CIP layer; Studio 5000 project credentials per Rockwell install | Integration host admin (license + install); Developer (per session — open Emulate, load L5X, click Run) |
 | **FOCAS TCP stub** (`Driver.Focas.TestStub`) | FOCAS functional testing (per `test-data-sources.md` §6) | Local .NET 10 console app from this repo | 8193 (FOCAS) | n/a | Developer / integration host (run on demand) |
@@ -162,10 +165,10 @@ init + skip cleanly when nothing's running.
 
 | Driver | Fixture image | Compose file | Bring up |
 |---|---|---|---|
-| Modbus | local-build `otopcua-pymodbus:3.13.0` | `tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Docker/docker-compose.yml` | `docker compose -f <compose> --profile <standard\|dl205\|mitsubishi\|s7_1500> up -d` |
-| AB CIP | local-build `otopcua-ab-server:libplctag-release` | `tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Docker/docker-compose.yml` | `docker compose -f <compose> --profile <controllogix\|compactlogix\|micro800\|guardlogix> up -d` |
-| S7 | local-build `otopcua-python-snap7:1.0` | `tests/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/Docker/docker-compose.yml` | `docker compose -f <compose> --profile s7_1500 up -d` |
-| OpcUaClient | `mcr.microsoft.com/iotedge/opc-plc:2.14.10` (pinned) | `tests/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.IntegrationTests/Docker/docker-compose.yml` | `docker compose -f <compose> up -d` |
+| Modbus | local-build `otopcua-pymodbus:3.13.0` | `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/Docker/docker-compose.yml` | `docker compose -f <compose> --profile <standard\|dl205\|mitsubishi\|s7_1500> up -d` |
+| AB CIP | local-build `otopcua-ab-server:libplctag-release` | `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Docker/docker-compose.yml` | `docker compose -f <compose> --profile <controllogix\|compactlogix\|micro800\|guardlogix> up -d` |
+| S7 | local-build `otopcua-python-snap7:1.0` | `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.S7.IntegrationTests/Docker/docker-compose.yml` | `docker compose -f <compose> --profile s7_1500 up -d` |
+| OpcUaClient | `mcr.microsoft.com/iotedge/opc-plc:2.14.10` (pinned) | `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.OpcUaClient.IntegrationTests/Docker/docker-compose.yml` | `docker compose -f <compose> up -d` |
 
 First build of a local-build image takes 1–5 minutes; subsequent runs use
 layer cache. `ab_server` is the slowest (multi-stage build clones
@@ -247,7 +250,7 @@ Order matters because some installs have prerequisites and several need admin el
    winget install --id Microsoft.DotNet.SDK.10 --accept-package-agreements --accept-source-agreements
    ```
 
-2. **Install .NET Framework 4.8 SDK + targeting pack** — only needed when starting Phase 2 (Galaxy.Host); skip for Phase 0–1 if not yet there
+2. **Install .NET Framework 4.8 SDK + targeting pack** — optional, only needed when building the mxaccessgw worker (sibling repo, x86 net48). Not required by anything in this repo.
    ```powershell
    winget install --id Microsoft.DotNet.Framework.DeveloperPack_4 --accept-package-agreements --accept-source-agreements
    ```
@@ -405,6 +408,49 @@ For production:
 - Per-NodeId credentials in `ClusterNodeCredential` table (per decision #83)
 - Admin app uses LDAP (no SQL credential at all on the user-facing side)
 
+## Service Refresh — `Refresh-Services.ps1`
+
+The deploy host hosts three NSSM-wrapped services (`MxAccessGw`,
+`OtOpcUaWonderwareHistorian`, `OtOpcUa`) that consume binaries from
+`C:\publish\`. After landing changes in either repo, refresh the
+deployed bits with `scripts\install\Refresh-Services.ps1`:
+
+```powershell
+# Default invocation (dev rig).
+& C:\Users\dohertj2\Desktop\lmxopcua\scripts\install\Refresh-Services.ps1
+
+# Skip the timestamped backup (faster on iterative dev cycles).
+& Refresh-Services.ps1 -SkipBackup
+
+# Dry-run — print the actions without doing them.
+& Refresh-Services.ps1 -WhatIf
+```
+
+The script:
+
+1. Stops services in reverse-dependency order (`OtOpcUa` →
+   `OtOpcUaWonderwareHistorian` → `MxAccessGw`) and force-kills
+   any residual processes.
+2. Snapshots the existing `C:\publish\mxaccessgw\` and
+   `C:\publish\lmxopcua\` trees to `C:\publish\.backup-<timestamp>\`
+   for rollback (skip with `-SkipBackup`).
+3. Builds + copies mxaccessgw worker (x86 net48) + server (net10.0)
+   binaries from the sibling repo.
+4. `dotnet publish`-es the OtOpcUa server + Wonderware historian
+   sidecar from this repo.
+5. Ensures `OTOPCUA_HISTORIAN_ALARM_WRITE_ENABLED=true` is set on
+   the historian service env block (PR C.2 toggle).
+6. Starts services in forward-dependency order (`MxAccessGw` →
+   `OtOpcUaWonderwareHistorian` → `OtOpcUa`).
+7. Smoke-verifies — service status, listening ports (5120 / 4840 /
+   4841), recent log tails.
+
+Functional verification (alarm raise / scripted alarm historian
+round-trip / sub-attribute fallback) is the operator's next step
+after the refresh; see
+[docs/plans/alarms-over-gateway.md](../plans/alarms-over-gateway.md)
+§Track D for the scenarios.
+
 ## Test Data Seed
 
 Each environment needs a baseline data set so cross-developer tests are reproducible. Lives in `tests/ZB.MOM.WW.OtOpcUa.IntegrationTests/SeedData/`:
@@ -482,7 +528,7 @@ Seeds are idempotent (re-runnable) and gitignored where they contain credentials
 | Docker Desktop license terms change for org use | Track Docker pricing; budget approved or fall back to Podman if license becomes blocking |
 | Integration host single point of failure | Document the setup so a second host can be provisioned in <2 days; test fixtures pin to a hostname so failover changes one DNS entry |
 | GLAuth dev config drifts between developers | Sync script + template (Step 4) keep configs aligned; periodic review |
-| Galaxy / MXAccess licensing for non-dev-machine | Galaxy stays on the dev machines that already have Aveva licenses; integration host does NOT run Galaxy (Galaxy.Host integration tests run on the dev box, not the shared host) |
+| Galaxy / MXAccess licensing for non-dev-machine | Galaxy stays on the dev machines that already have Aveva licenses; integration host does NOT run Galaxy (the mxaccessgw worker requires the AVEVA stack and runs on the dev box, not the shared host) |
 | Long-lived dev env credentials in dev `appsettings.Development.json` | Gitignored; documented as dev-only; production never uses these |
 
 ## Decisions to Add to plan.md

docs/v2/driver-specs.md

@@ -10,289 +10,65 @@
 
 ### Summary
 
-Out-of-process **Tier C** driver bridging AVEVA System Platform (Wonderware) Galaxies. The existing v1 implementation is refactored behind the new driver capability interfaces and hosted in a separate Windows service (.NET 4.8 x86) that communicates with the main OtOpcUa server (.NET 10 x64) via named pipes + MessagePack. Hosted out-of-process for **two reasons**: COM/.NET 4.8 x86 bitness constraint **and** Tier C stability isolation (per `driver-stability.md`). FOCAS is the second Tier C driver, also out-of-process — see §7.
-
-### Library & Dependencies
-
-| Component | Package / Source | Version | Target | Notes |
-|-----------|------------------|---------|--------|-------|
-| **MXAccess COM** | `ArchestrA.MxAccess` (GAC / `lib/ArchestrA.MxAccess.dll`) | version-neutral late-bound | .NET 4.8 x86 | Pinned via `<Reference Include="ArchestrA.MxAccess">` with `EmbedInteropTypes=false`; interfaces: `LMXProxyServer`, `ILMXProxyServerEvents`, `MXSTATUS_PROXY` |
-| **Galaxy DB client** | `System.Data.SqlClient` (BCL) | BCL | .NET 4.8 x86 | Direct SQL for hierarchy/attribute/change-detection queries |
-| **Wonderware Historian SDK** | `aahClientManaged`, `aahClientCommon` | Historian-shipped | .NET 4.8 x86 | Optional — loaded only when `Historian.Enabled=true` |
-| **MessagePack-CSharp** | `MessagePack` NuGet | 2.x | .NET Standard 2.0 (Shared) | IPC serialization; shared contract between Proxy and Host |
-| **Named pipes** | `System.IO.Pipes` (BCL) | BCL | both sides | IPC transport, localhost only |
-
-### Required Components
-
-- **AVEVA System Platform / ArchestrA Platform** deployed on the same machine as `Galaxy.Host` (installs MXAccess COM objects into the GAC)
-- A **deployed Galaxy** with at least one $WinPlatform object hosting $AppEngine(s) hosting AutomationObjects
-- **SQL Server** reachable from `Galaxy.Host` with the Galaxy repository database (default `ZB`); Windows Auth by default
-- **32-bit .NET Framework 4.8** runtime on the Host machine (MXAccess is 32-bit COM, no 64-bit variant)
-- **STA thread + Win32 message pump** inside the Host process for all COM calls and event callbacks (see §13)
-- **Wonderware Historian** installed on-box or reachable via aah SDK — *only* if HDA is enabled
-- **No external firewall ports** — MXAccess is local-machine COM/IPC; pipe is localhost-only. Galaxy DB port (default SQL 1433) if the ZB database is remote.
-
-### Connection Settings (per driver instance, from central config DB)
-
-All settings live under a schemaless `DriverConfig` JSON blob on the `DriverInstance` row. Current v1 equivalents (defaults and source file references in parentheses):
-
-**MXAccess** (`MxAccessConfiguration.cs`):
-
-| Setting | Type | Default | Description |
-|---------|------|---------|-------------|
-| `ClientName` | string | `"LmxOpcUa"` | Registration name passed to `LMXProxyServer.Register()` |
-| `NodeName` | string? | `null` | Optional ArchestrA node override (null = local) |
-| `GalaxyName` | string? | `null` | Optional Galaxy name override |
-| `ReadTimeoutSeconds` | int | `5` | Per-read timeout |
-| `WriteTimeoutSeconds` | int | `5` | Per-write timeout |
-| `RequestTimeoutSeconds` | int | `30` | Outer safety timeout around any MXAccess request |
-| `MaxConcurrentOperations` | int | `10` | Pool bound on in-flight MXAccess work items |
-| `MonitorIntervalSeconds` | int | `5` | Connectivity heartbeat probe interval |
-| `AutoReconnect` | bool | `true` | Replay stored subscriptions on COM reconnect |
-| `ProbeTag` | string? | `null` | Optional heartbeat tag for health monitoring |
-| `ProbeStaleThresholdSeconds` | int | `60` | Mark connection stale if no probe callback within |
-| `RuntimeStatusProbesEnabled` | bool | `true` | Auto-subscribe `ScanState` for $WinPlatform / $AppEngine |
-| `RuntimeStatusUnknownTimeoutSeconds` | int | `15` | Grace period before an un-probed host is assumed Stopped |
-
-**Galaxy repository** (`GalaxyRepositoryConfiguration.cs`):
-
-| Setting | Type | Default | Description |
-|---------|------|---------|-------------|
-| `ConnectionString` | string | `Server=localhost;Database=ZB;Integrated Security=true;` | ZB SQL Server connection |
-| `ChangeDetectionIntervalSeconds` | int | `30` | Poll interval for `galaxy.time_of_last_deploy` |
-| `CommandTimeoutSeconds` | int | `30` | SQL command timeout |
-| `ExtendedAttributes` | bool | `false` | Include extended attribute metadata in discovery |
-| `Scope` | enum (`Galaxy` \| `LocalPlatform`) | `Galaxy` | Address-space scope filter (commit bc282b6) |
-| `PlatformName` | string? | `Environment.MachineName` | Platform to scope to when `Scope=LocalPlatform` |
-
-**IPC** (new for v2):
-
-| Setting | Type | Default | Description |
-|---------|------|---------|-------------|
-| `PipeName` | string | `otopcua-galaxy-{InstanceId}` | Named pipe name |
-| `HostStartupTimeoutMs` | int | `30000` | Proxy wait for Host `Ready` handshake |
-| `IpcCallTimeoutMs` | int | `15000` | Per-call RPC timeout |
-
-### Addressing
-
-Galaxy objects carry two names:
-
-- **`contained_name`** — human-readable, scoped to parent; used for OPC UA browse tree
-- **`tag_name`** — globally unique system identifier; used for MXAccess runtime references
-
-| Layer | Example |
-|-------|---------|
-| OPC UA browse path | `TestMachine_001/DelmiaReceiver/DownloadPath` |
-| OPC UA NodeId | `ns=<galaxyNs>;s=<tagName>.<AttributeName>` |
-| MXAccess reference | `DelmiaReceiver_001.DownloadPath` (passed to `AddItem()`) |
-
-Tag discovery is **dynamic** — driven by the Galaxy repository DB (`gobject`, `dynamic_attribute`, `primitive_instance`, `template_definition`). Optional `Scope=LocalPlatform` filters the hierarchy via the `hosted_by_gobject_id` chain to the subtree rooted at the local $WinPlatform (on a dev Galaxy: 49→3 objects, 4206→386 attributes).
-
-### Data Type Mapping (`MxDataTypeMapper.cs`, `gr/data_type_mapping.md`)
-
-| mx_data_type | Galaxy Type | OPC UA BuiltInType | CLR Type |
-|--------------|-------------|--------------------|----------|
-| 1 | Boolean | Boolean (i=1) | `bool` |
-| 2 | Integer | Int32 (i=6) | `int` |
-| 3 | Float | Float (i=10) | `float` |
-| 4 | Double | Double (i=11) | `double` |
-| 5 | String | String (i=12) | `string` |
-| 6 | Time | DateTime (i=13) | `DateTime` |
-| 7 | ElapsedTime | Double (i=11) | `double` (seconds) |
-| 8 | Reference | String (i=12) | `string` |
-| 13 | Enumeration | Int32 (i=6) | `int` |
-| 14 / 16 | Custom | String (i=12) | `string` |
-| 15 | InternationalizedString | LocalizedText (i=21) | `string` |
-| (default) | Unknown | String (i=12) | `string` |
-
-**Arrays**: `is_array=0` → ValueRank `-1` (Scalar); `is_array=1` → ValueRank `1` (OneDimension), ArrayDimensions = `[array_dimension]`.
-
-### Security Classification Mapping (`SecurityClassificationMapper.cs`)
-
-| security_classification | Galaxy Level | OPC UA Write Permission |
-|-------------------------|--------------|-------------------------|
-| 0 | FreeAccess | `WriteOperate` |
-| 1 | Operate | `WriteOperate` |
-| 2 | SecuredWrite | — (read-only in v1) |
-| 3 | VerifiedWrite | — (read-only in v1) |
-| 4 | Tune | `WriteTune` |
-| 5 | Configure | `WriteConfigure` |
-| 6 | ViewOnly | — (read-only) |
-
-Maps to the OPC UA roles `ReadOnly` / `WriteOperate` / `WriteTune` / `WriteConfigure` defined in the LDAP role provider (see `docs/security.md`).
-
-### Subscription Model — Native MXAccess Advisories
-
-**Galaxy is one of three drivers with native subscriptions (Galaxy, TwinCAT, OPC UA Client).** No polling.
-
-- Mechanism: `LMXProxyServer.AddItem()` → `AdviseSupervisory(handle, itemHandle)`; callbacks delivered through the `ILMXProxyServerEvents.OnDataChange` COM event
-- Callback signature: `MxDataChangeHandler(itemHandle, MXSTATUS_PROXY, value, quality, timestamp)`
-- Dispatch: STA COM event → dispatch-thread queue → OPC UA `ClearChangeMasks` fan-out (decouples COM thread from UA stack lock — commit c76ab8f)
-- **Stored subscriptions** replayed on reconnect via `ReplayStoredSubscriptionsAsync()`
-- **Probe tag** + runtime-status probes provide connection-health visibility (see §14)
-- **Bad-quality fan-out**: when a host ($WinPlatform or $AppEngine) ScanState transitions to Stopped, every attribute under that host is immediately published as `BadOutOfService` (commits 7310925, c76ab8f)
-
-### Alarm Model
-
-In-process alarm-condition tracking (v1 baseline; extended in v2 to match `IAlarmSource`):
-
-- **Auto-subscribed attributes per alarm-eligible object**: `InAlarm`, `Priority`, `Description` (cached for severity and message)
-- **Filtering**: `AlarmFilterConfiguration.ObjectFilters[]` — include/exclude by template chain (empty = all eligible)
-- **Transitions**: `InAlarm` change → OPC UA A&C `AlarmConditionState` event (Active / Return to Normal)
-- **Severity**: Galaxy `Priority` (1 = highest) mapped to OPC UA 1–1000 severity (higher = more severe)
-- **Acknowledgment**: local OPC UA ack forwards to MXAccess write on the `Ack` attribute of the alarm-bearing object
-
-### History Model — Wonderware Historian (optional plugin)
-
-- Loaded **at runtime** from `ZB.MOM.WW.LmxOpcUa.Historian.Aveva.dll` when `Historian.Enabled=true`; compile-time optional
-- SDK: `aahClientManaged` / `aahClientCommon`
-- Supported OPC UA HDA calls:
-  - `HistoryReadRawModified` (raw values with bounds)
-  - `HistoryReadProcessed` (Historian aggregates: AVG, MIN, MAX, TIMEAVG, etc. — mapped to OPC UA aggregates)
-  - Continuation points for paged reads
-- Only attributes flagged `historize=1` in the Galaxy DB expose `AccessLevel.HistoryRead`
-
-### Error Mapping — MXAccess → Quality → OPC UA StatusCode
-
-**Byte quality (OPC DA convention)** — `QualityMapper.cs`:
-
-| OPC DA Quality | Category |
-|----------------|----------|
-| `>= 192` | Good |
-| `64–191` | Uncertain |
-| `< 64` | Bad |
-
-**MXAccess error codes → Quality** (`MxErrorCodes.cs`):
-
-| Code | Name | Quality |
-|------|------|---------|
-| 1008 | `MX_E_InvalidReference` | `BadConfigError` |
-| 1012 | `MX_E_WrongDataType` | `BadConfigError` |
-| 1013 | `MX_E_NotWritable` | `BadOutOfService` |
-| 1014 | `MX_E_RequestTimedOut` | `BadCommFailure` |
-| 1015 | `MX_E_CommFailure` | `BadCommFailure` |
-| 1016 | `MX_E_NotConnected` | `BadNotConnected` |
-
-**Quality → OPC UA StatusCode** (`QualityMapper.cs`):
-
-| Quality | StatusCode |
-|---------|-----------|
-| Good | `0x00000000` |
-| GoodLocalOverride | `0x00D80000` |
-| Uncertain | `0x40000000` |
-| Bad (generic) | `0x80000000` |
-| BadCommFailure | `0x80050000` |
-| BadNotConnected | `0x808A0000` |
-| BadOutOfService | `0x808D0000` |
-
-### Change Detection
-
-- `ChangeDetectionService` polls `galaxy.time_of_last_deploy` at `ChangeDetectionIntervalSeconds` (default 30s)
-- On timestamp change, `OnGalaxyChanged` fires → Host re-queries hierarchy/attributes → emits `TagSetChanged` over IPC → Proxy implements `IRediscoverable` and rebuilds the affected subtree in the address space
-- Platform-scope filter (commit bc282b6) applied during hierarchy load when `Scope=LocalPlatform`
-
-### IPC Contract (Proxy ↔ Host) — `Galaxy.Shared`
-
-.NET Standard 2.0 MessagePack contracts. Every request carries a correlation ID; responses carry the same ID plus success/error.
-
-**Lifecycle / handshake**:
-
-| Message | Direction | Payload |
-|---------|-----------|---------|
-| `ClientHello` | Proxy → Host | InstanceId, expected protocol version |
-| `HostReady` | Host → Proxy | Host version, Galaxy name, capabilities |
-| `Shutdown` | Proxy → Host | Graceful stop |
-
-**Tag discovery** (`ITagDiscovery`):
-
-| Message | Direction | Payload |
-|---------|-----------|---------|
-| `DiscoverHierarchyRequest` | Proxy → Host | `Scope`, `PlatformName` |
-| `DiscoverHierarchyResponse` | Host → Proxy | `GalaxyObjectInfo[]` (TagName, ContainedName, ParentTagName, TemplateChain, category) |
-| `DiscoverAttributesRequest` | Proxy → Host | `TagName[]` |
-| `DiscoverAttributesResponse` | Host → Proxy | `GalaxyAttributeInfo[]` (Name, MxDataType, IsArray, ArrayDim, SecurityClass, Historized, WriteableRuntimeChecked) |
-| `TagSetChangedNotification` | Host → Proxy | New deploy timestamp; triggers re-discover |
-
-**Read / Write** (`IReadable`, `IWritable`):
-
-| Message | Direction | Payload |
-|---------|-----------|---------|
-| `ReadRequest` | Proxy → Host | `TagRef[]` (tag_name + attribute) |
-| `ReadResponse` | Host → Proxy | `VtqPayload[]` (value, quality, timestamp, statusCode) |
-| `WriteRequest` | Proxy → Host | `(TagRef, Value, ExpectedDataType)[]` |
-| `WriteResponse` | Host → Proxy | `(TagRef, StatusCode)[]` |
-
-**Subscription** (`ISubscribable`):
-
-| Message | Direction | Payload |
-|---------|-----------|---------|
-| `SubscribeRequest` | Proxy → Host | `TagRef[]` + Proxy-generated subscription ID |
-| `SubscribeResponse` | Host → Proxy | Per-tag subscribe ack + handle |
-| `UnsubscribeRequest` | Proxy → Host | handles |
-| `DataChangeNotification` | Host → Proxy (push) | handle, VTQ, sequence number |
-| `ProbeHealthNotification` | Host → Proxy (push) | probe tag staleness, `ScanState` transitions, overall connected/disconnected |
-
-**Alarms** (`IAlarmSource`):
-
-| Message | Direction | Payload |
-|---------|-----------|---------|
-| `AlarmEventNotification` | Host → Proxy (push) | source tag, InAlarm, Priority, Description, severity, transition type |
-| `AlarmAckRequest` | Proxy → Host | source tag, user, comment |
-
-**History** (`IHistoryProvider`):
-
-| Message | Direction | Payload |
-|---------|-----------|---------|
-| `HistoryReadRawRequest` | Proxy → Host | TagRef, start, end, numValues, returnBounds, continuationPoint |
-| `HistoryReadRawResponse` | Host → Proxy | values + next continuation point |
-| `HistoryReadProcessedRequest` | Proxy → Host | TagRef, aggregateId, start, end, resampleInterval |
-| `HistoryReadProcessedResponse` | Host → Proxy | aggregated values |
-
-**Framing**: length-prefixed MessagePack frames over a single `NamedPipeServerStream` in `PipeTransmissionMode.Byte`. Separate outgoing pipe for push notifications or multiplex via message type tag.
-
-### Threading / COM Constraints
-
-- **STA thread** (`StaComThread.cs`) hosts MXAccess: `ApartmentState.STA`, raw Win32 `GetMessage` / `DispatchMessage` loop
-- Work items marshaled in via `PostThreadMessage(WM_APP=0x8000)`
-- **Per-handle serialization**: LMXProxyServer is not thread-safe — all Read/Write/Subscribe calls on one handle run serially via the STA queue
-- **Dispatch thread** (separate from STA thread) drains `_pendingDataChanges` to the OPC UA framework; decouples the STA pump from UA stack locks so a slow subscriber can't back up COM event delivery
-- **Reentrancy guards** — event unwiring must precede `Marshal.ReleaseComObject()` on disconnect
-
-### Runtime Status (recent commits bc282b6 / 4b209f6 / 7310925 / c76ab8f / 0003984)
-
-- `GalaxyRuntimeProbeManager` auto-subscribes `<ObjectName>.ScanState` for every $WinPlatform (category 1) and $AppEngine (category 3) in scope
-- Per-host state machine: `Unknown → Running | Stopped`; transitions fire `_onHostStopped` / `_onHostRunning` callbacks on the dispatch thread
-- **Synthetic OPC UA nodes** expose `ScanState` per host as read-only variables so clients see runtime topology without the dashboard
-- **HealthCheck Rule 2e** monitors probe subscription health; a failed probe can no longer leave phantom entries that fan out false `BadOutOfService`
-- Generalizes to the driver-agnostic `IHostConnectivityProbe` capability interface in v2 (see `plan.md` §5a)
-
-### Implementation Notes
-
-- **First Tier C out-of-process driver** — uses the `Galaxy.Proxy` / `Galaxy.Host` / `Galaxy.Shared` three-project split. The pattern is reusable; FOCAS is the second adopter (see §7), and any future driver with bitness, licensing, or stability-isolation needs reuses the same template. See `driver-stability.md` for the generalized contract
-- `Galaxy.Proxy` (in the main server) implements `IDriver`, `ITagDiscovery`, `IRediscoverable`, `IReadable`, `IWritable`, `ISubscribable`, `IAlarmSource`, `IHistoryProvider`, `IHostConnectivityProbe`
-- `Galaxy.Host` owns `MxAccessBridge`, `GalaxyRepository`, alarm tracking, `GalaxyRuntimeProbeManager`, and the Historian plugin — no reference to `Core.Abstractions`
-- `Galaxy.Shared` is .NET Standard 2.0, referenced by both sides
-- Existing v1 code is the implementation — **refactor in place** (extract capability interfaces first, then move behind IPC — see `plan.md` Decision #55)
-- **Parity gate**: v2 driver must pass v1 `IntegrationTests` suite + scripted Client.CLI walkthrough before Phase 3 begins
-
-### Operational Stability Notes
-
-Galaxy has a Tier C deep dive in `driver-stability.md` covering the STA pump, COM object lifetime, subscription replay, recycle policy, and post-mortem contents. Driver-instance specifics:
-
-- **Memory baseline scales with Galaxy size**. Watchdog floor of 200 MB above baseline + 1.5 GB hard ceiling — higher than FOCAS because legitimate Galaxy footprints are larger.
-- **Slope tolerance is 5 MB/min** (more permissive than FOCAS) because address-space rebuild on redeploy can transiently allocate large amounts.
-- **Known regression-prone failure modes** (closed in commits `c76ab8f` and `7310925`, must remain closed): phantom probe subscription flipping Tick() to Stopped; cross-host quality clear wiping sibling state during recovery; sync-over-async on the OPC UA stack thread; fire-and-forget alarm tasks racing shutdown. Each should have a regression test in the v2 parity suite.
-- **STA pump health probe** every 10 s (separate from the proxy↔host heartbeat). A wedged pump is the most likely Tier C failure mode for Galaxy.
-- **Recycle preserves cached `time_of_last_deploy` watermark** — the common case (crash unrelated to redeploy) skips full DB rediscovery for faster recovery.
-
-### Namespace Assignment
-
-Galaxy is the canonical **SystemPlatform-kind namespace** driver. It exposes Aveva System Platform / Galaxy objects as OPC UA — these are *processed* values with business meaning attached at Layer 3, not raw equipment signals. Per `plan.md` §4:
-
-- The Galaxy driver's `DriverInstance.NamespaceId` must reference a `Namespace` row with `Kind = 'SystemPlatform'`.
-- **UNS naming rules do NOT apply** to the Galaxy hierarchy. Tags belong to `DriverInstanceId + FolderPath` (v1 LmxOpcUa pattern preserved); `Tag.EquipmentId` is NULL.
-- The Galaxy hierarchy reflects the gobject parent chain as v1 has always done — no migration to UNS path conventions in v2.
-- If a future need arises to expose raw Galaxy gobject data alongside processed (e.g. an Aveva-Wonderware Historian raw signal feed), that becomes a *separate* driver instance assigned to an Equipment-kind namespace, with its own per-equipment mapping.
+Galaxy (MXAccess) is a **Tier-A in-process driver** that runs in the OtOpcUa server's .NET 10 AnyCPU process and speaks gRPC to a separately installed `mxaccessgw` (sibling repo at `c:\Users\dohertj2\Desktop\mxaccessgw\`). The gateway owns the MXAccess COM apartment, the STA pump, and the Galaxy Repository / Historian SDK on its own host; the driver itself is platform-agnostic and carries no COM or x86 bitness constraint. Project lives at `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/`.
+
+### Capability Surface
+
+`GalaxyDriver` (in `GalaxyDriver.cs`) implements `IDriver`, `IDisposable`, plus six driver capabilities — eight interfaces total.
+
+| Capability | Source files |
+|------------|--------------|
+| `ITagDiscovery` | `Browse/GalaxyDiscoverer.cs`, `Browse/GatewayGalaxyHierarchySource.cs`, `Browse/DataTypeMap.cs`, `Browse/SecurityMap.cs`, `Browse/AlarmRefBuilder.cs` |
+| `IRediscoverable` | `Browse/DeployWatcher.cs`, `Browse/GatewayGalaxyDeployWatchSource.cs` |
+| `IReadable` | `Runtime/GalaxyMxSession.cs`, `Runtime/MxValueDecoder.cs`, `Runtime/StatusCodeMap.cs` |
+| `IWritable` | `Runtime/GatewayGalaxyDataWriter.cs` (+ `TracedGalaxyDataWriter.cs`), `Runtime/MxValueEncoder.cs` |
+| `ISubscribable` | `Runtime/GatewayGalaxySubscriber.cs` (+ `TracedGalaxySubscriber.cs`), `Runtime/EventPump.cs`, `Runtime/SubscriptionRegistry.cs`, `Runtime/ReconnectSupervisor.cs` |
+| `IHostConnectivityProbe` | `Health/HostStatusAggregator.cs`, `Health/HostConnectivityForwarder.cs`, `Health/PerPlatformProbeWatcher.cs` |
+
+History reads + alarm condition tracking now live in the server-layer `IHistoryRouter` and `AlarmConditionService` (PR 7.2). Galaxy no longer carries `IHistoryProvider` or `IAlarmSource` of its own.
+
+### DriverConfig JSON shape
+
+Per `src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Galaxy/Config/GalaxyDriverOptions.cs`:
+
+```jsonc
+{
+  "Gateway": {
+    "Endpoint": "http://localhost:5120",
+    "ApiKeySecretRef": "secret:galaxy-gw-api-key",
+    "UseTls": true,
+    "CaCertificatePath": null,
+    "ConnectTimeoutSeconds": 10,
+    "DefaultCallTimeoutSeconds": 30,
+    "StreamTimeoutSeconds": 0
+  },
+  "MxAccess": {
+    "ClientName": "OtOpcUa",
+    "PublishingIntervalMs": 1000,
+    "WriteUserId": 0,
+    "EventPumpChannelCapacity": 50000
+  },
+  "Repository": {
+    "DiscoverPageSize": 5000,
+    "WatchDeployEvents": true
+  },
+  "Reconnect": {
+    "InitialBackoffMs": 500,
+    "MaxBackoffMs": 30000,
+    "ReplayOnSessionLost": true
+  }
+}
+```
+
+`Gateway.ApiKeySecretRef` resolves through the server-side secret store (DPAPI in production, env override in dev) — the API key never appears in cleartext config. `MxAccess.ClientName` MUST be unique per OtOpcUa instance; redundancy pairs enforce uniqueness at install time. `StreamTimeoutSeconds = 0` keeps the `StreamEvents` RPC alive for the lifetime of the driver.
+
+### Performance, tracing, soak
+
+See [Galaxy.Performance.md](Galaxy.Performance.md) for the OpenTelemetry trace map, the per-RPC metric set (`galaxy.events.dropped`, channel headroom, reconnect backoff distribution), and the soak-run profile.
+
+### Parity rig + gateway setup
+
+See [Galaxy.ParityRig.md](Galaxy.ParityRig.md) and the `mxaccessgw` repo for the gateway worker layout and the dev-rig recipe.
 
 ---
 

docs/v2/driver-stability.md

@@ -174,7 +174,7 @@ Common contract for the proxy in the main server:
 
 Named pipes default to allowing connections from any local user. Without explicit ACLs, any process on the host machine that knows the pipe name could connect, bypass the OPC UA server's authentication and authorization layers, and issue reads, writes, or alarm acknowledgments directly against the driver host. **This is a real privilege-escalation surface** — a service account with no OPC UA permissions could write field values it should never have access to. Every Tier C driver enforces the following:
 
-1. **Pipe ACL**: the host creates the pipe with a `PipeSecurity` ACL that grants `ReadWrite | Synchronize` only to the OtOpcUa server's service principal SID. All other local users — including LocalSystem and Administrators — are explicitly denied. The ACL is set at pipe-creation time so it's atomic with the pipe being listenable.
+1. **Pipe ACL**: the host creates the pipe with a `PipeSecurity` ACL that grants `ReadWrite | Synchronize` only to the OtOpcUa server's service principal SID. `LocalSystem` is explicitly denied. The ACL is set at pipe-creation time so it's atomic with the pipe being listenable. Administrators are **not** added to the deny list — UAC's filtered token carries the Admins group SID as deny-only, so a deny ACE on Administrators would fire even for non-elevated callers whose user account happens to be a member (common on dev boxes). The per-connection SID check in §2 remains the authorization boundary.
 2. **Caller identity verification**: on each new pipe connection, the host calls `NamedPipeServerStream.GetImpersonationUserName()` (or impersonates and inspects the token) and verifies the connected client's SID matches the configured server service SID. Mismatches are logged and the connection is dropped before any RPC frame is read.
 3. **Per-message authorization context**: every RPC frame includes the operation's authenticated OPC UA principal (forwarded by the Core after it has done its own authn/authz). The host treats this as input only — the driver-level authorization (e.g. "is this principal allowed to write Tune attributes?") is performed by the Core, but the host's own audit log records the principal so post-incident attribution is possible.
 4. **No anonymous endpoints**: the heartbeat pipe has the same ACL as the data-plane pipe. There are no "open" pipes a generic client can probe.

docs/v2/focas-version-matrix.md

@@ -1,12 +1,12 @@
 # FOCAS version / capability matrix
 
 Authoritative source for the per-CNC-series ranges that
-[`FocasCapabilityMatrix`](../../src/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasCapabilityMatrix.cs)
+[`FocasCapabilityMatrix`](../../src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasCapabilityMatrix.cs)
 enforces at driver init time. Every row cites the Fanuc FOCAS Developer
 Kit function whose documented input range determines the ceiling.
 
 **Why this exists** — we have no FOCAS hardware on the bench and no
-working simulator. Fwlib32 returns `EW_NUMBER` / `EW_PARAM` when you
+working simulator. FWLIB (Fwlib64, or Fwlib32 on legacy deployments) returns `EW_NUMBER` / `EW_PARAM` when you
 hand it an address outside the controller's supported range; the
 driver would map that to a per-read `BadOutOfRange` at steady state.
 Catching at `InitializeAsync` with this matrix surfaces operator
@@ -122,7 +122,7 @@ matrix: Macro variable #50000 is outside the documented range
 ## How this matrix stays honest
 
 - Every row is covered by a parameterized test in
-  [`FocasCapabilityMatrixTests.cs`](../../tests/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasCapabilityMatrixTests.cs)
+  [`FocasCapabilityMatrixTests.cs`](../../tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Tests/FocasCapabilityMatrixTests.cs)
   — 46 cases across macro / parameter / PMC-letter / PMC-number
   boundaries + unknown-series permissiveness + rejection-message
   content + case-insensitivity.
@@ -140,6 +140,6 @@ matrix: Macro variable #50000 is outside the documented range
 This validation closes the cheap half of the FOCAS hardware-free
 stability gap — config errors now fail at load instead of per-read.
 The expensive half is Tier-C process isolation so that a crashing
-`Fwlib32.dll` doesn't take the main OPC UA server down with it. See
+`Fwlib64.dll` doesn't take the main OPC UA server down with it. See
 [`docs/v2/implementation/focas-isolation-plan.md`](implementation/focas-isolation-plan.md)
 for that plan (task #220).

docs/v2/implementation/admin-ui-phase-6-status.md

@@ -0,0 +1,38 @@
+# Admin UI Phase 6 status audit (2026-04-24)
+
+Audit pass that closes the Phase 6 Admin-UI tasks that were tracked as still-open (#128–#131) but already had their Blazor pages shipped. Every page listed below compiles against the current `OtOpcUaConfigDbContext` schema + the current Admin service surface, has substantive (non-stub) content, and is covered by `ZB.MOM.WW.OtOpcUa.Admin.Tests` (112/112 green).
+
+## Task #128 — /hosts column refresh (Phase 6.1 Stream E.2/E.3)
+
+`Components/Pages/Hosts.razor` — 233 LOC. Route `/hosts`. Ships:
+
+- Per-driver circuit-breaker columns (`ConsecutiveFailures`, `LastCircuitBreakerOpenUtc`).
+- Stale-row detection via `HostStatusService.IsStale` (publisher heartbeat ≥ 30 s stale threshold).
+- Summary cards: Running / Stale / Faulted / total.
+- Auto-refresh every `RefreshIntervalSeconds` driven by the `FleetStatusHub` SignalR feed.
+- Health band via `DriverHostState` enum colour coding.
+
+## Task #129 — RoleGrantsTab + AclsTab + Probe (Phase 6.2 Stream D)
+
+- `Components/Pages/RoleGrants.razor` — 192 LOC. Route `/role-grants`. Edits LDAP-group → OPC-UA-role mappings with live reload over `AclChangeNotifier` SignalR.
+- `Components/Pages/Clusters/AclsTab.razor` — 279 LOC. NodeAcl CRUD + the **"Probe this permission"** form (task #196 slice 1, embedded at line 38 onward). Binds `_probeGroup` / `_probeNamespaceId` / `_probeUnsAreaId` / `_probeUnsLineId` / `_probeEquipmentId` / `_probeTagId` / `_probePermission` through `PermissionProbeService`.
+
+## Task #130 — RedundancyTab (Phase 6.3 Stream E)
+
+`Components/Pages/Clusters/RedundancyTab.razor` — 175 LOC. Topology table, per-peer reachability (via `FleetStatusHub`), ServiceLevel band + `ApplyLeaseRegistry` / `RecoveryStateManager` state surfaces, failover action button. Live updates over the same SignalR hub `RedundancyPublisherHostedService` ticks.
+
+## Task #131 — Draft / publish / diff / identification (Phase 6.4 Streams A–D)
+
+- `Components/Pages/Clusters/DraftEditor.razor` — 105 LOC. Route `/clusters/{ClusterId}/draft/{GenerationId:long}`. Calls `DraftValidationService` + `GenerationService`.
+- `Components/Pages/Clusters/Generations.razor` — 73 LOC. Publish flow (generation state transitions through `sp_PublishGeneration`).
+- `Components/Pages/Clusters/DiffViewer.razor` — 87 LOC. Route `/clusters/{ClusterId}/draft/{GenerationId:long}/diff`. Renders `sp_ComputeGenerationDiff` output.
+- `Components/Pages/Clusters/IdentificationFields.razor` — 49 LOC. OPC 40010 Identification folder editor bound to the `Equipment` entity.
+
+## What's NOT in this audit
+
+- `#124` — Phase 6.2 3-user interop matrix. Authz layer is now covered by `ThreeUserInteropMatrixTests` in `ZB.MOM.WW.OtOpcUa.Server.Tests` (drives the 5 GLAuth users + admin through `LdapUserAuthenticator` → `AuthorizationGate.IsAllowed` for the role × operation matrix). The wire-level OPC UA-client cross-vendor leg still needs a UserName-token endpoint policy + manual client drill — that part stays a manual deliverable.
+- `#119` — Phase 6.3 client interop matrix. Manual Ignition/Kepware/Aveva drills.
+- `#113` — OPC UA CTT conformance pass. Manual CTT run.
+- `#114` / `#115` — Redundancy cutover + deployment checklist. Manual.
+
+Those remain GA-gating but require a human at a console, not a code change.

docs/v2/implementation/exit-gate-phase-3.md

@@ -0,0 +1,129 @@
+# Phase 3 Exit Gate — Driver Fleet (reconstructed retroactively)
+
+> **Status**: **CLOSED (reconstructed 2026-04-23)**. The original plan split the
+> driver work across Phases 3 / 4 / 5 (Modbus alone → four PLC drivers → two
+> specialty drivers). In execution, all seven non-Galaxy drivers shipped under
+> one umbrella against `Core.Abstractions` + `Core`'s generic driver-hosting
+> machinery. This doc captures the closure retroactively; no forward work
+> remains under these three original phase numbers.
+>
+> **Plan doc**: none — phases 3/4/5 were intentionally not split out into
+> separate plan docs once it was clear the capability-interface contract
+> introduced in Phase 1 (`Core.Abstractions` — plan decision #4) was stable
+> enough that each driver could land as its own stream rather than as a
+> gated mini-phase. See `docs/v2/plan.md` §6 for the now-consolidated
+> migration strategy.
+
+## Scope
+
+All seven drivers in the v2 target list (Decision #5) minus Galaxy (closed
+separately under Phase 2). The Galaxy Proxy+Host+Shared split exited under
+`exit-gate-phase-2-final.md`; this gate does not re-cover it.
+
+## What shipped
+
+### Drivers
+
+| Driver | Project | Capability surface | Test projects |
+|---|---|---|---|
+| Modbus TCP | `Driver.Modbus` + `Driver.Modbus.Cli` | `IDriver` + `ITagDiscovery` + `IReadable` + `IWritable` + `ISubscribable` + `IHostConnectivityProbe` | `Tests`, `IntegrationTests`, `Cli.Tests` |
+| AB CIP | `Driver.AbCip` + `Driver.AbCip.Cli` | all of the above + `IPerCallHostResolver` + `IAlarmSource` | `Tests`, `IntegrationTests`, `Cli.Tests` |
+| AB Legacy (PCCC / DF1) | `Driver.AbLegacy` + `Driver.AbLegacy.Cli` | `IDriver` + `IReadable` + `IWritable` + `ITagDiscovery` + `ISubscribable` + `IHostConnectivityProbe` + `IPerCallHostResolver` | `Tests`, `IntegrationTests`, `Cli.Tests` |
+| Siemens S7 | `Driver.S7` + `Driver.S7.Cli` | `IDriver` + `ITagDiscovery` + `IReadable` + `IWritable` + `ISubscribable` + `IHostConnectivityProbe` | `Tests`, `IntegrationTests`, `Cli.Tests` |
+| Beckhoff TwinCAT (ADS) | `Driver.TwinCAT` + `Driver.TwinCAT.Cli` | `IDriver` + `IReadable` + `IWritable` + `ITagDiscovery` + `ISubscribable` + `IHostConnectivityProbe` + `IPerCallHostResolver` | `Tests`, `IntegrationTests`, `Cli.Tests` |
+| FANUC FOCAS | `Driver.FOCAS` + `Driver.FOCAS.Host` + `Driver.FOCAS.Shared` + `Driver.FOCAS.Cli` | `IDriver` + `IReadable` + `IWritable` + `ITagDiscovery` + `ISubscribable` + `IHostConnectivityProbe` + `IPerCallHostResolver`; Tier-C out-of-process backend mirrors the Galaxy Proxy/Host split. `Fwlib64FocasBackend` shipped 2026-04-23 as the production backend (P/Invoke against `Fwlib64.dll`); Host retargeted from net48 x86 to net10.0-windows x64 at the same time. | `Tests`, `Host.Tests`, `Shared.Tests`, `Cli.Tests` |
+| OPC UA Client (gateway) | `Driver.OpcUaClient` | `IDriver` + `ITagDiscovery` + `IReadable` + `IWritable` + `ISubscribable` + `IHostConnectivityProbe` + `IAlarmSource` + `IHistoryProvider` (richest surface in the fleet — it's bridging another UA server) | `Tests`, `IntegrationTests` |
+
+### Supporting infrastructure
+
+| PR / Task | Summary |
+|---|---|
+| #248 | `DriverFactoryRegistry` + `DriverInstanceBootstrapper` — central DB `DriverInstance` rows materialise into live `IDriver` instances at server startup. |
+| #210 | Modbus server-side factory + seed SQL (closed first child of umbrella #209). |
+| #211 #212 #213 | AB CIP / S7 / AB Legacy server-side factories + seed SQL. |
+| #220 (FOCAS) | FOCAS factory wired into the bootstrap pipeline; Tier-C split (`Driver.FOCAS.Host` process launcher, named-pipe IPC, NSSM install scripts, post-mortem MMF) shipped across the five-PR series. |
+| (this session) | TwinCAT factory wired in + Server project reference added; all seven driver factories now register uniformly in `Server/Program.cs`. |
+| #249 #250 #251 | Per-driver test-client CLI suite (`otopcua-<driver>-cli`) — shared lib + one CLI per driver for direct-to-PLC smoke testing independent of the server. |
+| #253 + follow-ups | E2E CLI test scripts (`scripts/e2e/test-<driver>.ps1`) — five-stage bidirectional bridge + subscribe-sees-change assertions per driver, plus `test-all.ps1` matrix runner. |
+| (this session) | OPC UA Client e2e script shipped (`test-opcuaclient.ps1`, 8 stages) — the only driver that was missing an e2e script. |
+
+### Docs
+
+Per-driver test-fixture documentation:
+- `docs/drivers/Modbus-Test-Fixture.md`
+- `docs/drivers/AbServer-Test-Fixture.md` (covers AB CIP fixture)
+- `docs/drivers/AbLegacy-Test-Fixture.md`
+- `docs/drivers/S7-Test-Fixture.md`
+- `docs/drivers/TwinCAT-Test-Fixture.md`
+- `docs/drivers/FOCAS-Test-Fixture.md`
+- `docs/drivers/OpcUaClient-Test-Fixture.md`
+
+Driver-level ops docs:
+- `docs/Driver.Modbus.Cli.md`, `docs/Driver.AbCip.Cli.md`, `docs/Driver.AbLegacy.Cli.md`, `docs/Driver.S7.Cli.md`, `docs/Driver.TwinCAT.Cli.md`, `docs/Driver.FOCAS.Cli.md`
+- `docs/v2/driver-specs.md` — unified capability-matrix spec for all eight drivers (Galaxy + seven).
+
+## Compliance evidence
+
+No dedicated `phase-3-compliance.ps1` exists — scope was too broad to fit the
+single-script pattern that worked for Phases 6.x and 7. Verification instead
+takes the form of the per-driver test suites + e2e scripts:
+
+- [x] **Unit tests** — every driver has a `Tests` project with capability-interface contract tests; `dotnet test tests/ZB.MOM.WW.OtOpcUa.Driver.*.Tests` is green.
+- [x] **Integration tests** — `Driver.*.IntegrationTests` stands up Docker-hosted simulators (pymodbus, ab_server, python-snap7, opc-plc) at collection init and exercises real wire-level read/write/subscribe/probe per driver.
+- [x] **CLI tests** — `Driver.*.Cli.Tests` covers the per-driver test-client CLIs (#249–#251).
+- [x] **E2E scripts** — `scripts/e2e/test-<driver>.ps1` covers the driver-CLI → PLC → OtOpcUa server → OPC UA client round-trip for all seven drivers + Galaxy; `test-all.ps1` aggregates; README status section (rewritten this session) summarises live-boot evidence.
+- [x] **Factory registration** — all seven factories plus Galaxy register in `src/Server/ZB.MOM.WW.OtOpcUa.Server/Program.cs` inside the `DriverFactoryRegistry` composition; the `DriverInstanceBootstrapper` can materialise any configured row.
+- [x] **Seed SQL** — #210–#213 provide per-driver Config DB seed scripts so a fresh Config DB is populatable without Admin UI interaction.
+
+### Live-boot verification
+
+Recorded across the session-level tracking tasks:
+
+| Driver | Fixture | Stages | Tracking |
+|---|---|---|---|
+| Modbus | pymodbus (dl205 profile) | 5/5 | #209 exit gate; bidirectional + subscribe-sees-change added in #253 follow-ups |
+| AB CIP | `ab_server` ControlLogix | 5/5 | #220 |
+| S7 | python-snap7 | 5/5 | #220 |
+| AB Legacy | `ab_server` SLC500 / MicroLogix / PLC-5 (requires `/1,0` cip-path for Docker fixture) | 5/5 | #222 partial |
+| OPC UA Client | opc-plc Docker fixture | 5/8 (probe, remote read, forward bridge, subscribe, browse) | (this session) |
+| TwinCAT | TCBSD VM @ 10.100.0.128 (AmsNetId `41.169.163.43.1.1`) — real TwinCAT runtime under FreeBSD on ESXi; bypasses the Hyper-V/RTIME conflict that blocks XAR on this dev box | features validated | fixture is the TCBSD VM; `TWINCAT_TRUST_WIRE=1` still gates the e2e script by default so unintentional runs against cold fixtures don't false-pass |
+| FOCAS | Lab-rig CNC + `Fwlib64.dll` | — | **deferred** — `Fwlib64FocasBackend` shipped 2026-04-23; wire-level live-boot gated `FOCAS_TRUST_WIRE=1`, lab rig tracked under #222 follow-up |
+| Galaxy | Live Galaxy + `OtOpcUaGalaxyHost` (this dev box) | 7/7 (read / write / subscribe / alarms / history) | closed under Phase 2 |
+
+## Deferred to post-gate follow-ups
+
+Items intentionally not blocking closure of this umbrella — each is hardware-
+dependent and tracked separately:
+
+- [ ] **FOCAS wire-level live-boot** — `test-focas.ps1` against a real CNC once `Fwlib64.dll` is on PATH and `FOCAS_TRUST_WIRE=1` (#222 follow-up). The `Fwlib64FocasBackend` shipped 2026-04-23 — code exists, unit-tests green; only the live-CNC smoke test remains.
+- [x] **FOCAS `Fwlib64FocasBackend`** — **CLOSED 2026-04-23**. The production backend in `src/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.Host/Backend/Fwlib64FocasBackend.cs` wraps `FwlibFocasClient` to fulfil `IFocasBackend` against the licensed `Fwlib64.dll`. Host project retargeted to `net10.0-windows` x64. Default when `OTOPCUA_FOCAS_BACKEND` is unset. 6 new backend tests green. Only wire-level live-boot against real hardware remains — see item above.
+- [ ] **OPC UA Client stages 5/7/8** — reverse-bridge, alarm, history stages are opt-in via sidecar NodeId params because opc-plc's default image has no writable nodes and doesn't historize. Against a richer upstream (Prosys, UA Expert sample server) all eight stages can run.
+
+## Completion checklist
+
+- [x] Modbus driver shipped + unit + integration + CLI tests green
+- [x] AB CIP driver shipped + tests green + live-boot 5/5
+- [x] AB Legacy driver shipped + tests green + live-boot 5/5
+- [x] S7 driver shipped + tests green + live-boot 5/5
+- [x] TwinCAT driver shipped + tests green + features validated against the TCBSD VM virtual-PLC fixture
+- [x] FOCAS driver shipped (Tier-C split) + tests green (wire-live deferred)
+- [x] OPC UA Client driver shipped + tests green + live-boot 5/8
+- [x] `DriverFactoryRegistry` + `DriverInstanceBootstrapper` shipped
+- [x] All seven factories registered in `Server/Program.cs`
+- [x] Per-driver test-client CLI suite shipped
+- [x] E2E test scripts shipped + `test-all.ps1` aggregator green
+- [x] Per-driver test-fixture docs present
+- [x] `docs/v2/driver-specs.md` unified capability spec present
+- [x] `scripts/e2e/README.md` status section reflects current live-boot matrix
+- [x] Exit gate doc checked in (this file)
+- [x] TwinCAT validated against the TCBSD VM virtual-PLC fixture — `TWINCAT_TRUST_WIRE=1` + e2e script still gated by default to prevent false-pass against cold fixtures
+- [ ] FOCAS lab-rig follow-up filed + tracked (#222)
+
+## Why no compliance script
+
+The Phases 6.1/6.2/6.3/6.4/7 pattern of a single `phase-N-compliance.ps1`
+worked because each of those phases touched a narrow slice of server-side
+runtime. A "phase-3-compliance.ps1" would have had to boot seven simulators,
+configure seven DriverInstance rows, and run seven e2e scripts — which is
+exactly what `scripts/e2e/test-all.ps1` already does. The aggregate runner
++ its README is the compliance artefact for this umbrella.

docs/v2/implementation/exit-gate-phase-7.md

@@ -1,6 +1,6 @@
 # Phase 7 Exit Gate — Scripting, Virtual Tags, Scripted Alarms, Historian Sink
 
-> **Status**: Open. Closed when every compliance check passes + every deferred item either ships or is filed as a post-v2-release follow-up.
+> **Status**: **FULLY CLOSED** 2026-04-23 audit — the three original follow-ups (#239 / #240 / #241) were all shipped under later branches but this exit-gate doc wasn't updated at the time. All three verified against the repo + tests green.
 >
 > **Compliance script**: `scripts/compliance/phase-7-compliance.ps1`
 > **Plan doc**: `docs/v2/implementation/phase-7-scripting-and-alarming.md`
@@ -45,13 +45,13 @@ Covered by `scripts/compliance/phase-7-compliance.ps1`:
 - [x] Walker emits `NodeSourceKind.Virtual` + `NodeSourceKind.ScriptedAlarm` variables
 - [x] `DriverNodeManager` dispatch routes Reads by source; Writes to non-Driver rejected with `BadUserAccessDenied` (plan #6)
 
-## Deferred to Post-Gate Follow-ups
+## Deferred to Post-Gate Follow-ups (all closed as of 2026-04-23 audit)
 
-Kept out of the capstone so the gate can close cleanly while the less-critical wiring lands in targeted PRs:
+Originally kept out of the capstone so the gate could close cleanly. Each landed as a targeted follow-up PR; audit this session verified them against the repo:
 
-- [ ] **SealedBootstrap composition root** (task #239) — instantiate `VirtualTagEngine` + `ScriptedAlarmEngine` + `SqliteStoreAndForwardSink` in `Program.cs`; pass `VirtualTagSource` + `ScriptedAlarmSource` as the new `IReadable` parameters on `DriverNodeManager`. Without this, the engines are dormant in production even though every piece is tested.
-- [ ] **Live OPC UA end-to-end smoke** (task #240) — Client.CLI browse + read a virtual tag computed by Roslyn; Client.CLI acknowledge a scripted alarm via the Part 9 method node; historian-disabled deployment returns `BadNotFound` for virtual nodes rather than silent failure.
-- [ ] **sp_ComputeGenerationDiff extension** (task #241) — emit Script / VirtualTag / ScriptedAlarm sections alongside the existing Namespace/DriverInstance/Equipment/Tag/NodeAcl rows so the Admin DiffViewer shows Phase 7 changes between generations.
+- [x] **SealedBootstrap composition root** (task #239) — **CLOSED**. `src/Server/ZB.MOM.WW.OtOpcUa.Server/Phase7/Phase7Composer.cs` instantiates `VirtualTagEngine` + `ScriptedAlarmEngine` via `Phase7EngineComposer.Compose`, and `SqliteStoreAndForwardSink` in `ResolveHistorianSink` when a registered driver provides `IAlarmHistorianWriter` (today: `GalaxyProxyDriver`). `OpcUaServerService.ExecuteAsync` calls `Phase7Composer.PrepareAsync` then `OpcUaApplicationHost.SetPhase7Sources` **before** `applicationHost.StartAsync` so `OtOpcUaServer` + `DriverNodeManager` capture the `VirtualReadable` / `ScriptedAlarmReadable` at construction. 38 tests green under `tests/Server/ZB.MOM.WW.OtOpcUa.Server.Tests/Phase7/` + `SealedBootstrapIntegrationTests`. The work landed under the label "Phase 7 follow-up #246" and was never re-labelled against #239.
+- [x] **Live OPC UA end-to-end smoke** (task #240) — **CLOSED**. `scripts/e2e/test-phase7-virtualtags.ps1` drives a full Client.CLI read of a driver-sourced input, reads the VirtualTag computed off it, triggers a scripted alarm by writing the trigger value, and subscribes to the alarm condition — all through a running OtOpcUa server. Covered in `scripts/e2e/test-all.ps1` + `scripts/e2e/README.md` matrix.
+- [x] **sp_ComputeGenerationDiff extension** (task #241) — **CLOSED**. Migration `20260420232000_ExtendComputeGenerationDiffWithPhase7.cs` extends the stored proc to emit Script / VirtualTag / ScriptedAlarm sections alongside the existing NodeAcl / Tag / Equipment / DriverInstance / Namespace output. Admin DiffViewer picks them up through its existing section-plugin architecture (Phase 6.4 Stream C).
 
 ## Completion Checklist
 
@@ -66,9 +66,9 @@ Kept out of the capstone so the gate can close cleanly while the less-critical w
 - [x] `phase-7-compliance.ps1` present and passes
 - [x] Full solution `dotnet test` passes (no new failures beyond pre-existing tolerated CLI flake)
 - [x] Exit-gate doc checked in
-- [ ] `SealedBootstrap` composition follow-up filed + tracked
-- [ ] Live end-to-end smoke follow-up filed + tracked
-- [ ] `sp_ComputeGenerationDiff` extension follow-up filed + tracked
+- [x] `SealedBootstrap` composition follow-up shipped (#239 / Phase 7 follow-up #246)
+- [x] Live end-to-end smoke follow-up shipped (#240 — `scripts/e2e/test-phase7-virtualtags.ps1`)
+- [x] `sp_ComputeGenerationDiff` extension follow-up shipped (#241 — migration `ExtendComputeGenerationDiffWithPhase7`)
 
 ## How to run
 

docs/v2/implementation/focas-isolation-plan.md

@@ -1,10 +1,21 @@
 # FOCAS Tier-C isolation — plan for task #220
 
-> **Status**: PRs A–E shipped. Architecture is in place; the only
-> remaining FOCAS work is the hardware-dependent production
-> integration of `Fwlib32.dll` into a real `IFocasBackend`
-> (`FwlibHostedBackend`), which needs an actual CNC on the bench
-> and is tracked as a follow-up on #220.
+> **Status**: **FULLY SHIPPED** (code). PRs A–E shipped the architecture; the
+> 2026-04-23 follow-up shipped the production `Fwlib64FocasBackend` wrapping
+> the licensed `Fwlib64.dll`. Only the wire-level live-boot against real
+> hardware remains (task #222 / requires a bench CNC).
+>
+> **Major update 2026-04-23 — Host retargeted to .NET 10 x64 + Fwlib64**:
+> Both `Fwlib32.dll` and `Fwlib64.dll` are licensed for this project. The
+> original plan put the Host on .NET 4.8 x86 because Fwlib32 was assumed.
+> With Fwlib64 available, the Host moves to `net10.0-windows` x64 — same
+> runtime as the rest of the fleet. **Tier-C isolation stays anyway** — the
+> blast-radius argument against a closed-source vendor P/Invoke is independent
+> of bitness. Galaxy (forced x86 by MXAccess COM) is a pure bitness forcing;
+> FOCAS is a pure blast-radius choice. Body of this document still reflects
+> the original x86 assumptions in a few places — read them as historical
+> design context; the current shape is in `docs/drivers/FOCAS-Test-Fixture.md`
+> and `exit-gate-phase-3.md`.
 >
 > **Pre-reqs shipped**: version matrix + pre-flight validation
 > (PR #168 — the cheap half of the hardware-free stability gap).
@@ -131,7 +142,7 @@ itself is verifiable without Fwlib32 actually being called:
   assert rejection.
 - **Fwlib32 integration itself**: still untestable without hardware.
   When a real CNC becomes available, the smoke tests already
-  scaffolded in `tests/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/`
+  scaffolded in `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/`
   run against it via `FOCAS_ENDPOINT`.
 
 ## Decisions to confirm before starting

docs/v2/implementation/focas-wire-protocol.md

@@ -0,0 +1,290 @@
+# FOCAS wire protocol — what's authoritative vs. what's guessed
+
+Written during Stream B on 2026-04-23 after a research pass through `strangesast/fwlib` +
+public FOCAS documentation. Purpose: separate what we *know* about the FOCAS
+wire protocol (can quote with confidence) from what we're *guessing* (will need
+Wireshark traces to validate in Stream C).
+
+This document directly informs `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Docker/server/`.
+
+## Authoritative — from Fanuc's public `fwlib32.h`
+
+The header file is distributed with the FOCAS Developer Kit and mirrored in OSS
+repos (notably `strangesast/fwlib`). The **struct layouts** documented there
+are stable across FOCAS versions and authoritative for the payload shapes our
+Python mock has to emit.
+
+### ODBM — macro variable read buffer
+
+```c
+typedef struct odbm {
+    short datano;    // macro variable number
+    short dummy;     // reserved / alignment padding
+    long  mcr_val;   // 32-bit signed macro value
+    short dec_val;   // decimal-point count (0-9)
+} ODBM;
+```
+
+With `#pragma pack(push, 4)` (the FOCAS default), total size is **10 bytes** on
+Windows: 2 + 2 + 4 + 2. Our `FwlibNative.cs` matches this exactly.
+
+Our mock's `_READ_RESP_STRUCT = struct.Struct(">iH")` is **only 6 bytes** —
+missing `datano` + `dummy`. A real Fwlib decoding the scaffold response will
+read garbage. Stream C fix: prepend two `short` fields.
+
+### IODBPSD — CNC parameter read/write buffer
+
+```c
+typedef struct iodbpsd {
+    short datano;       // parameter number
+    short type;         // axis index (0 for non-axis parameters)
+    union {
+        char  cdata;
+        short idata;
+        long  ldata;
+        char  cdatas[MAX_AXIS];   // MAX_AXIS varies — 8 on 0i, 32 on 30i
+        short idatas[MAX_AXIS];
+        long  ldatas[MAX_AXIS];
+    } u;
+} IODBPSD;
+```
+
+With `pack(4)` and `MAX_AXIS=8`, total size = 2 + 2 + 32 = **36 bytes**. Our
+`FwlibNative.cs` matches this (`[SizeConst = 32]` data buffer).
+
+Our mock's current param handler doesn't return bytes in IODBPSD shape —
+response payload is just the raw value. Stream C fix: wrap in 4-byte header
++ union-padded data.
+
+### ODBST — status info
+
+```c
+typedef struct odbst {
+    short dummy;      // reserved
+    short tmmode;     // Memory / Tape / MDI / EDIT / DNC
+    short aut;        // automatic mode
+    short run;        // running state
+    short motion;     // motion state
+    short mstb;       // M/S/T/B finish signal
+    short emergency;  // emergency stop
+    short alarm;      // alarm state
+    short edit;       // edit mode sub-state
+} ODBST;
+```
+
+9 × short = **18 bytes**. Our mock already emits 18 bytes via
+`struct.Struct(">9h")`. ✓ correct.
+
+### IODBPMC — PMC range read/write buffer
+
+```c
+typedef struct iodbpmc {
+    short type_a;       // PMC address letter encoded as ADR_* numeric code
+    short type_d;       // data type: 0=byte, 1=word, 2=long, 4=float, 5=double
+    unsigned short datano_s;  // start address number
+    unsigned short datano_e;  // end address number
+    union {
+        char   cdata[5];
+        short  idata[5];
+        long   ldata[5];
+        float  fdata[5];
+        double dbdata[5];
+    } u;   // 40-byte union (widest = dbdata = 5×8 bytes)
+} IODBPMC;
+```
+
+With `pack(4)` the union is 40 bytes; struct total = 8 + 40 = **48 bytes**.
+Our `FwlibNative.cs` matches this.
+
+Our mock's PMC handler takes a different layout (uint16 handle + uint8 letter
++ ...). Stream C fix: rewrite to IODBPMC shape.
+
+## Reference trace findings (2026-04-23 dev-box reversing)
+
+**Good news** — we don't need a bench CNC for first-pass reversing. Loading
+`Fwlib64.dll` in `otopcua-focas-cli` + pointing it at our Python simulator on
+`127.0.0.1:8193` + enabling `OTOPCUA_FOCAS_RAW_CAPTURE=1` on the sim lets us
+observe Fwlib's outbound bytes + iterate on reply shapes. Each cycle is ~5s;
+progress measure is "Fwlib sends more bytes before disconnecting".
+
+### Confirmed wire facts
+
+**Magic prefix** — every frame Fwlib sends begins with `0xA0 0xA0 0xA0 0xA0`
+(4 bytes). This is NOT a length prefix — our scaffold tried to decode it as
+uint32-big-endian = 2.7 GB and died. It's a fixed protocol marker.
+
+**Handshake request** — `cnc_allclibhndl3` produces this 8-byte frame:
+
+```
+a0 a0 a0 a0   00 01 01 01
+└─ magic ─┘   └── negotiation ──┘
+```
+
+The 4-byte negotiation field is stable across our observations (always
+`00 01 01 01`). Interpretation TBD — possibly `(version_major=0x0001,
+version_minor=0x0101)` or `(protocol=0x01, subtype=0x010101)`.
+
+**Handshake reply that Fwlib accepts** (empirically confirmed — doesn't
+disconnect):
+
+```
+a0 a0 a0 a0   00 01 01 01   00 XX   00 YY
+└─ magic ─┘   └── echo ──┘   handle  api_version
+```
+
+12 bytes: magic + echoed negotiation + 2-byte handle + 2-byte api_version code.
+
+### Post-handshake frame shape — decoded via drain mode
+
+The simulator's `OTOPCUA_FOCAS_DRAIN_AFTER_HANDSHAKE=1` mode reads all inbound
+bytes for 1000 ms after the handshake reply without attempting any decode.
+Captured payload from `cnc_allclibhndl3`:
+
+```
+00 02 00 02   a0 a0 a0 a0   00 01 21 01 00 00
+└── prefix ─┘   └── magic ─┘   └─── body ────┘
+  4 bytes         4 bytes         6 bytes     (total = 14 bytes)
+```
+
+**Key discovery**: post-handshake frames have a **4-byte prefix BEFORE the
+magic**, not magic-first. Frame shape:
+
+```
+uint16  msg_counter     // starts at 2; handshake was #1 implicitly
+uint16  handle_echo     // matches the handle our open reply returned
+4 bytes FOCAS_MAGIC     // 0xA0A0A0A0
+N bytes body            // function-specific
+```
+
+Session 1's drain captured only the prefix (`00 02 00 01`) before timing
+out — TCP multiplexed the two test sessions's bytes differently. Session 2
+caught the full 14-byte frame.
+
+### Body bytes — first post-handshake request
+
+Body on `cnc_allclibhndl3` first post-handshake frame:
+
+```
+00 01 21 01 00 00
+```
+
+Informed guesses (unvalidated):
+
+- `00 01` = body length (1 useful byte?) or sub-request count
+- `21 01` = function code / operation tag — `0x21` is seen in public FOCAS
+  reverse-engineering notes associated with "system info" / "controller
+  identification" queries
+- `00 00` = padding / reserved
+
+Likely this is Fwlib's "tell me what CNC you are" query — part of
+`cnc_allclibhndl3`'s internal handshake continuation before the handle is
+fully established. Returning an empty or malformed response causes Fwlib
+to declare the far end "not a CNC" and error with `EW_FUNC` (16).
+
+### Iteration 3 — echo response, error-code advances
+
+Sending back `<prefix><magic><echoed body>` (14 bytes matching request shape)
+advances Fwlib's client-side error code from **`EW_-16` (socket-level)** to
+**`EW_-17` (protocol-level rejection)**. Fwlib reads our response in full
+before disconnecting with `peer closed mid-frame`.
+
+Meaning: our **frame structure is correct enough** that Fwlib parses it as a
+valid FOCAS frame; the **body content** (the 6 bytes after magic) is where
+the semantic mismatch now lives. Fwlib expects specific bytes back for the
+`0x2101` system-info query and an echo doesn't match.
+
+### Current iteration block
+
+Going deeper without reference requires either:
+
+- **A bench CNC** (#54) to capture a real response to the `0x2101` query.
+  Stream C.2 Wireshark trace gives us the exact byte pattern Fwlib expects.
+- **Published FOCAS response specs** for sub-function `0x2101` — not present
+  in `strangesast/fwlib` headers; likely only in the licensed Developer Kit
+  binary docs.
+- **Blind enumeration** — try N variations of the 6-byte body response until
+  Fwlib's error code changes again. High cost, low signal.
+
+The first two are both blocked on resources we don't have. The third is
+~hundreds of cycles with no guarantee of convergence.
+
+### Diminishing-returns checkpoint
+
+**What we've proven without hardware**:
+1. Magic prefix `0xA0A0A0A0` confirmed
+2. Handshake request format decoded (`magic + 4-byte negotiation`)
+3. Handshake response format that Fwlib accepts (`magic + echo + handle + api`)
+4. Post-handshake frame format decoded (`prefix + magic + body`)
+5. First post-handshake function code observed (`0x2101` — likely system-info)
+6. Error code progression `EW_SOCKET` → `EW_PROTOCOL` confirms our framing is
+   structurally correct
+
+**What we can't prove without bench CNC or reference docs**:
+1. The exact 6-byte response body Fwlib expects for `0x2101`
+2. The full list of post-handshake function codes + their body shapes
+3. Whether subsequent frames use length prefixes or fixed body sizes
+
+**Recommendation**: checkpoint here. The framing discoveries above are
+preserved in `server/frames.py` + `server/state.py` + `server/focas_server.py`
++ `server/handlers/__init__.py`. When bench-CNC access unblocks Stream C.2's
+reference trace, the iteration loop (with the framing work already done)
+should converge in hours rather than days.
+
+### Still unknown
+
+- **Response shape** for the post-handshake body request — we can frame the
+  prefix + magic correctly now, but what the 6-byte body response should
+  carry (CNC series ID? version? capability flags?) needs further iteration.
+- **Function-id numeric values** for the 9 FWLIB calls our driver makes —
+  one per call, need to be observed separately.
+- **Error encoding** on the wire.
+
+### Next iteration cycles
+
+With the handshake working, each subsequent function gets its own probe-and-observe
+loop. The simulator now has a `RAW_FRAME_MARKER = 0xFFFF` sentinel that lets a
+handler return exact wire bytes (bypassing the scaffold envelope) — use that to
+try different post-handshake replies and watch Fwlib's reaction.
+
+## Stream C work order
+
+Given what's authoritative vs. guessed, here's the most efficient path:
+
+### Phase 1 — payload shapes (no hardware required)
+
+- [ ] Rewrite `server/handlers/macro.py` response to return 10-byte ODBM:
+      `short datano, short dummy, int32 mcr_val, short dec_val`
+- [ ] Rewrite `server/handlers/param.py` response to return 36-byte IODBPSD:
+      `short datano, short type, bytes[32] u`
+- [ ] Rewrite `server/handlers/pmc.py` response to return 48-byte IODBPMC:
+      `short type_a, short type_d, uint16 datano_s, uint16 datano_e, bytes[40] u`
+- [ ] Add unit tests asserting byte-exact sizes
+- [ ] Update validate_harness.py to match the new shapes
+
+Effect: when Stream C gets its first Wireshark trace, the payload-layer of the
+mock is already correct. Only the framing layer needs iteration.
+
+### Phase 2 — framing (requires hardware)
+
+This is the iterative Wireshark loop — no point starting until the Windows rig
++ licensed Fwlib64.dll + real CNC are all available. See the implementer's
+checklist in
+[`tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Docker/README.md`](../../../tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS.IntegrationTests/Docker/README.md).
+
+### Phase 3 — flip the C# test gate
+
+Once Phase 2 proves Fwlib64 can talk to the mock:
+
+- [ ] Flip `OTOPCUA_FOCAS_SIM_WIRE_COMPAT=1` in the CI env
+- [ ] Expand `tests/.../IntegrationTests/Series/WireCompatGatedTests.cs` with
+      real per-series assertions
+- [ ] Update `scripts/e2e/test-focas.ps1` to accept `-ProfileName`
+- [ ] Close Stream D
+
+## References
+
+- [`src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FwlibNative.cs`](../../../src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FwlibNative.cs) — P/Invoke surface, authoritative struct layouts
+- [`src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FwlibFocasClient.cs`](../../../src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FwlibFocasClient.cs) — reference C# implementation of each FWLIB call
+- [`src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasStatusMapper.cs`](../../../src/Drivers/ZB.MOM.WW.OtOpcUa.Driver.FOCAS/FocasStatusMapper.cs) — EW_* → OPC UA status mapping
+- Fanuc FOCAS Developer Kit (licensed, not in repo) — ultimate source of truth
+- `strangesast/fwlib` on GitHub — redistributes `fwlib32.h` + runtime binaries; no wire protocol docs

docs/v2/implementation/phase-0-rename-and-net10.md

@@ -74,9 +74,9 @@ Save the result to `docs/v2/implementation/phase-0-rename-inventory.md` (gitigno
 Per project (11 projects total — 5 src + 6 tests):
 
 ```bash
-git mv src/ZB.MOM.WW.LmxOpcUa.Client.CLI src/ZB.MOM.WW.OtOpcUa.Client.CLI
-git mv src/ZB.MOM.WW.OtOpcUa.Client.CLI/ZB.MOM.WW.LmxOpcUa.Client.CLI.csproj \
-       src/ZB.MOM.WW.OtOpcUa.Client.CLI/ZB.MOM.WW.OtOpcUa.Client.CLI.csproj
+git mv src/ZB.MOM.WW.LmxOpcUa.Client.CLI src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI
+git mv src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI/ZB.MOM.WW.LmxOpcUa.Client.CLI.csproj \
+       src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI/ZB.MOM.WW.OtOpcUa.Client.CLI.csproj
 ```
 
 Repeat for: `Client.Shared`, `Client.UI`, `Historian.Aveva`, `Host`, and all 6 test projects.
@@ -156,8 +156,8 @@ dotnet test ZB.MOM.WW.OtOpcUa.slnx
 Plus manual smoke test of Client.CLI against a running v1 OPC UA server:
 
 ```bash
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Client.CLI -- connect -u opc.tcp://localhost:4840
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Client.CLI -- browse -u opc.tcp://localhost:4840 -r -d 2
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- connect -u opc.tcp://localhost:4840
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- browse -u opc.tcp://localhost:4840 -r -d 2
 ```
 
 **Acceptance**:

docs/v2/implementation/phase-1-configuration-and-admin-scaffold.md

@@ -63,7 +63,7 @@ Phase 1 is large — broken into 5 work streams (A–E) that can partly overlap.
 
 #### Task A.1 — Define driver capability interfaces
 
-Create `src/ZB.MOM.WW.OtOpcUa.Core.Abstractions/` (.NET 10, no dependencies). Define:
+Create `src/Core/ZB.MOM.WW.OtOpcUa.Core.Abstractions/` (.NET 10, no dependencies). Define:
 
 ```csharp
 public interface IDriver { /* lifecycle, metadata, health */ }
@@ -131,7 +131,7 @@ In v2.0 v1 only registers the `Galaxy` type (`AllowedNamespaceKinds = SystemPlat
 
 #### Task B.1 — EF Core schema + initial migration
 
-Create `src/ZB.MOM.WW.OtOpcUa.Configuration/` (.NET 10, EF Core 10).
+Create `src/Core/ZB.MOM.WW.OtOpcUa.Configuration/` (.NET 10, EF Core 10).
 
 Implement DbContext with entities matching `config-db-schema.md` exactly:
 - `ServerCluster`, `ClusterNode`, `ClusterNodeCredential`
@@ -146,7 +146,7 @@ Implement DbContext with entities matching `config-db-schema.md` exactly:
 Generate the initial migration:
 
 ```bash
-dotnet ef migrations add InitialSchema --project src/ZB.MOM.WW.OtOpcUa.Configuration
+dotnet ef migrations add InitialSchema --project src/Core/ZB.MOM.WW.OtOpcUa.Configuration
 ```
 
 **Acceptance**:
@@ -338,7 +338,7 @@ If the central DB is unreachable at startup, load the most recent cached generat
 #### Task E.1 — Project scaffold mirroring ScadaLink CentralUI (decision #102)
 
 Copy the project layout from `scadalink-design/src/ScadaLink.CentralUI/` (decision #104):
-- `src/ZB.MOM.WW.OtOpcUa.Admin/`: Razor Components project, .NET 10, `AddInteractiveServerComponents`
+- `src/Server/ZB.MOM.WW.OtOpcUa.Admin/`: Razor Components project, .NET 10, `AddInteractiveServerComponents`
 - `Auth/AuthEndpoints.cs`, `Auth/CookieAuthenticationStateProvider.cs`
 - `Components/Layout/MainLayout.razor`, `Components/Layout/NavMenu.razor`
 - `Components/Pages/Login.razor`, `Components/Pages/Dashboard.razor`
@@ -496,10 +496,10 @@ A `phase-1-compliance.ps1` script that exits non-zero on any failure:
 
 ```powershell
 # Run all migrations against a clean SQL Server instance
-dotnet ef database update --project src/ZB.MOM.WW.OtOpcUa.Configuration --connection "Server=...;Database=OtOpcUaConfig_Test_$(date +%s);..."
+dotnet ef database update --project src/Core/ZB.MOM.WW.OtOpcUa.Configuration --connection "Server=...;Database=OtOpcUaConfig_Test_$(date +%s);..."
 
 # Run schema-introspection tests
-dotnet test tests/ZB.MOM.WW.OtOpcUa.Configuration.Tests --filter "Category=SchemaCompliance"
+dotnet test tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests --filter "Category=SchemaCompliance"
 ```
 
 Expected: every table, column, index, FK, CHECK, and stored procedure in `config-db-schema.md` is present and matches.

docs/v2/implementation/phase-2-galaxy-out-of-process.md

@@ -1,3 +1,14 @@
+> **✅ Completed 2026-04-30 — historical record of Phase 2 (Galaxy out-of-process split).**
+>
+> Phase 2 produced the `Galaxy.Host` / `Galaxy.Proxy` / `Galaxy.Shared`
+> three-project split as a stepping stone toward the eventual mxaccessgw
+> architecture. Those projects shipped, served their purpose for
+> roughly a year, then retired in PR 7.2 alongside the
+> `OtOpcUaGalaxyHost` Windows service. This file is preserved as the
+> phase-exit evidence; do not treat it as live architecture
+> documentation. See `docs/drivers/Galaxy.md` for the current
+> in-process driver.
+
 # Phase 2 — Galaxy Out-of-Process Refactor (Tier C)
 
 > **Status**: DRAFT — implementation plan for Phase 2 of the v2 build (`plan.md` §6, `driver-stability.md` §"Galaxy — Deep Dive").
@@ -172,7 +183,7 @@ Lift the existing `GalaxyRuntimeProbeManager` into the new project. Behaviors pe
 #### Task B.6 — Named-pipe IPC server with mandatory ACL
 
 Per decision #76 + `driver-stability.md` §"IPC Security":
-- Pipe ACL on creation: `ReadWrite | Synchronize` granted only to the OtOpcUa server's service principal SID; LocalSystem and Administrators **explicitly denied**
+- Pipe ACL on creation: `ReadWrite | Synchronize` granted only to the OtOpcUa server's service principal SID; LocalSystem **explicitly denied**. Administrators was dropped from the deny list so non-elevated admins on dev boxes aren't blocked via UAC-filtered-token deny-only semantics — the per-connection SID check (§2 of driver-stability.md) remains the real authorization boundary.
 - Caller identity verification on each new connection: `GetImpersonationUserName()` cross-checked against configured server service SID; mismatches dropped before any RPC frame is read
 - Per-process shared secret: passed by the supervisor at spawn time, required on first frame of every connection
 - Heartbeat pipe: separate from data-plane pipe, same ACL

docs/v2/implementation/phase-6-1-resilience-and-observability.md

@@ -1,6 +1,8 @@
 # Phase 6.1 — Resilience & Observability Runtime
 
-> **Status**: **SHIPPED** 2026-04-19 — Streams A/B/C/D + E data layer merged to `v2` across PRs #78-82. Final exit-gate PR #83 turns the compliance script into real checks (all pass) and records this status update. One deferred piece: Stream E.2/E.3 SignalR hub + Blazor `/hosts` column refresh lands in a visual-compliance follow-up PR on the Phase 6.4 Admin UI branch.
+> **Status**: **SHIPPED** 2026-04-19 — Streams A/B/C/D + E data layer merged to `v2` across PRs #78-82. Final exit-gate PR #83 turns the compliance script into real checks (all pass) and records this status update.
+>
+> **Stream E.2/E.3 closed 2026-04-23** — `FleetStatusPoller` now polls `DriverInstanceResilienceStatus`, detects per-`(DriverInstanceId, HostName)` deltas, and pushes `ResilienceStatusChangedMessage` via `FleetStatusHub` on the fleet group. Admin `/hosts` page subscribes on load and upserts the matching `HostStatusRow` in-memory on receipt, so operator-visible resilience state now reflects the runtime within one poller tick (~5 s) instead of the Admin page's own 10-second refresh. `FleetStatusPollerTests.Poller_pushes_ResilienceStatusChanged_on_delta` covers the first-observation push, the no-delta-no-push invariant, and the mutated-row re-push.
 >
 > Baseline: 906 solution tests → post-Phase-6.1: 1042 passing (+136 net). One pre-existing Client.CLI Subscribe flake unchanged.
 >
@@ -129,7 +131,7 @@ Closes these gaps flagged in the 2026-04-19 audit:
 - [ ] Stream B: Tier registry + generalised watchdog + scheduled recycle + wedge detector
 - [ ] Stream C: `/healthz` + `/readyz` + structured logging + JSON Serilog sink
 - [ ] Stream D: LiteDB cache + Polly fallback in Configuration
-- [ ] Stream E: Admin `/hosts` page refresh
+- [x] Stream E: Admin `/hosts` page refresh (E.1 in PRs #78-82 with the data layer; E.2/E.3 closed 2026-04-23)
 - [ ] Cross-cutting: `phase-6-1-compliance.ps1` exits 0; full solution `dotnet test` passes; exit-gate doc recorded
 
 ## Adversarial Review — 2026-04-19 (Codex, thread `019da489-e317-7aa1-ab1f-6335e0be2447`)

docs/v2/implementation/phase-6-2-authorization-runtime.md

@@ -1,10 +1,9 @@
 # Phase 6.2 — Authorization Runtime (ACL + LDAP grants)
 
-> **Status**: **SHIPPED (core)** 2026-04-19 — Streams A, B, C (foundation), D (data layer) merged to `v2` across PRs #84-87. Final exit-gate PR #88 turns the compliance stub into real checks (all pass, 2 deferred surfaces tracked).
+> **Status**: **FULLY SHIPPED** (updated 2026-04-23 audit). Streams A-D core merged to `v2` across PRs #84-87 + exit-gate PR #88 on 2026-04-19; both named deferrals landed separately and were confirmed against the repo this session:
 >
-> Deferred follow-ups (tracked separately):
-> - Stream C dispatch wiring on the 11 OPC UA operation surfaces (task #143).
-> - Stream D Admin UI — RoleGrantsTab, AclsTab Probe-this-permission, SignalR invalidation, draft-diff ACL section + visual-compliance reviewer signoff (task #144).
+> - **Task #143 Stream C dispatch wiring** — `DriverNodeManager` calls `AuthorizationGate.IsAllowed(context.UserIdentity, OpcUaOperation.<Op>, scope)` on Read (line 249), Write (line 536) with per-classification `OpcUaOperation.WriteOperate` / `WriteTune` / `WriteConfigure` routed via `WriteAuthzPolicy`, and HistoryRead (4 call sites). `TriePermissionEvaluator` + `PermissionTrieCache` back the gate.
+> - **Task #144 Stream D Admin UI** — `RoleGrants.razor` (LDAP group → Admin role mapping) + `AclsTab.razor` (per-cluster node-ACL editor with a probe-this-permission surface via `PermissionProbeService`) + `AclChangeNotifier` SignalR hub for cache invalidation all present and wired.
 >
 > Baseline pre-Phase-6.2: 1042 solution tests → post-Phase-6.2 core: 1097 passing (+55 net). One pre-existing Client.CLI Subscribe flake unchanged.
 >

docs/v2/implementation/phase-6-3-redundancy-runtime.md

@@ -1,13 +1,20 @@
 # Phase 6.3 — Redundancy Runtime
 
-> **Status**: **SHIPPED (core)** 2026-04-19 — Streams B (ServiceLevelCalculator + RecoveryStateManager) and D core (ApplyLeaseRegistry) merged to `v2` in PR #89. Exit gate in PR #90.
+> **Status**: **SHIPPED (core + Stream C)** — original body merged 2026-04-19; audit 2026-04-23 promoted **Stream C (task #147)** into shipped state.
 >
-> Deferred follow-ups (tracked separately):
-> - Stream A — RedundancyCoordinator cluster-topology loader (task #145).
-> - Stream C — OPC UA node wiring: ServiceLevel + ServerUriArray + RedundancySupport (task #147).
-> - Stream E — Admin UI RedundancyTab + OpenTelemetry metrics + SignalR (task #149).
-> - Stream F — client interop matrix + Galaxy MXAccess failover test (task #150).
-> - sp_PublishGeneration pre-publish validator rejecting unsupported RedundancyMode values (task #148 part 2 — SQL-side).
+> **In** (verified in repo):
+> - Stream A — `ClusterTopologyLoader`, `RedundancyCoordinator`, `RedundancyTopology`, `PeerReachability` all present under `src/Server/ZB.MOM.WW.OtOpcUa.Server/Redundancy/`. Coordinator is now also hosted by `Program.cs` via the new `RedundancyPublisherHostedService`, which calls `RefreshAsync` on startup.
+> - Stream B — `ServiceLevelCalculator` + `RecoveryStateManager`.
+> - **Stream C (task #147) — OPC UA node wiring**. `ServerRedundancyNodeWriter` maintains `Server.ServiceLevel` (i=2267), `Server.ServerRedundancy.RedundancySupport` (i=2994), and `Server.ServerRedundancy.ServerUriArray` (non-transparent subtype) by writing the `PropertyState.Value` + calling `ClearChangeMasks`. `RedundancyPublisherHostedService` drives the publisher on a 1 s tick and fans `OnStateChanged` / `OnServerUriArrayChanged` into the writer. Mapping of `Configuration.RedundancyMode` → Part 4 `RedundancySupport` is Warm/Hot/None (v2 clusters don't enumerate Cold / HotAndMirrored per decision #85). Idempotent per-value dedupe prevents spurious OPC UA notifications. Unit coverage: `ServerRedundancyNodeWriterTests` (4 tests, green).
+> - Stream D — `ApplyLeaseRegistry`.
+> - Stream E — `RedundancyTab.razor` with SignalR `RoleChanged` wiring (via `FleetStatusPoller` + `FleetStatusHub`) — stale-flag + role-swap banner.
+>
+> **Closed this session (2026-04-23)**:
+> - **Task #148 part 2** — `DraftValidator.ValidateClusterTopology(cluster, nodes)` now catches three pre-publish invariants the SQL CHECK can't see: (a) unsupported `NodeCount`/`RedundancyMode` pairs; (b) `Enabled`-node count vs. declared `NodeCount` mismatch (catches disabled-node drift with mode still Hot/Warm); (c) multiple-Primary per decision #84. Returns every failure in one pass — same shape as `Validate`. 8 new tests in `DraftValidatorTests` green.
+> - **Task #150 Stream F** — `docs/v2/redundancy-interop-playbook.md` captures the manual validation matrix against UaExpert + Kepware + AVEVA MXAccess failover. Automating these closed-source GUI clients in PR-CI is out of scope; the automatable half is already covered by `ServiceLevelCalculatorTests` / `RedundancyStatePublisherTests` / `ClusterTopologyLoaderTests` / `ServerRedundancyNodeWriterTests`.
+>
+> **Remaining (documented limitation, not blocking v2.0)**:
+> - Non-transparent redundancy-state node upgrade — the SDK's default `Server.ServerRedundancy` object is the base `ServerRedundancyState`, so `ApplyServerUriArray` currently logs-and-skips. Operators on the rare deployment that needs `ServerUriArray` read-back get a clear warning with the upgrade path. Documented in the interop playbook's "Known limitations" section.
 >
 > Baseline pre-Phase-6.3: 1097 solution tests → post-Phase-6.3 core: 1137 passing (+40 net).
 >

docs/v2/implementation/phase-6-4-admin-ui-completion.md

@@ -1,12 +1,17 @@
 # Phase 6.4 — Admin UI Completion
 
-> **Status**: **SHIPPED (data layer)** 2026-04-19 — Stream A.2 (UnsImpactAnalyzer + DraftRevisionToken) and Stream B.1 (EquipmentCsvImporter parser) merged to `v2` in PR #91. Exit gate in PR #92.
+> **Status**: **SHIPPED (mostly)** 2026-04-19; audit 2026-04-23 confirms what landed separately after the data-layer PR #91:
 >
-> Deferred follow-ups (Blazor UI + staging tables + address-space wiring):
-> - Stream A UI — UnsTab MudBlazor drag/drop + 409 concurrent-edit modal + Playwright smoke (task #153).
-> - Stream B follow-up — EquipmentImportBatch staging + FinaliseImportBatch transaction + CSV import UI (task #155).
-> - Stream C — DiffViewer refactor into base + 6 section plugins + 1000-row cap + SignalR paging (task #156).
-> - Stream D — IdentificationFields.razor + DriverNodeManager OPC 40010 sub-folder exposure (task #157).
+> **In** (verified in repo):
+> - **Task #153 Stream A UI** — `UnsTab.razor` with drag/drop handlers + concurrent-edit via `DraftRevisionToken` + `UnsImpactAnalyzer`; Playwright smoke test in `tests/Server/ZB.MOM.WW.OtOpcUa.Admin.E2ETests/UnsTabDragDropE2ETests.cs`.
+> - **Task #155 Stream B** — `EquipmentImportBatch` entity + migration, `EquipmentImportBatchService.CreateBatchAsync` / `FinaliseBatchAsync` / `DropBatchAsync` / `ListByUserAsync`, `ImportEquipment.razor` UI.
+> - **Task #156 Stream C** — `DiffViewer.razor` + `DiffSection.razor` refactor in place.
+> - Admin UI `IdentificationFields.razor` surface shipped (part of #157).
+>
+> **Closed this session (2026-04-23)**:
+> - **Task #157 Stream D server-side half** was a stale audit claim. `src/Core/ZB.MOM.WW.OtOpcUa.Core/OpcUa/IdentificationFolderBuilder.cs` ships the OPC 40010 Identification sub-folder materializer (Manufacturer / Model / SerialNumber / HardwareRevision / SoftwareRevision / YearOfConstruction / AssetLocation / ManufacturerUri / DeviceManualUri); `EquipmentNodeWalker.Walk` calls it per equipment; `IdentificationFolderBuilderTests` (158 lines) + two walker-level tests (`Walk_Materializes_Identification_Subfolder_When_AnyFieldPresent`, `Walk_Omits_Identification_Subfolder_When_AllFieldsNull`) cover the null-handling branches. The initial audit grepped only `src/Server/ZB.MOM.WW.OtOpcUa.Server/OpcUa/`; the builder lives in `Core/OpcUa/`.
+>
+> **Phase 6.4 is now FULLY SHIPPED — no deferred surfaces remain.**
 >
 > Baseline pre-Phase-6.4: 1137 solution tests → post-Phase-6.4 data layer: 1159 passing (+22).
 >

docs/v2/implementation/phase-7-e2e-smoke.md

@@ -12,16 +12,16 @@ End-to-end validation that the Phase 7 production wiring chain (#243 / #244 / #2
 | `OtOpcUaGalaxyHost` Windows service running | `sc query OtOpcUaGalaxyHost` → `STATE: 4 RUNNING` |
 | Galaxy.Host shared secret matches `.local/galaxy-host-secret.txt` | Set during NSSM install — see `docs/ServiceHosting.md` |
 | SQL Server reachable, `OtOpcUaConfig` DB exists with all migrations applied | `sqlcmd -S "localhost,14330" -d OtOpcUaConfig -U sa -P "..." -Q "SELECT COUNT(*) FROM dbo.__EFMigrationsHistory"` returns ≥ 11 |
-| Server's `appsettings.json` `Node:ConfigDbConnectionString` matches your SQL Server | `cat src/ZB.MOM.WW.OtOpcUa.Server/appsettings.json` |
+| Server's `appsettings.json` `Node:ConfigDbConnectionString` matches your SQL Server | `cat src/Server/ZB.MOM.WW.OtOpcUa.Server/appsettings.json` |
 
-> **Galaxy.Host pipe ACL.** Per `docs/ServiceHosting.md`, the pipe ACL deliberately denies `BUILTIN\Administrators`. **Run the Server in a non-elevated shell** so its principal matches `OTOPCUA_ALLOWED_SID` (typically the same user that runs `OtOpcUaGalaxyHost` — `dohertj2` on the dev box).
+> **Galaxy.Host pipe ACL.** The pipe allows the configured `OTOPCUA_ALLOWED_SID` (typically the user that runs `OtOpcUaGalaxyHost` — `dohertj2` on the dev box). Run the Server under the same user; elevation doesn't matter — `PipeAcl.cs` no longer denies `BUILTIN\Administrators` since UAC's deny-only Admins SID would have blocked non-elevated dev-box admins too.
 
 ## Setup
 
 ### 1. Migrate the Config DB
 
 ```powershell
-cd src/ZB.MOM.WW.OtOpcUa.Configuration
+cd src/Core/ZB.MOM.WW.OtOpcUa.Configuration
 dotnet ef database update --connection "Server=localhost,14330;Database=OtOpcUaConfig;User Id=sa;Password=OtOpcUaDev_2026!;TrustServerCertificate=True;Encrypt=False;"
 ```
 
@@ -36,11 +36,49 @@ sqlcmd -S "localhost,14330" -d OtOpcUaConfig -U sa -P "OtOpcUaDev_2026!" `
 
 Expected output ends with `Phase 7 smoke seed complete.` plus a Cluster / Node / Generation summary. Idempotent — re-running wipes the prior smoke state and starts clean.
 
-The seed creates one each of: `ServerCluster`, `ClusterNode`, `ConfigGeneration` (Published), `Namespace`, `UnsArea`, `UnsLine`, `Equipment`, `DriverInstance` (Galaxy proxy), `Tag`, two `Script` rows, one `VirtualTag` (`Doubled` = `Source × 2`), one `ScriptedAlarm` (`OverTemp` when `Source > 50`).
+The seed creates one each of: `ServerCluster`, `ClusterNode`, `ClusterNodeCredential` (binds the SQL login to the node — without this `sp_GetCurrentGenerationForCluster` returns `Unauthorized: caller X is not bound to NodeId p7-smoke-node`), `ConfigGeneration` (Published), `Namespace`, `UnsArea`, `UnsLine`, `Equipment`, `DriverInstance` (Galaxy proxy), `Tag`, two `Script` rows, one `VirtualTag` (`MachineStatus` = `Source > 0`, Boolean, historized), one `ScriptedAlarm` (`OverTemp` when `Source > 50`).
 
-### 3. Replace the Galaxy attribute placeholder
+### 3. (Optional) Swap the Galaxy attribute
 
-`scripts/smoke/seed-phase-7-smoke.sql` inserts a `dbo.Tag.TagConfig` JSON with `FullName = "REPLACE_WITH_REAL_GALAXY_ATTRIBUTE"`. Edit the SQL + re-run, or `UPDATE dbo.Tag SET TagConfig = N'{"FullName":"YourReal.GalaxyAttr","DataType":"Float64"}' WHERE TagId='p7-smoke-tag-source'`. Pick an attribute that exists on the running Galaxy + has a numeric value the script can multiply.
+The shipped seed points `dbo.Tag.TagConfig` at `TestMachine_001.TestHistoryValue` — the dev-box Galaxy ships it as Int32, writable (`security_classification = Operate`), and historized (`HistoryExtension` primitive), so every E2E stage has a real live target. To swap to another attribute on a different Galaxy, pick a candidate via the same shape:
+
+```sql
+-- Run against the Galaxy Repository DB (ZB).
+;WITH dpc AS (
+    SELECT g.gobject_id, p.package_id, p.derived_from_package_id, 0 AS depth
+    FROM gobject g INNER JOIN package p ON p.package_id = g.deployed_package_id
+    WHERE g.is_template = 0 AND g.deployed_package_id <> 0
+    UNION ALL
+    SELECT c.gobject_id, p.package_id, p.derived_from_package_id, c.depth + 1
+    FROM dpc c INNER JOIN package p ON p.package_id = c.derived_from_package_id
+    WHERE c.derived_from_package_id <> 0 AND c.depth < 10
+)
+SELECT DISTINCT g.tag_name + '.' + da.attribute_name AS full_ref,
+       dt.description AS dtype, da.security_classification
+FROM dpc
+INNER JOIN dynamic_attribute da ON da.package_id = dpc.package_id
+INNER JOIN gobject g ON g.gobject_id = dpc.gobject_id
+LEFT JOIN data_type dt ON dt.mx_data_type = da.mx_data_type
+WHERE da.attribute_name NOT LIKE '[_]%'
+  AND da.attribute_name NOT LIKE '%.Description'
+  AND da.mx_data_type IN (1, 2, 3, 4)
+  AND da.security_classification > 0  -- writable
+  AND EXISTS (
+      SELECT 1 FROM primitive_instance pi
+      INNER JOIN primitive_definition pd
+          ON pd.primitive_definition_id = pi.primitive_definition_id
+          AND pd.primitive_name = 'HistoryExtension'
+      WHERE pi.package_id = dpc.package_id AND pi.primitive_name = da.attribute_name)
+ORDER BY full_ref;
+```
+
+Then update the seed:
+
+```sql
+UPDATE dbo.Tag
+   SET TagConfig = N'{"FullName":"YourReal.GalaxyAttr","DataType":"Int32"}'
+ WHERE TagId = 'p7-smoke-tag-source';
+```
 
 ### 4. Point Server.appsettings at the smoke node
 
@@ -54,12 +92,41 @@ The seed creates one each of: `ServerCluster`, `ClusterNode`, `ConfigGeneration`
 }
 ```
 
+### 4a. (Optional) Enable LDAP + SecurityProfile for the write stage
+
+Anonymous OPC UA sessions are denied writes against `Operate`-classified tags by the PR 26 server-layer classification gate. To exercise the reverse-bridge + alarm-fires stages fully, the Server has to advertise a `UserName` UserTokenPolicy (any profile other than `None`) and authenticate against LDAP.
+
+```json
+{
+  "OpcUa": {
+    "SecurityProfile": "Basic256Sha256-Sign",
+    "Ldap": {
+      "Enabled": true,
+      "Server":  "localhost",
+      "Port":    3893,
+      "SearchBase": "dc=lmxopcua,dc=local",
+      "ServiceAccountDn": "cn=serviceaccount,dc=lmxopcua,dc=local",
+      "ServiceAccountPassword": "serviceaccount123",
+      "GroupToRole": {
+        "ReadOnly":       "ReadOnly",
+        "WriteOperate":   "WriteOperate",
+        "WriteTune":      "WriteTune",
+        "WriteConfigure": "WriteConfigure",
+        "AlarmAck":       "AlarmAck"
+      }
+    }
+  }
+}
+```
+
+Dev-box GLAuth ships `writeop` / `writeop123` in the `WriteOperate` group, `admin` / `admin123` across all write groups. See `C:\publish\glauth\auth.md`.
+
 ## Run
 
-### 5. Start the Server (non-elevated shell)
+### 5. Start the Server
 
 ```powershell
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Server
+dotnet run --project src/Server/ZB.MOM.WW.OtOpcUa.Server
 ```
 
 Expected log markers (in order):
@@ -79,30 +146,42 @@ Any line missing = follow up the failure surface (each step has its own log sign
 ### 6. Validate via Client.CLI
 
 ```powershell
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Client.CLI -- browse -u opc.tcp://localhost:4840/OtOpcUa -r -d 5
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- browse -u opc.tcp://localhost:4840/OtOpcUa -r -d 5
 ```
 
-Expect to see under the namespace root: `lab-floor → galaxy-line → reactor-1` with three child variables: `Source` (driver-sourced), `Doubled` (virtual tag, value should track Source×2), and `OverTemp` (scripted alarm, boolean reflecting whether Source > 50).
+Expect to see under the namespace root: `lab-floor → galaxy-line → reactor-1` with three child variables: `Source` (driver-sourced Int32), `MachineStatus` (virtual tag Boolean, `Source > 0`), and `OverTemp` (scripted alarm Boolean, `Source > 50`). NodeIds are path-based per OPC UA Part 3 §5.2.2 — the walker mints them from `{driverId}/{folder-path}/{browseName}` and stores the driver-side FullReference in an internal NodeId→FullRef map, so client subscriptions survive backend address renames.
 
 #### Read the virtual tag
 
 ```powershell
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Client.CLI -- read -u opc.tcp://localhost:4840/OtOpcUa -n "ns=2;s=p7-smoke-vt-derived"
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- read `
+    -u opc.tcp://localhost:4840/OtOpcUa `
+    -n "ns=2;s=p7-smoke-galaxy/lab-floor/galaxy-line/reactor-1/MachineStatus"
 ```
 
-Expected: a `Float64` value approximately equal to `2 × Source`. Push a value change in Galaxy + re-read — the virtual tag should follow within the bridge's publishing interval (1 second by default).
+Expected: `Boolean`. Push a value change into the Source Galaxy attribute and re-read — `MachineStatus` should follow within the bridge's publishing interval (1 second by default).
 
 #### Read the scripted alarm
 
 ```powershell
-dotnet run --project src/ZB.MOM.WW.OtOpcUa.Client.CLI -- read -u opc.tcp://localhost:4840/OtOpcUa -n "ns=2;s=p7-smoke-al-overtemp"
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- read `
+    -u opc.tcp://localhost:4840/OtOpcUa `
+    -n "ns=2;s=p7-smoke-galaxy/lab-floor/galaxy-line/reactor-1/OverTemp"
 ```
 
 Expected: `Boolean` — `false` when Source ≤ 50, `true` when Source > 50.
 
 #### Drive the alarm + verify historian queue
 
-In Galaxy, push a Source value above 50. Within ~1 second, `OverTemp.Read` flips to `true`. The alarm engine emits a transition to `Phase7EngineComposer.RouteToHistorianAsync` → `SqliteStoreAndForwardSink.EnqueueAsync` → drain worker (every 2s) → `GalaxyHistorianWriter.WriteBatchAsync` → Galaxy.Host pipe → Aveva Historian alarm schema.
+Push a Source value above 50 — either from Galaxy itself, or via the Server's OPC UA write path using LDAP credentials (step 4a). Within ~1 second, `OverTemp.Read` flips to `true`. The alarm engine emits a transition to `Phase7EngineComposer.RouteToHistorianAsync` → `SqliteStoreAndForwardSink.EnqueueAsync` → drain worker (every 2s) → `GalaxyHistorianWriter.WriteBatchAsync` → Galaxy.Host pipe → Aveva Historian alarm schema.
+
+```powershell
+# OPC UA write path — requires LDAP from step 4a + a writeop-class user.
+dotnet run --project src/Client/ZB.MOM.WW.OtOpcUa.Client.CLI -- write `
+    -u opc.tcp://localhost:4840/OtOpcUa -S sign `
+    -n "ns=2;s=p7-smoke-galaxy/lab-floor/galaxy-line/reactor-1/Source" `
+    -v 75 -U writeop -P writeop123
+```
 
 Verify the queue absorbed the event:
 
@@ -120,14 +199,32 @@ Open the Historian Client (or InTouch alarm summary) — the `OverTemp` activati
 
 - [ ] EF migrations applied through `20260420232000_ExtendComputeGenerationDiffWithPhase7`
 - [ ] Smoke seed completes without errors + creates exactly 1 Published generation
-- [ ] Server starts in non-elevated shell + logs the Phase 7 composition lines
-- [ ] Client.CLI browse shows the UNS tree with Source / Doubled / OverTemp under reactor-1
-- [ ] Read on `Doubled` returns `2 × Source` value
+- [ ] Server starts + logs the Phase 7 composition lines
+- [ ] Client.CLI browse shows the UNS tree with Source / MachineStatus / OverTemp under reactor-1
+- [ ] Read on `Source` returns a Good-quality Int32 value (proves MXAccess round-trip)
+- [ ] Read on `MachineStatus` returns the live boolean truth of `Source > 0`
 - [ ] Read on `OverTemp` returns the live boolean truth of `Source > 50`
-- [ ] Pushing Source past 50 in Galaxy flips `OverTemp` to `true` within 1 s
+- [ ] `test-galaxy.ps1 -Username writeop -Password writeop123` drives Source past 50 and flips `OverTemp` to `true` within 1 s
 - [ ] SQLite queue drains (`COUNT(*)` returns to 0 within 2 s of an alarm transition)
 - [ ] Historian shows the `OverTemp` activation event with the rendered message
 
+## Second-run evidence (2026-04-24 dev box)
+
+Full live stack ran end-to-end once the IPC unblocks (commit `d11dd05`), path-based NodeIds (commit `8be82e0`), cold-start engine guards (commit `69e1d32`), and seed retarget to `TestMachine_001.TestHistoryValue` (commit `ec1a590`) landed. Anonymous `scripts/e2e/test-galaxy.ps1` run reaches 3/7:
+
+```
+[PASS] source NodeId readable (Galaxy pipe → proxy → server → client chain up)
+[PASS] source value = System.Byte[]
+[INFO] BadUserAccessDenied — attribute's Galaxy-side ACL blocks writes for this session.
+```
+
+The `INFO` stage is correct behaviour — Source is `Operate`-classified and the anonymous session carries no LDAP roles. The Virtual-tag / Subscribe / Alarm / History stages stay at `[FAIL]` for two further environmental reasons once write is unblocked:
+
+1. `TestMachine_001.TestHistoryValue` is driven by whatever Galaxy code runs on the object — idle in the default dev-box state, so no subscription pushes fire.
+2. Historian writes require the Aveva Historian SDK to accept the alarm schema event — dev box doesn't have that path live.
+
+Running `./test-galaxy.ps1 -Username writeop -Password writeop123` with step 4a's LDAP + `SecurityProfile = Basic256Sha256-Sign` applied unblocks the reverse-bridge + alarm-fires stages. The virtual-tag, subscribe, and history stages depend on further deployment choices (pick an attribute Galaxy is actively writing to, wire Aveva Historian SDK).
+
 ## First-run evidence (2026-04-20 dev box)
 
 Ran the smoke against the live dev environment. Captured log signatures prove the Phase 7 wiring chain executes in production:

docs/v2/implementation/pr-1-body.md

@@ -1,80 +0,0 @@
-# PR 1 — Phase 1 + Phase 2 A/B/C → v2
-
-**Source**: `phase-1-configuration` (commits `980ea51..7403b92`, 11 commits)
-**Target**: `v2`
-**URL**: https://gitea.dohertylan.com/dohertj2/lmxopcua/pulls/new/phase-1-configuration
-
-## Summary
-
-- **Phase 1 complete** — Configuration project with 16 entities + 3 EF migrations
-  (InitialSchema + 8 stored procs + AuthorizationGrants), Core + Server + full Admin UI
-  (Blazor Server with cluster CRUD, draft → diff → publish → rollback, equipment with
-  OPC 40010, UNS, namespaces, drivers, ACLs, reservations, audit), LDAP via GLAuth
-  (`localhost:3893`), SignalR real-time fleet status + alerts.
-- **Phase 2 Streams A + B + C feature-complete** — full IPC contract surface
-  (Galaxy.Shared, netstandard2.0, MessagePack), Galaxy.Host with real Win32 STA pump,
-  ACL + caller-SID + per-process-secret IPC, Galaxy-specific MemoryWatchdog +
-  RecyclePolicy + PostMortemMmf + MxAccessHandle, three `IGalaxyBackend`
-  implementations (Stub / DbBacked / **MxAccess** — real ArchestrA.MxAccess.dll
-  reference, x86, smoke-tested live against `LMXProxyServer`), Galaxy.Proxy with all
-  9 capability interfaces (`IDriver` / `ITagDiscovery` / `IReadable` / `IWritable` /
-  `ISubscribable` / `IAlarmSource` / `IHistoryProvider` / `IRediscoverable` /
-  `IHostConnectivityProbe`) + supervisor (Backoff + CircuitBreaker +
-  HeartbeatMonitor).
-- **Phase 2 Stream D non-destructive deliverables** — appsettings.json → DriverConfig
-  migration script, two-service Windows installer scripts, process-spawn cross-FX
-  parity test, Stream D removal procedure doc with both Option A (rewrite 494 v1
-  tests) and Option B (archive + new v2 E2E suite) spelled out step-by-step.
-
-## What's NOT in this PR
-
-- Legacy `OtOpcUa.Host` deletion (Stream D.1) — reserved for a follow-up PR after
-  Option B's E2E suite is green. The 494 v1 tests still pass against the unchanged
-  legacy Host.
-- Live-Galaxy parity validation (Stream E) — needs the iterative debug cycle the
-  removal-procedure doc describes.
-
-## Tests
-
-**964 pass / 1 pre-existing Phase 0 baseline failure**, across 14 test projects:
-
-| Project | Pass | Notes |
-|---|---:|---|
-| Core.Abstractions.Tests | 24 | |
-| Configuration.Tests | 42 | incl. 7 schema compliance, 8 stored-proc, 3 SQL-role auth, 13 validator, 6 LiteDB cache, 5 generation-applier |
-| Core.Tests | 4 | DriverHost lifecycle |
-| Server.Tests | 2 | NodeBootstrap + LiteDB cache fallback |
-| Admin.Tests | 21 | incl. 5 RoleMapper, 6 LdapAuth, 3 LiveLdap, 2 FleetStatusPoller, 2 services-integration |
-| Driver.Galaxy.Shared.Tests | 6 | Round-trip + framing |
-| Driver.Galaxy.Host.Tests | 30 | incl. 5 GalaxyRepository live ZB, 3 live MXAccess COM, 5 EndToEndIpc, 2 IpcHandshake, 4 MemoryWatchdog, 3 RecyclePolicy, 3 PostMortemMmf, 3 StaPump, 2 service-installer dry-run |
-| Driver.Galaxy.Proxy.Tests | 10 | 9 unit + 1 process-spawn parity |
-| Client.Shared.Tests | 131 | unchanged |
-| Client.UI.Tests | 98 | unchanged |
-| Client.CLI.Tests | 51 / 1 fail | pre-existing baseline failure |
-| Historian.Aveva.Tests | 41 | unchanged |
-| IntegrationTests (net48) | 6 | unchanged — v1 parity baseline |
-| **OtOpcUa.Tests (net48)** | **494** | **unchanged — v1 parity baseline** |
-
-## Test plan for reviewers
-
-- [ ] `dotnet build ZB.MOM.WW.OtOpcUa.slnx` succeeds with no warnings beyond the
-      known NuGetAuditSuppress + xUnit1051 warnings
-- [ ] `dotnet test ZB.MOM.WW.OtOpcUa.slnx` shows the same 964/1 result
-- [ ] `Get-Service aaGR, aaBootstrap` reports Running on the merger's box
-- [ ] `docker ps --filter name=otopcua-mssql` shows the SQL container Up
-- [ ] Admin UI boots (`dotnet run --project src/ZB.MOM.WW.OtOpcUa.Admin`); home page
-      renders at http://localhost:5123/; LDAP sign-in with GLAuth `readonly` /
-      `readonly123` succeeds
-- [ ] Migration script dry-run: `powershell -File
-      scripts/migration/Migrate-AppSettings-To-DriverConfig.ps1 -DryRun` produces
-      a well-formed DriverConfig JSON
-- [ ] Spot-read three commit messages to confirm the deferred-with-rationale items
-      are explicitly documented (`549cd36`, `a7126ba`, `7403b92` are the most
-      recent and most detailed)
-
-## Follow-up tracking
-
-PR 2 (next session) will execute Stream D Option B — archive `OtOpcUa.Tests` as
-`OtOpcUa.Tests.v1Archive`, build the new `OtOpcUa.Driver.Galaxy.E2E` test project,
-delete legacy `OtOpcUa.Host`, and run the parity-validation cycle. See
-`docs/v2/implementation/stream-d-removal-procedure.md`.

docs/v2/implementation/pr-2-body.md

@@ -1,69 +0,0 @@
-# PR 2 — Phase 2 Stream D Option B (archive v1 + E2E suite) → v2
-
-**Source**: `phase-2-stream-d` (branched from `phase-1-configuration`)
-**Target**: `v2`
-**URL** (after push): https://gitea.dohertylan.com/dohertj2/lmxopcua/pulls/new/phase-2-stream-d
-
-## Summary
-
-Phase 2 Stream D Option B per `docs/v2/implementation/stream-d-removal-procedure.md`:
-
-- **Archived the v1 surface** without deleting:
-  - `tests/ZB.MOM.WW.OtOpcUa.Tests/` → `tests/ZB.MOM.WW.OtOpcUa.Tests.v1Archive/`
-    (`<AssemblyName>` kept as `ZB.MOM.WW.OtOpcUa.Tests` so v1 Host's `InternalsVisibleTo`
-    still matches; `<IsTestProject>false</IsTestProject>` so solution test runs skip it).
-  - `tests/ZB.MOM.WW.OtOpcUa.IntegrationTests/` — `<IsTestProject>false</IsTestProject>`
-    + archive comment.
-  - `src/ZB.MOM.WW.OtOpcUa.Host/` + `src/ZB.MOM.WW.OtOpcUa.Historian.Aveva/` — archive
-    PropertyGroup comments. Both still build (Historian plugin + 41 historian tests still
-    pass) so Phase 2 PR 3 can delete them in a focused, reviewable destructive change.
-- **New `tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.E2E/`** test project (.NET 10):
-  - `ParityFixture` spawns `OtOpcUa.Driver.Galaxy.Host.exe` (net48 x86) as a subprocess via
-    `Process.Start`, connects via real named pipe, exposes a connected `GalaxyProxyDriver`.
-    Skips when Galaxy ZB unreachable / Host EXE not built / Administrator shell.
-  - `HierarchyParityTests` (3) and `StabilityFindingsRegressionTests` (4) — one test per
-    2026-04-13 stability finding (phantom probe, cross-host quality clear, sync-over-async,
-    fire-and-forget alarm shutdown race).
-- **`docs/v2/V1_ARCHIVE_STATUS.md`** — inventory + deletion plan for PR 3.
-- **`docs/v2/implementation/exit-gate-phase-2-final.md`** — supersedes the two partial-exit
-  docs with the as-built state, adversarial review of PR 2 deltas (4 new findings), and the
-  recommended PR sequence (1 → 2 → 3 → 4).
-
-## What's NOT in this PR
-
-- Deletion of the v1 archive — saved for PR 3 with explicit operator review (destructive change).
-- Wonderware Historian SDK plugin port — Task B.1.h, follow-up to enable real `HistoryRead`.
-- MxAccess subscription push-frames — Task B.1.s, follow-up to enable real-time
-  data-change push from Host → Proxy.
-
-## Tests
-
-**`dotnet test ZB.MOM.WW.OtOpcUa.slnx`**: **470 pass / 7 skip / 1 pre-existing baseline**.
-
-The 7 skips are the new E2E tests, all skipping with the documented reason
-"PipeAcl denies Administrators on dev shells" — the production install runs as a non-admin
-service account and these tests will execute there.
-
-Run the archived v1 suites explicitly:
-```powershell
-dotnet test tests/ZB.MOM.WW.OtOpcUa.Tests.v1Archive   # → 494 pass
-dotnet test tests/ZB.MOM.WW.OtOpcUa.IntegrationTests  # → 6 pass
-```
-
-## Test plan for reviewers
-
-- [ ] `dotnet build ZB.MOM.WW.OtOpcUa.slnx` succeeds with no warnings beyond the known
-      NuGetAuditSuppress + NU1702 cross-FX
-- [ ] `dotnet test ZB.MOM.WW.OtOpcUa.slnx` shows the 470/7-skip/1-baseline result
-- [ ] Both archived suites pass when run explicitly
-- [ ] Build the Galaxy.Host EXE (`dotnet build src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host`),
-      then run E2E tests on a non-admin shell — they should actually execute and pass
-      against live Galaxy ZB
-- [ ] Spot-read `docs/v2/V1_ARCHIVE_STATUS.md` and confirm the deletion plan is acceptable
-
-## Follow-up tracking
-
-- **PR 3** (next session, when ready): execute the deletion plan in `V1_ARCHIVE_STATUS.md`.
-  4 projects removed, .slnx updated, full solution test confirms parity.
-- **PR 4** (Phase 2 follow-up): port Historian plugin + wire MxAccess subscription pushes +
-  close the high/medium open findings from `exit-gate-phase-2-final.md`.

docs/v2/implementation/pr-4-body.md

@@ -1,91 +0,0 @@
-# PR 4 — Phase 2 follow-up: close the 4 open MXAccess findings
-
-**Source**: `phase-2-pr4-findings` (branched from `phase-2-stream-d`)
-**Target**: `v2`
-
-## Summary
-
-Closes the 4 high/medium open findings carried forward in `exit-gate-phase-2-final.md`:
-
-- **High 1 — `ReadAsync` subscription-leak on cancel.** One-shot read now wraps the
-  subscribe→first-OnDataChange→unsubscribe pattern in a `try/finally` so the per-tag
-  callback is always detached, and if the read installed the underlying MXAccess
-  subscription itself (no other caller had it), it tears it down on the way out.
-- **High 2 — No reconnect loop on the MXAccess COM connection.** New
-  `MxAccessClientOptions { AutoReconnect, MonitorInterval, StaleThreshold }` + a background
-  `MonitorLoopAsync` that watches a stale-activity threshold + probes the proxy via a
-  no-op COM call, then reconnects-with-replay (re-Register, re-AddItem every active
-  subscription) when the proxy is dead. Liveness signal: every `OnDataChange` callback bumps
-  `_lastObservedActivityUtc`. Defaults match v1 monitor cadence (5s poll, 60s stale).
-  `ReconnectCount` exposed for diagnostics; `ConnectionStateChanged` event for downstream
-  consumers (the supervisor on the Proxy side already surfaces this through its
-  HeartbeatMonitor, but the Host-side event lets local logging/metrics hook in).
-- **Medium 3 — `MxAccessGalaxyBackend.SubscribeAsync` doesn't push OnDataChange frames back to
-  the Proxy.** New `IGalaxyBackend.OnDataChange` / `OnAlarmEvent` / `OnHostStatusChanged`
-  events that the new `GalaxyFrameHandler.AttachConnection` subscribes per-connection and
-  forwards as outbound `OnDataChangeNotification` / `AlarmEvent` /
-  `RuntimeStatusChange` frames through the connection's `FrameWriter`. `MxAccessGalaxyBackend`
-  fans out per-tag value changes to every `SubscriptionId` that's listening to that tag
-  (multiple Proxy subs may share a Galaxy attribute — single COM subscription, multi-fan-out
-  on the wire). Stub + DbBacked backends declare the events with `#pragma warning disable
-  CS0067` (treat-warnings-as-errors would otherwise fail on never-raised events that exist
-  only to satisfy the interface).
-- **Medium 4 — `WriteValuesAsync` doesn't await `OnWriteComplete`.** New
-  `WriteAsync(...)` overload returns `bool` after awaiting the OnWriteComplete callback via
-  the v1-style `TaskCompletionSource`-keyed-by-item-handle pattern in `_pendingWrites`.
-  `MxAccessGalaxyBackend.WriteValuesAsync` now reports per-tag `Bad_InternalError` when the
-  runtime rejected the write, instead of false-positive `Good`.
-
-## Pipe server change
-
-`IFrameHandler` gains `AttachConnection(FrameWriter writer): IDisposable` so the handler can
-register backend event sinks on each accepted connection and detach them at disconnect. The
-`PipeServer.RunOneConnectionAsync` calls it after the Hello handshake and disposes it in the
-finally of the per-connection scope. `StubFrameHandler` returns `IFrameHandler.NoopAttachment.Instance`
-(net48 doesn't support default interface methods, so the empty-attach lives as a public nested
-class).
-
-## Tests
-
-**`dotnet test ZB.MOM.WW.OtOpcUa.slnx`**: **460 pass / 7 skip (E2E on admin shell) / 1
-pre-existing baseline failure**. No regressions. The Driver.Galaxy.Host unit tests + 5 live
-ZB smoke + 3 live MXAccess COM smoke all pass unchanged.
-
-## Test plan for reviewers
-
-- [ ] `dotnet build` clean
-- [ ] `dotnet test` shows 460/7-skip/1-baseline
-- [ ] Spot-check `MxAccessClient.MonitorLoopAsync` against v1's `MxAccessClient.Monitor`
-      partial (`src/ZB.MOM.WW.OtOpcUa.Host/MxAccess/MxAccessClient.Monitor.cs`) — same
-      polling cadence, same probe-then-reconnect-with-replay shape
-- [ ] Read `GalaxyFrameHandler.ConnectionSink.Dispose` and confirm event handlers are
-      detached on connection close (no leaked invocation list refs)
-- [ ] `WriteValuesAsync` returning `Bad_InternalError` on a runtime-rejected write is the
-      correct shape — confirm against the v1 `MxAccessClient.ReadWrite.cs` pattern
-
-## What's NOT in this PR
-
-- Wonderware Historian SDK plugin port (Task B.1.h) — separate PR, larger scope.
-- Alarm subsystem wire-up (`MxAccessGalaxyBackend.SubscribeAlarmsAsync` is still a no-op).
-  `OnAlarmEvent` is declared on the backend interface and pushed by the frame handler when
-  raised; `MxAccessGalaxyBackend` just doesn't raise it yet (waits for the alarm-tracking
-  port from v1's `AlarmObjectFilter` + Galaxy alarm primitives).
-- Host-status push (`OnHostStatusChanged`) — declared on the interface and pushed by the
-  frame handler; `MxAccessGalaxyBackend` doesn't raise it (the Galaxy.Host's
-  `HostConnectivityProbe` from v1 needs porting too, scoped under the Historian PR).
-
-## Adversarial review
-
-Quick pass over the PR 4 deltas. No new findings beyond:
-
-- **Low 1** — `MonitorLoopAsync`'s `$Heartbeat` probe item-handle is leaked
-  (`AddItem` succeeds, never `RemoveItem`'d). Cosmetic — the probe item is internal to
-  the COM connection, dies with `Unregister` at disconnect/recycle. Worth a follow-up
-  to call `RemoveItem` after the probe succeeds.
-- **Low 2** — Replay loop in `MonitorLoopAsync` swallows per-subscription failures. If
-  Galaxy permanently rejects a previously-valid reference (rare but possible after a
-  re-deploy), the user gets silent data loss for that one subscription. The stub-handler-
-  unaware operator wouldn't notice. Worth surfacing as a `ConnectionStateChanged(false)
-  → ConnectionStateChanged(true)` payload that includes the replay-failures list.
-
-Both are low-priority follow-ups, not PR 4 blockers.

docs/v2/modbus-addressing.md

@@ -0,0 +1,233 @@
+# Modbus tag-addressing reference
+
+Foundational doc for the Modbus addressing grammar shipped across #136–#144.
+Covers the address-string parser (`ModbusAddressParser`) that the wire driver
+and the Admin UI both consume, the per-tag suffix modifiers, and the family-
+native branch.
+
+## Grammar
+
+```
+<region><offset>[.<bit>][:<type>[<len>]][:<order>][:<count>]
+```
+
+Each field is optional from left to right; the parser fills defaults.
+
+### Region + offset
+
+Three accepted forms — pick whichever matches your tag spreadsheet's
+convention. All three resolve to the same `(Region, ushort PduOffset)`
+on the wire.
+
+| Form | Example | Means |
+|---|---|---|
+| Modicon 5-digit | `40001` | Holding register 1 (PDU 0) |
+| Modicon 6-digit | `400001` | Holding register 1 (PDU 0); supports up to `465536` (PDU 65535) |
+| Mnemonic | `HR1`, `IR1`, `C100`, `DI1` | Same regions; `1`-based register number |
+
+Modicon leading-digit → region:
+
+| Digit | Region | OPC UA wire FC |
+|---|---|---|
+| `0` | Coils | FC01 / FC05 / FC15 |
+| `1` | DiscreteInputs | FC02 (read-only) |
+| `3` | InputRegisters | FC04 (read-only) |
+| `4` | HoldingRegisters | FC03 / FC06 / FC16 |
+
+### Bit suffix `.N`
+
+`40001.5` = bit 5 (LSB-first) of HR[0]. Implies `DataType=BitInRegister`;
+mixing with an explicit type or array-count is rejected.
+
+### Type code `:T`
+
+Codes verified 2026-04-25 against [Wonderware DASMBTCP user
+guide](https://cdn.logic-control.com/media/DASMBTCP.pdf) and the
+[Ignition Modbus addressing
+manual](https://www.docs.inductiveautomation.com/docs/8.1/ignition-modules/opc-ua/opc-ua-drivers/modbus/modbus-addressing).
+The `I` / `UI` / `I_64` / `UI_64` / `BCD_32` shapes match Wonderware's
+suffix convention and Ignition's underscore-N prefix variants where
+those vendors agree.
+
+| Code | Type | Registers | Vendor reference |
+|---|---|---|---|
+| `BOOL` | Boolean | 1 (region must be Coils / DiscreteInputs) | universal |
+| `S` | Int16 | 1 | Wonderware DASMBTCP `S` = 16-bit signed |
+| `US` | UInt16 | 1 | Ignition `HRUS` = Unsigned Short |
+| `I` | Int32 | 2 | Wonderware DASMBTCP `I` = 32-bit signed; Ignition `HRI` |
+| `UI` | UInt32 | 2 | Ignition `HRUI` |
+| `I_64` | Int64 | 4 | Ignition `HRI_64` |
+| `UI_64` | UInt64 | 4 | Ignition `HRUI_64` |
+| `F` | Float32 | 2 | Wonderware `F`; Ignition `HRF` |
+| `D` | Float64 | 4 | Ignition `HRD` |
+| `BCD` | 16-bit BCD | 1 | Ignition `HRBCD` |
+| `BCD_32` | 32-bit BCD | 2 | Ignition `HRBCD_32` |
+| `STR<len>` | ASCII string, `len` chars (2 chars / register) | `ceil(len/2)` | analogous to Ignition `HRS<addr>:<len>` |
+
+Default when omitted:
+- Coils / DiscreteInputs → `BOOL`
+- HoldingRegisters / InputRegisters → `S` (Int16) — matches Ignition's bare-`HR` default
+
+**Codes removed in #146** (silent wrong-data risk, never compatible with the
+two reference vendors): `:DI`, `:L`, `:UDI`, `:UL`, `:LI`, `:ULI`, `:LBCD`.
+Pre-#146 configs that use these get a clear "Unknown type code" diagnostic at
+parse time; rewrite to the post-#146 codes per the table above.
+
+### Byte order `:O`
+
+| Mnemonic | Meaning | Wire |
+|---|---|---|
+| `ABCD` | Big-endian (Modbus spec default) | `[A,B,C,D]` |
+| `CDAB` | Word swap (Siemens, several AB) | `[C,D,A,B]` |
+| `BADC` | Byte swap (legacy little-endian-internal devices) | `[B,A,D,C]` |
+| `DCBA` | Full reverse (some EtherNet/IP gateways) | `[D,C,B,A]` |
+
+For 8-byte values (Int64 / Float64) the same labels apply pairwise.
+
+### Array count `:N`
+
+`40001:F:5` = `Float32[5]` (consumes HR[0..9]). Array + bit suffix is
+rejected. Strings are not arrays.
+
+### Composition
+
+The 3-field shorthand `40001:F:5` is parsed as `(type=F, count=5)` because
+`5` isn't a valid byte-order mnemonic. Use the explicit 4-field form
+`40001:F:CDAB:5` when you need a non-default order.
+
+## Family-native syntax (#144)
+
+When the driver instance has `Family != Generic`, the parser tries the
+family's native syntax FIRST, then falls back to Modicon / mnemonic.
+
+### DL205 (AutomationDirect DirectLOGIC)
+
+| Form | Example | Mapping |
+|---|---|---|
+| `Vnnnn` (octal) | `V2000` | HoldingRegisters[1024] (octal 2000 = decimal 1024) |
+| `Ynn` (octal) | `Y17` | Coils[2048 + 15] (Y-output base + offset) |
+| `Cnn` (octal) | `C100` | Coils[3072 + 64] (C-relay base + offset) |
+| `Xnn` (octal) | `X17` | DiscreteInputs[15] |
+| `SPnn` (octal) | `SP10` | DiscreteInputs[1024 + 8] |
+
+**Cross-family ambiguity**: `C100` means Coils[99] under `Generic`
+(mnemonic) but Coils[3136] under `DL205`. Per-driver Family choice
+disambiguates.
+
+### MELSEC (Mitsubishi)
+
+| Form | Example | Mapping (sub-family Q_L_iQR / F_iQF) |
+|---|---|---|
+| `Dnnn` (decimal) | `D100` | HoldingRegisters[100] |
+| `Mnnn` (decimal) | `M50` | Coils[50] |
+| `Xnn` | `X20` | DiscreteInputs[32 hex / 16 octal] |
+| `Ynn` | `Y20` | Coils[32 hex / 16 octal] |
+
+X / Y digit interpretation depends on `MelsecSubFamily`:
+- `Q_L_iQR` → hex (default)
+- `F_iQF` → octal
+
+Bank-base offsets default to 0 in the grammar string. Sites with non-zero
+"Modbus Device Assignment" bases use the structured tag form.
+
+## Driver-instance options
+
+Beyond per-tag addressing, `ModbusDriverOptions` exposes (#139–#143):
+
+### Connection (#139)
+- `KeepAlive { Enabled, Time, Interval, RetryCount }` — TCP-level probes.
+  Defaults match the historical PR 53 wire output (Enabled=true, Time=30s,
+  Interval=10s, RetryCount=3).
+- `IdleDisconnectTimeout` — proactively close + reconnect after this much
+  socket idle time. Default null = disabled.
+- `Reconnect { InitialDelay, MaxDelay, BackoffMultiplier }` — geometric
+  backoff for the post-drop reconnect loop. Default
+  `(0, 30s, 2.0)` = immediate first retry, geometric thereafter.
+
+### Protocol (#140)
+- `MaxCoilsPerRead` (default 2000) — separate cap for FC01/FC02 coil reads.
+- `UseFC15ForSingleCoilWrites` — force FC15 (write multiple coils
+  qty=1) for single-coil writes. Safety/audit PLCs may require this.
+- `UseFC16ForSingleRegisterWrites` — same for FC16 vs FC06.
+- `DisableFC23` — kill switch for FC23 (currently unused; reserved).
+
+### Subscribe (#141)
+- Per-tag `Deadband` — suppress sub-threshold publishes on numeric tags.
+- `WriteOnChangeOnly` (driver-level) — short-circuit identical-value
+  writes. Cache invalidates on read-divergence.
+
+### Multi-unit (#142)
+- Per-tag `UnitId` — overrides the driver-level UnitId in the MBAP
+  header. Required for one-Ethernet-gateway / N-RTU-slave deployments.
+- `IPerCallHostResolver.ResolveHost` returns `host:port/unitN` per tag so
+  per-PLC circuit breakers fire per slave.
+- Per-tag `CoalesceProhibited` — escape hatch for #143's planner (read
+  this tag in isolation regardless of `MaxReadGap`).
+
+### Block-read coalescing (#143)
+- `MaxReadGap` (default 0 = off) — gap budget the planner is willing to
+  bridge between adjacent register tags. With `MaxReadGap=10`, three tags
+  at HR 100/102/110 collapse into one FC03 of quantity 11.
+
+### Coalescing auto-recovery (#148 / #150 / #151 / #152)
+- A coalesced read that fails with a Modbus exception (write-only or
+  protected register mid-block) records the failed range as
+  auto-prohibited. The planner stops re-coalescing across the range; the
+  per-tag fallback path keeps healthy members working in the same scan.
+- **Bisection (#150)**: every re-probe pass narrows multi-register
+  prohibitions by trying the two halves separately. Over log2(span)
+  ticks the prohibition pins at the actual offending register(s);
+  intermediate halves that succeed get cleared.
+- **Periodic re-probe (#151)**: opt in via
+  `AutoProhibitReprobeInterval` (TimeSpan?). Default null = disabled
+  (prohibitions persist for the driver lifetime; clear on
+  `ReinitializeAsync`).
+- **Per-tag escape hatch**: `CoalesceProhibited` (bool, default false)
+  on `ModbusTagDefinition`. The planner reads such tags in isolation
+  regardless of `MaxReadGap`. Use for known-bad addresses you want to
+  exclude from the auto-discovery loop.
+- **Diagnostics (#152)**: `ModbusDriver.GetAutoProhibitedRanges()`
+  returns a snapshot of every active prohibition as
+  `ModbusAutoProhibition` records (UnitId / Region / StartAddress /
+  EndAddress / LastProbedUtc / BisectionPending). Surface in the
+  driver-diagnostics RPC channel when that wiring lands; for now
+  consumable by in-process callers (Server health endpoints, log
+  aggregation).
+
+## JSON DTO shape
+
+The factory accepts both the structured form (legacy) and the new
+`AddressString` form per-tag. Mix freely — newer pasted rows use the
+grammar string; legacy rows keep the structured fields.
+
+```json
+{
+  "host": "10.1.2.3",
+  "port": 502,
+  "unitId": 1,
+  "family": "DL205",
+  "keepAlive": { "enabled": true, "timeMs": 30000, "intervalMs": 10000, "retryCount": 3 },
+  "idleDisconnectMs": 120000,
+  "reconnect": { "initialDelayMs": 0, "maxDelayMs": 30000, "backoffMultiplier": 2.0 },
+  "maxCoilsPerRead": 2000,
+  "writeOnChangeOnly": false,
+  "maxReadGap": 8,
+  "tags": [
+    { "name": "Temp",        "addressString": "V2000:F:CDAB" },
+    { "name": "Setpoint",    "addressString": "40001:I" },
+    { "name": "Outputs",     "addressString": "Y0:5" },
+    { "name": "AlarmCount",  "region": "HoldingRegisters", "address": 200, "dataType": "Int16", "deadband": 5.0 }
+  ]
+}
+```
+
+## Vendor compatibility caveat
+
+The exact spelling of type codes (e.g. `I` vs `INT`, `BCD` vs `L_BCD`) and
+the byte-order mnemonics were synthesised from training-era vendor docs
+(Wonderware DASMBTCP, Kepware KEPServerEX, Ignition, Matrikon, OAS).
+Before locking the grammar for a production deployment, verify against
+the current Kepware "Modbus Ethernet Driver Help" PDF and Ignition's
+"Modbus Addressing" user-manual page — if a critical tool's mnemonics
+have shifted, add aliases in `ModbusAddressParser.TryParseType` rather
+than asking users to rewrite spreadsheets.

docs/v2/modbus-test-plan.md

@@ -7,7 +7,7 @@ populations disagree with the spec in small, device-specific ways, and a driver
 passes textbook tests can still misbehave against actual equipment.
 
 This doc is the harness-and-quirks playbook. The project it describes lives at
-`tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/` — scaffolded in PR 30 with
+`tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests/` — scaffolded in PR 30 with
 the simulator fixture, DL205 profile stub, and one write/read smoke test. Each
 confirmed DL205 quirk lands in a follow-up PR as a named test in that project.
 
@@ -33,7 +33,7 @@ under `tests/.../Modbus.IntegrationTests/Docker/`. See that folder's
 
 **Setup pattern**:
 1. `docker compose -f tests\...\Modbus.IntegrationTests\Docker\docker-compose.yml --profile <standard|dl205|mitsubishi|s7_1500> up -d`.
-2. `dotnet test tests\ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests` —
+2. `dotnet test tests\Drivers\ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests` —
    tests auto-skip when the endpoint is unreachable. Default endpoint is
    `localhost:5020`; override via `MODBUS_SIM_ENDPOINT` for a real PLC on its
    native port 502.
@@ -70,6 +70,17 @@ integration tests until reproduced on hardware:
 - TxId drop under load (forum rumour; not reproduced).
 - Pre-2004 firmware ABCD word order (every shipped DL205/DL260 since 2004 is CDAB).
 
+### Siemens SIMATIC S7
+
+Quirk catalog at [`s7.md`](s7.md) — covers S7-1200 / S7-1500 / S7-300 / S7-400 /
+ET 200SP. Modbus TCP isn't native; each platform exposes it via a different
+add-on module with its own register-mapping conventions.
+
+### Mitsubishi MELSEC
+
+Quirk catalog at [`mitsubishi.md`](mitsubishi.md) — Modbus TCP via add-on modules
+across the MELSEC family.
+
 ### Future devices
 
 One section per device class, same shape as DL205. Quirks that apply across
@@ -105,7 +116,7 @@ vendors get promoted into driver defaults or opt-in options:
 ## Next concrete PRs
 
 - **PR 30 — Integration test project + DL205 profile scaffold** — **DONE**.
-  Shipped `tests/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests` with
+  Shipped `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.Modbus.IntegrationTests` with
   `ModbusSimulatorFixture` (TCP-probe, skips with a clear `SkipReason` when the
   endpoint is unreachable), `DL205/DL205Profile.cs` (tag map stub), and
   `DL205/DL205SmokeTests.cs` (write-then-read round-trip).

docs/v2/multi-host-dispatch.md

@@ -0,0 +1,46 @@
+# Multi-host dispatch — per-PLC circuit breakers
+
+Phase 6.1 decision #144 / task #135. Motivation: a single DriverInstance that fronts N PLCs (Modbus with multiple slaves, AB CIP with multiple ControlLogix chassis, etc.) must not let one dead PLC trip the resilience breaker for its healthy siblings.
+
+This note documents the shipped contract so future driver authors don't re-derive it.
+
+## Contract
+
+The resilience pipeline keys on `(DriverInstanceId, HostName, DriverCapability)`. One dead PLC opens only the pipeline keyed on its HostName; healthy sibling PLCs keep their own pipelines intact.
+
+Three participants:
+
+1. **`DriverResiliencePipelineBuilder.GetOrCreate(driverInstanceId, hostName, capability, options)`** — the pipeline cache. First call per key builds a Polly pipeline (timeout → retry → breaker). Subsequent calls return the cached instance. Covered by `DriverResiliencePipelineBuilderTests.Pipeline_IsIsolated_PerHost`.
+
+2. **`CapabilityInvoker.ExecuteAsync(capability, hostName, callSite, ct)`** — takes `hostName` per-call. Threads it straight through to the pipeline builder. Covered by `CapabilityInvokerTests`.
+
+3. **`IPerCallHostResolver.ResolveHost(fullReference)`** — an optional interface a multi-device driver implements. `DriverNodeManager.ResolveHostFor` calls it on every capability dispatch so the host flowing into the invoker comes from the tag's per-PLC metadata, not the driver instance. Single-device drivers don't implement it — `DriverNodeManager` falls back to `DriverInstanceId` as the hostname, which still flows through the same `(instance, host, capability)` key shape (one pipeline per single-device instance).
+
+End-to-end `dead PLC, healthy PLC` scenario proven by `PerCallHostResolverDispatchTests.DeadPlc_DoesNotOpenBreaker_For_HealthyPlc_With_Resolver`.
+
+## Driver author checklist
+
+To light up per-PLC circuit breakers on a multi-device driver:
+
+1. **Options model** — extend the driver's options type with an explicit device list. See `AbCipDriverOptions.Devices : IReadOnlyList<AbCipDeviceConfig>`.
+2. **Tag → device mapping** — parse the tag's `DeviceId` from `TagConfig`. The driver's per-tag definition records the device HostAddress alongside the wire address. See `AbCipTagDefinition.DeviceHostAddress`.
+3. **`IPerCallHostResolver`** — implement it on the driver. `ResolveHost(fullReference)` looks up the tag's definition and returns the device HostAddress. Unknown references should return a deterministic fallback (e.g. the first configured device's host) rather than throw — the invoker handles the mislookup at capability level when the actual read surfaces `BadNodeIdUnknown`.
+4. **Health surface** — `IHostConnectivityProbe.GetHostStatuses()` returns one `HostConnectivityStatus` per configured device so the Admin UI fleet page lights the per-PLC status distinctly.
+5. **Transport per device** — one network connection per PLC, serialized per device via `SemaphoreSlim` (or equivalent). Do not share a transport across PLCs; the breaker-isolation guarantee disappears if they share a queue.
+
+## Current fleet status (2026-04-24)
+
+| Driver | Per-tag device | `IPerCallHostResolver` | Per-PLC breaker isolation |
+|---|---|---|---|
+| AB CIP | ✅ `DeviceId` | ✅ | ✅ live |
+| AB Legacy | 1 device / instance | — (not needed) | trivial |
+| Modbus | 1 device / instance today | — | trivial — multi-device refactor tracked separately |
+| S7 | 1 device / instance today | — | trivial — same |
+| TwinCAT | 1 device / instance today | — | trivial — same |
+| FOCAS | 1 CNC / instance | — (not needed) | trivial |
+| Galaxy | 1 Galaxy Host / instance | — (not needed) | trivial — Host recycle runs per instance |
+| OPC UA Client | 1 upstream / instance | — (not needed) | trivial |
+
+"Trivial" above means the pipeline key ends up as `(DriverInstanceId, DriverInstanceId, capability)` via `DriverNodeManager.ResolveHostFor`'s fallback — one pipeline per driver instance, which is correct for single-device drivers.
+
+Extending Modbus / S7 / TwinCAT to multi-device follows the AB CIP template verbatim; it's per-driver surgery (schema row + options model + resolver implementation + transport fan-out) rather than shared-infrastructure work.

docs/v2/plan.md

@@ -689,7 +689,7 @@ Galaxy.Proxy ──→ Galaxy.Shared ←── Galaxy.Host
 
 **Decided:**
 - Mono-repo (Decision #31 above).
-- `Core.Abstractions` is **internal-only for now** — no standalone NuGet. Keep the contract mutable while the first 8 drivers are being built; revisit publishing after Phase 5 when the shape has stabilized. Design the contract *as if* it will eventually be public (no leaky types, stable names) to minimize churn later.
+- `Core.Abstractions` is **internal-only for now** — no standalone NuGet. Keep the contract mutable while the first 8 drivers are being built; revisit publishing after the driver fleet (originally Phase 5, folded into the Phase 3 umbrella — see exit gate) once the shape has stabilized. Design the contract *as if* it will eventually be public (no leaky types, stable names) to minimize churn later.
 
 ---
 
@@ -742,24 +742,30 @@ Each step leaves the system runnable. The generic extraction is effectively free
 10. **Build `Galaxy.Proxy`** — .NET 10 in-process proxy implementing IDriver interfaces, forwarding over IPC
 11. **Validate parity** — v2 Galaxy driver must pass the same integration tests as v1
 
-**Phase 3 — Modbus TCP driver (prove the abstraction)**
-12. **Build `Driver.ModbusTcp`** — NModbus, config-driven tags from central DB, internal poll loop, device-as-folder hierarchy
-13. **Add Modbus config screens to Admin** (first driver-specific config UI)
+**Phase 3 — Driver fleet (all seven non-Galaxy drivers) — ✅ CLOSED 2026-04-23** (see [`implementation/exit-gate-phase-3.md`](implementation/exit-gate-phase-3.md))
 
-**Phase 4 — PLC drivers**
-14. **Build `Driver.AbCip`** — libplctag, ControlLogix/CompactLogix symbolic tags + Admin config screens
-15. **Build `Driver.AbLegacy`** — libplctag, SLC 500/MicroLogix file-based addressing + Admin config screens
-16. **Build `Driver.S7`** — S7netplus, Siemens S7-300/400/1200/1500 + Admin config screens
-17. **Build `Driver.TwinCat`** — Beckhoff.TwinCAT.Ads v6, native ADS notifications, symbol upload + Admin config screens
+Originally split across Phase 3 (Modbus alone), Phase 4 (PLC drivers), and
+Phase 5 (specialty drivers). In execution, once `Core.Abstractions` had
+stabilised under Phase 1 + Phase 2, each driver landed as its own stream
+rather than as a gated mini-phase; the phase numbers were folded into a
+single umbrella. Shipped:
 
-**Phase 5 — Specialty drivers**
-18. **Build `Driver.Focas`** — FANUC FOCAS2 P/Invoke, pre-defined CNC tag set, PMC/macro config + Admin config screens
-19. **Build `Driver.OpcUaClient`** — OPC UA client gateway/aggregation, namespace remapping, subscription proxying + Admin config screens
+12. **`Driver.Modbus`** — NModbus, config-driven tags, internal poll loop, device-as-folder hierarchy (umbrella closure #210)
+13. **`Driver.AbCip`** — libplctag, ControlLogix/CompactLogix symbolic tags (#211, live-booted under #220)
+14. **`Driver.AbLegacy`** — libplctag, SLC 500 / MicroLogix / PLC-5 file-based addressing (#213, live-booted under #222)
+15. **`Driver.S7`** — S7netplus, Siemens S7-300/400/1200/1500 (#212, live-booted under #220)
+16. **`Driver.TwinCAT`** — Beckhoff.TwinCAT.Ads v7, native ADS notifications, symbol upload (factory wired 2026-04-23; wire-live deferred, #221)
+17. **`Driver.FOCAS`** — FANUC FOCAS2 P/Invoke via Tier-C out-of-process `Driver.FOCAS.Host` (#220 five-PR split; wire-live deferred, #222 follow-up)
+18. **`Driver.OpcUaClient`** — OPC UA client gateway / aggregation, namespace remapping, subscription proxying (scaffold #66; live-boot 5/8 stages via `test-opcuaclient.ps1`)
+
+Supporting infrastructure: `DriverFactoryRegistry` + `DriverInstanceBootstrapper`
+(#248); per-driver test-client CLI suite (#249–#251); e2e test scripts with
+aggregate runner (#253); server-side factory + seed SQL per driver (#210–#213).
 
 **Decided:**
 - **Parity test for Galaxy**: existing v1 IntegrationTests suite + scripted Client.CLI walkthrough (see Section 4 above).
 - **Timeline**: no hard deadline. Each phase ships when it's right — tests passing, Galaxy parity bar met. Quality cadence over calendar cadence.
-- **FOCAS SDK**: license already secured. Phase 5 can proceed as scheduled; `Fwlib64.dll` available for P/Invoke.
+- **FOCAS SDK**: license already secured. FOCAS driver shipped as part of the Phase 3 umbrella with Tier-C host; `Fwlib64.dll` available for P/Invoke (wire-level live-boot gated on lab rig, #222 follow-up).
 
 ---
 

docs/v2/redundancy-interop-playbook.md

@@ -0,0 +1,128 @@
+# Redundancy Interop Playbook (Phase 6.3 Stream F — task #150)
+
+> **Scope**: manual validation that third-party OPC UA clients + AVEVA MXAccess
+> observe our non-transparent redundancy signals (ServiceLevel, ServerUriArray,
+> RedundancySupport) and fail over to the Backup node when the Primary drops.
+>
+> **Why manual**: the third-party clients named here are Windows-GUI binaries
+> (UaExpert, Kepware QuickClient) or embedded inside AVEVA System Platform.
+> Automating any of them into PR-CI is out of scope for v2. This playbook
+> captures the minimal dev-box-plus-VM setup and the expected pass criteria so
+> the work can be executed repeatably at v2 release readiness and after any
+> Phase 6.3 follow-up change.
+
+## Prerequisites
+
+1. Two `OtOpcUa.Server` nodes in one `ServerCluster`:
+   - Declared as `NodeCount = 2`, `RedundancyMode = Hot` (or `Warm`).
+   - Each with a distinct `ApplicationUri` (enforced by unique index per
+     decision #86).
+   - Each node's `StaticRoutes.xml` points at the other (`ServerCluster.Node[].Host`).
+2. `scripts/install/Install-Services.ps1` applied on each node so the
+   `RedundancyPublisherHostedService` is running.
+3. At least one `DriverInstance` with a reachable simulator or PLC so both
+   servers have a non-empty address space to browse.
+4. On the client host:
+   - `UaExpert` ≥ 1.7 installed
+   - Kepware `ClientAce QuickClient` (or equivalent) — optional, for a second
+     client
+5. For the AVEVA leg: a `Galaxy.Host` running against an MXAccess deployment
+   with an external OPC UA client object pointed at the cluster (not at a
+   single node).
+
+## Expected signals on a running cluster
+
+| Node | `ServiceLevel` | `RedundancySupport` | `ServerUriArray` |
+|---|---|---|---|
+| Primary, healthy, peer reachable | 200 | `Hot` (or `Warm`) | self + peer |
+| Primary, mid-apply | 75 (`PrimaryMidApply`) | same | same |
+| Primary, peer UNreachable | 150 (`PrimaryPeerDown`) | same | same |
+| Backup, healthy | 100 (`Secondary`) | same | same |
+| Either, dwelling in recovery | 50 (`Recovering`) | same | same |
+| Either, invariant violation (two Primary, disabled-node mismatch) | 2 (`InvalidTopology`) | same | same |
+
+(The band constants live in `ServiceLevelCalculator.Classify`.)
+
+## Test matrix
+
+Each row is one manual run; pass criterion in the right column.
+
+### Block A — UA protocol signals (UaExpert)
+
+| # | Scenario | Procedure | Pass criterion |
+|---|---|---|---|
+| A1 | ServiceLevel published | Connect UaExpert to Primary. Browse to `Server.ServerStatus.ServiceLevel`. | Value = 200 (or the expected Band byte per table above) |
+| A2 | ServiceLevel updates on peer down | Connect to Primary. Stop Backup (`sc stop OtOpcUa`). Watch `ServiceLevel`. | Transitions 200 → 150 within ~2 s of peer probe timeout |
+| A3 | RedundancySupport | Browse to `Server.ServerRedundancy.RedundancySupport`. | Value matches the declared `RedundancyMode` (Warm / Hot / None) |
+| A4 | ServerUriArray (non-transparent upgrade) | Requires a redundancy-object-type upgrade follow-up. | When upgrade lands: `ServerUriArray` reports both ApplicationUris, self first |
+| A5 | Mid-apply dip | On Primary trigger a `sp_PublishGeneration` apply. | `ServiceLevel` drops to 75 for the apply duration + dwell |
+
+### Block B — Client failover
+
+| # | Scenario | Procedure | Pass criterion |
+|---|---|---|---|
+| B1 | UaExpert picks Primary by ServiceLevel | In UaExpert configure a Redundancy Group with both endpoint URLs. | Client picks the Primary URL (higher ServiceLevel) |
+| B2 | UaExpert cuts over on Primary kill | Kill the Primary's `OtOpcUa` service. | Client session reconnects to Backup within UaExpert's reconnect timeout (default 5 s). Data-change monitored items resume. |
+| B3 | UaExpert cuts back when Primary returns | Start the Primary service. Wait ≥ recovery dwell (see `RecoveryStateManager.DwellTime`). | `ServiceLevel` on returning Primary goes through 50 (Recovering) → 200; UaExpert may or may not switch back (client-policy dependent; both are accepted outcomes) |
+| B4 | Kepware QuickClient failover | Repeat B1–B3 with Kepware in place of UaExpert. | Same pass criteria; establishes we're not UaExpert-specific |
+
+### Block C — Galaxy MXAccess failover
+
+This block validates that an AVEVA System Platform app consuming our cluster
+via MXAccess tolerates a Primary drop the same way a native OPC UA client does.
+The MXAccess toolkit internally wraps the OPC UA Client and does its own
+redundancy negotiation; we're asserting that negotiation honors our
+`ServiceLevel` signal.
+
+| # | Scenario | Procedure | Pass criterion |
+|---|---|---|---|
+| C1 | Galaxy binds to Primary on first connect | Bring the cluster up. Start a Galaxy `$MxAccessClient` object pointed at the cluster with both node URLs. | Galaxy reports `QUALITY = Good` + initial values from the Primary |
+| C2 | Galaxy redirects on Primary drop | Stop the Primary. | Galaxy's `QUALITY` briefly goes `Uncertain`, then back to `Good`; values continue streaming from the Backup within MXAccess's `ReconnectInterval` (default 20 s) |
+| C3 | Galaxy handles mid-apply dip | Trigger a generation apply on the Primary. | Galaxy continues reading — the mid-apply dip is advertisory (ServiceLevel 75), not a session drop; MXAccess should stay bound |
+
+## Recording results
+
+Copy the tables above into a tracking doc per run. The tracking doc shape:
+
+```
+Run date: 2026-MM-DD
+Cluster: <id>  Primary: <node>  Backup: <node>  Release: <sha>
+A1: PASS  evidence: UaExpert screenshot uaexpert-a1.png
+A2: PASS  evidence: ServiceLevel trend grafana-a2.png
+…
+```
+
+One pass of every row is the acceptance criterion. Re-run after any Phase 6.3
+follow-up ships (especially the non-transparent redundancy-type upgrade, which
+flips A4 from "deferred" to "expected pass").
+
+## Known limitations
+
+- **A4 pending**: `Server.ServerRedundancy` on our current SDK build lands as
+  the base `ServerRedundancyState`, which has no `ServerUriArray` child.
+  `ServerRedundancyNodeWriter.ApplyServerUriArray` logs-and-skips until the
+  redundancy-object-type upgrade follow-up lands.
+- **Recovery dwell default**: `RecoveryStateManager.DwellTime` defaults to 60 s
+  in `Program.cs`. Adjust via future config knob if B3 takes too long to
+  observe.
+- **C-block external dependency**: The `Galaxy.Host` side of the redundancy
+  story is largely out of our code — it's MXAccess's own client-redundancy
+  policy talking to our published ServiceLevel. A negative result on C1-C3
+  does not necessarily indicate an OtOpcUa bug; cross-check with UaExpert
+  (Block A / B) first.
+
+## Automation notes (why this is a playbook, not a test)
+
+- UaExpert and Kepware binaries are closed-source Windows GUIs; they don't
+  ship headless CLIs for the browse/connect/subscribe flows.
+- The OPC Foundation reference SDK *can* drive every scenario, but our own
+  `Driver.OpcUaClient` tests already cover that client's behaviour; Block B
+  adds value specifically because these two clients have independent
+  redundancy implementations we don't control.
+- For the sub-set of scenarios that *can* be automated — the self-loopback
+  case where our own `otopcua-cli` drives Primary + Backup — the existing
+  `tests/Server/ZB.MOM.WW.OtOpcUa.Server.Tests/RedundancyStatePublisherTests` +
+  `ServiceLevelCalculatorTests` (unit) + `ClusterTopologyLoaderTests`
+  (integration) already cover the math + data path. The wire-level assertion
+  that the values actually land on the right OPC UA nodes is covered by
+  `ServerRedundancyNodeWriterTests`.

docs/v2/test-data-sources.md

@@ -191,7 +191,7 @@ Modbus has no native String, DateTime, or Int64 — those rows are skipped on th
 
 ### CI fixture (task #180)
 
-The integration harness at `tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/` is Docker-only — `ab_server` is a source-only tool under libplctag's `src/tools/ab_server/`, and the fixture's multi-stage `Docker/Dockerfile` is the only supported reproducible build path.
+The integration harness at `tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/` is Docker-only — `ab_server` is a source-only tool under libplctag's `src/tools/ab_server/`, and the fixture's multi-stage `Docker/Dockerfile` is the only supported reproducible build path.
 
 - **`AbServerFixture(AbServerProfile)`** — thin TCP probe against `127.0.0.1:44818` (or `AB_SERVER_ENDPOINT` override). Does not spawn the simulator; the operator brings up the compose service for whichever family the test class targets (`controllogix` / `compactlogix` / `micro800` / `guardlogix`).
 - **`KnownProfiles.{ControlLogix, CompactLogix, Micro800, GuardLogix}`** — thin `(Family, ComposeProfile, Notes)` records. The compose file (`Docker/docker-compose.yml`) is the canonical source of truth for which tags each family seeds + which `--plc` mode the simulator boots in. `Micro800` uses the dedicated `--plc=Micro800` mode; `GuardLogix` uses `ControlLogix` emulation because ab_server has no safety subsystem (the `_S`-suffixed seed tag triggers driver-side ViewOnly classification only).
@@ -205,7 +205,7 @@ The integration harness at `tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTest
 - name: Start ab_server Docker container
   shell: pwsh
   run: |
-    docker compose -f tests/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Docker/docker-compose.yml `
+    docker compose -f tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/Docker/docker-compose.yml `
       --profile controllogix up -d --build
     # Wait for :44818 to accept connections (compose healthcheck-equivalent)
     for ($i = 0; $i -lt 30; $i++) {

docs/v2/v2-release-readiness.md

@@ -1,7 +1,7 @@
 # v2 Release Readiness
 
-> **Last updated**: 2026-04-19 (all three release blockers CLOSED — Phase 6.3 Streams A/C core shipped)
-> **Status**: **RELEASE-READY (code-path)** for v2 GA — all three code-path release blockers are closed. Remaining work is manual (client interop matrix, deployment checklist signoff, OPC UA CTT pass) + hardening follow-ups; see exit-criteria checklist below.
+> **Last updated**: 2026-04-24 (Phase 5 driver complement closed — AB CIP, AB Legacy, TwinCAT, FOCAS all shipped; FOCAS Tier-C retired for a pure-managed in-process client)
+> **Status**: **RELEASE-READY (code-path)** for v2 GA. All three original code-path release blockers remain closed. Phase 5 is now complete. Remaining work is manual (live-hardware validations, client interop matrix, deployment checklist signoff, OPC UA CTT pass) + hardening follow-ups; see exit-criteria checklist below.
 
 This doc is the single view of where v2 stands against its release criteria. Update it whenever a deferred follow-up closes or a new release blocker is discovered.
 
@@ -14,67 +14,78 @@ This doc is the single view of where v2 stands against its release criteria. Upd
 | Phase 2 — Galaxy driver split (Proxy/Host/Shared) | ✓ | Shipped |
 | Phase 3 — OPC UA server + LDAP + security profiles | ✓ | Shipped |
 | Phase 4 — Redundancy scaffold (entities + endpoints) | ✓ | Shipped (runtime closes in 6.3) |
-| Phase 5 — Drivers | ⚠ partial | Galaxy / Modbus / S7 / OpcUaClient shipped; AB CIP / AB Legacy / TwinCAT / FOCAS deferred (task #120) |
-| Phase 6.1 — Resilience & Observability | ✓ | **SHIPPED** (PRs #78–83) |
-| Phase 6.2 — Authorization runtime | ◐ core | **SHIPPED (core)** (PRs #84–88); dispatch wiring + Admin UI deferred |
-| Phase 6.3 — Redundancy runtime | ◐ core | **SHIPPED (core)** (PRs #89–90); coordinator + UA-node wiring + Admin UI + interop deferred |
-| Phase 6.4 — Admin UI completion | ◐ data layer | **SHIPPED (data layer)** (PRs #91–92); Blazor UI + OPC 40010 address-space wiring deferred |
+| Phase 5 — Drivers | ✓ | **Shipped** — Galaxy, Modbus (+ DL205/S7/MELSEC profiles), S7 native, OPC UA Client, AB CIP, AB Legacy, TwinCAT ADS, FOCAS (managed wire client) |
+| Phase 6.1 — Resilience & Observability | ✓ | Shipped (PRs #78–83) |
+| Phase 6.2 — Authorization runtime | ◐ core | Core shipped (PRs #84–88, #94 dispatch wiring); finer-grained Browse/Subscribe/Alarm/Call gating + 3-user interop matrix deferred |
+| Phase 6.3 — Redundancy runtime | ◐ core | Core shipped (PRs #89–90, #98–99); peer-probe HostedServices, OPC UA variable-node binding, `sp_PublishGeneration` lease wrap, client interop matrix deferred |
+| Phase 6.4 — Admin UI completion | ◐ data layer + Identification | Data layer + OPC 40010 Identification folder shipped (PRs #91–92, Identification audit close-out 2026-04-23); Blazor UI pieces deferred |
 
-**Aggregate test counts:** 906 baseline (pre-Phase-6) → **1159 passing** across Phase 6. One pre-existing Client.CLI `SubscribeCommandTests.Execute_PrintsSubscriptionMessage` flake tracked separately.
+**Driver integration-test counts** (end-to-end against live or simulated targets): Modbus 26, FOCAS 9, AbCip 7, OpcUaClient 3, S7 3, AbLegacy 2, TwinCAT 2. Plus Galaxy's separate cross-FX parity/stability suite.
+
+**Aggregate test counts** (2026-04-19 baseline): 1159 passing across the solution. One pre-existing Client.CLI `SubscribeCommandTests.Execute_PrintsSubscriptionMessage` flake tracked separately. Rerun `dotnet test ZB.MOM.WW.OtOpcUa.slnx` after the FOCAS migration commits land to refresh the number.
 
 ## Release blockers (must close before v2 GA)
 
-Ordered by severity + impact on production fitness.
+All code-path release blockers are closed. The remaining items are live-hardware / manual validations listed under exit criteria.
 
 ### ~~Security — Phase 6.2 dispatch wiring~~ (task #143 — **CLOSED** 2026-04-19, PR #94)
 
-**Closed**. `AuthorizationGate` + `NodeScopeResolver` now thread through `OpcUaApplicationHost → OtOpcUaServer → DriverNodeManager`. `OnReadValue` + `OnWriteValue` + all four HistoryRead paths call `gate.IsAllowed(identity, operation, scope)` before the invoker. Production deployments activate enforcement by constructing `OpcUaApplicationHost` with an `AuthorizationGate(StrictMode: true)` + populating the `NodeAcl` table.
+**Closed**. `AuthorizationGate` + `NodeScopeResolver` thread through `OpcUaApplicationHost → OtOpcUaServer → DriverNodeManager`. `OnReadValue` + `OnWriteValue` + all four HistoryRead paths call `gate.IsAllowed(identity, operation, scope)` before the invoker. Production deployments activate enforcement by constructing `OpcUaApplicationHost` with an `AuthorizationGate(StrictMode: true)` + populating the `NodeAcl` table.
 
-Additional Stream C surfaces (not release-blocking, hardening only):
+Remaining Stream C surfaces (hardening, not release-blocking):
 
-- Browse + TranslateBrowsePathsToNodeIds gating with ancestor-visibility logic per `acl-design.md` §Browse.
-- CreateMonitoredItems + TransferSubscriptions gating with per-item `(AuthGenerationId, MembershipVersion)` stamp so revoked grants surface `BadUserAccessDenied` within one publish cycle (decision #153).
-- Alarm Acknowledge / Confirm / Shelve gating.
-- Call (method invocation) gating.
-- Finer-grained scope resolution — current `NodeScopeResolver` returns a flat cluster-level scope. Joining against the live Configuration DB to populate UnsArea / UnsLine / Equipment path is tracked as Stream C.12.
+- ~~Browse + TranslateBrowsePathsToNodeIds gating with ancestor-visibility logic per `acl-design.md` §Browse.~~ **Partial, 2026-04-24.** `DriverNodeManager.Browse` override post-filters the `ReferenceDescription` list via a new `FilterBrowseReferences` helper — denied nodes disappear silently per OPC UA convention. Ancestor-visibility implication (Read-grant at `Line/Tag` implying Browse on `Line`) still to ship; needs a subtree-has-any-grant query on the trie evaluator. `TranslateBrowsePathsToNodeIds` surface not yet wired.
+- ~~CreateMonitoredItems + TransferSubscriptions gating with per-item `(AuthGenerationId, MembershipVersion)` stamp so revoked grants surface `BadUserAccessDenied` within one publish cycle (decision #153).~~ **Partial, 2026-04-24.** `DriverNodeManager.CreateMonitoredItems` override pre-gates each request and pre-populates `BadUserAccessDenied` into the errors slot for denied items (the base stack honours pre-set errors and skips those items). Decision #153's per-item `(AuthGenerationId, MembershipVersion)` stamp for detecting mid-subscription revocation is still to ship — needs subscription-layer plumbing. TransferSubscriptions not yet wired (same pattern).
+- ~~Alarm Acknowledge / Confirm / Shelve gating.~~ **Partial, 2026-04-24.** Acknowledge + Confirm map to dedicated `OpcUaOperation.AlarmAcknowledge` / `AlarmConfirm` via `MapCallOperation`; Shelve falls through to generic `OpcUaOperation.Call` (needs per-instance method NodeId resolution to distinguish — follow-up).
+- ~~Call (method invocation) gating.~~ **Closed 2026-04-24.** `DriverNodeManager.Call` override pre-gates each `CallMethodRequest` via `GateCallMethodRequests`. Denied calls return `BadUserAccessDenied` without running the method. Alarm methods map to alarm-specific operation kinds; everything else gates as generic `Call`.
+- ~~Finer-grained scope resolution — current `NodeScopeResolver` returns a flat cluster-level scope. Joining against the live Configuration DB to populate UnsArea / UnsLine / Equipment path is tracked as Stream C.12.~~ **Closed 2026-04-24.** `AuthorizationBootstrap` now loads `NodeAcl` rows for the current generation into a `PermissionTrieCache`, builds the gate, and merges every registered driver's `EquipmentNamespaceContent` into a full-path `NodeScopeResolver` index. `OpcUaServerService` calls the bootstrap after the equipment registry is populated, before `OpcUaApplicationHost.StartAsync`. Disabled by default — operators flip `Node:Authorization:Enabled=true` to enforce, `StrictMode=true` to reject anonymous/no-groups identities.
 - 3-user integration matrix covering every operation × allow/deny.
 
-These are additional hardening — the three highest-value surfaces (Read / Write / HistoryRead) are now gated, which covers the base-security gap for v2 GA.
-
 ### ~~Config fallback — Phase 6.1 Stream D wiring~~ (task #136 — **CLOSED** 2026-04-19, PR #96)
 
-**Closed**. `SealedBootstrap` consumes `ResilientConfigReader` + `GenerationSealedCache` + `StaleConfigFlag` end-to-end: bootstrap calls go through the timeout → retry → fallback-to-sealed pipeline; every central-DB success writes a fresh sealed snapshot so the next cache-miss has a known-good fallback; `StaleConfigFlag.IsStale` is now consumed by `HealthEndpointsHost.usingStaleConfig` so `/healthz` body reports reality.
+**Closed**. `SealedBootstrap` consumes `ResilientConfigReader` + `GenerationSealedCache` + `StaleConfigFlag` end-to-end; `/healthz` surfaces the stale flag.
 
-Production activation: Program.cs switches `NodeBootstrap → SealedBootstrap` + constructs `OpcUaApplicationHost` with the `StaleConfigFlag` as an optional ctor parameter.
-
-Remaining follow-ups (hardening, not release-blocking):
+Remaining follow-ups (hardening):
 
 - A `HostedService` that polls `sp_GetCurrentGenerationForCluster` periodically so peer-published generations land in this node's cache without a restart.
-- Richer snapshot payload via `sp_GetGenerationContent` so fallback can serve the full generation content (DriverInstance enumeration, ACL rows, etc.) from the sealed cache alone.
+- Richer snapshot payload via `sp_GetGenerationContent` so fallback can serve full generation content (DriverInstance enumeration, ACL rows, etc.) from the sealed cache alone.
 
 ### ~~Redundancy — Phase 6.3 Streams A/C core~~ (tasks #145 + #147 — **CLOSED** 2026-04-19, PRs #98–99)
 
-**Closed**. The runtime orchestration layer now exists end-to-end:
-
-- `RedundancyCoordinator` reads `ClusterNode` + peer list at startup (Stream A shipped in PR #98). Invariants enforced: 1-2 nodes (decision #83), unique ApplicationUri (#86), ≤1 Primary in Warm/Hot (#84). Startup fails fast on violation; runtime refresh logs + flips `IsTopologyValid=false` so the calculator falls to band 2 without tearing down.
-- `RedundancyStatePublisher` orchestrates topology + apply lease + recovery state + peer reachability through `ServiceLevelCalculator` + emits `OnStateChanged` / `OnServerUriArrayChanged` edge-triggered events (Stream C core shipped in PR #99). The OPC UA `ServiceLevel` Byte variable + `ServerUriArray` String[] variable subscribe to these events.
+**Closed**. `RedundancyCoordinator` + `RedundancyStatePublisher` + `PeerReachabilityTracker` orchestrate topology + apply lease + recovery state + peer reachability through `ServiceLevelCalculator` + emit `OnStateChanged` / `OnServerUriArrayChanged` edge-triggered events.
 
 Remaining Phase 6.3 surfaces (hardening, not release-blocking):
 
-- `PeerHttpProbeLoop` + `PeerUaProbeLoop` HostedServices that poll the peer + write to `PeerReachabilityTracker` on each tick. Without these the publisher sees `PeerReachability.Unknown` for every peer → Isolated-Primary band (230) even when the peer is up. Safe default (retains authority) but not the full non-transparent-redundancy UX.
-- OPC UA variable-node wiring layer: bind the `ServiceLevel` Byte node + `ServerUriArray` String[] node to the publisher's events via `BaseDataVariable.OnReadValue` / direct value push. Scoped follow-up on the Opc.Ua.Server stack integration.
-- `sp_PublishGeneration` wraps its apply in `await using var lease = coordinator.BeginApplyLease(...)` so the `PrimaryMidApply` band (200) fires during actual publishes (task #148 part 2).
-- Client interop matrix validation — Ignition / Kepware / Aveva OI Gateway (Stream F, task #150). Manual + doc-only work; doesn't block code ship.
+- ~~`PeerHttpProbeLoop` + `PeerUaProbeLoop` HostedServices populating `PeerReachabilityTracker` on each tick.~~ **Closed 2026-04-24.** Two-layer probe model shipped: HTTP probe at 2 s / 1 s timeout against `/healthz`; OPC UA probe at 10 s / 5 s timeout via `DiscoveryClient.GetEndpoints`, short-circuiting when HTTP reports the peer unhealthy. Registered on the Server as `AddHostedService<PeerHttpProbeLoop>` + `AddHostedService<PeerUaProbeLoop>`. Publisher now sees accurate `PeerReachability` per peer instead of degrading to `Unknown` → Isolated-Primary band (230).
+- OPC UA variable-node wiring: bind `ServiceLevel` Byte + `ServerUriArray` String[] to the publisher's events via `BaseDataVariable.OnReadValue` / direct value push.
+- ~~`sp_PublishGeneration` wraps its apply in `await using var lease = coordinator.BeginApplyLease(...)` so the `PrimaryMidApply` band (200) fires during actual publishes (task #148 part 2).~~ **Closed 2026-04-24.** The apply loop now lives in `GenerationRefreshHostedService` — polls `sp_GetCurrentGenerationForCluster` every 5s, opens a lease when a new generation is detected, calls `RedundancyCoordinator.RefreshAsync` inside the `await using`, releases the lease on all exit paths. Replaces the previous "topology never refreshes without a process restart" behaviour.
+- Client interop matrix — Ignition / Kepware / Aveva OI Gateway (Stream F, task #150). Manual + doc-only.
 
-### Remaining drivers (task #120)
+### ~~Phase 5 driver complement~~ (task #120 — **CLOSED** 2026-04-24)
 
-AB CIP, AB Legacy, TwinCAT ADS, FOCAS drivers are planned but unshipped. Decision pending on whether these are release-blocking for v2 GA or can slip to a v2.1 follow-up.
+**Closed**. All four deferred drivers shipped:
+
+- **AB CIP** (PRs #202–222) — `Driver.AbCip`, `Driver.AbCip.IntegrationTests` (7 tests), AB CIP Cli. Live-boot verified against a ControlLogix rig.
+- **AB Legacy** (PRs #202, #223) — `Driver.AbLegacy`, `Driver.AbLegacy.IntegrationTests` (2 tests), AB Legacy Cli. PCCC cip-path workaround for SLC/MicroLogix.
+- **TwinCAT ADS** (PRs #205, this branch `task-galaxy-e2e`) — `Driver.TwinCAT`, `Driver.TwinCAT.IntegrationTests` (2 tests), TwinCAT Cli. TCBSD/ESXi fixture for e2e since local Hyper-V / TwinCAT RTIME are mutually exclusive on the dev box.
+- **FOCAS** (PRs #173, #199 + this session's migration) — `Driver.FOCAS` with an **in-process managed `FocasWireClient`** that speaks FOCAS/2 over TCP directly. Tier-C isolation retired — `Driver.FOCAS.Host` + `Driver.FOCAS.Shared` + `FwlibNative` P/Invoke + shim DLL + NSSM service all deleted. `Driver.FOCAS.IntegrationTests` covers 9 scenarios (fixed tree identity/axes/program/timers/spindle + user-authored PARAM/MACRO/PMC reads, Browse, Subscribe, IAlarmSource raise/clear, Probe transitions).
+
+Decision recorded: FOCAS is **read-only** against the CNC by design — writes return `BadNotWritable`. See `docs/drivers/FOCAS.md` + `docs/drivers/FOCAS-Test-Fixture.md` for the deployment + coverage map.
 
 ## Nice-to-haves (not release-blocking)
 
 - **Admin UI** — Phase 6.1 Stream E.2/E.3 (`/hosts` column refresh), Phase 6.2 Stream D (`RoleGrantsTab` + `AclsTab` Probe), Phase 6.3 Stream E (`RedundancyTab`), Phase 6.4 Streams A/B UI pieces, Stream C DiffViewer, Stream D `IdentificationFields.razor`. Tasks #134, #144, #149, #153, #155, #156, #157.
 - **Background services** — Phase 6.1 Stream B.4 `ScheduledRecycleScheduler` HostedService (task #137), Phase 6.1 Stream A analyzer (task #135 — Roslyn analyzer asserting every capability surface routes through `CapabilityInvoker`).
-- **Multi-host dispatch** — Phase 6.1 Stream A follow-up (task #135). Currently every driver gets a single pipeline keyed on `driver.DriverInstanceId`; multi-host drivers (Modbus with N PLCs) need per-PLC host resolution so failing PLCs trip per-PLC breakers without poisoning siblings. Decision #144 requires this but we haven't wired it yet.
+- **Multi-host dispatch** — Phase 6.1 Stream A follow-up (task #135). Every driver currently gets a single pipeline keyed on `driver.DriverInstanceId`; multi-host drivers (Modbus with N PLCs) need per-PLC host resolution so failing PLCs trip per-PLC breakers without poisoning siblings. Decision #144 requires this but not wired.
+- **Phase 7** — scripting + alarming + historian sink (plan drafted 2026-04-20 in `docs/v2/implementation/phase-7-*.md`). Out of scope for v2 GA.
+
+## Live-hardware validations (task #54 + task family)
+
+The code ships; these tasks remain open as lab/field verification:
+
+- **#54** — FOCAS live-CNC wire-level smoke against a real FANUC control. The mock's wire responder is PDU-verified against `fwlibe64.dll` upstream but OtOpcUa's managed client has not been pointed at a production CNC.
+- **AB CIP live-boot** — already passed on a ControlLogix rig (PR #222). Continue to run ahead of each release.
+- **TwinCAT wire-live** — TCBSD/ESXi fixture covers the common path; production PLC verification remains lab-gated.
 
 ## Running the release-readiness check
 
@@ -82,7 +93,12 @@ AB CIP, AB Legacy, TwinCAT ADS, FOCAS drivers are planned but unshipped. Decisio
 pwsh ./scripts/compliance/phase-6-all.ps1
 ```
 
-This meta-runner invokes each `phase-6-N-compliance.ps1` script in sequence and reports an aggregate PASS/FAIL. It is the single-command verification that what we claim is shipped still compiles + tests pass + the plan-level invariants are still satisfied.
+This meta-runner invokes each `phase-6-N-compliance.ps1` script in sequence and reports an aggregate PASS/FAIL:
+
+- `phase-6-1-compliance.ps1` — Resilience & Observability
+- `phase-6-2-compliance.ps1` — Authorization runtime
+- `phase-6-3-compliance.ps1` — Redundancy runtime
+- `phase-6-4-compliance.ps1` — Admin UI completion
 
 Exit 0 = every phase passes its compliance checks + no test-count regression.
 
@@ -92,18 +108,23 @@ v2 GA requires all of the following:
 
 - [ ] All four Phase 6.N compliance scripts exit 0.
 - [ ] `dotnet test ZB.MOM.WW.OtOpcUa.slnx` passes with ≤ 1 known-flake failure.
-- [ ] Release blockers listed above all closed (or consciously deferred to v2.1 with a written decision).
+- [x] Release blockers listed above all closed.
+- [x] Phase 5 driver complement shipped (Galaxy, Modbus, S7, OpcUaClient, AbCip, AbLegacy, TwinCAT, FOCAS).
 - [ ] Production deployment checklist (separate doc) signed off by Fleet Admin.
 - [ ] At least one end-to-end integration run against the live Galaxy on the dev box succeeds.
+- [ ] FOCAS live-CNC wire-level smoke (#54) runs clean against a real FANUC control.
 - [ ] OPC UA conformance test (CTT or UA Compliance Test Tool) passes against the live endpoint.
 - [ ] Non-transparent redundancy cutover validated with at least one production client (Ignition 8.3 recommended — see decision #85).
 
 ## Change log
 
-- **2026-04-19** — Release blocker #3 **closed** (PRs #98–99). Phase 6.3 Streams A + C core shipped: `ClusterTopologyLoader` + `RedundancyCoordinator` + `RedundancyStatePublisher` + `PeerReachabilityTracker`. Code-path release blockers all closed; remaining Phase 6.3 surfaces (peer-probe HostedServices, OPC UA variable-node binding, sp_PublishGeneration lease wrap, client interop matrix) are hardening follow-ups.
-- **2026-04-19** — Release blocker #2 **closed** (PR #96). `SealedBootstrap` consumes `ResilientConfigReader` + `GenerationSealedCache` + `StaleConfigFlag`; `/healthz` now surfaces the stale flag. Remaining follow-ups (periodic poller + richer snapshot payload) downgraded to hardening.
-- **2026-04-19** — Release blocker #1 **closed** (PR #94). `AuthorizationGate` wired into `DriverNodeManager` Read / Write / HistoryRead dispatch. Remaining Stream C surfaces (Browse / Subscribe / Alarm / Call + finer-grained scope resolution) downgraded to hardening follow-ups — no longer release-blocking.
-- **2026-04-19** — Phase 6.4 data layer merged (PRs #91–92). Phase 6 core complete. Capstone doc created.
+- **2026-04-24** — Phase 5 driver complement closed (task #120 CLOSED). AB CIP, AB Legacy, TwinCAT, FOCAS all shipped. FOCAS migration: retired the Tier-C split (`Driver.FOCAS.Host` + `Driver.FOCAS.Shared` + `FwlibNative` + shim DLL deleted) in favour of a pure-managed in-process `FocasWireClient` inlined into `Driver.FOCAS`; driver is now read-only against the CNC by design. Integration test matrix grew to cover Browse / Subscribe / IAlarmSource / Probe end-to-end.
+- **2026-04-23** — Phase 6.4 audit close-out. IdentificationFolderBuilder + OPC 40010 Identification folder verified against the shipped code.
+- **2026-04-20** — Phase 7 plan drafted (`phase-7-scripting-and-alarming.md`, `phase-7-e2e-smoke.md`). Out of scope for v2 GA.
+- **2026-04-19** — Release blocker #3 closed (PRs #98–99). Phase 6.3 Streams A + C core shipped: `ClusterTopologyLoader` + `RedundancyCoordinator` + `RedundancyStatePublisher` + `PeerReachabilityTracker`. Code-path release blockers all closed; remaining Phase 6.3 surfaces (peer-probe HostedServices, OPC UA variable-node binding, `sp_PublishGeneration` lease wrap, client interop matrix) are hardening follow-ups.
+- **2026-04-19** — Release blocker #2 closed (PR #96). `SealedBootstrap` consumes `ResilientConfigReader` + `GenerationSealedCache` + `StaleConfigFlag`; `/healthz` surfaces the stale flag. Remaining follow-ups (periodic poller + richer snapshot payload) downgraded to hardening.
+- **2026-04-19** — Release blocker #1 closed (PR #94). `AuthorizationGate` wired into `DriverNodeManager` Read / Write / HistoryRead dispatch. Remaining Stream C surfaces (Browse / Subscribe / Alarm / Call + finer-grained scope resolution) downgraded to hardening follow-ups — no longer release-blocking.
+- **2026-04-19** — Phase 6.4 data layer merged (PRs #91–92). Phase 6 core complete.
 - **2026-04-19** — Phase 6.3 core merged (PRs #89–90). `ServiceLevelCalculator` + `RecoveryStateManager` + `ApplyLeaseRegistry` land as pure logic; coordinator / UA-node wiring / Admin UI / interop deferred.
 - **2026-04-19** — Phase 6.2 core merged (PRs #84–88). `AuthorizationGate` + `TriePermissionEvaluator` + `LdapGroupRoleMapping` land; dispatch wiring + Admin UI deferred.
 - **2026-04-19** — Phase 6.1 shipped (PRs #78–83). Polly resilience + Tier A/B/C stability + health endpoints + LiteDB generation-sealed cache + Admin `/hosts` data layer all live.

docs/v3/twincat-backlog.md

@@ -0,0 +1,31 @@
+# TwinCAT driver — v3 backlog
+
+The v2 TwinCAT driver is considered solid: 28 integration tests (14 `[TwinCATFact]` +
+16-case `[TwinCATTheory]`) running live against the TCBSD fixture, 110 unit tests,
+three latent driver bugs shaken out (notification cycle units, `STRING(N)` mapper,
+bit-indexed BOOL path). Further work is deferred.
+
+Archived from `docs/drivers/TwinCAT-Test-Fixture.md` § Follow-up candidates.
+
+## Deferred items
+
+1. **TC2 coverage** — spin up a TC2 runtime (Windows CE IPC or legacy XAR)
+   and run the same suite; any delta surfaces. Blocked on hardware.
+
+2. **Notification coalescing under load** — run the subscribe test while
+   the PLC cycle is saturated (bump `lineSim` complexity, watch for
+   dropped notifications). Doable on current rig; deferred as lower
+   priority than v3 feature work.
+
+3. **Multi-hop AMS route** — add a test behind an IPC gateway with a
+   chained route entry. Blocked on hardware (gateway IPC).
+
+4. **License-rotation automation** — XAR's 7-day trial expires on
+   schedule. Either automate `TcActivate.exe /reactivate` via a scheduled
+   task on the VM (not officially supported; reportedly works for some
+   TC3 builds), or buy a paid runtime license (~$1k one-time per runtime
+   per CPU) to kill the rotation. Ops item, not code.
+
+5. **Lab rig** — cheapest IPC (CX7000 / CX9020) on a dedicated network;
+   the only route that covers TC2 + real EtherCAT I/O timing + cycle
+   jitter under CPU load. Blocked on hardware + budget.

gr/CLAUDE.md

@@ -1,51 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Purpose
-
-The goal of this project is to identify and develop SQL queries that extract the Galaxy object hierarchy from the **System Platform Galaxy Repository** database in order to build a tag structure for an OPC UA server.
-
-Specifically, we need to:
-- Build the hierarchy of **areas** and **automation objects** (using contained names for human-readable browsing)
-- Translate contained names to **tag_names** for read/write operations (e.g., `TestMachine_001.DelmiaReceiver` in the hierarchy becomes `DelmiaReceiver_001` when addressing tag values)
-
-See `layout.md` for details on the hierarchy vs tag name relationship.
-
-## Key Files
-
-### Documentation
-- `connectioninfo.md` — Database connection details and sqlcmd usage
-- `layout.md` — Galaxy object hierarchy, contained_name vs tag_name translation, and target OPC UA structure
-- `build_layout_plan.md` — Step-by-step plan for extracting hierarchy, attaching attributes, and monitoring for changes
-- `data_type_mapping.md` — Galaxy mx_data_type to OPC UA DataType mapping, including array handling (ValueRank, ArrayDimensions)
-
-### Queries
-- `queries/hierarchy.sql` — Deployed object hierarchy with browse names and parent relationships
-- `queries/attributes.sql` — User-defined (dynamic) attributes with data types and array dimensions
-- `queries/attributes_extended.sql` — All attributes (system + user-defined) with data types and array dimensions
-- `queries/change_detection.sql` — Poll `galaxy.time_of_last_deploy` to detect deployment changes
-
-### Schema Reference
-- `schema.md` — Full schema reference for all tables and views in the ZB database
-- `ddl/tables/` — Individual CREATE TABLE definitions
-- `ddl/views/` — Individual view definitions
-
-## Working with the Galaxy Repository Database
-
-The Galaxy Repository is the backing SQL Server database for Wonderware/AVEVA System Platform (Galaxy: ZB, localhost, Windows Auth). Key tables used by the queries:
-
-- **gobject** — Object instances, hierarchy (contained_by_gobject_id, area_gobject_id), deployment state (deployed_package_id)
-- **template_definition** — Object type categories (category_id distinguishes areas, engines, user-defined objects, etc.)
-- **dynamic_attribute** — User-defined attributes on templates, inherited by instances via derived_from_gobject_id chain
-- **attribute_definition** — System/primitive attributes
-- **primitive_instance** — Links objects to their primitive components and attribute definitions
-- **galaxy** — Single-row table with time_of_last_deploy for change detection
-
-Use `sqlcmd -S localhost -d ZB -E -Q "..."` to run queries. See `connectioninfo.md` for details.
-
-## Conventions
-
-- Store all connection parameters in `connectioninfo.md`, not scattered across scripts.
-- Keep SQL query examples and extraction notes as Markdown files in this repo.
-- If scripts are added (Python, PowerShell, etc.), document their usage and dependencies alongside them.

gr/build_layout_plan.md

@@ -1,84 +0,0 @@
-# OPC UA Server Layout — Build Plan
-
-## Overview
-
-Extract the Galaxy object hierarchy and tag definitions from the ZB (Galaxy Repository) database to construct an OPC UA server address space. The root node is hardcoded as **ZB**.
-
-## Step 1: Build the Browse Tree
-
-Run `queries/hierarchy.sql` to get all deployed automation objects and their parent-child relationships.
-
-For each row returned:
-- `parent_gobject_id = 0` → child of the root ZB node
-- `is_area = 1` → create as an OPC UA folder node (organizational)
-- `is_area = 0` → create as an OPC UA object node (container for tags)
-- Use `browse_name` as the OPC UA BrowseName/DisplayName
-- Store `gobject_id` and `tag_name` for attribute lookup and tag reference translation
-
-Build the tree by matching each row's `parent_gobject_id` to another row's `gobject_id`. The result is:
-
-```
-ZB (root, hardcoded)
-└── DEV (folder, is_area=1)
-    ├── DevAppEngine (object)
-    ├── DevPlatform (object)
-    └── TestArea (folder, is_area=1)
-        ├── DevTestObject (object)
-        └── TestMachine_001 (object)
-            ├── DelmiaReceiver (object, browse_name from contained_name)
-            └── MESReceiver (object, browse_name from contained_name)
-```
-
-## Step 2: Attach Attributes as Tag Nodes
-
-Run `queries/attributes.sql` to get all user-defined attributes for deployed objects.
-
-For each attribute row:
-- Match to the browse tree via `gobject_id`
-- Create an OPC UA variable node under the matching object node
-- Use `attribute_name` as the BrowseName/DisplayName
-- Use `full_tag_reference` as the runtime tag path for read/write operations
-- Map `mx_data_type` to OPC UA built-in types:
-
-| mx_data_type | Description | OPC UA Type |
-|--------------|-------------|-------------|
-| 1 | Boolean | Boolean |
-| 2 | Integer | Int32 |
-| 3 | Float | Float |
-| 4 | Double | Double |
-| 5 | String | String |
-| 6 | Time | DateTime |
-| 7 | ElapsedTime | Double (seconds) or Duration |
-
-- If `is_array = 1`, create the variable as an array with rank 1 and dimension from `array_dimension`
-
-## Step 3: Monitor for Changes
-
-Poll `queries/change_detection.sql` on a regular interval (e.g., every 30 seconds).
-
-```
-SELECT time_of_last_deploy FROM galaxy;
-```
-
-Compare the returned `time_of_last_deploy` to the last known value:
-- **No change** → do nothing
-- **Changed** → a deployment occurred; re-run Steps 1 and 2 to rebuild the address space
-
-This handles objects being deployed, undeployed, added, or removed.
-
-## Connection Details
-
-See `connectioninfo.md` for database connection parameters and sqlcmd usage.
-
-```
-sqlcmd -S localhost -d ZB -E -Q "YOUR QUERY HERE"
-```
-
-## Query Files
-
-| File | Purpose |
-|------|---------|
-| `queries/hierarchy.sql` | Deployed object hierarchy with browse names and parent relationships |
-| `queries/attributes.sql` | User-defined attributes with data types and array dimensions |
-| `queries/attributes_extended.sql` | All attributes (system + user-defined) with data types and array dimensions |
-| `queries/change_detection.sql` | Poll galaxy.time_of_last_deploy for deployment changes |

gr/connectioninfo.md

@@ -1,26 +0,0 @@
-# Galaxy Repository — Connection Information
-
-## Database Connection
-
-| Parameter       | Value          |
-|-----------------|----------------|
-| Server          | localhost (default instance) |
-| Database Name   | ZB             |
-| Port            | 1433 (default) |
-| Authentication  | Windows Auth   |
-| Username        | dohertj2       |
-
-## sqlcmd Usage
-
-```
-sqlcmd -S localhost -d ZB -E -Q "YOUR QUERY HERE"
-```
-
-- `-S localhost` — default instance
-- `-d ZB` — database name
-- `-E` — Windows Authentication (dohertj2)
-
-## Notes
-
-- The Galaxy Repository is a SQL Server database created and managed by AVEVA System Platform (formerly Wonderware).
-- Typically accessed via SQL Server Management Studio (SSMS), `sqlcmd`, or programmatically via ODBC/ADO.NET/pyodbc.

gr/data_type_mapping.md

@@ -1,96 +0,0 @@
-# Data Type Mapping — Galaxy Repository to OPC UA
-
-## Scalar Type Mapping
-
-| mx_data_type | Galaxy Description | OPC UA DataType | OPC UA NodeId | Notes |
-|--------------|--------------------|-----------------|---------------|-------|
-| 1 | Boolean | Boolean | i=1 | Direct mapping |
-| 2 | Integer (Int32) | Int32 | i=6 | Galaxy integers are 32-bit signed |
-| 3 | Float (Single) | Float | i=10 | 32-bit IEEE 754 |
-| 4 | Double | Double | i=11 | 64-bit IEEE 754 |
-| 5 | String | String | i=12 | Unicode string |
-| 6 | Time (DateTime) | DateTime | i=13 | Galaxy DateTime to OPC UA DateTime (100ns ticks since 1601-01-01) |
-| 7 | ElapsedTime (TimeSpan) | Double | i=11 | No native OPC UA TimeSpan; map to Double representing seconds (or use Duration type alias, NodeId i=290) |
-| 8 | (reference) | String | i=12 | Object reference; expose as string representation |
-| 13 | (enumeration) | Int32 | i=6 | Enum backing value is integer |
-| 14 | (custom) | String | i=12 | Fallback to string |
-| 15 | InternationalizedString | LocalizedText | i=21 | OPC UA LocalizedText supports locale + text pairs |
-| 16 | (custom) | String | i=12 | Fallback to string |
-
-## OPC UA Built-in Type Reference
-
-For context, the full set of OPC UA built-in types and their NodeIds:
-
-| NodeId | Type | Description |
-|--------|------|-------------|
-| i=1 | Boolean | True/false |
-| i=2 | SByte | Signed 8-bit integer |
-| i=3 | Byte | Unsigned 8-bit integer |
-| i=4 | Int16 | Signed 16-bit integer |
-| i=5 | UInt16 | Unsigned 16-bit integer |
-| i=6 | Int32 | Signed 32-bit integer |
-| i=7 | UInt32 | Unsigned 32-bit integer |
-| i=8 | Int64 | Signed 64-bit integer |
-| i=9 | UInt64 | Unsigned 64-bit integer |
-| i=10 | Float | 32-bit IEEE 754 |
-| i=11 | Double | 64-bit IEEE 754 |
-| i=12 | String | Unicode string |
-| i=13 | DateTime | Date and time (100ns ticks since 1601-01-01) |
-| i=14 | Guid | 128-bit globally unique identifier |
-| i=15 | ByteString | Sequence of bytes |
-| i=21 | LocalizedText | Locale + text pair |
-
-## Array Handling
-
-When `is_array = 1` in the attributes query, the OPC UA variable node must be configured as an array.
-
-### ValueRank
-
-Set on the OPC UA variable node to indicate scalar vs array:
-
-| is_array | ValueRank | Meaning |
-|----------|-----------|---------|
-| 0 | -1 (Scalar) | Value is not an array |
-| 1 | 1 (OneDimension) | Value is a one-dimensional array |
-
-### ArrayDimensions
-
-When `ValueRank = 1`, set the `ArrayDimensions` attribute to a single-element array containing the `array_dimension` value from the attributes query.
-
-Example for `MESReceiver_001.MoveInPartNumbers` (`is_array=1`, `array_dimension=50`):
-- DataType: String (i=12)
-- ValueRank: 1
-- ArrayDimensions: [50]
-
-Example for `TestMachine_001.MachineID` (`is_array=0`):
-- DataType: String (i=12)
-- ValueRank: -1
-- ArrayDimensions: (not set)
-
-## Security Classification
-
-Galaxy attributes have a `security_classification` column that controls the access level required for writes. The attributes query returns this value for each attribute.
-
-| security_classification | Galaxy Level | OPC UA Access | Description |
-|-------------------------|--------------|---------------|-------------|
-| 0 | FreeAccess | ReadWrite | No security restrictions |
-| 1 | Operate | ReadWrite | Normal operating level (default) |
-| 2 | SecuredWrite | ReadOnly | Requires elevated write access |
-| 3 | VerifiedWrite | ReadOnly | Requires verified/confirmed write access |
-| 4 | Tune | ReadWrite | Tuning-level access |
-| 5 | Configure | ReadWrite | Configuration-level access |
-| 6 | ViewOnly | ReadOnly | Read-only, no writes permitted |
-
-Most attributes default to `Operate` (1). Higher values indicate more restrictive write access. `ViewOnly` (6) attributes should be exposed as read-only in OPC UA (`AccessLevel = CurrentRead` only, no `CurrentWrite`).
-
-## DateTime Conversion
-
-Galaxy `Time` (mx_data_type=6) stores DateTime values. OPC UA DateTime is defined as the number of 100-nanosecond intervals since January 1, 1601 (UTC). Ensure the conversion accounts for:
-- Timezone: Galaxy may store local time; OPC UA expects UTC
-- Epoch difference: adjust if Galaxy uses a different epoch (e.g., Unix epoch 1970-01-01)
-
-## ElapsedTime Handling
-
-Galaxy `ElapsedTime` (mx_data_type=7) represents a duration/timespan. OPC UA has no native TimeSpan type. Options:
-- **Double (i=11)**: Store as seconds (recommended for simplicity)
-- **Duration (i=290)**: OPC UA type alias for Double, semantically represents milliseconds — use if the OPC UA SDK supports it

gr/ddl/tables/ConversionQueue.sql

@@ -1,13 +0,0 @@
--- Table: ConversionQueue
-CREATE TABLE [ConversionQueue] (
-    [id] int NULL,
-    [Name] nvarchar(329) NULL,
-    [IsCheckedOut] bit NOT NULL,
-    [Status] bit NOT NULL DEFAULT ((0)),
-    [MetaData] nchar(256) NULL,
-    [OperationType] nchar(20) NOT NULL,
-    [timestamp_of_last_change] bigint NULL,
-    [change_type] int NULL
-);
-GO
-

gr/ddl/tables/CurrentSessionContainedName.sql

@@ -1,9 +0,0 @@
--- Table: CurrentSessionContainedName
-CREATE TABLE [CurrentSessionContainedName] (
-    [Uniqeid] int NOT NULL,
-    [obj_id] int NULL,
-    [containedname] nvarchar(32) NULL,
-    CONSTRAINT [PK_CurrentSessionContainedName] PRIMARY KEY ([Uniqeid])
-);
-GO
-

gr/ddl/tables/ImportTransaction.sql

@@ -1,7 +0,0 @@
--- Table: ImportTransaction
-CREATE TABLE [ImportTransaction] (
-    [ImportOperationId] nvarchar(329) NULL,
-    [Status] bit NOT NULL DEFAULT ((1))
-);
-GO
-

gr/ddl/tables/aa_sql_objects.sql

@@ -1,8 +0,0 @@
--- Table: aa_sql_objects
-CREATE TABLE [aa_sql_objects] (
-    [object_name] nvarchar(128) NOT NULL,
-    [object_type] nvarchar(10) NOT NULL,
-    CONSTRAINT [PK_aa_sql_objects] PRIMARY KEY ([object_name])
-);
-GO
-

gr/ddl/tables/affected_overview_symbols.sql

@@ -1,9 +0,0 @@
--- Table: affected_overview_symbols
-CREATE TABLE [affected_overview_symbols] (
-    [gobject_id] int NOT NULL,
-    [package_id] int NOT NULL,
-    [mx_primitive_id] smallint NOT NULL,
-    [visual_element_id] int NOT NULL
-);
-GO
-

gr/ddl/tables/alarm_message_defaults.sql

@@ -1,8 +0,0 @@
--- Table: alarm_message_defaults
-CREATE TABLE [alarm_message_defaults] (
-    [phrase_id] int NOT NULL,
-    [default_message] nvarchar(1024) NOT NULL,
-    CONSTRAINT [PK_alarm_message_defaults] PRIMARY KEY ([phrase_id])
-);
-GO
-

gr/ddl/tables/alarm_message_timestamps.sql

@@ -1,8 +0,0 @@
--- Table: alarm_message_timestamps
-CREATE TABLE [alarm_message_timestamps] (
-    [gobject_id] int NOT NULL,
-    [timestamp_of_populate] bigint NOT NULL DEFAULT ((0)),
-    CONSTRAINT [PK_alarm_message_timestamps] PRIMARY KEY ([gobject_id])
-);
-GO
-

gr/ddl/tables/alarm_message_translations.sql

@@ -1,12 +0,0 @@
--- Table: alarm_message_translations
-CREATE TABLE [alarm_message_translations] (
-    [phrase_id] int NOT NULL,
-    [locale_id] smallint NOT NULL,
-    [translated_message] nvarchar(1024) NOT NULL,
-    CONSTRAINT [PK_alarm_message_translations] PRIMARY KEY ([phrase_id], [locale_id], [phrase_id], [locale_id])
-);
-GO
-
-ALTER TABLE [alarm_message_translations] ADD FOREIGN KEY ([locale_id]) REFERENCES [supported_locales] ([locale_id]);
-GO
-

gr/ddl/tables/alarm_messages.sql

@@ -1,13 +0,0 @@
--- Table: alarm_messages
-CREATE TABLE [alarm_messages] (
-    [gobject_id] int NOT NULL,
-    [package_id] int NOT NULL,
-    [mx_primitive_id] smallint NOT NULL,
-    [phrase_id] int NOT NULL,
-    CONSTRAINT [PK_alarm_messages] PRIMARY KEY ([gobject_id], [package_id], [mx_primitive_id], [phrase_id], [gobject_id], [gobject_id], [mx_primitive_id], [package_id], [gobject_id], [mx_primitive_id], [package_id], [gobject_id], [mx_primitive_id], [package_id])
-);
-GO
-
-ALTER TABLE [alarm_messages] ADD FOREIGN KEY ([package_id]) REFERENCES [primitive_instance] ([package_id]);
-GO
-

gr/ddl/tables/attribute_definition.sql

@@ -1,24 +0,0 @@
--- Table: attribute_definition
-CREATE TABLE [attribute_definition] (
-    [attribute_definition_id] int NOT NULL,
-    [primitive_definition_id] int NOT NULL,
-    [attribute_name] nvarchar(329) NOT NULL,
-    [mx_attribute_id] smallint NOT NULL,
-    [has_config_set_handler] bit NOT NULL,
-    [mx_data_type] smallint NOT NULL,
-    [is_array] bit NOT NULL,
-    [security_classification] smallint NOT NULL,
-    [security_classification_needs_deployed] bit NOT NULL,
-    [mx_attribute_category] int NOT NULL,
-    [is_frequently_accessed] bit NOT NULL,
-    [is_locked] bit NOT NULL,
-    [is_locked_needs_deployed] bit NOT NULL,
-    [mx_value] text(2147483647) NOT NULL,
-    [mx_value_needs_deployed] bit NOT NULL,
-    CONSTRAINT [PK_attribute_definition] PRIMARY KEY ([primitive_definition_id], [mx_attribute_id], [primitive_definition_id])
-);
-GO
-
-ALTER TABLE [attribute_definition] ADD FOREIGN KEY ([primitive_definition_id]) REFERENCES [primitive_definition] ([primitive_definition_id]);
-GO
-

gr/ddl/tables/attribute_reference.sql

@@ -1,26 +0,0 @@
--- Table: attribute_reference
-CREATE TABLE [attribute_reference] (
-    [gobject_id] int NOT NULL,
-    [package_id] int NOT NULL,
-    [referring_mx_primitive_id] smallint NOT NULL DEFAULT ((0)),
-    [referring_mx_attribute_id] smallint NOT NULL DEFAULT ((0)),
-    [element_index] smallint NOT NULL DEFAULT ((0)),
-    [resolved_gobject_id] int NOT NULL DEFAULT ((0)),
-    [reference_string] nvarchar(700) NOT NULL DEFAULT (''),
-    [context_string] nvarchar(329) NOT NULL DEFAULT (''),
-    [object_signature] int NOT NULL DEFAULT ((0)),
-    [resolved_mx_primitive_id] smallint NOT NULL DEFAULT ((0)),
-    [resolved_mx_attribute_id] smallint NOT NULL DEFAULT ((0)),
-    [resolved_mx_property_id] smallint NOT NULL DEFAULT ((0)),
-    [attribute_signature] int NOT NULL DEFAULT ((0)),
-    [lock_type] int NOT NULL DEFAULT ((0)),
-    [is_valid] bit NOT NULL DEFAULT ((0)),
-    [attr_res_status] int NOT NULL DEFAULT ((0)),
-    [attribute_index] smallint NULL DEFAULT ((-1)),
-    CONSTRAINT [PK_attribute_reference] PRIMARY KEY ([gobject_id], [package_id], [referring_mx_primitive_id], [referring_mx_attribute_id], [element_index], [gobject_id], [package_id], [referring_mx_primitive_id], [gobject_id], [package_id], [referring_mx_primitive_id], [gobject_id], [package_id], [referring_mx_primitive_id])
-);
-GO
-
-ALTER TABLE [attribute_reference] ADD FOREIGN KEY ([referring_mx_primitive_id]) REFERENCES [primitive_instance] ([package_id]);
-GO
-

gr/ddl/tables/attributes_translation_table.sql

@@ -1,11 +0,0 @@
--- Table: attributes_translation_table
-CREATE TABLE [attributes_translation_table] (
-    [gobject_id] int NULL,
-    [attribute_name] nvarchar(329) NOT NULL,
-    [new_primitive_id] int NULL,
-    [new_attribute_id] int NULL,
-    [old_primitive_id] int NULL,
-    [old_attribute_id] int NULL
-);
-GO
-

gr/ddl/tables/autobind_device.sql

@@ -1,11 +0,0 @@
--- Table: autobind_device
-CREATE TABLE [autobind_device] (
-    [dio_id] int NOT NULL,
-    [overridden_naming_rule_id] int NULL,
-    CONSTRAINT [PK_autobind_device] PRIMARY KEY ([dio_id], [overridden_naming_rule_id], [dio_id])
-);
-GO
-
-ALTER TABLE [autobind_device] ADD FOREIGN KEY ([dio_id]) REFERENCES [gobject] ([gobject_id]);
-GO
-

gr/ddl/tables/autobind_device_category.sql

@@ -1,11 +0,0 @@
--- Table: autobind_device_category
-CREATE TABLE [autobind_device_category] (
-    [category_id] smallint NOT NULL,
-    [rule_id] int NULL DEFAULT ((0)),
-    CONSTRAINT [PK_autobind_device_category] PRIMARY KEY ([category_id], [rule_id], [category_id])
-);
-GO
-
-ALTER TABLE [autobind_device_category] ADD FOREIGN KEY ([category_id]) REFERENCES [lookup_category] ([category_id]);
-GO
-

gr/ddl/tables/autobind_device_template.sql

@@ -1,11 +0,0 @@
--- Table: autobind_device_template
-CREATE TABLE [autobind_device_template] (
-    [template_definition_id] int NOT NULL,
-    [rule_id] int NULL,
-    CONSTRAINT [PK_autobind_device_template] PRIMARY KEY ([template_definition_id], [rule_id], [template_definition_id])
-);
-GO
-
-ALTER TABLE [autobind_device_template] ADD FOREIGN KEY ([template_definition_id]) REFERENCES [template_definition] ([template_definition_id]);
-GO
-

gr/ddl/tables/autobind_device_topic.sql

@@ -1,13 +0,0 @@
--- Table: autobind_device_topic
-CREATE TABLE [autobind_device_topic] (
-    [dio_id] int NOT NULL,
-    [sg_mx_primitive_id] smallint NOT NULL DEFAULT ((0)),
-    [overridden_naming_rule_id] int NULL,
-    [default_xlate_rule_id] int NOT NULL DEFAULT ((0)),
-    CONSTRAINT [PK_autobind_device_topic] PRIMARY KEY ([dio_id], [sg_mx_primitive_id], [overridden_naming_rule_id], [dio_id])
-);
-GO
-
-ALTER TABLE [autobind_device_topic] ADD FOREIGN KEY ([dio_id]) REFERENCES [autobind_device] ([dio_id]);
-GO
-

gr/ddl/tables/autobind_naming_rule.sql

@@ -1,8 +0,0 @@
--- Table: autobind_naming_rule
-CREATE TABLE [autobind_naming_rule] (
-    [rule_id] int NOT NULL,
-    [rule_name] nvarchar(329) NOT NULL,
-    CONSTRAINT [PK_autobind_naming_rule] PRIMARY KEY ([rule_id])
-);
-GO
-