diff --git a/docs/plans/2026-06-13-alarm-subtag-fallback.md b/docs/plans/2026-06-13-alarm-subtag-fallback.md index 09af7b6..8116f9d 100644 --- a/docs/plans/2026-06-13-alarm-subtag-fallback.md +++ b/docs/plans/2026-06-13-alarm-subtag-fallback.md @@ -38,9 +38,11 @@ **Parallelizable with:** none (Task 2 imports these types) **Files:** -- Modify: `src/ZB.MOM.WW.MxGateway.Contracts/Protos/mxaccess_worker.proto` (alarm command block, ~lines 318-346) +- Modify: `src/ZB.MOM.WW.MxGateway.Contracts/Protos/mxaccess_gateway.proto` (real `SubscribeAlarmsCommand` at ~line 324; `MxCommand` references it at 123-125) -**Step 1: Add the enum and messages.** In `mxaccess_worker.proto`, replace the `SubscribeAlarmsCommand` message and add the new types after it: +> **CORRECTION (execution):** The alarm command messages and `MxCommand` live in **`mxaccess_gateway.proto`**, not the worker proto. `mxaccess_worker.proto` *imports* the gateway proto (`WorkerCommand.command` is `mxaccess_gateway.v1.MxCommand`), so the gateway proto is the base and the worker proto needs **no** change. `AlarmProviderMode` and the new types are added to the gateway proto and are visible to worker code as `mxaccess_gateway.v1` types. Tasks 1 and 2 are executed as a single combined edit on this one file. + +**Step 1: Add the enum and messages.** In `mxaccess_gateway.proto`, extend the existing `SubscribeAlarmsCommand` message (line 324) and add the new types after it: ```protobuf // Provider selection / current provider for the alarm feed. Defined here in @@ -53,7 +55,7 @@ enum AlarmProviderMode { } message SubscribeAlarmsCommand { - string subscription_expression = 1; + string subscription_expression = 1; // existing field — keep // UNSPECIFIED = auto-failover/failback. ALARMMGR/SUBTAG force one provider. AlarmProviderMode forced_mode = 2; // Subtag watch-list resolved by the gateway (GR SQL + config). Empty in pure