feat(deploy): reject Sql Query tags naming undeclared queries; warn on Writable/writable disagreement (lmxopcua#781)

Item 5: DraftValidator now emits SqlQueryNotDeclared (always blocking) for a Query tag whose
query is absent from the merged driver config's queries map, via the driver's own tag parse.
Item 3: StartDeployment appends a non-blocking warning to the accepted message when the Tag
entity's AccessLevel and the Sql blob's writable flag disagree.

Claude-Session: https://claude.ai/code/session_01GT67AEHd2Acv1YPwGfXEoV

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

@@ -41,6 +41,7 @@ public static class DraftValidator
         ValidateEquipReferenceResolution(draft, errors);
         ValidateCalculationTags(draft, errors);
         ValidateSqlConnectionStringNotPersisted(draft, errors);
+        errors.AddRange(SqlTagDeployChecks.UndeclaredQueryErrors(draft));
         ValidateMTConnectSingleDevice(draft, errors);
         ValidateNodeAclScopes(draft, errors);
         return errors;

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

@@ -0,0 +1,107 @@
+using System.Text.Json;
+using ZB.MOM.WW.OtOpcUa.Commons.Types;
+using ZB.MOM.WW.OtOpcUa.Configuration.Entities;
+using ZB.MOM.WW.OtOpcUa.Configuration.Enums;
+using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
+using ZB.MOM.WW.OtOpcUa.Driver.Sql.Contracts;
+
+namespace ZB.MOM.WW.OtOpcUa.Configuration.Validation;
+
+/// <summary>
+///     Deploy-gate checks for Sql tags that need a fact outside the tag's own blob (lmxopcua#781 items 3 and 5).
+///     <para>Both go through <see cref="SqlEquipmentTagParser.TryParse"/> — the driver's own runtime parse — so a
+///     blob the driver would refuse anyway (already reported by the per-tag inspector) is never double-reported
+///     here, and nothing here can be stricter than the runtime.</para>
+/// </summary>
+public static class SqlTagDeployChecks
+{
+    /// <summary>Error code for a Query tag naming a query its driver instance does not declare.</summary>
+    public const string UndeclaredQueryCode = "SqlQueryNotDeclared";
+
+    /// <summary>
+    ///     Item 5. A <c>Query</c>-model tag whose <c>query</c> is not a key of the driver instance's
+    ///     <c>queries</c> map is skipped by the driver at Initialize (BadNodeIdUnknown, reason on /hosts). The
+    ///     <c>queries</c> map is read from the same merged config the driver binds
+    ///     (<see cref="DriverDeviceConfigMerger"/>: DriverConfig plus, for a single-device instance, the
+    ///     DeviceConfig), keys matched ordinally as the driver does.
+    /// </summary>
+    /// <param name="draft">The snapshot being validated.</param>
+    /// <returns>One error per offending tag; empty when every Query tag names a declared query.</returns>
+    public static IReadOnlyList<ValidationError> UndeclaredQueryErrors(DraftSnapshot draft)
+    {
+        var errors = new List<ValidationError>();
+        foreach (var (driver, devices) in SqlInstances(draft))
+        {
+            HashSet<string>? declared = null;
+            foreach (var tag in draft.Tags)
+            {
+                if (!devices.Any(d => string.Equals(d.DeviceId, tag.DeviceId, StringComparison.Ordinal))) continue;
+                if (!SqlEquipmentTagParser.TryParse(tag.TagConfig, tag.Name, out var def)
+                    || def.Model != SqlTagModel.Query) continue;
+                declared ??= DeclaredQueries(driver, devices);
+                if (declared.Contains(def.QueryName!)) continue;
+                errors.Add(new(UndeclaredQueryCode,
+                    $"Sql tag '{tag.TagId}' reads named query '{def.QueryName}', which Sql driver instance " +
+                    $"'{driver.DriverInstanceId}' does not declare under 'queries' — the driver would skip the tag " +
+                    "and it would read BadNodeIdUnknown. Declare the query in the driver config or fix the tag's 'query'.",
+                    tag.TagId));
+            }
+        }
+
+        return errors;
+    }
+
+    /// <summary>
+    ///     Item 3. The node's write permission needs BOTH the Tag entity's <c>AccessLevel</c> (ReadWrite) and the
+    ///     Sql blob's <c>"writable": true</c>; when they disagree the tag is silently read-only. A warning, never
+    ///     an error: both read-only combinations are legal states, just usually not the intended one.
+    /// </summary>
+    /// <param name="draft">The snapshot being validated.</param>
+    /// <returns>One human-readable warning per disagreeing tag.</returns>
+    public static IReadOnlyList<string> WritableMismatchWarnings(DraftSnapshot draft)
+    {
+        var warnings = new List<string>();
+        foreach (var (_, devices) in SqlInstances(draft))
+        {
+            foreach (var tag in draft.Tags)
+            {
+                if (!devices.Any(d => string.Equals(d.DeviceId, tag.DeviceId, StringComparison.Ordinal))) continue;
+                if (!SqlEquipmentTagParser.TryParse(tag.TagConfig, tag.Name, out var def)) continue;
+                var entityWritable = tag.AccessLevel == TagAccessLevel.ReadWrite;
+                if (entityWritable == def.Writable) continue;
+                warnings.Add(entityWritable
+                    ? $"tag '{tag.TagId}': Writable flag is on but the Sql TagConfig lacks \"writable\": true — the driver will refuse writes to it."
+                    : $"tag '{tag.TagId}': Sql TagConfig says \"writable\": true but the tag's Writable flag is off — the node will be read-only.");
+            }
+        }
+
+        return warnings;
+    }
+
+    private static IEnumerable<(DriverInstance Driver, List<Device> Devices)> SqlInstances(DraftSnapshot draft)
+    {
+        foreach (var driver in draft.DriverInstances)
+        {
+            if (!string.Equals(driver.DriverType, DriverTypeNames.Sql, StringComparison.Ordinal)) continue;
+            yield return (driver, draft.Devices
+                .Where(d => string.Equals(d.DriverInstanceId, driver.DriverInstanceId, StringComparison.Ordinal))
+                .ToList());
+        }
+    }
+
+    private static HashSet<string> DeclaredQueries(DriverInstance driver, List<Device> devices)
+    {
+        var set = new HashSet<string>(StringComparer.Ordinal);
+        var merged = DriverDeviceConfigMerger.Merge(
+            driver.DriverConfig, devices.Select(d => new DriverDeviceConfigMerger.DeviceRow(d.Name, d.DeviceConfig)).ToList(), []);
+        using var doc = JsonDocument.Parse(merged);
+        foreach (var p in doc.RootElement.EnumerateObject())
+        {
+            if (!string.Equals(p.Name, "queries", StringComparison.OrdinalIgnoreCase)
+                || p.Value.ValueKind != JsonValueKind.Object) continue;
+            foreach (var q in p.Value.EnumerateObject()) set.Add(q.Name);
+        }
+
+        return set;
+    }
+}

src/Core/ZB.MOM.WW.OtOpcUa.Configuration/ZB.MOM.WW.OtOpcUa.Configuration.csproj

@@ -44,6 +44,9 @@
         <!-- WP7: the deploy-gate cycle check reuses DependencyGraph (Tarjan SCC) for the calc→calc
              dependency-cycle rule. Cycle-safe — Core.VirtualTags does not reference Configuration. -->
         <ProjectReference Include="..\ZB.MOM.WW.OtOpcUa.Core.VirtualTags\ZB.MOM.WW.OtOpcUa.Core.VirtualTags.csproj"/>
+        <!-- lmxopcua#781: the Sql deploy checks reuse the driver's own tag parse. Cycle-safe — Sql.Contracts
+             references only Core.Abstractions. -->
+        <ProjectReference Include="..\..\Drivers\ZB.MOM.WW.OtOpcUa.Driver.Sql.Contracts\ZB.MOM.WW.OtOpcUa.Driver.Sql.Contracts.csproj"/>
     </ItemGroup>
 
 </Project>