From 9365beb966ca4a916403d76ee15fc1fb2c60d905 Mon Sep 17 00:00:00 2001
From: Joseph Doherty <dohejw01@gmail.com>
Date: Wed, 29 Apr 2026 14:12:43 -0400
Subject: [PATCH] =?UTF-8?q?PR=203.2=20=E2=80=94=20Lift=20Wonderware=20Hist?=
 =?UTF-8?q?orian=20SDK=20code=20to=20sidecar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move all historian implementation files from Driver.Galaxy.Host/Backend/Historian/
to Driver.Historian.Wonderware/Backend/. Sidecar now owns the aahClientManaged /
aahClientCommon SDK references; Galaxy.Host project-references the sidecar so
MxAccessGalaxyBackend keeps building until PR 7.2 retires Galaxy.Host entirely.

10 source files moved (preserving git history via git mv):
  IHistorianDataSource, HistorianDataSource, HistorianClusterEndpointPicker,
  HistorianClusterNodeState, HistorianConfiguration, HistorianEventDto,
  HistorianHealthSnapshot, HistorianQualityMapper, HistorianSample,
  IHistorianConnectionFactory.

2 historian tests moved alongside (HistorianClusterEndpointPickerTests,
HistorianQualityMapperTests). Sidecar test project now hosts 29 tests (1 PR 3.1
smoke + 28 moved historian tests, all passing).

Galaxy.Host's remaining 6 historian-flavored tests (HistorianWiringTests,
HistoryReadAtTimeTests, HistoryReadEventsTests, HistoryReadProcessedTests)
keep passing via the project reference — using directives updated to reach
the new namespace.

Sidecar deliberately speaks no Core.Abstractions — its surface is the legacy
List<HistorianSample> shape; PR 3.4's .NET 10 client translates to the
Core.Abstractions shapes added in PR 1.1.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../Backend/MxAccessGalaxyBackend.cs          |  2 +-
 .../Program.cs                                |  2 +-
 ...B.MOM.WW.OtOpcUa.Driver.Galaxy.Host.csproj | 32 ++-------------
 .../HistorianClusterEndpointPicker.cs         |  2 +-
 .../Backend}/HistorianClusterNodeState.cs     |  2 +-
 .../Backend}/HistorianConfiguration.cs        |  2 +-
 .../Backend}/HistorianDataSource.cs           |  2 +-
 .../Backend}/HistorianEventDto.cs             |  2 +-
 .../Backend}/HistorianHealthSnapshot.cs       |  2 +-
 .../Backend}/HistorianQualityMapper.cs        |  2 +-
 .../Backend}/HistorianSample.cs               |  2 +-
 .../Backend}/IHistorianConnectionFactory.cs   |  2 +-
 .../Backend}/IHistorianDataSource.cs          |  2 +-
 ...OtOpcUa.Driver.Historian.Wonderware.csproj | 41 ++++++++++++++++++-
 .../HistorianWiringTests.cs                   |  2 +-
 .../HistoryReadAtTimeTests.cs                 |  2 +-
 .../HistoryReadEventsTests.cs                 |  2 +-
 .../HistoryReadProcessedTests.cs              |  2 +-
 .../HistorianClusterEndpointPickerTests.cs    |  2 +-
 .../Backend}/HistorianQualityMapperTests.cs   |  2 +-
 20 files changed, 62 insertions(+), 47 deletions(-)
 rename src/{ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian => ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend}/HistorianClusterEndpointPicker.cs (98%)
 rename src/{ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian => ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend}/HistorianClusterNodeState.cs (89%)
 rename src/{ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian => ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend}/HistorianConfiguration.cs (96%)
 rename src/{ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian => ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend}/HistorianDataSource.cs (99%)
 rename src/{ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian => ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend}/HistorianEventDto.cs (89%)
 rename src/{ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian => ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend}/HistorianHealthSnapshot.cs (94%)
 rename src/{ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian => ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend}/HistorianQualityMapper.cs (97%)
 rename src/{ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian => ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend}/HistorianSample.cs (94%)
 rename src/{ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian => ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend}/IHistorianConnectionFactory.cs (97%)
 rename src/{ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian => ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend}/IHistorianDataSource.cs (95%)
 rename tests/{ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests => ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Tests/Backend}/HistorianClusterEndpointPickerTests.cs (98%)
 rename tests/{ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests => ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Tests/Backend}/HistorianQualityMapperTests.cs (97%)

diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/MxAccessGalaxyBackend.cs b/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/MxAccessGalaxyBackend.cs
index c3da3ff..ff92a55 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/MxAccessGalaxyBackend.cs
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/MxAccessGalaxyBackend.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using MessagePack;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Alarms;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Galaxy;
-using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian;
+using ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.MxAccess;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Stability;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.Contracts;
diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Program.cs b/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Program.cs
index 2a5ceec..15fc144 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Program.cs
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Program.cs
@@ -4,7 +4,7 @@ using System.Threading;
 using Serilog;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Galaxy;
-using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian;
+using ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.MxAccess;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Ipc;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Sta;
diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.csproj b/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.csproj
index 7498013..55bd8f3 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.csproj
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.csproj
@@ -28,6 +28,10 @@
 
     <ItemGroup>
         <ProjectReference Include="..\ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared\ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.csproj"/>
+        <!-- PR 3.2: Historian SDK code lifted to the Wonderware sidecar. Galaxy.Host still
+             consumes the historian types (MxAccessGalaxyBackend, Program) until phase 7,
+             so reference the sidecar project to keep building. -->
+        <ProjectReference Include="..\ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware\ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.csproj"/>
     </ItemGroup>
 
     <ItemGroup>
@@ -39,34 +43,6 @@
             <HintPath>..\..\lib\ArchestrA.MxAccess.dll</HintPath>
             <Private>true</Private>
         </Reference>
-        <!-- Wonderware Historian SDK — consumed by Backend/Historian/ for HistoryReadAsync.
-             Previously lived in the v1 Historian.Aveva plugin; folded into Driver.Galaxy.Host
-             for PR #5 because this host is already Galaxy-specific. -->
-        <Reference Include="aahClientManaged">
-            <HintPath>..\..\lib\aahClientManaged.dll</HintPath>
-            <EmbedInteropTypes>false</EmbedInteropTypes>
-        </Reference>
-        <Reference Include="aahClientCommon">
-            <HintPath>..\..\lib\aahClientCommon.dll</HintPath>
-            <EmbedInteropTypes>false</EmbedInteropTypes>
-        </Reference>
-    </ItemGroup>
-
-    <ItemGroup>
-        <!-- Historian SDK native and satellite DLLs — staged beside the host exe so the
-             aahClientManaged wrapper can P/Invoke into them without an AssemblyResolve hook. -->
-        <None Include="..\..\lib\aahClient.dll">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Include="..\..\lib\Historian.CBE.dll">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Include="..\..\lib\Historian.DPAPI.dll">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Include="..\..\lib\ArchestrA.CloudHistorian.Contract.dll">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianClusterEndpointPicker.cs b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianClusterEndpointPicker.cs
similarity index 98%
rename from src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianClusterEndpointPicker.cs
rename to src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianClusterEndpointPicker.cs
index 312207b..bd9283a 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianClusterEndpointPicker.cs
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianClusterEndpointPicker.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian
+namespace ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend
 {
     /// <summary>
     ///     Thread-safe, pure-logic endpoint picker for the Wonderware Historian cluster. Tracks which
diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianClusterNodeState.cs b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianClusterNodeState.cs
similarity index 89%
rename from src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianClusterNodeState.cs
rename to src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianClusterNodeState.cs
index 5b78243..96af0e5 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianClusterNodeState.cs
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianClusterNodeState.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian
+namespace ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend
 {
     /// <summary>
     ///     Point-in-time state of a single historian cluster node. One entry per configured node
diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianConfiguration.cs b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianConfiguration.cs
similarity index 96%
rename from src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianConfiguration.cs
rename to src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianConfiguration.cs
index 8d3ac17..d2e129e 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianConfiguration.cs
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianConfiguration.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian
+namespace ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend
 {
     /// <summary>
     ///     Wonderware Historian SDK configuration. Populated from environment variables at Host
diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianDataSource.cs b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianDataSource.cs
similarity index 99%
rename from src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianDataSource.cs
rename to src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianDataSource.cs
index d132aed..93b796c 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianDataSource.cs
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianDataSource.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using ArchestrA;
 using Serilog;
 
-namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian
+namespace ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend
 {
     /// <summary>
     ///     Reads historical data from the Wonderware Historian via the aahClientManaged SDK.
diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianEventDto.cs b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianEventDto.cs
similarity index 89%
rename from src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianEventDto.cs
rename to src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianEventDto.cs
index d01e164..b45062f 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianEventDto.cs
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianEventDto.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian
+namespace ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend
 {
     /// <summary>
     ///     SDK-free representation of a Historian event record. Prevents ArchestrA types from
diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianHealthSnapshot.cs b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianHealthSnapshot.cs
similarity index 94%
rename from src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianHealthSnapshot.cs
rename to src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianHealthSnapshot.cs
index d056435..47591d8 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianHealthSnapshot.cs
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianHealthSnapshot.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian
+namespace ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend
 {
     /// <summary>
     ///     Point-in-time runtime health of the historian subsystem — consumed by the status dashboard
diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianQualityMapper.cs b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianQualityMapper.cs
similarity index 97%
rename from src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianQualityMapper.cs
rename to src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianQualityMapper.cs
index d84318a..9021a37 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianQualityMapper.cs
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianQualityMapper.cs
@@ -1,4 +1,4 @@
-namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian;
+namespace ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend;
 
 /// <summary>
 ///     Maps a raw OPC DA quality byte (as returned by Wonderware Historian's <c>OpcQuality</c>)
diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianSample.cs b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianSample.cs
similarity index 94%
rename from src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianSample.cs
rename to src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianSample.cs
index 3f78ffd..b7b55cc 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/HistorianSample.cs
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/HistorianSample.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian
+namespace ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend
 {
     /// <summary>
     ///     OPC-UA-free representation of a single historical data point. The Host returns these
diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/IHistorianConnectionFactory.cs b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/IHistorianConnectionFactory.cs
similarity index 97%
rename from src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/IHistorianConnectionFactory.cs
rename to src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/IHistorianConnectionFactory.cs
index 51001e9..4893ff6 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/IHistorianConnectionFactory.cs
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/IHistorianConnectionFactory.cs
@@ -2,7 +2,7 @@ using System;
 using System.Threading;
 using ArchestrA;
 
-namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian
+namespace ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend
 {
     /// <summary>
     ///     Creates and opens Historian SDK connections. Extracted so tests can inject fakes that
diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/IHistorianDataSource.cs b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/IHistorianDataSource.cs
similarity index 95%
rename from src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/IHistorianDataSource.cs
rename to src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/IHistorianDataSource.cs
index 146ae1b..ac73cf6 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host/Backend/Historian/IHistorianDataSource.cs
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/Backend/IHistorianDataSource.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian
+namespace ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend
 {
     /// <summary>
     ///     OPC-UA-free surface for the Wonderware Historian subsystem inside Galaxy.Host.
diff --git a/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.csproj b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.csproj
index 2acff21..737abe6 100644
--- a/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.csproj
+++ b/src/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.csproj
@@ -4,7 +4,7 @@
         <OutputType>Exe</OutputType>
         <TargetFramework>net48</TargetFramework>
         <!-- x86 to match the in-process bitness expectations of the Wonderware Historian SDK
-             that PR 3.2 will lift in. Mirrors Driver.Galaxy.Host's bitness for consistency. -->
+             that PR 3.2 lifted in. Mirrors Driver.Galaxy.Host's bitness for consistency. -->
         <PlatformTarget>x86</PlatformTarget>
         <Prefer32Bit>true</Prefer32Bit>
         <Nullable>enable</Nullable>
@@ -17,6 +17,10 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="System.IO.Pipes.AccessControl" Version="5.0.0"/>
+        <PackageReference Include="System.Memory" Version="4.5.5"/>
+        <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4"/>
+        <PackageReference Include="System.Data.SqlClient" Version="4.9.0"/>
         <PackageReference Include="Serilog" Version="4.2.0"/>
         <PackageReference Include="Serilog.Sinks.File" Version="7.0.0"/>
     </ItemGroup>
@@ -25,4 +29,39 @@
         <InternalsVisibleTo Include="ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Tests"/>
     </ItemGroup>
 
+    <ItemGroup>
+        <!-- Wonderware Historian SDK — consumed by Backend/ for HistoryReadAsync.
+             Lifted from Driver.Galaxy.Host in PR 3.2 so the sidecar owns the SDK. -->
+        <Reference Include="aahClientManaged">
+            <HintPath>..\..\lib\aahClientManaged.dll</HintPath>
+            <EmbedInteropTypes>false</EmbedInteropTypes>
+        </Reference>
+        <Reference Include="aahClientCommon">
+            <HintPath>..\..\lib\aahClientCommon.dll</HintPath>
+            <EmbedInteropTypes>false</EmbedInteropTypes>
+        </Reference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <!-- Historian SDK native and satellite DLLs — staged beside the host exe so the
+             aahClientManaged wrapper can P/Invoke into them without an AssemblyResolve hook. -->
+        <None Include="..\..\lib\aahClient.dll">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Include="..\..\lib\Historian.CBE.dll">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Include="..\..\lib\Historian.DPAPI.dll">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Include="..\..\lib\ArchestrA.CloudHistorian.Contract.dll">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
+    <ItemGroup>
+        <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-37gx-xxp4-5rgx"/>
+        <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-w3x6-4m5h-cxqf"/>
+    </ItemGroup>
+
 </Project>
diff --git a/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistorianWiringTests.cs b/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistorianWiringTests.cs
index 4c7800c..67f3885 100644
--- a/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistorianWiringTests.cs
+++ b/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistorianWiringTests.cs
@@ -6,7 +6,7 @@ using Shouldly;
 using Xunit;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Galaxy;
-using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian;
+using ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.MxAccess;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Sta;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.Contracts;
diff --git a/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistoryReadAtTimeTests.cs b/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistoryReadAtTimeTests.cs
index 4be8be9..37c1389 100644
--- a/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistoryReadAtTimeTests.cs
+++ b/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistoryReadAtTimeTests.cs
@@ -8,7 +8,7 @@ using Shouldly;
 using Xunit;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Galaxy;
-using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian;
+using ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.MxAccess;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Sta;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.Contracts;
diff --git a/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistoryReadEventsTests.cs b/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistoryReadEventsTests.cs
index 2e57756..ac24443 100644
--- a/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistoryReadEventsTests.cs
+++ b/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistoryReadEventsTests.cs
@@ -6,7 +6,7 @@ using Shouldly;
 using Xunit;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Galaxy;
-using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian;
+using ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.MxAccess;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Sta;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.Contracts;
diff --git a/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistoryReadProcessedTests.cs b/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistoryReadProcessedTests.cs
index 7cca434..aa86c50 100644
--- a/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistoryReadProcessedTests.cs
+++ b/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistoryReadProcessedTests.cs
@@ -7,7 +7,7 @@ using Shouldly;
 using Xunit;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Galaxy;
-using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian;
+using ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.MxAccess;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Sta;
 using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Shared.Contracts;
diff --git a/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistorianClusterEndpointPickerTests.cs b/tests/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Tests/Backend/HistorianClusterEndpointPickerTests.cs
similarity index 98%
rename from tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistorianClusterEndpointPickerTests.cs
rename to tests/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Tests/Backend/HistorianClusterEndpointPickerTests.cs
index 4078080..50d2410 100644
--- a/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistorianClusterEndpointPickerTests.cs
+++ b/tests/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Tests/Backend/HistorianClusterEndpointPickerTests.cs
@@ -2,7 +2,7 @@ using System;
 using System.Linq;
 using Shouldly;
 using Xunit;
-using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian;
+using ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests
 {
diff --git a/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistorianQualityMapperTests.cs b/tests/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Tests/Backend/HistorianQualityMapperTests.cs
similarity index 97%
rename from tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistorianQualityMapperTests.cs
rename to tests/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Tests/Backend/HistorianQualityMapperTests.cs
index 8e75348..348a43f 100644
--- a/tests/ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests/HistorianQualityMapperTests.cs
+++ b/tests/ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Tests/Backend/HistorianQualityMapperTests.cs
@@ -1,6 +1,6 @@
 using Shouldly;
 using Xunit;
-using ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Backend.Historian;
+using ZB.MOM.WW.OtOpcUa.Driver.Historian.Wonderware.Backend;
 
 namespace ZB.MOM.WW.OtOpcUa.Driver.Galaxy.Host.Tests;