feat: align frontend runtime and Edge TTS

src/features/agent/ui-envelope/map-actions.test.ts

@@ -20,6 +20,13 @@ describe("toTrustedMapAction", () => {
       })
     ).toBeNull();
     expect(toTrustedMapAction("apply_layer_style", {})).toBeNull();
+    expect(
+      toTrustedMapAction("apply_layer_style", {
+        layer_group_id: "pipes",
+        layer_id: "scada",
+        visible: true
+      })
+    ).toBeNull();
   });
 
   it("rejects out-of-range coordinates and zoom", () => {
@@ -83,6 +90,7 @@ describe("toTrustedMapAction", () => {
   it("accepts supply layer visibility and scada locate actions", () => {
     expect(toTrustedMapAction("apply_layer_style", { layer_id: "scada", visible: false })).toMatchObject({
       type: "apply_layer_style",
+      layerGroupId: "scada",
       layerId: "scada",
       visible: false
     });
@@ -92,4 +100,20 @@ describe("toTrustedMapAction", () => {
       layer: "geo_scada"
     });
   });
+
+  it("rejects unknown layers and accepts known visibility controls", () => {
+    expect(toTrustedMapAction("locate_features", { ids: ["P1"], layer: "geo_unknown" })).toBeNull();
+    expect(toTrustedMapAction("apply_layer_style", { layer_id: "pipes", visible: true })).toMatchObject({
+      type: "apply_layer_style",
+      layerGroupId: "pipes",
+      layerId: "pipes",
+      visible: true
+    });
+    expect(toTrustedMapAction("apply_layer_style", { layer_group_id: "simulation", visible: false })).toMatchObject({
+      type: "apply_layer_style",
+      layerGroupId: "simulation",
+      visible: false
+    });
+    expect(toTrustedMapAction("apply_layer_style", { layer_id: "conduits", visible: true })).toBeNull();
+  });
 });

src/features/agent/ui-envelope/map-actions.ts

@@ -14,7 +14,7 @@ export type TrustedMapAction =
     }
   | {
       type: "apply_layer_style";
-      layerGroupId?: string;
+      layerGroupId: string;
       layerId?: string;
       visible?: boolean;
       fallbackText?: string;
@@ -33,12 +33,14 @@ export function toTrustedMapAction(action: string, params: unknown, fallbackText
   if (action === "locate_features" || action in LEGACY_LOCATE_ACTION_LAYERS) {
     const featureIds = readLocateIds(params);
     if (featureIds.length === 0 || featureIds.length > 100 || featureIds.some((id) => id.length > 128)) return null;
+    const layer =
+      stringValue(params.layer ?? params.target_layer ?? params.targetLayer) ??
+      LEGACY_LOCATE_ACTION_LAYERS[action];
+    if (layer && !ALLOWED_LOCATE_LAYERS.has(layer)) return null;
     return {
       type: "locate_features",
       featureIds,
-      layer:
-        stringValue(params.layer ?? params.target_layer ?? params.targetLayer) ??
-        LEGACY_LOCATE_ACTION_LAYERS[action],
+      layer,
       fallbackText
     };
   }
@@ -66,11 +68,18 @@ export function toTrustedMapAction(action: string, params: unknown, fallbackText
   if (action === "apply_layer_style") {
     const layerGroupId = stringValue(params.layer_group_id ?? params.layerGroupId);
     const layerId = stringValue(params.layer_id ?? params.layerId);
+    const resolvedLayerGroupId = layerGroupId ?? layerId;
     const visible = booleanValue(params.visible);
-    if ((!layerGroupId && !layerId) || visible === undefined || (layerId && !ALLOWED_LAYER_IDS.has(layerId))) return null;
+    if (
+      !resolvedLayerGroupId ||
+      visible === undefined ||
+      (layerGroupId && !ALLOWED_LAYER_GROUP_IDS.has(layerGroupId)) ||
+      (layerId && !ALLOWED_LAYER_IDS.has(layerId)) ||
+      (layerGroupId && layerId && layerGroupId !== layerId)
+    ) return null;
     return {
       type: "apply_layer_style",
-      layerGroupId,
+      layerGroupId: resolvedLayerGroupId,
       layerId,
       visible,
       fallbackText
@@ -165,7 +174,21 @@ const LEGACY_LOCATE_ACTION_LAYERS: Record<string, string> = {
 };
 
 const RESULT_REF_PATTERN = /^res-[A-Za-z0-9_-]{8,128}$/;
-const ALLOWED_LAYER_IDS = new Set(["junctions", "pipes", "valves", "reservoirs", "scada"]);
+const SUPPLY_SOURCE_IDS = ["junctions", "pipes", "valves", "reservoirs", "scada"];
+const ALLOWED_LAYER_IDS = new Set(SUPPLY_SOURCE_IDS);
+const ALLOWED_LAYER_GROUP_IDS = new Set([...SUPPLY_SOURCE_IDS, "simulation"]);
+const ALLOWED_LOCATE_LAYERS = new Set([
+  ...SUPPLY_SOURCE_IDS,
+  "pumps",
+  "tanks",
+  "geo_junctions_mat",
+  "geo_pipes_mat",
+  "geo_valves",
+  "geo_reservoirs",
+  "geo_scada",
+  "geo_pumps",
+  "geo_tanks"
+]);
 const WEB_MERCATOR_RADIUS = 6378137;
 
 const LOCATE_ID_PARAM_KEYS = [