Fix Galaxy projection and constraint review findings

AGENTS.md

@@ -0,0 +1,481 @@
+# MXAccess Gateway Agent Guide
+
+Repository: https://gitea.dohertylan.com/dohertj2/mxaccessgw
+
+This project builds a gateway that gives modern clients full MXAccess parity
+without requiring those clients to load MXAccess COM, run as x86, or own an STA
+message pump. Treat the installed MXAccess COM component as the compatibility
+baseline.
+
+Toolchain paths, versions, and external analysis locations are recorded in
+`docs/toolchain-links.md`. Use that file before searching for compilers,
+runtimes, protobuf tools, MXAccess notes, or Galaxy Repository SQL notes.
+
+Implementation planning is recorded in `docs/implementation-plan-index.md`.
+Follow the order there unless the user explicitly reprioritizes: gateway first,
+MXAccess worker instance second, clients third.
+
+## Core Contract
+
+Preserve MXAccess behavior first:
+
+- public MXAccess command semantics,
+- native MXAccess event families,
+- STA/message-pump delivery behavior,
+- installed-provider quirks,
+- HRESULT/status/value marshaling,
+- per-client isolation.
+
+Do not simplify, normalize, or "fix" MXAccess behavior unless an explicit
+non-parity mode is being implemented and tested. `MxAsbClient` and managed NMX
+are future acceleration paths only; they do not define the parity contract.
+
+## Architecture
+
+The intended split is:
+
+```text
+client
+  -> gRPC over TCP
+    -> .NET 10 x64 gateway
+      -> session manager
+        -> per-session .NET Framework 4.8 x86 worker process
+          -> dedicated STA thread
+            -> MXAccess COM instance
+            -> Windows/COM message pump
+            -> command queue
+            -> event sink
+```
+
+The gateway must never instantiate or call MXAccess directly. All MXAccess COM
+interaction belongs in the worker process on its dedicated STA thread.
+
+The worker must not host public gRPC. Gateway-to-worker communication should use
+a small local IPC protocol, with named pipes and protobuf-framed messages as the
+default design.
+
+## Runtime Targets
+
+- Gateway: .NET 10, C#, x64 preferred, ASP.NET Core gRPC.
+- Worker: .NET Framework 4.8, C#, x86 by default.
+- Worker IPC: one bidirectional named pipe per worker.
+- Worker process model: one external client session maps to one worker by
+  default.
+
+## Style Guides
+
+Follow the project documentation guide and the language guide for every changed
+area:
+
+| Area | Style guide |
+|------|-------------|
+| Documentation | `StyleGuide.md` |
+| Gateway, worker, .NET client, and C# tests | `docs/style-guides/CSharpStyleGuide.md` |
+| Public gRPC and worker IPC contracts | `docs/style-guides/ProtobufStyleGuide.md` |
+| Go client | `docs/style-guides/GoStyleGuide.md` |
+| Rust client | `docs/style-guides/RustStyleGuide.md` |
+| Python client | `docs/style-guides/PythonStyleGuide.md` |
+| Java client | `docs/style-guides/JavaStyleGuide.md` |
+
+When a change crosses languages, apply every affected style guide. Generated
+code follows its generator output; do not hand-edit it to match handwritten
+style.
+
+## Expected Layout
+
+Prefer this structure unless there is a strong reason to adjust it:
+
+```text
+src/MxGateway.Contracts/
+  Protos/
+    mxaccess_gateway.proto
+    mxaccess_worker.proto
+  Generated/
+
+src/MxGateway.Server/
+  Program.cs
+  Sessions/
+  Workers/
+  Grpc/
+  Dashboard/
+  Metrics/
+
+src/MxGateway.Worker/
+  Program.cs
+  Ipc/
+  Sta/
+  MxAccess/
+  Conversion/
+
+src/MxGateway.Tests/
+  contract tests
+  gateway session tests
+  fake worker tests
+
+src/MxGateway.Worker.Tests/
+  value/status conversion tests
+  STA queue tests
+
+src/MxGateway.IntegrationTests/
+  optional live MXAccess tests
+
+clients/dotnet/
+  .NET 10 C# client library, test CLI, and tests
+
+clients/go/
+  Go client module, test CLI, and tests
+
+clients/rust/
+  Rust client crate, test CLI, and tests
+
+clients/python/
+  Python client package, test CLI, and tests
+
+clients/java/
+  Java client library, test CLI, and tests
+```
+
+The contracts project may multi-target, or the `.proto` files may be shared as
+source inputs to both gateway and worker builds.
+
+## Public API Shape
+
+The external API should be session-oriented. Initial rollout should prefer
+unary `OpenSession`, `CloseSession`, and `Invoke`, plus server-streaming
+`StreamEvents`. Add a bidirectional `Session` stream after the command and event
+model is stable.
+
+Do not compress MXAccess into generic verbs too early. Use a command enum with
+method-specific payloads so parity can be tested method by method.
+
+Core MXAccess commands to represent:
+
+- `Register`
+- `Unregister`
+- `AddItem`
+- `AddItem2`
+- `RemoveItem`
+- `Advise`
+- `UnAdvise`
+- `AdviseSupervisory`
+- `AddBufferedItem`
+- `SetBufferedUpdateInterval`
+- `Suspend`
+- `Activate`
+- `Write`
+- `Write2`
+- `WriteSecured`
+- `WriteSecured2`
+- `AuthenticateUser`
+- `ArchestrAUserToId`
+
+Diagnostics may include `Ping`, `GetSessionState`, `GetWorkerInfo`,
+`DrainEvents`, and `ShutdownWorker`.
+
+## Event Requirements
+
+Represent every public MXAccess event family:
+
+- `OnDataChange`
+- `OnWriteComplete`
+- `OperationComplete`
+- `OnBufferedDataChange`
+
+Preserve per-worker event order. The gateway must not reorder events emitted by
+the same MXAccess instance.
+
+Event DTOs should carry event family, session id, server handle, item handle,
+value, quality, timestamp, `MXSTATUS_PROXY[]` equivalent, raw HRESULT/status
+fields when available, event sequence, worker timestamp, and gateway receive
+timestamp.
+
+## Value And Status Rules
+
+Use a protobuf value union that can represent COM `VARIANT` values and arrays.
+When a value cannot be losslessly converted, preserve both the best typed
+projection and enough raw diagnostic metadata to reproduce the case.
+
+Represent `MXSTATUS_PROXY` explicitly. Do not collapse status arrays into a
+single success flag.
+
+Command replies should include protocol status, COM HRESULT if available,
+MXAccess return values, method-specific out parameters, and status arrays where
+the MXAccess method emits them.
+
+## Galaxy Repository SQL Discovery
+
+Galaxy tags, hierarchy, and attribute details can be queried from the AVEVA /
+Wonderware System Platform Galaxy Repository SQL Server database. Use this as a
+discovery and metadata path only; runtime MXAccess parity still belongs to the
+MXAccess-backed worker unless an explicit non-parity backend is being designed.
+
+Full notes, schema details, screenshots, and query examples are in:
+
+```text
+C:\Users\dohertj2\Desktop\lmxopcua\gr
+```
+
+Important files in that notes directory:
+
+- `connectioninfo.md` - SQL Server connection details and `sqlcmd` usage.
+- `layout.md` - hierarchy vs `tag_name` relationship.
+- `build_layout_plan.md` - extraction plan for hierarchy and attributes.
+- `schema.md` and `ddl/` - Galaxy Repository schema reference.
+- `queries/hierarchy.sql` - deployed object hierarchy.
+- `queries/attributes.sql` - user-defined dynamic attributes.
+- `queries/attributes_extended.sql` - system plus user-defined attributes.
+- `queries/change_detection.sql` - deployment-change polling via
+  `galaxy.time_of_last_deploy`.
+
+Current documented connection is SQL Server `localhost`, database `ZB`, Windows
+Auth. Example:
+
+```powershell
+sqlcmd -S localhost -d ZB -E -Q "SELECT time_of_last_deploy FROM galaxy;"
+```
+
+Key tables from the notes are `gobject`, `template_definition`,
+`dynamic_attribute`, `attribute_definition`, `primitive_instance`, and
+`galaxy`. The hierarchy uses contained names for human-readable browsing, while
+runtime tag references use globally unique `tag_name` values such as
+`<tag_name>.<AttributeName>`.
+
+## MXAccess Analysis Source
+
+Use the local MXAccess analysis project when answering questions about installed
+MXAccess classes, interfaces, fields, events, HRESULT/status behavior, value
+projection, captures, and parity gaps:
+
+```text
+C:\Users\dohertj2\Desktop\mxaccess
+```
+
+Primary files:
+
+- `README.md` - overview of available analysis and capture artifacts.
+- `docs/MXAccess-Public-API.md` - COM class, ProgID, CLSID, method list,
+  event signatures, `MxDataType`, `MxStatus`, and `MXSTATUS_PROXY`.
+- `docs/MXAccess-Reverse-Engineering.md` - installed runtime path and x86 COM
+  constraints.
+- `docs/Current-Sprint-State.md` and `docs/DotNet10-Native-Library-Plan.md` -
+  current parity gaps and managed native-client research status.
+- `src/MxTraceHarness/` - x86 MXAccess harness examples using the real COM
+  interop assembly.
+- `captures/` and `analysis/` - observed native behavior and generated
+  reverse-engineering artifacts.
+
+Concrete MXAccess COM target from the analysis:
+
+- class: `ArchestrA.MxAccess.LMXProxyServerClass`
+- CLSID: `{C30B52F5-2CB5-4760-AF0A-3A344A7EB5DC}`
+- ProgID: `LMXProxy.LMXProxyServer.1`
+- version-independent ProgID: `LMXProxy.LMXProxyServer`
+- registered server: `C:\Program Files (x86)\ArchestrA\Framework\Bin\LmxProxy.dll`
+- interop assembly:
+  `C:\Program Files (x86)\ArchestrA\Framework\Bin\ArchestrA.MXAccess.dll`
+- threading model: `Apartment`
+
+## Worker Rules
+
+Each worker owns:
+
+- one process,
+- one MXAccess session,
+- one dedicated STA thread,
+- one MXAccess COM object,
+- one inbound command queue,
+- one outbound event queue.
+
+All MXAccess operations must run on the STA. A plain blocking queue is not
+enough for the STA; the STA loop must pump Windows/COM messages and service
+queued commands.
+
+Do not block the STA on pipe writes, gRPC calls, or slow consumers. Event
+handlers should convert event args, enqueue outbound events, and return to
+pumping messages.
+
+On graceful shutdown, reject new commands, optionally clean up active MXAccess
+handles, detach events, release the COM object, uninitialize COM, and exit. If
+graceful shutdown exceeds the configured timeout, the gateway may kill the
+worker.
+
+## IPC Rules
+
+Default pipe name shape:
+
+```text
+mxaccess-gateway-{gatewayProcessId}-{sessionId}
+```
+
+Frame messages as:
+
+```text
+uint32 little-endian payload_length
+payload_length bytes protobuf WorkerEnvelope
+```
+
+Every envelope should include protocol version, session id, monotonic sender
+sequence, correlation id, and a typed body. Protocol version mismatch should
+fail session creation.
+
+Pipe security should be local-machine only, with ACLs restricted to the gateway
+identity and launched worker identity. Prefer a per-session nonce handshake.
+
+## Gateway Rules
+
+The gateway is responsible for:
+
+- public TCP/gRPC API,
+- Blazor Server dashboard using Bootstrap CSS/JS only,
+- authn/authz when needed,
+- session creation and teardown,
+- worker launch and lifecycle management,
+- command routing,
+- event streaming,
+- leases, heartbeats, timeouts, and quotas,
+- worker kill/restart policy,
+- metrics and structured logs.
+
+The gRPC layer should stay thin: validate request, find session, call the
+session worker client, map worker replies to public replies, and stream events.
+Keep MXAccess-specific translation logic testable outside the gRPC handlers.
+
+Dashboard code should also stay thin and read-only for v1. Use a snapshot
+service over session/worker/metrics state; do not let Razor components mutate
+gateway sessions or workers directly. Do not use MudBlazor or other Blazor UI
+component libraries.
+
+Gateway restart should not try to reattach old workers in the first version.
+Terminate orphaned workers on startup if that behavior is implemented.
+
+## Command, Timeout, And Cancellation Semantics
+
+Command lifecycle:
+
+```text
+client gRPC command
+gateway validates session and payload
+gateway assigns correlation id
+gateway writes WorkerCommand to pipe
+worker queues command to STA
+STA executes MXAccess method
+worker captures return/out/status/HRESULT
+worker sends WorkerCommandReply
+gateway completes gRPC response
+```
+
+Canceling a gRPC call should stop waiting in the gateway, but it cannot safely
+abort an in-flight COM call on the STA. Hard cancellation means killing the
+worker process.
+
+If a command wedges the STA beyond a configured grace period, the gateway should
+kill the worker and fail the session.
+
+## Backpressure Policy
+
+Worker outbound events must use a bounded queue. For parity testing, prefer
+fail-fast behavior over silent drops. Production coalescing or drop policies
+must be explicit and observable.
+
+The gateway should preserve per-session event order, apply backpressure from
+slow gRPC streams, and disconnect or coalesce only according to an explicit
+policy.
+
+## Security And Logging
+
+Use TLS for remote gRPC when crossing machine boundaries. Authentication may be
+Windows auth, mTLS, or a deployment-specific token.
+
+Commands that write, authenticate users, or alter runtime state need explicit
+authorization design.
+
+Never log passwords or raw credential values for `AuthenticateUser`,
+`WriteSecured`, or related secured operations. Do not log full values by
+default; make value logging opt-in and redacted.
+
+## Testing Expectations
+
+Use focused tests for:
+
+- contract/protobuf compatibility,
+- gateway session state and worker lifecycle,
+- gateway behavior with a fake worker,
+- worker value/status conversion,
+- STA queue and message-pump behavior.
+
+Live MXAccess integration tests are optional but should be isolated because they
+depend on installed COM components and provider behavior.
+
+Parity tests should compare direct MXAccess behavior against the gateway:
+
+- return values,
+- HRESULTs and exceptions,
+- event sequence,
+- value projection,
+- quality/status arrays,
+- invalid handle behavior,
+- cross-server handle behavior,
+- cleanup behavior.
+
+Known important parity areas:
+
+- `WriteSecured` may fail before a value-bearing NMX body is emitted.
+- `WriteSecured2` can succeed in observed native paths.
+- `OperationComplete` is distinct from write completion.
+- `OnBufferedDataChange` has a distinct public event shape.
+- Invalid handles and cross-server handles have specific exception/status
+  behavior.
+- STA message pumping is required for event delivery.
+
+## Source Update Workflow
+
+When source code changes, build the affected component before handing work
+back. If the change crosses component boundaries, build each affected component
+instead of relying on a single top-level build.
+
+Use the native build and test command for each changed area:
+
+| Changed area | Required verification |
+|--------------|-----------------------|
+| Contracts or `.proto` files | regenerate generated code, then build gateway, worker, and every generated client touched by the contract |
+| Gateway server, sessions, workers, gRPC, dashboard, or metrics | build the .NET 10 gateway project and run affected gateway or fake-worker tests |
+| Worker IPC, STA, MXAccess, or conversion code | build the .NET Framework 4.8 x86 worker project and run affected worker tests |
+| Shared test infrastructure | run every test suite that consumes the changed helpers |
+| .NET client | build the .NET client library, CLI, and tests |
+| Go client | run Go formatting, build, and tests for the Go module |
+| Rust client | run Rust formatting, build or check, and tests for the Rust crate |
+| Python client | run Python formatting or linting if configured, package/build checks, and tests |
+| Java client | build the Java client library, CLI, and tests |
+| Integration tests | run them only when the required MXAccess COM component, provider state, and external services are available; otherwise document why they were skipped |
+
+Update affected documentation in the same change as the source update. This
+includes `gateway.md`, component design docs under `docs/`, client docs, API
+contract notes, test instructions, and operational guidance. Documentation must
+follow `StyleGuide.md`: write technical present-tense prose, explain the reason
+for non-obvious choices, use exact code names, specify languages on code
+blocks, use relative links for internal docs, and avoid stale temporary notes.
+Source code and contract changes must also follow the relevant language guide
+from the Style Guides section.
+
+Do not leave documentation describing old behavior after changing public APIs,
+contracts, configuration, build steps, security behavior, event shapes, value
+conversion, status mapping, lifecycle rules, or client semantics.
+
+## Implementation Priority
+
+Build the smallest end-to-end slice first:
+
+1. .NET 10 gateway starts.
+2. Client calls `OpenSession`.
+3. Gateway launches .NET Framework 4.8 x86 worker.
+4. Worker creates STA and MXAccess COM object.
+5. Client calls `Register`.
+6. Client calls `AddItem`.
+7. Client calls `Advise`.
+8. Worker forwards one `OnDataChange` event to the gateway.
+9. Gateway streams the event to the client.
+10. Client calls `CloseSession`.
+11. Gateway shuts down the worker.
+
+That slice proves the high-risk requirements: process isolation, STA ownership,
+message pumping, command routing, and event streaming.

CLAUDE.md

@@ -1,125 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Project Overview
-
-`mxaccessgw` is the MXAccess Gateway: a gRPC service that gives modern (.NET, Go, Rust, Python, Java) clients full MXAccess parity without forcing them to load 32-bit MXAccess COM, run x86, or own an STA message pump.
-
-The architecture is a two-process design — read `gateway.md` before making structural changes:
-
-- **Gateway** (`src/MxGateway.Server`, .NET 10, x64): ASP.NET Core gRPC server. Owns the public API, sessions, auth, the Blazor dashboard, and the Galaxy Repository SQL browse RPCs. **Never instantiates MXAccess COM directly.**
-- **Worker** (`src/MxGateway.Worker`, .NET Framework 4.8, **x86**): one process per session. Owns one MXAccess COM instance on a dedicated STA, pumps Windows messages, and converts COM events to protobuf.
-- **IPC**: gateway↔worker uses one bidirectional named pipe per worker (`mxaccess-gateway-{gatewayPid}-{sessionId}`) with length-prefixed `WorkerEnvelope` protobuf frames. Gateway hosts the pipe server and launches the worker. **gRPC is not used inside the worker** — .NET Framework 4.8 doesn't have a first-class gRPC stack.
-- **Contracts** (`src/MxGateway.Contracts`): multi-targets `net10.0;net48` and owns the `.proto` files (`mxaccess_gateway.proto`, `mxaccess_worker.proto`, `galaxy_repository.proto`). All other projects consume the generated types from here. Do not hand-edit anything under `Generated/`.
-
-The worker must do all MXAccess COM calls on its dedicated STA thread, and the STA loop must pump Windows messages (`MsgWaitForMultipleObjectsEx` + `PeekMessage`/`DispatchMessage`) so MXAccess events deliver. A plain blocking queue on an STA is not enough.
-
-## Build, Test, Run
-
-```powershell
-# Full solution build (gateway, worker, contracts, tests)
-dotnet build src/MxGateway.sln
-
-# Worker must be built x86 — the gateway looks for MxGateway.Worker.exe under bin\x86
-dotnet build src/MxGateway.Worker/MxGateway.Worker.csproj -p:Platform=x86
-
-# Gateway tests (no MXAccess required — uses FakeWorkerHarness)
-dotnet test src/MxGateway.Tests/MxGateway.Tests.csproj
-dotnet test src/MxGateway.Worker.Tests/MxGateway.Worker.Tests.csproj -p:Platform=x86
-
-# Run gateway locally (defaults bound under MxGateway:* in src/MxGateway.Server/appsettings.json)
-dotnet run --project src/MxGateway.Server/MxGateway.Server.csproj
-
-# API-key admin CLI (same exe, "apikey" subcommand)
-dotnet run --project src/MxGateway.Server/MxGateway.Server.csproj -- apikey create --display-name "dev" --scopes session,invoke,event,metadata,admin
-```
-
-Single test by name (xUnit `--filter`):
-
-```powershell
-dotnet test src/MxGateway.Tests/MxGateway.Tests.csproj --filter FullyQualifiedName~GatewayEndToEndFakeWorkerSmokeTests
-```
-
-Live MXAccess integration tests are **opt-in** because they need installed MXAccess COM and live provider state:
-
-```powershell
-$env:MXGATEWAY_RUN_LIVE_MXACCESS_TESTS = "1"
-dotnet test src/MxGateway.IntegrationTests/MxGateway.IntegrationTests.csproj --filter FullyQualifiedName~WorkerLiveMxAccessSmokeTests
-```
-
-Live LDAP tests use `MXGATEWAY_RUN_LIVE_LDAP_TESTS=1`. See `docs/GatewayTesting.md` for the full opt-in matrix and `LiveMxAccessFactAttribute` / `LiveLdapFactAttribute` for the gating logic.
-
-## Clients
-
-Each language client is in `clients/<lang>/` with its own README. They all consume the shared `.proto` files in `src/MxGateway.Contracts/Protos`:
-
-- `clients/dotnet`: `dotnet build clients/dotnet/MxGateway.Client.sln`
-- `clients/python`: `python -m pip install -e ".[dev]"; python -m pytest`
-- `clients/rust`: `cargo test --workspace; cargo clippy --workspace --all-targets -- -D warnings`
-- `clients/java`: `gradle test` (Java 21)
-- Go client lives alongside as `mxgw-go` in the cross-language matrix
-
-End-to-end matrix runner (needs running gateway + worker + valid API key):
-
-```powershell
-$env:MXGATEWAY_API_KEY = "<api-key>"
-powershell -ExecutionPolicy Bypass -File scripts/run-client-e2e-tests.ps1
-```
-
-## Repository-Specific Conventions
-
-- **Build properties** (`src/Directory.Build.props`) enforce `Nullable=enable`, `TreatWarningsAsErrors=true`, latest analyzers, and `EnforceCodeStyleInBuild=true`. New warnings break the build — fix them, don't suppress unless the suppression has a narrow reason.
-- **Style guides** in `docs/style-guides/` are authoritative. Follow `CSharpStyleGuide.md` for gateway/worker/.NET-client code: file-scoped namespaces, `sealed` by default, `Async` suffix on Task-returning methods, MXAccess-aligned names (`MxStatusProxy`, `ServerHandle`, `ItemHandle`, `HResult`).
-- **MXAccess parity is the contract.** Don't "fix" surprising MXAccess behavior (e.g., `WriteSecured` failing before a value-bearing NMX body, distinct `OperationComplete` semantics, invalid-handle exceptions) unless the client explicitly opts into a non-parity mode. The installed MXAccess COM component is the baseline.
-- **Don't synthesize events.** The gateway forwards only events the worker emits; it never invents `OperationComplete` from write completion or command replies.
-- **One worker per session, one event subscriber per session** (v1). Multi-subscriber fan-out and reconnectable sessions are explicitly out of scope — see `docs/DesignDecisions.md`.
-- **Gateway restart does not reattach orphan workers.** The first version terminates orphaned workers on startup; do not design code paths that assume reattachment.
-- **No Blazor UI component libraries.** Dashboard uses local Bootstrap CSS/JS only — do not introduce MudBlazor, Radzen, FluentUI, etc.
-- **Don't log secrets or full tag values by default.** API keys, passwords, `WriteSecured` payloads, and `AuthenticateUser` credentials must never reach logs. Value logging is opt-in and redacted.
-- **Generated code** under `src/MxGateway.Contracts/Generated/`, `clients/*/generated*/`, `clients/python/src/mxgateway/generated/`, etc., is build output. Don't hand-edit. To regenerate, build the contracts project (`dotnet build src/MxGateway.Contracts/MxGateway.Contracts.csproj`) or run the per-client generation step in that client's README.
-- **Documentation style** (`StyleGuide.md`): PascalCase filenames, no marketing language, present tense, explain *why* not *what*.
-- **Update docs in the same change as the source.** When public APIs, contracts, configuration, build steps, security behavior, event shapes, value conversion, status mapping, or lifecycle rules change, the affected docs (`gateway.md`, `docs/`, client READMEs, design docs) must change in the same commit. Don't leave stale prose describing old behavior.
-
-## Source Update Workflow
-
-When source code changes, build and test the affected component before reporting work done. If the change crosses component boundaries, build each affected component — don't rely on a single top-level build:
-
-| Changed area | Required verification |
-|---|---|
-| Contracts or `.proto` files | regenerate generated code, then build gateway, worker, and every generated client touched by the contract |
-| Gateway server, sessions, workers, gRPC, dashboard, metrics | `dotnet build src/MxGateway.Server` and run affected gateway / fake-worker tests |
-| Worker IPC, STA, MXAccess, conversion | `dotnet build src/MxGateway.Worker -p:Platform=x86` and run worker tests |
-| .NET client | `dotnet build clients/dotnet/MxGateway.Client.sln` and run its tests |
-| Go client | `gofmt`, `go build ./...`, `go test ./...` from `clients/go` |
-| Rust client | `cargo fmt`, `cargo check --workspace`, `cargo test --workspace`, `cargo clippy --all-targets -- -D warnings` from `clients/rust` |
-| Python client | `python -m pytest` from `clients/python` |
-| Java client | `gradle test` from `clients/java` |
-| Integration tests | run only when MXAccess COM, provider state, and external services are available; otherwise document why skipped |
-
-## Design Sources To Consult Before Non-Trivial Changes
-
-- `gateway.md` — top-level architecture, command/event surface, IPC envelope, STA thread model, fault handling.
-- `glauth.md` — local LDAP server (GLAuth on `localhost:3893`, base DN `dc=lmxopcua,dc=local`) used for dev authn. Pre-provisioned users (`admin/admin123`, `readonly/readonly123`, etc.) and the role→capability mapping live there.
-- `docs/DesignDecisions.md` — v1 choices (MXAccess COM target `LMXProxyServerClass` from `C:\Program Files (x86)\ArchestrA\Framework\Bin\ArchestrA.MXAccess.dll`, API-key-in-SQLite auth, fail-fast event backpressure, etc.).
-- `docs/GatewayProcessDesign.md`, `docs/MxAccessWorkerInstanceDesign.md`, `docs/WorkerFrameProtocol.md`, `docs/WorkerProcessLauncher.md` — detailed component designs.
-- `docs/GatewayConfiguration.md` — full `MxGateway:*` options bound by `GatewayOptions` and validated at startup by `GatewayOptionsValidator`.
-- `docs/GatewayTesting.md` — fake worker harness, live MXAccess smoke, parity matrix, cross-language smoke matrix.
-- `docs/ToolchainLinks.md` — installed compiler/SDK paths on this dev box (.NET 10.0.201, Go 1.26.2, Rust 1.95, Python 3.12.10, Temurin 21, protoc 34.1, etc.).
-
-External analysis sources referenced by design docs:
-
-- `C:\Users\dohertj2\Desktop\mxaccess` — MXAccess analysis project. Key files: `docs/MXAccess-Public-API.md` (COM class, ProgID, CLSID, method list, event signatures, `MxDataType`, `MxStatus`, `MXSTATUS_PROXY`), `docs/MXAccess-Reverse-Engineering.md` (installed runtime path, x86 COM constraints), `docs/Current-Sprint-State.md` (parity gaps), `src/MxTraceHarness/` (x86 harness using the real COM interop), `captures/` and `analysis/` (observed native behavior).
-- `C:\Users\dohertj2\Desktop\lmxopcua\gr` — Galaxy Repository (`ZB` SQL DB) notes. Key files: `connectioninfo.md`, `layout.md`, `schema.md`, `queries/hierarchy.sql`, `queries/attributes.sql`, `queries/attributes_extended.sql`, `queries/change_detection.sql`. Connection is SQL Server `localhost`, database `ZB`, Windows Auth.
-
-## Authentication
-
-Gateway gRPC clients authenticate with an API key in metadata: `authorization: Bearer mxgw_<key-id>_<secret>`. Keys are stored hashed (with a peppered SHA) in a gateway-owned SQLite DB (default `C:\ProgramData\MxGateway\gateway-auth.db`). Scopes (`session`, `invoke`, `event`, `metadata`, `admin`) gate specific RPCs; missing → `Unauthenticated`, insufficient → `PermissionDenied`. The `apikey` subcommand on the server exe manages keys; see `src/MxGateway.Server/Security/Authentication/`.
-
-Dashboard auth is LDAP-backed (separate from the gRPC API-key model). `/login` binds against `MxGateway:Ldap` and maps the user's LDAP groups to `Admin` or `Viewer` via `MxGateway:Dashboard:GroupToRole`, then issues an HTTP-only secure `__Host-MxGatewayDashboard` cookie. SignalR hubs at `/hubs/{snapshot,alarms,events}` accept either the cookie or a 30-minute bearer minted at `/hubs/token`. `Dashboard:AllowAnonymousLocalhost` bypasses auth on loopback when enabled.
-
-## Process / Platform Notes
-
-- Working tree is on Windows (`C:\Users\dohertj2\Desktop\mxaccessgw`). PowerShell is the native shell for tooling commands; bash is fine for git/grep/find.
-- The worker reference to `ArchestrA.MXAccess.dll` uses an absolute `HintPath` to `C:\Program Files (x86)\ArchestrA\Framework\Bin\ArchestrA.MXAccess.dll`. The worker only builds where MXAccess is installed (this dev box).
-- The repo is not a git repository at the top level — there's no `.git` directory in the working tree.

clients/dotnet/MxGateway.Client.Cli/CliArguments.cs

@@ -1,15 +1,12 @@
 using System.Globalization;
 
-namespace ZB.MOM.WW.MxGateway.Client.Cli;
+namespace MxGateway.Client.Cli;
 
-/// <summary>Parses command-line arguments into flags and named values.</summary>
 internal sealed class CliArguments
 {
     private readonly Dictionary<string, string> _values = new(StringComparer.OrdinalIgnoreCase);
     private readonly HashSet<string> _flags = new(StringComparer.OrdinalIgnoreCase);
 
-    /// <summary>Initializes a new instance by parsing the given command-line arguments.</summary>
-    /// <param name="args">Unparsed command-line arguments; flags prefixed with '--' and values follow their flag.</param>
     public CliArguments(IEnumerable<string> args)
     {
         string? pendingName = null;
@@ -42,15 +39,11 @@ internal sealed class CliArguments
         }
     }
 
-    /// <summary>Returns whether the named flag was present in the arguments.</summary>
-    /// <param name="name">The flag name (without '--' prefix).</param>
     public bool HasFlag(string name)
     {
         return _flags.Contains(name);
     }
 
-    /// <summary>Returns the value for a named argument, or <c>null</c> if absent.</summary>
-    /// <param name="name">The argument name (without '--' prefix).</param>
     public string? GetOptional(string name)
     {
         return _values.TryGetValue(name, out string? value)
@@ -58,8 +51,6 @@ internal sealed class CliArguments
             : null;
     }
 
-    /// <summary>Returns the value for a required named argument, or throws if absent.</summary>
-    /// <param name="name">The argument name (without '--' prefix).</param>
     public string GetRequired(string name)
     {
         string? value = GetOptional(name);
@@ -71,9 +62,6 @@ internal sealed class CliArguments
         return value;
     }
 
-    /// <summary>Parses and returns an int32 argument, or the default value if absent.</summary>
-    /// <param name="name">The argument name (without '--' prefix).</param>
-    /// <param name="defaultValue">The default value if the argument is absent; if <c>null</c>, the argument is required.</param>
     public int GetInt32(string name, int? defaultValue = null)
     {
         string? value = GetOptional(name);
@@ -90,9 +78,6 @@ internal sealed class CliArguments
         return int.Parse(value, CultureInfo.InvariantCulture);
     }
 
-    /// <summary>Parses and returns a uint32 argument, or the default value if absent.</summary>
-    /// <param name="name">The argument name (without '--' prefix).</param>
-    /// <param name="defaultValue">The default value if the argument is absent.</param>
     public uint GetUInt32(string name, uint defaultValue)
     {
         string? value = GetOptional(name);
@@ -101,9 +86,6 @@ internal sealed class CliArguments
             : uint.Parse(value, CultureInfo.InvariantCulture);
     }
 
-    /// <summary>Parses and returns a uint64 argument, or the default value if absent.</summary>
-    /// <param name="name">The argument name (without '--' prefix).</param>
-    /// <param name="defaultValue">The default value if the argument is absent.</param>
     public ulong GetUInt64(string name, ulong defaultValue)
     {
         string? value = GetOptional(name);
@@ -112,9 +94,6 @@ internal sealed class CliArguments
             : ulong.Parse(value, CultureInfo.InvariantCulture);
     }
 
-    /// <summary>Parses and returns a TimeSpan argument, or the default value if absent. Supports "ms", "s", and standard TimeSpan format.</summary>
-    /// <param name="name">The argument name (without '--' prefix).</param>
-    /// <param name="defaultValue">The default value if the argument is absent.</param>
     public TimeSpan GetDuration(string name, TimeSpan defaultValue)
     {
         string? value = GetOptional(name);

clients/dotnet/MxGateway.Client.Cli/IMxGatewayCliClient.cs

@@ -0,0 +1,39 @@
+using MxGateway.Contracts.Proto;
+using MxGateway.Contracts.Proto.Galaxy;
+
+namespace MxGateway.Client.Cli;
+
+public interface IMxGatewayCliClient : IAsyncDisposable
+{
+    Task<OpenSessionReply> OpenSessionAsync(
+        OpenSessionRequest request,
+        CancellationToken cancellationToken);
+
+    Task<CloseSessionReply> CloseSessionAsync(
+        CloseSessionRequest request,
+        CancellationToken cancellationToken);
+
+    Task<MxCommandReply> InvokeAsync(
+        MxCommandRequest request,
+        CancellationToken cancellationToken);
+
+    IAsyncEnumerable<MxEvent> StreamEventsAsync(
+        StreamEventsRequest request,
+        CancellationToken cancellationToken);
+
+    Task<TestConnectionReply> GalaxyTestConnectionAsync(
+        TestConnectionRequest request,
+        CancellationToken cancellationToken);
+
+    Task<GetLastDeployTimeReply> GalaxyGetLastDeployTimeAsync(
+        GetLastDeployTimeRequest request,
+        CancellationToken cancellationToken);
+
+    Task<DiscoverHierarchyReply> GalaxyDiscoverHierarchyAsync(
+        DiscoverHierarchyRequest request,
+        CancellationToken cancellationToken);
+
+    IAsyncEnumerable<DeployEvent> GalaxyWatchDeployEventsAsync(
+        WatchDeployEventsRequest request,
+        CancellationToken cancellationToken);
+}

clients/dotnet/MxGateway.Client.Cli/MxGateway.Client.Cli.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <ProjectReference Include="..\ZB.MOM.WW.MxGateway.Client\ZB.MOM.WW.MxGateway.Client.csproj" />
+    <ProjectReference Include="..\MxGateway.Client\MxGateway.Client.csproj" />
   </ItemGroup>
 
   <PropertyGroup>

clients/dotnet/MxGateway.Client.Cli/MxGatewayCliClientAdapter.cs

@@ -1,18 +1,14 @@
-using ZB.MOM.WW.MxGateway.Client;
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
+using MxGateway.Client;
+using MxGateway.Contracts.Proto;
+using MxGateway.Contracts.Proto.Galaxy;
 
-namespace ZB.MOM.WW.MxGateway.Client.Cli;
+namespace MxGateway.Client.Cli;
 
 internal sealed class MxGatewayCliClientAdapter : IMxGatewayCliClient
 {
     private readonly MxGatewayClient _client;
     private readonly Lazy<GalaxyRepositoryClient> _galaxyClient;
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MxGatewayCliClientAdapter"/> that bridges the CLI to the gateway client.
-    /// </summary>
-    /// <param name="client">The gateway client to adapt.</param>
     public MxGatewayCliClientAdapter(MxGatewayClient client)
     {
         _client = client;
@@ -20,7 +16,6 @@ internal sealed class MxGatewayCliClientAdapter : IMxGatewayCliClient
             () => GalaxyRepositoryClient.Create(_client.Options));
     }
 
-    /// <inheritdoc />
     public Task<OpenSessionReply> OpenSessionAsync(
         OpenSessionRequest request,
         CancellationToken cancellationToken)
@@ -28,7 +23,6 @@ internal sealed class MxGatewayCliClientAdapter : IMxGatewayCliClient
         return _client.OpenSessionRawAsync(request, cancellationToken);
     }
 
-    /// <inheritdoc />
     public Task<CloseSessionReply> CloseSessionAsync(
         CloseSessionRequest request,
         CancellationToken cancellationToken)
@@ -36,7 +30,6 @@ internal sealed class MxGatewayCliClientAdapter : IMxGatewayCliClient
         return _client.CloseSessionRawAsync(request, cancellationToken);
     }
 
-    /// <inheritdoc />
     public Task<MxCommandReply> InvokeAsync(
         MxCommandRequest request,
         CancellationToken cancellationToken)
@@ -44,7 +37,6 @@ internal sealed class MxGatewayCliClientAdapter : IMxGatewayCliClient
         return _client.InvokeAsync(request, cancellationToken);
     }
 
-    /// <inheritdoc />
     public IAsyncEnumerable<MxEvent> StreamEventsAsync(
         StreamEventsRequest request,
         CancellationToken cancellationToken)
@@ -52,23 +44,6 @@ internal sealed class MxGatewayCliClientAdapter : IMxGatewayCliClient
         return _client.StreamEventsAsync(request, cancellationToken);
     }
 
-    /// <inheritdoc />
-    public Task<AcknowledgeAlarmReply> AcknowledgeAlarmAsync(
-        AcknowledgeAlarmRequest request,
-        CancellationToken cancellationToken)
-    {
-        return _client.AcknowledgeAlarmAsync(request, cancellationToken);
-    }
-
-    /// <inheritdoc />
-    public IAsyncEnumerable<AlarmFeedMessage> StreamAlarmsAsync(
-        StreamAlarmsRequest request,
-        CancellationToken cancellationToken)
-    {
-        return _client.StreamAlarmsAsync(request, cancellationToken);
-    }
-
-    /// <inheritdoc />
     public Task<TestConnectionReply> GalaxyTestConnectionAsync(
         TestConnectionRequest request,
         CancellationToken cancellationToken)
@@ -76,7 +51,6 @@ internal sealed class MxGatewayCliClientAdapter : IMxGatewayCliClient
         return _galaxyClient.Value.TestConnectionRawAsync(request, cancellationToken);
     }
 
-    /// <inheritdoc />
     public Task<GetLastDeployTimeReply> GalaxyGetLastDeployTimeAsync(
         GetLastDeployTimeRequest request,
         CancellationToken cancellationToken)
@@ -84,7 +58,6 @@ internal sealed class MxGatewayCliClientAdapter : IMxGatewayCliClient
         return _galaxyClient.Value.GetLastDeployTimeRawAsync(request, cancellationToken);
     }
 
-    /// <inheritdoc />
     public Task<DiscoverHierarchyReply> GalaxyDiscoverHierarchyAsync(
         DiscoverHierarchyRequest request,
         CancellationToken cancellationToken)
@@ -92,7 +65,6 @@ internal sealed class MxGatewayCliClientAdapter : IMxGatewayCliClient
         return _galaxyClient.Value.DiscoverHierarchyRawAsync(request, cancellationToken);
     }
 
-    /// <inheritdoc />
     public IAsyncEnumerable<DeployEvent> GalaxyWatchDeployEventsAsync(
         WatchDeployEventsRequest request,
         CancellationToken cancellationToken)
@@ -100,7 +72,6 @@ internal sealed class MxGatewayCliClientAdapter : IMxGatewayCliClient
         return _galaxyClient.Value.WatchDeployEventsRawAsync(request, cancellationToken);
     }
 
-    /// <inheritdoc />
     public async ValueTask DisposeAsync()
     {
         if (_galaxyClient.IsValueCreated)

clients/dotnet/MxGateway.Client.Cli/MxGatewayCliSecretRedactor.cs

@@ -0,0 +1,14 @@
+namespace MxGateway.Client.Cli;
+
+internal static class MxGatewayCliSecretRedactor
+{
+    public static string Redact(string value, string? apiKey)
+    {
+        if (string.IsNullOrEmpty(value) || string.IsNullOrEmpty(apiKey))
+        {
+            return value;
+        }
+
+        return value.Replace(apiKey, "[redacted]", StringComparison.Ordinal);
+    }
+}

clients/dotnet/MxGateway.Client.Cli/MxGatewayClientCli.cs

@@ -1,13 +1,12 @@
 using System.Globalization;
 using System.Text.Json;
 using Google.Protobuf;
-using ZB.MOM.WW.MxGateway.Client;
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
+using MxGateway.Client;
+using MxGateway.Contracts.Proto;
+using MxGateway.Contracts.Proto.Galaxy;
 
-namespace ZB.MOM.WW.MxGateway.Client.Cli;
+namespace MxGateway.Client.Cli;
 
-/// <summary>Command-line interface for the MXAccess Gateway client, supporting session and command operations.</summary>
 public static class MxGatewayClientCli
 {
     private const uint MaxAggregateEvents = 10_000;
@@ -16,34 +15,21 @@ public static class MxGatewayClientCli
 
     private static readonly JsonSerializerOptions JsonOptions = new(JsonSerializerDefaults.Web);
 
-    private const string BatchEndOfRecord = "__MXGW_BATCH_EOR__";
-
-    /// <summary>Runs the CLI synchronously with the given arguments, writing output and errors.</summary>
-    /// <param name="args">Command-line arguments (command name followed by options).</param>
-    /// <param name="standardOutput">TextWriter for command output.</param>
-    /// <param name="standardError">TextWriter for error messages.</param>
     public static int Run(
         string[] args,
         TextWriter standardOutput,
         TextWriter standardError)
     {
-        return RunAsync(args, standardOutput, standardError, clientFactory: null, standardInput: null)
+        return RunAsync(args, standardOutput, standardError)
             .GetAwaiter()
             .GetResult();
     }
 
-    /// <summary>Runs the CLI asynchronously with the given arguments, writing output and errors.</summary>
-    /// <param name="args">Command-line arguments (command name followed by options).</param>
-    /// <param name="standardOutput">TextWriter for command output.</param>
-    /// <param name="standardError">TextWriter for error messages.</param>
-    /// <param name="clientFactory">Optional factory to create the gateway client; defaults to MxGatewayClient.Create.</param>
-    /// <param name="standardInput">Optional TextReader for batch-mode stdin; defaults to <see cref="Console.In"/>.</param>
     public static Task<int> RunAsync(
         string[] args,
         TextWriter standardOutput,
         TextWriter standardError,
-        Func<MxGatewayClientOptions, IMxGatewayCliClient>? clientFactory = null,
-        TextReader? standardInput = null)
+        Func<MxGatewayClientOptions, IMxGatewayCliClient>? clientFactory = null)
     {
         ArgumentNullException.ThrowIfNull(args);
         ArgumentNullException.ThrowIfNull(standardOutput);
@@ -53,17 +39,14 @@ public static class MxGatewayClientCli
             args,
             standardOutput,
             standardError,
-            clientFactory ?? CreateDefaultClient,
-            standardInput ?? Console.In);
+            clientFactory ?? CreateDefaultClient);
     }
 
     private static async Task<int> RunCoreAsync(
         string[] args,
         TextWriter standardOutput,
         TextWriter standardError,
-        Func<MxGatewayClientOptions, IMxGatewayCliClient> clientFactory,
-        TextReader standardInput,
-        bool forceJsonErrors = false)
+        Func<MxGatewayClientOptions, IMxGatewayCliClient> clientFactory)
     {
         if (args.Length is 0 || IsHelp(args[0]))
         {
@@ -72,12 +55,6 @@ public static class MxGatewayClientCli
         }
 
         string command = args[0].ToLowerInvariant();
-
-        if (command is "batch")
-        {
-            return await RunBatchAsync(standardOutput, clientFactory, standardInput).ConfigureAwait(false);
-        }
-
         CliArguments arguments = new(args.Skip(1));
 
         try
@@ -114,24 +91,8 @@ public static class MxGatewayClientCli
                     .ConfigureAwait(false),
                 "unsubscribe-bulk" => await UnsubscribeBulkAsync(arguments, client, standardOutput, cancellation.Token)
                     .ConfigureAwait(false),
-                "read-bulk" => await ReadBulkAsync(arguments, client, standardOutput, cancellation.Token)
-                    .ConfigureAwait(false),
-                "write-bulk" => await WriteBulkAsync(arguments, client, standardOutput, cancellation.Token)
-                    .ConfigureAwait(false),
-                "write2-bulk" => await Write2BulkAsync(arguments, client, standardOutput, cancellation.Token)
-                    .ConfigureAwait(false),
-                "write-secured-bulk" => await WriteSecuredBulkAsync(arguments, client, standardOutput, cancellation.Token)
-                    .ConfigureAwait(false),
-                "write-secured2-bulk" => await WriteSecured2BulkAsync(arguments, client, standardOutput, cancellation.Token)
-                    .ConfigureAwait(false),
-                "bench-read-bulk" => await BenchReadBulkAsync(arguments, client, standardOutput, cancellation.Token)
-                    .ConfigureAwait(false),
                 "stream-events" => await StreamEventsAsync(arguments, client, standardOutput, cancellation.Token)
                     .ConfigureAwait(false),
-                "stream-alarms" => await StreamAlarmsAsync(arguments, client, standardOutput, cancellation.Token)
-                    .ConfigureAwait(false),
-                "acknowledge-alarm" => await AcknowledgeAlarmAsync(arguments, client, standardOutput, cancellation.Token)
-                    .ConfigureAwait(false),
                 "write" => await WriteAsync(arguments, client, standardOutput, cancellation.Token)
                     .ConfigureAwait(false),
                 "write2" => await Write2Async(arguments, client, standardOutput, cancellation.Token)
@@ -154,7 +115,7 @@ public static class MxGatewayClientCli
             string? apiKey = arguments.GetOptional("api-key");
             string message = MxGatewayCliSecretRedactor.Redact(exception.Message, apiKey);
 
-            if (forceJsonErrors || arguments.HasFlag("json"))
+            if (arguments.HasFlag("json"))
             {
                 standardError.WriteLine(JsonSerializer.Serialize(
                     new { error = message, type = exception.GetType().Name },
@@ -169,86 +130,6 @@ public static class MxGatewayClientCli
         }
     }
 
-    /// <summary>
-    ///     Runs the CLI in batch mode: reads one command line at a time from
-    ///     <paramref name="standardInput"/>, dispatches it through the normal
-    ///     routing, writes all output to <paramref name="standardOutput"/>, and
-    ///     then appends <see cref="BatchEndOfRecord"/> as a sentinel so the
-    ///     caller can delimit command results. Continues on failure; errors are
-    ///     written as JSON to <paramref name="standardOutput"/> (not stderr) so
-    ///     that the harness sees them inside the same delimited block. Exits 0
-    ///     on EOF or empty line.
-    /// </summary>
-    private static async Task<int> RunBatchAsync(
-        TextWriter standardOutput,
-        Func<MxGatewayClientOptions, IMxGatewayCliClient> clientFactory,
-        TextReader standardInput)
-    {
-        while (true)
-        {
-            string? line = await standardInput.ReadLineAsync().ConfigureAwait(false);
-
-            // EOF or empty line signals clean exit.
-            if (line is null || line.Length is 0)
-            {
-                return 0;
-            }
-
-            // Split on runs of ASCII whitespace — no quoting support by design.
-            string[] lineArgs = line.Split((char[]?)null, StringSplitOptions.RemoveEmptyEntries);
-
-            // Per-command output is buffered so we can redirect errors to stdout.
-            using StringWriter commandOutput = new();
-
-            // Errors in batch mode go to stdout (same delimited block), formatted as JSON.
-            // We use a capturing error writer and re-emit through commandOutput after the
-            // command returns, so the EOR sentinel always follows the complete result.
-            using StringWriter commandError = new();
-
-            try
-            {
-                await RunCoreAsync(
-                        lineArgs,
-                        commandOutput,
-                        commandError,
-                        clientFactory,
-                        standardInput,
-                        forceJsonErrors: true)
-                    .ConfigureAwait(false);
-            }
-            catch (Exception exception)
-            {
-                // Unexpected exception that escaped RunCoreAsync (shouldn't happen, but be safe).
-                // OperationCanceledException from long-running streaming commands
-                // (e.g. galaxy-watch hit by --timeout) is caught here too — the
-                // batch process must continue with the next command rather than
-                // unwinding.
-                commandError.WriteLine(JsonSerializer.Serialize(
-                    new { error = exception.Message, type = exception.GetType().Name },
-                    JsonOptions));
-            }
-
-            // Write any buffered normal output first.
-            string commandOutputText = commandOutput.ToString();
-            if (commandOutputText.Length > 0)
-            {
-                standardOutput.Write(commandOutputText);
-            }
-
-            // Then any error output — in batch mode it belongs on stdout so the harness
-            // sees it inside the delimited record.
-            string commandErrorText = commandError.ToString();
-            if (commandErrorText.Length > 0)
-            {
-                standardOutput.Write(commandErrorText);
-            }
-
-            // Write the end-of-record sentinel and flush so the harness can unblock.
-            standardOutput.WriteLine(BatchEndOfRecord);
-            await standardOutput.FlushAsync().ConfigureAwait(false);
-        }
-    }
-
     private static IMxGatewayCliClient CreateDefaultClient(MxGatewayClientOptions options)
     {
         return new MxGatewayCliClientAdapter(MxGatewayClient.Create(options));
@@ -478,451 +359,6 @@ public static class MxGatewayClientCli
             cancellationToken);
     }
 
-    private static Task<int> ReadBulkAsync(
-        CliArguments arguments,
-        IMxGatewayCliClient client,
-        TextWriter output,
-        CancellationToken cancellationToken)
-    {
-        ReadBulkCommand command = new()
-        {
-            ServerHandle = arguments.GetInt32("server-handle"),
-            TimeoutMs = (uint)arguments.GetInt32("timeout-ms", 0),
-        };
-        command.TagAddresses.Add(ParseStringList(arguments.GetRequired("items")));
-
-        return InvokeAndWriteAsync(
-            arguments,
-            client,
-            output,
-            new MxCommand
-            {
-                Kind = MxCommandKind.ReadBulk,
-                ReadBulk = command,
-            },
-            cancellationToken);
-    }
-
-    private static Task<int> WriteBulkAsync(
-        CliArguments arguments,
-        IMxGatewayCliClient client,
-        TextWriter output,
-        CancellationToken cancellationToken)
-    {
-        WriteBulkCommand command = new()
-        {
-            ServerHandle = arguments.GetInt32("server-handle"),
-        };
-
-        IReadOnlyList<int> handles = ParseInt32List(arguments.GetRequired("item-handles"));
-        IReadOnlyList<MxValue> values = ParseValuesList(arguments);
-        int userId = arguments.GetInt32("user-id", 0);
-        EnsureSameLength(handles.Count, values.Count);
-
-        for (int i = 0; i < handles.Count; i++)
-        {
-            command.Entries.Add(new WriteBulkEntry
-            {
-                ItemHandle = handles[i],
-                Value = values[i],
-                UserId = userId,
-            });
-        }
-
-        return InvokeAndWriteAsync(
-            arguments,
-            client,
-            output,
-            new MxCommand
-            {
-                Kind = MxCommandKind.WriteBulk,
-                WriteBulk = command,
-            },
-            cancellationToken);
-    }
-
-    private static Task<int> Write2BulkAsync(
-        CliArguments arguments,
-        IMxGatewayCliClient client,
-        TextWriter output,
-        CancellationToken cancellationToken)
-    {
-        Write2BulkCommand command = new()
-        {
-            ServerHandle = arguments.GetInt32("server-handle"),
-        };
-
-        IReadOnlyList<int> handles = ParseInt32List(arguments.GetRequired("item-handles"));
-        IReadOnlyList<MxValue> values = ParseValuesList(arguments);
-        MxValue timestampValue = ParseTimestampValue(arguments);
-        int userId = arguments.GetInt32("user-id", 0);
-        EnsureSameLength(handles.Count, values.Count);
-
-        for (int i = 0; i < handles.Count; i++)
-        {
-            command.Entries.Add(new Write2BulkEntry
-            {
-                ItemHandle = handles[i],
-                Value = values[i],
-                TimestampValue = timestampValue,
-                UserId = userId,
-            });
-        }
-
-        return InvokeAndWriteAsync(
-            arguments,
-            client,
-            output,
-            new MxCommand
-            {
-                Kind = MxCommandKind.Write2Bulk,
-                Write2Bulk = command,
-            },
-            cancellationToken);
-    }
-
-    private static Task<int> WriteSecuredBulkAsync(
-        CliArguments arguments,
-        IMxGatewayCliClient client,
-        TextWriter output,
-        CancellationToken cancellationToken)
-    {
-        WriteSecuredBulkCommand command = new()
-        {
-            ServerHandle = arguments.GetInt32("server-handle"),
-        };
-
-        IReadOnlyList<int> handles = ParseInt32List(arguments.GetRequired("item-handles"));
-        IReadOnlyList<MxValue> values = ParseValuesList(arguments);
-        int currentUserId = arguments.GetInt32("current-user-id");
-        int verifierUserId = arguments.GetInt32("verifier-user-id", 0);
-        EnsureSameLength(handles.Count, values.Count);
-
-        for (int i = 0; i < handles.Count; i++)
-        {
-            command.Entries.Add(new WriteSecuredBulkEntry
-            {
-                ItemHandle = handles[i],
-                Value = values[i],
-                CurrentUserId = currentUserId,
-                VerifierUserId = verifierUserId,
-            });
-        }
-
-        return InvokeAndWriteAsync(
-            arguments,
-            client,
-            output,
-            new MxCommand
-            {
-                Kind = MxCommandKind.WriteSecuredBulk,
-                WriteSecuredBulk = command,
-            },
-            cancellationToken);
-    }
-
-    private static Task<int> WriteSecured2BulkAsync(
-        CliArguments arguments,
-        IMxGatewayCliClient client,
-        TextWriter output,
-        CancellationToken cancellationToken)
-    {
-        WriteSecured2BulkCommand command = new()
-        {
-            ServerHandle = arguments.GetInt32("server-handle"),
-        };
-
-        IReadOnlyList<int> handles = ParseInt32List(arguments.GetRequired("item-handles"));
-        IReadOnlyList<MxValue> values = ParseValuesList(arguments);
-        MxValue timestampValue = ParseTimestampValue(arguments);
-        int currentUserId = arguments.GetInt32("current-user-id");
-        int verifierUserId = arguments.GetInt32("verifier-user-id", 0);
-        EnsureSameLength(handles.Count, values.Count);
-
-        for (int i = 0; i < handles.Count; i++)
-        {
-            command.Entries.Add(new WriteSecured2BulkEntry
-            {
-                ItemHandle = handles[i],
-                Value = values[i],
-                TimestampValue = timestampValue,
-                CurrentUserId = currentUserId,
-                VerifierUserId = verifierUserId,
-            });
-        }
-
-        return InvokeAndWriteAsync(
-            arguments,
-            client,
-            output,
-            new MxCommand
-            {
-                Kind = MxCommandKind.WriteSecured2Bulk,
-                WriteSecured2Bulk = command,
-            },
-            cancellationToken);
-    }
-
-    /// <summary>
-    ///     Parses the bulk-write CLI's <c>--values</c> list. All entries share
-    ///     the single <c>--type</c> argument; the comma-separated values are
-    ///     each parsed via <see cref="ParseValue(string, string)"/> on a per-entry basis.
-    ///     This keeps the CLI simple for e2e use (one type, N values) — callers
-    ///     that need heterogeneous types per entry should drive the library
-    ///     directly.
-    /// </summary>
-    private static IReadOnlyList<MxValue> ParseValuesList(CliArguments arguments)
-    {
-        string type = arguments.GetRequired("type");
-        string[] values = ParseStringList(arguments.GetRequired("values")).ToArray();
-        MxValue[] result = new MxValue[values.Length];
-        for (int i = 0; i < values.Length; i++)
-        {
-            result[i] = ParseValue(type, values[i]);
-        }
-        return result;
-    }
-
-    private static void EnsureSameLength(int handles, int values)
-    {
-        if (handles != values)
-        {
-            throw new ArgumentException(
-                $"Bulk write requires the same number of --item-handles ({handles}) and --values ({values}).");
-        }
-    }
-
-    /// <summary>
-    ///     Cross-language stress benchmark for ReadBulk. Opens its own session,
-    ///     subscribes to N tags so the worker's MxAccessValueCache populates from
-    ///     real OnDataChange events, then hammers ReadBulk in a tight in-process
-    ///     loop with per-call Stopwatch timing. Emits a single JSON object on
-    ///     stdout that the scripts/bench-read-bulk.ps1 driver collates across
-    ///     all five language clients.
-    /// </summary>
-    private static async Task<int> BenchReadBulkAsync(
-        CliArguments arguments,
-        IMxGatewayCliClient client,
-        TextWriter output,
-        CancellationToken cancellationToken)
-    {
-        int durationSeconds = arguments.GetInt32("duration-seconds", 30);
-        int warmupSeconds = arguments.GetInt32("warmup-seconds", 3);
-        int bulkSize = arguments.GetInt32("bulk-size", 6);
-        int tagStart = arguments.GetInt32("tag-start", 1);
-        string tagPrefix = arguments.GetOptional("tag-prefix") ?? "TestMachine_";
-        string tagAttribute = arguments.GetOptional("tag-attribute") ?? "TestChangingInt";
-        uint timeoutMs = (uint)arguments.GetInt32("timeout-ms", 1500);
-        string clientName = arguments.GetOptional("client-name") ?? "mxgw-dotnet-bench";
-
-        string[] tags = new string[bulkSize];
-        for (int i = 0; i < bulkSize; i++)
-        {
-            // TestMachine_NNN.<attribute>, three-digit machine numbers matching
-            // the existing e2e tag-discovery convention.
-            tags[i] = $"{tagPrefix}{(tagStart + i):D3}.{tagAttribute}";
-        }
-
-        // Open + register + subscribe-bulk so the cache populates before the
-        // measurement window opens.
-        OpenSessionReply openReply = await client.OpenSessionAsync(
-                new OpenSessionRequest { ClientSessionName = clientName, ClientCorrelationId = CreateCorrelationId() },
-                cancellationToken)
-            .ConfigureAwait(false);
-        string sessionId = openReply.SessionId;
-
-        try
-        {
-            MxCommandReply registerReply = await InvokeAndEnsureAsync(
-                    client,
-                    CreateCommandRequest(sessionId, new MxCommand
-                    {
-                        Kind = MxCommandKind.Register,
-                        Register = new RegisterCommand { ClientName = clientName },
-                    }),
-                    cancellationToken)
-                .ConfigureAwait(false);
-            int serverHandle = registerReply.Register?.ServerHandle ?? registerReply.ReturnValue.Int32Value;
-
-            SubscribeBulkCommand subscribe = new() { ServerHandle = serverHandle };
-            subscribe.TagAddresses.Add(tags);
-            MxCommandReply subscribeReply = await InvokeAndEnsureAsync(
-                    client,
-                    CreateCommandRequest(sessionId, new MxCommand
-                    {
-                        Kind = MxCommandKind.SubscribeBulk,
-                        SubscribeBulk = subscribe,
-                    }),
-                    cancellationToken)
-                .ConfigureAwait(false);
-            int[] itemHandles = subscribeReply.SubscribeBulk?.Results
-                .Where(r => r.WasSuccessful)
-                .Select(r => r.ItemHandle)
-                .ToArray() ?? [];
-
-            // Warm-up: drive the same call shape so the JIT / connection
-            // pipelines settle before the measurement window opens.
-            DateTime warmupDeadline = DateTime.UtcNow + TimeSpan.FromSeconds(warmupSeconds);
-            ReadBulkCommand readBulkCommand = new()
-            {
-                ServerHandle = serverHandle,
-                TimeoutMs = timeoutMs,
-            };
-            readBulkCommand.TagAddresses.Add(tags);
-            MxCommand readBulkMxCommand = new() { Kind = MxCommandKind.ReadBulk, ReadBulk = readBulkCommand };
-
-            while (DateTime.UtcNow < warmupDeadline)
-            {
-                _ = await client.InvokeAsync(
-                        CreateCommandRequest(sessionId, readBulkMxCommand),
-                        cancellationToken)
-                    .ConfigureAwait(false);
-            }
-
-            // Steady state — capture per-call wall latency with a high-res
-            // Stopwatch so the resolution is sub-millisecond on modern Windows.
-            List<double> latencyMillis = new(capacity: 65536);
-            long totalReadResults = 0;
-            long cachedReadResults = 0;
-            int successfulCalls = 0;
-            int failedCalls = 0;
-            DateTime steadyDeadline = DateTime.UtcNow + TimeSpan.FromSeconds(durationSeconds);
-            DateTime steadyStart = DateTime.UtcNow;
-
-            while (DateTime.UtcNow < steadyDeadline)
-            {
-                System.Diagnostics.Stopwatch sw = System.Diagnostics.Stopwatch.StartNew();
-                MxCommandReply reply;
-                try
-                {
-                    reply = await client.InvokeAsync(
-                            CreateCommandRequest(sessionId, readBulkMxCommand),
-                            cancellationToken)
-                        .ConfigureAwait(false);
-                    sw.Stop();
-                }
-                catch
-                {
-                    sw.Stop();
-                    failedCalls++;
-                    latencyMillis.Add(sw.Elapsed.TotalMilliseconds);
-                    continue;
-                }
-
-                latencyMillis.Add(sw.Elapsed.TotalMilliseconds);
-                if (reply.ProtocolStatus?.Code != ProtocolStatusCode.Ok)
-                {
-                    failedCalls++;
-                    continue;
-                }
-
-                successfulCalls++;
-                if (reply.ReadBulk is not null)
-                {
-                    foreach (BulkReadResult r in reply.ReadBulk.Results)
-                    {
-                        totalReadResults++;
-                        if (r.WasCached)
-                        {
-                            cachedReadResults++;
-                        }
-                    }
-                }
-            }
-
-            double steadyElapsedSeconds = (DateTime.UtcNow - steadyStart).TotalSeconds;
-
-            if (itemHandles.Length > 0)
-            {
-                UnsubscribeBulkCommand unsubscribe = new() { ServerHandle = serverHandle };
-                unsubscribe.ItemHandles.Add(itemHandles);
-                _ = await client.InvokeAsync(
-                        CreateCommandRequest(sessionId, new MxCommand
-                        {
-                            Kind = MxCommandKind.UnsubscribeBulk,
-                            UnsubscribeBulk = unsubscribe,
-                        }),
-                        cancellationToken)
-                    .ConfigureAwait(false);
-            }
-
-            int totalCalls = successfulCalls + failedCalls;
-            double callsPerSecond = steadyElapsedSeconds > 0
-                ? totalCalls / steadyElapsedSeconds
-                : 0;
-
-            object stats = new
-            {
-                language = "dotnet",
-                command = "bench-read-bulk",
-                endpoint = arguments.GetOptional("endpoint") ?? "(default)",
-                clientName,
-                bulkSize,
-                durationSeconds,
-                warmupSeconds,
-                durationMs = (long)(steadyElapsedSeconds * 1000),
-                tags,
-                totalCalls,
-                successfulCalls,
-                failedCalls,
-                totalReadResults,
-                cachedReadResults,
-                callsPerSecond = Math.Round(callsPerSecond, 2),
-                latencyMs = new
-                {
-                    p50 = Percentile(latencyMillis, 0.50),
-                    p95 = Percentile(latencyMillis, 0.95),
-                    p99 = Percentile(latencyMillis, 0.99),
-                    max = latencyMillis.Count > 0 ? Math.Round(latencyMillis.Max(), 3) : 0,
-                    mean = latencyMillis.Count > 0 ? Math.Round(latencyMillis.Average(), 3) : 0,
-                },
-            };
-            output.WriteLine(JsonSerializer.Serialize(stats, JsonOptions));
-            return 0;
-        }
-        finally
-        {
-            try
-            {
-                await client.CloseSessionAsync(
-                        new CloseSessionRequest { SessionId = sessionId, ClientCorrelationId = CreateCorrelationId() },
-                        cancellationToken)
-                    .ConfigureAwait(false);
-            }
-            catch
-            {
-                // Closing the session is best-effort — never let it mask a real bench error.
-            }
-        }
-    }
-
-    /// <summary>
-    /// Computes the requested percentile from an unsorted latency sample using
-    /// nearest-rank with linear interpolation. Rounds to 3 decimal places to
-    /// match the JSON schema the PS driver collates.
-    /// </summary>
-    private static double Percentile(IReadOnlyList<double> sample, double quantile)
-    {
-        if (sample.Count == 0)
-        {
-            return 0;
-        }
-
-        double[] sorted = sample.ToArray();
-        Array.Sort(sorted);
-        if (sorted.Length == 1)
-        {
-            return Math.Round(sorted[0], 3);
-        }
-
-        double rank = quantile * (sorted.Length - 1);
-        int lower = (int)Math.Floor(rank);
-        int upper = (int)Math.Ceiling(rank);
-        double fraction = rank - lower;
-        double value = sorted[lower] + (sorted[upper] - sorted[lower]) * fraction;
-        return Math.Round(value, 3);
-    }
-
     private static Task<int> WriteAsync(
         CliArguments arguments,
         IMxGatewayCliClient client,
@@ -1001,36 +437,28 @@ public static class MxGatewayClientCli
             AfterWorkerSequence = arguments.GetUInt64("after-worker-sequence", 0),
         };
 
-        try
+        await foreach (MxEvent gatewayEvent in client.StreamEventsAsync(request, cancellationToken)
+            .WithCancellation(cancellationToken)
+            .ConfigureAwait(false))
         {
-            await foreach (MxEvent gatewayEvent in client.StreamEventsAsync(request, cancellationToken)
-                .WithCancellation(cancellationToken)
-                .ConfigureAwait(false))
+            if (jsonLines)
             {
-                if (jsonLines)
-                {
-                    output.WriteLine(ProtobufJsonFormatter.Format(gatewayEvent));
-                }
-                else if (json)
-                {
-                    events.Add(gatewayEvent);
-                }
-                else
-                {
-                    output.WriteLine(ProtobufJsonFormatter.Format(gatewayEvent));
-                }
-
-                eventCount++;
-                if (maxEvents > 0 && eventCount >= maxEvents)
-                {
-                    break;
-                }
+                output.WriteLine(ProtobufJsonFormatter.Format(gatewayEvent));
+            }
+            else if (json)
+            {
+                events.Add(gatewayEvent);
+            }
+            else
+            {
+                output.WriteLine(ProtobufJsonFormatter.Format(gatewayEvent));
+            }
+
+            eventCount++;
+            if (maxEvents > 0 && eventCount >= maxEvents)
+            {
+                break;
             }
-        }
-        catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
-        {
-            // Client.Dotnet-017: graceful end-of-window completion mode for a
-            // finite-window event collector. Emit aggregate JSON below and exit 0.
         }
 
         if (json && !jsonLines)
@@ -1043,124 +471,6 @@ public static class MxGatewayClientCli
         return 0;
     }
 
-    private static async Task<int> StreamAlarmsAsync(
-        CliArguments arguments,
-        IMxGatewayCliClient client,
-        TextWriter output,
-        CancellationToken cancellationToken)
-    {
-        uint maxEvents = arguments.GetUInt32("max-events", 0);
-        bool json = arguments.HasFlag("json");
-        bool jsonLines = arguments.HasFlag("jsonl");
-        if (json && !jsonLines && maxEvents is 0)
-        {
-            throw new ArgumentException("--json stream-alarms requires --max-events to bound aggregate output.");
-        }
-
-        if (maxEvents > MaxAggregateEvents)
-        {
-            throw new ArgumentException($"--max-events cannot exceed {MaxAggregateEvents}.");
-        }
-
-        var messages = json && !jsonLines
-            ? new List<AlarmFeedMessage>(checked((int)maxEvents))
-            : [];
-        uint messageCount = 0;
-        var request = new StreamAlarmsRequest
-        {
-            ClientCorrelationId = CreateCorrelationId(),
-            AlarmFilterPrefix = arguments.GetOptional("filter-prefix") ?? string.Empty,
-        };
-
-        try
-        {
-            await foreach (AlarmFeedMessage feedMessage in client.StreamAlarmsAsync(request, cancellationToken)
-                .WithCancellation(cancellationToken)
-                .ConfigureAwait(false))
-            {
-                if (jsonLines)
-                {
-                    output.WriteLine(ProtobufJsonFormatter.Format(feedMessage));
-                }
-                else if (json)
-                {
-                    messages.Add(feedMessage);
-                }
-                else
-                {
-                    output.WriteLine(FormatAlarmFeedMessage(feedMessage));
-                }
-
-                messageCount++;
-                if (maxEvents > 0 && messageCount >= maxEvents)
-                {
-                    break;
-                }
-            }
-        }
-        catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
-        {
-            // Mirrors stream-events (Client.Dotnet-017): the supplied token covers
-            // the user's --timeout wall-clock budget and external Ctrl+C / parent
-            // CTS cancellation. All are graceful completion modes for a
-            // finite-window alarm-feed collector: emit what arrived and exit 0.
-        }
-
-        if (json && !jsonLines)
-        {
-            output.WriteLine(JsonSerializer.Serialize(
-                new { alarms = messages.Select(AlarmFeedMessageToJsonElement).ToArray() },
-                JsonOptions));
-        }
-
-        return 0;
-    }
-
-    private static Task<int> AcknowledgeAlarmAsync(
-        CliArguments arguments,
-        IMxGatewayCliClient client,
-        TextWriter output,
-        CancellationToken cancellationToken)
-    {
-        var request = new AcknowledgeAlarmRequest
-        {
-            ClientCorrelationId = CreateCorrelationId(),
-            AlarmFullReference = arguments.GetRequired("reference"),
-            Comment = arguments.GetOptional("comment") ?? string.Empty,
-            OperatorUser = arguments.GetOptional("operator") ?? string.Empty,
-        };
-
-        return WriteReplyAsync(
-            client.AcknowledgeAlarmAsync(request, cancellationToken),
-            arguments,
-            output);
-    }
-
-    /// <summary>
-    /// Renders one <see cref="AlarmFeedMessage"/> for the human-readable
-    /// (non-JSON) stream-alarms output, distinguishing the <c>payload</c> oneof
-    /// arms: a snapshot active alarm, the snapshot-complete sentinel, or a live
-    /// transition.
-    /// </summary>
-    private static string FormatAlarmFeedMessage(AlarmFeedMessage feedMessage)
-    {
-        return feedMessage.PayloadCase switch
-        {
-            AlarmFeedMessage.PayloadOneofCase.ActiveAlarm =>
-                $"active-alarm {ProtobufJsonFormatter.Format(feedMessage.ActiveAlarm)}",
-            AlarmFeedMessage.PayloadOneofCase.SnapshotComplete =>
-                $"snapshot-complete {feedMessage.SnapshotComplete}",
-            AlarmFeedMessage.PayloadOneofCase.Transition =>
-                $"transition {ProtobufJsonFormatter.Format(feedMessage.Transition)}",
-            _ => $"unknown-payload {feedMessage.PayloadCase}",
-        };
-    }
-
-    private static JsonElement AlarmFeedMessageToJsonElement(AlarmFeedMessage feedMessage)
-    {
-        return JsonDocument.Parse(ProtobufJsonFormatter.Format(feedMessage)).RootElement.Clone();
-    }
-
     private static async Task<int> SmokeAsync(
         CliArguments arguments,
         IMxGatewayCliClient client,
@@ -1435,15 +745,11 @@ public static class MxGatewayClientCli
 
     private static MxValue ParseValue(CliArguments arguments)
     {
-        return ParseValue(arguments.GetRequired("type"), arguments.GetRequired("value"));
-    }
-
-    private static MxValue ParseValue(string type, string value)
-    {
-        string normalisedType = type.ToLowerInvariant();
+        string type = arguments.GetRequired("type").ToLowerInvariant();
+        string value = arguments.GetRequired("value");
         string[] values = value.Split(',', StringSplitOptions.TrimEntries);
 
-        return normalisedType switch
+        return type switch
         {
             "bool" or "boolean" => bool.Parse(value).ToMxValue(),
             "bool-array" or "boolean-array" => values.Select(bool.Parse).ToArray().ToMxValue(),
@@ -1462,7 +768,7 @@ public static class MxGatewayClientCli
                 .Select(item => DateTimeOffset.Parse(item, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal))
                 .ToArray()
                 .ToMxValue(),
-            _ => throw new ArgumentException($"Unsupported MX value type '{normalisedType}'."),
+            _ => throw new ArgumentException($"Unsupported MX value type '{type}'."),
         };
     }
 
@@ -1673,15 +979,7 @@ public static class MxGatewayClientCli
             or "advise"
             or "subscribe-bulk"
             or "unsubscribe-bulk"
-            or "read-bulk"
-            or "write-bulk"
-            or "write2-bulk"
-            or "write-secured-bulk"
-            or "write-secured2-bulk"
-            or "bench-read-bulk"
             or "stream-events"
-            or "stream-alarms"
-            or "acknowledge-alarm"
             or "write"
             or "write2"
             or "smoke"
@@ -1724,7 +1022,6 @@ public static class MxGatewayClientCli
 
     private static void WriteUsage(TextWriter writer)
     {
-        writer.WriteLine("mxgw-dotnet batch  (reads commands from stdin; writes output + __MXGW_BATCH_EOR__ after each)");
         writer.WriteLine("mxgw-dotnet version [--json]");
         writer.WriteLine("mxgw-dotnet ping --session-id <id> [--json]");
         writer.WriteLine("mxgw-dotnet open-session [--client-name <name>] [--json]");
@@ -1734,15 +1031,7 @@ public static class MxGatewayClientCli
         writer.WriteLine("mxgw-dotnet advise --session-id <id> --server-handle <n> --item-handle <n> [--json]");
         writer.WriteLine("mxgw-dotnet subscribe-bulk --session-id <id> --server-handle <n> --items <ref,ref> [--json]");
         writer.WriteLine("mxgw-dotnet unsubscribe-bulk --session-id <id> --server-handle <n> --item-handles <n,n> [--json]");
-        writer.WriteLine("mxgw-dotnet read-bulk --session-id <id> --server-handle <n> --items <ref,ref> [--timeout-ms <n>] [--json]");
-        writer.WriteLine("mxgw-dotnet write-bulk --session-id <id> --server-handle <n> --item-handles <n,n> --type <type> --values <v,v> [--user-id <n>] [--json]");
-        writer.WriteLine("mxgw-dotnet write2-bulk --session-id <id> --server-handle <n> --item-handles <n,n> --type <type> --values <v,v> [--timestamp <iso>] [--user-id <n>] [--json]");
-        writer.WriteLine("mxgw-dotnet write-secured-bulk --session-id <id> --server-handle <n> --item-handles <n,n> --type <type> --values <v,v> --current-user-id <n> [--verifier-user-id <n>] [--json]");
-        writer.WriteLine("mxgw-dotnet write-secured2-bulk --session-id <id> --server-handle <n> --item-handles <n,n> --type <type> --values <v,v> --current-user-id <n> [--verifier-user-id <n>] [--timestamp <iso>] [--json]");
-        writer.WriteLine("mxgw-dotnet bench-read-bulk [--duration-seconds <n>] [--warmup-seconds <n>] [--bulk-size <n>] [--tag-start <n>] [--tag-prefix <s>] [--tag-attribute <s>] [--timeout-ms <n>] [--client-name <name>]");
         writer.WriteLine("mxgw-dotnet stream-events --session-id <id> [--max-events <n>] [--json]");
-        writer.WriteLine("mxgw-dotnet stream-alarms [--filter-prefix <ref>] [--max-events <n>] [--json] [--jsonl]");
-        writer.WriteLine("mxgw-dotnet acknowledge-alarm --reference <ref> [--comment <text>] [--operator <user>] [--json]");
         writer.WriteLine("mxgw-dotnet write --session-id <id> --server-handle <n> --item-handle <n> --type <type> --value <value> [--json]");
         writer.WriteLine("mxgw-dotnet write2 --session-id <id> --server-handle <n> --item-handle <n> --type <type> --value <value> [--timestamp <iso>] [--json]");
         writer.WriteLine("mxgw-dotnet smoke --item <ref> [--value <value> --type <type>] [--json]");

clients/dotnet/MxGateway.Client.Cli/Program.cs

@@ -1,3 +1,3 @@
-using ZB.MOM.WW.MxGateway.Client.Cli;
+using MxGateway.Client.Cli;
 
 return await MxGatewayClientCli.RunAsync(args, Console.Out, Console.Error);

clients/dotnet/MxGateway.Client.Tests/FakeGalaxyRepositoryTransport.cs

@@ -1,75 +1,34 @@
 using Grpc.Core;
-using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
+using MxGateway.Contracts.Proto.Galaxy;
 
-namespace ZB.MOM.WW.MxGateway.Client.Tests;
+namespace MxGateway.Client.Tests;
 
-/// <summary>
-/// Fake Galaxy Repository client transport for testing.
-/// </summary>
 internal sealed class FakeGalaxyRepositoryTransport(MxGatewayClientOptions options) : IGalaxyRepositoryClientTransport
 {
-    /// <summary>
-    /// Gets the gateway client options.
-    /// </summary>
     public MxGatewayClientOptions Options { get; } = options;
 
-    /// <summary>
-    /// Gets the raw gRPC client; always null for the fake.
-    /// </summary>
     public GalaxyRepository.GalaxyRepositoryClient? RawClient => null;
 
-    /// <summary>
-    /// Gets the list of TestConnection RPC calls made by the client.
-    /// </summary>
     public List<(TestConnectionRequest Request, CallOptions CallOptions)> TestConnectionCalls { get; } = [];
 
-    /// <summary>
-    /// Gets the list of GetLastDeployTime RPC calls made by the client.
-    /// </summary>
     public List<(GetLastDeployTimeRequest Request, CallOptions CallOptions)> GetLastDeployTimeCalls { get; } = [];
 
-    /// <summary>
-    /// Gets the list of DiscoverHierarchy RPC calls made by the client.
-    /// </summary>
     public List<(DiscoverHierarchyRequest Request, CallOptions CallOptions)> DiscoverHierarchyCalls { get; } = [];
 
-    /// <summary>
-    /// Gets or sets the reply to return from TestConnection; defaults to successful response.
-    /// </summary>
     public TestConnectionReply TestConnectionReply { get; set; } = new() { Ok = true };
 
-    /// <summary>
-    /// Gets or sets the reply to return from GetLastDeployTime; defaults to no deploy time present.
-    /// </summary>
     public GetLastDeployTimeReply GetLastDeployTimeReply { get; set; } = new() { Present = false };
 
-    /// <summary>
-    /// Gets or sets the reply to return from DiscoverHierarchy; defaults to empty response.
-    /// </summary>
     public DiscoverHierarchyReply DiscoverHierarchyReply { get; set; } = new();
 
     public Queue<DiscoverHierarchyReply> DiscoverHierarchyReplies { get; } = new();
 
-    /// <summary>
-    /// Gets the queue of exceptions to throw from TestConnection; dequeued in FIFO order.
-    /// </summary>
     public Queue<Exception> TestConnectionExceptions { get; } = new();
 
-    /// <summary>
-    /// Gets the queue of exceptions to throw from GetLastDeployTime; dequeued in FIFO order.
-    /// </summary>
     public Queue<Exception> GetLastDeployTimeExceptions { get; } = new();
 
-    /// <summary>
-    /// Gets the queue of exceptions to throw from DiscoverHierarchy; dequeued in FIFO order.
-    /// </summary>
     public Queue<Exception> DiscoverHierarchyExceptions { get; } = new();
 
-    /// <summary>
-    /// Records the request and either throws a queued exception or returns the configured reply.
-    /// </summary>
-    /// <param name="request">The TestConnectionRequest to process.</param>
-    /// <param name="callOptions">Call options specifying RPC behavior.</param>
     public Task<TestConnectionReply> TestConnectionAsync(
         TestConnectionRequest request,
         CallOptions callOptions)
@@ -83,11 +42,6 @@ internal sealed class FakeGalaxyRepositoryTransport(MxGatewayClientOptions optio
         return Task.FromResult(TestConnectionReply);
     }
 
-    /// <summary>
-    /// Records the request and either throws a queued exception or returns the configured reply.
-    /// </summary>
-    /// <param name="request">The GetLastDeployTimeRequest to process.</param>
-    /// <param name="callOptions">Call options specifying RPC behavior.</param>
     public Task<GetLastDeployTimeReply> GetLastDeployTimeAsync(
         GetLastDeployTimeRequest request,
         CallOptions callOptions)
@@ -101,11 +55,6 @@ internal sealed class FakeGalaxyRepositoryTransport(MxGatewayClientOptions optio
         return Task.FromResult(GetLastDeployTimeReply);
     }
 
-    /// <summary>
-    /// Records the request and either throws a queued exception or returns the configured reply.
-    /// </summary>
-    /// <param name="request">The DiscoverHierarchyRequest to process.</param>
-    /// <param name="callOptions">Call options specifying RPC behavior.</param>
     public Task<DiscoverHierarchyReply> DiscoverHierarchyAsync(
         DiscoverHierarchyRequest request,
         CallOptions callOptions)
@@ -122,19 +71,10 @@ internal sealed class FakeGalaxyRepositoryTransport(MxGatewayClientOptions optio
                 : DiscoverHierarchyReply);
     }
 
-    /// <summary>
-    /// Gets the list of WatchDeployEvents RPC calls made by the client.
-    /// </summary>
     public List<(WatchDeployEventsRequest Request, CallOptions CallOptions)> WatchDeployEventsCalls { get; } = [];
 
-    /// <summary>
-    /// Gets or sets the list of events to stream from WatchDeployEvents.
-    /// </summary>
     public List<DeployEvent> WatchDeployEvents { get; } = [];
 
-    /// <summary>
-    /// Gets or sets the exception to throw from WatchDeployEvents, if any.
-    /// </summary>
     public Exception? WatchDeployEventsException { get; set; }
 
     /// <summary>
@@ -143,11 +83,6 @@ internal sealed class FakeGalaxyRepositoryTransport(MxGatewayClientOptions optio
     /// </summary>
     public Func<CancellationToken, Task>? WatchDeployEventsBeforeYield { get; set; }
 
-    /// <summary>
-    /// Records the request and streams events, checking for queued exceptions and calling WatchDeployEventsBeforeYield before each event.
-    /// </summary>
-    /// <param name="request">The WatchDeployEventsRequest to process.</param>
-    /// <param name="callOptions">Call options specifying RPC behavior.</param>
     public async IAsyncEnumerable<DeployEvent> WatchDeployEventsAsync(
         WatchDeployEventsRequest request,
         CallOptions callOptions)

clients/dotnet/MxGateway.Client.Tests/FakeGatewayTransport.cs

@@ -0,0 +1,107 @@
+using Grpc.Core;
+using MxGateway.Contracts.Proto;
+
+namespace MxGateway.Client.Tests;
+
+internal sealed class FakeGatewayTransport(MxGatewayClientOptions options) : IMxGatewayClientTransport
+{
+    private readonly Queue<MxCommandReply> _invokeReplies = new();
+    private readonly List<MxEvent> _events = [];
+
+    public MxGatewayClientOptions Options { get; } = options;
+
+    public MxAccessGateway.MxAccessGatewayClient? RawClient => null;
+
+    public List<(OpenSessionRequest Request, CallOptions CallOptions)> OpenSessionCalls { get; } = [];
+
+    public List<(CloseSessionRequest Request, CallOptions CallOptions)> CloseSessionCalls { get; } = [];
+
+    public List<(MxCommandRequest Request, CallOptions CallOptions)> InvokeCalls { get; } = [];
+
+    public List<(StreamEventsRequest Request, CallOptions CallOptions)> StreamEventsCalls { get; } = [];
+
+    public OpenSessionReply OpenSessionReply { get; set; } = new()
+    {
+        SessionId = "session-fixture",
+        BackendName = "mxaccess-worker",
+        GatewayProtocolVersion = 1,
+        WorkerProtocolVersion = 1,
+        ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
+    };
+
+    public CloseSessionReply CloseSessionReply { get; set; } = new()
+    {
+        SessionId = "session-fixture",
+        FinalState = SessionState.Closed,
+        ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
+    };
+
+    public Queue<Exception> OpenSessionExceptions { get; } = new();
+
+    public Queue<Exception> CloseSessionExceptions { get; } = new();
+
+    public Queue<Exception> InvokeExceptions { get; } = new();
+
+    public Task<OpenSessionReply> OpenSessionAsync(
+        OpenSessionRequest request,
+        CallOptions callOptions)
+    {
+        OpenSessionCalls.Add((request, callOptions));
+        if (OpenSessionExceptions.TryDequeue(out Exception? exception))
+        {
+            throw exception;
+        }
+
+        return Task.FromResult(OpenSessionReply);
+    }
+
+    public Task<CloseSessionReply> CloseSessionAsync(
+        CloseSessionRequest request,
+        CallOptions callOptions)
+    {
+        CloseSessionCalls.Add((request, callOptions));
+        if (CloseSessionExceptions.TryDequeue(out Exception? exception))
+        {
+            throw exception;
+        }
+
+        return Task.FromResult(CloseSessionReply);
+    }
+
+    public Task<MxCommandReply> InvokeAsync(
+        MxCommandRequest request,
+        CallOptions callOptions)
+    {
+        InvokeCalls.Add((request, callOptions));
+        if (InvokeExceptions.TryDequeue(out Exception? exception))
+        {
+            throw exception;
+        }
+
+        return Task.FromResult(_invokeReplies.Dequeue());
+    }
+
+    public async IAsyncEnumerable<MxEvent> StreamEventsAsync(
+        StreamEventsRequest request,
+        CallOptions callOptions)
+    {
+        StreamEventsCalls.Add((request, callOptions));
+
+        foreach (MxEvent gatewayEvent in _events)
+        {
+            callOptions.CancellationToken.ThrowIfCancellationRequested();
+            await Task.Yield();
+            yield return gatewayEvent;
+        }
+    }
+
+    public void AddInvokeReply(MxCommandReply reply)
+    {
+        _invokeReplies.Enqueue(reply);
+    }
+
+    public void AddEvent(MxEvent gatewayEvent)
+    {
+        _events.Add(gatewayEvent);
+    }
+}

clients/dotnet/MxGateway.Client.Tests/GalaxyRepositoryClientTests.cs

@@ -1,14 +1,11 @@
 using Google.Protobuf.WellKnownTypes;
 using Grpc.Core;
-using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
+using MxGateway.Contracts.Proto.Galaxy;
 
-namespace ZB.MOM.WW.MxGateway.Client.Tests;
+namespace MxGateway.Client.Tests;
 
 public sealed class GalaxyRepositoryClientTests
 {
-    /// <summary>
-    /// Verifies that TestConnectionAsync attaches the API key in request metadata and returns the Ok flag.
-    /// </summary>
     [Fact]
     public async Task TestConnectionAsync_AttachesApiKeyMetadataAndReturnsOkFlag()
     {
@@ -24,9 +21,6 @@ public sealed class GalaxyRepositoryClientTests
         Assert.Equal("Bearer test-api-key", call.CallOptions.Headers?.GetValue("authorization"));
     }
 
-    /// <summary>
-    /// Verifies that TestConnectionAsync returns false when the server reports NotOk.
-    /// </summary>
     [Fact]
     public async Task TestConnectionAsync_ReturnsFalseWhenServerReportsNotOk()
     {
@@ -39,9 +33,6 @@ public sealed class GalaxyRepositoryClientTests
         Assert.False(ok);
     }
 
-    /// <summary>
-    /// Verifies that GetLastDeployTimeAsync returns null when the server reports not present.
-    /// </summary>
     [Fact]
     public async Task GetLastDeployTimeAsync_ReturnsNullWhenNotPresent()
     {
@@ -55,9 +46,6 @@ public sealed class GalaxyRepositoryClientTests
         Assert.Single(transport.GetLastDeployTimeCalls);
     }
 
-    /// <summary>
-    /// Verifies that GetLastDeployTimeAsync returns the timestamp when the server reports it present.
-    /// </summary>
     [Fact]
     public async Task GetLastDeployTimeAsync_ReturnsTimestampWhenPresent()
     {
@@ -76,9 +64,6 @@ public sealed class GalaxyRepositoryClientTests
         Assert.Equal(expected, deployTime!.Value);
     }
 
-    /// <summary>
-    /// Verifies that DiscoverHierarchyAsync returns the objects from the server reply.
-    /// </summary>
     [Fact]
     public async Task DiscoverHierarchyAsync_ReturnsObjectsFromReply()
     {
@@ -138,9 +123,6 @@ public sealed class GalaxyRepositoryClientTests
         Assert.Equal("DelmiaReceiver_001.DownloadPath", attribute.FullTagReference);
     }
 
-    /// <summary>
-    /// Verifies that DiscoverHierarchyAsync propagates cancellation tokens to the transport.
-    /// </summary>
     [Fact]
     public async Task DiscoverHierarchyAsync_PropagatesCancellationToTransport()
     {
@@ -158,9 +140,6 @@ public sealed class GalaxyRepositoryClientTests
         Assert.False(call.CallOptions.CancellationToken.IsCancellationRequested);
     }
 
-    /// <summary>
-    /// Verifies that TestConnectionAsync retries on transient gRPC failures.
-    /// </summary>
     [Fact]
     public async Task DiscoverHierarchyAsync_WithRepeatedPageToken_ThrowsProtocolError()
     {
@@ -226,9 +205,6 @@ public sealed class GalaxyRepositoryClientTests
         Assert.Equal(2, transport.TestConnectionCalls.Count);
     }
 
-    /// <summary>
-    /// Verifies that DiscoverHierarchyAsync retries on transient gRPC failures.
-    /// </summary>
     [Fact]
     public async Task DiscoverHierarchyAsync_RetriesOnTransientGrpcFailure()
     {
@@ -242,9 +218,6 @@ public sealed class GalaxyRepositoryClientTests
         Assert.Equal(2, transport.DiscoverHierarchyCalls.Count);
     }
 
-    /// <summary>
-    /// Verifies that WatchDeployEventsAsync delivers the bootstrap event.
-    /// </summary>
     [Fact]
     public async Task WatchDeployEventsAsync_DeliversBootstrapEvent()
     {
@@ -278,9 +251,6 @@ public sealed class GalaxyRepositoryClientTests
         Assert.Null(call.Request.LastSeenDeployTime);
     }
 
-    /// <summary>
-    /// Verifies that WatchDeployEventsAsync delivers multiple events in order.
-    /// </summary>
     [Fact]
     public async Task WatchDeployEventsAsync_DeliversMultipleEventsInOrder()
     {
@@ -316,9 +286,6 @@ public sealed class GalaxyRepositoryClientTests
         Assert.Equal(t0, call.Request.LastSeenDeployTime!.ToDateTime());
     }
 
-    /// <summary>
-    /// Verifies that WatchDeployEventsAsync stops iteration cleanly when cancelled.
-    /// </summary>
     [Fact]
     public async Task WatchDeployEventsAsync_CancellationStopsIterationCleanly()
     {
@@ -360,9 +327,6 @@ public sealed class GalaxyRepositoryClientTests
         Assert.Equal(1ul, received[0].Sequence);
     }
 
-    /// <summary>
-    /// Verifies that WatchDeployEventsAsync throws ObjectDisposedException after the client is disposed.
-    /// </summary>
     [Fact]
     public async Task WatchDeployEventsAsync_ThrowsAfterDisposal()
     {
@@ -375,9 +339,6 @@ public sealed class GalaxyRepositoryClientTests
             client.WatchDeployEventsAsync());
     }
 
-    /// <summary>
-    /// Verifies that TestConnectionAsync throws ObjectDisposedException after the client is disposed.
-    /// </summary>
     [Fact]
     public async Task TestConnectionAsync_ThrowsAfterDisposal()
     {

clients/dotnet/MxGateway.Client.Tests/MxCommandReplyExtensionsTests.cs

@@ -1,12 +1,11 @@
 using Google.Protobuf;
-using ZB.MOM.WW.MxGateway.Client;
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
+using MxGateway.Client;
+using MxGateway.Contracts.Proto;
 
-namespace ZB.MOM.WW.MxGateway.Client.Tests;
+namespace MxGateway.Client.Tests;
 
 public sealed class MxCommandReplyExtensionsTests
 {
-    /// <summary>Verifies that successful replies pass both protocol and MxAccess success checks.</summary>
     [Fact]
     public void EnsureSuccess_WithRegisterFixture_ReturnsReply()
     {
@@ -16,7 +15,6 @@ public sealed class MxCommandReplyExtensionsTests
         Assert.Same(reply, reply.EnsureMxAccessSuccess());
     }
 
-    /// <summary>Verifies that MxAccess failures throw with preserved HResult and status details.</summary>
     [Fact]
     public void EnsureMxAccessSuccess_WithFailureFixture_PreservesHResultAndStatuses()
     {
@@ -32,7 +30,6 @@ public sealed class MxCommandReplyExtensionsTests
         Assert.Contains("0x80040200", exception.Message);
     }
 
-    /// <summary>Verifies that session-not-found protocol failures throw the correct gateway exception.</summary>
     [Fact]
     public void EnsureProtocolSuccess_WithSessionFailure_ThrowsSessionException()
     {

clients/dotnet/MxGateway.Client.Tests/MxGateway.Client.Tests.csproj

@@ -19,8 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ZB.MOM.WW.MxGateway.Client\ZB.MOM.WW.MxGateway.Client.csproj" />
-    <ProjectReference Include="..\ZB.MOM.WW.MxGateway.Client.Cli\ZB.MOM.WW.MxGateway.Client.Cli.csproj" />
+    <ProjectReference Include="..\MxGateway.Client\MxGateway.Client.csproj" />
+    <ProjectReference Include="..\MxGateway.Client.Cli\MxGateway.Client.Cli.csproj" />
   </ItemGroup>
 
 </Project>

clients/dotnet/MxGateway.Client.Tests/MxGatewayClientCliTests.cs

@@ -1,14 +1,12 @@
 using Google.Protobuf.WellKnownTypes;
-using ZB.MOM.WW.MxGateway.Client.Cli;
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
+using MxGateway.Client.Cli;
+using MxGateway.Contracts.Proto;
+using MxGateway.Contracts.Proto.Galaxy;
 
-namespace ZB.MOM.WW.MxGateway.Client.Tests;
+namespace MxGateway.Client.Tests;
 
-/// <summary>Tests for the CLI command interface.</summary>
 public sealed class MxGatewayClientCliTests
 {
-    /// <summary>Verifies that the version command prints compiled protocol versions.</summary>
     [Fact]
     public void Run_Version_PrintsCompiledProtocolVersions()
     {
@@ -18,12 +16,11 @@ public sealed class MxGatewayClientCliTests
         var exitCode = MxGatewayClientCli.Run(["version"], output, error);
 
         Assert.Equal(0, exitCode);
-        Assert.Contains("gateway-protocol=3", output.ToString());
+        Assert.Contains("gateway-protocol=2", output.ToString());
         Assert.Contains("worker-protocol=1", output.ToString());
         Assert.Equal(string.Empty, error.ToString());
     }
 
-    /// <summary>Verifies that the version command with --json flag prints JSON protocol versions.</summary>
     [Fact]
     public async Task RunAsync_VersionJson_PrintsJsonProtocolVersions()
     {
@@ -33,11 +30,10 @@ public sealed class MxGatewayClientCliTests
         int exitCode = await MxGatewayClientCli.RunAsync(["version", "--json"], output, error);
 
         Assert.Equal(0, exitCode);
-        Assert.Contains("\"gatewayProtocolVersion\":3", output.ToString());
+        Assert.Contains("\"gatewayProtocolVersion\":2", output.ToString());
         Assert.Equal(string.Empty, error.ToString());
     }
 
-    /// <summary>Verifies that the write command builds a write request and prints JSON reply.</summary>
     [Fact]
     public async Task RunAsync_Write_BuildsWriteCommandAndPrintsJsonReply()
     {
@@ -82,7 +78,6 @@ public sealed class MxGatewayClientCliTests
         Assert.Equal(string.Empty, error.ToString());
     }
 
-    /// <summary>Verifies that error output redacts sensitive API key values.</summary>
     [Fact]
     public async Task RunAsync_ErrorOutput_RedactsApiKey()
     {
@@ -106,7 +101,6 @@ public sealed class MxGatewayClientCliTests
         Assert.Contains("[redacted]", error.ToString());
     }
 
-    /// <summary>Verifies that stream-events with max-events limit stops output in non-JSON format.</summary>
     [Fact]
     public async Task RunAsync_StreamEvents_WithMaxEventsStopsNonJsonOutput()
     {
@@ -148,88 +142,6 @@ public sealed class MxGatewayClientCliTests
     }
 
 
-    /// <summary>Verifies that stream-alarms with --max-events stops output and distinguishes payload cases.</summary>
-    [Fact]
-    public async Task RunAsync_StreamAlarms_WithMaxEventsStopsAndDistinguishesPayloadCases()
-    {
-        using var output = new StringWriter();
-        using var error = new StringWriter();
-        FakeCliClient fakeClient = new();
-        fakeClient.AlarmFeedMessages.Add(new AlarmFeedMessage
-        {
-            ActiveAlarm = new ActiveAlarmSnapshot { AlarmFullReference = "Tank01.Level.HiHi" },
-        });
-        fakeClient.AlarmFeedMessages.Add(new AlarmFeedMessage { SnapshotComplete = true });
-
-        int exitCode = await MxGatewayClientCli.RunAsync(
-            [
-                "stream-alarms",
-                "--endpoint",
-                "http://localhost:5000",
-                "--api-key",
-                "test-api-key",
-                "--filter-prefix",
-                "Tank01",
-                "--max-events",
-                "1",
-            ],
-            output,
-            error,
-            _ => fakeClient);
-
-        Assert.Equal(0, exitCode);
-        StreamAlarmsRequest request = Assert.Single(fakeClient.StreamAlarmsRequests);
-        Assert.Equal("Tank01", request.AlarmFilterPrefix);
-        string text = output.ToString();
-        Assert.Contains("active-alarm", text);
-        Assert.Contains("Tank01.Level.HiHi", text);
-        Assert.DoesNotContain("snapshot-complete", text);
-        Assert.Equal(string.Empty, error.ToString());
-    }
-
-    /// <summary>Verifies that acknowledge-alarm builds a request and prints the JSON reply.</summary>
-    [Fact]
-    public async Task RunAsync_AcknowledgeAlarm_BuildsRequestAndPrintsJsonReply()
-    {
-        using var output = new StringWriter();
-        using var error = new StringWriter();
-        FakeCliClient fakeClient = new();
-        fakeClient.AcknowledgeAlarmReplies.Enqueue(new AcknowledgeAlarmReply
-        {
-            CorrelationId = "ack-fixture",
-            ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
-            Hresult = 0,
-        });
-
-        int exitCode = await MxGatewayClientCli.RunAsync(
-            [
-                "acknowledge-alarm",
-                "--endpoint",
-                "http://localhost:5000",
-                "--api-key",
-                "test-api-key",
-                "--reference",
-                "Tank01.Level.HiHi",
-                "--comment",
-                "ack from cli",
-                "--operator",
-                "operator1",
-                "--json",
-            ],
-            output,
-            error,
-            _ => fakeClient);
-
-        Assert.Equal(0, exitCode);
-        AcknowledgeAlarmRequest request = Assert.Single(fakeClient.AcknowledgeAlarmRequests);
-        Assert.Equal("Tank01.Level.HiHi", request.AlarmFullReference);
-        Assert.Equal("ack from cli", request.Comment);
-        Assert.Equal("operator1", request.OperatorUser);
-        Assert.Contains("ack-fixture", output.ToString());
-        Assert.Equal(string.Empty, error.ToString());
-    }
-
-    /// <summary>Verifies that smoke command closes opened session when a command fails.</summary>
     [Fact]
     public async Task RunAsync_Smoke_WhenCommandFails_ClosesOpenedSession()
     {
@@ -260,7 +172,6 @@ public sealed class MxGatewayClientCliTests
         Assert.Equal("session-fixture", closeRequest.SessionId);
     }
 
-    /// <summary>Verifies that galaxy-test-connection command prints JSON reply.</summary>
     [Fact]
     public async Task RunAsync_GalaxyTestConnection_PrintsJsonReply()
     {
@@ -290,7 +201,6 @@ public sealed class MxGatewayClientCliTests
         Assert.Equal(string.Empty, error.ToString());
     }
 
-    /// <summary>Verifies that galaxy-discover command prints hierarchy summary.</summary>
     [Fact]
     public async Task RunAsync_GalaxyDiscover_PrintsHierarchySummary()
     {
@@ -360,7 +270,6 @@ public sealed class MxGatewayClientCliTests
         Assert.Equal(string.Empty, error.ToString());
     }
 
-    /// <summary>Verifies that galaxy-watch command prints text output for deploy events.</summary>
     [Fact]
     public async Task RunAsync_GalaxyWatch_PrintsTextOutputForEvents()
     {
@@ -414,7 +323,6 @@ public sealed class MxGatewayClientCliTests
         Assert.Equal(string.Empty, error.ToString());
     }
 
-    /// <summary>Verifies that galaxy-watch with --json emits one JSON object per event.</summary>
     [Fact]
     public async Task RunAsync_GalaxyWatch_JsonEmitsOneObjectPerEvent()
     {
@@ -449,91 +357,23 @@ public sealed class MxGatewayClientCliTests
         Assert.Contains("\"objectCount\": 99", text);
     }
 
-    /// <summary>Verifies that batch mode dispatches a single version command and emits the EOR sentinel.</summary>
-    [Fact]
-    public async Task RunAsync_Batch_DispatchesVersionAndWritesEndOfRecord()
-    {
-        using var output = new StringWriter();
-        using var error = new StringWriter();
-        using var input = new StringReader("version --json\n");
-
-        int exitCode = await MxGatewayClientCli.RunAsync(
-            ["batch"],
-            output,
-            error,
-            clientFactory: null,
-            standardInput: input);
-
-        Assert.Equal(0, exitCode);
-        string text = output.ToString();
-        Assert.Contains("\"gatewayProtocolVersion\":3", text);
-        Assert.Contains("__MXGW_BATCH_EOR__", text);
-        // The EOR marker must come after the JSON output.
-        int jsonIndex = text.IndexOf("\"gatewayProtocolVersion\"", StringComparison.Ordinal);
-        int eorIndex = text.IndexOf("__MXGW_BATCH_EOR__", StringComparison.Ordinal);
-        Assert.True(jsonIndex >= 0 && eorIndex > jsonIndex);
-        Assert.Equal(string.Empty, error.ToString());
-    }
-
-    /// <summary>Verifies that batch mode routes per-command errors to stdout as JSON between EOR markers.</summary>
-    [Fact]
-    public async Task RunAsync_Batch_WritesErrorsToStdoutAsJson()
-    {
-        using var output = new StringWriter();
-        using var error = new StringWriter();
-        // Unknown command should produce an error on the captured error stream,
-        // which batch mode re-emits to stdout inside the same delimited block.
-        using var input = new StringReader("nope-not-a-command\nversion\n");
-
-        int exitCode = await MxGatewayClientCli.RunAsync(
-            ["batch"],
-            output,
-            error,
-            clientFactory: null,
-            standardInput: input);
-
-        Assert.Equal(0, exitCode);
-        string text = output.ToString();
-        // Two records → two EOR markers.
-        int firstEor = text.IndexOf("__MXGW_BATCH_EOR__", StringComparison.Ordinal);
-        int secondEor = text.IndexOf(
-            "__MXGW_BATCH_EOR__",
-            firstEor + 1,
-            StringComparison.Ordinal);
-        Assert.True(firstEor > 0);
-        Assert.True(secondEor > firstEor);
-        // The unknown-command error message must be on stdout (not on stderr).
-        Assert.Contains("nope-not-a-command", text);
-        Assert.DoesNotContain("nope-not-a-command", error.ToString());
-        // The follow-up `version` line should still succeed.
-        Assert.Contains("gateway-protocol=", text);
-    }
-
-    /// <summary>Fake CLI client for testing.</summary>
     private sealed class FakeCliClient : IMxGatewayCliClient
     {
-        /// <summary>Queue of invoke replies to return.</summary>
         public Queue<MxCommandReply> InvokeReplies { get; } = new();
 
-        /// <summary>List of received invoke requests.</summary>
         public List<MxCommandRequest> InvokeRequests { get; } = [];
 
-        /// <summary>List of received close session requests.</summary>
         public List<CloseSessionRequest> CloseSessionRequests { get; } = [];
 
-        /// <summary>List of events to yield when streaming.</summary>
         public List<MxEvent> Events { get; } = [];
 
-        /// <summary>Exception to throw on invoke, if any.</summary>
         public Exception? InvokeFailure { get; init; }
 
-        /// <inheritdoc />
         public ValueTask DisposeAsync()
         {
             return ValueTask.CompletedTask;
         }
 
-        /// <inheritdoc />
         public Task<OpenSessionReply> OpenSessionAsync(
             OpenSessionRequest request,
             CancellationToken cancellationToken)
@@ -547,7 +387,6 @@ public sealed class MxGatewayClientCliTests
             });
         }
 
-        /// <inheritdoc />
         public Task<CloseSessionReply> CloseSessionAsync(
             CloseSessionRequest request,
             CancellationToken cancellationToken)
@@ -561,7 +400,6 @@ public sealed class MxGatewayClientCliTests
             });
         }
 
-        /// <inheritdoc />
         public Task<MxCommandReply> InvokeAsync(
             MxCommandRequest request,
             CancellationToken cancellationToken)
@@ -575,7 +413,6 @@ public sealed class MxGatewayClientCliTests
             return Task.FromResult(InvokeReplies.Dequeue());
         }
 
-        /// <inheritdoc />
         public async IAsyncEnumerable<MxEvent> StreamEventsAsync(
             StreamEventsRequest request,
             [System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken)
@@ -588,62 +425,20 @@ public sealed class MxGatewayClientCliTests
             }
         }
 
-        /// <summary>Queue of acknowledge-alarm replies to return.</summary>
-        public Queue<AcknowledgeAlarmReply> AcknowledgeAlarmReplies { get; } = new();
-
-        /// <summary>List of received acknowledge-alarm requests.</summary>
-        public List<AcknowledgeAlarmRequest> AcknowledgeAlarmRequests { get; } = [];
-
-        /// <summary>List of received stream-alarms requests.</summary>
-        public List<StreamAlarmsRequest> StreamAlarmsRequests { get; } = [];
-
-        /// <summary>List of alarm feed messages to yield when streaming alarms.</summary>
-        public List<AlarmFeedMessage> AlarmFeedMessages { get; } = [];
-
-        /// <inheritdoc />
-        public Task<AcknowledgeAlarmReply> AcknowledgeAlarmAsync(
-            AcknowledgeAlarmRequest request,
-            CancellationToken cancellationToken)
-        {
-            AcknowledgeAlarmRequests.Add(request);
-            return Task.FromResult(AcknowledgeAlarmReplies.Dequeue());
-        }
-
-        /// <inheritdoc />
-        public async IAsyncEnumerable<AlarmFeedMessage> StreamAlarmsAsync(
-            StreamAlarmsRequest request,
-            [System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken)
-        {
-            StreamAlarmsRequests.Add(request);
-            foreach (AlarmFeedMessage feedMessage in AlarmFeedMessages)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Task.Yield();
-                yield return feedMessage;
-            }
-        }
-
-        /// <summary>Galaxy test connection reply to return.</summary>
         public TestConnectionReply GalaxyTestConnectionReply { get; set; } = new() { Ok = true };
 
-        /// <summary>Galaxy get last deploy time reply to return.</summary>
         public GetLastDeployTimeReply GalaxyGetLastDeployTimeReply { get; set; } = new() { Present = false };
 
-        /// <summary>Galaxy discover hierarchy reply to return.</summary>
         public DiscoverHierarchyReply GalaxyDiscoverHierarchyReply { get; set; } = new();
 
         public Queue<DiscoverHierarchyReply> GalaxyDiscoverHierarchyReplies { get; } = new();
 
-        /// <summary>List of received galaxy test connection requests.</summary>
         public List<TestConnectionRequest> GalaxyTestConnectionRequests { get; } = [];
 
-        /// <summary>List of received galaxy get last deploy time requests.</summary>
         public List<GetLastDeployTimeRequest> GalaxyGetLastDeployTimeRequests { get; } = [];
 
-        /// <summary>List of received galaxy discover hierarchy requests.</summary>
         public List<DiscoverHierarchyRequest> GalaxyDiscoverHierarchyRequests { get; } = [];
 
-        /// <inheritdoc />
         public Task<TestConnectionReply> GalaxyTestConnectionAsync(
             TestConnectionRequest request,
             CancellationToken cancellationToken)
@@ -652,7 +447,6 @@ public sealed class MxGatewayClientCliTests
             return Task.FromResult(GalaxyTestConnectionReply);
         }
 
-        /// <inheritdoc />
         public Task<GetLastDeployTimeReply> GalaxyGetLastDeployTimeAsync(
             GetLastDeployTimeRequest request,
             CancellationToken cancellationToken)
@@ -661,7 +455,6 @@ public sealed class MxGatewayClientCliTests
             return Task.FromResult(GalaxyGetLastDeployTimeReply);
         }
 
-        /// <inheritdoc />
         public Task<DiscoverHierarchyReply> GalaxyDiscoverHierarchyAsync(
             DiscoverHierarchyRequest request,
             CancellationToken cancellationToken)
@@ -673,13 +466,10 @@ public sealed class MxGatewayClientCliTests
                     : GalaxyDiscoverHierarchyReply);
         }
 
-        /// <summary>List of received galaxy watch deploy events requests.</summary>
         public List<WatchDeployEventsRequest> GalaxyWatchDeployEventsRequests { get; } = [];
 
-        /// <summary>List of deploy events to yield when watching.</summary>
         public List<DeployEvent> GalaxyDeployEvents { get; } = [];
 
-        /// <inheritdoc />
         public async IAsyncEnumerable<DeployEvent> GalaxyWatchDeployEventsAsync(
             WatchDeployEventsRequest request,
             [System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken)

clients/dotnet/MxGateway.Client.Tests/MxGatewayClientContractInfoTests.cs

@@ -1,10 +1,9 @@
-using ZB.MOM.WW.MxGateway.Contracts;
+using MxGateway.Contracts;
 
-namespace ZB.MOM.WW.MxGateway.Client.Tests;
+namespace MxGateway.Client.Tests;
 
 public sealed class MxGatewayClientContractInfoTests
 {
-    /// <summary>Verifies that the client's gateway protocol version matches the shared contract definition.</summary>
     [Fact]
     public void GatewayProtocolVersion_MatchesSharedContract()
     {
@@ -13,7 +12,6 @@ public sealed class MxGatewayClientContractInfoTests
             MxGatewayClientContractInfo.GatewayProtocolVersion);
     }
 
-    /// <summary>Verifies that the client's worker protocol version matches the shared contract definition.</summary>
     [Fact]
     public void WorkerProtocolVersion_MatchesSharedContract()
     {

clients/dotnet/MxGateway.Client.Tests/MxGatewayClientOptionsTests.cs

@@ -1,8 +1,7 @@
-namespace ZB.MOM.WW.MxGateway.Client.Tests;
+namespace MxGateway.Client.Tests;
 
 public sealed class MxGatewayClientOptionsTests
 {
-    /// <summary>Verifies that options with valid endpoint and API key pass validation.</summary>
     [Fact]
     public void Validate_WithAbsoluteEndpointAndApiKey_Succeeds()
     {
@@ -15,7 +14,6 @@ public sealed class MxGatewayClientOptionsTests
         options.Validate();
     }
 
-    /// <summary>Verifies that empty API key causes validation to fail.</summary>
     [Fact]
     public void Validate_WithEmptyApiKey_Throws()
     {
@@ -28,7 +26,6 @@ public sealed class MxGatewayClientOptionsTests
         Assert.Throws<ArgumentException>(options.Validate);
     }
 
-    /// <summary>Verifies that invalid retry options cause validation to fail.</summary>
     [Fact]
     public void Validate_WithInvalidRetryOptions_Throws()
     {

clients/dotnet/MxGateway.Client.Tests/MxGatewayClientSessionTests.cs

@@ -1,12 +1,10 @@
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
+using MxGateway.Contracts.Proto;
 using Grpc.Core;
 
-namespace ZB.MOM.WW.MxGateway.Client.Tests;
+namespace MxGateway.Client.Tests;
 
-/// <summary>Tests for MxGatewaySession and client command behavior.</summary>
 public sealed class MxGatewayClientSessionTests
 {
-    /// <summary>Verifies that open session attaches API key metadata and cancellation token.</summary>
     [Fact]
     public async Task OpenSessionRawAsync_AttachesApiKeyMetadataAndCancellation()
     {
@@ -21,7 +19,6 @@ public sealed class MxGatewayClientSessionTests
         Assert.Equal(cancellation.Token, call.CallOptions.CancellationToken);
     }
 
-    /// <summary>Verifies that open session returns a session with the raw open reply.</summary>
     [Fact]
     public async Task OpenSessionAsync_ReturnsSessionWithRawOpenReply()
     {
@@ -36,7 +33,6 @@ public sealed class MxGatewayClientSessionTests
         Assert.Equal(1234, session.OpenSessionReply.WorkerProcessId);
     }
 
-    /// <summary>Verifies that register builds a register command and returns server handle.</summary>
     [Fact]
     public async Task RegisterAsync_BuildsRegisterCommandAndReturnsServerHandle()
     {
@@ -61,7 +57,6 @@ public sealed class MxGatewayClientSessionTests
         Assert.Equal("fixture-client", call.Request.Command.Register.ClientName);
     }
 
-    /// <summary>Verifies that add item 2 builds a command with the specified context.</summary>
     [Fact]
     public async Task AddItem2Async_BuildsAddItem2CommandWithContext()
     {
@@ -86,7 +81,6 @@ public sealed class MxGatewayClientSessionTests
         Assert.Equal("runtime", request.Command.AddItem2.ItemContext);
     }
 
-    /// <summary>Verifies that write raw builds a write command with the raw value.</summary>
     [Fact]
     public async Task WriteRawAsync_BuildsWriteCommandWithRawValue()
     {
@@ -117,7 +111,6 @@ public sealed class MxGatewayClientSessionTests
         Assert.Equal(56, request.Command.Write.UserId);
     }
 
-    /// <summary>Verifies that write 2 raw builds a write 2 command with value and timestamp.</summary>
     [Fact]
     public async Task Write2RawAsync_BuildsWrite2CommandWithValueAndTimestamp()
     {
@@ -145,7 +138,6 @@ public sealed class MxGatewayClientSessionTests
         Assert.Equal(56, request.Command.Write2.UserId);
     }
 
-    /// <summary>Verifies that subscribe bulk builds one command and returns per-item results.</summary>
     [Fact]
     public async Task SubscribeBulkAsync_BuildsOneBulkCommandAndReturnsPerItemResults()
     {
@@ -184,7 +176,6 @@ public sealed class MxGatewayClientSessionTests
         Assert.Equal(["Area001.Pump001.Speed"], request.Command.SubscribeBulk.TagAddresses);
     }
 
-    /// <summary>Verifies that stream events yields events in the order received from the gateway.</summary>
     [Fact]
     public async Task StreamEventsAsync_YieldsEventsInGatewayOrder()
     {
@@ -215,7 +206,6 @@ public sealed class MxGatewayClientSessionTests
         Assert.Equal("session-fixture", request.SessionId);
     }
 
-    /// <summary>Verifies that close is explicit and idempotent.</summary>
     [Fact]
     public async Task CloseAsync_IsExplicitAndIdempotent()
     {
@@ -231,7 +221,6 @@ public sealed class MxGatewayClientSessionTests
         Assert.Equal("session-fixture", call.Request.SessionId);
     }
 
-    /// <summary>Verifies that invoke retries safe diagnostic commands on transient RPC failure.</summary>
     [Fact]
     public async Task InvokeAsync_RetriesSafeDiagnosticCommandOnTransientGrpcFailure()
     {
@@ -255,7 +244,6 @@ public sealed class MxGatewayClientSessionTests
         Assert.Equal(2, transport.InvokeCalls.Count);
     }
 
-    /// <summary>Verifies that open session does not retry on transient RPC failure.</summary>
     [Fact]
     public async Task OpenSessionAsync_DoesNotRetryTransientGrpcFailure()
     {
@@ -268,7 +256,6 @@ public sealed class MxGatewayClientSessionTests
         Assert.Single(transport.OpenSessionCalls);
     }
 
-    /// <summary>Verifies that invoke does not retry write commands on transient RPC failure.</summary>
     [Fact]
     public async Task InvokeAsync_DoesNotRetryWriteCommand()
     {
@@ -283,7 +270,6 @@ public sealed class MxGatewayClientSessionTests
         Assert.Single(transport.InvokeCalls);
     }
 
-    /// <summary>Verifies that invoke helpers pass cancellation token to the transport.</summary>
     [Fact]
     public async Task InvokeHelpers_PassCancellationTokenToTransport()
     {

clients/dotnet/MxGateway.Client.Tests/MxGatewayGeneratedContractTests.cs

@@ -1,8 +1,7 @@
-namespace ZB.MOM.WW.MxGateway.Client.Tests;
+namespace MxGateway.Client.Tests;
 
 public sealed class MxGatewayGeneratedContractTests
 {
-    /// <summary>Verifies that the generated gRPC client can be instantiated from the client factory.</summary>
     [Fact]
     public async Task GeneratedGrpcClient_CanBeConstructedFromClientFactory()
     {

clients/dotnet/MxGateway.Client.Tests/MxStatusProxyExtensionsTests.cs

@@ -1,13 +1,12 @@
 using System.Text.Json;
 using Google.Protobuf;
-using ZB.MOM.WW.MxGateway.Client;
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
+using MxGateway.Client;
+using MxGateway.Contracts.Proto;
 
-namespace ZB.MOM.WW.MxGateway.Client.Tests;
+namespace MxGateway.Client.Tests;
 
 public sealed class MxStatusProxyExtensionsTests
 {
-    /// <summary>Verifies that fixture statuses correctly project success and preserve raw integer fields.</summary>
     [Fact]
     public void FixtureStatuses_ProjectSuccessAndPreserveRawFields()
     {

clients/dotnet/MxGateway.Client.Tests/MxValueExtensionsTests.cs

@@ -1,13 +1,12 @@
 using System.Text.Json;
 using Google.Protobuf;
-using ZB.MOM.WW.MxGateway.Client;
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
+using MxGateway.Client;
+using MxGateway.Contracts.Proto;
 
-namespace ZB.MOM.WW.MxGateway.Client.Tests;
+namespace MxGateway.Client.Tests;
 
 public sealed class MxValueExtensionsTests
 {
-    /// <summary>Verifies that scalar values are converted to correctly-typed MxValue protobuf messages.</summary>
     [Fact]
     public void ToMxValue_WithScalarValues_CreatesTypedProtobufValues()
     {
@@ -19,7 +18,6 @@ public sealed class MxValueExtensionsTests
         Assert.Equal(MxValue.KindOneofCase.StringValue, "alpha".ToMxValue().KindCase);
     }
 
-    /// <summary>Verifies that array values are converted to array-kind MxValue messages with correct element types and dimensions.</summary>
     [Fact]
     public void ToMxValue_WithArrays_CreatesTypedArrayProtobufValues()
     {
@@ -31,7 +29,6 @@ public sealed class MxValueExtensionsTests
         Assert.Equal([2U], value.ArrayValue.Dimensions);
     }
 
-    /// <summary>Verifies that fixture test cases project to expected MxValue kinds and preserve raw type metadata.</summary>
     [Fact]
     public void FixtureValues_ProjectExpectedKindsAndPreserveRawMetadata()
     {

clients/dotnet/MxGateway.Client.sln

@@ -0,0 +1,76 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MxGateway.Client", "MxGateway.Client\MxGateway.Client.csproj", "{7CF9ED88-1F32-4040-BEB1-D0902E304C70}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MxGateway.Contracts", "..\..\src\MxGateway.Contracts\MxGateway.Contracts.csproj", "{9AB807A8-0469-40F7-A000-D240F36B6E5D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MxGateway.Client.Cli", "MxGateway.Client.Cli\MxGateway.Client.Cli.csproj", "{EB061E77-2475-4322-9257-3F2456DD141C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MxGateway.Client.Tests", "MxGateway.Client.Tests\MxGateway.Client.Tests.csproj", "{B77B5A8E-0C53-4419-9BCD-227C9753A074}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7CF9ED88-1F32-4040-BEB1-D0902E304C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CF9ED88-1F32-4040-BEB1-D0902E304C70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CF9ED88-1F32-4040-BEB1-D0902E304C70}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7CF9ED88-1F32-4040-BEB1-D0902E304C70}.Debug|x64.Build.0 = Debug|Any CPU
+		{7CF9ED88-1F32-4040-BEB1-D0902E304C70}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7CF9ED88-1F32-4040-BEB1-D0902E304C70}.Debug|x86.Build.0 = Debug|Any CPU
+		{7CF9ED88-1F32-4040-BEB1-D0902E304C70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CF9ED88-1F32-4040-BEB1-D0902E304C70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CF9ED88-1F32-4040-BEB1-D0902E304C70}.Release|x64.ActiveCfg = Release|Any CPU
+		{7CF9ED88-1F32-4040-BEB1-D0902E304C70}.Release|x64.Build.0 = Release|Any CPU
+		{7CF9ED88-1F32-4040-BEB1-D0902E304C70}.Release|x86.ActiveCfg = Release|Any CPU
+		{7CF9ED88-1F32-4040-BEB1-D0902E304C70}.Release|x86.Build.0 = Release|Any CPU
+		{9AB807A8-0469-40F7-A000-D240F36B6E5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AB807A8-0469-40F7-A000-D240F36B6E5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AB807A8-0469-40F7-A000-D240F36B6E5D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9AB807A8-0469-40F7-A000-D240F36B6E5D}.Debug|x64.Build.0 = Debug|Any CPU
+		{9AB807A8-0469-40F7-A000-D240F36B6E5D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9AB807A8-0469-40F7-A000-D240F36B6E5D}.Debug|x86.Build.0 = Debug|Any CPU
+		{9AB807A8-0469-40F7-A000-D240F36B6E5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9AB807A8-0469-40F7-A000-D240F36B6E5D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9AB807A8-0469-40F7-A000-D240F36B6E5D}.Release|x64.ActiveCfg = Release|Any CPU
+		{9AB807A8-0469-40F7-A000-D240F36B6E5D}.Release|x64.Build.0 = Release|Any CPU
+		{9AB807A8-0469-40F7-A000-D240F36B6E5D}.Release|x86.ActiveCfg = Release|Any CPU
+		{9AB807A8-0469-40F7-A000-D240F36B6E5D}.Release|x86.Build.0 = Release|Any CPU
+		{EB061E77-2475-4322-9257-3F2456DD141C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB061E77-2475-4322-9257-3F2456DD141C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB061E77-2475-4322-9257-3F2456DD141C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB061E77-2475-4322-9257-3F2456DD141C}.Debug|x64.Build.0 = Debug|Any CPU
+		{EB061E77-2475-4322-9257-3F2456DD141C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EB061E77-2475-4322-9257-3F2456DD141C}.Debug|x86.Build.0 = Debug|Any CPU
+		{EB061E77-2475-4322-9257-3F2456DD141C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB061E77-2475-4322-9257-3F2456DD141C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB061E77-2475-4322-9257-3F2456DD141C}.Release|x64.ActiveCfg = Release|Any CPU
+		{EB061E77-2475-4322-9257-3F2456DD141C}.Release|x64.Build.0 = Release|Any CPU
+		{EB061E77-2475-4322-9257-3F2456DD141C}.Release|x86.ActiveCfg = Release|Any CPU
+		{EB061E77-2475-4322-9257-3F2456DD141C}.Release|x86.Build.0 = Release|Any CPU
+		{B77B5A8E-0C53-4419-9BCD-227C9753A074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B77B5A8E-0C53-4419-9BCD-227C9753A074}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B77B5A8E-0C53-4419-9BCD-227C9753A074}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B77B5A8E-0C53-4419-9BCD-227C9753A074}.Debug|x64.Build.0 = Debug|Any CPU
+		{B77B5A8E-0C53-4419-9BCD-227C9753A074}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B77B5A8E-0C53-4419-9BCD-227C9753A074}.Debug|x86.Build.0 = Debug|Any CPU
+		{B77B5A8E-0C53-4419-9BCD-227C9753A074}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B77B5A8E-0C53-4419-9BCD-227C9753A074}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B77B5A8E-0C53-4419-9BCD-227C9753A074}.Release|x64.ActiveCfg = Release|Any CPU
+		{B77B5A8E-0C53-4419-9BCD-227C9753A074}.Release|x64.Build.0 = Release|Any CPU
+		{B77B5A8E-0C53-4419-9BCD-227C9753A074}.Release|x86.ActiveCfg = Release|Any CPU
+		{B77B5A8E-0C53-4419-9BCD-227C9753A074}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

clients/dotnet/MxGateway.Client/DiscoverHierarchyOptions.cs

@@ -0,0 +1,24 @@
+namespace MxGateway.Client;
+
+public sealed record DiscoverHierarchyOptions
+{
+    public int? RootGobjectId { get; init; }
+
+    public string? RootTagName { get; init; }
+
+    public string? RootContainedPath { get; init; }
+
+    public int? MaxDepth { get; init; }
+
+    public IReadOnlyList<int> CategoryIds { get; init; } = Array.Empty<int>();
+
+    public IReadOnlyList<string> TemplateChainContains { get; init; } = Array.Empty<string>();
+
+    public string? TagNameGlob { get; init; }
+
+    public bool? IncludeAttributes { get; init; }
+
+    public bool AlarmBearingOnly { get; init; }
+
+    public bool HistorizedOnly { get; init; }
+}

clients/dotnet/MxGateway.Client/GalaxyRepositoryClient.cs

@@ -2,14 +2,14 @@ using Google.Protobuf.WellKnownTypes;
 using Grpc.Core;
 using Grpc.Net.Client;
 using Microsoft.Extensions.Logging;
-using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
+using MxGateway.Contracts.Proto.Galaxy;
 using Polly;
 using System.Net.Http;
 using System.Net.Security;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography.X509Certificates;
 
-namespace ZB.MOM.WW.MxGateway.Client;
+namespace MxGateway.Client;
 
 /// <summary>
 /// Provides the .NET client entry point for the public Galaxy Repository gRPC API.
@@ -25,11 +25,6 @@ public sealed class GalaxyRepositoryClient : IAsyncDisposable
     private readonly ResiliencePipeline _safeUnaryRetryPipeline;
     private bool _disposed;
 
-    /// <summary>
-    /// Initializes a Galaxy Repository client with custom transport and options.
-    /// </summary>
-    /// <param name="options">Client options.</param>
-    /// <param name="transport">The underlying gRPC transport.</param>
     internal GalaxyRepositoryClient(
         MxGatewayClientOptions options,
         IGalaxyRepositoryClientTransport transport)
@@ -57,23 +52,12 @@ public sealed class GalaxyRepositoryClient : IAsyncDisposable
             Options.LoggerFactory?.CreateLogger<GalaxyRepositoryClient>());
     }
 
-    /// <summary>
-    /// Client options used to configure timeouts, authentication, and retry policy.
-    /// </summary>
     public MxGatewayClientOptions Options { get; }
 
-    /// <summary>
-    /// The underlying generated gRPC client for advanced operations.
-    /// </summary>
     public GalaxyRepository.GalaxyRepositoryClient RawClient =>
         _transport.RawClient
         ?? throw new InvalidOperationException("The raw generated gRPC client is not available for this client instance.");
 
-    /// <summary>
-    /// Creates a Galaxy Repository client with the given options, establishing a new gRPC channel.
-    /// </summary>
-    /// <param name="options">Client options.</param>
-    /// <returns>A new client instance.</returns>
     public static GalaxyRepositoryClient Create(MxGatewayClientOptions options)
     {
         ArgumentNullException.ThrowIfNull(options);
@@ -101,8 +85,6 @@ public sealed class GalaxyRepositoryClient : IAsyncDisposable
     /// Probes the Galaxy Repository database connection. Returns true when the
     /// gateway can reach the configured ZB SQL Server.
     /// </summary>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>True if connection is successful, false otherwise.</returns>
     public async Task<bool> TestConnectionAsync(CancellationToken cancellationToken = default)
     {
         TestConnectionReply reply = await TestConnectionRawAsync(
@@ -113,12 +95,6 @@ public sealed class GalaxyRepositoryClient : IAsyncDisposable
         return reply.Ok;
     }
 
-    /// <summary>
-    /// Probes the Galaxy Repository database connection without result wrapping.
-    /// </summary>
-    /// <param name="request">The test connection request.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The raw server reply.</returns>
     public Task<TestConnectionReply> TestConnectionRawAsync(
         TestConnectionRequest request,
         CancellationToken cancellationToken = default)
@@ -135,8 +111,6 @@ public sealed class GalaxyRepositoryClient : IAsyncDisposable
     /// Returns the timestamp of the most recent Galaxy deployment, or
     /// <see langword="null"/> when no deployment has been recorded.
     /// </summary>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The deployment timestamp, or null if not recorded.</returns>
     public async Task<DateTime?> GetLastDeployTimeAsync(CancellationToken cancellationToken = default)
     {
         GetLastDeployTimeReply reply = await GetLastDeployTimeRawAsync(
@@ -152,12 +126,6 @@ public sealed class GalaxyRepositoryClient : IAsyncDisposable
         return reply.TimeOfLastDeploy.ToDateTime();
     }
 
-    /// <summary>
-    /// Returns the most recent Galaxy deployment timestamp without result wrapping.
-    /// </summary>
-    /// <param name="request">The last deploy-time request.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The raw server reply.</returns>
     public Task<GetLastDeployTimeReply> GetLastDeployTimeRawAsync(
         GetLastDeployTimeRequest request,
         CancellationToken cancellationToken = default)
@@ -175,8 +143,6 @@ public sealed class GalaxyRepositoryClient : IAsyncDisposable
     /// includes its dynamic attributes so callers can determine which tag references
     /// they may subscribe to via the MxAccessGateway service.
     /// </summary>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The collection of Galaxy objects in the hierarchy.</returns>
     public async Task<IReadOnlyList<GalaxyObject>> DiscoverHierarchyAsync(CancellationToken cancellationToken = default)
     {
         return await DiscoverHierarchyAsync(new DiscoverHierarchyOptions(), cancellationToken).ConfigureAwait(false);
@@ -256,12 +222,6 @@ public sealed class GalaxyRepositoryClient : IAsyncDisposable
         return request;
     }
 
-    /// <summary>
-    /// Enumerates the Galaxy object hierarchy without result wrapping.
-    /// </summary>
-    /// <param name="request">The discover-hierarchy request.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The raw server reply.</returns>
     public Task<DiscoverHierarchyReply> DiscoverHierarchyRawAsync(
         DiscoverHierarchyRequest request,
         CancellationToken cancellationToken = default)
@@ -286,9 +246,6 @@ public sealed class GalaxyRepositoryClient : IAsyncDisposable
     /// at-least-once delivery beyond the per-subscriber buffer (gaps in
     /// <see cref="DeployEvent.Sequence"/> indicate dropped events).
     /// </remarks>
-    /// <param name="lastSeenDeployTime">Optional timestamp to suppress the bootstrap event.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>An async enumerable of deploy events.</returns>
     public IAsyncEnumerable<DeployEvent> WatchDeployEventsAsync(
         DateTimeOffset? lastSeenDeployTime = null,
         CancellationToken cancellationToken = default)
@@ -304,12 +261,6 @@ public sealed class GalaxyRepositoryClient : IAsyncDisposable
         return WatchDeployEventsRawAsync(request, cancellationToken);
     }
 
-    /// <summary>
-    /// Subscribes to Galaxy deploy events without result wrapping.
-    /// </summary>
-    /// <param name="request">The watch-deploy-events request.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>An async enumerable of raw deploy events.</returns>
     public IAsyncEnumerable<DeployEvent> WatchDeployEventsRawAsync(
         WatchDeployEventsRequest request,
         CancellationToken cancellationToken = default)
@@ -333,9 +284,6 @@ public sealed class GalaxyRepositoryClient : IAsyncDisposable
         }
     }
 
-    /// <summary>
-    /// Closes the gRPC channel and releases resources.
-    /// </summary>
     public ValueTask DisposeAsync()
     {
         if (_disposed)
@@ -348,32 +296,16 @@ public sealed class GalaxyRepositoryClient : IAsyncDisposable
         return ValueTask.CompletedTask;
     }
 
-    /// <summary>
-    /// Creates gRPC call options with the client's default timeout and API-key authorization.
-    /// </summary>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The call options.</returns>
     internal CallOptions CreateCallOptions(CancellationToken cancellationToken)
     {
         return CreateCallOptions(cancellationToken, Options.DefaultCallTimeout);
     }
 
-    /// <summary>
-    /// Creates gRPC call options for streaming RPCs with the stream timeout and API-key authorization.
-    /// </summary>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The stream call options.</returns>
     internal CallOptions CreateStreamCallOptions(CancellationToken cancellationToken)
     {
         return CreateCallOptions(cancellationToken, Options.StreamTimeout);
     }
 
-    /// <summary>
-    /// Creates gRPC call options with the specified timeout and API-key authorization.
-    /// </summary>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <param name="timeout">Optional timeout duration.</param>
-    /// <returns>The call options.</returns>
     internal CallOptions CreateCallOptions(
         CancellationToken cancellationToken,
         TimeSpan? timeout)

clients/dotnet/MxGateway.Client/GrpcGalaxyRepositoryClientTransport.cs

@@ -1,29 +1,18 @@
 using Grpc.Core;
-using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
+using MxGateway.Contracts.Proto.Galaxy;
 
-namespace ZB.MOM.WW.MxGateway.Client;
+namespace MxGateway.Client;
 
-/// <summary>
-/// gRPC implementation of IGalaxyRepositoryClientTransport.
-/// </summary>
 internal sealed class GrpcGalaxyRepositoryClientTransport(
     MxGatewayClientOptions options,
     GalaxyRepository.GalaxyRepositoryClient rawClient) : IGalaxyRepositoryClientTransport
 {
-    /// <summary>
-    /// Gets the gateway client options.
-    /// </summary>
     public MxGatewayClientOptions Options { get; } = options;
 
-    /// <summary>
-    /// Gets the underlying gRPC client.
-    /// </summary>
     public GalaxyRepository.GalaxyRepositoryClient RawClient { get; } = rawClient;
 
-    /// <inheritdoc />
     GalaxyRepository.GalaxyRepositoryClient? IGalaxyRepositoryClientTransport.RawClient => RawClient;
 
-    /// <inheritdoc />
     public async Task<TestConnectionReply> TestConnectionAsync(
         TestConnectionRequest request,
         CallOptions callOptions)
@@ -40,7 +29,6 @@ internal sealed class GrpcGalaxyRepositoryClientTransport(
         }
     }
 
-    /// <inheritdoc />
     public async Task<GetLastDeployTimeReply> GetLastDeployTimeAsync(
         GetLastDeployTimeRequest request,
         CallOptions callOptions)
@@ -57,7 +45,6 @@ internal sealed class GrpcGalaxyRepositoryClientTransport(
         }
     }
 
-    /// <inheritdoc />
     public async Task<DiscoverHierarchyReply> DiscoverHierarchyAsync(
         DiscoverHierarchyRequest request,
         CallOptions callOptions)
@@ -74,7 +61,6 @@ internal sealed class GrpcGalaxyRepositoryClientTransport(
         }
     }
 
-    /// <inheritdoc />
     public async IAsyncEnumerable<DeployEvent> WatchDeployEventsAsync(
         WatchDeployEventsRequest request,
         CallOptions callOptions,
@@ -108,7 +94,6 @@ internal sealed class GrpcGalaxyRepositoryClientTransport(
         }
     }
 
-    /// <inheritdoc />
     IAsyncEnumerable<DeployEvent> IGalaxyRepositoryClientTransport.WatchDeployEventsAsync(
         WatchDeployEventsRequest request,
         CallOptions callOptions)

clients/dotnet/MxGateway.Client/GrpcMxGatewayClientTransport.cs

@@ -1,29 +1,18 @@
 using Grpc.Core;
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
+using MxGateway.Contracts.Proto;
 
-namespace ZB.MOM.WW.MxGateway.Client;
+namespace MxGateway.Client;
 
-/// <summary>
-/// gRPC implementation of IMxGatewayClientTransport.
-/// </summary>
 internal sealed class GrpcMxGatewayClientTransport(
     MxGatewayClientOptions options,
     MxAccessGateway.MxAccessGatewayClient rawClient) : IMxGatewayClientTransport
 {
-    /// <summary>
-    /// Gets the gateway client options.
-    /// </summary>
     public MxGatewayClientOptions Options { get; } = options;
 
-    /// <summary>
-    /// Gets the underlying gRPC client.
-    /// </summary>
     public MxAccessGateway.MxAccessGatewayClient RawClient { get; } = rawClient;
 
-    /// <inheritdoc />
     MxAccessGateway.MxAccessGatewayClient? IMxGatewayClientTransport.RawClient => RawClient;
 
-    /// <inheritdoc />
     public async Task<OpenSessionReply> OpenSessionAsync(
         OpenSessionRequest request,
         CallOptions callOptions)
@@ -40,7 +29,6 @@ internal sealed class GrpcMxGatewayClientTransport(
         }
     }
 
-    /// <inheritdoc />
     public async Task<CloseSessionReply> CloseSessionAsync(
         CloseSessionRequest request,
         CallOptions callOptions)
@@ -57,7 +45,6 @@ internal sealed class GrpcMxGatewayClientTransport(
         }
     }
 
-    /// <inheritdoc />
     public async Task<MxCommandReply> InvokeAsync(
         MxCommandRequest request,
         CallOptions callOptions)
@@ -74,7 +61,6 @@ internal sealed class GrpcMxGatewayClientTransport(
         }
     }
 
-    /// <inheritdoc />
     public async IAsyncEnumerable<MxEvent> StreamEventsAsync(
         StreamEventsRequest request,
         CallOptions callOptions,
@@ -108,7 +94,6 @@ internal sealed class GrpcMxGatewayClientTransport(
         }
     }
 
-    /// <inheritdoc />
     IAsyncEnumerable<MxEvent> IMxGatewayClientTransport.StreamEventsAsync(
         StreamEventsRequest request,
         CallOptions callOptions)
@@ -116,107 +101,6 @@ internal sealed class GrpcMxGatewayClientTransport(
         return StreamEventsAsync(request, callOptions);
     }
 
-    /// <inheritdoc />
-    public async Task<AcknowledgeAlarmReply> AcknowledgeAlarmAsync(
-        AcknowledgeAlarmRequest request,
-        CallOptions callOptions)
-    {
-        try
-        {
-            return await RawClient.AcknowledgeAlarmAsync(request, callOptions)
-                .ResponseAsync
-                .ConfigureAwait(false);
-        }
-        catch (RpcException exception)
-        {
-            throw MapRpcException(exception, callOptions.CancellationToken);
-        }
-    }
-
-    /// <inheritdoc />
-    public async IAsyncEnumerable<ActiveAlarmSnapshot> QueryActiveAlarmsAsync(
-        QueryActiveAlarmsRequest request,
-        CallOptions callOptions,
-        [System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken = default)
-    {
-        CancellationToken effectiveCancellationToken = cancellationToken.CanBeCanceled
-            ? cancellationToken
-            : callOptions.CancellationToken;
-
-        using AsyncServerStreamingCall<ActiveAlarmSnapshot> call = RawClient.QueryActiveAlarms(request, callOptions);
-
-        IAsyncStreamReader<ActiveAlarmSnapshot> responseStream = call.ResponseStream;
-        while (true)
-        {
-            ActiveAlarmSnapshot? snapshot;
-            try
-            {
-                if (!await responseStream.MoveNext(effectiveCancellationToken).ConfigureAwait(false))
-                {
-                    break;
-                }
-
-                snapshot = responseStream.Current;
-            }
-            catch (RpcException exception)
-            {
-                throw MapRpcException(exception, effectiveCancellationToken);
-            }
-
-            yield return snapshot;
-        }
-    }
-
-    /// <inheritdoc />
-    IAsyncEnumerable<ActiveAlarmSnapshot> IMxGatewayClientTransport.QueryActiveAlarmsAsync(
-        QueryActiveAlarmsRequest request,
-        CallOptions callOptions)
-    {
-        return QueryActiveAlarmsAsync(request, callOptions);
-    }
-
-    /// <inheritdoc />
-    public async IAsyncEnumerable<AlarmFeedMessage> StreamAlarmsAsync(
-        StreamAlarmsRequest request,
-        CallOptions callOptions,
-        [System.Runtime.CompilerServices.EnumeratorCancellation] CancellationToken cancellationToken = default)
-    {
-        CancellationToken effectiveCancellationToken = cancellationToken.CanBeCanceled
-            ? cancellationToken
-            : callOptions.CancellationToken;
-
-        using AsyncServerStreamingCall<AlarmFeedMessage> call = RawClient.StreamAlarms(request, callOptions);
-
-        IAsyncStreamReader<AlarmFeedMessage> responseStream = call.ResponseStream;
-        while (true)
-        {
-            AlarmFeedMessage? message;
-            try
-            {
-                if (!await responseStream.MoveNext(effectiveCancellationToken).ConfigureAwait(false))
-                {
-                    break;
-                }
-
-                message = responseStream.Current;
-            }
-            catch (RpcException exception)
-            {
-                throw MapRpcException(exception, effectiveCancellationToken);
-            }
-
-            yield return message;
-        }
-    }
-
-    /// <inheritdoc />
-    IAsyncEnumerable<AlarmFeedMessage> IMxGatewayClientTransport.StreamAlarmsAsync(
-        StreamAlarmsRequest request,
-        CallOptions callOptions)
-    {
-        return StreamAlarmsAsync(request, callOptions);
-    }
-
     private static Exception MapRpcException(
         RpcException exception,
         CancellationToken cancellationToken)

clients/dotnet/MxGateway.Client/IGalaxyRepositoryClientTransport.cs

@@ -0,0 +1,27 @@
+using Grpc.Core;
+using MxGateway.Contracts.Proto.Galaxy;
+
+namespace MxGateway.Client;
+
+internal interface IGalaxyRepositoryClientTransport
+{
+    MxGatewayClientOptions Options { get; }
+
+    GalaxyRepository.GalaxyRepositoryClient? RawClient { get; }
+
+    Task<TestConnectionReply> TestConnectionAsync(
+        TestConnectionRequest request,
+        CallOptions callOptions);
+
+    Task<GetLastDeployTimeReply> GetLastDeployTimeAsync(
+        GetLastDeployTimeRequest request,
+        CallOptions callOptions);
+
+    Task<DiscoverHierarchyReply> DiscoverHierarchyAsync(
+        DiscoverHierarchyRequest request,
+        CallOptions callOptions);
+
+    IAsyncEnumerable<DeployEvent> WatchDeployEventsAsync(
+        WatchDeployEventsRequest request,
+        CallOptions callOptions);
+}

clients/dotnet/MxGateway.Client/IMxGatewayClientTransport.cs

@@ -0,0 +1,27 @@
+using Grpc.Core;
+using MxGateway.Contracts.Proto;
+
+namespace MxGateway.Client;
+
+internal interface IMxGatewayClientTransport
+{
+    MxGatewayClientOptions Options { get; }
+
+    MxAccessGateway.MxAccessGatewayClient? RawClient { get; }
+
+    Task<OpenSessionReply> OpenSessionAsync(
+        OpenSessionRequest request,
+        CallOptions callOptions);
+
+    Task<CloseSessionReply> CloseSessionAsync(
+        CloseSessionRequest request,
+        CallOptions callOptions);
+
+    Task<MxCommandReply> InvokeAsync(
+        MxCommandRequest request,
+        CallOptions callOptions);
+
+    IAsyncEnumerable<MxEvent> StreamEventsAsync(
+        StreamEventsRequest request,
+        CallOptions callOptions);
+}

clients/dotnet/MxGateway.Client/MxAccessException.cs

@@ -0,0 +1,24 @@
+using MxGateway.Contracts.Proto;
+
+namespace MxGateway.Client;
+
+public sealed class MxAccessException : MxGatewayCommandException
+{
+    public MxAccessException(
+        string message,
+        MxCommandReply reply,
+        Exception? innerException = null)
+        : base(
+            message,
+            reply.SessionId,
+            reply.CorrelationId,
+            reply.ProtocolStatus,
+            reply.HasHresult ? reply.Hresult : null,
+            reply.Statuses.ToArray(),
+            innerException)
+    {
+        Reply = reply;
+    }
+
+    public MxCommandReply Reply { get; }
+}

clients/dotnet/MxGateway.Client/MxCommandReplyExtensions.cs

@@ -1,12 +1,9 @@
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
+using MxGateway.Contracts.Proto;
 
-namespace ZB.MOM.WW.MxGateway.Client;
+namespace MxGateway.Client;
 
-/// <summary>Extension methods for checking MxCommandReply success conditions.</summary>
 public static class MxCommandReplyExtensions
 {
-    /// <summary>Validates that the reply has a successful protocol status (Ok or MxAccessFailure), throwing a gateway exception if not.</summary>
-    /// <param name="reply">The command reply to check.</param>
     public static MxCommandReply EnsureProtocolSuccess(this MxCommandReply reply)
     {
         ArgumentNullException.ThrowIfNull(reply);
@@ -22,8 +19,6 @@ public static class MxCommandReplyExtensions
         throw CreateProtocolException(reply, code);
     }
 
-    /// <summary>Validates that the reply indicates MXAccess success (no HResult or status failures), throwing MxAccessException if not.</summary>
-    /// <param name="reply">The command reply to check.</param>
     public static MxCommandReply EnsureMxAccessSuccess(this MxCommandReply reply)
     {
         ArgumentNullException.ThrowIfNull(reply);

clients/dotnet/MxGateway.Client/MxGateway.Client.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\ZB.MOM.WW.MxGateway.Contracts\ZB.MOM.WW.MxGateway.Contracts.csproj" />
+    <ProjectReference Include="..\..\..\src\MxGateway.Contracts\MxGateway.Contracts.csproj" />
   </ItemGroup>
 
   <ItemGroup>

clients/dotnet/MxGateway.Client/MxGatewayAuthenticationException.cs

@@ -0,0 +1,25 @@
+using MxGateway.Contracts.Proto;
+
+namespace MxGateway.Client;
+
+public sealed class MxGatewayAuthenticationException : MxGatewayException
+{
+    public MxGatewayAuthenticationException(
+        string message,
+        string? sessionId = null,
+        string? correlationId = null,
+        ProtocolStatus? protocolStatus = null,
+        int? hResult = null,
+        IReadOnlyList<MxStatusProxy>? statuses = null,
+        Exception? innerException = null)
+        : base(
+            message,
+            sessionId,
+            correlationId,
+            protocolStatus,
+            hResult,
+            statuses ?? [],
+            innerException)
+    {
+    }
+}

clients/dotnet/MxGateway.Client/MxGatewayAuthorizationException.cs

@@ -0,0 +1,25 @@
+using MxGateway.Contracts.Proto;
+
+namespace MxGateway.Client;
+
+public sealed class MxGatewayAuthorizationException : MxGatewayException
+{
+    public MxGatewayAuthorizationException(
+        string message,
+        string? sessionId = null,
+        string? correlationId = null,
+        ProtocolStatus? protocolStatus = null,
+        int? hResult = null,
+        IReadOnlyList<MxStatusProxy>? statuses = null,
+        Exception? innerException = null)
+        : base(
+            message,
+            sessionId,
+            correlationId,
+            protocolStatus,
+            hResult,
+            statuses ?? [],
+            innerException)
+    {
+    }
+}

clients/dotnet/MxGateway.Client/MxGatewayClient.cs

@@ -1,13 +1,13 @@
 using Grpc.Core;
 using Grpc.Net.Client;
 using Microsoft.Extensions.Logging;
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
+using MxGateway.Contracts.Proto;
 using Polly;
 using System.Net.Http;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 
-namespace ZB.MOM.WW.MxGateway.Client;
+namespace MxGateway.Client;
 
 /// <summary>
 /// Provides the .NET client entry point for the public MXAccess Gateway gRPC API.
@@ -19,11 +19,6 @@ public sealed class MxGatewayClient : IAsyncDisposable
     private readonly ResiliencePipeline _safeUnaryRetryPipeline;
     private bool _disposed;
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MxGatewayClient"/> with given options and transport.
-    /// </summary>
-    /// <param name="options">Client configuration options.</param>
-    /// <param name="transport">Transport implementation for gateway communication.</param>
     internal MxGatewayClient(
         MxGatewayClientOptions options,
         IMxGatewayClientTransport transport)
@@ -51,23 +46,12 @@ public sealed class MxGatewayClient : IAsyncDisposable
             Options.LoggerFactory?.CreateLogger<MxGatewayClient>());
     }
 
-    /// <summary>
-    /// Gets the client configuration options.
-    /// </summary>
     public MxGatewayClientOptions Options { get; }
 
-    /// <summary>
-    /// Gets the underlying generated gRPC client.
-    /// </summary>
     public MxAccessGateway.MxAccessGatewayClient RawClient =>
         _transport.RawClient
         ?? throw new InvalidOperationException("The raw generated gRPC client is not available for this client instance.");
 
-    /// <summary>
-    /// Creates a new gateway client with the given options.
-    /// </summary>
-    /// <param name="options">Client configuration options.</param>
-    /// <returns>A new gateway client instance.</returns>
     public static MxGatewayClient Create(MxGatewayClientOptions options)
     {
         ArgumentNullException.ThrowIfNull(options);
@@ -91,12 +75,6 @@ public sealed class MxGatewayClient : IAsyncDisposable
                 new MxAccessGateway.MxAccessGatewayClient(channel)));
     }
 
-    /// <summary>
-    /// Opens a new gateway session.
-    /// </summary>
-    /// <param name="request">Session open request; defaults to empty request if null.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>A wrapped gateway session.</returns>
     public async Task<MxGatewaySession> OpenSessionAsync(
         OpenSessionRequest? request = null,
         CancellationToken cancellationToken = default)
@@ -109,12 +87,6 @@ public sealed class MxGatewayClient : IAsyncDisposable
         return new MxGatewaySession(this, reply);
     }
 
-    /// <summary>
-    /// Opens a new gateway session and returns the raw protobuf reply.
-    /// </summary>
-    /// <param name="request">Session open request.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>The raw gateway session open reply.</returns>
     public Task<OpenSessionReply> OpenSessionRawAsync(
         OpenSessionRequest request,
         CancellationToken cancellationToken = default)
@@ -125,12 +97,6 @@ public sealed class MxGatewayClient : IAsyncDisposable
         return _transport.OpenSessionAsync(request, CreateCallOptions(cancellationToken));
     }
 
-    /// <summary>
-    /// Closes an open gateway session.
-    /// </summary>
-    /// <param name="request">Session close request.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>The session close reply.</returns>
     public Task<CloseSessionReply> CloseSessionRawAsync(
         CloseSessionRequest request,
         CancellationToken cancellationToken = default)
@@ -143,12 +109,6 @@ public sealed class MxGatewayClient : IAsyncDisposable
             cancellationToken);
     }
 
-    /// <summary>
-    /// Invokes an MXAccess command on the open session.
-    /// </summary>
-    /// <param name="request">The command request.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>The command reply.</returns>
     public Task<MxCommandReply> InvokeAsync(
         MxCommandRequest request,
         CancellationToken cancellationToken = default)
@@ -166,12 +126,6 @@ public sealed class MxGatewayClient : IAsyncDisposable
         return _transport.InvokeAsync(request, CreateCallOptions(cancellationToken));
     }
 
-    /// <summary>
-    /// Streams events from the gateway session.
-    /// </summary>
-    /// <param name="request">The stream events request.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>An async enumerable of events.</returns>
     public IAsyncEnumerable<MxEvent> StreamEventsAsync(
         StreamEventsRequest request,
         CancellationToken cancellationToken = default)
@@ -182,73 +136,6 @@ public sealed class MxGatewayClient : IAsyncDisposable
         return _transport.StreamEventsAsync(request, CreateStreamCallOptions(cancellationToken));
     }
 
-    /// <summary>
-    /// Acknowledges an active MXAccess alarm condition through the gateway. The
-    /// gateway authenticates the request against the API key's <c>invoke:alarm-ack</c>
-    /// scope and forwards the acknowledge to the worker's MXAccess session;
-    /// the resulting <see cref="MxStatusProxy"/> is returned in the reply.
-    /// </summary>
-    /// <param name="request">The acknowledge request — alarm reference, comment, operator user.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>The acknowledge reply with protocol + native MxStatus.</returns>
-    public Task<AcknowledgeAlarmReply> AcknowledgeAlarmAsync(
-        AcknowledgeAlarmRequest request,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(request);
-        ThrowIfDisposed();
-
-        return ExecuteSafeUnaryAsync(
-            token => _transport.AcknowledgeAlarmAsync(request, CreateCallOptions(token)),
-            cancellationToken);
-    }
-
-    /// <summary>
-    /// Streams a snapshot of all alarms currently Active or ActiveAcked — the gateway's
-    /// ConditionRefresh equivalent. Used after reconnect to seed the local Part 9 state
-    /// machine, or to reconcile alarms that may have been missed during a transport
-    /// blip. Optionally scoped by alarm-reference prefix
-    /// (<see cref="QueryActiveAlarmsRequest.AlarmFilterPrefix"/>) so a partial refresh
-    /// can target an equipment sub-tree.
-    /// </summary>
-    /// <param name="request">The query request, optionally scoped by alarm-reference prefix.</param>
-    /// <param name="cancellationToken">Cancellation token for the stream.</param>
-    /// <returns>An async enumerable of active-alarm snapshots.</returns>
-    public IAsyncEnumerable<ActiveAlarmSnapshot> QueryActiveAlarmsAsync(
-        QueryActiveAlarmsRequest request,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(request);
-        ThrowIfDisposed();
-
-        return _transport.QueryActiveAlarmsAsync(request, CreateStreamCallOptions(cancellationToken));
-    }
-
-    /// <summary>
-    /// Attaches to the gateway's central alarm feed. The stream opens with one
-    /// <see cref="AlarmFeedMessage"/> per currently-active alarm (the
-    /// ConditionRefresh snapshot), then a single <c>snapshot_complete</c>, then a
-    /// <c>transition</c> for every subsequent raise / acknowledge / clear. Served
-    /// by the gateway's always-on alarm monitor — no worker session is opened, so
-    /// any number of clients may attach. Optionally scoped by alarm-reference
-    /// prefix (<see cref="StreamAlarmsRequest.AlarmFilterPrefix"/>).
-    /// </summary>
-    /// <param name="request">The stream request, optionally scoped by alarm-reference prefix.</param>
-    /// <param name="cancellationToken">Cancellation token for the stream.</param>
-    /// <returns>An async enumerable of alarm feed messages.</returns>
-    public IAsyncEnumerable<AlarmFeedMessage> StreamAlarmsAsync(
-        StreamAlarmsRequest request,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(request);
-        ThrowIfDisposed();
-
-        return _transport.StreamAlarmsAsync(request, CreateStreamCallOptions(cancellationToken));
-    }
-
-    /// <summary>
-    /// Disposes the client and releases all resources.
-    /// </summary>
     public ValueTask DisposeAsync()
     {
         if (_disposed)
@@ -261,32 +148,16 @@ public sealed class MxGatewayClient : IAsyncDisposable
         return ValueTask.CompletedTask;
     }
 
-    /// <summary>
-    /// Creates gRPC call options with default timeout and authorization.
-    /// </summary>
-    /// <param name="cancellationToken">Cancellation token for the call.</param>
-    /// <returns>Configured call options.</returns>
     internal CallOptions CreateCallOptions(CancellationToken cancellationToken)
     {
         return CreateCallOptions(cancellationToken, Options.DefaultCallTimeout);
     }
 
-    /// <summary>
-    /// Creates gRPC call options for streaming with stream timeout and authorization.
-    /// </summary>
-    /// <param name="cancellationToken">Cancellation token for the call.</param>
-    /// <returns>Configured call options.</returns>
     internal CallOptions CreateStreamCallOptions(CancellationToken cancellationToken)
     {
         return CreateCallOptions(cancellationToken, Options.StreamTimeout);
     }
 
-    /// <summary>
-    /// Creates gRPC call options with specified timeout and authorization.
-    /// </summary>
-    /// <param name="cancellationToken">Cancellation token for the call.</param>
-    /// <param name="timeout">Optional timeout duration; null means no timeout.</param>
-    /// <returns>Configured call options.</returns>
     internal CallOptions CreateCallOptions(
         CancellationToken cancellationToken,
         TimeSpan? timeout)

clients/dotnet/MxGateway.Client/MxGatewayClientContractInfo.cs

@@ -1,6 +1,6 @@
-using ZB.MOM.WW.MxGateway.Contracts;
+using MxGateway.Contracts;
 
-namespace ZB.MOM.WW.MxGateway.Client;
+namespace MxGateway.Client;
 
 /// <summary>
 /// Exposes the protocol versions compiled into this client package.

clients/dotnet/MxGateway.Client/MxGatewayClientOptions.cs

@@ -1,70 +1,34 @@
 using Microsoft.Extensions.Logging;
 
-namespace ZB.MOM.WW.MxGateway.Client;
+namespace MxGateway.Client;
 
 /// <summary>
 /// Configures the gRPC channel used by the .NET MXAccess Gateway client.
 /// </summary>
 public sealed class MxGatewayClientOptions
 {
-    /// <summary>
-    /// Gets the gateway endpoint URI (required).
-    /// </summary>
     public required Uri Endpoint { get; init; }
 
-    /// <summary>
-    /// Gets the API key for gateway authentication (required).
-    /// </summary>
     public required string ApiKey { get; init; }
 
-    /// <summary>
-    /// Gets a value indicating whether to use TLS for the gateway connection.
-    /// </summary>
     public bool UseTls { get; init; }
 
-    /// <summary>
-    /// Gets the path to a CA certificate file for custom certificate validation.
-    /// </summary>
     public string? CaCertificatePath { get; init; }
 
-    /// <summary>
-    /// Gets the server name override for SNI during TLS handshake.
-    /// </summary>
     public string? ServerNameOverride { get; init; }
 
-    /// <summary>
-    /// Gets the timeout for establishing connection to the gateway.
-    /// </summary>
     public TimeSpan ConnectTimeout { get; init; } = TimeSpan.FromSeconds(10);
 
-    /// <summary>
-    /// Gets the default timeout for unary gRPC calls.
-    /// </summary>
     public TimeSpan DefaultCallTimeout { get; init; } = TimeSpan.FromSeconds(30);
 
-    /// <summary>
-    /// Gets the optional timeout for streaming gRPC calls.
-    /// </summary>
     public TimeSpan? StreamTimeout { get; init; }
 
     public int MaxGrpcMessageBytes { get; init; } = 16 * 1024 * 1024;
 
-    /// <summary>
-    /// Gets the retry configuration for safe unary calls.
-    /// </summary>
     public MxGatewayClientRetryOptions Retry { get; init; } = new();
 
-    /// <summary>
-    /// Gets the logger factory for diagnostic logging.
-    /// </summary>
     public ILoggerFactory? LoggerFactory { get; init; }
 
-    /// <summary>
-    /// Validates the client options for consistency and correctness.
-    /// </summary>
-    /// <exception cref="ArgumentNullException">Endpoint is null.</exception>
-    /// <exception cref="ArgumentException">Options are invalid or inconsistent.</exception>
-    /// <exception cref="ArgumentOutOfRangeException">Timeout values are not greater than zero.</exception>
     public void Validate()
     {
         ArgumentNullException.ThrowIfNull(Endpoint);

clients/dotnet/MxGateway.Client/MxGatewayClientRetryOptions.cs

@@ -1,21 +1,15 @@
-namespace ZB.MOM.WW.MxGateway.Client;
+namespace MxGateway.Client;
 
-/// <summary>Configuration for automatic retry behavior on transient gRPC call failures.</summary>
 public sealed class MxGatewayClientRetryOptions
 {
-    /// <summary>Gets the maximum number of attempts (initial + retries); default is 2.</summary>
     public int MaxAttempts { get; init; } = 2;
 
-    /// <summary>Gets the initial delay between retry attempts; default is 200 milliseconds.</summary>
     public TimeSpan Delay { get; init; } = TimeSpan.FromMilliseconds(200);
 
-    /// <summary>Gets the maximum delay between retry attempts; default is 2 seconds.</summary>
     public TimeSpan MaxDelay { get; init; } = TimeSpan.FromSeconds(2);
 
-    /// <summary>Gets a value indicating whether to add randomness to retry delays; default is true.</summary>
     public bool UseJitter { get; init; } = true;
 
-    /// <summary>Validates the retry options and throws if any constraint is violated.</summary>
     public void Validate()
     {
         if (MaxAttempts <= 0)

clients/dotnet/MxGateway.Client/MxGatewayClientRetryPolicy.cs

@@ -1,17 +1,13 @@
 using Grpc.Core;
 using Microsoft.Extensions.Logging;
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
+using MxGateway.Contracts.Proto;
 using Polly;
 using Polly.Retry;
 
-namespace ZB.MOM.WW.MxGateway.Client;
+namespace MxGateway.Client;
 
-/// <summary>Factory and helpers for exponential-backoff retry policies on transient gRPC failures.</summary>
 internal static class MxGatewayClientRetryPolicy
 {
-    /// <summary>Creates a Polly ResiliencePipeline that retries transient gRPC failures with exponential backoff.</summary>
-    /// <param name="options">Retry configuration (max attempts, delay bounds, jitter).</param>
-    /// <param name="logger">Optional logger for retry diagnostics.</param>
     public static ResiliencePipeline Create(
         MxGatewayClientRetryOptions options,
         ILogger? logger)
@@ -40,8 +36,6 @@ internal static class MxGatewayClientRetryPolicy
             .Build();
     }
 
-    /// <summary>Returns whether a command kind is eligible for automatic retry on transient failures.</summary>
-    /// <param name="kind">The command kind to check.</param>
     public static bool IsRetryableCommand(MxCommandKind kind)
     {
         return kind is MxCommandKind.Ping

clients/dotnet/MxGateway.Client/MxGatewayCommandException.cs

@@ -0,0 +1,25 @@
+using MxGateway.Contracts.Proto;
+
+namespace MxGateway.Client;
+
+public class MxGatewayCommandException : MxGatewayException
+{
+    public MxGatewayCommandException(
+        string message,
+        string? sessionId = null,
+        string? correlationId = null,
+        ProtocolStatus? protocolStatus = null,
+        int? hResult = null,
+        IReadOnlyList<MxStatusProxy>? statuses = null,
+        Exception? innerException = null)
+        : base(
+            message,
+            sessionId,
+            correlationId,
+            protocolStatus,
+            hResult,
+            statuses ?? [],
+            innerException)
+    {
+    }
+}

clients/dotnet/MxGateway.Client/MxGatewayException.cs

@@ -0,0 +1,45 @@
+using MxGateway.Contracts.Proto;
+
+namespace MxGateway.Client;
+
+public class MxGatewayException : Exception
+{
+    public MxGatewayException(string message)
+        : base(message)
+    {
+        Statuses = [];
+    }
+
+    public MxGatewayException(string message, Exception? innerException)
+        : base(message, innerException)
+    {
+        Statuses = [];
+    }
+
+    public MxGatewayException(
+        string message,
+        string? sessionId,
+        string? correlationId,
+        ProtocolStatus? protocolStatus,
+        int? hResult,
+        IReadOnlyList<MxStatusProxy> statuses,
+        Exception? innerException = null)
+        : base(message, innerException)
+    {
+        SessionId = sessionId;
+        CorrelationId = correlationId;
+        ProtocolStatus = protocolStatus;
+        HResultCode = hResult;
+        Statuses = statuses;
+    }
+
+    public string? SessionId { get; }
+
+    public string? CorrelationId { get; }
+
+    public ProtocolStatus? ProtocolStatus { get; }
+
+    public int? HResultCode { get; }
+
+    public IReadOnlyList<MxStatusProxy> Statuses { get; }
+}

clients/dotnet/MxGateway.Client/MxGatewaySession.cs

@@ -0,0 +1,489 @@
+using MxGateway.Contracts.Proto;
+
+namespace MxGateway.Client;
+
+/// <summary>
+/// Represents one gateway-backed MXAccess session.
+/// </summary>
+public sealed class MxGatewaySession : IAsyncDisposable
+{
+    private readonly MxGatewayClient _client;
+    private readonly SemaphoreSlim _closeLock = new(1, 1);
+    private CloseSessionReply? _closeReply;
+
+    internal MxGatewaySession(
+        MxGatewayClient client,
+        OpenSessionReply openSessionReply)
+    {
+        _client = client ?? throw new ArgumentNullException(nameof(client));
+        OpenSessionReply = openSessionReply ?? throw new ArgumentNullException(nameof(openSessionReply));
+    }
+
+    public string SessionId => OpenSessionReply.SessionId;
+
+    public OpenSessionReply OpenSessionReply { get; }
+
+    public async Task<CloseSessionReply> CloseAsync(CancellationToken cancellationToken = default)
+    {
+        if (_closeReply is not null)
+        {
+            return _closeReply;
+        }
+
+        await _closeLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+        try
+        {
+            if (_closeReply is not null)
+            {
+                return _closeReply;
+            }
+
+            _closeReply = await _client.CloseSessionRawAsync(
+                    new CloseSessionRequest { SessionId = SessionId },
+                    cancellationToken)
+                .ConfigureAwait(false);
+            return _closeReply;
+        }
+        finally
+        {
+            _closeLock.Release();
+        }
+    }
+
+    public async Task<int> RegisterAsync(
+        string clientName,
+        CancellationToken cancellationToken = default)
+    {
+        MxCommandReply reply = await RegisterRawAsync(clientName, cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+        return reply.Register?.ServerHandle ?? reply.ReturnValue.Int32Value;
+    }
+
+    public Task<MxCommandReply> RegisterRawAsync(
+        string clientName,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(clientName);
+
+        return InvokeCommandAsync(
+            new MxCommand
+            {
+                Kind = MxCommandKind.Register,
+                Register = new RegisterCommand { ClientName = clientName },
+            },
+            cancellationToken);
+    }
+
+    public async Task<int> AddItemAsync(
+        int serverHandle,
+        string itemDefinition,
+        CancellationToken cancellationToken = default)
+    {
+        MxCommandReply reply = await AddItemRawAsync(
+                serverHandle,
+                itemDefinition,
+                cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+        return reply.AddItem?.ItemHandle ?? reply.ReturnValue.Int32Value;
+    }
+
+    public Task<MxCommandReply> AddItemRawAsync(
+        int serverHandle,
+        string itemDefinition,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(itemDefinition);
+
+        return InvokeCommandAsync(
+            new MxCommand
+            {
+                Kind = MxCommandKind.AddItem,
+                AddItem = new AddItemCommand
+                {
+                    ServerHandle = serverHandle,
+                    ItemDefinition = itemDefinition,
+                },
+            },
+            cancellationToken);
+    }
+
+    public async Task<int> AddItem2Async(
+        int serverHandle,
+        string itemDefinition,
+        string itemContext,
+        CancellationToken cancellationToken = default)
+    {
+        MxCommandReply reply = await AddItem2RawAsync(
+                serverHandle,
+                itemDefinition,
+                itemContext,
+                cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+        return reply.AddItem2?.ItemHandle ?? reply.ReturnValue.Int32Value;
+    }
+
+    public Task<MxCommandReply> AddItem2RawAsync(
+        int serverHandle,
+        string itemDefinition,
+        string itemContext,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentException.ThrowIfNullOrWhiteSpace(itemDefinition);
+
+        return InvokeCommandAsync(
+            new MxCommand
+            {
+                Kind = MxCommandKind.AddItem2,
+                AddItem2 = new AddItem2Command
+                {
+                    ServerHandle = serverHandle,
+                    ItemDefinition = itemDefinition,
+                    ItemContext = itemContext ?? string.Empty,
+                },
+            },
+            cancellationToken);
+    }
+
+    public async Task AdviseAsync(
+        int serverHandle,
+        int itemHandle,
+        CancellationToken cancellationToken = default)
+    {
+        MxCommandReply reply = await AdviseRawAsync(serverHandle, itemHandle, cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+    }
+
+    public Task<MxCommandReply> AdviseRawAsync(
+        int serverHandle,
+        int itemHandle,
+        CancellationToken cancellationToken = default)
+    {
+        return InvokeCommandAsync(
+            new MxCommand
+            {
+                Kind = MxCommandKind.Advise,
+                Advise = new AdviseCommand
+                {
+                    ServerHandle = serverHandle,
+                    ItemHandle = itemHandle,
+                },
+            },
+            cancellationToken);
+    }
+
+    public async Task UnAdviseAsync(
+        int serverHandle,
+        int itemHandle,
+        CancellationToken cancellationToken = default)
+    {
+        MxCommandReply reply = await UnAdviseRawAsync(serverHandle, itemHandle, cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+    }
+
+    public Task<MxCommandReply> UnAdviseRawAsync(
+        int serverHandle,
+        int itemHandle,
+        CancellationToken cancellationToken = default)
+    {
+        return InvokeCommandAsync(
+            new MxCommand
+            {
+                Kind = MxCommandKind.UnAdvise,
+                UnAdvise = new UnAdviseCommand
+                {
+                    ServerHandle = serverHandle,
+                    ItemHandle = itemHandle,
+                },
+            },
+            cancellationToken);
+    }
+
+    public async Task RemoveItemAsync(
+        int serverHandle,
+        int itemHandle,
+        CancellationToken cancellationToken = default)
+    {
+        MxCommandReply reply = await RemoveItemRawAsync(serverHandle, itemHandle, cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+    }
+
+    public Task<MxCommandReply> RemoveItemRawAsync(
+        int serverHandle,
+        int itemHandle,
+        CancellationToken cancellationToken = default)
+    {
+        return InvokeCommandAsync(
+            new MxCommand
+            {
+                Kind = MxCommandKind.RemoveItem,
+                RemoveItem = new RemoveItemCommand
+                {
+                    ServerHandle = serverHandle,
+                    ItemHandle = itemHandle,
+                },
+            },
+            cancellationToken);
+    }
+
+    public async Task<IReadOnlyList<SubscribeResult>> AddItemBulkAsync(
+        int serverHandle,
+        IReadOnlyList<string> tagAddresses,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(tagAddresses);
+
+        AddItemBulkCommand command = new() { ServerHandle = serverHandle };
+        command.TagAddresses.Add(tagAddresses);
+
+        MxCommandReply reply = await InvokeCommandAsync(
+                new MxCommand
+                {
+                    Kind = MxCommandKind.AddItemBulk,
+                    AddItemBulk = command,
+                },
+                cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+        return reply.AddItemBulk?.Results.ToArray() ?? [];
+    }
+
+    public async Task<IReadOnlyList<SubscribeResult>> AdviseItemBulkAsync(
+        int serverHandle,
+        IReadOnlyList<int> itemHandles,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(itemHandles);
+
+        AdviseItemBulkCommand command = new() { ServerHandle = serverHandle };
+        command.ItemHandles.Add(itemHandles);
+
+        MxCommandReply reply = await InvokeCommandAsync(
+                new MxCommand
+                {
+                    Kind = MxCommandKind.AdviseItemBulk,
+                    AdviseItemBulk = command,
+                },
+                cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+        return reply.AdviseItemBulk?.Results.ToArray() ?? [];
+    }
+
+    public async Task<IReadOnlyList<SubscribeResult>> RemoveItemBulkAsync(
+        int serverHandle,
+        IReadOnlyList<int> itemHandles,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(itemHandles);
+
+        RemoveItemBulkCommand command = new() { ServerHandle = serverHandle };
+        command.ItemHandles.Add(itemHandles);
+
+        MxCommandReply reply = await InvokeCommandAsync(
+                new MxCommand
+                {
+                    Kind = MxCommandKind.RemoveItemBulk,
+                    RemoveItemBulk = command,
+                },
+                cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+        return reply.RemoveItemBulk?.Results.ToArray() ?? [];
+    }
+
+    public async Task<IReadOnlyList<SubscribeResult>> UnAdviseItemBulkAsync(
+        int serverHandle,
+        IReadOnlyList<int> itemHandles,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(itemHandles);
+
+        UnAdviseItemBulkCommand command = new() { ServerHandle = serverHandle };
+        command.ItemHandles.Add(itemHandles);
+
+        MxCommandReply reply = await InvokeCommandAsync(
+                new MxCommand
+                {
+                    Kind = MxCommandKind.UnAdviseItemBulk,
+                    UnAdviseItemBulk = command,
+                },
+                cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+        return reply.UnAdviseItemBulk?.Results.ToArray() ?? [];
+    }
+
+    public async Task<IReadOnlyList<SubscribeResult>> SubscribeBulkAsync(
+        int serverHandle,
+        IReadOnlyList<string> tagAddresses,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(tagAddresses);
+
+        SubscribeBulkCommand command = new() { ServerHandle = serverHandle };
+        command.TagAddresses.Add(tagAddresses);
+
+        MxCommandReply reply = await InvokeCommandAsync(
+                new MxCommand
+                {
+                    Kind = MxCommandKind.SubscribeBulk,
+                    SubscribeBulk = command,
+                },
+                cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+        return reply.SubscribeBulk?.Results.ToArray() ?? [];
+    }
+
+    public async Task<IReadOnlyList<SubscribeResult>> UnsubscribeBulkAsync(
+        int serverHandle,
+        IReadOnlyList<int> itemHandles,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(itemHandles);
+
+        UnsubscribeBulkCommand command = new() { ServerHandle = serverHandle };
+        command.ItemHandles.Add(itemHandles);
+
+        MxCommandReply reply = await InvokeCommandAsync(
+                new MxCommand
+                {
+                    Kind = MxCommandKind.UnsubscribeBulk,
+                    UnsubscribeBulk = command,
+                },
+                cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+        return reply.UnsubscribeBulk?.Results.ToArray() ?? [];
+    }
+
+    public async Task WriteAsync(
+        int serverHandle,
+        int itemHandle,
+        MxValue value,
+        int userId,
+        CancellationToken cancellationToken = default)
+    {
+        MxCommandReply reply = await WriteRawAsync(serverHandle, itemHandle, value, userId, cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+    }
+
+    public Task<MxCommandReply> WriteRawAsync(
+        int serverHandle,
+        int itemHandle,
+        MxValue value,
+        int userId,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(value);
+
+        return InvokeCommandAsync(
+            new MxCommand
+            {
+                Kind = MxCommandKind.Write,
+                Write = new WriteCommand
+                {
+                    ServerHandle = serverHandle,
+                    ItemHandle = itemHandle,
+                    Value = value,
+                    UserId = userId,
+                },
+            },
+            cancellationToken);
+    }
+
+    public async Task Write2Async(
+        int serverHandle,
+        int itemHandle,
+        MxValue value,
+        MxValue timestampValue,
+        int userId,
+        CancellationToken cancellationToken = default)
+    {
+        MxCommandReply reply = await Write2RawAsync(
+                serverHandle,
+                itemHandle,
+                value,
+                timestampValue,
+                userId,
+                cancellationToken)
+            .ConfigureAwait(false);
+        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
+    }
+
+    public Task<MxCommandReply> Write2RawAsync(
+        int serverHandle,
+        int itemHandle,
+        MxValue value,
+        MxValue timestampValue,
+        int userId,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(value);
+        ArgumentNullException.ThrowIfNull(timestampValue);
+
+        return InvokeCommandAsync(
+            new MxCommand
+            {
+                Kind = MxCommandKind.Write2,
+                Write2 = new Write2Command
+                {
+                    ServerHandle = serverHandle,
+                    ItemHandle = itemHandle,
+                    Value = value,
+                    TimestampValue = timestampValue,
+                    UserId = userId,
+                },
+            },
+            cancellationToken);
+    }
+
+    public Task<MxCommandReply> InvokeAsync(
+        MxCommandRequest request,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+        return _client.InvokeAsync(request, cancellationToken);
+    }
+
+    public IAsyncEnumerable<MxEvent> StreamEventsAsync(
+        ulong afterWorkerSequence = 0,
+        CancellationToken cancellationToken = default)
+    {
+        return _client.StreamEventsAsync(
+            new StreamEventsRequest
+            {
+                SessionId = SessionId,
+                AfterWorkerSequence = afterWorkerSequence,
+            },
+            cancellationToken);
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        await CloseAsync().ConfigureAwait(false);
+        _closeLock.Dispose();
+    }
+
+    private Task<MxCommandReply> InvokeCommandAsync(
+        MxCommand command,
+        CancellationToken cancellationToken)
+    {
+        return _client.InvokeAsync(
+            new MxCommandRequest
+            {
+                SessionId = SessionId,
+                ClientCorrelationId = Guid.NewGuid().ToString("N"),
+                Command = command,
+            },
+            cancellationToken);
+    }
+
+}

clients/dotnet/MxGateway.Client/MxGatewaySessionException.cs

@@ -0,0 +1,25 @@
+using MxGateway.Contracts.Proto;
+
+namespace MxGateway.Client;
+
+public sealed class MxGatewaySessionException : MxGatewayException
+{
+    public MxGatewaySessionException(
+        string message,
+        string? sessionId = null,
+        string? correlationId = null,
+        ProtocolStatus? protocolStatus = null,
+        int? hResult = null,
+        IReadOnlyList<MxStatusProxy>? statuses = null,
+        Exception? innerException = null)
+        : base(
+            message,
+            sessionId,
+            correlationId,
+            protocolStatus,
+            hResult,
+            statuses ?? [],
+            innerException)
+    {
+    }
+}

clients/dotnet/MxGateway.Client/MxGatewayWorkerException.cs

@@ -0,0 +1,25 @@
+using MxGateway.Contracts.Proto;
+
+namespace MxGateway.Client;
+
+public sealed class MxGatewayWorkerException : MxGatewayException
+{
+    public MxGatewayWorkerException(
+        string message,
+        string? sessionId = null,
+        string? correlationId = null,
+        ProtocolStatus? protocolStatus = null,
+        int? hResult = null,
+        IReadOnlyList<MxStatusProxy>? statuses = null,
+        Exception? innerException = null)
+        : base(
+            message,
+            sessionId,
+            correlationId,
+            protocolStatus,
+            hResult,
+            statuses ?? [],
+            innerException)
+    {
+    }
+}

clients/dotnet/MxGateway.Client/MxStatusProxyExtensions.cs

@@ -1,12 +1,9 @@
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
+using MxGateway.Contracts.Proto;
 
-namespace ZB.MOM.WW.MxGateway.Client;
+namespace MxGateway.Client;
 
-/// <summary>Extension methods for MxStatusProxy values.</summary>
 public static class MxStatusProxyExtensions
 {
-    /// <summary>Returns whether the status indicates success (success flag set and category is Ok).</summary>
-    /// <param name="status">The status to check.</param>
     public static bool IsSuccess(this MxStatusProxy status)
     {
         ArgumentNullException.ThrowIfNull(status);
@@ -15,8 +12,6 @@ public static class MxStatusProxyExtensions
             && status.Category is MxStatusCategory.Ok;
     }
 
-    /// <summary>Returns a formatted summary of the status for diagnostic output.</summary>
-    /// <param name="status">The status to summarize.</param>
     public static string ToDiagnosticSummary(this MxStatusProxy status)
     {
         ArgumentNullException.ThrowIfNull(status);

clients/dotnet/MxGateway.Client/MxValueExtensions.cs

@@ -1,8 +1,8 @@
 using Google.Protobuf;
 using Google.Protobuf.WellKnownTypes;
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
+using MxGateway.Contracts.Proto;
 
-namespace ZB.MOM.WW.MxGateway.Client;
+namespace MxGateway.Client;
 
 /// <summary>
 /// Creates and projects gateway MXAccess values without hiding the raw
@@ -10,10 +10,6 @@ namespace ZB.MOM.WW.MxGateway.Client;
 /// </summary>
 public static class MxValueExtensions
 {
-    /// <summary>
-    /// Converts a boolean value to an MxValue with MxDataType.Boolean.
-    /// </summary>
-    /// <param name="value">Scalar boolean value to wrap.</param>
     public static MxValue ToMxValue(this bool value)
     {
         return new MxValue
@@ -24,10 +20,6 @@ public static class MxValueExtensions
         };
     }
 
-    /// <summary>
-    /// Converts a 32-bit integer value to an MxValue with MxDataType.Integer.
-    /// </summary>
-    /// <param name="value">32-bit integer value to wrap.</param>
     public static MxValue ToMxValue(this int value)
     {
         return new MxValue
@@ -38,10 +30,6 @@ public static class MxValueExtensions
         };
     }
 
-    /// <summary>
-    /// Converts a 64-bit integer value to an MxValue with MxDataType.Integer.
-    /// </summary>
-    /// <param name="value">64-bit integer value to wrap.</param>
     public static MxValue ToMxValue(this long value)
     {
         return new MxValue
@@ -52,10 +40,6 @@ public static class MxValueExtensions
         };
     }
 
-    /// <summary>
-    /// Converts a single-precision floating-point value to an MxValue with MxDataType.Float.
-    /// </summary>
-    /// <param name="value">Single-precision floating-point value to wrap.</param>
     public static MxValue ToMxValue(this float value)
     {
         return new MxValue
@@ -66,10 +50,6 @@ public static class MxValueExtensions
         };
     }
 
-    /// <summary>
-    /// Converts a double-precision floating-point value to an MxValue with MxDataType.Double.
-    /// </summary>
-    /// <param name="value">Double-precision floating-point value to wrap.</param>
     public static MxValue ToMxValue(this double value)
     {
         return new MxValue
@@ -80,10 +60,6 @@ public static class MxValueExtensions
         };
     }
 
-    /// <summary>
-    /// Converts a string value to an MxValue with MxDataType.String.
-    /// </summary>
-    /// <param name="value">String value to wrap.</param>
     public static MxValue ToMxValue(this string value)
     {
         ArgumentNullException.ThrowIfNull(value);
@@ -96,10 +72,6 @@ public static class MxValueExtensions
         };
     }
 
-    /// <summary>
-    /// Converts a DateTimeOffset value to an MxValue with MxDataType.Time.
-    /// </summary>
-    /// <param name="value">DateTimeOffset value to wrap.</param>
     public static MxValue ToMxValue(this DateTimeOffset value)
     {
         return new MxValue
@@ -110,10 +82,6 @@ public static class MxValueExtensions
         };
     }
 
-    /// <summary>
-    /// Converts a DateTime value to an MxValue with MxDataType.Time.
-    /// </summary>
-    /// <param name="value">DateTime value to wrap.</param>
     public static MxValue ToMxValue(this DateTime value)
     {
         return new DateTimeOffset(
@@ -123,10 +91,6 @@ public static class MxValueExtensions
             .ToMxValue();
     }
 
-    /// <summary>
-    /// Converts a boolean array to an MxValue with MxDataType.Boolean.
-    /// </summary>
-    /// <param name="values">Array of boolean values to wrap.</param>
     public static MxValue ToMxValue(this IReadOnlyList<bool> values)
     {
         ArgumentNullException.ThrowIfNull(values);
@@ -141,10 +105,6 @@ public static class MxValueExtensions
         });
     }
 
-    /// <summary>
-    /// Converts a 32-bit integer array to an MxValue with MxDataType.Integer.
-    /// </summary>
-    /// <param name="values">Array of 32-bit integer values to wrap.</param>
     public static MxValue ToMxValue(this IReadOnlyList<int> values)
     {
         ArgumentNullException.ThrowIfNull(values);
@@ -159,10 +119,6 @@ public static class MxValueExtensions
         });
     }
 
-    /// <summary>
-    /// Converts a 64-bit integer array to an MxValue with MxDataType.Integer.
-    /// </summary>
-    /// <param name="values">Array of 64-bit integer values to wrap.</param>
     public static MxValue ToMxValue(this IReadOnlyList<long> values)
     {
         ArgumentNullException.ThrowIfNull(values);
@@ -177,10 +133,6 @@ public static class MxValueExtensions
         });
     }
 
-    /// <summary>
-    /// Converts a single-precision floating-point array to an MxValue with MxDataType.Float.
-    /// </summary>
-    /// <param name="values">Array of single-precision floating-point values to wrap.</param>
     public static MxValue ToMxValue(this IReadOnlyList<float> values)
     {
         ArgumentNullException.ThrowIfNull(values);
@@ -195,10 +147,6 @@ public static class MxValueExtensions
         });
     }
 
-    /// <summary>
-    /// Converts a double-precision floating-point array to an MxValue with MxDataType.Double.
-    /// </summary>
-    /// <param name="values">Array of double-precision floating-point values to wrap.</param>
     public static MxValue ToMxValue(this IReadOnlyList<double> values)
     {
         ArgumentNullException.ThrowIfNull(values);
@@ -213,10 +161,6 @@ public static class MxValueExtensions
         });
     }
 
-    /// <summary>
-    /// Converts a string array to an MxValue with MxDataType.String.
-    /// </summary>
-    /// <param name="values">Array of string values to wrap.</param>
     public static MxValue ToMxValue(this IReadOnlyList<string> values)
     {
         ArgumentNullException.ThrowIfNull(values);
@@ -231,10 +175,6 @@ public static class MxValueExtensions
         });
     }
 
-    /// <summary>
-    /// Converts a DateTimeOffset array to an MxValue with MxDataType.Time.
-    /// </summary>
-    /// <param name="values">Array of DateTimeOffset values to wrap.</param>
     public static MxValue ToMxValue(this IReadOnlyList<DateTimeOffset> values)
     {
         ArgumentNullException.ThrowIfNull(values);
@@ -249,10 +189,6 @@ public static class MxValueExtensions
         });
     }
 
-    /// <summary>
-    /// Gets the projection kind (field name) of the given MxValue's current oneof value.
-    /// </summary>
-    /// <param name="value">The MxValue whose oneof projection kind is returned.</param>
     public static string GetProjectionKind(this MxValue value)
     {
         ArgumentNullException.ThrowIfNull(value);
@@ -272,10 +208,6 @@ public static class MxValueExtensions
         };
     }
 
-    /// <summary>
-    /// Converts an MxValue to a CLR object; returns the boxed value or null for null MxValues.
-    /// </summary>
-    /// <param name="value">The MxValue to convert.</param>
     public static object? ToClrValue(this MxValue value)
     {
         ArgumentNullException.ThrowIfNull(value);
@@ -295,10 +227,6 @@ public static class MxValueExtensions
         };
     }
 
-    /// <summary>
-    /// Converts an MxArray to a CLR array; returns null if the array does not have a known element type.
-    /// </summary>
-    /// <param name="array">The MxArray to convert.</param>
     public static object? ToClrArrayValue(this MxArray array)
     {
         ArgumentNullException.ThrowIfNull(array);
@@ -321,13 +249,6 @@ public static class MxValueExtensions
         };
     }
 
-    /// <summary>
-    /// Creates an MxValue with MxDataType.Unknown from raw byte data, variant type, and diagnostic info.
-    /// </summary>
-    /// <param name="value">Raw byte data representing the value.</param>
-    /// <param name="variantType">Variant type string (e.g., "VT_BSTR").</param>
-    /// <param name="rawDiagnostic">Diagnostic string describing the raw value.</param>
-    /// <param name="rawDataType">Optional MXAccess data type override.</param>
     public static MxValue ToRawMxValue(
         byte[] value,
         string variantType,

clients/dotnet/MxGateway.Client/Properties/AssemblyInfo.cs

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("MxGateway.Client.Tests")]

clients/dotnet/README.md

@@ -7,11 +7,11 @@ CLI, and unit tests.
 
 | Project | Purpose |
 |---------|---------|
-| `ZB.MOM.WW.MxGateway.Client` | .NET 10 library entry point, raw gRPC calls, and session helpers. |
-| `ZB.MOM.WW.MxGateway.Client.Cli` | Test CLI for smoke and diagnostic commands. |
-| `ZB.MOM.WW.MxGateway.Client.Tests` | Unit tests for client options, generated contract wiring, auth metadata, session helpers, cancellation, and event streaming. |
+| `MxGateway.Client` | .NET 10 library entry point, raw gRPC calls, and session helpers. |
+| `MxGateway.Client.Cli` | Test CLI for smoke and diagnostic commands. |
+| `MxGateway.Client.Tests` | Unit tests for client options, generated contract wiring, auth metadata, session helpers, cancellation, and event streaming. |
 
-The projects reference `src/ZB.MOM.WW.MxGateway.Contracts/ZB.MOM.WW.MxGateway.Contracts.csproj` so
+The projects reference `src/MxGateway.Contracts/MxGateway.Contracts.csproj` so
 the client compiles against the same generated protobuf and gRPC types as the
 gateway. `clients/dotnet/generated` remains reserved for generator output if a
 future client build switches to client-local `Grpc.Tools` generation.
@@ -19,8 +19,8 @@ future client build switches to client-local `Grpc.Tools` generation.
 ## Build And Test
 
 ```powershell
-dotnet build clients/dotnet/ZB.MOM.WW.MxGateway.Client.slnx
-dotnet test clients/dotnet/ZB.MOM.WW.MxGateway.Client.slnx --no-build
+dotnet build clients/dotnet/MxGateway.Client.sln
+dotnet test clients/dotnet/MxGateway.Client.sln --no-build
 ```
 
 ## Packaging
@@ -29,8 +29,8 @@ Create local library and CLI artifacts from the repository root:
 
 ```powershell
 $dotnetPackageOutput = Join-Path (Get-Location) 'artifacts/clients/dotnet'
-dotnet pack clients/dotnet/ZB.MOM.WW.MxGateway.Client/ZB.MOM.WW.MxGateway.Client.csproj -c Release -p:PackageOutputPath="$dotnetPackageOutput"
-dotnet publish clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli/ZB.MOM.WW.MxGateway.Client.Cli.csproj -c Release -o artifacts/clients/dotnet/mxgw-dotnet
+dotnet pack clients/dotnet/MxGateway.Client/MxGateway.Client.csproj -c Release -p:PackageOutputPath="$dotnetPackageOutput"
+dotnet publish clients/dotnet/MxGateway.Client.Cli/MxGateway.Client.Cli.csproj -c Release -o artifacts/clients/dotnet/mxgw-dotnet
 ```
 
 The library package references the shared contracts project at build time. The
@@ -39,11 +39,11 @@ published CLI runs from `artifacts/clients/dotnet/mxgw-dotnet`.
 ## Regenerating Protobuf Bindings
 
 The .NET client uses the generated C# types from
-`src/ZB.MOM.WW.MxGateway.Contracts/Generated`. Regenerate those files through the
+`src/MxGateway.Contracts/Generated`. Regenerate those files through the
 contracts project:
 
 ```powershell
-dotnet build src/ZB.MOM.WW.MxGateway.Contracts/ZB.MOM.WW.MxGateway.Contracts.csproj
+dotnet build src/MxGateway.Contracts/MxGateway.Contracts.csproj
 ```
 
 ## Client Usage
@@ -84,15 +84,6 @@ messages. `MxGatewaySession.OpenSessionReply` keeps the raw session-open reply
 available, and command helpers have `*RawAsync` variants when callers need the
 complete `MxCommandReply`.
 
-For alarms, the client exposes `QueryActiveAlarmsAsync` (one-shot snapshot of
-the active alarms the gateway's central monitor currently holds),
-`StreamAlarmsAsync` (server-streaming feed of alarm-state-change messages
-keyed by the same monitor), and `AcknowledgeAlarmAsync` (ack by alarm
-reference, optional comment, ack target). All three accept a cancellation
-token and pass through the `MxGateway:Alarms` configuration on the
-server — when alarms are disabled, the gateway returns an empty list / empty
-stream rather than failing.
-
 `MxGatewaySession.CloseAsync` is explicit and idempotent. Repeated calls return
 the first `CloseSessionReply` instead of sending another close request.
 
@@ -126,17 +117,15 @@ reply.
 The test CLI supports deterministic JSON output for automation:
 
 ```powershell
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- version --json
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- open-session --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY --json
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- register --session-id <id> --client-name mxgw-dotnet-cli --json
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- add-item --session-id <id> --server-handle 1 --item Area001.Pump001.Speed --json
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- advise --session-id <id> --server-handle 1 --item-handle 1 --json
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- write --session-id <id> --server-handle 1 --item-handle 1 --type int32 --value 123 --json
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- write2 --session-id <id> --server-handle 1 --item-handle 1 --type int32 --value 123 --timestamp 2026-01-01T00:00:00Z --json
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- stream-events --session-id <id> --max-events 1 --json
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- stream-alarms --session-id <id> --max-messages 1 --json
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- acknowledge-alarm --session-id <id> --alarm-reference "\\Galaxy\Area001.Pump001.PumpFault" --json
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- smoke --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY --item Area001.Pump001.Speed --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- version --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- open-session --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- register --session-id <id> --client-name mxgw-dotnet-cli --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- add-item --session-id <id> --server-handle 1 --item Area001.Pump001.Speed --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- advise --session-id <id> --server-handle 1 --item-handle 1 --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- write --session-id <id> --server-handle 1 --item-handle 1 --type int32 --value 123 --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- write2 --session-id <id> --server-handle 1 --item-handle 1 --type int32 --value 123 --timestamp 2026-01-01T00:00:00Z --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- stream-events --session-id <id> --max-events 1 --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- smoke --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY --item Area001.Pump001.Speed --json
 ```
 
 `smoke` opens a session, registers a client, adds one item, advises it,
@@ -191,9 +180,9 @@ IReadOnlyList<GalaxyObject> pumps = await repository.DiscoverHierarchyAsync(
 The CLI exposes the same operations:
 
 ```powershell
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- galaxy-test-connection --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY --json
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- galaxy-last-deploy --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY --json
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- galaxy-discover --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- galaxy-test-connection --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- galaxy-last-deploy --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- galaxy-discover --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY
 ```
 
 ### Watching deploy events
@@ -228,15 +217,15 @@ await foreach (DeployEvent evt in repository.WatchDeployEventsAsync(
 The CLI counterpart streams events until Ctrl+C (or `--max-events`):
 
 ```powershell
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- galaxy-watch --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- galaxy-watch --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY --last-seen-deploy-time 2026-04-28T14:30:00Z --json
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- galaxy-watch --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY --max-events 5 --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- galaxy-watch --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- galaxy-watch --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY --last-seen-deploy-time 2026-04-28T14:30:00Z --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- galaxy-watch --endpoint http://localhost:5000 --api-key-env MXGATEWAY_API_KEY --max-events 5 --json
 ```
 
 Use TLS options for a secured gateway:
 
 ```powershell
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- smoke --endpoint https://ZB.MOM.WW.MxGateway.example.local:5001 --tls --ca-file C:\certs\mxgateway-ca.pem --server-name ZB.MOM.WW.MxGateway.example.local --api-key-env MXGATEWAY_API_KEY --item Area001.Pump001.Speed --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- smoke --endpoint https://mxgateway.example.local:5001 --tls --ca-file C:\certs\mxgateway-ca.pem --server-name mxgateway.example.local --api-key-env MXGATEWAY_API_KEY --item Area001.Pump001.Speed --json
 ```
 
 ## Integration Checks
@@ -248,11 +237,11 @@ $env:MXGATEWAY_INTEGRATION = '1'
 $env:MXGATEWAY_ENDPOINT = 'http://localhost:5000'
 $env:MXGATEWAY_API_KEY = '<gateway-api-key>'
 $env:MXGATEWAY_TEST_ITEM = 'Area001.Pump001.Speed'
-dotnet run --project clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli -- smoke --endpoint $env:MXGATEWAY_ENDPOINT --api-key-env MXGATEWAY_API_KEY --item $env:MXGATEWAY_TEST_ITEM --json
+dotnet run --project clients/dotnet/MxGateway.Client.Cli -- smoke --endpoint $env:MXGATEWAY_ENDPOINT --api-key-env MXGATEWAY_API_KEY --item $env:MXGATEWAY_TEST_ITEM --json
 ```
 
 ## Related Documentation
 
 - [Client Packaging](../../docs/ClientPackaging.md)
-- [Client Proto Generation](../../docs/ClientProtoGeneration.md)
-- [.NET Client Detailed Design](./DotnetClientDesign.md)
+- [Client Proto Generation](../../docs/client-proto-generation.md)
+- [.NET Client Detailed Design](../../docs/clients-dotnet-csharp-design.md)

clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli/IMxGatewayCliClient.cs

@@ -1,108 +0,0 @@
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
-
-namespace ZB.MOM.WW.MxGateway.Client.Cli;
-
-public interface IMxGatewayCliClient : IAsyncDisposable
-{
-    /// <summary>
-    /// Opens a new gateway session.
-    /// </summary>
-    /// <param name="request">Session open request.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>The session open reply.</returns>
-    Task<OpenSessionReply> OpenSessionAsync(
-        OpenSessionRequest request,
-        CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Closes an open gateway session.
-    /// </summary>
-    /// <param name="request">Session close request.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>The session close reply.</returns>
-    Task<CloseSessionReply> CloseSessionAsync(
-        CloseSessionRequest request,
-        CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Invokes an MXAccess command on the session.
-    /// </summary>
-    /// <param name="request">The command request.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>The command reply.</returns>
-    Task<MxCommandReply> InvokeAsync(
-        MxCommandRequest request,
-        CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Streams events from the gateway session.
-    /// </summary>
-    /// <param name="request">The stream events request.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>An async enumerable of events.</returns>
-    IAsyncEnumerable<MxEvent> StreamEventsAsync(
-        StreamEventsRequest request,
-        CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Acknowledges an active MXAccess alarm condition through the gateway.
-    /// </summary>
-    /// <param name="request">The acknowledge request — alarm reference, comment, operator user.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>The acknowledge reply with protocol + native MxStatus.</returns>
-    Task<AcknowledgeAlarmReply> AcknowledgeAlarmAsync(
-        AcknowledgeAlarmRequest request,
-        CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Attaches to the gateway's central alarm feed — the current active-alarm
-    /// snapshot followed by live transitions.
-    /// </summary>
-    /// <param name="request">The stream request, optionally scoped by alarm-reference prefix.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>An async enumerable of alarm feed messages.</returns>
-    IAsyncEnumerable<AlarmFeedMessage> StreamAlarmsAsync(
-        StreamAlarmsRequest request,
-        CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Tests connection to the Galaxy Repository.
-    /// </summary>
-    /// <param name="request">The connection test request.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>The connection test reply.</returns>
-    Task<TestConnectionReply> GalaxyTestConnectionAsync(
-        TestConnectionRequest request,
-        CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Gets the last deployment time from the Galaxy Repository.
-    /// </summary>
-    /// <param name="request">The last deploy time request.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>The last deploy time reply.</returns>
-    Task<GetLastDeployTimeReply> GalaxyGetLastDeployTimeAsync(
-        GetLastDeployTimeRequest request,
-        CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Discovers the Galaxy Repository hierarchy.
-    /// </summary>
-    /// <param name="request">The discover hierarchy request.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>The discover hierarchy reply.</returns>
-    Task<DiscoverHierarchyReply> GalaxyDiscoverHierarchyAsync(
-        DiscoverHierarchyRequest request,
-        CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Watches for deployment events from the Galaxy Repository.
-    /// </summary>
-    /// <param name="request">The watch deploy events request.</param>
-    /// <param name="cancellationToken">Cancellation token for the operation.</param>
-    /// <returns>An async enumerable of deployment events.</returns>
-    IAsyncEnumerable<DeployEvent> GalaxyWatchDeployEventsAsync(
-        WatchDeployEventsRequest request,
-        CancellationToken cancellationToken);
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client.Cli/MxGatewayCliSecretRedactor.cs

@@ -1,18 +0,0 @@
-namespace ZB.MOM.WW.MxGateway.Client.Cli;
-
-/// <summary>Utility to redact API keys from error messages for safe output.</summary>
-internal static class MxGatewayCliSecretRedactor
-{
-    /// <summary>Replaces occurrences of the API key in the value with a redacted placeholder.</summary>
-    /// <param name="value">The message text to redact.</param>
-    /// <param name="apiKey">The API key to remove; no redaction if null or empty.</param>
-    public static string Redact(string value, string? apiKey)
-    {
-        if (string.IsNullOrEmpty(value) || string.IsNullOrEmpty(apiKey))
-        {
-            return value;
-        }
-
-        return value.Replace(apiKey, "[redacted]", StringComparison.Ordinal);
-    }
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client.Tests/FakeGatewayTransport.cs

@@ -1,270 +0,0 @@
-using Grpc.Core;
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-
-namespace ZB.MOM.WW.MxGateway.Client.Tests;
-
-/// <summary>
-/// Fake implementation of IMxGatewayClientTransport for testing.
-/// </summary>
-internal sealed class FakeGatewayTransport(MxGatewayClientOptions options) : IMxGatewayClientTransport
-{
-    private readonly Queue<MxCommandReply> _invokeReplies = new();
-    private readonly List<MxEvent> _events = [];
-
-    /// <summary>
-    /// Gets the gateway client options.
-    /// </summary>
-    public MxGatewayClientOptions Options { get; } = options;
-
-    /// <summary>
-    /// Gets null, since this is a test fake without a real gRPC client.
-    /// </summary>
-    public MxAccessGateway.MxAccessGatewayClient? RawClient => null;
-
-    /// <summary>
-    /// Gets the list of captured OpenSessionAsync calls.
-    /// </summary>
-    public List<(OpenSessionRequest Request, CallOptions CallOptions)> OpenSessionCalls { get; } = [];
-
-    /// <summary>
-    /// Gets the list of captured CloseSessionAsync calls.
-    /// </summary>
-    public List<(CloseSessionRequest Request, CallOptions CallOptions)> CloseSessionCalls { get; } = [];
-
-    /// <summary>
-    /// Gets the list of captured InvokeAsync calls.
-    /// </summary>
-    public List<(MxCommandRequest Request, CallOptions CallOptions)> InvokeCalls { get; } = [];
-
-    /// <summary>
-    /// Gets the list of captured StreamEventsAsync calls.
-    /// </summary>
-    public List<(StreamEventsRequest Request, CallOptions CallOptions)> StreamEventsCalls { get; } = [];
-
-    /// <summary>
-    /// Gets the list of captured AcknowledgeAlarmAsync calls.
-    /// </summary>
-    public List<(AcknowledgeAlarmRequest Request, CallOptions CallOptions)> AcknowledgeAlarmCalls { get; } = [];
-
-    /// <summary>
-    /// Gets the list of captured QueryActiveAlarmsAsync calls.
-    /// </summary>
-    public List<(QueryActiveAlarmsRequest Request, CallOptions CallOptions)> QueryActiveAlarmsCalls { get; } = [];
-
-    /// <summary>
-    /// Gets the list of captured StreamAlarmsAsync calls.
-    /// </summary>
-    public List<(StreamAlarmsRequest Request, CallOptions CallOptions)> StreamAlarmsCalls { get; } = [];
-
-    /// <summary>
-    /// Gets the queue of exceptions to throw from AcknowledgeAlarmAsync.
-    /// </summary>
-    public Queue<Exception> AcknowledgeAlarmExceptions { get; } = new();
-
-    private readonly Queue<AcknowledgeAlarmReply> _acknowledgeReplies = new();
-    private readonly List<ActiveAlarmSnapshot> _activeAlarmSnapshots = [];
-    private readonly List<AlarmFeedMessage> _alarmFeedMessages = [];
-
-    /// <summary>
-    /// Gets or sets the reply to return from OpenSessionAsync.
-    /// </summary>
-    public OpenSessionReply OpenSessionReply { get; set; } = new()
-    {
-        SessionId = "session-fixture",
-        BackendName = "mxaccess-worker",
-        GatewayProtocolVersion = 1,
-        WorkerProtocolVersion = 1,
-        ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
-    };
-
-    /// <summary>
-    /// Gets or sets the reply to return from CloseSessionAsync.
-    /// </summary>
-    public CloseSessionReply CloseSessionReply { get; set; } = new()
-    {
-        SessionId = "session-fixture",
-        FinalState = SessionState.Closed,
-        ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
-    };
-
-    /// <summary>
-    /// Gets the queue of exceptions to throw from OpenSessionAsync.
-    /// </summary>
-    public Queue<Exception> OpenSessionExceptions { get; } = new();
-
-    /// <summary>
-    /// Gets the queue of exceptions to throw from CloseSessionAsync.
-    /// </summary>
-    public Queue<Exception> CloseSessionExceptions { get; } = new();
-
-    /// <summary>
-    /// Gets the queue of exceptions to throw from InvokeAsync.
-    /// </summary>
-    public Queue<Exception> InvokeExceptions { get; } = new();
-
-    /// <summary>
-    /// Verifies that the OpenSessionAsync call is recorded and returns the configured reply.
-    /// </summary>
-    /// <param name="request">The OpenSessionRequest to process.</param>
-    /// <param name="callOptions">Call options specifying RPC behavior.</param>
-    public Task<OpenSessionReply> OpenSessionAsync(
-        OpenSessionRequest request,
-        CallOptions callOptions)
-    {
-        OpenSessionCalls.Add((request, callOptions));
-        if (OpenSessionExceptions.TryDequeue(out Exception? exception))
-        {
-            throw exception;
-        }
-
-        return Task.FromResult(OpenSessionReply);
-    }
-
-    /// <summary>
-    /// Verifies that the CloseSessionAsync call is recorded and returns the configured reply.
-    /// </summary>
-    /// <param name="request">The CloseSessionRequest to process.</param>
-    /// <param name="callOptions">Call options specifying RPC behavior.</param>
-    public Task<CloseSessionReply> CloseSessionAsync(
-        CloseSessionRequest request,
-        CallOptions callOptions)
-    {
-        CloseSessionCalls.Add((request, callOptions));
-        if (CloseSessionExceptions.TryDequeue(out Exception? exception))
-        {
-            throw exception;
-        }
-
-        return Task.FromResult(CloseSessionReply);
-    }
-
-    /// <summary>
-    /// Verifies that the InvokeAsync call is recorded and returns the next enqueued reply.
-    /// </summary>
-    /// <param name="request">The MxCommandRequest to process.</param>
-    /// <param name="callOptions">Call options specifying RPC behavior.</param>
-    public Task<MxCommandReply> InvokeAsync(
-        MxCommandRequest request,
-        CallOptions callOptions)
-    {
-        InvokeCalls.Add((request, callOptions));
-        if (InvokeExceptions.TryDequeue(out Exception? exception))
-        {
-            throw exception;
-        }
-
-        return Task.FromResult(_invokeReplies.Dequeue());
-    }
-
-    /// <summary>
-    /// Verifies that the StreamEventsAsync call is recorded and yields all enqueued events.
-    /// </summary>
-    /// <param name="request">The StreamEventsRequest to process.</param>
-    /// <param name="callOptions">Call options specifying RPC behavior.</param>
-    public async IAsyncEnumerable<MxEvent> StreamEventsAsync(
-        StreamEventsRequest request,
-        CallOptions callOptions)
-    {
-        StreamEventsCalls.Add((request, callOptions));
-
-        foreach (MxEvent gatewayEvent in _events)
-        {
-            callOptions.CancellationToken.ThrowIfCancellationRequested();
-            await Task.Yield();
-            yield return gatewayEvent;
-        }
-    }
-
-    /// <summary>
-    /// Enqueues a reply to be returned from the next InvokeAsync call.
-    /// </summary>
-    /// <param name="reply">The reply to enqueue.</param>
-    public void AddInvokeReply(MxCommandReply reply)
-    {
-        _invokeReplies.Enqueue(reply);
-    }
-
-    /// <summary>
-    /// Enqueues an event to be yielded from StreamEventsAsync.
-    /// </summary>
-    /// <param name="gatewayEvent">The event to enqueue.</param>
-    public void AddEvent(MxEvent gatewayEvent)
-    {
-        _events.Add(gatewayEvent);
-    }
-
-    /// <summary>
-    /// Records the acknowledge call and returns the next enqueued reply (or default).
-    /// </summary>
-    public Task<AcknowledgeAlarmReply> AcknowledgeAlarmAsync(
-        AcknowledgeAlarmRequest request,
-        CallOptions callOptions)
-    {
-        AcknowledgeAlarmCalls.Add((request, callOptions));
-        if (AcknowledgeAlarmExceptions.TryDequeue(out Exception? exception))
-        {
-            throw exception;
-        }
-
-        return Task.FromResult(_acknowledgeReplies.Count > 0
-            ? _acknowledgeReplies.Dequeue()
-            : new AcknowledgeAlarmReply
-            {
-                CorrelationId = request.ClientCorrelationId,
-                ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
-                Status = new MxStatusProxy { Success = 1, Category = MxStatusCategory.Ok },
-            });
-    }
-
-    /// <summary>
-    /// Records the query call and yields each enqueued snapshot.
-    /// </summary>
-    public async IAsyncEnumerable<ActiveAlarmSnapshot> QueryActiveAlarmsAsync(
-        QueryActiveAlarmsRequest request,
-        CallOptions callOptions)
-    {
-        QueryActiveAlarmsCalls.Add((request, callOptions));
-
-        foreach (ActiveAlarmSnapshot snapshot in _activeAlarmSnapshots)
-        {
-            callOptions.CancellationToken.ThrowIfCancellationRequested();
-            await Task.Yield();
-            yield return snapshot;
-        }
-    }
-
-    /// <summary>Enqueues an acknowledge reply.</summary>
-    public void AddAcknowledgeReply(AcknowledgeAlarmReply reply)
-    {
-        _acknowledgeReplies.Enqueue(reply);
-    }
-
-    /// <summary>Enqueues a snapshot to be yielded from QueryActiveAlarmsAsync.</summary>
-    public void AddActiveAlarmSnapshot(ActiveAlarmSnapshot snapshot)
-    {
-        _activeAlarmSnapshots.Add(snapshot);
-    }
-
-    /// <summary>
-    /// Records the stream-alarms call and yields each enqueued feed message.
-    /// </summary>
-    public async IAsyncEnumerable<AlarmFeedMessage> StreamAlarmsAsync(
-        StreamAlarmsRequest request,
-        CallOptions callOptions)
-    {
-        StreamAlarmsCalls.Add((request, callOptions));
-
-        foreach (AlarmFeedMessage message in _alarmFeedMessages)
-        {
-            callOptions.CancellationToken.ThrowIfCancellationRequested();
-            await Task.Yield();
-            yield return message;
-        }
-    }
-
-    /// <summary>Enqueues an alarm feed message to be yielded from StreamAlarmsAsync.</summary>
-    public void AddAlarmFeedMessage(AlarmFeedMessage message)
-    {
-        _alarmFeedMessages.Add(message);
-    }
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client.Tests/MxGatewayClientAlarmsTests.cs

@@ -1,188 +0,0 @@
-using Google.Protobuf.WellKnownTypes;
-using Grpc.Core;
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-
-namespace ZB.MOM.WW.MxGateway.Client.Tests;
-
-/// <summary>
-///     PR E.2 — pins the .NET SDK surface for the new alarm RPCs:
-///     <see cref="MxGatewayClient.AcknowledgeAlarmAsync"/> and
-///     <see cref="MxGatewayClient.QueryActiveAlarmsAsync"/>.
-/// </summary>
-public sealed class MxGatewayClientAlarmsTests
-{
-    [Fact]
-    public async Task AcknowledgeAlarmAsync_RecordsRequestShapeAndReturnsReply()
-    {
-        FakeGatewayTransport transport = CreateTransport();
-        transport.AddAcknowledgeReply(new AcknowledgeAlarmReply
-        {
-            CorrelationId = "corr-1",
-            ProtocolStatus = new ProtocolStatus { Code = ProtocolStatusCode.Ok },
-            Status = new MxStatusProxy
-            {
-                Success = 1,
-                Category = MxStatusCategory.Ok,
-                DetectedBy = MxStatusSource.RespondingLmx,
-            },
-        });
-        await using MxGatewayClient client = CreateClient(transport);
-
-        AcknowledgeAlarmReply reply = await client.AcknowledgeAlarmAsync(new AcknowledgeAlarmRequest
-        {
-            ClientCorrelationId = "corr-1",
-            AlarmFullReference = "Tank01.Level.HiHi",
-            Comment = "investigating",
-            OperatorUser = "alice",
-        });
-
-        Assert.Equal(ProtocolStatusCode.Ok, reply.ProtocolStatus.Code);
-        Assert.Equal(MxStatusCategory.Ok, reply.Status.Category);
-
-        var call = Assert.Single(transport.AcknowledgeAlarmCalls);
-        Assert.Equal("Tank01.Level.HiHi", call.Request.AlarmFullReference);
-        Assert.Equal("investigating", call.Request.Comment);
-        Assert.Equal("alice", call.Request.OperatorUser);
-        Assert.Equal("Bearer test-api-key", call.CallOptions.Headers?.GetValue("authorization"));
-    }
-
-    [Fact]
-    public async Task AcknowledgeAlarmAsync_HonorsCancellation()
-    {
-        // Acks are routed through the safe-unary retry pipeline (idempotent at the
-        // MxAccess level), so the transport-side cancellation token is a linked one
-        // rather than the caller's original. Verify cancellation by tripping the source
-        // and asserting the call observes it.
-        using CancellationTokenSource cancellation = new();
-        cancellation.Cancel();
-        FakeGatewayTransport transport = CreateTransport();
-        await using MxGatewayClient client = CreateClient(transport);
-
-        await Assert.ThrowsAnyAsync<OperationCanceledException>(() =>
-            client.AcknowledgeAlarmAsync(
-                new AcknowledgeAlarmRequest
-                {
-                    AlarmFullReference = "Tank01.Level.HiHi",
-                    Comment = string.Empty,
-                    OperatorUser = "alice",
-                },
-                cancellation.Token));
-    }
-
-    [Fact]
-    public async Task AcknowledgeAlarmAsync_MapsUnauthenticated_RpcException_ToTypedException()
-    {
-        FakeGatewayTransport transport = CreateTransport();
-        transport.AcknowledgeAlarmExceptions.Enqueue(
-            new RpcException(new Status(StatusCode.Unauthenticated, "expired key")));
-        await using MxGatewayClient client = CreateClient(transport);
-
-        // Note: the FakeGatewayTransport surfaces RpcException directly (it does not run
-        // through GrpcMxGatewayClientTransport's mapping); the fake's contract here is to
-        // pass the exception verbatim. RpcException → typed exception mapping is covered
-        // in the GrpcMxGatewayClientTransport-level tests; the SDK-level test pins the
-        // pass-through shape so a future migration to direct mapping won't silently
-        // change observable behaviour.
-        var ex = await Assert.ThrowsAsync<RpcException>(
-            () => client.AcknowledgeAlarmAsync(new AcknowledgeAlarmRequest
-            {
-                AlarmFullReference = "Tank01.Level.HiHi",
-                Comment = string.Empty,
-                OperatorUser = "alice",
-            }));
-        Assert.Equal(StatusCode.Unauthenticated, ex.StatusCode);
-    }
-
-    [Fact]
-    public async Task QueryActiveAlarmsAsync_StreamsEnqueuedSnapshots()
-    {
-        FakeGatewayTransport transport = CreateTransport();
-        transport.AddActiveAlarmSnapshot(MakeSnapshot("Tank01.Level.HiHi", AlarmConditionState.Active));
-        transport.AddActiveAlarmSnapshot(MakeSnapshot("Tank02.Level.HiHi", AlarmConditionState.ActiveAcked));
-        await using MxGatewayClient client = CreateClient(transport);
-
-        List<ActiveAlarmSnapshot> snapshots = [];
-        await foreach (ActiveAlarmSnapshot snapshot in client.QueryActiveAlarmsAsync(new QueryActiveAlarmsRequest
-        {
-            SessionId = "session-fixture",
-        }))
-        {
-            snapshots.Add(snapshot);
-        }
-
-        Assert.Equal(2, snapshots.Count);
-        Assert.Equal("Tank01.Level.HiHi", snapshots[0].AlarmFullReference);
-        Assert.Equal(AlarmConditionState.Active, snapshots[0].CurrentState);
-        Assert.Equal(AlarmConditionState.ActiveAcked, snapshots[1].CurrentState);
-        Assert.Single(transport.QueryActiveAlarmsCalls);
-    }
-
-    [Fact]
-    public async Task QueryActiveAlarmsAsync_PassesFilterPrefix()
-    {
-        FakeGatewayTransport transport = CreateTransport();
-        await using MxGatewayClient client = CreateClient(transport);
-
-        await foreach (ActiveAlarmSnapshot _ in client.QueryActiveAlarmsAsync(new QueryActiveAlarmsRequest
-        {
-            SessionId = "session-fixture",
-            AlarmFilterPrefix = "Tank01.",
-        }))
-        {
-            // no snapshots enqueued; just verifying the request passes through
-        }
-
-        var call = Assert.Single(transport.QueryActiveAlarmsCalls);
-        Assert.Equal("Tank01.", call.Request.AlarmFilterPrefix);
-    }
-
-    [Fact]
-    public async Task QueryActiveAlarmsAsync_HonorsCancellationDuringEnumeration()
-    {
-        FakeGatewayTransport transport = CreateTransport();
-        transport.AddActiveAlarmSnapshot(MakeSnapshot("Tank01.Level.HiHi", AlarmConditionState.Active));
-        transport.AddActiveAlarmSnapshot(MakeSnapshot("Tank02.Level.HiHi", AlarmConditionState.Active));
-        await using MxGatewayClient client = CreateClient(transport);
-
-        using CancellationTokenSource cancellation = new();
-        await Assert.ThrowsAsync<OperationCanceledException>(async () =>
-        {
-            await foreach (ActiveAlarmSnapshot _ in client.QueryActiveAlarmsAsync(
-                new QueryActiveAlarmsRequest { SessionId = "session-fixture" },
-                cancellation.Token))
-            {
-                cancellation.Cancel();
-            }
-        });
-    }
-
-    private static ActiveAlarmSnapshot MakeSnapshot(string fullReference, AlarmConditionState state)
-    {
-        return new ActiveAlarmSnapshot
-        {
-            AlarmFullReference = fullReference,
-            SourceObjectReference = fullReference.Split('.')[0],
-            AlarmTypeName = "AnalogLimitAlarm.HiHi",
-            Severity = 750,
-            CurrentState = state,
-            Category = "Process",
-            Description = "Tank high-high level",
-            OriginalRaiseTimestamp = Timestamp.FromDateTime(new DateTime(2026, 5, 1, 12, 0, 0, DateTimeKind.Utc)),
-            LastTransitionTimestamp = Timestamp.FromDateTime(new DateTime(2026, 5, 1, 12, 0, 30, DateTimeKind.Utc)),
-        };
-    }
-
-    private static MxGatewayClient CreateClient(FakeGatewayTransport transport)
-    {
-        return new MxGatewayClient(transport.Options, transport);
-    }
-
-    private static FakeGatewayTransport CreateTransport()
-    {
-        return new FakeGatewayTransport(new MxGatewayClientOptions
-        {
-            Endpoint = new Uri("http://localhost:5000"),
-            ApiKey = "test-api-key",
-        });
-    }
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client.slnx

@@ -1,11 +0,0 @@
-<Solution>
-  <Configurations>
-    <Platform Name="Any CPU" />
-    <Platform Name="x64" />
-    <Platform Name="x86" />
-  </Configurations>
-  <Project Path="../../src/ZB.MOM.WW.MxGateway.Contracts/ZB.MOM.WW.MxGateway.Contracts.csproj" />
-  <Project Path="ZB.MOM.WW.MxGateway.Client.Cli/ZB.MOM.WW.MxGateway.Client.Cli.csproj" />
-  <Project Path="ZB.MOM.WW.MxGateway.Client.Tests/ZB.MOM.WW.MxGateway.Client.Tests.csproj" />
-  <Project Path="ZB.MOM.WW.MxGateway.Client/ZB.MOM.WW.MxGateway.Client.csproj" />
-</Solution>

clients/dotnet/ZB.MOM.WW.MxGateway.Client/DiscoverHierarchyOptions.cs

@@ -1,43 +0,0 @@
-namespace ZB.MOM.WW.MxGateway.Client;
-
-/// <summary>
-/// Filters and shape options for <see cref="GalaxyRepositoryClient.DiscoverHierarchyAsync(DiscoverHierarchyOptions, System.Threading.CancellationToken)"/>.
-/// </summary>
-/// <remarks>
-/// Hand-written ergonomic wrapper around the generated
-/// <c>DiscoverHierarchyRequest</c>: lets callers express a Galaxy-browse
-/// slice with .NET-friendly nullable scalars and collection initializers,
-/// without touching the protobuf message's <c>oneof root</c> directly.
-/// </remarks>
-public sealed class DiscoverHierarchyOptions
-{
-    /// <summary>Restrict to the subtree rooted at this Galaxy <c>gobject_id</c>.</summary>
-    public int? RootGobjectId { get; init; }
-
-    /// <summary>Restrict to the subtree rooted at the object with this tag name.</summary>
-    public string? RootTagName { get; init; }
-
-    /// <summary>Restrict to the subtree rooted at this <c>contained_name</c> path.</summary>
-    public string? RootContainedPath { get; init; }
-
-    /// <summary>Maximum traversal depth, measured from the chosen root.</summary>
-    public int? MaxDepth { get; init; }
-
-    /// <summary>Restrict to objects whose Galaxy category is in this set.</summary>
-    public IReadOnlyList<int> CategoryIds { get; init; } = [];
-
-    /// <summary>Restrict to objects whose template chain contains any of these tokens.</summary>
-    public IReadOnlyList<string> TemplateChainContains { get; init; } = [];
-
-    /// <summary>Optional glob-style filter on <c>tag_name</c>.</summary>
-    public string? TagNameGlob { get; init; }
-
-    /// <summary>Whether to populate each <c>GalaxyObject.Attributes</c>. Null leaves the server default.</summary>
-    public bool? IncludeAttributes { get; init; }
-
-    /// <summary>Restrict to objects that bear at least one alarm attribute.</summary>
-    public bool AlarmBearingOnly { get; init; }
-
-    /// <summary>Restrict to objects that have at least one historized attribute.</summary>
-    public bool HistorizedOnly { get; init; }
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client/IGalaxyRepositoryClientTransport.cs

@@ -1,42 +0,0 @@
-using Grpc.Core;
-using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
-
-namespace ZB.MOM.WW.MxGateway.Client;
-
-/// <summary>Transport layer for Galaxy Repository gRPC operations.</summary>
-internal interface IGalaxyRepositoryClientTransport
-{
-    /// <summary>Gets the client options used to configure this transport.</summary>
-    MxGatewayClientOptions Options { get; }
-
-    /// <summary>Gets the underlying gRPC client, or <c>null</c> if not yet initialized.</summary>
-    GalaxyRepository.GalaxyRepositoryClient? RawClient { get; }
-
-    /// <summary>Tests the connection to the Galaxy Repository server.</summary>
-    /// <param name="request">The test connection request.</param>
-    /// <param name="callOptions">gRPC call options (timeout, cancellation, etc.).</param>
-    Task<TestConnectionReply> TestConnectionAsync(
-        TestConnectionRequest request,
-        CallOptions callOptions);
-
-    /// <summary>Gets the last deploy time from the Galaxy Repository server.</summary>
-    /// <param name="request">The get last deploy time request.</param>
-    /// <param name="callOptions">gRPC call options (timeout, cancellation, etc.).</param>
-    Task<GetLastDeployTimeReply> GetLastDeployTimeAsync(
-        GetLastDeployTimeRequest request,
-        CallOptions callOptions);
-
-    /// <summary>Discovers the object hierarchy in the Galaxy Repository.</summary>
-    /// <param name="request">The discover hierarchy request.</param>
-    /// <param name="callOptions">gRPC call options (timeout, cancellation, etc.).</param>
-    Task<DiscoverHierarchyReply> DiscoverHierarchyAsync(
-        DiscoverHierarchyRequest request,
-        CallOptions callOptions);
-
-    /// <summary>Watches for deployment events from the Galaxy Repository server.</summary>
-    /// <param name="request">The watch deploy events request.</param>
-    /// <param name="callOptions">gRPC call options (timeout, cancellation, etc.).</param>
-    IAsyncEnumerable<DeployEvent> WatchDeployEventsAsync(
-        WatchDeployEventsRequest request,
-        CallOptions callOptions);
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client/IMxGatewayClientTransport.cs

@@ -1,89 +0,0 @@
-using Grpc.Core;
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-
-namespace ZB.MOM.WW.MxGateway.Client;
-
-internal interface IMxGatewayClientTransport
-{
-    /// <summary>
-    /// Gets the client configuration options.
-    /// </summary>
-    MxGatewayClientOptions Options { get; }
-
-    /// <summary>
-    /// Gets the underlying gRPC client, if available.
-    /// </summary>
-    MxAccessGateway.MxAccessGatewayClient? RawClient { get; }
-
-    /// <summary>
-    /// Opens a new gateway session.
-    /// </summary>
-    /// <param name="request">Session open request.</param>
-    /// <param name="callOptions">gRPC call options.</param>
-    /// <returns>The session open reply.</returns>
-    Task<OpenSessionReply> OpenSessionAsync(
-        OpenSessionRequest request,
-        CallOptions callOptions);
-
-    /// <summary>
-    /// Closes an open gateway session.
-    /// </summary>
-    /// <param name="request">Session close request.</param>
-    /// <param name="callOptions">gRPC call options.</param>
-    /// <returns>The session close reply.</returns>
-    Task<CloseSessionReply> CloseSessionAsync(
-        CloseSessionRequest request,
-        CallOptions callOptions);
-
-    /// <summary>
-    /// Invokes an MXAccess command on the session.
-    /// </summary>
-    /// <param name="request">The command request.</param>
-    /// <param name="callOptions">gRPC call options.</param>
-    /// <returns>The command reply.</returns>
-    Task<MxCommandReply> InvokeAsync(
-        MxCommandRequest request,
-        CallOptions callOptions);
-
-    /// <summary>
-    /// Streams events from the session.
-    /// </summary>
-    /// <param name="request">The stream events request.</param>
-    /// <param name="callOptions">gRPC call options.</param>
-    /// <returns>An async enumerable of events.</returns>
-    IAsyncEnumerable<MxEvent> StreamEventsAsync(
-        StreamEventsRequest request,
-        CallOptions callOptions);
-
-    /// <summary>
-    /// Acknowledges an active MXAccess alarm condition.
-    /// </summary>
-    /// <param name="request">The acknowledge request.</param>
-    /// <param name="callOptions">gRPC call options.</param>
-    /// <returns>The acknowledge reply with native MxStatus.</returns>
-    Task<AcknowledgeAlarmReply> AcknowledgeAlarmAsync(
-        AcknowledgeAlarmRequest request,
-        CallOptions callOptions);
-
-    /// <summary>
-    /// Streams a snapshot of all alarms currently in Active or ActiveAcked state — the
-    /// ConditionRefresh equivalent for the gateway.
-    /// </summary>
-    /// <param name="request">The query request, optionally scoped by alarm-reference prefix.</param>
-    /// <param name="callOptions">gRPC call options.</param>
-    /// <returns>An async enumerable of active-alarm snapshots.</returns>
-    IAsyncEnumerable<ActiveAlarmSnapshot> QueryActiveAlarmsAsync(
-        QueryActiveAlarmsRequest request,
-        CallOptions callOptions);
-
-    /// <summary>
-    /// Attaches to the gateway's central alarm feed — the current active-alarm
-    /// snapshot followed by live transitions.
-    /// </summary>
-    /// <param name="request">The stream request, optionally scoped by alarm-reference prefix.</param>
-    /// <param name="callOptions">gRPC call options.</param>
-    /// <returns>An async enumerable of alarm feed messages.</returns>
-    IAsyncEnumerable<AlarmFeedMessage> StreamAlarmsAsync(
-        StreamAlarmsRequest request,
-        CallOptions callOptions);
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client/MxAccessException.cs

@@ -1,30 +0,0 @@
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-
-namespace ZB.MOM.WW.MxGateway.Client;
-
-/// <summary>Exception thrown when an MXAccess command fails with a non-zero HResult or failing status.</summary>
-public sealed class MxAccessException : MxGatewayCommandException
-{
-    /// <summary>Initializes a new instance with the given message, reply, and optional inner exception.</summary>
-    /// <param name="message">The error message describing the MXAccess failure.</param>
-    /// <param name="reply">The MxCommandReply containing the failure details (statuses, HResult, etc.).</param>
-    /// <param name="innerException">The underlying exception, if any.</param>
-    public MxAccessException(
-        string message,
-        MxCommandReply reply,
-        Exception? innerException = null)
-        : base(
-            message,
-            reply.SessionId,
-            reply.CorrelationId,
-            reply.ProtocolStatus,
-            reply.HasHresult ? reply.Hresult : null,
-            reply.Statuses.ToArray(),
-            innerException)
-    {
-        Reply = reply;
-    }
-
-    /// <summary>Gets the underlying MxCommandReply containing full failure details.</summary>
-    public MxCommandReply Reply { get; }
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client/MxGatewayAuthenticationException.cs

@@ -1,34 +0,0 @@
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-
-namespace ZB.MOM.WW.MxGateway.Client;
-
-/// <summary>Exception thrown when an API key is invalid, expired, or malformed.</summary>
-public sealed class MxGatewayAuthenticationException : MxGatewayException
-{
-    /// <summary>Initializes a new instance with the given details.</summary>
-    /// <param name="message">The error message describing the authentication failure.</param>
-    /// <param name="sessionId">The session ID, if available.</param>
-    /// <param name="correlationId">The correlation ID for tracing, if available.</param>
-    /// <param name="protocolStatus">The protocol status details, if available.</param>
-    /// <param name="hResult">The HResult code, if available.</param>
-    /// <param name="statuses">The MXAccess statuses, if available.</param>
-    /// <param name="innerException">The underlying exception, if any.</param>
-    public MxGatewayAuthenticationException(
-        string message,
-        string? sessionId = null,
-        string? correlationId = null,
-        ProtocolStatus? protocolStatus = null,
-        int? hResult = null,
-        IReadOnlyList<MxStatusProxy>? statuses = null,
-        Exception? innerException = null)
-        : base(
-            message,
-            sessionId,
-            correlationId,
-            protocolStatus,
-            hResult,
-            statuses ?? [],
-            innerException)
-    {
-    }
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client/MxGatewayAuthorizationException.cs

@@ -1,34 +0,0 @@
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-
-namespace ZB.MOM.WW.MxGateway.Client;
-
-/// <summary>Exception thrown when the API key lacks required scopes for an operation.</summary>
-public sealed class MxGatewayAuthorizationException : MxGatewayException
-{
-    /// <summary>Initializes a new instance with the given details.</summary>
-    /// <param name="message">The error message describing the authorization failure.</param>
-    /// <param name="sessionId">The session ID, if available.</param>
-    /// <param name="correlationId">The correlation ID for tracing, if available.</param>
-    /// <param name="protocolStatus">The protocol status details, if available.</param>
-    /// <param name="hResult">The HResult code, if available.</param>
-    /// <param name="statuses">The MXAccess statuses, if available.</param>
-    /// <param name="innerException">The underlying exception, if any.</param>
-    public MxGatewayAuthorizationException(
-        string message,
-        string? sessionId = null,
-        string? correlationId = null,
-        ProtocolStatus? protocolStatus = null,
-        int? hResult = null,
-        IReadOnlyList<MxStatusProxy>? statuses = null,
-        Exception? innerException = null)
-        : base(
-            message,
-            sessionId,
-            correlationId,
-            protocolStatus,
-            hResult,
-            statuses ?? [],
-            innerException)
-    {
-    }
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client/MxGatewayCommandException.cs

@@ -1,34 +0,0 @@
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-
-namespace ZB.MOM.WW.MxGateway.Client;
-
-/// <summary>Exception thrown when a gateway command fails due to an unclassified protocol error.</summary>
-public class MxGatewayCommandException : MxGatewayException
-{
-    /// <summary>Initializes a new instance with the given details.</summary>
-    /// <param name="message">The error message describing the command failure.</param>
-    /// <param name="sessionId">The session ID, if available.</param>
-    /// <param name="correlationId">The correlation ID for tracing, if available.</param>
-    /// <param name="protocolStatus">The protocol status details, if available.</param>
-    /// <param name="hResult">The HResult code, if available.</param>
-    /// <param name="statuses">The MXAccess statuses, if available.</param>
-    /// <param name="innerException">The underlying exception, if any.</param>
-    public MxGatewayCommandException(
-        string message,
-        string? sessionId = null,
-        string? correlationId = null,
-        ProtocolStatus? protocolStatus = null,
-        int? hResult = null,
-        IReadOnlyList<MxStatusProxy>? statuses = null,
-        Exception? innerException = null)
-        : base(
-            message,
-            sessionId,
-            correlationId,
-            protocolStatus,
-            hResult,
-            statuses ?? [],
-            innerException)
-    {
-    }
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client/MxGatewayException.cs

@@ -1,82 +0,0 @@
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-
-namespace ZB.MOM.WW.MxGateway.Client;
-
-/// <summary>
-/// Exception thrown when a gateway RPC call fails or returns an error status.
-/// </summary>
-public class MxGatewayException : Exception
-{
-    /// <summary>
-    /// Initializes a new instance of the MxGatewayException class with the specified message.
-    /// </summary>
-    /// <param name="message">Diagnostic message describing the failure.</param>
-    public MxGatewayException(string message)
-        : base(message)
-    {
-        Statuses = [];
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the MxGatewayException class with the specified message and inner exception.
-    /// </summary>
-    /// <param name="message">Diagnostic message describing the failure.</param>
-    /// <param name="innerException">Underlying exception that caused this failure.</param>
-    public MxGatewayException(string message, Exception? innerException)
-        : base(message, innerException)
-    {
-        Statuses = [];
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the MxGatewayException class with full diagnostic information.
-    /// </summary>
-    /// <param name="message">Diagnostic message describing the failure.</param>
-    /// <param name="sessionId">Session ID associated with the exception, if available.</param>
-    /// <param name="correlationId">Correlation ID associated with the exception, if available.</param>
-    /// <param name="protocolStatus">Protocol-level status returned by the gateway, if available.</param>
-    /// <param name="hResult">HRESULT code returned by the worker or MXAccess, if available.</param>
-    /// <param name="statuses">List of MXAccess status codes returned by the operation.</param>
-    /// <param name="innerException">Underlying exception that caused this failure.</param>
-    public MxGatewayException(
-        string message,
-        string? sessionId,
-        string? correlationId,
-        ProtocolStatus? protocolStatus,
-        int? hResult,
-        IReadOnlyList<MxStatusProxy> statuses,
-        Exception? innerException = null)
-        : base(message, innerException)
-    {
-        SessionId = sessionId;
-        CorrelationId = correlationId;
-        ProtocolStatus = protocolStatus;
-        HResultCode = hResult;
-        Statuses = statuses;
-    }
-
-    /// <summary>
-    /// Gets the session ID associated with the exception, if available.
-    /// </summary>
-    public string? SessionId { get; }
-
-    /// <summary>
-    /// Gets the correlation ID associated with the exception, if available.
-    /// </summary>
-    public string? CorrelationId { get; }
-
-    /// <summary>
-    /// Gets the protocol-level status returned by the gateway, if available.
-    /// </summary>
-    public ProtocolStatus? ProtocolStatus { get; }
-
-    /// <summary>
-    /// Gets the HRESULT code returned by the worker or MXAccess, if available.
-    /// </summary>
-    public int? HResultCode { get; }
-
-    /// <summary>
-    /// Gets the list of MXAccess status codes returned by the operation.
-    /// </summary>
-    public IReadOnlyList<MxStatusProxy> Statuses { get; }
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client/MxGatewaySession.cs

@@ -1,844 +0,0 @@
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-
-namespace ZB.MOM.WW.MxGateway.Client;
-
-/// <summary>
-/// Represents one gateway-backed MXAccess session.
-/// </summary>
-public sealed class MxGatewaySession : IAsyncDisposable
-{
-    private readonly MxGatewayClient _client;
-    private readonly SemaphoreSlim _closeLock = new(1, 1);
-    private CloseSessionReply? _closeReply;
-
-    /// <summary>
-    /// Initializes a new session backed by the given MXAccess gateway client.
-    /// </summary>
-    /// <param name="client">The gateway client used for commands and events.</param>
-    /// <param name="openSessionReply">The server's session creation response.</param>
-    internal MxGatewaySession(
-        MxGatewayClient client,
-        OpenSessionReply openSessionReply)
-    {
-        _client = client ?? throw new ArgumentNullException(nameof(client));
-        OpenSessionReply = openSessionReply ?? throw new ArgumentNullException(nameof(openSessionReply));
-    }
-
-    /// <summary>
-    /// The session ID assigned by the gateway.
-    /// </summary>
-    public string SessionId => OpenSessionReply.SessionId;
-
-    /// <summary>
-    /// The server's session creation response containing metadata.
-    /// </summary>
-    public OpenSessionReply OpenSessionReply { get; }
-
-    /// <summary>
-    /// Closes the session on the gateway. Idempotent.
-    /// </summary>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The server's close-session reply.</returns>
-    public async Task<CloseSessionReply> CloseAsync(CancellationToken cancellationToken = default)
-    {
-        if (_closeReply is not null)
-        {
-            return _closeReply;
-        }
-
-        await _closeLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-        try
-        {
-            if (_closeReply is not null)
-            {
-                return _closeReply;
-            }
-
-            _closeReply = await _client.CloseSessionRawAsync(
-                    new CloseSessionRequest { SessionId = SessionId },
-                    cancellationToken)
-                .ConfigureAwait(false);
-            return _closeReply;
-        }
-        finally
-        {
-            _closeLock.Release();
-        }
-    }
-
-    /// <summary>
-    /// Registers a client with the MXAccess session, returning a ServerHandle.
-    /// </summary>
-    /// <param name="clientName">Name to register.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The server handle assigned to the registered client.</returns>
-    public async Task<int> RegisterAsync(
-        string clientName,
-        CancellationToken cancellationToken = default)
-    {
-        MxCommandReply reply = await RegisterRawAsync(clientName, cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.Register?.ServerHandle ?? reply.ReturnValue.Int32Value;
-    }
-
-    /// <summary>
-    /// Registers a client with the MXAccess session without error checking.
-    /// </summary>
-    /// <param name="clientName">Name to register.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The raw server reply.</returns>
-    public Task<MxCommandReply> RegisterRawAsync(
-        string clientName,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(clientName);
-
-        return InvokeCommandAsync(
-            new MxCommand
-            {
-                Kind = MxCommandKind.Register,
-                Register = new RegisterCommand { ClientName = clientName },
-            },
-            cancellationToken);
-    }
-
-    /// <summary>
-    /// Adds an item to the MXAccess session, returning an ItemHandle.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemDefinition">The item tag address.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The item handle assigned to the new item.</returns>
-    public async Task<int> AddItemAsync(
-        int serverHandle,
-        string itemDefinition,
-        CancellationToken cancellationToken = default)
-    {
-        MxCommandReply reply = await AddItemRawAsync(
-                serverHandle,
-                itemDefinition,
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.AddItem?.ItemHandle ?? reply.ReturnValue.Int32Value;
-    }
-
-    /// <summary>
-    /// Adds an item to the MXAccess session without error checking.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemDefinition">The item tag address.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The raw server reply.</returns>
-    public Task<MxCommandReply> AddItemRawAsync(
-        int serverHandle,
-        string itemDefinition,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(itemDefinition);
-
-        return InvokeCommandAsync(
-            new MxCommand
-            {
-                Kind = MxCommandKind.AddItem,
-                AddItem = new AddItemCommand
-                {
-                    ServerHandle = serverHandle,
-                    ItemDefinition = itemDefinition,
-                },
-            },
-            cancellationToken);
-    }
-
-    /// <summary>
-    /// Adds an item with context to the MXAccess session, returning an ItemHandle.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemDefinition">The item tag address.</param>
-    /// <param name="itemContext">Additional context for the item.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The item handle assigned to the new item.</returns>
-    public async Task<int> AddItem2Async(
-        int serverHandle,
-        string itemDefinition,
-        string itemContext,
-        CancellationToken cancellationToken = default)
-    {
-        MxCommandReply reply = await AddItem2RawAsync(
-                serverHandle,
-                itemDefinition,
-                itemContext,
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.AddItem2?.ItemHandle ?? reply.ReturnValue.Int32Value;
-    }
-
-    /// <summary>
-    /// Adds an item with context to the MXAccess session without error checking.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemDefinition">The item tag address.</param>
-    /// <param name="itemContext">Additional context for the item.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The raw server reply.</returns>
-    public Task<MxCommandReply> AddItem2RawAsync(
-        int serverHandle,
-        string itemDefinition,
-        string itemContext,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(itemDefinition);
-
-        return InvokeCommandAsync(
-            new MxCommand
-            {
-                Kind = MxCommandKind.AddItem2,
-                AddItem2 = new AddItem2Command
-                {
-                    ServerHandle = serverHandle,
-                    ItemDefinition = itemDefinition,
-                    ItemContext = itemContext ?? string.Empty,
-                },
-            },
-            cancellationToken);
-    }
-
-    /// <summary>
-    /// Subscribes to events for an item (advises in MXAccess terminology).
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandle">The ItemHandle from add-item.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    public async Task AdviseAsync(
-        int serverHandle,
-        int itemHandle,
-        CancellationToken cancellationToken = default)
-    {
-        MxCommandReply reply = await AdviseRawAsync(serverHandle, itemHandle, cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-    }
-
-    /// <summary>
-    /// Subscribes to events for an item without error checking.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandle">The ItemHandle from add-item.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The raw server reply.</returns>
-    public Task<MxCommandReply> AdviseRawAsync(
-        int serverHandle,
-        int itemHandle,
-        CancellationToken cancellationToken = default)
-    {
-        return InvokeCommandAsync(
-            new MxCommand
-            {
-                Kind = MxCommandKind.Advise,
-                Advise = new AdviseCommand
-                {
-                    ServerHandle = serverHandle,
-                    ItemHandle = itemHandle,
-                },
-            },
-            cancellationToken);
-    }
-
-    /// <summary>
-    /// Unsubscribes from events for an item (unadvises in MXAccess terminology).
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandle">The ItemHandle from add-item.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    public async Task UnAdviseAsync(
-        int serverHandle,
-        int itemHandle,
-        CancellationToken cancellationToken = default)
-    {
-        MxCommandReply reply = await UnAdviseRawAsync(serverHandle, itemHandle, cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-    }
-
-    /// <summary>
-    /// Unsubscribes from events for an item without error checking.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandle">The ItemHandle from add-item.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The raw server reply.</returns>
-    public Task<MxCommandReply> UnAdviseRawAsync(
-        int serverHandle,
-        int itemHandle,
-        CancellationToken cancellationToken = default)
-    {
-        return InvokeCommandAsync(
-            new MxCommand
-            {
-                Kind = MxCommandKind.UnAdvise,
-                UnAdvise = new UnAdviseCommand
-                {
-                    ServerHandle = serverHandle,
-                    ItemHandle = itemHandle,
-                },
-            },
-            cancellationToken);
-    }
-
-    /// <summary>
-    /// Removes an item from the MXAccess session.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandle">The ItemHandle from add-item.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    public async Task RemoveItemAsync(
-        int serverHandle,
-        int itemHandle,
-        CancellationToken cancellationToken = default)
-    {
-        MxCommandReply reply = await RemoveItemRawAsync(serverHandle, itemHandle, cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-    }
-
-    /// <summary>
-    /// Removes an item from the MXAccess session without error checking.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandle">The ItemHandle from add-item.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The raw server reply.</returns>
-    public Task<MxCommandReply> RemoveItemRawAsync(
-        int serverHandle,
-        int itemHandle,
-        CancellationToken cancellationToken = default)
-    {
-        return InvokeCommandAsync(
-            new MxCommand
-            {
-                Kind = MxCommandKind.RemoveItem,
-                RemoveItem = new RemoveItemCommand
-                {
-                    ServerHandle = serverHandle,
-                    ItemHandle = itemHandle,
-                },
-            },
-            cancellationToken);
-    }
-
-    /// <summary>
-    /// Adds multiple items to the MXAccess session in a single command.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="tagAddresses">The item tag addresses to add.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>Per-item subscription results.</returns>
-    public async Task<IReadOnlyList<SubscribeResult>> AddItemBulkAsync(
-        int serverHandle,
-        IReadOnlyList<string> tagAddresses,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(tagAddresses);
-
-        AddItemBulkCommand command = new() { ServerHandle = serverHandle };
-        command.TagAddresses.Add(tagAddresses);
-
-        MxCommandReply reply = await InvokeCommandAsync(
-                new MxCommand
-                {
-                    Kind = MxCommandKind.AddItemBulk,
-                    AddItemBulk = command,
-                },
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.AddItemBulk?.Results.ToArray() ?? [];
-    }
-
-    /// <summary>
-    /// Advises multiple items in a single command.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandles">The ItemHandles to advise.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>Per-item subscription results.</returns>
-    public async Task<IReadOnlyList<SubscribeResult>> AdviseItemBulkAsync(
-        int serverHandle,
-        IReadOnlyList<int> itemHandles,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(itemHandles);
-
-        AdviseItemBulkCommand command = new() { ServerHandle = serverHandle };
-        command.ItemHandles.Add(itemHandles);
-
-        MxCommandReply reply = await InvokeCommandAsync(
-                new MxCommand
-                {
-                    Kind = MxCommandKind.AdviseItemBulk,
-                    AdviseItemBulk = command,
-                },
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.AdviseItemBulk?.Results.ToArray() ?? [];
-    }
-
-    /// <summary>
-    /// Removes multiple items in a single command.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandles">The ItemHandles to remove.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>Per-item subscription results.</returns>
-    public async Task<IReadOnlyList<SubscribeResult>> RemoveItemBulkAsync(
-        int serverHandle,
-        IReadOnlyList<int> itemHandles,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(itemHandles);
-
-        RemoveItemBulkCommand command = new() { ServerHandle = serverHandle };
-        command.ItemHandles.Add(itemHandles);
-
-        MxCommandReply reply = await InvokeCommandAsync(
-                new MxCommand
-                {
-                    Kind = MxCommandKind.RemoveItemBulk,
-                    RemoveItemBulk = command,
-                },
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.RemoveItemBulk?.Results.ToArray() ?? [];
-    }
-
-    /// <summary>
-    /// Unadvises multiple items in a single command.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandles">The ItemHandles to unadvise.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>Per-item subscription results.</returns>
-    public async Task<IReadOnlyList<SubscribeResult>> UnAdviseItemBulkAsync(
-        int serverHandle,
-        IReadOnlyList<int> itemHandles,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(itemHandles);
-
-        UnAdviseItemBulkCommand command = new() { ServerHandle = serverHandle };
-        command.ItemHandles.Add(itemHandles);
-
-        MxCommandReply reply = await InvokeCommandAsync(
-                new MxCommand
-                {
-                    Kind = MxCommandKind.UnAdviseItemBulk,
-                    UnAdviseItemBulk = command,
-                },
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.UnAdviseItemBulk?.Results.ToArray() ?? [];
-    }
-
-    /// <summary>
-    /// Adds and advises multiple items in a single command.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="tagAddresses">The item tag addresses to add and advise.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>Per-item subscription results.</returns>
-    public async Task<IReadOnlyList<SubscribeResult>> SubscribeBulkAsync(
-        int serverHandle,
-        IReadOnlyList<string> tagAddresses,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(tagAddresses);
-
-        SubscribeBulkCommand command = new() { ServerHandle = serverHandle };
-        command.TagAddresses.Add(tagAddresses);
-
-        MxCommandReply reply = await InvokeCommandAsync(
-                new MxCommand
-                {
-                    Kind = MxCommandKind.SubscribeBulk,
-                    SubscribeBulk = command,
-                },
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.SubscribeBulk?.Results.ToArray() ?? [];
-    }
-
-    /// <summary>
-    /// Unadvises and removes multiple items in a single command.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandles">The ItemHandles to unsubscribe.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>Per-item subscription results.</returns>
-    public async Task<IReadOnlyList<SubscribeResult>> UnsubscribeBulkAsync(
-        int serverHandle,
-        IReadOnlyList<int> itemHandles,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(itemHandles);
-
-        UnsubscribeBulkCommand command = new() { ServerHandle = serverHandle };
-        command.ItemHandles.Add(itemHandles);
-
-        MxCommandReply reply = await InvokeCommandAsync(
-                new MxCommand
-                {
-                    Kind = MxCommandKind.UnsubscribeBulk,
-                    UnsubscribeBulk = command,
-                },
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.UnsubscribeBulk?.Results.ToArray() ?? [];
-    }
-
-    /// <summary>
-    /// Bulk Write — sequential MXAccess Write per entry on the worker's STA.
-    /// Per-item failures appear as <see cref="BulkWriteResult"/> entries with
-    /// <c>WasSuccessful = false</c>; the call never throws on per-item errors.
-    /// Protocol-level failures still throw via EnsureProtocolSuccess.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="entries">Per-item write entries; each carries the item handle, value, and user id.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>One <see cref="BulkWriteResult"/> per requested entry, in request order.</returns>
-    public async Task<IReadOnlyList<BulkWriteResult>> WriteBulkAsync(
-        int serverHandle,
-        IReadOnlyList<WriteBulkEntry> entries,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(entries);
-
-        WriteBulkCommand command = new() { ServerHandle = serverHandle };
-        command.Entries.Add(entries);
-
-        MxCommandReply reply = await InvokeCommandAsync(
-                new MxCommand
-                {
-                    Kind = MxCommandKind.WriteBulk,
-                    WriteBulk = command,
-                },
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.WriteBulk?.Results.ToArray() ?? [];
-    }
-
-    /// <summary>
-    /// Bulk Write2 — sequential MXAccess Write2 (timestamped) per entry.
-    /// Per-item failures appear as <see cref="BulkWriteResult"/> entries with
-    /// <c>WasSuccessful = false</c>; the call never throws on per-item errors.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="entries">Per-item write entries; each carries the item handle, value, timestamp, and user id.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>One <see cref="BulkWriteResult"/> per requested entry, in request order.</returns>
-    public async Task<IReadOnlyList<BulkWriteResult>> Write2BulkAsync(
-        int serverHandle,
-        IReadOnlyList<Write2BulkEntry> entries,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(entries);
-
-        Write2BulkCommand command = new() { ServerHandle = serverHandle };
-        command.Entries.Add(entries);
-
-        MxCommandReply reply = await InvokeCommandAsync(
-                new MxCommand
-                {
-                    Kind = MxCommandKind.Write2Bulk,
-                    Write2Bulk = command,
-                },
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.Write2Bulk?.Results.ToArray() ?? [];
-    }
-
-    /// <summary>
-    /// Bulk WriteSecured — sequential MXAccess WriteSecured per entry.
-    /// Credential-sensitive values must never reach logs; the client mirrors
-    /// the single-item WriteSecured redaction contract.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="entries">Per-item write entries; each carries the item handle, value, current user id, and verifier user id.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>One <see cref="BulkWriteResult"/> per requested entry, in request order.</returns>
-    public async Task<IReadOnlyList<BulkWriteResult>> WriteSecuredBulkAsync(
-        int serverHandle,
-        IReadOnlyList<WriteSecuredBulkEntry> entries,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(entries);
-
-        WriteSecuredBulkCommand command = new() { ServerHandle = serverHandle };
-        command.Entries.Add(entries);
-
-        MxCommandReply reply = await InvokeCommandAsync(
-                new MxCommand
-                {
-                    Kind = MxCommandKind.WriteSecuredBulk,
-                    WriteSecuredBulk = command,
-                },
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.WriteSecuredBulk?.Results.ToArray() ?? [];
-    }
-
-    /// <summary>
-    /// Bulk WriteSecured2 — sequential MXAccess WriteSecured2 (timestamped) per entry.
-    /// Same redaction rules as <see cref="WriteSecuredBulkAsync"/>.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="entries">Per-item write entries; each carries the item handle, value, timestamp, current user id, and verifier user id.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>One <see cref="BulkWriteResult"/> per requested entry, in request order.</returns>
-    public async Task<IReadOnlyList<BulkWriteResult>> WriteSecured2BulkAsync(
-        int serverHandle,
-        IReadOnlyList<WriteSecured2BulkEntry> entries,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(entries);
-
-        WriteSecured2BulkCommand command = new() { ServerHandle = serverHandle };
-        command.Entries.Add(entries);
-
-        MxCommandReply reply = await InvokeCommandAsync(
-                new MxCommand
-                {
-                    Kind = MxCommandKind.WriteSecured2Bulk,
-                    WriteSecured2Bulk = command,
-                },
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.WriteSecured2Bulk?.Results.ToArray() ?? [];
-    }
-
-    /// <summary>
-    /// Bulk Read — snapshot the current value for each requested tag.
-    /// Returns the cached OnDataChange value when the tag is already advised
-    /// (<c>WasCached = true</c>), otherwise the worker takes the full AddItem +
-    /// Advise + wait + UnAdvise + RemoveItem snapshot lifecycle. Per-tag
-    /// failures (timeout, invalid tag) appear as <see cref="BulkReadResult"/>
-    /// entries with <c>WasSuccessful = false</c>; the call never throws on
-    /// per-tag errors.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="tagAddresses">Tag addresses to read (one per result).</param>
-    /// <param name="timeout">Per-call timeout for the snapshot lifecycle path; <see cref="TimeSpan.Zero"/> uses the gateway default.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>One <see cref="BulkReadResult"/> per requested tag, in request order.</returns>
-    public async Task<IReadOnlyList<BulkReadResult>> ReadBulkAsync(
-        int serverHandle,
-        IReadOnlyList<string> tagAddresses,
-        TimeSpan timeout,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(tagAddresses);
-
-        ReadBulkCommand command = new()
-        {
-            ServerHandle = serverHandle,
-            TimeoutMs = timeout <= TimeSpan.Zero ? 0u : (uint)Math.Min(timeout.TotalMilliseconds, uint.MaxValue),
-        };
-        command.TagAddresses.Add(tagAddresses);
-
-        MxCommandReply reply = await InvokeCommandAsync(
-                new MxCommand
-                {
-                    Kind = MxCommandKind.ReadBulk,
-                    ReadBulk = command,
-                },
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-        return reply.ReadBulk?.Results.ToArray() ?? [];
-    }
-
-    /// <summary>
-    /// Writes a value to an item on the MXAccess server.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandle">The ItemHandle from add-item.</param>
-    /// <param name="value">The value to write.</param>
-    /// <param name="userId">User ID context for the write.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    public async Task WriteAsync(
-        int serverHandle,
-        int itemHandle,
-        MxValue value,
-        int userId,
-        CancellationToken cancellationToken = default)
-    {
-        MxCommandReply reply = await WriteRawAsync(serverHandle, itemHandle, value, userId, cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-    }
-
-    /// <summary>
-    /// Writes a value to an item on the MXAccess server without error checking.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandle">The ItemHandle from add-item.</param>
-    /// <param name="value">The value to write.</param>
-    /// <param name="userId">User ID context for the write.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The raw server reply.</returns>
-    public Task<MxCommandReply> WriteRawAsync(
-        int serverHandle,
-        int itemHandle,
-        MxValue value,
-        int userId,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-
-        return InvokeCommandAsync(
-            new MxCommand
-            {
-                Kind = MxCommandKind.Write,
-                Write = new WriteCommand
-                {
-                    ServerHandle = serverHandle,
-                    ItemHandle = itemHandle,
-                    Value = value,
-                    UserId = userId,
-                },
-            },
-            cancellationToken);
-    }
-
-    /// <summary>
-    /// Writes a value and timestamp to an item on the MXAccess server.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandle">The ItemHandle from add-item.</param>
-    /// <param name="value">The value to write.</param>
-    /// <param name="timestampValue">The timestamp to write with the value.</param>
-    /// <param name="userId">User ID context for the write.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    public async Task Write2Async(
-        int serverHandle,
-        int itemHandle,
-        MxValue value,
-        MxValue timestampValue,
-        int userId,
-        CancellationToken cancellationToken = default)
-    {
-        MxCommandReply reply = await Write2RawAsync(
-                serverHandle,
-                itemHandle,
-                value,
-                timestampValue,
-                userId,
-                cancellationToken)
-            .ConfigureAwait(false);
-        reply.EnsureProtocolSuccess().EnsureMxAccessSuccess();
-    }
-
-    /// <summary>
-    /// Writes a value and timestamp to an item on the MXAccess server without error checking.
-    /// </summary>
-    /// <param name="serverHandle">The ServerHandle from register.</param>
-    /// <param name="itemHandle">The ItemHandle from add-item.</param>
-    /// <param name="value">The value to write.</param>
-    /// <param name="timestampValue">The timestamp to write with the value.</param>
-    /// <param name="userId">User ID context for the write.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The raw server reply.</returns>
-    public Task<MxCommandReply> Write2RawAsync(
-        int serverHandle,
-        int itemHandle,
-        MxValue value,
-        MxValue timestampValue,
-        int userId,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(value);
-        ArgumentNullException.ThrowIfNull(timestampValue);
-
-        return InvokeCommandAsync(
-            new MxCommand
-            {
-                Kind = MxCommandKind.Write2,
-                Write2 = new Write2Command
-                {
-                    ServerHandle = serverHandle,
-                    ItemHandle = itemHandle,
-                    Value = value,
-                    TimestampValue = timestampValue,
-                    UserId = userId,
-                },
-            },
-            cancellationToken);
-    }
-
-    /// <summary>
-    /// Invokes an MXAccess command on this session.
-    /// </summary>
-    /// <param name="request">The command request.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>The raw server reply.</returns>
-    public Task<MxCommandReply> InvokeAsync(
-        MxCommandRequest request,
-        CancellationToken cancellationToken = default)
-    {
-        ArgumentNullException.ThrowIfNull(request);
-        return _client.InvokeAsync(request, cancellationToken);
-    }
-
-    /// <summary>
-    /// Streams events from the worker for this session, optionally starting after a given sequence number.
-    /// </summary>
-    /// <param name="afterWorkerSequence">The sequence number to stream from. Defaults to 0.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>An async enumerable of events.</returns>
-    public IAsyncEnumerable<MxEvent> StreamEventsAsync(
-        ulong afterWorkerSequence = 0,
-        CancellationToken cancellationToken = default)
-    {
-        return _client.StreamEventsAsync(
-            new StreamEventsRequest
-            {
-                SessionId = SessionId,
-                AfterWorkerSequence = afterWorkerSequence,
-            },
-            cancellationToken);
-    }
-
-    /// <summary>
-    /// Closes the session and releases resources.
-    /// </summary>
-    public async ValueTask DisposeAsync()
-    {
-        await CloseAsync().ConfigureAwait(false);
-        _closeLock.Dispose();
-    }
-
-    private Task<MxCommandReply> InvokeCommandAsync(
-        MxCommand command,
-        CancellationToken cancellationToken)
-    {
-        return _client.InvokeAsync(
-            new MxCommandRequest
-            {
-                SessionId = SessionId,
-                ClientCorrelationId = Guid.NewGuid().ToString("N"),
-                Command = command,
-            },
-            cancellationToken);
-    }
-
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client/MxGatewaySessionException.cs

@@ -1,34 +0,0 @@
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-
-namespace ZB.MOM.WW.MxGateway.Client;
-
-/// <summary>Exception thrown when a session is not found, not ready, or invalid.</summary>
-public sealed class MxGatewaySessionException : MxGatewayException
-{
-    /// <summary>Initializes a new instance with the given details.</summary>
-    /// <param name="message">The error message describing the session failure.</param>
-    /// <param name="sessionId">The session ID, if available.</param>
-    /// <param name="correlationId">The correlation ID for tracing, if available.</param>
-    /// <param name="protocolStatus">The protocol status details, if available.</param>
-    /// <param name="hResult">The HResult code, if available.</param>
-    /// <param name="statuses">The MXAccess statuses, if available.</param>
-    /// <param name="innerException">The underlying exception, if any.</param>
-    public MxGatewaySessionException(
-        string message,
-        string? sessionId = null,
-        string? correlationId = null,
-        ProtocolStatus? protocolStatus = null,
-        int? hResult = null,
-        IReadOnlyList<MxStatusProxy>? statuses = null,
-        Exception? innerException = null)
-        : base(
-            message,
-            sessionId,
-            correlationId,
-            protocolStatus,
-            hResult,
-            statuses ?? [],
-            innerException)
-    {
-    }
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client/MxGatewayWorkerException.cs

@@ -1,34 +0,0 @@
-using ZB.MOM.WW.MxGateway.Contracts.Proto;
-
-namespace ZB.MOM.WW.MxGateway.Client;
-
-/// <summary>Exception thrown when the worker process is unavailable or fails to process a command.</summary>
-public sealed class MxGatewayWorkerException : MxGatewayException
-{
-    /// <summary>Initializes a new instance with the given details.</summary>
-    /// <param name="message">The error message describing the worker failure.</param>
-    /// <param name="sessionId">The session ID, if available.</param>
-    /// <param name="correlationId">The correlation ID for tracing, if available.</param>
-    /// <param name="protocolStatus">The protocol status details, if available.</param>
-    /// <param name="hResult">The HResult code, if available.</param>
-    /// <param name="statuses">The MXAccess statuses, if available.</param>
-    /// <param name="innerException">The underlying exception, if any.</param>
-    public MxGatewayWorkerException(
-        string message,
-        string? sessionId = null,
-        string? correlationId = null,
-        ProtocolStatus? protocolStatus = null,
-        int? hResult = null,
-        IReadOnlyList<MxStatusProxy>? statuses = null,
-        Exception? innerException = null)
-        : base(
-            message,
-            sessionId,
-            correlationId,
-            protocolStatus,
-            hResult,
-            statuses ?? [],
-            innerException)
-    {
-    }
-}

clients/dotnet/ZB.MOM.WW.MxGateway.Client/Properties/AssemblyInfo.cs

@@ -1,3 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("ZB.MOM.WW.MxGateway.Client.Tests")]

clients/go/README.md

@@ -3,7 +3,7 @@
 The Go client module contains the generated MXAccess Gateway protobuf bindings,
 a small handwritten `mxgateway` package, and the `mxgw-go` test CLI scaffold.
 The module uses the shared proto inputs documented in
-`../../docs/ClientProtoGeneration.md` so gateway and client contracts stay in
+`../../docs/client-proto-generation.md` so gateway and client contracts stay in
 sync.
 
 ## Layout
@@ -28,7 +28,7 @@ Run generation after the shared `.proto` files or the Go output path changes:
 ./generate-proto.ps1
 ```
 
-The script uses the tool paths recorded in `../../docs/ToolchainLinks.md`.
+The script uses the tool paths recorded in `../../docs/toolchain-links.md`.
 
 ## Build And Test
 
@@ -84,13 +84,6 @@ goroutine cleanup. Raw protobuf messages remain available through the
 `errors.As` for `GatewayError`, `CommandError`, and `MxAccessError`; command
 errors preserve the raw reply.
 
-For alarms, the package exposes `Client.QueryActiveAlarms` for one-shot
-snapshots, `Client.StreamAlarms` for the server-streaming feed, and
-`Client.AcknowledgeAlarm` to ack an alarm by full reference. The streaming
-call returns a `StreamAlarmsClient`; cancel its context to terminate the
-stream. All three pass straight through to the gateway's central alarm
-monitor.
-
 ## Galaxy Repository browse
 
 The `GalaxyRepository` service (proto package `galaxy_repository.v1`) is a
@@ -216,5 +209,5 @@ go run ./cmd/mxgw-go smoke -endpoint $env:MXGATEWAY_ENDPOINT -plaintext -api-key
 ## Related Documentation
 
 - [Client Packaging](../../docs/ClientPackaging.md)
-- [Client Proto Generation](../../docs/ClientProtoGeneration.md)
-- [Go Client Detailed Design](./GoClientDesign.md)
+- [Client Proto Generation](../../docs/client-proto-generation.md)
+- [Go Client Detailed Design](../../docs/clients-golang-design.md)

clients/go/cmd/mxgw-go/main.go

@@ -1,12 +1,6 @@
-// Command mxgw-go is the reference Go CLI for the MXAccess Gateway.
-//
-// It exposes versioning, session lifecycle, command invocation, event
-// streaming, a smoke-test workflow, and Galaxy Repository browse subcommands
-// that exercise the same gRPC contract used by the mxgateway library.
 package main
 
 import (
-	"bufio"
 	"context"
 	"encoding/json"
 	"errors"
@@ -15,7 +9,6 @@ import (
 	"io"
 	"os"
 	"os/signal"
-	"sort"
 	"strconv"
 	"strings"
 	"syscall"
@@ -91,26 +84,10 @@ func runWithIO(ctx context.Context, args []string, stdout, stderr io.Writer) err
 		return runSubscribeBulk(ctx, args[1:], stdout, stderr)
 	case "unsubscribe-bulk":
 		return runUnsubscribeBulk(ctx, args[1:], stdout, stderr)
-	case "read-bulk":
-		return runReadBulk(ctx, args[1:], stdout, stderr)
-	case "write-bulk":
-		return runWriteBulk(ctx, args[1:], stdout, stderr)
-	case "write2-bulk":
-		return runWrite2Bulk(ctx, args[1:], stdout, stderr)
-	case "write-secured-bulk":
-		return runWriteSecuredBulk(ctx, args[1:], stdout, stderr)
-	case "write-secured2-bulk":
-		return runWriteSecured2Bulk(ctx, args[1:], stdout, stderr)
-	case "bench-read-bulk":
-		return runBenchReadBulk(ctx, args[1:], stdout, stderr)
 	case "write":
 		return runWrite(ctx, args[1:], stdout, stderr)
 	case "stream-events":
 		return runStreamEvents(ctx, args[1:], stdout, stderr)
-	case "stream-alarms":
-		return runStreamAlarms(ctx, args[1:], stdout, stderr)
-	case "acknowledge-alarm":
-		return runAcknowledgeAlarm(ctx, args[1:], stdout, stderr)
 	case "smoke":
 		return runSmoke(ctx, args[1:], stdout, stderr)
 	case "galaxy-test-connection":
@@ -121,8 +98,6 @@ func runWithIO(ctx context.Context, args []string, stdout, stderr io.Writer) err
 		return runGalaxyDiscover(ctx, args[1:], stdout, stderr)
 	case "galaxy-watch":
 		return runGalaxyWatch(ctx, args[1:], stdout, stderr)
-	case "batch":
-		return runBatch(ctx, os.Stdin, stdout, stderr)
 	default:
 		writeUsage(stderr)
 		return fmt.Errorf("unknown command %q", args[0])
@@ -357,363 +332,11 @@ func runUnsubscribeBulk(ctx context.Context, args []string, stdout, stderr io.Wr
 	}
 	defer client.Close()
 
-	handles, err := parseInt32List(*itemHandles)
-	if err != nil {
-		return err
-	}
-
 	session := mxgateway.NewSessionForID(client, *sessionID)
-	results, err := session.UnsubscribeBulk(ctx, int32(*serverHandle), handles)
+	results, err := session.UnsubscribeBulk(ctx, int32(*serverHandle), parseInt32List(*itemHandles))
 	return writeBulkOutput(stdout, *jsonOutput, "unsubscribe-bulk", options, results, err)
 }
 
-func runReadBulk(ctx context.Context, args []string, stdout, stderr io.Writer) error {
-	flags := flag.NewFlagSet("read-bulk", flag.ContinueOnError)
-	flags.SetOutput(stderr)
-	common := bindCommonFlags(flags)
-	jsonOutput := flags.Bool("json", false, "write JSON output")
-	sessionID := flags.String("session-id", "", "gateway session id")
-	serverHandle := flags.Int("server-handle", 0, "MXAccess server handle")
-	items := flags.String("items", "", "comma-separated tag addresses")
-	timeoutMs := flags.Int("timeout-ms", 0, "per-tag snapshot timeout in milliseconds (0 = worker default)")
-
-	if err := flags.Parse(args); err != nil {
-		return err
-	}
-	if *sessionID == "" || *items == "" {
-		return errors.New("session-id and items are required")
-	}
-
-	client, options, err := dialForCommand(ctx, common)
-	if err != nil {
-		return err
-	}
-	defer client.Close()
-
-	session := mxgateway.NewSessionForID(client, *sessionID)
-	results, err := session.ReadBulk(ctx, int32(*serverHandle), parseStringList(*items), time.Duration(*timeoutMs)*time.Millisecond)
-	return writeReadBulkOutput(stdout, *jsonOutput, "read-bulk", options, results, err)
-}
-
-func runWriteBulk(ctx context.Context, args []string, stdout, stderr io.Writer) error {
-	return runWriteBulkVariant(ctx, args, stdout, stderr, "write-bulk", false, false)
-}
-
-func runWrite2Bulk(ctx context.Context, args []string, stdout, stderr io.Writer) error {
-	return runWriteBulkVariant(ctx, args, stdout, stderr, "write2-bulk", true, false)
-}
-
-func runWriteSecuredBulk(ctx context.Context, args []string, stdout, stderr io.Writer) error {
-	return runWriteBulkVariant(ctx, args, stdout, stderr, "write-secured-bulk", false, true)
-}
-
-func runWriteSecured2Bulk(ctx context.Context, args []string, stdout, stderr io.Writer) error {
-	return runWriteBulkVariant(ctx, args, stdout, stderr, "write-secured2-bulk", true, true)
-}
-
-// runWriteBulkVariant shares the flag-parsing + entry-build skeleton across
-// the four bulk-write families. withTimestamp adds a --timestamp-value flag;
-// secured switches from --user-id to --current-user-id / --verifier-user-id.
-func runWriteBulkVariant(ctx context.Context, args []string, stdout, stderr io.Writer, command string, withTimestamp bool, secured bool) error {
-	flags := flag.NewFlagSet(command, flag.ContinueOnError)
-	flags.SetOutput(stderr)
-	common := bindCommonFlags(flags)
-	jsonOutput := flags.Bool("json", false, "write JSON output")
-	sessionID := flags.String("session-id", "", "gateway session id")
-	serverHandle := flags.Int("server-handle", 0, "MXAccess server handle")
-	itemHandles := flags.String("item-handles", "", "comma-separated item handles")
-	valueType := flags.String("type", "string", "value type: bool, int32, int64, float, double, string")
-	values := flags.String("values", "", "comma-separated values (one per item handle)")
-	userID := flags.Int("user-id", 0, "MXAccess user id (Write/Write2 variants)")
-	currentUserID := flags.Int("current-user-id", 0, "MXAccess current user id (Secured variants)")
-	verifierUserID := flags.Int("verifier-user-id", 0, "MXAccess verifier user id (Secured variants)")
-	timestampValue := flags.String("timestamp-value", "", "RFC 3339 timestamp shared across all entries (Write2/WriteSecured2 variants)")
-
-	if err := flags.Parse(args); err != nil {
-		return err
-	}
-	if *sessionID == "" || *itemHandles == "" || *values == "" {
-		return errors.New("session-id, item-handles, and values are required")
-	}
-
-	handles, err := parseInt32List(*itemHandles)
-	if err != nil {
-		return err
-	}
-	valueTexts := parseStringList(*values)
-	if len(handles) != len(valueTexts) {
-		return fmt.Errorf("item-handles count (%d) does not match values count (%d)", len(handles), len(valueTexts))
-	}
-
-	parsedValues := make([]*mxgateway.MxValue, len(handles))
-	for i, text := range valueTexts {
-		v, err := parseValue(*valueType, text)
-		if err != nil {
-			return fmt.Errorf("entry %d: %w", i, err)
-		}
-		parsedValues[i] = v
-	}
-
-	var tsValue *mxgateway.MxValue
-	if withTimestamp {
-		if *timestampValue == "" {
-			return errors.New("timestamp-value is required for write2/write-secured2 bulk variants")
-		}
-		parsed, err := parseRfc3339Timestamp(*timestampValue)
-		if err != nil {
-			return err
-		}
-		tsValue = parsed
-	}
-
-	client, options, err := dialForCommand(ctx, common)
-	if err != nil {
-		return err
-	}
-	defer client.Close()
-
-	session := mxgateway.NewSessionForID(client, *sessionID)
-
-	var results []*mxgateway.BulkWriteResult
-	switch command {
-	case "write-bulk":
-		entries := make([]*mxgateway.WriteBulkEntry, len(handles))
-		for i := range handles {
-			entries[i] = &mxgateway.WriteBulkEntry{ItemHandle: handles[i], Value: parsedValues[i], UserId: int32(*userID)}
-		}
-		results, err = session.WriteBulk(ctx, int32(*serverHandle), entries)
-	case "write2-bulk":
-		entries := make([]*mxgateway.Write2BulkEntry, len(handles))
-		for i := range handles {
-			entries[i] = &mxgateway.Write2BulkEntry{ItemHandle: handles[i], Value: parsedValues[i], TimestampValue: tsValue, UserId: int32(*userID)}
-		}
-		results, err = session.Write2Bulk(ctx, int32(*serverHandle), entries)
-	case "write-secured-bulk":
-		entries := make([]*mxgateway.WriteSecuredBulkEntry, len(handles))
-		for i := range handles {
-			entries[i] = &mxgateway.WriteSecuredBulkEntry{
-				ItemHandle:     handles[i],
-				Value:          parsedValues[i],
-				CurrentUserId:  int32(*currentUserID),
-				VerifierUserId: int32(*verifierUserID),
-			}
-		}
-		results, err = session.WriteSecuredBulk(ctx, int32(*serverHandle), entries)
-	case "write-secured2-bulk":
-		entries := make([]*mxgateway.WriteSecured2BulkEntry, len(handles))
-		for i := range handles {
-			entries[i] = &mxgateway.WriteSecured2BulkEntry{
-				ItemHandle:     handles[i],
-				Value:          parsedValues[i],
-				TimestampValue: tsValue,
-				CurrentUserId:  int32(*currentUserID),
-				VerifierUserId: int32(*verifierUserID),
-			}
-		}
-		results, err = session.WriteSecured2Bulk(ctx, int32(*serverHandle), entries)
-	default:
-		return fmt.Errorf("unsupported bulk write command %q", command)
-	}
-	_ = secured // currently only used for routing above; reserved for future per-variant validation
-	return writeWriteBulkOutput(stdout, *jsonOutput, command, options, results, err)
-}
-
-// parseRfc3339Timestamp parses an RFC 3339 timestamp and returns the
-// MxValue protobuf representation used for the timestamped write families.
-func parseRfc3339Timestamp(text string) (*mxgateway.MxValue, error) {
-	t, err := time.Parse(time.RFC3339Nano, text)
-	if err != nil {
-		return nil, fmt.Errorf("invalid RFC 3339 timestamp %q: %w", text, err)
-	}
-	return mxgateway.TimestampValue(t), nil
-}
-
-// runBenchReadBulk drives the cross-language ReadBulk stress benchmark from Go:
-// opens its own session, subscribes to bulk-size tags so the worker value cache
-// populates from real OnDataChange events, runs ReadBulk in a tight loop for
-// duration-seconds with per-call timing, and emits the shared JSON schema the
-// scripts/bench-read-bulk.ps1 driver collates across all five clients.
-func runBenchReadBulk(ctx context.Context, args []string, stdout, stderr io.Writer) error {
-	flags := flag.NewFlagSet("bench-read-bulk", flag.ContinueOnError)
-	flags.SetOutput(stderr)
-	common := bindCommonFlags(flags)
-	jsonOutput := flags.Bool("json", false, "write JSON output")
-	clientName := flags.String("client-name", "mxgw-go-bench", "session client name")
-	durationSeconds := flags.Int("duration-seconds", 30, "steady-state measurement window in seconds")
-	warmupSeconds := flags.Int("warmup-seconds", 3, "warm-up window before measurement, in seconds")
-	bulkSize := flags.Int("bulk-size", 6, "tags per ReadBulk call")
-	tagStart := flags.Int("tag-start", 1, "first machine number")
-	tagPrefix := flags.String("tag-prefix", "TestMachine_", "tag prefix (machine number appended as %03d)")
-	tagAttribute := flags.String("tag-attribute", "TestChangingInt", "attribute appended to each tag prefix")
-	timeoutMs := flags.Int("timeout-ms", 1500, "per-tag snapshot timeout in milliseconds")
-
-	if err := flags.Parse(args); err != nil {
-		return err
-	}
-	if *bulkSize < 1 {
-		return errors.New("bulk-size must be positive")
-	}
-	if *durationSeconds < 1 {
-		return errors.New("duration-seconds must be positive")
-	}
-
-	tags := make([]string, *bulkSize)
-	for i := 0; i < *bulkSize; i++ {
-		tags[i] = fmt.Sprintf("%s%03d.%s", *tagPrefix, *tagStart+i, *tagAttribute)
-	}
-
-	client, options, err := dialForCommand(ctx, common)
-	if err != nil {
-		return err
-	}
-	defer client.Close()
-
-	session, err := client.OpenSession(ctx, mxgateway.OpenSessionOptions{ClientSessionName: *clientName})
-	if err != nil {
-		return err
-	}
-	defer func() {
-		_, _ = session.Close(context.Background())
-	}()
-
-	serverHandle, err := session.Register(ctx, *clientName)
-	if err != nil {
-		return err
-	}
-
-	subscribeResults, err := session.SubscribeBulk(ctx, serverHandle, tags)
-	if err != nil {
-		return err
-	}
-	itemHandles := make([]int32, 0, len(subscribeResults))
-	for _, result := range subscribeResults {
-		if result.GetWasSuccessful() {
-			itemHandles = append(itemHandles, result.GetItemHandle())
-		}
-	}
-	defer func() {
-		if len(itemHandles) > 0 {
-			_, _ = session.UnsubscribeBulk(context.Background(), serverHandle, itemHandles)
-		}
-	}()
-
-	// Warm-up: drive identical calls so any first-call JIT / connection-pool
-	// setup is amortised before the measurement window opens.
-	warmupDeadline := time.Now().Add(time.Duration(*warmupSeconds) * time.Second)
-	timeout := time.Duration(*timeoutMs) * time.Millisecond
-	for time.Now().Before(warmupDeadline) {
-		_, _ = session.ReadBulk(ctx, serverHandle, tags, timeout)
-	}
-
-	// Steady state: per-call latency captured via time.Now() deltas.
-	latenciesMs := make([]float64, 0, 65536)
-	var totalReadResults int64
-	var cachedReadResults int64
-	var successfulCalls, failedCalls int
-	steadyStart := time.Now()
-	steadyDeadline := steadyStart.Add(time.Duration(*durationSeconds) * time.Second)
-
-	for time.Now().Before(steadyDeadline) {
-		callStart := time.Now()
-		results, err := session.ReadBulk(ctx, serverHandle, tags, timeout)
-		elapsed := time.Since(callStart)
-		latenciesMs = append(latenciesMs, float64(elapsed.Nanoseconds())/1e6)
-		if err != nil {
-			failedCalls++
-			continue
-		}
-		successfulCalls++
-		for _, r := range results {
-			totalReadResults++
-			if r.GetWasCached() {
-				cachedReadResults++
-			}
-		}
-	}
-	steadyElapsed := time.Since(steadyStart)
-	totalCalls := successfulCalls + failedCalls
-
-	callsPerSecond := 0.0
-	if steadyElapsed.Seconds() > 0 {
-		callsPerSecond = float64(totalCalls) / steadyElapsed.Seconds()
-	}
-
-	stats := map[string]any{
-		"language":          "go",
-		"command":           "bench-read-bulk",
-		"endpoint":          options.Endpoint,
-		"clientName":        *clientName,
-		"bulkSize":          *bulkSize,
-		"durationSeconds":   *durationSeconds,
-		"warmupSeconds":     *warmupSeconds,
-		"durationMs":        steadyElapsed.Milliseconds(),
-		"tags":              tags,
-		"totalCalls":        totalCalls,
-		"successfulCalls":   successfulCalls,
-		"failedCalls":       failedCalls,
-		"totalReadResults":  totalReadResults,
-		"cachedReadResults": cachedReadResults,
-		"callsPerSecond":    roundTo(callsPerSecond, 2),
-		"latencyMs":         percentileSummary(latenciesMs),
-	}
-	if *jsonOutput {
-		return writeJSON(stdout, stats)
-	}
-	fmt.Fprintln(stdout, callsPerSecond)
-	return nil
-}
-
-// percentileSummary returns the same { p50, p95, p99, max, mean } shape every
-// language bench emits, rounded to 3 decimal places so the PowerShell driver
-// sees one schema across all five clients.
-func percentileSummary(sample []float64) map[string]float64 {
-	if len(sample) == 0 {
-		return map[string]float64{"p50": 0, "p95": 0, "p99": 0, "max": 0, "mean": 0}
-	}
-	sorted := append([]float64(nil), sample...)
-	sort.Float64s(sorted)
-	mean := 0.0
-	maxValue := sorted[len(sorted)-1]
-	for _, v := range sample {
-		mean += v
-	}
-	mean /= float64(len(sample))
-	return map[string]float64{
-		"p50":  roundTo(percentile(sorted, 0.50), 3),
-		"p95":  roundTo(percentile(sorted, 0.95), 3),
-		"p99":  roundTo(percentile(sorted, 0.99), 3),
-		"max":  roundTo(maxValue, 3),
-		"mean": roundTo(mean, 3),
-	}
-}
-
-// percentile uses nearest-rank with linear interpolation; matches the .NET
-// implementation so cross-language comparisons are apples-to-apples.
-func percentile(sorted []float64, quantile float64) float64 {
-	if len(sorted) == 0 {
-		return 0
-	}
-	if len(sorted) == 1 {
-		return sorted[0]
-	}
-	rank := quantile * float64(len(sorted)-1)
-	lower := int(rank)
-	upper := lower + 1
-	if upper >= len(sorted) {
-		return sorted[lower]
-	}
-	fraction := rank - float64(lower)
-	return sorted[lower] + (sorted[upper]-sorted[lower])*fraction
-}
-
-func roundTo(value float64, digits int) float64 {
-	shift := 1.0
-	for i := 0; i < digits; i++ {
-		shift *= 10
-	}
-	return float64(int64(value*shift+0.5)) / shift
-}
-
 func runWrite(ctx context.Context, args []string, stdout, stderr io.Writer) error {
 	flags := flag.NewFlagSet("write", flag.ContinueOnError)
 	flags.SetOutput(stderr)
@@ -800,119 +423,6 @@ func runStreamEvents(ctx context.Context, args []string, stdout, stderr io.Write
 	return nil
 }
 
-func runStreamAlarms(ctx context.Context, args []string, stdout, stderr io.Writer) error {
-	flags := flag.NewFlagSet("stream-alarms", flag.ContinueOnError)
-	flags.SetOutput(stderr)
-	common := bindCommonFlags(flags)
-	jsonOutput := flags.Bool("json", false, "write JSON output")
-	filterPrefix := flags.String("filter-prefix", "", "alarm-reference prefix scoping the feed; empty means unscoped")
-	limit := flags.Int("limit", 0, "maximum feed messages to read; 0 means unbounded")
-
-	if err := flags.Parse(args); err != nil {
-		return err
-	}
-
-	client, _, err := dialForCommand(ctx, common)
-	if err != nil {
-		return err
-	}
-	defer client.Close()
-
-	// Mirror runStreamEvents so Ctrl+C on a long-running stream-alarms command
-	// cancels the gRPC stream cleanly (the gateway sees codes.Canceled rather
-	// than a torn TCP connection) and the deferred client.Close() actually runs.
-	signalCtx, stopSignals := signal.NotifyContext(ctx, os.Interrupt, syscall.SIGTERM)
-	defer stopSignals()
-
-	streamCtx, cancelStream := context.WithCancel(signalCtx)
-	defer cancelStream()
-	stream, err := client.StreamAlarms(streamCtx, &mxgateway.StreamAlarmsRequest{AlarmFilterPrefix: *filterPrefix})
-	if err != nil {
-		return err
-	}
-
-	count := 0
-	for {
-		message, err := stream.Recv()
-		if errors.Is(err, io.EOF) {
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-		if *jsonOutput {
-			fmt.Fprintln(stdout, string(mustMarshalProto(message)))
-		} else {
-			fmt.Fprintln(stdout, formatAlarmFeedMessage(message))
-		}
-		count++
-		if *limit > 0 && count >= *limit {
-			cancelStream()
-			return nil
-		}
-	}
-}
-
-// formatAlarmFeedMessage renders one AlarmFeedMessage in the CLI's plain-text
-// output style, distinguishing the active-alarm snapshot, snapshot-complete
-// sentinel, and transition cases of the message's payload oneof.
-func formatAlarmFeedMessage(message *mxgateway.AlarmFeedMessage) string {
-	switch {
-	case message.GetActiveAlarm() != nil:
-		alarm := message.GetActiveAlarm()
-		return fmt.Sprintf("active-alarm %s state=%s severity=%d", alarm.GetAlarmFullReference(), alarm.GetCurrentState(), alarm.GetSeverity())
-	case message.GetSnapshotComplete():
-		return "snapshot-complete"
-	case message.GetTransition() != nil:
-		transition := message.GetTransition()
-		return fmt.Sprintf("transition %s kind=%s severity=%d", transition.GetAlarmFullReference(), transition.GetTransitionKind(), transition.GetSeverity())
-	default:
-		return "unknown"
-	}
-}
-
-func runAcknowledgeAlarm(ctx context.Context, args []string, stdout, stderr io.Writer) error {
-	flags := flag.NewFlagSet("acknowledge-alarm", flag.ContinueOnError)
-	flags.SetOutput(stderr)
-	common := bindCommonFlags(flags)
-	jsonOutput := flags.Bool("json", false, "write JSON output")
-	reference := flags.String("reference", "", "full alarm reference to acknowledge")
-	comment := flags.String("comment", "", "operator acknowledge comment")
-	operator := flags.String("operator", "", "operator user performing the acknowledge")
-
-	if err := flags.Parse(args); err != nil {
-		return err
-	}
-	if *reference == "" {
-		return errors.New("reference is required")
-	}
-
-	client, options, err := dialForCommand(ctx, common)
-	if err != nil {
-		return err
-	}
-	defer client.Close()
-
-	reply, err := client.AcknowledgeAlarm(ctx, &mxgateway.AcknowledgeAlarmRequest{
-		AlarmFullReference: *reference,
-		Comment:            *comment,
-		OperatorUser:       *operator,
-	})
-	if err != nil {
-		return err
-	}
-	if *jsonOutput {
-		return writeJSON(stdout, commandReplyOutput{
-			Command: "acknowledge-alarm",
-			Options: options,
-			Reply:   mustMarshalProto(reply),
-		})
-	}
-
-	fmt.Fprintln(stdout, reply.GetHresult())
-	return nil
-}
-
 func runSmoke(ctx context.Context, args []string, stdout, stderr io.Writer) error {
 	flags := flag.NewFlagSet("smoke", flag.ContinueOnError)
 	flags.SetOutput(stderr)
@@ -999,7 +509,7 @@ func parseStringList(value string) []string {
 	return items
 }
 
-func parseInt32List(value string) ([]int32, error) {
+func parseInt32List(value string) []int32 {
 	parts := strings.Split(value, ",")
 	items := make([]int32, 0, len(parts))
 	for _, part := range parts {
@@ -1009,11 +519,11 @@ func parseInt32List(value string) ([]int32, error) {
 		}
 		parsed, err := strconv.ParseInt(item, 10, 32)
 		if err != nil {
-			return nil, fmt.Errorf("invalid item handle %q: %w", item, err)
+			panic(err)
 		}
 		items = append(items, int32(parsed))
 	}
-	return items, nil
+	return items
 }
 
 func bindCommonFlags(flags *flag.FlagSet) *commonOptions {
@@ -1132,36 +642,6 @@ func writeBulkOutput(stdout io.Writer, jsonOutput bool, command string, options
 	return nil
 }
 
-func writeWriteBulkOutput(stdout io.Writer, jsonOutput bool, command string, options commonOptions, results []*mxgateway.BulkWriteResult, err error) error {
-	if err != nil {
-		return err
-	}
-	if jsonOutput {
-		return writeJSON(stdout, map[string]any{
-			"command": command,
-			"options": options,
-			"results": results,
-		})
-	}
-	fmt.Fprintln(stdout, len(results))
-	return nil
-}
-
-func writeReadBulkOutput(stdout io.Writer, jsonOutput bool, command string, options commonOptions, results []*mxgateway.BulkReadResult, err error) error {
-	if err != nil {
-		return err
-	}
-	if jsonOutput {
-		return writeJSON(stdout, map[string]any{
-			"command": command,
-			"options": options,
-			"results": results,
-		})
-	}
-	fmt.Fprintln(stdout, len(results))
-	return nil
-}
-
 func writeJSON(writer io.Writer, value any) error {
 	encoder := json.NewEncoder(writer)
 	encoder.SetIndent("", "  ")
@@ -1181,43 +661,7 @@ type protojsonMessage interface {
 }
 
 func writeUsage(writer io.Writer) {
-	fmt.Fprintln(writer, "usage: mxgw-go <version|open-session|close-session|register|add-item|advise|subscribe-bulk|unsubscribe-bulk|read-bulk|write-bulk|write2-bulk|write-secured-bulk|write-secured2-bulk|bench-read-bulk|write|stream-events|stream-alarms|acknowledge-alarm|smoke|galaxy-test-connection|galaxy-last-deploy|galaxy-discover|galaxy-watch|batch>")
-}
-
-// batchEOR is the end-of-result sentinel emitted to stdout after every command
-// in batch mode, regardless of success or failure.
-const batchEOR = "__MXGW_BATCH_EOR__"
-
-// runBatch reads one command line at a time from in, dispatches each via the
-// normal runWithIO routing, and writes a batchEOR sentinel to stdout after
-// every result. Errors are serialised as JSON to stdout (not stderr) so the
-// harness can parse them without interleaving stderr. The loop never terminates
-// on command error; only stdin EOF (or an empty line) ends the session.
-func runBatch(ctx context.Context, in io.Reader, stdout, stderr io.Writer) error {
-	bw := bufio.NewWriter(stdout)
-	scanner := bufio.NewScanner(in)
-	for scanner.Scan() {
-		line := scanner.Text()
-		if line == "" {
-			break
-		}
-		args := strings.Fields(line)
-		if len(args) == 0 {
-			continue
-		}
-		if err := runWithIO(ctx, args, bw, stderr); err != nil {
-			// Write error as JSON to stdout (bw) so the harness sees it in the
-			// same stream as normal output, framed by the EOR sentinel.
-			errPayload := map[string]string{
-				"error": err.Error(),
-				"type":  "error",
-			}
-			_ = writeJSON(bw, errPayload)
-		}
-		_, _ = fmt.Fprintln(bw, batchEOR)
-		_ = bw.Flush()
-	}
-	return scanner.Err()
+	fmt.Fprintln(writer, "usage: mxgw-go <version|open-session|close-session|register|add-item|advise|subscribe-bulk|unsubscribe-bulk|write|stream-events|smoke|galaxy-test-connection|galaxy-last-deploy|galaxy-discover|galaxy-watch>")
 }
 
 func dialGalaxyForCommand(ctx context.Context, common *commonOptions) (*mxgateway.GalaxyClient, commonOptions, error) {

clients/go/cmd/mxgw-go/main_test.go

@@ -47,34 +47,6 @@ func TestCommonOptionsRedactsAPIKey(t *testing.T) {
 	}
 }
 
-func TestRunBatchEmitsEORAfterVersion(t *testing.T) {
-	var stdout bytes.Buffer
-	var stderr bytes.Buffer
-
-	in := strings.NewReader("version --json\n")
-	if err := runBatch(t.Context(), in, &stdout, &stderr); err != nil {
-		t.Fatalf("runBatch() error = %v; stderr = %s", err, stderr.String())
-	}
-
-	out := stdout.String()
-	if !strings.Contains(out, "\n"+batchEOR+"\n") && !strings.HasSuffix(out, batchEOR+"\n") {
-		t.Fatalf("expected EOR marker %q in stdout; got: %q", batchEOR, out)
-	}
-
-	idx := strings.Index(out, batchEOR)
-	if idx <= 0 {
-		t.Fatalf("EOR marker not found or appeared before any output: %q", out)
-	}
-	payload := out[:idx]
-	var output versionOutput
-	if err := json.Unmarshal([]byte(payload), &output); err != nil {
-		t.Fatalf("parse JSON block before EOR: %v (payload=%q)", err, payload)
-	}
-	if output.GatewayProtocolVersion == 0 || output.WorkerProtocolVersion == 0 {
-		t.Fatalf("protocol versions were not populated: %+v", output)
-	}
-}
-
 func TestParseValueBuildsTypedValue(t *testing.T) {
 	value, err := parseValue("int32", "123")
 	if err != nil {

clients/go/generate-proto.ps1

@@ -2,20 +2,20 @@ Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 
 $repoRoot = Resolve-Path (Join-Path $PSScriptRoot '..\..')
-$protoRoot = Join-Path $repoRoot 'src\ZB.MOM.WW.MxGateway.Contracts\Protos'
+$protoRoot = Join-Path $repoRoot 'src\MxGateway.Contracts\Protos'
 $outputRoot = Join-Path $PSScriptRoot 'internal\generated'
 $modulePath = 'gitea.dohertylan.com/dohertj2/mxaccessgw/clients/go/internal/generated'
 $protoc = 'C:\Users\dohertj2\AppData\Local\Microsoft\WinGet\Packages\Google.Protobuf_Microsoft.Winget.Source_8wekyb3d8bbwe\bin\protoc.exe'
 $goPluginPath = 'C:\Users\dohertj2\go\bin'
 
 if (-not (Test-Path $protoc)) {
-    throw "protoc was not found at $protoc. See docs/ToolchainLinks.md."
+    throw "protoc was not found at $protoc. See docs/toolchain-links.md."
 }
 
 foreach ($pluginName in @('protoc-gen-go.exe', 'protoc-gen-go-grpc.exe')) {
     $pluginPath = Join-Path $goPluginPath $pluginName
     if (-not (Test-Path $pluginPath)) {
-        throw "$pluginName was not found at $pluginPath. See docs/ToolchainLinks.md."
+        throw "$pluginName was not found at $pluginPath. See docs/toolchain-links.md."
     }
 }
 

clients/go/internal/generated/galaxy_repository.pb.go

@@ -687,32 +687,18 @@ func (x *GalaxyObject) GetAttributes() []*GalaxyAttribute {
 }
 
 type GalaxyAttribute struct {
-	state            protoimpl.MessageState `protogen:"open.v1"`
-	AttributeName    string                 `protobuf:"bytes,1,opt,name=attribute_name,json=attributeName,proto3" json:"attribute_name,omitempty"`
-	FullTagReference string                 `protobuf:"bytes,2,opt,name=full_tag_reference,json=fullTagReference,proto3" json:"full_tag_reference,omitempty"`
-	// Raw Galaxy SQL `dbo.data_type` identifier, passed through unchanged.
-	// This is NOT a member of `mxaccess_gateway.v1.MxDataType` — Galaxy's
-	// type enumeration is distinct from MXAccess's wire data-type enum and
-	// the two must not be cast or compared. The GalaxyRepository service is
-	// metadata-only and deliberately does not share types with
-	// mxaccess_gateway.proto. See docs/GalaxyRepository.md.
-	MxDataType int32 `protobuf:"varint,3,opt,name=mx_data_type,json=mxDataType,proto3" json:"mx_data_type,omitempty"`
-	// Human-readable name from Galaxy's `dbo.data_type` table (e.g. "Float",
-	// "Integer", "Boolean"). Free-form Galaxy text; not a stable enum.
-	DataTypeName          string `protobuf:"bytes,4,opt,name=data_type_name,json=dataTypeName,proto3" json:"data_type_name,omitempty"`
-	IsArray               bool   `protobuf:"varint,5,opt,name=is_array,json=isArray,proto3" json:"is_array,omitempty"`
-	ArrayDimension        int32  `protobuf:"varint,6,opt,name=array_dimension,json=arrayDimension,proto3" json:"array_dimension,omitempty"`
-	ArrayDimensionPresent bool   `protobuf:"varint,7,opt,name=array_dimension_present,json=arrayDimensionPresent,proto3" json:"array_dimension_present,omitempty"`
-	// Raw Galaxy SQL attribute-category identifier, passed through unchanged.
-	// Galaxy-specific; not mapped to any gateway enum. See
-	// docs/GalaxyRepository.md.
-	MxAttributeCategory int32 `protobuf:"varint,8,opt,name=mx_attribute_category,json=mxAttributeCategory,proto3" json:"mx_attribute_category,omitempty"`
-	// Raw Galaxy SQL security-classification identifier, passed through
-	// unchanged. Galaxy-specific; not mapped to any gateway enum. See
-	// docs/GalaxyRepository.md.
-	SecurityClassification int32 `protobuf:"varint,9,opt,name=security_classification,json=securityClassification,proto3" json:"security_classification,omitempty"`
-	IsHistorized           bool  `protobuf:"varint,10,opt,name=is_historized,json=isHistorized,proto3" json:"is_historized,omitempty"`
-	IsAlarm                bool  `protobuf:"varint,11,opt,name=is_alarm,json=isAlarm,proto3" json:"is_alarm,omitempty"`
+	state                  protoimpl.MessageState `protogen:"open.v1"`
+	AttributeName          string                 `protobuf:"bytes,1,opt,name=attribute_name,json=attributeName,proto3" json:"attribute_name,omitempty"`
+	FullTagReference       string                 `protobuf:"bytes,2,opt,name=full_tag_reference,json=fullTagReference,proto3" json:"full_tag_reference,omitempty"`
+	MxDataType             int32                  `protobuf:"varint,3,opt,name=mx_data_type,json=mxDataType,proto3" json:"mx_data_type,omitempty"`
+	DataTypeName           string                 `protobuf:"bytes,4,opt,name=data_type_name,json=dataTypeName,proto3" json:"data_type_name,omitempty"`
+	IsArray                bool                   `protobuf:"varint,5,opt,name=is_array,json=isArray,proto3" json:"is_array,omitempty"`
+	ArrayDimension         int32                  `protobuf:"varint,6,opt,name=array_dimension,json=arrayDimension,proto3" json:"array_dimension,omitempty"`
+	ArrayDimensionPresent  bool                   `protobuf:"varint,7,opt,name=array_dimension_present,json=arrayDimensionPresent,proto3" json:"array_dimension_present,omitempty"`
+	MxAttributeCategory    int32                  `protobuf:"varint,8,opt,name=mx_attribute_category,json=mxAttributeCategory,proto3" json:"mx_attribute_category,omitempty"`
+	SecurityClassification int32                  `protobuf:"varint,9,opt,name=security_classification,json=securityClassification,proto3" json:"security_classification,omitempty"`
+	IsHistorized           bool                   `protobuf:"varint,10,opt,name=is_historized,json=isHistorized,proto3" json:"is_historized,omitempty"`
+	IsAlarm                bool                   `protobuf:"varint,11,opt,name=is_alarm,json=isAlarm,proto3" json:"is_alarm,omitempty"`
 	unknownFields          protoimpl.UnknownFields
 	sizeCache              protoimpl.SizeCache
 }
@@ -902,7 +888,7 @@ const file_galaxy_repository_proto_rawDesc = "" +
 	"\x0eTestConnection\x12+.galaxy_repository.v1.TestConnectionRequest\x1a).galaxy_repository.v1.TestConnectionReply\x12q\n" +
 	"\x11GetLastDeployTime\x12..galaxy_repository.v1.GetLastDeployTimeRequest\x1a,.galaxy_repository.v1.GetLastDeployTimeReply\x12q\n" +
 	"\x11DiscoverHierarchy\x12..galaxy_repository.v1.DiscoverHierarchyRequest\x1a,.galaxy_repository.v1.DiscoverHierarchyReply\x12h\n" +
-	"\x11WatchDeployEvents\x12..galaxy_repository.v1.WatchDeployEventsRequest\x1a!.galaxy_repository.v1.DeployEvent0\x01B-\xaa\x02*ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxyb\x06proto3"
+	"\x11WatchDeployEvents\x12..galaxy_repository.v1.WatchDeployEventsRequest\x1a!.galaxy_repository.v1.DeployEvent0\x01B#\xaa\x02 MxGateway.Contracts.Proto.Galaxyb\x06proto3"
 
 var (
 	file_galaxy_repository_proto_rawDescOnce sync.Once

clients/go/internal/generated/mxaccess_gateway_grpc.pb.go

@@ -19,13 +19,10 @@ import (
 const _ = grpc.SupportPackageIsVersion9
 
 const (
-	MxAccessGateway_OpenSession_FullMethodName       = "/mxaccess_gateway.v1.MxAccessGateway/OpenSession"
-	MxAccessGateway_CloseSession_FullMethodName      = "/mxaccess_gateway.v1.MxAccessGateway/CloseSession"
-	MxAccessGateway_Invoke_FullMethodName            = "/mxaccess_gateway.v1.MxAccessGateway/Invoke"
-	MxAccessGateway_StreamEvents_FullMethodName      = "/mxaccess_gateway.v1.MxAccessGateway/StreamEvents"
-	MxAccessGateway_AcknowledgeAlarm_FullMethodName  = "/mxaccess_gateway.v1.MxAccessGateway/AcknowledgeAlarm"
-	MxAccessGateway_StreamAlarms_FullMethodName      = "/mxaccess_gateway.v1.MxAccessGateway/StreamAlarms"
-	MxAccessGateway_QueryActiveAlarms_FullMethodName = "/mxaccess_gateway.v1.MxAccessGateway/QueryActiveAlarms"
+	MxAccessGateway_OpenSession_FullMethodName  = "/mxaccess_gateway.v1.MxAccessGateway/OpenSession"
+	MxAccessGateway_CloseSession_FullMethodName = "/mxaccess_gateway.v1.MxAccessGateway/CloseSession"
+	MxAccessGateway_Invoke_FullMethodName       = "/mxaccess_gateway.v1.MxAccessGateway/Invoke"
+	MxAccessGateway_StreamEvents_FullMethodName = "/mxaccess_gateway.v1.MxAccessGateway/StreamEvents"
 )
 
 // MxAccessGatewayClient is the client API for MxAccessGateway service.
@@ -38,19 +35,6 @@ type MxAccessGatewayClient interface {
 	CloseSession(ctx context.Context, in *CloseSessionRequest, opts ...grpc.CallOption) (*CloseSessionReply, error)
 	Invoke(ctx context.Context, in *MxCommandRequest, opts ...grpc.CallOption) (*MxCommandReply, error)
 	StreamEvents(ctx context.Context, in *StreamEventsRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[MxEvent], error)
-	AcknowledgeAlarm(ctx context.Context, in *AcknowledgeAlarmRequest, opts ...grpc.CallOption) (*AcknowledgeAlarmReply, error)
-	// Session-less central alarm feed. The stream opens with the current
-	// active-alarm snapshot (one `active_alarm` per alarm), then a single
-	// `snapshot_complete`, then a `transition` for every subsequent change.
-	// Served by the gateway's always-on alarm monitor; any number of clients
-	// fan out from the single monitor without opening a worker session.
-	StreamAlarms(ctx context.Context, in *StreamAlarmsRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[AlarmFeedMessage], error)
-	// Point-in-time snapshot of the currently-active alarm set served from the
-	// gateway's always-on alarm monitor cache (session-less). Used after a
-	// reconnect to seed Part 9 client state, or to reconcile alarms that may
-	// have been missed during a transport blip. Streamed so callers can
-	// begin processing without buffering the full set.
-	QueryActiveAlarms(ctx context.Context, in *QueryActiveAlarmsRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[ActiveAlarmSnapshot], error)
 }
 
 type mxAccessGatewayClient struct {
@@ -110,54 +94,6 @@ func (c *mxAccessGatewayClient) StreamEvents(ctx context.Context, in *StreamEven
 // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
 type MxAccessGateway_StreamEventsClient = grpc.ServerStreamingClient[MxEvent]
 
-func (c *mxAccessGatewayClient) AcknowledgeAlarm(ctx context.Context, in *AcknowledgeAlarmRequest, opts ...grpc.CallOption) (*AcknowledgeAlarmReply, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(AcknowledgeAlarmReply)
-	err := c.cc.Invoke(ctx, MxAccessGateway_AcknowledgeAlarm_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *mxAccessGatewayClient) StreamAlarms(ctx context.Context, in *StreamAlarmsRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[AlarmFeedMessage], error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	stream, err := c.cc.NewStream(ctx, &MxAccessGateway_ServiceDesc.Streams[1], MxAccessGateway_StreamAlarms_FullMethodName, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &grpc.GenericClientStream[StreamAlarmsRequest, AlarmFeedMessage]{ClientStream: stream}
-	if err := x.ClientStream.SendMsg(in); err != nil {
-		return nil, err
-	}
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	return x, nil
-}
-
-// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
-type MxAccessGateway_StreamAlarmsClient = grpc.ServerStreamingClient[AlarmFeedMessage]
-
-func (c *mxAccessGatewayClient) QueryActiveAlarms(ctx context.Context, in *QueryActiveAlarmsRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[ActiveAlarmSnapshot], error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	stream, err := c.cc.NewStream(ctx, &MxAccessGateway_ServiceDesc.Streams[2], MxAccessGateway_QueryActiveAlarms_FullMethodName, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &grpc.GenericClientStream[QueryActiveAlarmsRequest, ActiveAlarmSnapshot]{ClientStream: stream}
-	if err := x.ClientStream.SendMsg(in); err != nil {
-		return nil, err
-	}
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	return x, nil
-}
-
-// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
-type MxAccessGateway_QueryActiveAlarmsClient = grpc.ServerStreamingClient[ActiveAlarmSnapshot]
-
 // MxAccessGatewayServer is the server API for MxAccessGateway service.
 // All implementations must embed UnimplementedMxAccessGatewayServer
 // for forward compatibility.
@@ -168,19 +104,6 @@ type MxAccessGatewayServer interface {
 	CloseSession(context.Context, *CloseSessionRequest) (*CloseSessionReply, error)
 	Invoke(context.Context, *MxCommandRequest) (*MxCommandReply, error)
 	StreamEvents(*StreamEventsRequest, grpc.ServerStreamingServer[MxEvent]) error
-	AcknowledgeAlarm(context.Context, *AcknowledgeAlarmRequest) (*AcknowledgeAlarmReply, error)
-	// Session-less central alarm feed. The stream opens with the current
-	// active-alarm snapshot (one `active_alarm` per alarm), then a single
-	// `snapshot_complete`, then a `transition` for every subsequent change.
-	// Served by the gateway's always-on alarm monitor; any number of clients
-	// fan out from the single monitor without opening a worker session.
-	StreamAlarms(*StreamAlarmsRequest, grpc.ServerStreamingServer[AlarmFeedMessage]) error
-	// Point-in-time snapshot of the currently-active alarm set served from the
-	// gateway's always-on alarm monitor cache (session-less). Used after a
-	// reconnect to seed Part 9 client state, or to reconcile alarms that may
-	// have been missed during a transport blip. Streamed so callers can
-	// begin processing without buffering the full set.
-	QueryActiveAlarms(*QueryActiveAlarmsRequest, grpc.ServerStreamingServer[ActiveAlarmSnapshot]) error
 	mustEmbedUnimplementedMxAccessGatewayServer()
 }
 
@@ -203,15 +126,6 @@ func (UnimplementedMxAccessGatewayServer) Invoke(context.Context, *MxCommandRequ
 func (UnimplementedMxAccessGatewayServer) StreamEvents(*StreamEventsRequest, grpc.ServerStreamingServer[MxEvent]) error {
 	return status.Error(codes.Unimplemented, "method StreamEvents not implemented")
 }
-func (UnimplementedMxAccessGatewayServer) AcknowledgeAlarm(context.Context, *AcknowledgeAlarmRequest) (*AcknowledgeAlarmReply, error) {
-	return nil, status.Error(codes.Unimplemented, "method AcknowledgeAlarm not implemented")
-}
-func (UnimplementedMxAccessGatewayServer) StreamAlarms(*StreamAlarmsRequest, grpc.ServerStreamingServer[AlarmFeedMessage]) error {
-	return status.Error(codes.Unimplemented, "method StreamAlarms not implemented")
-}
-func (UnimplementedMxAccessGatewayServer) QueryActiveAlarms(*QueryActiveAlarmsRequest, grpc.ServerStreamingServer[ActiveAlarmSnapshot]) error {
-	return status.Error(codes.Unimplemented, "method QueryActiveAlarms not implemented")
-}
 func (UnimplementedMxAccessGatewayServer) mustEmbedUnimplementedMxAccessGatewayServer() {}
 func (UnimplementedMxAccessGatewayServer) testEmbeddedByValue()                         {}
 
@@ -298,46 +212,6 @@ func _MxAccessGateway_StreamEvents_Handler(srv interface{}, stream grpc.ServerSt
 // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
 type MxAccessGateway_StreamEventsServer = grpc.ServerStreamingServer[MxEvent]
 
-func _MxAccessGateway_AcknowledgeAlarm_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AcknowledgeAlarmRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(MxAccessGatewayServer).AcknowledgeAlarm(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: MxAccessGateway_AcknowledgeAlarm_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(MxAccessGatewayServer).AcknowledgeAlarm(ctx, req.(*AcknowledgeAlarmRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _MxAccessGateway_StreamAlarms_Handler(srv interface{}, stream grpc.ServerStream) error {
-	m := new(StreamAlarmsRequest)
-	if err := stream.RecvMsg(m); err != nil {
-		return err
-	}
-	return srv.(MxAccessGatewayServer).StreamAlarms(m, &grpc.GenericServerStream[StreamAlarmsRequest, AlarmFeedMessage]{ServerStream: stream})
-}
-
-// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
-type MxAccessGateway_StreamAlarmsServer = grpc.ServerStreamingServer[AlarmFeedMessage]
-
-func _MxAccessGateway_QueryActiveAlarms_Handler(srv interface{}, stream grpc.ServerStream) error {
-	m := new(QueryActiveAlarmsRequest)
-	if err := stream.RecvMsg(m); err != nil {
-		return err
-	}
-	return srv.(MxAccessGatewayServer).QueryActiveAlarms(m, &grpc.GenericServerStream[QueryActiveAlarmsRequest, ActiveAlarmSnapshot]{ServerStream: stream})
-}
-
-// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
-type MxAccessGateway_QueryActiveAlarmsServer = grpc.ServerStreamingServer[ActiveAlarmSnapshot]
-
 // MxAccessGateway_ServiceDesc is the grpc.ServiceDesc for MxAccessGateway service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -357,10 +231,6 @@ var MxAccessGateway_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "Invoke",
 			Handler:    _MxAccessGateway_Invoke_Handler,
 		},
-		{
-			MethodName: "AcknowledgeAlarm",
-			Handler:    _MxAccessGateway_AcknowledgeAlarm_Handler,
-		},
 	},
 	Streams: []grpc.StreamDesc{
 		{
@@ -368,16 +238,6 @@ var MxAccessGateway_ServiceDesc = grpc.ServiceDesc{
 			Handler:       _MxAccessGateway_StreamEvents_Handler,
 			ServerStreams: true,
 		},
-		{
-			StreamName:    "StreamAlarms",
-			Handler:       _MxAccessGateway_StreamAlarms_Handler,
-			ServerStreams: true,
-		},
-		{
-			StreamName:    "QueryActiveAlarms",
-			Handler:       _MxAccessGateway_QueryActiveAlarms_Handler,
-			ServerStreams: true,
-		},
 	},
 	Metadata: "mxaccess_gateway.proto",
 }

clients/go/internal/generated/mxaccess_worker.pb.go

@@ -1179,7 +1179,7 @@ const file_mxaccess_worker_proto_rawDesc = "" +
 	"\x1eWORKER_FAULT_CATEGORY_STA_HUNG\x10\t\x12(\n" +
 	"$WORKER_FAULT_CATEGORY_QUEUE_OVERFLOW\x10\n" +
 	"\x12*\n" +
-	"&WORKER_FAULT_CATEGORY_SHUTDOWN_TIMEOUT\x10\vB&\xaa\x02#ZB.MOM.WW.MxGateway.Contracts.Protob\x06proto3"
+	"&WORKER_FAULT_CATEGORY_SHUTDOWN_TIMEOUT\x10\vB\x1c\xaa\x02\x19MxGateway.Contracts.Protob\x06proto3"
 
 var (
 	file_mxaccess_worker_proto_rawDescOnce sync.Once

clients/go/mxgateway/alarms.go

@@ -1,76 +0,0 @@
-package mxgateway
-
-import (
-	"context"
-	"errors"
-)
-
-// AcknowledgeAlarm acknowledges an active MXAccess alarm condition through the
-// gateway. The gateway authenticates the request against the API key's
-// invoke:alarm-ack scope and forwards the acknowledge to the worker's MXAccess
-// session; the resulting native MxStatus is returned in the reply.
-//
-// Acks are idempotent — re-acking an already-acked condition is a no-op at
-// the MxAccess layer.
-func (c *Client) AcknowledgeAlarm(ctx context.Context, req *AcknowledgeAlarmRequest) (*AcknowledgeAlarmReply, error) {
-	if req == nil {
-		return nil, errors.New("mxgateway: acknowledge alarm request is required")
-	}
-
-	callCtx, cancel := c.callContext(ctx)
-	defer cancel()
-
-	reply, err := c.raw.AcknowledgeAlarm(callCtx, req)
-	if err != nil {
-		return nil, &GatewayError{Op: "acknowledge alarm", Err: err}
-	}
-	if err := EnsureProtocolSuccess("acknowledge alarm", reply.GetProtocolStatus(), nil); err != nil {
-		return reply, err
-	}
-
-	return reply, nil
-}
-
-// QueryActiveAlarms streams a snapshot of all alarms currently Active or
-// ActiveAcked — the gateway's ConditionRefresh equivalent. Used after reconnect
-// to seed local Part 9 state, or to reconcile alarms that may have been missed
-// during a transport blip.
-//
-// The returned stream is owned by the caller; cancel ctx to release it.
-// Optional alarm-reference prefix scoping (req.AlarmFilterPrefix) limits the
-// stream to a sub-tree.
-func (c *Client) QueryActiveAlarms(ctx context.Context, req *QueryActiveAlarmsRequest) (QueryActiveAlarmsClient, error) {
-	if req == nil {
-		return nil, errors.New("mxgateway: query active alarms request is required")
-	}
-
-	stream, err := c.raw.QueryActiveAlarms(ctx, req)
-	if err != nil {
-		return nil, &GatewayError{Op: "query active alarms", Err: err}
-	}
-
-	return stream, nil
-}
-
-// StreamAlarms attaches to the gateway's central alarm feed. The stream opens
-// with one AlarmFeedMessage per currently-active alarm (the ConditionRefresh
-// snapshot), then a single snapshot-complete sentinel, then a transition for
-// every subsequent raise / acknowledge / clear. It is served by the gateway's
-// always-on alarm monitor — no worker session is opened — so any number of
-// clients may attach.
-//
-// The returned stream is owned by the caller; cancel ctx to release it.
-// Optional alarm-reference prefix scoping (req.AlarmFilterPrefix) limits the
-// stream to a sub-tree.
-func (c *Client) StreamAlarms(ctx context.Context, req *StreamAlarmsRequest) (StreamAlarmsClient, error) {
-	if req == nil {
-		return nil, errors.New("mxgateway: stream alarms request is required")
-	}
-
-	stream, err := c.raw.StreamAlarms(ctx, req)
-	if err != nil {
-		return nil, &GatewayError{Op: "stream alarms", Err: err}
-	}
-
-	return stream, nil
-}

clients/go/mxgateway/alarms_test.go

@@ -1,235 +0,0 @@
-package mxgateway
-
-import (
-	"context"
-	"errors"
-	"io"
-	"net"
-	"testing"
-
-	pb "gitea.dohertylan.com/dohertj2/mxaccessgw/clients/go/internal/generated"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/grpc/test/bufconn"
-)
-
-// PR E.4 — pins the Go SDK surface for the new alarm RPCs:
-// AcknowledgeAlarm + QueryActiveAlarms.
-
-func TestAcknowledgeAlarmSendsRequestAndReturnsReply(t *testing.T) {
-	fake := &fakeGatewayWithAlarms{
-		acknowledgeReply: &pb.AcknowledgeAlarmReply{
-			CorrelationId: "corr-1",
-			ProtocolStatus: &pb.ProtocolStatus{
-				Code: pb.ProtocolStatusCode_PROTOCOL_STATUS_CODE_OK,
-			},
-			Status: &pb.MxStatusProxy{
-				Success:  1,
-				Category: pb.MxStatusCategory_MX_STATUS_CATEGORY_OK,
-			},
-		},
-	}
-	client, cleanup := newBufconnClientWithAlarms(t, fake)
-	defer cleanup()
-
-	reply, err := client.AcknowledgeAlarm(context.Background(), &pb.AcknowledgeAlarmRequest{
-		ClientCorrelationId: "corr-1",
-		AlarmFullReference:  "Tank01.Level.HiHi",
-		Comment:             "investigating",
-		OperatorUser:        "alice",
-	})
-	if err != nil {
-		t.Fatalf("AcknowledgeAlarm() error = %v", err)
-	}
-	if reply.GetProtocolStatus().GetCode() != pb.ProtocolStatusCode_PROTOCOL_STATUS_CODE_OK {
-		t.Fatalf("protocol status = %v", reply.GetProtocolStatus().GetCode())
-	}
-	if got := fake.acknowledgeRequest.GetAlarmFullReference(); got != "Tank01.Level.HiHi" {
-		t.Fatalf("captured alarm reference = %q", got)
-	}
-	if got := fake.acknowledgeRequest.GetComment(); got != "investigating" {
-		t.Fatalf("captured comment = %q", got)
-	}
-	if got := fake.acknowledgeAuth; got != "Bearer test-api-key" {
-		t.Fatalf("authorization metadata = %q", got)
-	}
-}
-
-func TestAcknowledgeAlarmRejectsNilRequest(t *testing.T) {
-	fake := &fakeGatewayWithAlarms{}
-	client, cleanup := newBufconnClientWithAlarms(t, fake)
-	defer cleanup()
-
-	_, err := client.AcknowledgeAlarm(context.Background(), nil)
-	if err == nil || !errors.Is(err, errors.Unwrap(err)) && err.Error() != "mxgateway: acknowledge alarm request is required" {
-		// Accept either: the helper returned the literal sentinel, or the
-		// generic transport error — both prove nil was rejected.
-	}
-	if err == nil {
-		t.Fatalf("AcknowledgeAlarm(nil) returned no error")
-	}
-}
-
-func TestAcknowledgeAlarmMapsUnauthenticated(t *testing.T) {
-	fake := &fakeGatewayWithAlarms{
-		acknowledgeError: status.Error(codes.Unauthenticated, "expired key"),
-	}
-	client, cleanup := newBufconnClientWithAlarms(t, fake)
-	defer cleanup()
-
-	_, err := client.AcknowledgeAlarm(context.Background(), &pb.AcknowledgeAlarmRequest{
-		AlarmFullReference: "Tank01.Level.HiHi",
-		OperatorUser:       "alice",
-	})
-	if err == nil {
-		t.Fatalf("AcknowledgeAlarm() returned no error on Unauthenticated")
-	}
-	var gwErr *GatewayError
-	if !errors.As(err, &gwErr) {
-		t.Fatalf("error %T does not unwrap to *GatewayError", err)
-	}
-	if got, _ := status.FromError(gwErr.Err); got.Code() != codes.Unauthenticated {
-		t.Fatalf("inner status code = %v", got.Code())
-	}
-}
-
-func TestQueryActiveAlarmsStreamsSnapshots(t *testing.T) {
-	fake := &fakeGatewayWithAlarms{
-		activeSnapshots: []*pb.ActiveAlarmSnapshot{
-			{
-				AlarmFullReference: "Tank01.Level.HiHi",
-				CurrentState:       pb.AlarmConditionState_ALARM_CONDITION_STATE_ACTIVE,
-				Severity:           750,
-			},
-			{
-				AlarmFullReference: "Tank02.Level.HiHi",
-				CurrentState:       pb.AlarmConditionState_ALARM_CONDITION_STATE_ACTIVE_ACKED,
-				Severity:           750,
-			},
-		},
-	}
-	client, cleanup := newBufconnClientWithAlarms(t, fake)
-	defer cleanup()
-
-	stream, err := client.QueryActiveAlarms(context.Background(), &pb.QueryActiveAlarmsRequest{
-		SessionId: "session-1",
-	})
-	if err != nil {
-		t.Fatalf("QueryActiveAlarms() error = %v", err)
-	}
-
-	var received []*pb.ActiveAlarmSnapshot
-	for {
-		snap, err := stream.Recv()
-		if errors.Is(err, io.EOF) {
-			break
-		}
-		if err != nil {
-			t.Fatalf("stream.Recv() error = %v", err)
-		}
-		received = append(received, snap)
-	}
-	if len(received) != 2 {
-		t.Fatalf("snapshot count = %d, want 2", len(received))
-	}
-	if received[0].GetAlarmFullReference() != "Tank01.Level.HiHi" {
-		t.Fatalf("snapshot[0] ref = %q", received[0].GetAlarmFullReference())
-	}
-	if received[1].GetCurrentState() != pb.AlarmConditionState_ALARM_CONDITION_STATE_ACTIVE_ACKED {
-		t.Fatalf("snapshot[1] state = %v", received[1].GetCurrentState())
-	}
-}
-
-func TestQueryActiveAlarmsPassesFilterPrefix(t *testing.T) {
-	fake := &fakeGatewayWithAlarms{}
-	client, cleanup := newBufconnClientWithAlarms(t, fake)
-	defer cleanup()
-
-	stream, err := client.QueryActiveAlarms(context.Background(), &pb.QueryActiveAlarmsRequest{
-		SessionId:         "session-1",
-		AlarmFilterPrefix: "Tank01.",
-	})
-	if err != nil {
-		t.Fatalf("QueryActiveAlarms() error = %v", err)
-	}
-	for {
-		_, err := stream.Recv()
-		if errors.Is(err, io.EOF) {
-			break
-		}
-		if err != nil {
-			t.Fatalf("stream.Recv() error = %v", err)
-		}
-	}
-
-	if got := fake.queryRequest.GetAlarmFilterPrefix(); got != "Tank01." {
-		t.Fatalf("captured filter prefix = %q", got)
-	}
-}
-
-type fakeGatewayWithAlarms struct {
-	pb.UnimplementedMxAccessGatewayServer
-
-	acknowledgeRequest *pb.AcknowledgeAlarmRequest
-	acknowledgeReply   *pb.AcknowledgeAlarmReply
-	acknowledgeError   error
-	acknowledgeAuth    string
-
-	queryRequest    *pb.QueryActiveAlarmsRequest
-	activeSnapshots []*pb.ActiveAlarmSnapshot
-}
-
-func (s *fakeGatewayWithAlarms) AcknowledgeAlarm(ctx context.Context, req *pb.AcknowledgeAlarmRequest) (*pb.AcknowledgeAlarmReply, error) {
-	s.acknowledgeRequest = req
-	s.acknowledgeAuth = authorizationFromContext(ctx)
-	if s.acknowledgeError != nil {
-		return nil, s.acknowledgeError
-	}
-	if s.acknowledgeReply != nil {
-		return s.acknowledgeReply, nil
-	}
-	return &pb.AcknowledgeAlarmReply{
-		CorrelationId: req.GetClientCorrelationId(),
-		ProtocolStatus: &pb.ProtocolStatus{
-			Code: pb.ProtocolStatusCode_PROTOCOL_STATUS_CODE_OK,
-		},
-	}, nil
-}
-
-func (s *fakeGatewayWithAlarms) QueryActiveAlarms(req *pb.QueryActiveAlarmsRequest, stream grpc.ServerStreamingServer[pb.ActiveAlarmSnapshot]) error {
-	s.queryRequest = req
-	for _, snap := range s.activeSnapshots {
-		if err := stream.Send(snap); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func newBufconnClientWithAlarms(t *testing.T, fake *fakeGatewayWithAlarms) (*Client, func()) {
-	t.Helper()
-	listener := bufconn.Listen(bufSize)
-	server := grpc.NewServer()
-	pb.RegisterMxAccessGatewayServer(server, fake)
-	go func() {
-		_ = server.Serve(listener)
-	}()
-	dialer := func(ctx context.Context, _ string) (net.Conn, error) {
-		return listener.DialContext(ctx)
-	}
-	client, err := Dial(context.Background(), Options{
-		Endpoint:    "bufnet",
-		APIKey:      "test-api-key",
-		Plaintext:   true,
-		DialOptions: []grpc.DialOption{grpc.WithContextDialer(dialer)},
-	})
-	if err != nil {
-		t.Fatalf("Dial() error = %v", err)
-	}
-	return client, func() {
-		client.Close()
-		server.Stop()
-		listener.Close()
-	}
-}

clients/go/mxgateway/client.go

@@ -1,14 +1,3 @@
-// Package mxgateway is the Go client for the MXAccess Gateway gRPC service.
-//
-// The package wraps the generated gRPC contract with session-oriented helpers
-// for invoking MXAccess commands, streaming events, and browsing the Galaxy
-// Repository. Authentication uses an API-key bearer token attached as gRPC
-// metadata on every call.
-//
-// Typical use opens a Client with Dial, opens a Session, invokes commands such
-// as Register, AddItem, Advise, and Write, and consumes events via
-// SubscribeEvents. Galaxy Repository browse RPCs are exposed through
-// GalaxyClient.
 package mxgateway
 
 import (
@@ -27,6 +16,7 @@ import (
 const (
 	defaultDialTimeout = 10 * time.Second
 	defaultCallTimeout = 30 * time.Second
+	defaultMaxGrpcMessageBytes = 16 * 1024 * 1024
 )
 
 // Client owns a gateway gRPC connection and exposes session-oriented helpers.
@@ -61,6 +51,10 @@ func Dial(ctx context.Context, opts Options) (*Client, error) {
 		grpc.WithTransportCredentials(transportCredentials),
 		grpc.WithUnaryInterceptor(unaryAuthInterceptor(opts.APIKey)),
 		grpc.WithStreamInterceptor(streamAuthInterceptor(opts.APIKey)),
+		grpc.WithDefaultCallOptions(
+			grpc.MaxCallRecvMsgSize(resolveMaxGrpcMessageBytes(opts)),
+			grpc.MaxCallSendMsgSize(resolveMaxGrpcMessageBytes(opts)),
+		),
 		grpc.WithBlock(),
 	}
 	dialOptions = append(dialOptions, opts.DialOptions...)
@@ -73,6 +67,13 @@ func Dial(ctx context.Context, opts Options) (*Client, error) {
 	return NewClient(conn, opts), nil
 }
 
+func resolveMaxGrpcMessageBytes(opts Options) int {
+	if opts.MaxGrpcMessageBytes > 0 {
+		return opts.MaxGrpcMessageBytes
+	}
+	return defaultMaxGrpcMessageBytes
+}
+
 // NewClient wraps an existing gRPC connection. The caller owns closing conn
 // unless it calls Close on the returned Client.
 func NewClient(conn *grpc.ClientConn, opts Options) *Client {
@@ -230,15 +231,10 @@ func resolveTransportCredentials(opts Options) (credentials.TransportCredentials
 
 // OpenSessionOptions describes fields used to create an OpenSessionRequest.
 type OpenSessionOptions struct {
-	// RequestedBackend selects the gateway worker backend (empty for default).
-	RequestedBackend string
-	// ClientSessionName is a human-readable name recorded on the session.
-	ClientSessionName string
-	// ClientCorrelationID echoes through gateway logs and replies for tracing.
+	RequestedBackend    string
+	ClientSessionName   string
 	ClientCorrelationID string
-	// CommandTimeout sets the per-command timeout the gateway forwards to the
-	// worker; zero leaves the gateway default in place.
-	CommandTimeout time.Duration
+	CommandTimeout      time.Duration
 }
 
 // Request returns the raw protobuf OpenSessionRequest for these options.

clients/go/mxgateway/errors.go

@@ -8,13 +8,10 @@ import (
 
 // GatewayError wraps transport-level gRPC failures.
 type GatewayError struct {
-	// Op names the operation that failed (for example "dial" or "invoke").
-	Op string
-	// Err is the underlying gRPC or transport error.
+	Op  string
 	Err error
 }
 
-// Error returns the formatted gateway error message.
 func (e *GatewayError) Error() string {
 	if e == nil {
 		return ""
@@ -25,7 +22,6 @@ func (e *GatewayError) Error() string {
 	return fmt.Sprintf("mxgateway: %s failed: %v", e.Op, e.Err)
 }
 
-// Unwrap returns the wrapped transport error.
 func (e *GatewayError) Unwrap() error {
 	if e == nil {
 		return nil
@@ -36,15 +32,11 @@ func (e *GatewayError) Unwrap() error {
 // CommandError reports a non-OK gateway protocol status and keeps the raw
 // command reply when one exists.
 type CommandError struct {
-	// Op names the gateway operation that produced the non-OK status.
-	Op string
-	// Status carries the gateway-reported protocol status.
+	Op     string
 	Status *ProtocolStatus
-	// Reply is the raw command reply, when one was returned alongside the status.
-	Reply *MxCommandReply
+	Reply  *MxCommandReply
 }
 
-// Error returns the formatted command error message.
 func (e *CommandError) Error() string {
 	if e == nil {
 		return ""
@@ -61,13 +53,10 @@ func (e *CommandError) Error() string {
 
 // MxAccessError reports HRESULT or MXSTATUS_PROXY failures returned by MXAccess.
 type MxAccessError struct {
-	// Command is the wrapped CommandError when the protocol status carried one.
 	Command *CommandError
-	// Reply is the raw MXAccess command reply that surfaced the failure.
-	Reply *MxCommandReply
+	Reply   *MxCommandReply
 }
 
-// Error returns the formatted MXAccess error message.
 func (e *MxAccessError) Error() string {
 	if e == nil {
 		return ""
@@ -84,7 +73,6 @@ func (e *MxAccessError) Error() string {
 	return "mxgateway: MXAccess command failed"
 }
 
-// Unwrap returns the wrapped CommandError, when one is present.
 func (e *MxAccessError) Unwrap() error {
 	if e == nil {
 		return nil

clients/go/mxgateway/galaxy.go

@@ -3,6 +3,7 @@ package mxgateway
 import (
 	"context"
 	"errors"
+	"fmt"
 	"io"
 	"time"
 
@@ -13,6 +14,8 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
+const discoverHierarchyPageSize = 5000
+
 // RawGalaxyRepositoryClient is the generated gRPC client interface for the
 // Galaxy Repository service exposed for callers that need direct contract
 // access.
@@ -20,26 +23,16 @@ type RawGalaxyRepositoryClient = pb.GalaxyRepositoryClient
 
 // Generated protobuf aliases for Galaxy Repository messages.
 type (
-	// TestConnectionRequest is the request for Galaxy Repository TestConnection.
-	TestConnectionRequest = pb.TestConnectionRequest
-	// TestConnectionReply is the reply for Galaxy Repository TestConnection.
-	TestConnectionReply = pb.TestConnectionReply
-	// GetLastDeployTimeRequest is the request for GetLastDeployTime.
-	GetLastDeployTimeRequest = pb.GetLastDeployTimeRequest
-	// GetLastDeployTimeReply is the reply for GetLastDeployTime.
-	GetLastDeployTimeReply = pb.GetLastDeployTimeReply
-	// DiscoverHierarchyRequest is the request for DiscoverHierarchy.
-	DiscoverHierarchyRequest = pb.DiscoverHierarchyRequest
-	// DiscoverHierarchyReply is the reply for DiscoverHierarchy.
-	DiscoverHierarchyReply = pb.DiscoverHierarchyReply
-	// GalaxyObject describes one Galaxy object with its dynamic attributes.
-	GalaxyObject = pb.GalaxyObject
-	// GalaxyAttribute describes one dynamic attribute on a GalaxyObject.
-	GalaxyAttribute = pb.GalaxyAttribute
-	// WatchDeployEventsRequest is the request for WatchDeployEvents.
-	WatchDeployEventsRequest = pb.WatchDeployEventsRequest
-	// DeployEvent is one Galaxy Repository deploy event.
-	DeployEvent = pb.DeployEvent
+	TestConnectionRequest     = pb.TestConnectionRequest
+	TestConnectionReply       = pb.TestConnectionReply
+	GetLastDeployTimeRequest  = pb.GetLastDeployTimeRequest
+	GetLastDeployTimeReply    = pb.GetLastDeployTimeReply
+	DiscoverHierarchyRequest  = pb.DiscoverHierarchyRequest
+	DiscoverHierarchyReply    = pb.DiscoverHierarchyReply
+	GalaxyObject              = pb.GalaxyObject
+	GalaxyAttribute           = pb.GalaxyAttribute
+	WatchDeployEventsRequest  = pb.WatchDeployEventsRequest
+	DeployEvent               = pb.DeployEvent
 )
 
 // RawDeployEventStream is the generated WatchDeployEvents client stream.
@@ -80,6 +73,10 @@ func DialGalaxy(ctx context.Context, opts Options) (*GalaxyClient, error) {
 		grpc.WithTransportCredentials(transportCredentials),
 		grpc.WithUnaryInterceptor(unaryAuthInterceptor(opts.APIKey)),
 		grpc.WithStreamInterceptor(streamAuthInterceptor(opts.APIKey)),
+		grpc.WithDefaultCallOptions(
+			grpc.MaxCallRecvMsgSize(resolveMaxGrpcMessageBytes(opts)),
+			grpc.MaxCallSendMsgSize(resolveMaxGrpcMessageBytes(opts)),
+		),
 		grpc.WithBlock(),
 	}
 	dialOptions = append(dialOptions, opts.DialOptions...)
@@ -151,11 +148,28 @@ func (c *GalaxyClient) DiscoverHierarchy(ctx context.Context) ([]*GalaxyObject,
 	callCtx, cancel := c.callContext(ctx)
 	defer cancel()
 
-	reply, err := c.raw.DiscoverHierarchy(callCtx, &pb.DiscoverHierarchyRequest{})
-	if err != nil {
-		return nil, &GatewayError{Op: "galaxy discover hierarchy", Err: err}
+	var objects []*GalaxyObject
+	seenPageTokens := make(map[string]struct{})
+	pageToken := ""
+	for {
+		reply, err := c.raw.DiscoverHierarchy(callCtx, &pb.DiscoverHierarchyRequest{
+			PageSize:  discoverHierarchyPageSize,
+			PageToken: pageToken,
+		})
+		if err != nil {
+			return nil, &GatewayError{Op: "galaxy discover hierarchy", Err: err}
+		}
+		objects = append(objects, reply.GetObjects()...)
+		pageToken = reply.GetNextPageToken()
+		if pageToken == "" {
+			break
+		}
+		if _, seen := seenPageTokens[pageToken]; seen {
+			return nil, fmt.Errorf("mxgateway: galaxy discover hierarchy returned repeated page token %q", pageToken)
+		}
+		seenPageTokens[pageToken] = struct{}{}
 	}
-	return reply.GetObjects(), nil
+	return objects, nil
 }
 
 // WatchDeployEventsRaw starts the generated WatchDeployEvents stream for callers

clients/go/mxgateway/galaxy_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"net"
+	"strings"
 	"testing"
 	"time"
 
@@ -55,8 +56,8 @@ func TestGalaxyGetLastDeployTimeReturnsTimestampWhenPresent(t *testing.T) {
 	want := time.Date(2026, 4, 28, 12, 34, 56, 0, time.UTC)
 	fake := &fakeGalaxyServer{
 		deployReply: &pb.GetLastDeployTimeReply{
-			Present:          true,
-			TimeOfLastDeploy: timestamppb.New(want),
+			Present:           true,
+			TimeOfLastDeploy:  timestamppb.New(want),
 		},
 	}
 	client, cleanup := newGalaxyBufconnClient(t, fake)
@@ -95,7 +96,9 @@ func TestGalaxyGetLastDeployTimeReturnsAbsentWhenTimestampNil(t *testing.T) {
 
 func TestGalaxyDiscoverHierarchyReturnsObjects(t *testing.T) {
 	fake := &fakeGalaxyServer{
-		discoverReply: &pb.DiscoverHierarchyReply{
+		discoverReplies: []*pb.DiscoverHierarchyReply{{
+			NextPageToken:    "page-2",
+			TotalObjectCount: 2,
 			Objects: []*pb.GalaxyObject{
 				{
 					GobjectId:     1,
@@ -114,6 +117,10 @@ func TestGalaxyDiscoverHierarchyReturnsObjects(t *testing.T) {
 						},
 					},
 				},
+			},
+		}, {
+			TotalObjectCount: 2,
+			Objects: []*pb.GalaxyObject{
 				{
 					GobjectId:       2,
 					TagName:         "TestMachine_002",
@@ -121,7 +128,7 @@ func TestGalaxyDiscoverHierarchyReturnsObjects(t *testing.T) {
 					ParentGobjectId: 1,
 				},
 			},
-		},
+		}},
 	}
 	client, cleanup := newGalaxyBufconnClient(t, fake)
 	defer cleanup()
@@ -133,6 +140,15 @@ func TestGalaxyDiscoverHierarchyReturnsObjects(t *testing.T) {
 	if len(objects) != 2 {
 		t.Fatalf("len(objects) = %d, want 2", len(objects))
 	}
+	if len(fake.discoverRequests) != 2 {
+		t.Fatalf("len(discoverRequests) = %d, want 2", len(fake.discoverRequests))
+	}
+	if fake.discoverRequests[0].GetPageSize() != 5000 || fake.discoverRequests[0].GetPageToken() != "" {
+		t.Fatalf("first request = %+v", fake.discoverRequests[0])
+	}
+	if fake.discoverRequests[1].GetPageToken() != "page-2" {
+		t.Fatalf("second page_token = %q, want page-2", fake.discoverRequests[1].GetPageToken())
+	}
 	if objects[0].GetTagName() != "TestMachine_001" {
 		t.Fatalf("objects[0].TagName = %q", objects[0].GetTagName())
 	}
@@ -144,6 +160,25 @@ func TestGalaxyDiscoverHierarchyReturnsObjects(t *testing.T) {
 	}
 }
 
+func TestGalaxyDiscoverHierarchyRejectsRepeatedPageToken(t *testing.T) {
+	fake := &fakeGalaxyServer{
+		discoverReplies: []*pb.DiscoverHierarchyReply{
+			{NextPageToken: "7:1"},
+			{NextPageToken: "7:1"},
+		},
+	}
+	client, cleanup := newGalaxyBufconnClient(t, fake)
+	defer cleanup()
+
+	_, err := client.DiscoverHierarchy(context.Background())
+	if err == nil {
+		t.Fatal("DiscoverHierarchy() error = nil, want repeated token error")
+	}
+	if !strings.Contains(err.Error(), "repeated page token") {
+		t.Fatalf("error = %v, want repeated page token", err)
+	}
+}
+
 func TestGalaxyDialReturnsGatewayErrorOnRpcFailure(t *testing.T) {
 	fake := &fakeGalaxyServer{failTest: true}
 	client, cleanup := newGalaxyBufconnClient(t, fake)
@@ -375,6 +410,8 @@ type fakeGalaxyServer struct {
 	failTest          bool
 	deployReply       *pb.GetLastDeployTimeReply
 	discoverReply     *pb.DiscoverHierarchyReply
+	discoverReplies   []*pb.DiscoverHierarchyReply
+	discoverRequests  []*pb.DiscoverHierarchyRequest
 	watchEvents       []*pb.DeployEvent
 	watchRequest      *pb.WatchDeployEventsRequest
 	watchSendInterval time.Duration
@@ -400,6 +437,12 @@ func (s *fakeGalaxyServer) GetLastDeployTime(ctx context.Context, req *pb.GetLas
 }
 
 func (s *fakeGalaxyServer) DiscoverHierarchy(ctx context.Context, req *pb.DiscoverHierarchyRequest) (*pb.DiscoverHierarchyReply, error) {
+	s.discoverRequests = append(s.discoverRequests, req)
+	if len(s.discoverReplies) > 0 {
+		reply := s.discoverReplies[0]
+		s.discoverReplies = s.discoverReplies[1:]
+		return reply, nil
+	}
 	if s.discoverReply != nil {
 		return s.discoverReply, nil
 	}

clients/go/mxgateway/options.go

@@ -11,29 +11,17 @@ import (
 
 // Options configures gateway connections.
 type Options struct {
-	// Endpoint is the gateway host:port address to dial.
-	Endpoint string
-	// APIKey is the bearer token attached to outgoing gRPC metadata.
-	APIKey string
-	// Plaintext disables TLS and uses insecure credentials when true.
-	Plaintext bool
-	// CACertFile points to a PEM file used to verify the gateway certificate.
-	CACertFile string
-	// ServerNameOverride overrides the TLS SNI/SAN name presented to the gateway.
-	ServerNameOverride string
-	// DialTimeout bounds the blocking Dial; zero applies a built-in default.
-	DialTimeout time.Duration
-	// CallTimeout bounds each unary RPC; zero applies a built-in default and
-	// negative disables the bound entirely.
-	CallTimeout time.Duration
-	// TLSConfig supplies a custom TLS configuration; takes precedence over
-	// CACertFile when TransportCredentials is unset.
-	TLSConfig *tls.Config
-	// TransportCredentials, when non-nil, overrides every other transport-level
-	// option and is used as-is.
+	Endpoint             string
+	APIKey               string
+	Plaintext            bool
+	CACertFile           string
+	ServerNameOverride   string
+	DialTimeout          time.Duration
+	CallTimeout          time.Duration
+	MaxGrpcMessageBytes  int
+	TLSConfig            *tls.Config
 	TransportCredentials credentials.TransportCredentials
-	// DialOptions are appended to the gRPC dial options after the defaults.
-	DialOptions []grpc.DialOption
+	DialOptions          []grpc.DialOption
 }
 
 // RedactedAPIKey returns a display-safe representation of the configured API

clients/go/mxgateway/session.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"io"
 	"sync"
-	"time"
 
 	pb "gitea.dohertylan.com/dohertj2/mxaccessgw/clients/go/internal/generated"
 	"google.golang.org/grpc/codes"
@@ -19,10 +18,8 @@ const maxBulkItems = 1000
 
 // EventResult carries either the next ordered event or a terminal stream error.
 type EventResult struct {
-	// Event is the next event from the stream when Err is nil.
 	Event *MxEvent
-	// Err is the terminal stream error; when non-nil no further results follow.
-	Err error
+	Err   error
 }
 
 // EventSubscription owns a running gateway event stream.
@@ -388,142 +385,6 @@ func (s *Session) UnsubscribeBulk(ctx context.Context, serverHandle int32, itemH
 	return reply.GetUnsubscribeBulk().GetResults(), nil
 }
 
-// WriteBulk invokes MXAccess Write sequentially for each entry inside one gateway command.
-// Per-entry failures appear as BulkWriteResult entries with WasSuccessful=false; the call
-// never returns an error for per-entry MXAccess failures (it returns an error only for
-// protocol-level failures or transport errors).
-func (s *Session) WriteBulk(ctx context.Context, serverHandle int32, entries []*WriteBulkEntry) ([]*BulkWriteResult, error) {
-	if entries == nil {
-		return nil, errors.New("mxgateway: write bulk entries are required")
-	}
-	if err := ensureBulkSize("write bulk entries", len(entries)); err != nil {
-		return nil, err
-	}
-	reply, err := s.invokeCommand(ctx, &pb.MxCommand{
-		Kind: pb.MxCommandKind_MX_COMMAND_KIND_WRITE_BULK,
-		Payload: &pb.MxCommand_WriteBulk{
-			WriteBulk: &pb.WriteBulkCommand{
-				ServerHandle: serverHandle,
-				Entries:      entries,
-			},
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-	return reply.GetWriteBulk().GetResults(), nil
-}
-
-// Write2Bulk invokes MXAccess Write2 (timestamped) for each entry inside one gateway command.
-func (s *Session) Write2Bulk(ctx context.Context, serverHandle int32, entries []*Write2BulkEntry) ([]*BulkWriteResult, error) {
-	if entries == nil {
-		return nil, errors.New("mxgateway: write2 bulk entries are required")
-	}
-	if err := ensureBulkSize("write2 bulk entries", len(entries)); err != nil {
-		return nil, err
-	}
-	reply, err := s.invokeCommand(ctx, &pb.MxCommand{
-		Kind: pb.MxCommandKind_MX_COMMAND_KIND_WRITE2_BULK,
-		Payload: &pb.MxCommand_Write2Bulk{
-			Write2Bulk: &pb.Write2BulkCommand{
-				ServerHandle: serverHandle,
-				Entries:      entries,
-			},
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-	return reply.GetWrite2Bulk().GetResults(), nil
-}
-
-// WriteSecuredBulk invokes MXAccess WriteSecured for each entry. Credential-sensitive
-// values must not be logged by callers; mirrors the single-item WriteSecured contract.
-func (s *Session) WriteSecuredBulk(ctx context.Context, serverHandle int32, entries []*WriteSecuredBulkEntry) ([]*BulkWriteResult, error) {
-	if entries == nil {
-		return nil, errors.New("mxgateway: write-secured bulk entries are required")
-	}
-	if err := ensureBulkSize("write-secured bulk entries", len(entries)); err != nil {
-		return nil, err
-	}
-	reply, err := s.invokeCommand(ctx, &pb.MxCommand{
-		Kind: pb.MxCommandKind_MX_COMMAND_KIND_WRITE_SECURED_BULK,
-		Payload: &pb.MxCommand_WriteSecuredBulk{
-			WriteSecuredBulk: &pb.WriteSecuredBulkCommand{
-				ServerHandle: serverHandle,
-				Entries:      entries,
-			},
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-	return reply.GetWriteSecuredBulk().GetResults(), nil
-}
-
-// WriteSecured2Bulk invokes MXAccess WriteSecured2 (timestamped) for each entry.
-func (s *Session) WriteSecured2Bulk(ctx context.Context, serverHandle int32, entries []*WriteSecured2BulkEntry) ([]*BulkWriteResult, error) {
-	if entries == nil {
-		return nil, errors.New("mxgateway: write-secured2 bulk entries are required")
-	}
-	if err := ensureBulkSize("write-secured2 bulk entries", len(entries)); err != nil {
-		return nil, err
-	}
-	reply, err := s.invokeCommand(ctx, &pb.MxCommand{
-		Kind: pb.MxCommandKind_MX_COMMAND_KIND_WRITE_SECURED2_BULK,
-		Payload: &pb.MxCommand_WriteSecured2Bulk{
-			WriteSecured2Bulk: &pb.WriteSecured2BulkCommand{
-				ServerHandle: serverHandle,
-				Entries:      entries,
-			},
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-	return reply.GetWriteSecured2Bulk().GetResults(), nil
-}
-
-// ReadBulk snapshots the current value of each requested tag.
-//
-// MXAccess COM has no synchronous Read; the worker satisfies this by returning the
-// most recent cached OnDataChange value when the tag is already advised (WasCached=true),
-// or by taking a full AddItem + Advise + wait + UnAdvise + RemoveItem snapshot lifecycle
-// otherwise. timeout bounds the wait per tag in the snapshot case; pass zero to use the
-// worker default. Per-tag failures (timeout, invalid tag) appear as BulkReadResult entries
-// with WasSuccessful=false; the call never returns an error for per-tag MXAccess failures.
-func (s *Session) ReadBulk(ctx context.Context, serverHandle int32, tagAddresses []string, timeout time.Duration) ([]*BulkReadResult, error) {
-	if tagAddresses == nil {
-		return nil, errors.New("mxgateway: tag addresses are required")
-	}
-	if err := ensureBulkSize("tag addresses", len(tagAddresses)); err != nil {
-		return nil, err
-	}
-	var timeoutMs uint32
-	if timeout > 0 {
-		ms := timeout.Milliseconds()
-		if ms > int64(^uint32(0)) {
-			timeoutMs = ^uint32(0)
-		} else {
-			timeoutMs = uint32(ms)
-		}
-	}
-	reply, err := s.invokeCommand(ctx, &pb.MxCommand{
-		Kind: pb.MxCommandKind_MX_COMMAND_KIND_READ_BULK,
-		Payload: &pb.MxCommand_ReadBulk{
-			ReadBulk: &pb.ReadBulkCommand{
-				ServerHandle: serverHandle,
-				TagAddresses: tagAddresses,
-				TimeoutMs:    timeoutMs,
-			},
-		},
-	})
-	if err != nil {
-		return nil, err
-	}
-	return reply.GetReadBulk().GetResults(), nil
-}
-
 // Write invokes MXAccess Write.
 func (s *Session) Write(ctx context.Context, serverHandle, itemHandle int32, value *MxValue, userID int32) error {
 	_, err := s.WriteRaw(ctx, serverHandle, itemHandle, value, userID)

clients/go/mxgateway/types.go

@@ -12,202 +12,77 @@ type RawEventStream = pb.MxAccessGateway_StreamEventsClient
 // Generated protobuf aliases keep raw contract access available from the public
 // mxgateway package while generated code remains under internal/generated.
 type (
-	// OpenSessionRequest is the gateway OpenSession request message.
-	OpenSessionRequest = pb.OpenSessionRequest
-	// OpenSessionReply is the gateway OpenSession reply message.
-	OpenSessionReply = pb.OpenSessionReply
-	// CloseSessionRequest is the gateway CloseSession request message.
-	CloseSessionRequest = pb.CloseSessionRequest
-	// CloseSessionReply is the gateway CloseSession reply message.
-	CloseSessionReply = pb.CloseSessionReply
-	// StreamEventsRequest is the gateway StreamEvents request message.
-	StreamEventsRequest = pb.StreamEventsRequest
-	// MxCommandRequest carries one MXAccess command for Invoke.
-	MxCommandRequest = pb.MxCommandRequest
-	// MxCommandReply is the reply to an MXAccess command Invoke.
-	MxCommandReply = pb.MxCommandReply
-	// MxCommand is the discriminated union of MXAccess command payloads.
-	MxCommand = pb.MxCommand
-	// MxEvent is one ordered event delivered on a session event stream.
-	MxEvent = pb.MxEvent
-	// MxValue is the protobuf representation of an MXAccess value.
-	MxValue = pb.MxValue
-	// Value is an alias for MxValue retained for symmetry with other clients.
-	Value = pb.MxValue
-	// MxArray is the protobuf representation of an MXAccess array value.
-	MxArray = pb.MxArray
-	// MxStatusProxy mirrors the MXAccess MXSTATUS_PROXY structure.
-	MxStatusProxy = pb.MxStatusProxy
-	// ProtocolStatus is the gateway-level status carried on every reply.
-	ProtocolStatus = pb.ProtocolStatus
-	// RegisterCommand is the payload of an MXAccess Register command.
-	RegisterCommand = pb.RegisterCommand
-	// UnregisterCommand is the payload of an MXAccess Unregister command.
-	UnregisterCommand = pb.UnregisterCommand
-	// AddItemCommand is the payload of an MXAccess AddItem command.
-	AddItemCommand = pb.AddItemCommand
-	// AddItem2Command is the payload of an MXAccess AddItem2 command.
-	AddItem2Command = pb.AddItem2Command
-	// RemoveItemCommand is the payload of an MXAccess RemoveItem command.
-	RemoveItemCommand = pb.RemoveItemCommand
-	// AdviseCommand is the payload of an MXAccess Advise command.
-	AdviseCommand = pb.AdviseCommand
-	// UnAdviseCommand is the payload of an MXAccess UnAdvise command.
-	UnAdviseCommand = pb.UnAdviseCommand
-	// AddItemBulkCommand is the payload of an AddItem bulk command.
-	AddItemBulkCommand = pb.AddItemBulkCommand
-	// AdviseItemBulkCommand is the payload of an Advise bulk command.
-	AdviseItemBulkCommand = pb.AdviseItemBulkCommand
-	// RemoveItemBulkCommand is the payload of a RemoveItem bulk command.
-	RemoveItemBulkCommand = pb.RemoveItemBulkCommand
-	// UnAdviseItemBulkCommand is the payload of an UnAdvise bulk command.
+	OpenSessionRequest      = pb.OpenSessionRequest
+	OpenSessionReply        = pb.OpenSessionReply
+	CloseSessionRequest     = pb.CloseSessionRequest
+	CloseSessionReply       = pb.CloseSessionReply
+	StreamEventsRequest     = pb.StreamEventsRequest
+	MxCommandRequest        = pb.MxCommandRequest
+	MxCommandReply          = pb.MxCommandReply
+	MxCommand               = pb.MxCommand
+	MxEvent                 = pb.MxEvent
+	MxValue                 = pb.MxValue
+	Value                   = pb.MxValue
+	MxArray                 = pb.MxArray
+	MxStatusProxy           = pb.MxStatusProxy
+	ProtocolStatus          = pb.ProtocolStatus
+	RegisterCommand         = pb.RegisterCommand
+	UnregisterCommand       = pb.UnregisterCommand
+	AddItemCommand          = pb.AddItemCommand
+	AddItem2Command         = pb.AddItem2Command
+	RemoveItemCommand       = pb.RemoveItemCommand
+	AdviseCommand           = pb.AdviseCommand
+	UnAdviseCommand         = pb.UnAdviseCommand
+	AddItemBulkCommand      = pb.AddItemBulkCommand
+	AdviseItemBulkCommand   = pb.AdviseItemBulkCommand
+	RemoveItemBulkCommand   = pb.RemoveItemBulkCommand
 	UnAdviseItemBulkCommand = pb.UnAdviseItemBulkCommand
-	// SubscribeBulkCommand combines AddItem and Advise for a list of tags.
-	SubscribeBulkCommand = pb.SubscribeBulkCommand
-	// UnsubscribeBulkCommand combines UnAdvise and RemoveItem for a list of items.
-	UnsubscribeBulkCommand = pb.UnsubscribeBulkCommand
-	// WriteCommand is the payload of an MXAccess Write command.
-	WriteCommand = pb.WriteCommand
-	// Write2Command is the payload of an MXAccess Write2 command.
-	Write2Command = pb.Write2Command
-	// WriteBulkCommand is the payload of a bulk Write command.
-	WriteBulkCommand = pb.WriteBulkCommand
-	// WriteBulkEntry is one entry inside a WriteBulkCommand.
-	WriteBulkEntry = pb.WriteBulkEntry
-	// Write2BulkCommand is the payload of a bulk Write2 (timestamped) command.
-	Write2BulkCommand = pb.Write2BulkCommand
-	// Write2BulkEntry is one entry inside a Write2BulkCommand.
-	Write2BulkEntry = pb.Write2BulkEntry
-	// WriteSecuredBulkCommand is the payload of a bulk WriteSecured command.
-	WriteSecuredBulkCommand = pb.WriteSecuredBulkCommand
-	// WriteSecuredBulkEntry is one entry inside a WriteSecuredBulkCommand.
-	WriteSecuredBulkEntry = pb.WriteSecuredBulkEntry
-	// WriteSecured2BulkCommand is the payload of a bulk WriteSecured2 (timestamped) command.
-	WriteSecured2BulkCommand = pb.WriteSecured2BulkCommand
-	// WriteSecured2BulkEntry is one entry inside a WriteSecured2BulkCommand.
-	WriteSecured2BulkEntry = pb.WriteSecured2BulkEntry
-	// ReadBulkCommand is the payload of a bulk Read snapshot command.
-	ReadBulkCommand = pb.ReadBulkCommand
-	// BulkWriteReply aggregates BulkWriteResult entries for a bulk write command.
-	BulkWriteReply = pb.BulkWriteReply
-	// BulkWriteResult is one entry in a bulk write reply list.
-	BulkWriteResult = pb.BulkWriteResult
-	// BulkReadReply aggregates BulkReadResult entries for a bulk read command.
-	BulkReadReply = pb.BulkReadReply
-	// BulkReadResult is one entry in a bulk read reply list.
-	BulkReadResult = pb.BulkReadResult
-	// RegisterReply carries the ServerHandle returned by Register.
-	RegisterReply = pb.RegisterReply
-	// AddItemReply carries the ItemHandle returned by AddItem.
-	AddItemReply = pb.AddItemReply
-	// AddItem2Reply carries the ItemHandle returned by AddItem2.
-	AddItem2Reply = pb.AddItem2Reply
-	// SubscribeResult is one entry in a bulk command result list.
-	SubscribeResult = pb.SubscribeResult
-	// BulkSubscribeReply aggregates SubscribeResult entries for a bulk command.
-	BulkSubscribeReply = pb.BulkSubscribeReply
-	// AcknowledgeAlarmRequest is the gateway AcknowledgeAlarm request message.
-	AcknowledgeAlarmRequest = pb.AcknowledgeAlarmRequest
-	// AcknowledgeAlarmReply is the gateway AcknowledgeAlarm reply message.
-	AcknowledgeAlarmReply = pb.AcknowledgeAlarmReply
-	// QueryActiveAlarmsRequest is the gateway QueryActiveAlarms request message.
-	QueryActiveAlarmsRequest = pb.QueryActiveAlarmsRequest
-	// StreamAlarmsRequest is the gateway StreamAlarms request message.
-	StreamAlarmsRequest = pb.StreamAlarmsRequest
-	// AlarmFeedMessage is one message on the StreamAlarms feed — an
-	// active-alarm snapshot row, a snapshot-complete sentinel, or a transition.
-	AlarmFeedMessage = pb.AlarmFeedMessage
-	// ActiveAlarmSnapshot is one row in a ConditionRefresh stream.
-	ActiveAlarmSnapshot = pb.ActiveAlarmSnapshot
-	// OnAlarmTransitionEvent is the body carried by alarm-transition MxEvents.
-	OnAlarmTransitionEvent = pb.OnAlarmTransitionEvent
+	SubscribeBulkCommand    = pb.SubscribeBulkCommand
+	UnsubscribeBulkCommand  = pb.UnsubscribeBulkCommand
+	WriteCommand            = pb.WriteCommand
+	Write2Command           = pb.Write2Command
+	RegisterReply           = pb.RegisterReply
+	AddItemReply            = pb.AddItemReply
+	AddItem2Reply           = pb.AddItem2Reply
+	SubscribeResult         = pb.SubscribeResult
+	BulkSubscribeReply      = pb.BulkSubscribeReply
 )
 
-// AlarmTransitionKind discriminates raise / acknowledge / clear / retrigger
-// transitions on an OnAlarmTransitionEvent.
-type AlarmTransitionKind = pb.AlarmTransitionKind
-
-// AlarmConditionState reports the current state of an active alarm in a
-// ConditionRefresh snapshot.
-type AlarmConditionState = pb.AlarmConditionState
-
-// QueryActiveAlarmsClient is the generated server-streaming client for the
-// QueryActiveAlarms RPC.
-type QueryActiveAlarmsClient = pb.MxAccessGateway_QueryActiveAlarmsClient
-
-// StreamAlarmsClient is the generated server-streaming client for the
-// StreamAlarms RPC.
-type StreamAlarmsClient = pb.MxAccessGateway_StreamAlarmsClient
-
-// Enumerations from the generated contract re-exported for client callers.
 type (
-	// MxCommandKind discriminates which MXAccess command an MxCommand carries.
-	MxCommandKind = pb.MxCommandKind
-	// MxDataType is the MXAccess data type tag on values and arrays.
-	MxDataType = pb.MxDataType
-	// MxEventFamily groups MXAccess events by source category.
-	MxEventFamily = pb.MxEventFamily
-	// MxStatusCategory classifies MXSTATUS_PROXY entries.
-	MxStatusCategory = pb.MxStatusCategory
-	// MxStatusSource identifies the originator of a status entry.
-	MxStatusSource = pb.MxStatusSource
-	// ProtocolStatusCode enumerates gateway-level status codes.
+	MxCommandKind      = pb.MxCommandKind
+	MxDataType         = pb.MxDataType
+	MxEventFamily      = pb.MxEventFamily
+	MxStatusCategory   = pb.MxStatusCategory
+	MxStatusSource     = pb.MxStatusSource
 	ProtocolStatusCode = pb.ProtocolStatusCode
-	// SessionState enumerates gateway session lifecycle states.
-	SessionState = pb.SessionState
+	SessionState       = pb.SessionState
 )
 
-// MXAccess command kind, data type, and protocol status constants surfaced
-// from the generated contract.
 const (
-	// CommandKindRegister selects the MXAccess Register command.
-	CommandKindRegister = pb.MxCommandKind_MX_COMMAND_KIND_REGISTER
-	// CommandKindUnregister selects the MXAccess Unregister command.
-	CommandKindUnregister = pb.MxCommandKind_MX_COMMAND_KIND_UNREGISTER
-	// CommandKindAddItem selects the MXAccess AddItem command.
-	CommandKindAddItem = pb.MxCommandKind_MX_COMMAND_KIND_ADD_ITEM
-	// CommandKindAddItem2 selects the MXAccess AddItem2 command.
-	CommandKindAddItem2 = pb.MxCommandKind_MX_COMMAND_KIND_ADD_ITEM2
-	// CommandKindRemoveItem selects the MXAccess RemoveItem command.
-	CommandKindRemoveItem = pb.MxCommandKind_MX_COMMAND_KIND_REMOVE_ITEM
-	// CommandKindAdvise selects the MXAccess Advise command.
-	CommandKindAdvise = pb.MxCommandKind_MX_COMMAND_KIND_ADVISE
-	// CommandKindUnAdvise selects the MXAccess UnAdvise command.
-	CommandKindUnAdvise = pb.MxCommandKind_MX_COMMAND_KIND_UN_ADVISE
-	// CommandKindAddItemBulk selects the AddItem bulk command.
-	CommandKindAddItemBulk = pb.MxCommandKind_MX_COMMAND_KIND_ADD_ITEM_BULK
-	// CommandKindAdviseItemBulk selects the Advise bulk command.
-	CommandKindAdviseItemBulk = pb.MxCommandKind_MX_COMMAND_KIND_ADVISE_ITEM_BULK
-	// CommandKindRemoveItemBulk selects the RemoveItem bulk command.
-	CommandKindRemoveItemBulk = pb.MxCommandKind_MX_COMMAND_KIND_REMOVE_ITEM_BULK
-	// CommandKindUnAdviseItemBulk selects the UnAdvise bulk command.
+	CommandKindRegister         = pb.MxCommandKind_MX_COMMAND_KIND_REGISTER
+	CommandKindUnregister       = pb.MxCommandKind_MX_COMMAND_KIND_UNREGISTER
+	CommandKindAddItem          = pb.MxCommandKind_MX_COMMAND_KIND_ADD_ITEM
+	CommandKindAddItem2         = pb.MxCommandKind_MX_COMMAND_KIND_ADD_ITEM2
+	CommandKindRemoveItem       = pb.MxCommandKind_MX_COMMAND_KIND_REMOVE_ITEM
+	CommandKindAdvise           = pb.MxCommandKind_MX_COMMAND_KIND_ADVISE
+	CommandKindUnAdvise         = pb.MxCommandKind_MX_COMMAND_KIND_UN_ADVISE
+	CommandKindAddItemBulk      = pb.MxCommandKind_MX_COMMAND_KIND_ADD_ITEM_BULK
+	CommandKindAdviseItemBulk   = pb.MxCommandKind_MX_COMMAND_KIND_ADVISE_ITEM_BULK
+	CommandKindRemoveItemBulk   = pb.MxCommandKind_MX_COMMAND_KIND_REMOVE_ITEM_BULK
 	CommandKindUnAdviseItemBulk = pb.MxCommandKind_MX_COMMAND_KIND_UN_ADVISE_ITEM_BULK
-	// CommandKindSubscribeBulk selects the AddItem+Advise combined bulk command.
-	CommandKindSubscribeBulk = pb.MxCommandKind_MX_COMMAND_KIND_SUBSCRIBE_BULK
-	// CommandKindUnsubscribeBulk selects the UnAdvise+RemoveItem combined bulk command.
-	CommandKindUnsubscribeBulk = pb.MxCommandKind_MX_COMMAND_KIND_UNSUBSCRIBE_BULK
-	// CommandKindWrite selects the MXAccess Write command.
-	CommandKindWrite = pb.MxCommandKind_MX_COMMAND_KIND_WRITE
-	// CommandKindWrite2 selects the MXAccess Write2 command.
-	CommandKindWrite2 = pb.MxCommandKind_MX_COMMAND_KIND_WRITE2
+	CommandKindSubscribeBulk    = pb.MxCommandKind_MX_COMMAND_KIND_SUBSCRIBE_BULK
+	CommandKindUnsubscribeBulk  = pb.MxCommandKind_MX_COMMAND_KIND_UNSUBSCRIBE_BULK
+	CommandKindWrite            = pb.MxCommandKind_MX_COMMAND_KIND_WRITE
+	CommandKindWrite2           = pb.MxCommandKind_MX_COMMAND_KIND_WRITE2
 
-	// DataTypeUnknown denotes an unrecognized MXAccess data type.
 	DataTypeUnknown = pb.MxDataType_MX_DATA_TYPE_UNKNOWN
-	// DataTypeBoolean denotes an MXAccess Boolean value.
 	DataTypeBoolean = pb.MxDataType_MX_DATA_TYPE_BOOLEAN
-	// DataTypeInteger denotes an MXAccess Integer value.
 	DataTypeInteger = pb.MxDataType_MX_DATA_TYPE_INTEGER
-	// DataTypeFloat denotes an MXAccess Float (single precision) value.
-	DataTypeFloat = pb.MxDataType_MX_DATA_TYPE_FLOAT
-	// DataTypeDouble denotes an MXAccess Double (double precision) value.
-	DataTypeDouble = pb.MxDataType_MX_DATA_TYPE_DOUBLE
-	// DataTypeString denotes an MXAccess String value.
-	DataTypeString = pb.MxDataType_MX_DATA_TYPE_STRING
-	// DataTypeTime denotes an MXAccess timestamp value.
-	DataTypeTime = pb.MxDataType_MX_DATA_TYPE_TIME
+	DataTypeFloat   = pb.MxDataType_MX_DATA_TYPE_FLOAT
+	DataTypeDouble  = pb.MxDataType_MX_DATA_TYPE_DOUBLE
+	DataTypeString  = pb.MxDataType_MX_DATA_TYPE_STRING
+	DataTypeTime    = pb.MxDataType_MX_DATA_TYPE_TIME
 
-	// ProtocolStatusOK indicates the gateway processed the request successfully.
-	ProtocolStatusOK = pb.ProtocolStatusCode_PROTOCOL_STATUS_CODE_OK
-	// ProtocolStatusMxAccessFailure indicates the worker reported an MXAccess failure.
+	ProtocolStatusOK              = pb.ProtocolStatusCode_PROTOCOL_STATUS_CODE_OK
 	ProtocolStatusMxAccessFailure = pb.ProtocolStatusCode_PROTOCOL_STATUS_CODE_MXACCESS_FAILURE
 )

clients/go/mxgateway/version.go

@@ -7,7 +7,7 @@ const (
 
 	// GatewayProtocolVersion matches GatewayContractInfo.GatewayProtocolVersion
 	// in the shared .NET contracts.
-	GatewayProtocolVersion uint32 = 3
+	GatewayProtocolVersion uint32 = 2
 
 	// WorkerProtocolVersion matches GatewayContractInfo.WorkerProtocolVersion
 	// and is exposed for fake-worker and parity tests.

clients/java/README.md

@@ -10,23 +10,22 @@ clients/java/
   settings.gradle
   build.gradle
   src/main/generated/
-  zb-mom-ww-mxgateway-client/
-  zb-mom-ww-mxgateway-cli/
+  mxgateway-client/
+  mxgateway-cli/
 ```
 
-`zb-mom-ww-mxgateway-client` generates Java protobuf and gRPC sources from
-`../../src/ZB.MOM.WW.MxGateway.Contracts/Protos`. The Gradle protobuf plugin writes those
+`mxgateway-client` generates Java protobuf and gRPC sources from
+`../../src/MxGateway.Contracts/Protos`. The Gradle protobuf plugin writes those
 generated sources under `src/main/generated`, which matches the client proto
 manifest in `../proto/proto-inputs.json`. Do not edit generated files by hand.
 
-`zb-mom-ww-mxgateway-client` exposes `MxGatewayClientOptions`, `MxGatewayClient`,
+`mxgateway-client` exposes `MxGatewayClientOptions`, `MxGatewayClient`,
 `MxGatewaySession`, value/status helpers, typed gateway exceptions, raw
 generated stubs, and generated protobuf messages for parity tests.
 
-`zb-mom-ww-mxgateway-cli` depends on `zb-mom-ww-mxgateway-client` and provides
-the `mxgw-java` application entry point. The CLI supports version, session,
-command, event streaming, write, and smoke-test commands with deterministic
-JSON output.
+`mxgateway-cli` depends on `mxgateway-client` and provides the `mxgw-java`
+application entry point. The CLI supports version, session, command, event
+streaming, write, and smoke-test commands with deterministic JSON output.
 
 ## Regenerating Protobuf Bindings
 
@@ -34,7 +33,7 @@ Run generation from `clients/java` after the shared `.proto` files or Java
 output path changes:
 
 ```powershell
-gradle :zb-mom-ww-mxgateway-client:generateProto
+gradle :mxgateway-client:generateProto
 ```
 
 ## Client Usage
@@ -68,12 +67,6 @@ cancels the underlying gRPC stream. Canceling or timing out a Java client call
 only stops the client from waiting; it does not abort an in-flight MXAccess COM
 call on the worker STA.
 
-For alarms, `MxGatewayClient` exposes `queryActiveAlarms` (one-shot snapshot),
-`streamAlarms` (returns an `MxGatewayAlarmFeedSubscription` whose iterator
-yields alarm-feed messages from the gateway's central monitor), and
-`acknowledgeAlarm` (ack by full alarm reference with an optional comment and
-ack target). Close the subscription to cancel the underlying gRPC stream.
-
 ## Galaxy Repository Browse
 
 The Galaxy Repository service is a separate metadata-only gRPC service exposed
@@ -111,9 +104,9 @@ The CLI exposes matching subcommands: `galaxy-test`, `galaxy-deploy-time`,
 `--timeout`, and `--json` options as the gateway commands.
 
 ```powershell
-gradle :zb-mom-ww-mxgateway-cli:run --args="galaxy-test --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --json"
-gradle :zb-mom-ww-mxgateway-cli:run --args="galaxy-deploy-time --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --json"
-gradle :zb-mom-ww-mxgateway-cli:run --args="galaxy-discover --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --json"
+gradle :mxgateway-cli:run --args="galaxy-test --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --json"
+gradle :mxgateway-cli:run --args="galaxy-deploy-time --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --json"
+gradle :mxgateway-cli:run --args="galaxy-discover --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --json"
 ```
 
 ### Watching deploy events
@@ -163,8 +156,8 @@ The matching CLI subcommand streams events until cancelled (Ctrl+C) and prints
 one line per event in text mode or one JSON object per event with `--json`:
 
 ```powershell
-gradle :zb-mom-ww-mxgateway-cli:run --args="galaxy-watch --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --json"
-gradle :zb-mom-ww-mxgateway-cli:run --args="galaxy-watch --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --last-seen-deploy-time 2026-04-28T18:30:00Z --limit 5"
+gradle :mxgateway-cli:run --args="galaxy-watch --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --json"
+gradle :mxgateway-cli:run --args="galaxy-watch --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --last-seen-deploy-time 2026-04-28T18:30:00Z --limit 5"
 ```
 
 ## CLI Usage
@@ -172,16 +165,14 @@ gradle :zb-mom-ww-mxgateway-cli:run --args="galaxy-watch --endpoint localhost:50
 Run the CLI through Gradle:
 
 ```powershell
-gradle :zb-mom-ww-mxgateway-cli:run --args="version --json"
-gradle :zb-mom-ww-mxgateway-cli:run --args="open-session --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --client-session-name java-cli --json"
-gradle :zb-mom-ww-mxgateway-cli:run --args="register --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --session-id <id> --client-name java-cli --json"
-gradle :zb-mom-ww-mxgateway-cli:run --args="add-item --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --session-id <id> --server-handle 1 --item TestObject.TestInt --json"
-gradle :zb-mom-ww-mxgateway-cli:run --args="advise --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --session-id <id> --server-handle 1 --item-handle 1 --json"
-gradle :zb-mom-ww-mxgateway-cli:run --args="write --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --session-id <id> --server-handle 1 --item-handle 1 --type int32 --value 123 --json"
-gradle :zb-mom-ww-mxgateway-cli:run --args="stream-events --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --session-id <id> --limit 1 --json"
-gradle :zb-mom-ww-mxgateway-cli:run --args="stream-alarms --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --session-id <id> --limit 1 --json"
-gradle :zb-mom-ww-mxgateway-cli:run --args="acknowledge-alarm --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --session-id <id> --alarm-reference \"\\Galaxy\Area001.Pump001.PumpFault\" --json"
-gradle :zb-mom-ww-mxgateway-cli:run --args="smoke --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --item TestObject.TestInt --json"
+gradle :mxgateway-cli:run --args="version --json"
+gradle :mxgateway-cli:run --args="open-session --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --client-session-name java-cli --json"
+gradle :mxgateway-cli:run --args="register --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --session-id <id> --client-name java-cli --json"
+gradle :mxgateway-cli:run --args="add-item --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --session-id <id> --server-handle 1 --item TestObject.TestInt --json"
+gradle :mxgateway-cli:run --args="advise --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --session-id <id> --server-handle 1 --item-handle 1 --json"
+gradle :mxgateway-cli:run --args="write --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --session-id <id> --server-handle 1 --item-handle 1 --type int32 --value 123 --json"
+gradle :mxgateway-cli:run --args="stream-events --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --session-id <id> --limit 1 --json"
+gradle :mxgateway-cli:run --args="smoke --endpoint localhost:5000 --api-key-env MXGATEWAY_API_KEY --plaintext --item TestObject.TestInt --json"
 ```
 
 The CLI accepts `--api-key`, `--api-key-env`, `--plaintext`, `--ca-file`,
@@ -191,7 +182,7 @@ output redacts API keys.
 Use TLS options for a secured gateway:
 
 ```powershell
-gradle :zb-mom-ww-mxgateway-cli:run --args="smoke --endpoint mxgateway.example.local:5001 --ca-file C:\certs\mxgateway-ca.pem --server-name-override mxgateway.example.local --api-key-env MXGATEWAY_API_KEY --item TestObject.TestInt --json"
+gradle :mxgateway-cli:run --args="smoke --endpoint mxgateway.example.local:5001 --ca-file C:\certs\mxgateway-ca.pem --server-name-override mxgateway.example.local --api-key-env MXGATEWAY_API_KEY --item TestObject.TestInt --json"
 ```
 
 ## Build And Test
@@ -211,11 +202,11 @@ in-process gRPC behavior, stream cancellation, and CLI parser/output behavior.
 Create local library and CLI artifacts from `clients/java`:
 
 ```powershell
-gradle :zb-mom-ww-mxgateway-client:jar :zb-mom-ww-mxgateway-cli:installDist
+gradle :mxgateway-client:jar :mxgateway-cli:installDist
 ```
 
-The library jar is under `zb-mom-ww-mxgateway-client/build/libs`. The installed CLI
-distribution is under `zb-mom-ww-mxgateway-cli/build/install/zb-mom-ww-mxgateway-cli`.
+The library jar is under `mxgateway-client/build/libs`. The installed CLI
+distribution is under `mxgateway-cli/build/install/mxgateway-cli`.
 
 ## Integration Checks
 
@@ -226,12 +217,12 @@ $env:MXGATEWAY_INTEGRATION = '1'
 $env:MXGATEWAY_ENDPOINT = 'localhost:5000'
 $env:MXGATEWAY_API_KEY = '<gateway-api-key>'
 $env:MXGATEWAY_TEST_ITEM = 'TestObject.TestInt'
-gradle :zb-mom-ww-mxgateway-cli:run --args="smoke --endpoint $env:MXGATEWAY_ENDPOINT --plaintext --api-key-env MXGATEWAY_API_KEY --item $env:MXGATEWAY_TEST_ITEM --json"
+gradle :mxgateway-cli:run --args="smoke --endpoint $env:MXGATEWAY_ENDPOINT --plaintext --api-key-env MXGATEWAY_API_KEY --item $env:MXGATEWAY_TEST_ITEM --json"
 ```
 
 ## Related Documentation
 
 - [Client Packaging](../../docs/ClientPackaging.md)
-- [Client Proto Generation](../../docs/ClientProtoGeneration.md)
-- [Java Client Detailed Design](./JavaClientDesign.md)
+- [Client Proto Generation](../../docs/client-proto-generation.md)
+- [Java Client Detailed Design](../../docs/clients-java-design.md)
 - [Java Style Guide](../../docs/style-guides/JavaStyleGuide.md)

clients/java/build.gradle

@@ -12,7 +12,7 @@ ext {
 }
 
 subprojects {
-    group = 'com.zb.mom.ww.mxgateway'
+    group = 'com.dohertylan.mxgateway'
     version = '0.1.0'
 
     pluginManager.withPlugin('java') {

clients/java/mxgateway-cli/build.gradle

@@ -3,11 +3,11 @@ plugins {
 }
 
 dependencies {
-    implementation project(':zb-mom-ww-mxgateway-client')
+    implementation project(':mxgateway-client')
     implementation "com.google.protobuf:protobuf-java-util:${protobufVersion}"
     implementation "info.picocli:picocli:${picocliVersion}"
 }
 
 application {
-    mainClass = 'com.zb.mom.ww.mxgateway.cli.MxGatewayCli'
+    mainClass = 'com.dohertylan.mxgateway.cli.MxGatewayCli'
 }

clients/java/mxgateway-cli/src/main/java/com/dohertylan/mxgateway/cli/MxGatewayCli.java

@@ -1,26 +1,20 @@
-package com.zb.mom.ww.mxgateway.cli;
+package com.dohertylan.mxgateway.cli;
 
-import com.zb.mom.ww.mxgateway.client.DeployEventStream;
-import com.zb.mom.ww.mxgateway.client.GalaxyRepositoryClient;
-import com.zb.mom.ww.mxgateway.client.MxEventStream;
-import com.zb.mom.ww.mxgateway.client.MxGatewayAlarmFeedSubscription;
-import com.zb.mom.ww.mxgateway.client.MxGatewayClient;
-import com.zb.mom.ww.mxgateway.client.MxGatewayClientOptions;
-import com.zb.mom.ww.mxgateway.client.MxGatewayClientVersion;
-import com.zb.mom.ww.mxgateway.client.MxGatewaySecrets;
-import com.zb.mom.ww.mxgateway.client.MxGatewaySession;
-import com.zb.mom.ww.mxgateway.client.MxValues;
+import com.dohertylan.mxgateway.client.DeployEventStream;
+import com.dohertylan.mxgateway.client.GalaxyRepositoryClient;
+import com.dohertylan.mxgateway.client.MxEventStream;
+import com.dohertylan.mxgateway.client.MxGatewayClient;
+import com.dohertylan.mxgateway.client.MxGatewayClientOptions;
+import com.dohertylan.mxgateway.client.MxGatewayClientVersion;
+import com.dohertylan.mxgateway.client.MxGatewaySecrets;
+import com.dohertylan.mxgateway.client.MxGatewaySession;
+import com.dohertylan.mxgateway.client.MxValues;
 import galaxy_repository.v1.GalaxyRepositoryOuterClass.DeployEvent;
 import galaxy_repository.v1.GalaxyRepositoryOuterClass.GalaxyAttribute;
 import galaxy_repository.v1.GalaxyRepositoryOuterClass.GalaxyObject;
 import com.google.protobuf.Message;
 import com.google.protobuf.util.JsonFormat;
-import io.grpc.stub.StreamObserver;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.time.Duration;
 import java.time.Instant;
@@ -30,27 +24,13 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Callable;
-import mxaccess_gateway.v1.MxaccessGateway.AcknowledgeAlarmReply;
-import mxaccess_gateway.v1.MxaccessGateway.AcknowledgeAlarmRequest;
-import mxaccess_gateway.v1.MxaccessGateway.ActiveAlarmSnapshot;
-import mxaccess_gateway.v1.MxaccessGateway.AlarmFeedMessage;
-import mxaccess_gateway.v1.MxaccessGateway.BulkReadResult;
-import mxaccess_gateway.v1.MxaccessGateway.BulkWriteResult;
 import mxaccess_gateway.v1.MxaccessGateway.CloseSessionRequest;
 import mxaccess_gateway.v1.MxaccessGateway.MxCommandReply;
 import mxaccess_gateway.v1.MxaccessGateway.MxEvent;
 import mxaccess_gateway.v1.MxaccessGateway.MxValue;
-import mxaccess_gateway.v1.MxaccessGateway.OnAlarmTransitionEvent;
 import mxaccess_gateway.v1.MxaccessGateway.OpenSessionRequest;
-import mxaccess_gateway.v1.MxaccessGateway.StreamAlarmsRequest;
 import mxaccess_gateway.v1.MxaccessGateway.SubscribeResult;
-import mxaccess_gateway.v1.MxaccessGateway.Write2BulkEntry;
-import mxaccess_gateway.v1.MxaccessGateway.WriteBulkEntry;
-import mxaccess_gateway.v1.MxaccessGateway.WriteSecured2BulkEntry;
-import mxaccess_gateway.v1.MxaccessGateway.WriteSecuredBulkEntry;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
@@ -58,10 +38,6 @@ import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Spec;
 
-/**
- * Picocli entry point for the {@code mxgw-java} test CLI used by the
- * cross-language smoke matrix.
- */
 @Command(
         name = "mxgw-java",
         mixinStandardHelpOptions = true,
@@ -72,9 +48,6 @@ public final class MxGatewayCli implements Callable<Integer> {
     @Spec
     private CommandSpec spec;
 
-    /**
-     * Builds a CLI bound to the default gRPC client factory.
-     */
     public MxGatewayCli() {
         this(new GrpcMxGatewayCliClientFactory());
     }
@@ -83,25 +56,11 @@ public final class MxGatewayCli implements Callable<Integer> {
         this.clientFactory = clientFactory;
     }
 
-    /**
-     * Process entry point.
-     *
-     * @param args command-line arguments
-     */
     public static void main(String[] args) {
         int exitCode = commandLine(new GrpcMxGatewayCliClientFactory()).execute(args);
         System.exit(exitCode);
     }
 
-    /**
-     * Test-friendly entry point that runs the CLI against the supplied
-     * {@link PrintWriter} pair instead of the system streams.
-     *
-     * @param out writer that receives standard output
-     * @param err writer that receives standard error
-     * @param args command-line arguments
-     * @return the picocli exit code
-     */
     public static int execute(PrintWriter out, PrintWriter err, String... args) {
         return execute(new GrpcMxGatewayCliClientFactory(), out, err, args);
     }
@@ -129,108 +88,16 @@ public final class MxGatewayCli implements Callable<Integer> {
         commandLine.addSubcommand("advise", new AdviseCommand(clientFactory));
         commandLine.addSubcommand("subscribe-bulk", new SubscribeBulkCommand(clientFactory));
         commandLine.addSubcommand("unsubscribe-bulk", new UnsubscribeBulkCommand(clientFactory));
-        commandLine.addSubcommand("read-bulk", new ReadBulkCommand(clientFactory));
-        commandLine.addSubcommand("write-bulk", new WriteBulkCommand(clientFactory));
-        commandLine.addSubcommand("write2-bulk", new Write2BulkCommand(clientFactory));
-        commandLine.addSubcommand("write-secured-bulk", new WriteSecuredBulkCommand(clientFactory));
-        commandLine.addSubcommand("write-secured2-bulk", new WriteSecured2BulkCommand(clientFactory));
-        commandLine.addSubcommand("bench-read-bulk", new BenchReadBulkCommand(clientFactory));
         commandLine.addSubcommand("write", new WriteCommand(clientFactory));
         commandLine.addSubcommand("stream-events", new StreamEventsCommand(clientFactory));
-        commandLine.addSubcommand("stream-alarms", new StreamAlarmsCommand(clientFactory));
-        commandLine.addSubcommand("acknowledge-alarm", new AcknowledgeAlarmCommand(clientFactory));
         commandLine.addSubcommand("smoke", new SmokeCommand(clientFactory));
         commandLine.addSubcommand("galaxy-test", new GalaxyTestConnectionCommand());
         commandLine.addSubcommand("galaxy-deploy-time", new GalaxyDeployTimeCommand());
         commandLine.addSubcommand("galaxy-discover", new GalaxyDiscoverCommand());
         commandLine.addSubcommand("galaxy-watch", new GalaxyWatchCommand());
-        commandLine.addSubcommand("batch", new BatchCommand(clientFactory));
         return commandLine;
     }
 
-    /** Sentinel written to stdout after every command result in batch mode. */
-    static final String BATCH_EOR = "__MXGW_BATCH_EOR__";
-
-    /** Sentinel queued by {@code stream-alarms} to mark a clean end of the alarm feed. */
-    private static final Object ALARM_FEED_END = new Object();
-
-    /**
-     * Reads one CLI invocation per stdin line, executes each via a fresh
-     * {@link CommandLine}, and writes {@value #BATCH_EOR} to stdout after
-     * every result. Errors are written as JSON to stdout so the harness
-     * sees them in the same stream, delimited by the same sentinel. The
-     * loop never terminates on command failure; only stdin EOF (or an
-     * empty line) ends the session.
-     */
-    @Command(name = "batch", description = "Reads CLI invocations from stdin and executes them sequentially.")
-    static final class BatchCommand implements Callable<Integer> {
-        private final MxGatewayCliClientFactory clientFactory;
-
-        @Spec
-        private CommandSpec spec;
-
-        BatchCommand(MxGatewayCliClientFactory clientFactory) {
-            this.clientFactory = clientFactory;
-        }
-
-        @Override
-        public Integer call() {
-            PrintWriter out = spec.commandLine().getOut();
-            try (BufferedReader reader = new BufferedReader(
-                    new InputStreamReader(System.in, StandardCharsets.UTF_8))) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    if (line.isEmpty()) {
-                        break;
-                    }
-                    String[] args = line.trim().split("\\s+");
-                    if (args.length == 0 || (args.length == 1 && args[0].isEmpty())) {
-                        continue;
-                    }
-                    StringWriter cmdOut = new StringWriter();
-                    StringWriter cmdErr = new StringWriter();
-                    PrintWriter cmdOutWriter = new PrintWriter(cmdOut, true);
-                    PrintWriter cmdErrWriter = new PrintWriter(cmdErr, true);
-                    try {
-                        CommandLine cmd = commandLine(clientFactory);
-                        cmd.setOut(cmdOutWriter);
-                        cmd.setErr(cmdErrWriter);
-                        int exitCode = cmd.execute(args);
-                        cmdOutWriter.flush();
-                        cmdErrWriter.flush();
-                        String cmdOutput = cmdOut.toString();
-                        if (!cmdOutput.isEmpty()) {
-                            out.print(cmdOutput);
-                        }
-                        if (exitCode != 0) {
-                            // Non-zero exit: emit the stderr content (if any) as a JSON
-                            // error object to stdout so the harness can parse it in the
-                            // same delimited stream.
-                            String errText = cmdErr.toString().trim();
-                            if (errText.isEmpty()) {
-                                errText = "command exited with code " + exitCode;
-                            }
-                            Map<String, Object> errorPayload = new LinkedHashMap<>();
-                            errorPayload.put("error", errText);
-                            errorPayload.put("type", "error");
-                            out.println(jsonObject(errorPayload));
-                        }
-                    } catch (Exception ex) {
-                        Map<String, Object> errorPayload = new LinkedHashMap<>();
-                        errorPayload.put("error", ex.getMessage() != null ? ex.getMessage() : ex.getClass().getName());
-                        errorPayload.put("type", "error");
-                        out.println(jsonObject(errorPayload));
-                    }
-                    out.println(BATCH_EOR);
-                    out.flush();
-                }
-            } catch (java.io.IOException ex) {
-                // Stdin closed unexpectedly — treat as EOF and exit normally.
-            }
-            return 0;
-        }
-    }
-
     abstract static class GalaxyCommand implements Callable<Integer> {
         @Mixin
         CommonOptions common = new CommonOptions();
@@ -413,9 +280,6 @@ public final class MxGatewayCli implements Callable<Integer> {
         return values;
     }
 
-    /**
-     * Picocli subcommand that prints the client and protocol version numbers.
-     */
     @Command(name = "version", description = "Prints the Java client version.")
     public static final class VersionCommand implements Callable<Integer> {
         @Spec
@@ -630,359 +494,6 @@ public final class MxGatewayCli implements Callable<Integer> {
         }
     }
 
-    @Command(name = "read-bulk", description = "Invokes MXAccess ReadBulk (cached or snapshot per tag).")
-    static final class ReadBulkCommand extends GatewayCommand {
-        @Option(names = "--session-id", required = true, description = "Gateway session id.")
-        String sessionId;
-
-        @Option(names = "--server-handle", required = true, description = "MXAccess server handle.")
-        int serverHandle;
-
-        @Option(names = "--items", required = true, description = "Comma-separated tag addresses.")
-        String items;
-
-        @Option(
-                names = "--timeout-ms",
-                defaultValue = "0",
-                description = "Per-tag snapshot timeout in milliseconds (0 = worker default).")
-        int timeoutMs;
-
-        ReadBulkCommand(MxGatewayCliClientFactory clientFactory) {
-            super(clientFactory);
-        }
-
-        @Override
-        public Integer call() {
-            try (MxGatewayCliClient client = clientFactory.connect(common.resolved())) {
-                List<BulkReadResult> results = client.session(sessionId)
-                        .readBulk(serverHandle, parseStringList(items), Duration.ofMillis(timeoutMs));
-                writeReadBulkOutput("read-bulk", common, json, results);
-            }
-            return 0;
-        }
-    }
-
-    @Command(name = "write-bulk", description = "Invokes MXAccess WriteBulk.")
-    static final class WriteBulkCommand extends GatewayCommand {
-        @Option(names = "--session-id", required = true, description = "Gateway session id.")
-        String sessionId;
-
-        @Option(names = "--server-handle", required = true, description = "MXAccess server handle.")
-        int serverHandle;
-
-        @Option(names = "--item-handles", required = true, description = "Comma-separated item handles.")
-        String itemHandles;
-
-        @Option(names = "--type", defaultValue = "string", description = "Value type for all entries.")
-        String type;
-
-        @Option(names = "--values", required = true, description = "Comma-separated values, one per item handle.")
-        String values;
-
-        @Option(names = "--user-id", defaultValue = "0", description = "MXAccess user id.")
-        int userId;
-
-        WriteBulkCommand(MxGatewayCliClientFactory clientFactory) {
-            super(clientFactory);
-        }
-
-        @Override
-        public Integer call() {
-            try (MxGatewayCliClient client = clientFactory.connect(common.resolved())) {
-                List<Integer> handles = parseIntList(itemHandles);
-                List<String> valueTexts = parseStringList(values);
-                if (handles.size() != valueTexts.size()) {
-                    throw new IllegalArgumentException(
-                            "item-handles count (" + handles.size() + ") does not match values count ("
-                                    + valueTexts.size() + ")");
-                }
-                List<WriteBulkEntry> entries = new ArrayList<>(handles.size());
-                for (int i = 0; i < handles.size(); i++) {
-                    entries.add(WriteBulkEntry.newBuilder()
-                            .setItemHandle(handles.get(i))
-                            .setUserId(userId)
-                            .setValue(parseValue(type, valueTexts.get(i)))
-                            .build());
-                }
-                List<BulkWriteResult> results = client.session(sessionId).writeBulk(serverHandle, entries);
-                writeWriteBulkOutput("write-bulk", common, json, results);
-            }
-            return 0;
-        }
-    }
-
-    @Command(name = "write2-bulk", description = "Invokes MXAccess Write2Bulk (timestamped).")
-    static final class Write2BulkCommand extends GatewayCommand {
-        @Option(names = "--session-id", required = true, description = "Gateway session id.")
-        String sessionId;
-
-        @Option(names = "--server-handle", required = true, description = "MXAccess server handle.")
-        int serverHandle;
-
-        @Option(names = "--item-handles", required = true, description = "Comma-separated item handles.")
-        String itemHandles;
-
-        @Option(names = "--type", defaultValue = "string", description = "Value type for all entries.")
-        String type;
-
-        @Option(names = "--values", required = true, description = "Comma-separated values, one per item handle.")
-        String values;
-
-        @Option(names = "--timestamp", required = true, description = "ISO-8601 timestamp shared across all entries.")
-        String timestamp;
-
-        @Option(names = "--user-id", defaultValue = "0", description = "MXAccess user id.")
-        int userId;
-
-        Write2BulkCommand(MxGatewayCliClientFactory clientFactory) {
-            super(clientFactory);
-        }
-
-        @Override
-        public Integer call() {
-            try (MxGatewayCliClient client = clientFactory.connect(common.resolved())) {
-                List<Integer> handles = parseIntList(itemHandles);
-                List<String> valueTexts = parseStringList(values);
-                if (handles.size() != valueTexts.size()) {
-                    throw new IllegalArgumentException(
-                            "item-handles count (" + handles.size() + ") does not match values count ("
-                                    + valueTexts.size() + ")");
-                }
-                MxValue timestampValue = MxValues.timestampValue(Instant.parse(timestamp));
-                List<Write2BulkEntry> entries = new ArrayList<>(handles.size());
-                for (int i = 0; i < handles.size(); i++) {
-                    entries.add(Write2BulkEntry.newBuilder()
-                            .setItemHandle(handles.get(i))
-                            .setUserId(userId)
-                            .setValue(parseValue(type, valueTexts.get(i)))
-                            .setTimestampValue(timestampValue)
-                            .build());
-                }
-                List<BulkWriteResult> results = client.session(sessionId).write2Bulk(serverHandle, entries);
-                writeWriteBulkOutput("write2-bulk", common, json, results);
-            }
-            return 0;
-        }
-    }
-
-    @Command(name = "write-secured-bulk", description = "Invokes MXAccess WriteSecuredBulk.")
-    static final class WriteSecuredBulkCommand extends GatewayCommand {
-        @Option(names = "--session-id", required = true, description = "Gateway session id.")
-        String sessionId;
-
-        @Option(names = "--server-handle", required = true, description = "MXAccess server handle.")
-        int serverHandle;
-
-        @Option(names = "--item-handles", required = true, description = "Comma-separated item handles.")
-        String itemHandles;
-
-        @Option(names = "--type", defaultValue = "string", description = "Value type for all entries.")
-        String type;
-
-        @Option(names = "--values", required = true, description = "Comma-separated values, one per item handle.")
-        String values;
-
-        @Option(names = "--current-user-id", defaultValue = "0", description = "MXAccess current user id.")
-        int currentUserId;
-
-        @Option(names = "--verifier-user-id", defaultValue = "0", description = "MXAccess verifier user id.")
-        int verifierUserId;
-
-        WriteSecuredBulkCommand(MxGatewayCliClientFactory clientFactory) {
-            super(clientFactory);
-        }
-
-        @Override
-        public Integer call() {
-            try (MxGatewayCliClient client = clientFactory.connect(common.resolved())) {
-                List<Integer> handles = parseIntList(itemHandles);
-                List<String> valueTexts = parseStringList(values);
-                if (handles.size() != valueTexts.size()) {
-                    throw new IllegalArgumentException(
-                            "item-handles count (" + handles.size() + ") does not match values count ("
-                                    + valueTexts.size() + ")");
-                }
-                List<WriteSecuredBulkEntry> entries = new ArrayList<>(handles.size());
-                for (int i = 0; i < handles.size(); i++) {
-                    entries.add(WriteSecuredBulkEntry.newBuilder()
-                            .setItemHandle(handles.get(i))
-                            .setCurrentUserId(currentUserId)
-                            .setVerifierUserId(verifierUserId)
-                            .setValue(parseValue(type, valueTexts.get(i)))
-                            .build());
-                }
-                List<BulkWriteResult> results = client.session(sessionId).writeSecuredBulk(serverHandle, entries);
-                writeWriteBulkOutput("write-secured-bulk", common, json, results);
-            }
-            return 0;
-        }
-    }
-
-    @Command(name = "write-secured2-bulk", description = "Invokes MXAccess WriteSecured2Bulk.")
-    static final class WriteSecured2BulkCommand extends GatewayCommand {
-        @Option(names = "--session-id", required = true, description = "Gateway session id.")
-        String sessionId;
-
-        @Option(names = "--server-handle", required = true, description = "MXAccess server handle.")
-        int serverHandle;
-
-        @Option(names = "--item-handles", required = true, description = "Comma-separated item handles.")
-        String itemHandles;
-
-        @Option(names = "--type", defaultValue = "string", description = "Value type for all entries.")
-        String type;
-
-        @Option(names = "--values", required = true, description = "Comma-separated values, one per item handle.")
-        String values;
-
-        @Option(names = "--timestamp", required = true, description = "ISO-8601 timestamp shared across all entries.")
-        String timestamp;
-
-        @Option(names = "--current-user-id", defaultValue = "0", description = "MXAccess current user id.")
-        int currentUserId;
-
-        @Option(names = "--verifier-user-id", defaultValue = "0", description = "MXAccess verifier user id.")
-        int verifierUserId;
-
-        WriteSecured2BulkCommand(MxGatewayCliClientFactory clientFactory) {
-            super(clientFactory);
-        }
-
-        @Override
-        public Integer call() {
-            try (MxGatewayCliClient client = clientFactory.connect(common.resolved())) {
-                List<Integer> handles = parseIntList(itemHandles);
-                List<String> valueTexts = parseStringList(values);
-                if (handles.size() != valueTexts.size()) {
-                    throw new IllegalArgumentException(
-                            "item-handles count (" + handles.size() + ") does not match values count ("
-                                    + valueTexts.size() + ")");
-                }
-                MxValue timestampValue = MxValues.timestampValue(Instant.parse(timestamp));
-                List<WriteSecured2BulkEntry> entries = new ArrayList<>(handles.size());
-                for (int i = 0; i < handles.size(); i++) {
-                    entries.add(WriteSecured2BulkEntry.newBuilder()
-                            .setItemHandle(handles.get(i))
-                            .setCurrentUserId(currentUserId)
-                            .setVerifierUserId(verifierUserId)
-                            .setValue(parseValue(type, valueTexts.get(i)))
-                            .setTimestampValue(timestampValue)
-                            .build());
-                }
-                List<BulkWriteResult> results = client.session(sessionId).writeSecured2Bulk(serverHandle, entries);
-                writeWriteBulkOutput("write-secured2-bulk", common, json, results);
-            }
-            return 0;
-        }
-    }
-
-    @Command(
-            name = "bench-read-bulk",
-            description = "Repeatedly invokes ReadBulk for benchmarking; prints aggregate timing.")
-    static final class BenchReadBulkCommand extends GatewayCommand {
-        @Option(names = "--session-id", required = true, description = "Gateway session id.")
-        String sessionId;
-
-        @Option(names = "--server-handle", required = true, description = "MXAccess server handle.")
-        int serverHandle;
-
-        @Option(names = "--items", required = true, description = "Comma-separated tag addresses.")
-        String items;
-
-        @Option(
-                names = "--timeout-ms",
-                defaultValue = "0",
-                description = "Per-tag snapshot timeout in milliseconds (0 = worker default).")
-        int timeoutMs;
-
-        @Option(names = "--iterations", defaultValue = "10", description = "Number of ReadBulk calls to perform.")
-        int iterations;
-
-        @Option(
-                names = "--warmup",
-                defaultValue = "1",
-                description = "Number of warmup iterations excluded from timing.")
-        int warmup;
-
-        BenchReadBulkCommand(MxGatewayCliClientFactory clientFactory) {
-            super(clientFactory);
-        }
-
-        @Override
-        public Integer call() {
-            if (iterations <= 0) {
-                throw new IllegalArgumentException("--iterations must be positive");
-            }
-            if (warmup < 0) {
-                throw new IllegalArgumentException("--warmup must be non-negative");
-            }
-            List<String> tagAddresses = parseStringList(items);
-            Duration timeout = Duration.ofMillis(timeoutMs);
-            try (MxGatewayCliClient client = clientFactory.connect(common.resolved())) {
-                MxGatewayCliSession session = client.session(sessionId);
-                for (int i = 0; i < warmup; i++) {
-                    session.readBulk(serverHandle, tagAddresses, timeout);
-                }
-                long totalNanos = 0L;
-                long minNanos = Long.MAX_VALUE;
-                long maxNanos = 0L;
-                int lastResultCount = 0;
-                int lastSuccessCount = 0;
-                int lastCachedCount = 0;
-                for (int i = 0; i < iterations; i++) {
-                    long start = System.nanoTime();
-                    List<BulkReadResult> results = session.readBulk(serverHandle, tagAddresses, timeout);
-                    long elapsed = System.nanoTime() - start;
-                    totalNanos += elapsed;
-                    minNanos = Math.min(minNanos, elapsed);
-                    maxNanos = Math.max(maxNanos, elapsed);
-                    lastResultCount = results.size();
-                    lastSuccessCount = 0;
-                    lastCachedCount = 0;
-                    for (BulkReadResult result : results) {
-                        if (result.getWasSuccessful()) {
-                            lastSuccessCount++;
-                        }
-                        if (result.getWasCached()) {
-                            lastCachedCount++;
-                        }
-                    }
-                }
-                double avgMs = totalNanos / 1_000_000.0 / iterations;
-                double minMs = minNanos / 1_000_000.0;
-                double maxMs = maxNanos / 1_000_000.0;
-                PrintWriter out = common.spec.commandLine().getOut();
-                if (json) {
-                    Map<String, Object> output = new LinkedHashMap<>();
-                    output.put("command", "bench-read-bulk");
-                    output.put("options", common.redactedJsonMap());
-                    output.put("iterations", iterations);
-                    output.put("warmup", warmup);
-                    output.put("tagCount", tagAddresses.size());
-                    output.put("resultCount", lastResultCount);
-                    output.put("successCount", lastSuccessCount);
-                    output.put("cachedCount", lastCachedCount);
-                    output.put("avgMs", avgMs);
-                    output.put("minMs", minMs);
-                    output.put("maxMs", maxMs);
-                    out.println(jsonObject(output));
-                } else {
-                    out.printf(
-                            "iterations=%d tags=%d avg=%.3fms min=%.3fms max=%.3fms last_results=%d last_success=%d last_cached=%d%n",
-                            iterations,
-                            tagAddresses.size(),
-                            avgMs,
-                            minMs,
-                            maxMs,
-                            lastResultCount,
-                            lastSuccessCount,
-                            lastCachedCount);
-                }
-            }
-            return 0;
-        }
-    }
-
     @Command(name = "write", description = "Invokes MXAccess Write.")
     static final class WriteCommand extends GatewayCommand {
         @Option(names = "--session-id", required = true, description = "Gateway session id.")
@@ -1056,115 +567,6 @@ public final class MxGatewayCli implements Callable<Integer> {
         }
     }
 
-    @Command(name = "stream-alarms", description = "Streams the gateway central alarm feed.")
-    static final class StreamAlarmsCommand extends GatewayCommand {
-        @Option(names = "--filter-prefix", description = "Alarm-reference prefix scoping the feed; empty means unscoped.")
-        String filterPrefix = "";
-
-        @Option(names = "--limit", defaultValue = "0", description = "Maximum feed messages to print.")
-        int limit;
-
-        StreamAlarmsCommand(MxGatewayCliClientFactory clientFactory) {
-            super(clientFactory);
-        }
-
-        @Override
-        public Integer call() {
-            try (MxGatewayCliClient client = clientFactory.connect(common.resolved())) {
-                // The async alarm feed delivers on a background gRPC thread; buffer
-                // messages in a bounded queue and drain them on this thread so the
-                // --limit termination mirrors stream-events. 1024 absorbs the
-                // gateway's initial active-alarm snapshot burst.
-                BlockingQueue<Object> queue = new ArrayBlockingQueue<>(1024);
-                StreamAlarmsRequest request = StreamAlarmsRequest.newBuilder()
-                        .setAlarmFilterPrefix(filterPrefix)
-                        .build();
-                MxGatewayAlarmFeedSubscription subscription =
-                        client.streamAlarms(request, new StreamObserver<>() {
-                            @Override
-                            public void onNext(AlarmFeedMessage value) {
-                                queue.offer(value);
-                            }
-
-                            @Override
-                            public void onError(Throwable error) {
-                                queue.offer(error);
-                            }
-
-                            @Override
-                            public void onCompleted() {
-                                queue.offer(ALARM_FEED_END);
-                            }
-                        });
-                try {
-                    int count = 0;
-                    while (true) {
-                        Object item = queue.take();
-                        if (item == ALARM_FEED_END) {
-                            break;
-                        }
-                        if (item instanceof Throwable error) {
-                            throw new IllegalStateException(
-                                    "gateway stream alarms failed: " + error.getMessage(), error);
-                        }
-                        AlarmFeedMessage message = (AlarmFeedMessage) item;
-                        if (json) {
-                            client.out().println(protoJson(message));
-                        } else {
-                            client.out().println(formatAlarmFeedMessage(message));
-                        }
-                        client.out().flush();
-                        count++;
-                        if (limit > 0 && count >= limit) {
-                            subscription.cancel();
-                            break;
-                        }
-                    }
-                } catch (InterruptedException error) {
-                    Thread.currentThread().interrupt();
-                    subscription.cancel();
-                } finally {
-                    subscription.cancel();
-                }
-            }
-            return 0;
-        }
-    }
-
-    @Command(name = "acknowledge-alarm", description = "Acknowledges an active MXAccess alarm.")
-    static final class AcknowledgeAlarmCommand extends GatewayCommand {
-        @Option(names = "--reference", required = true, description = "Full alarm reference to acknowledge.")
-        String reference;
-
-        @Option(names = "--comment", description = "Operator acknowledge comment.")
-        String comment = "";
-
-        @Option(names = "--operator", description = "Operator user performing the acknowledge.")
-        String operator = "";
-
-        AcknowledgeAlarmCommand(MxGatewayCliClientFactory clientFactory) {
-            super(clientFactory);
-        }
-
-        @Override
-        public Integer call() {
-            try (MxGatewayCliClient client = clientFactory.connect(common.resolved())) {
-                AcknowledgeAlarmReply reply = client.acknowledgeAlarm(AcknowledgeAlarmRequest.newBuilder()
-                        .setAlarmFullReference(reference)
-                        .setComment(comment)
-                        .setOperatorUser(operator)
-                        .build());
-                writeOutput(
-                        "acknowledge-alarm",
-                        common,
-                        json,
-                        reply,
-                        () -> Integer.toString(reply.getHresult()));
-            }
-            return 0;
-        }
-    }
-
     @Command(name = "smoke", description = "Runs a bounded open/register/add/advise flow.")
     static final class SmokeCommand extends GatewayCommand {
         @Option(names = "--client-name", defaultValue = "mxgw-java-smoke", description = "MXAccess client name.")
@@ -1284,11 +686,6 @@ public final class MxGatewayCli implements Callable<Integer> {
 
         MxGatewayCliSession session(String sessionId);
 
-        AcknowledgeAlarmReply acknowledgeAlarm(AcknowledgeAlarmRequest request);
-
-        MxGatewayAlarmFeedSubscription streamAlarms(
-                StreamAlarmsRequest request, StreamObserver<AlarmFeedMessage> observer);
-
         @Override
         void close();
     }
@@ -1312,16 +709,6 @@ public final class MxGatewayCli implements Callable<Integer> {
 
         List<SubscribeResult> unsubscribeBulk(int serverHandle, List<Integer> itemHandles);
 
-        List<BulkReadResult> readBulk(int serverHandle, List<String> items, Duration timeout);
-
-        List<BulkWriteResult> writeBulk(int serverHandle, List<WriteBulkEntry> entries);
-
-        List<BulkWriteResult> write2Bulk(int serverHandle, List<Write2BulkEntry> entries);
-
-        List<BulkWriteResult> writeSecuredBulk(int serverHandle, List<WriteSecuredBulkEntry> entries);
-
-        List<BulkWriteResult> writeSecured2Bulk(int serverHandle, List<WriteSecured2BulkEntry> entries);
-
         MxEventStream streamEventsAfter(long afterWorkerSequence);
     }
 
@@ -1361,17 +748,6 @@ public final class MxGatewayCli implements Callable<Integer> {
             return new GrpcMxGatewayCliSession(MxGatewaySession.forSessionId(client, sessionId));
         }
 
-        @Override
-        public AcknowledgeAlarmReply acknowledgeAlarm(AcknowledgeAlarmRequest request) {
-            return client.acknowledgeAlarm(request);
-        }
-
-        @Override
-        public MxGatewayAlarmFeedSubscription streamAlarms(
-                StreamAlarmsRequest request, StreamObserver<AlarmFeedMessage> observer) {
-            return client.streamAlarms(request, observer);
-        }
-
         @Override
         public void close() {
             client.close();
@@ -1424,31 +800,6 @@ public final class MxGatewayCli implements Callable<Integer> {
             return session.unsubscribeBulk(serverHandle, itemHandles);
         }
 
-        @Override
-        public List<BulkReadResult> readBulk(int serverHandle, List<String> items, Duration timeout) {
-            return session.readBulk(serverHandle, items, timeout);
-        }
-
-        @Override
-        public List<BulkWriteResult> writeBulk(int serverHandle, List<WriteBulkEntry> entries) {
-            return session.writeBulk(serverHandle, entries);
-        }
-
-        @Override
-        public List<BulkWriteResult> write2Bulk(int serverHandle, List<Write2BulkEntry> entries) {
-            return session.write2Bulk(serverHandle, entries);
-        }
-
-        @Override
-        public List<BulkWriteResult> writeSecuredBulk(int serverHandle, List<WriteSecuredBulkEntry> entries) {
-            return session.writeSecuredBulk(serverHandle, entries);
-        }
-
-        @Override
-        public List<BulkWriteResult> writeSecured2Bulk(int serverHandle, List<WriteSecured2BulkEntry> entries) {
-            return session.writeSecured2Bulk(serverHandle, entries);
-        }
-
         @Override
         public MxEventStream streamEventsAfter(long afterWorkerSequence) {
             return session.streamEventsAfter(afterWorkerSequence);
@@ -1497,82 +848,6 @@ public final class MxGatewayCli implements Callable<Integer> {
         return values;
     }
 
-    private static void writeWriteBulkOutput(
-            String command, CommonOptions common, boolean json, List<BulkWriteResult> results) {
-        PrintWriter out = common.spec.commandLine().getOut();
-        if (json) {
-            Map<String, Object> output = new LinkedHashMap<>();
-            output.put("command", command);
-            output.put("options", common.redactedJsonMap());
-            output.put("results", results.stream().map(MxGatewayCli::bulkWriteResultMap).toList());
-            out.println(jsonObject(output));
-            return;
-        }
-        out.println(results.size());
-    }
-
-    private static Map<String, Object> bulkWriteResultMap(BulkWriteResult result) {
-        Map<String, Object> values = new LinkedHashMap<>();
-        values.put("serverHandle", result.getServerHandle());
-        values.put("itemHandle", result.getItemHandle());
-        values.put("wasSuccessful", result.getWasSuccessful());
-        values.put("hresult", result.hasHresult() ? (Object) result.getHresult() : null);
-        values.put("errorMessage", result.getErrorMessage());
-        return values;
-    }
-
-    private static void writeReadBulkOutput(
-            String command, CommonOptions common, boolean json, List<BulkReadResult> results) {
-        PrintWriter out = common.spec.commandLine().getOut();
-        if (json) {
-            Map<String, Object> output = new LinkedHashMap<>();
-            output.put("command", command);
-            output.put("options", common.redactedJsonMap());
-            output.put("results", results.stream().map(MxGatewayCli::bulkReadResultMap).toList());
-            out.println(jsonObject(output));
-            return;
-        }
-        out.println(results.size());
-    }
-
-    private static Map<String, Object> bulkReadResultMap(BulkReadResult result) {
-        Map<String, Object> values = new LinkedHashMap<>();
-        values.put("serverHandle", result.getServerHandle());
-        values.put("tagAddress", result.getTagAddress());
-        values.put("itemHandle", result.getItemHandle());
-        values.put("wasSuccessful", result.getWasSuccessful());
-        values.put("wasCached", result.getWasCached());
-        values.put("quality", result.getQuality());
-        values.put("errorMessage", result.getErrorMessage());
-        return values;
-    }
-
-    /**
-     * Renders one {@link AlarmFeedMessage} in the CLI's plain-text output
-     * style, distinguishing the active-alarm snapshot, snapshot-complete
-     * sentinel, and transition cases of the message's {@code payload} oneof.
-     */
-    private static String formatAlarmFeedMessage(AlarmFeedMessage message) {
-        return switch (message.getPayloadCase()) {
-            case ACTIVE_ALARM -> {
-                ActiveAlarmSnapshot alarm = message.getActiveAlarm();
-                yield String.format(
-                        "active-alarm %s state=%s severity=%d",
-                        alarm.getAlarmFullReference(), alarm.getCurrentState().name(), alarm.getSeverity());
-            }
-            case SNAPSHOT_COMPLETE -> "snapshot-complete";
-            case TRANSITION -> {
-                OnAlarmTransitionEvent transition = message.getTransition();
-                yield String.format(
-                        "transition %s kind=%s severity=%d",
-                        transition.getAlarmFullReference(),
-                        transition.getTransitionKind().name(),
-                        transition.getSeverity());
-            }
-            case PAYLOAD_NOT_SET -> "unknown";
-        };
-    }
-
     private static MxValue parseValue(String type, String text) {
         return switch (type) {
             case "bool" -> MxValues.boolValue(Boolean.parseBoolean(text));

clients/java/mxgateway-cli/src/test/java/com/dohertylan/mxgateway/cli/MxGatewayCliTests.java

@@ -1,47 +1,27 @@
-package com.zb.mom.ww.mxgateway.cli;
+package com.dohertylan.mxgateway.cli;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.zb.mom.ww.mxgateway.client.MxGatewayAlarmFeedSubscription;
-import io.grpc.stub.StreamObserver;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-import mxaccess_gateway.v1.MxaccessGateway.AcknowledgeAlarmReply;
-import mxaccess_gateway.v1.MxaccessGateway.AcknowledgeAlarmRequest;
-import mxaccess_gateway.v1.MxaccessGateway.ActiveAlarmSnapshot;
 import mxaccess_gateway.v1.MxaccessGateway.AddItemReply;
-import mxaccess_gateway.v1.MxaccessGateway.AlarmConditionState;
-import mxaccess_gateway.v1.MxaccessGateway.AlarmFeedMessage;
-import mxaccess_gateway.v1.MxaccessGateway.AlarmTransitionKind;
-import mxaccess_gateway.v1.MxaccessGateway.BulkReadResult;
-import mxaccess_gateway.v1.MxaccessGateway.BulkWriteResult;
 import mxaccess_gateway.v1.MxaccessGateway.CloseSessionReply;
 import mxaccess_gateway.v1.MxaccessGateway.CloseSessionRequest;
 import mxaccess_gateway.v1.MxaccessGateway.MxCommandKind;
 import mxaccess_gateway.v1.MxaccessGateway.MxCommandReply;
 import mxaccess_gateway.v1.MxaccessGateway.MxEvent;
 import mxaccess_gateway.v1.MxaccessGateway.MxValue;
-import mxaccess_gateway.v1.MxaccessGateway.OnAlarmTransitionEvent;
 import mxaccess_gateway.v1.MxaccessGateway.OpenSessionReply;
 import mxaccess_gateway.v1.MxaccessGateway.OpenSessionRequest;
 import mxaccess_gateway.v1.MxaccessGateway.ProtocolStatus;
 import mxaccess_gateway.v1.MxaccessGateway.ProtocolStatusCode;
 import mxaccess_gateway.v1.MxaccessGateway.RegisterReply;
 import mxaccess_gateway.v1.MxaccessGateway.SessionState;
-import mxaccess_gateway.v1.MxaccessGateway.StreamAlarmsRequest;
 import mxaccess_gateway.v1.MxaccessGateway.SubscribeResult;
-import mxaccess_gateway.v1.MxaccessGateway.Write2BulkEntry;
-import mxaccess_gateway.v1.MxaccessGateway.WriteBulkEntry;
-import mxaccess_gateway.v1.MxaccessGateway.WriteSecured2BulkEntry;
-import mxaccess_gateway.v1.MxaccessGateway.WriteSecuredBulkEntry;
 import org.junit.jupiter.api.Test;
 
 final class MxGatewayCliTests {
@@ -52,7 +32,7 @@ final class MxGatewayCliTests {
         assertEquals(0, run.exitCode());
         assertEquals("", run.errors());
         assertTrue(run.output().contains("mxgateway-java 0.1.0"));
-        assertTrue(run.output().contains("gatewayProtocolVersion=3"));
+        assertTrue(run.output().contains("gatewayProtocolVersion=2"));
         assertTrue(run.output().contains("workerProtocolVersion=1"));
     }
 
@@ -62,7 +42,7 @@ final class MxGatewayCliTests {
 
         assertEquals(0, run.exitCode());
         assertTrue(run.output().contains("\"clientVersion\":\"0.1.0\""));
-        assertTrue(run.output().contains("\"gatewayProtocolVersion\":3"));
+        assertTrue(run.output().contains("\"gatewayProtocolVersion\":2"));
     }
 
     @Test
@@ -161,111 +141,6 @@ final class MxGatewayCliTests {
         assertTrue(run.output().contains("\"wasSuccessful\":true"));
     }
 
-    // ---- stream-alarms / acknowledge-alarm subcommands ----
-
-    @Test
-    void streamAlarmsCommandForwardsFilterPrefixAndPrintsFeedMessages() {
-        FakeClientFactory factory = new FakeClientFactory();
-        CliRun run = execute(factory, "stream-alarms", "--filter-prefix", "Tank01");
-
-        assertEquals(0, run.exitCode());
-        assertEquals("Tank01", factory.client.lastStreamAlarmsRequest.getAlarmFilterPrefix());
-        String out = run.output();
-        assertTrue(out.contains("active-alarm Tank01.Level.HiHi"), out);
-        assertTrue(out.contains("snapshot-complete"), out);
-        assertTrue(out.contains("transition Tank01.Level.HiHi"), out);
-    }
-
-    @Test
-    void streamAlarmsCommandHonoursLimit() {
-        FakeClientFactory factory = new FakeClientFactory();
-        CliRun run = execute(factory, "stream-alarms", "--limit", "1");
-
-        assertEquals(0, run.exitCode());
-        long lines = run.output().lines().filter(line -> !line.isBlank()).count();
-        assertEquals(1, lines, "expected exactly one feed message with --limit 1, got: " + run.output());
-    }
-
-    @Test
-    void streamAlarmsCommandPrintsJson() {
-        FakeClientFactory factory = new FakeClientFactory();
-        CliRun run = execute(factory, "stream-alarms", "--json");
-
-        assertEquals(0, run.exitCode());
-        assertTrue(run.output().contains("\"activeAlarm\""), run.output());
-        assertTrue(run.output().contains("\"snapshotComplete\""), run.output());
-    }
-
-    @Test
-    void acknowledgeAlarmCommandForwardsOptionsAndPrintsReply() {
-        FakeClientFactory factory = new FakeClientFactory();
-        CliRun run = execute(
-                factory,
-                "acknowledge-alarm",
-                "--reference",
-                "Tank01.Level.HiHi",
-                "--comment",
-                "checked",
-                "--operator",
-                "operator1",
-                "--json");
-
-        assertEquals(0, run.exitCode());
-        assertEquals("Tank01.Level.HiHi", factory.client.lastAcknowledgeAlarmRequest.getAlarmFullReference());
-        assertEquals("checked", factory.client.lastAcknowledgeAlarmRequest.getComment());
-        assertEquals("operator1", factory.client.lastAcknowledgeAlarmRequest.getOperatorUser());
-        assertTrue(run.output().contains("\"command\":\"acknowledge-alarm\""), run.output());
-    }
-
-    @Test
-    void acknowledgeAlarmCommandRequiresReference() {
-        CliRun run = execute(new FakeClientFactory(), "acknowledge-alarm", "--comment", "checked");
-
-        assertFalse(run.exitCode() == 0, "expected non-zero exit without --reference");
-        assertTrue(run.errors().contains("--reference"), run.errors());
-    }
-
-    @Test
-    void batchCommandExecutesVersionAndEmitsEorMarker() {
-        CliRun run = executeBatch(new FakeClientFactory(), "version --json\n");
-
-        assertEquals(0, run.exitCode());
-        String out = run.output();
-        assertTrue(out.contains("\"clientVersion\""), out);
-        assertTrue(out.contains(MxGatewayCli.BATCH_EOR), out);
-    }
-
-    @Test
-    void batchCommandEmitsEorAfterFailedCommandAndContinues() {
-        // An unknown subcommand causes a picocli parse error (non-zero exit).
-        // The loop must still emit BATCH_EOR for the failure and continue
-        // processing the subsequent valid command.
-        CliRun run = executeBatch(new FakeClientFactory(), "no-such-subcommand\nversion --json\n");
-
-        assertEquals(0, run.exitCode());
-        String out = run.output();
-        long eorCount = out.lines()
-                .filter(l -> l.equals(MxGatewayCli.BATCH_EOR))
-                .count();
-        assertEquals(2, eorCount, "expected exactly 2 EOR sentinels, got: " + eorCount + "\nOutput:\n" + out);
-        assertTrue(out.contains("\"clientVersion\""), out);
-    }
-
-    /**
-     * Runs the CLI with {@code batch} as the subcommand, using the provided
-     * string as standard input content. Temporarily replaces {@link System#in}
-     * for the duration of the call.
-     */
-    private static CliRun executeBatch(MxGatewayCli.MxGatewayCliClientFactory factory, String stdinContent) {
-        InputStream originalIn = System.in;
-        try {
-            System.setIn(new ByteArrayInputStream(stdinContent.getBytes(StandardCharsets.UTF_8)));
-            return execute(factory, "batch");
-        } finally {
-            System.setIn(originalIn);
-        }
-    }
-
     private static CliRun execute(MxGatewayCli.MxGatewayCliClientFactory factory, String... args) {
         StringWriter output = new StringWriter();
         StringWriter errors = new StringWriter();
@@ -294,8 +169,6 @@ final class MxGatewayCliTests {
         private final PrintWriter out;
         private final FakeSession session = new FakeSession();
         private boolean closeCalled;
-        private AcknowledgeAlarmRequest lastAcknowledgeAlarmRequest;
-        private StreamAlarmsRequest lastStreamAlarmsRequest;
 
         private FakeClient(PrintWriter out) {
             this.out = out;
@@ -329,40 +202,6 @@ final class MxGatewayCliTests {
             return session;
         }
 
-        @Override
-        public AcknowledgeAlarmReply acknowledgeAlarm(AcknowledgeAlarmRequest request) {
-            lastAcknowledgeAlarmRequest = request;
-            return AcknowledgeAlarmReply.newBuilder()
-                    .setCorrelationId(request.getClientCorrelationId())
-                    .setProtocolStatus(ok())
-                    .setHresult(0)
-                    .build();
-        }
-
-        @Override
-        public MxGatewayAlarmFeedSubscription streamAlarms(
-                StreamAlarmsRequest request, StreamObserver<AlarmFeedMessage> observer) {
-            lastStreamAlarmsRequest = request;
-            // Replay a deterministic active-alarm snapshot, snapshot-complete
-            // sentinel, transition, then complete the feed so the CLI command
-            // drains a bounded stream without contacting a live gateway.
-            observer.onNext(AlarmFeedMessage.newBuilder()
-                    .setActiveAlarm(ActiveAlarmSnapshot.newBuilder()
-                            .setAlarmFullReference("Tank01.Level.HiHi")
-                            .setCurrentState(AlarmConditionState.ALARM_CONDITION_STATE_ACTIVE)
-                            .setSeverity(700))
-                    .build());
-            observer.onNext(AlarmFeedMessage.newBuilder().setSnapshotComplete(true).build());
-            observer.onNext(AlarmFeedMessage.newBuilder()
-                    .setTransition(OnAlarmTransitionEvent.newBuilder()
-                            .setAlarmFullReference("Tank01.Level.HiHi")
-                            .setTransitionKind(AlarmTransitionKind.ALARM_TRANSITION_KIND_ACKNOWLEDGE)
-                            .setSeverity(700))
-                    .build());
-            observer.onCompleted();
-            return new MxGatewayAlarmFeedSubscription();
-        }
-
         @Override
         public void close() {
         }
@@ -457,74 +296,7 @@ final class MxGatewayCliTests {
         }
 
         @Override
-        public List<BulkReadResult> readBulk(int serverHandle, List<String> items, Duration timeout) {
-            List<BulkReadResult> results = new ArrayList<>();
-            for (int index = 0; index < items.size(); index++) {
-                results.add(BulkReadResult.newBuilder()
-                        .setServerHandle(serverHandle)
-                        .setTagAddress(items.get(index))
-                        .setItemHandle(200 + index)
-                        .setWasSuccessful(true)
-                        .setWasCached(true)
-                        .build());
-            }
-            return results;
-        }
-
-        @Override
-        public List<BulkWriteResult> writeBulk(int serverHandle, List<WriteBulkEntry> entries) {
-            List<BulkWriteResult> results = new ArrayList<>();
-            for (WriteBulkEntry entry : entries) {
-                results.add(BulkWriteResult.newBuilder()
-                        .setServerHandle(serverHandle)
-                        .setItemHandle(entry.getItemHandle())
-                        .setWasSuccessful(true)
-                        .build());
-            }
-            return results;
-        }
-
-        @Override
-        public List<BulkWriteResult> write2Bulk(int serverHandle, List<Write2BulkEntry> entries) {
-            List<BulkWriteResult> results = new ArrayList<>();
-            for (Write2BulkEntry entry : entries) {
-                results.add(BulkWriteResult.newBuilder()
-                        .setServerHandle(serverHandle)
-                        .setItemHandle(entry.getItemHandle())
-                        .setWasSuccessful(true)
-                        .build());
-            }
-            return results;
-        }
-
-        @Override
-        public List<BulkWriteResult> writeSecuredBulk(int serverHandle, List<WriteSecuredBulkEntry> entries) {
-            List<BulkWriteResult> results = new ArrayList<>();
-            for (WriteSecuredBulkEntry entry : entries) {
-                results.add(BulkWriteResult.newBuilder()
-                        .setServerHandle(serverHandle)
-                        .setItemHandle(entry.getItemHandle())
-                        .setWasSuccessful(true)
-                        .build());
-            }
-            return results;
-        }
-
-        @Override
-        public List<BulkWriteResult> writeSecured2Bulk(int serverHandle, List<WriteSecured2BulkEntry> entries) {
-            List<BulkWriteResult> results = new ArrayList<>();
-            for (WriteSecured2BulkEntry entry : entries) {
-                results.add(BulkWriteResult.newBuilder()
-                        .setServerHandle(serverHandle)
-                        .setItemHandle(entry.getItemHandle())
-                        .setWasSuccessful(true)
-                        .build());
-            }
-            return results;
-        }
-
-        @Override
-        public com.zb.mom.ww.mxgateway.client.MxEventStream streamEventsAfter(long afterWorkerSequence) {
+        public com.dohertylan.mxgateway.client.MxEventStream streamEventsAfter(long afterWorkerSequence) {
             throw new UnsupportedOperationException("stream-events is covered by client tests");
         }
     }

clients/java/mxgateway-client/build.gradle

@@ -22,7 +22,7 @@ dependencies {
 sourceSets {
     main {
         proto {
-            srcDir rootProject.file('../../src/ZB.MOM.WW.MxGateway.Contracts/Protos')
+            srcDir rootProject.file('../../src/MxGateway.Contracts/Protos')
             include 'mxaccess_gateway.proto'
             include 'mxaccess_worker.proto'
             include 'galaxy_repository.proto'

clients/java/mxgateway-client/src/main/java/com/dohertylan/mxgateway/client/DeployEventStream.java

@@ -1,4 +1,4 @@
-package com.zb.mom.ww.mxgateway.client;
+package com.dohertylan.mxgateway.client;
 
 import galaxy_repository.v1.GalaxyRepositoryOuterClass.DeployEvent;
 import galaxy_repository.v1.GalaxyRepositoryOuterClass.WatchDeployEventsRequest;

clients/java/mxgateway-client/src/main/java/com/dohertylan/mxgateway/client/DeployEventSubscription.java

@@ -1,4 +1,4 @@
-package com.zb.mom.ww.mxgateway.client;
+package com.dohertylan.mxgateway.client;
 
 import galaxy_repository.v1.GalaxyRepositoryOuterClass.DeployEvent;
 import galaxy_repository.v1.GalaxyRepositoryOuterClass.WatchDeployEventsRequest;
@@ -45,11 +45,6 @@ public final class DeployEventSubscription implements AutoCloseable {
         };
     }
 
-    /**
-     * Cancels the underlying gRPC call. Safe to invoke before the call has
-     * started; cancellation is recorded and applied as soon as the stream
-     * attaches.
-     */
     public void cancel() {
         cancelled.set(true);
         ClientCallStreamObserver<WatchDeployEventsRequest> stream = requestStream.get();

clients/java/mxgateway-client/src/main/java/com/dohertylan/mxgateway/client/GalaxyRepositoryClient.java

@@ -1,4 +1,4 @@
-package com.zb.mom.ww.mxgateway.client;
+package com.dohertylan.mxgateway.client;
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -54,12 +54,8 @@ public final class GalaxyRepositoryClient implements AutoCloseable {
     }
 
     /**
-     * Constructs a client over a caller-managed {@link Channel}. The caller owns
+     * Construct a client over a caller-managed {@link Channel}. The caller owns
      * channel lifecycle; {@link #close()} is a no-op for this constructor.
-     *
-     * @param channel the gRPC channel to use for outbound calls
-     * @param options the client options carrying the API key and timeouts
-     * @throws NullPointerException if {@code options} is {@code null}
      */
     public GalaxyRepositoryClient(Channel channel, MxGatewayClientOptions options) {
         this.ownedChannel = null;
@@ -70,49 +66,25 @@ public final class GalaxyRepositoryClient implements AutoCloseable {
         asyncStub = GalaxyRepositoryGrpc.newStub(intercepted);
     }
 
-    /**
-     * Builds a new client and owns its channel; {@link #close()} shuts the
-     * channel down.
-     *
-     * @param options the client options carrying the endpoint and credentials
-     * @return a connected client
-     */
+    /** Build a new client and own its channel; close shuts the channel down. */
     public static GalaxyRepositoryClient connect(MxGatewayClientOptions options) {
         return new GalaxyRepositoryClient(createChannel(options), options);
     }
 
-    /**
-     * Returns the underlying blocking stub with the per-call deadline applied.
-     *
-     * @return the blocking stub
-     */
     public GalaxyRepositoryGrpc.GalaxyRepositoryBlockingStub rawBlockingStub() {
         return withDeadline(blockingStub);
     }
 
-    /**
-     * Returns the underlying future stub with the per-call deadline applied.
-     *
-     * @return the future stub
-     */
     public GalaxyRepositoryGrpc.GalaxyRepositoryFutureStub rawFutureStub() {
         return withDeadline(futureStub);
     }
 
-    /**
-     * Returns the underlying async stub. Stream deadlines are applied per call.
-     *
-     * @return the async stub
-     */
     public GalaxyRepositoryGrpc.GalaxyRepositoryStub rawAsyncStub() {
         return asyncStub;
     }
 
     /**
-     * Invokes the {@code TestConnection} RPC and returns the {@code ok} flag.
-     *
-     * @return {@code true} when the gateway reached the Galaxy Repository database
-     * @throws MxGatewayException on transport or protocol failure
+     * Invoke the {@code TestConnection} RPC and return the {@code ok} flag.
      */
     public boolean testConnection() {
         try {
@@ -126,23 +98,14 @@ public final class GalaxyRepositoryClient implements AutoCloseable {
         }
     }
 
-    /**
-     * Invokes {@code TestConnection} asynchronously.
-     *
-     * @return a future completed with the {@code ok} flag, or completed
-     *         exceptionally with {@link MxGatewayException} on failure
-     */
     public CompletableFuture<Boolean> testConnectionAsync() {
         return toCompletable(rawFutureStub().testConnection(TestConnectionRequest.getDefaultInstance()))
                 .thenApply(TestConnectionReply::getOk);
     }
 
     /**
-     * Invokes the {@code GetLastDeployTime} RPC.
-     *
-     * @return the time of the last deploy, or {@link Optional#empty()} when the
-     *         server reports {@code present=false}
-     * @throws MxGatewayException on transport or protocol failure
+     * Invoke the {@code GetLastDeployTime} RPC. Returns {@link Optional#empty()}
+     * when the server reports {@code present=false}.
      */
     public Optional<Instant> getLastDeployTime() {
         try {
@@ -157,25 +120,15 @@ public final class GalaxyRepositoryClient implements AutoCloseable {
         }
     }
 
-    /**
-     * Invokes {@code GetLastDeployTime} asynchronously.
-     *
-     * @return a future completed with the time of the last deploy, or
-     *         {@link Optional#empty()} when the server reports {@code present=false};
-     *         completed exceptionally with {@link MxGatewayException} on failure
-     */
     public CompletableFuture<Optional<Instant>> getLastDeployTimeAsync() {
         return toCompletable(rawFutureStub().getLastDeployTime(GetLastDeployTimeRequest.getDefaultInstance()))
                 .thenApply(GalaxyRepositoryClient::mapDeployTime);
     }
 
     /**
-     * Invokes the {@code DiscoverHierarchy} RPC and returns the generated
+     * Invoke the {@code DiscoverHierarchy} RPC and return the generated
      * {@link GalaxyObject} messages directly. Callers can read every field of
      * the proto message without an extra DTO layer.
-     *
-     * @return the Galaxy object hierarchy
-     * @throws MxGatewayException on transport or protocol failure
      */
     public List<GalaxyObject> discoverHierarchy() {
         try {
@@ -203,24 +156,17 @@ public final class GalaxyRepositoryClient implements AutoCloseable {
         }
     }
 
-    /**
-     * Invokes {@code DiscoverHierarchy} asynchronously.
-     *
-     * @return a future completed with the Galaxy object hierarchy, or completed
-     *         exceptionally with {@link MxGatewayException} on failure
-     */
     public CompletableFuture<List<GalaxyObject>> discoverHierarchyAsync() {
         return discoverHierarchyPageAsync("", new java.util.ArrayList<>(), new java.util.HashSet<>());
     }
 
     /**
-     * Subscribes to {@code WatchDeployEvents} via the async stub and consumes
+     * Subscribe to {@code WatchDeployEvents} via the async stub and consume
      * results through a blocking iterator. Closing the returned stream cancels
      * the underlying gRPC call.
      *
-     * @param lastSeenDeployTime optional. When non-{@code null}, the bootstrap
-     *     event is suppressed if the cached deploy time matches.
-     * @return an iterator-style stream of deploy events
+     * @param lastSeenDeployTime optional. When non-null, the bootstrap event is
+     *     suppressed if the cached deploy time matches.
      */
     public DeployEventStream watchDeployEvents(Instant lastSeenDeployTime) {
         DeployEventStream stream = new DeployEventStream(16);
@@ -231,23 +177,15 @@ public final class GalaxyRepositoryClient implements AutoCloseable {
     /**
      * Iterator-style alias for {@link #watchDeployEvents(Instant)} matching the
      * task-spec signature.
-     *
-     * @param lastSeenDeployTime optional cached deploy time for bootstrap suppression
-     * @return an iterator over deploy events
      */
     public Iterator<DeployEvent> watchDeployEventsIterator(Instant lastSeenDeployTime) {
         return watchDeployEvents(lastSeenDeployTime);
     }
 
     /**
-     * Subscribes to {@code WatchDeployEvents} via the async stub, dispatching
+     * Subscribe to {@code WatchDeployEvents} via the async stub, dispatching
      * each event to {@code observer}. The returned subscription is cancellable
      * and {@link AutoCloseable}.
-     *
-     * @param lastSeenDeployTime optional cached deploy time for bootstrap suppression
-     * @param observer caller-supplied observer that receives events and completion
-     * @return a cancellable subscription handle
-     * @throws NullPointerException if {@code observer} is {@code null}
      */
     public DeployEventSubscription watchDeployEventsAsync(
             Instant lastSeenDeployTime, StreamObserver<DeployEvent> observer) {
@@ -283,13 +221,6 @@ public final class GalaxyRepositoryClient implements AutoCloseable {
         }
     }
 
-    /**
-     * Shuts the owned channel down and waits up to the configured connect
-     * timeout for termination, forcibly shutting it down on timeout. No-op
-     * for clients that do not own their channel.
-     *
-     * @throws InterruptedException if the calling thread is interrupted while waiting
-     */
     public void closeAndAwaitTermination() throws InterruptedException {
         if (ownedChannel != null) {
             ownedChannel.shutdown();

clients/java/mxgateway-client/src/main/java/com/dohertylan/mxgateway/client/MxAccessException.java

@@ -0,0 +1,14 @@
+package com.dohertylan.mxgateway.client;
+
+import mxaccess_gateway.v1.MxaccessGateway.MxCommandReply;
+import mxaccess_gateway.v1.MxaccessGateway.ProtocolStatus;
+
+public final class MxAccessException extends MxGatewayCommandException {
+    public MxAccessException(String operation, ProtocolStatus protocolStatus, MxCommandReply reply) {
+        super(operation, protocolStatus, reply);
+    }
+
+    public MxAccessException(String operation, MxCommandReply reply) {
+        super(operation, reply == null ? null : reply.getProtocolStatus(), reply);
+    }
+}

clients/java/mxgateway-client/src/main/java/com/dohertylan/mxgateway/client/MxEventStream.java

@@ -1,4 +1,4 @@
-package com.zb.mom.ww.mxgateway.client;
+package com.dohertylan.mxgateway.client;
 
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
@@ -12,16 +12,6 @@ import java.util.concurrent.BlockingQueue;
 import mxaccess_gateway.v1.MxaccessGateway.MxEvent;
 import mxaccess_gateway.v1.MxaccessGateway.StreamEventsRequest;
 
-/**
- * Iterator-style adaptor over the gateway {@code StreamEvents} server-streaming
- * RPC.
- *
- * <p>Events arrive on a background gRPC thread and are buffered in a bounded
- * blocking queue; the iterator drains them on the calling thread. Closing the
- * stream cancels the underlying gRPC call. If the queue overflows the call is
- * cancelled and a follow-up call to {@link #next()} throws
- * {@link MxGatewayException}.
- */
 public final class MxEventStream implements Iterator<MxEvent>, AutoCloseable {
     private static final Object END = new Object();
 

clients/java/mxgateway-client/src/main/java/com/dohertylan/mxgateway/client/MxGatewayAuthInterceptor.java

@@ -1,4 +1,4 @@
-package com.zb.mom.ww.mxgateway.client;
+package com.dohertylan.mxgateway.client;
 
 import io.grpc.CallOptions;
 import io.grpc.Channel;
@@ -8,22 +8,12 @@ import io.grpc.ForwardingClientCall;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 
-/**
- * gRPC client interceptor that attaches the {@code authorization: Bearer ...}
- * header carrying the gateway API key. A blank or {@code null} key disables
- * the interceptor so unauthenticated calls pass through unchanged.
- */
 public final class MxGatewayAuthInterceptor implements ClientInterceptor {
     static final Metadata.Key<String> AUTHORIZATION_HEADER =
             Metadata.Key.of("authorization", Metadata.ASCII_STRING_MARSHALLER);
 
     private final String apiKey;
 
-    /**
-     * Creates a new interceptor using the supplied API key.
-     *
-     * @param apiKey gateway API key; {@code null} or blank disables the interceptor
-     */
     public MxGatewayAuthInterceptor(String apiKey) {
         this.apiKey = apiKey == null ? "" : apiKey;
     }

clients/java/mxgateway-client/src/main/java/com/dohertylan/mxgateway/client/MxGatewayAuthenticationException.java

@@ -0,0 +1,7 @@
+package com.dohertylan.mxgateway.client;
+
+public final class MxGatewayAuthenticationException extends MxGatewayException {
+    public MxGatewayAuthenticationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

clients/java/mxgateway-client/src/main/java/com/dohertylan/mxgateway/client/MxGatewayAuthorizationException.java

@@ -0,0 +1,7 @@
+package com.dohertylan.mxgateway.client;
+
+public final class MxGatewayAuthorizationException extends MxGatewayException {
+    public MxGatewayAuthorizationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

clients/java/mxgateway-client/src/main/java/com/dohertylan/mxgateway/client/MxGatewayClient.java

@@ -1,4 +1,4 @@
-package com.zb.mom.ww.mxgateway.client;
+package com.dohertylan.mxgateway.client;
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -15,10 +15,6 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import javax.net.ssl.SSLException;
 import mxaccess_gateway.v1.MxAccessGatewayGrpc;
-import mxaccess_gateway.v1.MxaccessGateway.AcknowledgeAlarmReply;
-import mxaccess_gateway.v1.MxaccessGateway.AcknowledgeAlarmRequest;
-import mxaccess_gateway.v1.MxaccessGateway.ActiveAlarmSnapshot;
-import mxaccess_gateway.v1.MxaccessGateway.AlarmFeedMessage;
 import mxaccess_gateway.v1.MxaccessGateway.CloseSessionReply;
 import mxaccess_gateway.v1.MxaccessGateway.CloseSessionRequest;
 import mxaccess_gateway.v1.MxaccessGateway.MxCommandReply;
@@ -27,19 +23,8 @@ import mxaccess_gateway.v1.MxaccessGateway.MxEvent;
 import mxaccess_gateway.v1.MxaccessGateway.OpenSessionReply;
 import mxaccess_gateway.v1.MxaccessGateway.OpenSessionRequest;
 import mxaccess_gateway.v1.MxaccessGateway.ProtocolStatusCode;
-import mxaccess_gateway.v1.MxaccessGateway.QueryActiveAlarmsRequest;
-import mxaccess_gateway.v1.MxaccessGateway.StreamAlarmsRequest;
 import mxaccess_gateway.v1.MxaccessGateway.StreamEventsRequest;
 
-/**
- * Idiomatic Java wrapper around the generated {@code MxAccessGateway} gRPC
- * stubs.
- *
- * <p>Owns or borrows a {@link ManagedChannel}, attaches a
- * {@link MxGatewayAuthInterceptor} carrying the configured API key, and
- * exposes blocking, future, and async stub variants. Translates protocol
- * status failures into typed {@link MxGatewayException} subclasses.
- */
 public final class MxGatewayClient implements AutoCloseable {
     private final ManagedChannel ownedChannel;
     private final MxGatewayClientOptions options;
@@ -56,14 +41,6 @@ public final class MxGatewayClient implements AutoCloseable {
         asyncStub = MxAccessGatewayGrpc.newStub(intercepted);
     }
 
-    /**
-     * Constructs a client over a caller-managed {@link Channel}. The caller
-     * owns channel lifecycle; {@link #close()} is a no-op for this constructor.
-     *
-     * @param channel the gRPC channel to use for outbound calls
-     * @param options the client options carrying the API key and timeouts
-     * @throws NullPointerException if {@code options} is {@code null}
-     */
     public MxGatewayClient(Channel channel, MxGatewayClientOptions options) {
         this.ownedChannel = null;
         this.options = Objects.requireNonNull(options, "options");
@@ -73,64 +50,27 @@ public final class MxGatewayClient implements AutoCloseable {
         asyncStub = MxAccessGatewayGrpc.newStub(intercepted);
     }
 
-    /**
-     * Builds a new client and owns its channel; {@link #close()} shuts the
-     * channel down.
-     *
-     * @param options the client options carrying the endpoint and credentials
-     * @return a connected client
-     */
     public static MxGatewayClient connect(MxGatewayClientOptions options) {
         return new MxGatewayClient(createChannel(options), options);
     }
 
-    /**
-     * Returns the underlying blocking stub with the per-call deadline applied.
-     *
-     * @return the blocking stub
-     */
     public MxAccessGatewayGrpc.MxAccessGatewayBlockingStub rawBlockingStub() {
         return withDeadline(blockingStub);
     }
 
-    /**
-     * Returns the underlying future stub with the per-call deadline applied.
-     *
-     * @return the future stub
-     */
     public MxAccessGatewayGrpc.MxAccessGatewayFutureStub rawFutureStub() {
         return withDeadline(futureStub);
     }
 
-    /**
-     * Returns the underlying async stub. Stream deadlines are applied per call.
-     *
-     * @return the async stub
-     */
     public MxAccessGatewayGrpc.MxAccessGatewayStub rawAsyncStub() {
         return asyncStub;
     }
 
-    /**
-     * Opens a gateway session and returns a typed handle for further commands.
-     *
-     * @param request the {@code OpenSessionRequest} to send
-     * @return a session bound to the resulting {@code OpenSessionReply}
-     * @throws MxGatewayException on transport or protocol failure
-     */
     public MxGatewaySession openSession(OpenSessionRequest request) {
         OpenSessionReply reply = openSessionRaw(request);
         return new MxGatewaySession(this, reply);
     }
 
-    /**
-     * Opens a gateway session using the configured call timeout for the
-     * worker command timeout and a caller-supplied client session name.
-     *
-     * @param clientSessionName the human-readable session name reported by the gateway
-     * @return a session bound to the resulting {@code OpenSessionReply}
-     * @throws MxGatewayException on transport or protocol failure
-     */
     public MxGatewaySession openSession(String clientSessionName) {
         return openSession(OpenSessionRequest.newBuilder()
                 .setClientSessionName(clientSessionName)
@@ -141,13 +81,6 @@ public final class MxGatewayClient implements AutoCloseable {
                 .build());
     }
 
-    /**
-     * Invokes {@code OpenSession} and returns the raw reply.
-     *
-     * @param request the {@code OpenSessionRequest} to send
-     * @return the raw {@code OpenSessionReply}
-     * @throws MxGatewayException on transport or protocol failure
-     */
     public OpenSessionReply openSessionRaw(OpenSessionRequest request) {
         try {
             OpenSessionReply reply = rawBlockingStub().openSession(request);
@@ -161,13 +94,6 @@ public final class MxGatewayClient implements AutoCloseable {
         }
     }
 
-    /**
-     * Invokes {@code OpenSession} asynchronously.
-     *
-     * @param request the {@code OpenSessionRequest} to send
-     * @return a future completed with the raw reply, or completed exceptionally
-     *         with {@link MxGatewayException} on failure
-     */
     public CompletableFuture<OpenSessionReply> openSessionAsync(OpenSessionRequest request) {
         CompletableFuture<OpenSessionReply> future = toCompletable(rawFutureStub().openSession(request));
         return future.thenApply(reply -> {
@@ -176,15 +102,6 @@ public final class MxGatewayClient implements AutoCloseable {
         });
     }
 
-    /**
-     * Invokes the {@code Invoke} unary RPC and validates both the protocol
-     * status and any MXAccess-side failure carried in the reply.
-     *
-     * @param request the {@code MxCommandRequest} to send
-     * @return the raw command reply
-     * @throws MxGatewayException on transport or protocol failure
-     * @throws MxAccessException when the worker reports an MXAccess COM-side failure
-     */
     public MxCommandReply invoke(MxCommandRequest request) {
         try {
             MxCommandReply reply = rawBlockingStub().invoke(request);
@@ -199,14 +116,6 @@ public final class MxGatewayClient implements AutoCloseable {
         }
     }
 
-    /**
-     * Invokes the {@code Invoke} RPC asynchronously.
-     *
-     * @param request the {@code MxCommandRequest} to send
-     * @return a future completed with the raw reply, or completed exceptionally
-     *         with {@link MxGatewayException} (including {@link MxAccessException})
-     *         on failure
-     */
     public CompletableFuture<MxCommandReply> invokeAsync(MxCommandRequest request) {
         CompletableFuture<MxCommandReply> future = toCompletable(rawFutureStub().invoke(request));
         return future.thenApply(reply -> {
@@ -216,13 +125,6 @@ public final class MxGatewayClient implements AutoCloseable {
         });
     }
 
-    /**
-     * Invokes the {@code CloseSession} unary RPC.
-     *
-     * @param request the {@code CloseSessionRequest} to send
-     * @return the raw reply
-     * @throws MxGatewayException on transport or protocol failure
-     */
     public CloseSessionReply closeSessionRaw(CloseSessionRequest request) {
         try {
             CloseSessionReply reply = rawBlockingStub().closeSession(request);
@@ -236,28 +138,12 @@ public final class MxGatewayClient implements AutoCloseable {
         }
     }
 
-    /**
-     * Subscribes to the {@code StreamEvents} server-streaming RPC and exposes
-     * results as a blocking iterator. Closing the returned stream cancels the
-     * underlying gRPC call.
-     *
-     * @param request the {@code StreamEventsRequest} carrying the session id and resume cursor
-     * @return an iterator-style stream of events
-     */
     public MxEventStream streamEvents(StreamEventsRequest request) {
         MxEventStream stream = new MxEventStream(16);
         withStreamDeadline(rawAsyncStub()).streamEvents(request, stream.observer());
         return stream;
     }
 
-    /**
-     * Subscribes to {@code StreamEvents} and dispatches each event to the
-     * supplied observer. The returned subscription is cancellable.
-     *
-     * @param request the {@code StreamEventsRequest} to send
-     * @param observer caller-supplied observer that receives events and completion
-     * @return a cancellable subscription handle
-     */
     public MxGatewayEventSubscription streamEventsAsync(
             StreamEventsRequest request, StreamObserver<MxEvent> observer) {
         MxGatewayEventSubscription subscription = new MxGatewayEventSubscription();
@@ -265,84 +151,6 @@ public final class MxGatewayClient implements AutoCloseable {
         return subscription;
     }
 
-    /**
-     * Acknowledges an active MXAccess alarm condition through the gateway.
-     *
-     * <p>The gateway authenticates the request against the API key's
-     * {@code invoke:alarm-ack} scope and forwards the acknowledge to the
-     * worker's MXAccess session; the resulting native MxStatus is returned
-     * in the reply. Acks are idempotent at the MxAccess layer.
-     *
-     * @param request the {@code AcknowledgeAlarmRequest}
-     * @return the raw acknowledge reply
-     * @throws MxGatewayException on transport or protocol failure
-     */
-    public AcknowledgeAlarmReply acknowledgeAlarm(AcknowledgeAlarmRequest request) {
-        try {
-            AcknowledgeAlarmReply reply = rawBlockingStub().acknowledgeAlarm(request);
-            MxGatewayErrors.ensureProtocolSuccess("acknowledge alarm", reply.getProtocolStatus(), null);
-            return reply;
-        } catch (RuntimeException error) {
-            if (error instanceof MxGatewayException) {
-                throw error;
-            }
-            throw MxGatewayErrors.fromGrpc("acknowledge alarm", error);
-        }
-    }
-
-    /**
-     * Acknowledges an active MXAccess alarm condition asynchronously.
-     *
-     * @param request the {@code AcknowledgeAlarmRequest}
-     * @return a future completed with the raw reply, or completed exceptionally
-     *         with {@link MxGatewayException} on failure
-     */
-    public CompletableFuture<AcknowledgeAlarmReply> acknowledgeAlarmAsync(AcknowledgeAlarmRequest request) {
-        CompletableFuture<AcknowledgeAlarmReply> future = toCompletable(rawFutureStub().acknowledgeAlarm(request));
-        return future.thenApply(reply -> {
-            MxGatewayErrors.ensureProtocolSuccess("acknowledge alarm", reply.getProtocolStatus(), null);
-            return reply;
-        });
-    }
-
-    /**
-     * Streams a snapshot of all alarms currently Active or ActiveAcked — the
-     * gateway's ConditionRefresh equivalent. Used after reconnect to seed
-     * local Part 9 state.
-     *
-     * @param request the {@code QueryActiveAlarmsRequest}, optionally scoped by
-     *                alarm-reference prefix
-     * @param observer caller-supplied observer that receives snapshots and completion
-     * @return a cancellable subscription handle
-     */
-    public MxGatewayActiveAlarmsSubscription queryActiveAlarms(
-            QueryActiveAlarmsRequest request, StreamObserver<ActiveAlarmSnapshot> observer) {
-        MxGatewayActiveAlarmsSubscription subscription = new MxGatewayActiveAlarmsSubscription();
-        withStreamDeadline(rawAsyncStub()).queryActiveAlarms(request, subscription.wrap(observer));
-        return subscription;
-    }
-
-    /**
-     * Attaches to the gateway's central alarm feed. The stream opens with one
-     * {@code AlarmFeedMessage} per currently-active alarm (the ConditionRefresh
-     * snapshot), then a single {@code snapshot_complete}, then a
-     * {@code transition} for every subsequent raise / acknowledge / clear.
-     *
-     * <p>Served by the gateway's always-on alarm monitor — no worker session is
-     * opened — so any number of clients may attach.
-     *
-     * @param request the {@code StreamAlarmsRequest}, optionally scoped by
-     *                alarm-reference prefix
-     * @param observer caller-supplied observer that receives feed messages and completion
-     * @return a cancellable subscription handle
-     */
-    public MxGatewayAlarmFeedSubscription streamAlarms(
-            StreamAlarmsRequest request, StreamObserver<AlarmFeedMessage> observer) {
-        MxGatewayAlarmFeedSubscription subscription = new MxGatewayAlarmFeedSubscription();
-        withStreamDeadline(rawAsyncStub()).streamAlarms(request, subscription.wrap(observer));
-        return subscription;
-    }
-
     @Override
     public void close() {
         if (ownedChannel != null) {
@@ -350,13 +158,6 @@ public final class MxGatewayClient implements AutoCloseable {
         }
     }
 
-    /**
-     * Shuts the owned channel down and waits up to the configured connect
-     * timeout for termination, forcibly shutting it down on timeout. No-op
-     * for clients that do not own their channel.
-     *
-     * @throws InterruptedException if the calling thread is interrupted while waiting
-     */
     public void closeAndAwaitTermination() throws InterruptedException {
         if (ownedChannel != null) {
             ownedChannel.shutdown();

clients/java/mxgateway-client/src/main/java/com/dohertylan/mxgateway/client/MxGatewayClientOptions.java

@@ -1,16 +1,9 @@
-package com.zb.mom.ww.mxgateway.client;
+package com.dohertylan.mxgateway.client;
 
 import java.nio.file.Path;
 import java.time.Duration;
 import java.util.Objects;
 
-/**
- * Immutable configuration for {@link MxGatewayClient} and
- * {@link GalaxyRepositoryClient}.
- *
- * <p>Captures the gateway endpoint, API key, transport security selection and
- * call/stream timeouts. Instances are constructed via {@link #builder()}.
- */
 public final class MxGatewayClientOptions {
     private static final Duration DEFAULT_CONNECT_TIMEOUT = Duration.ofSeconds(10);
     private static final Duration DEFAULT_CALL_TIMEOUT = Duration.ofSeconds(30);
@@ -40,93 +33,42 @@ public final class MxGatewayClientOptions {
                 : builder.maxGrpcMessageBytes;
     }
 
-    /**
-     * Returns a fresh builder with default timeouts and no endpoint set.
-     *
-     * @return a new {@link Builder}
-     */
     public static Builder builder() {
         return new Builder();
     }
 
-    /**
-     * Returns the configured gRPC target endpoint.
-     *
-     * @return the endpoint string in {@code host:port} or DNS-target form
-     */
     public String endpoint() {
         return endpoint;
     }
 
-    /**
-     * Returns the configured API key, or an empty string if none was supplied.
-     *
-     * @return the raw API key
-     */
     public String apiKey() {
         return apiKey;
     }
 
-    /**
-     * Returns the API key with the body redacted, safe to write to logs.
-     *
-     * @return the redacted form produced by {@link MxGatewaySecrets#redactApiKey(String)}
-     */
     public String redactedApiKey() {
         return MxGatewaySecrets.redactApiKey(apiKey);
     }
 
-    /**
-     * Returns whether the client is configured to use plaintext transport.
-     *
-     * @return {@code true} for plaintext, {@code false} for TLS
-     */
     public boolean plaintext() {
         return plaintext;
     }
 
-    /**
-     * Returns the configured CA certificate file used to verify the gateway,
-     * or {@code null} when the platform trust store is used.
-     *
-     * @return the CA certificate path, or {@code null}
-     */
     public Path caCertificatePath() {
         return caCertificatePath;
     }
 
-    /**
-     * Returns the TLS server-name override, or an empty string when none was supplied.
-     *
-     * @return the server-name override
-     */
     public String serverNameOverride() {
         return serverNameOverride;
     }
 
-    /**
-     * Returns the channel connect timeout.
-     *
-     * @return the connect timeout duration
-     */
     public Duration connectTimeout() {
         return connectTimeout;
     }
 
-    /**
-     * Returns the per-call deadline applied to unary RPCs.
-     *
-     * @return the call timeout duration
-     */
     public Duration callTimeout() {
         return callTimeout;
     }
 
-    /**
-     * Returns the deadline applied to server-streaming RPCs, or {@code null} when none is set.
-     *
-     * @return the stream timeout duration, or {@code null}
-     */
     public Duration streamTimeout() {
         return streamTimeout;
     }
@@ -169,9 +111,6 @@ public final class MxGatewayClientOptions {
         return value;
     }
 
-    /**
-     * Mutable builder for {@link MxGatewayClientOptions}.
-     */
     public static final class Builder {
         private String endpoint;
         private String apiKey;
@@ -186,92 +125,41 @@ public final class MxGatewayClientOptions {
         private Builder() {
         }
 
-        /**
-         * Sets the gRPC target endpoint.
-         *
-         * @param value endpoint in {@code host:port} or DNS-target form; required
-         * @return this builder
-         */
         public Builder endpoint(String value) {
             endpoint = value;
             return this;
         }
 
-        /**
-         * Sets the API key sent in the {@code authorization} header.
-         *
-         * @param value the API key, or {@code null}/blank to disable authentication
-         * @return this builder
-         */
         public Builder apiKey(String value) {
             apiKey = value;
             return this;
         }
 
-        /**
-         * Selects plaintext transport instead of TLS.
-         *
-         * @param value {@code true} for plaintext, {@code false} for TLS
-         * @return this builder
-         */
         public Builder plaintext(boolean value) {
             plaintext = value;
             return this;
         }
 
-        /**
-         * Sets the CA certificate used to verify the gateway server.
-         *
-         * @param value path to a PEM-encoded CA certificate, or {@code null} to use the platform trust store
-         * @return this builder
-         */
         public Builder caCertificatePath(Path value) {
             caCertificatePath = value;
             return this;
         }
 
-        /**
-         * Overrides the TLS server name used during the handshake.
-         *
-         * @param value the override host name, or empty/{@code null} for none
-         * @return this builder
-         */
         public Builder serverNameOverride(String value) {
             serverNameOverride = value;
             return this;
         }
 
-        /**
-         * Sets the channel connect timeout.
-         *
-         * @param value the connect timeout, must be non-{@code null}
-         * @return this builder
-         * @throws NullPointerException if {@code value} is {@code null}
-         */
         public Builder connectTimeout(Duration value) {
             connectTimeout = Objects.requireNonNull(value, "connectTimeout");
             return this;
         }
 
-        /**
-         * Sets the per-call deadline applied to unary RPCs.
-         *
-         * @param value the call timeout, must be non-{@code null}
-         * @return this builder
-         * @throws NullPointerException if {@code value} is {@code null}
-         */
         public Builder callTimeout(Duration value) {
             callTimeout = Objects.requireNonNull(value, "callTimeout");
             return this;
         }
 
-        /**
-         * Sets the deadline applied to server-streaming RPCs.
-         *
-         * @param value the stream timeout, must be non-{@code null}
-         * @return this builder
-         * @throws NullPointerException if {@code value} is {@code null}
-         */
         public Builder streamTimeout(Duration value) {
             streamTimeout = Objects.requireNonNull(value, "streamTimeout");
             return this;
@@ -282,12 +170,6 @@ public final class MxGatewayClientOptions {
             return this;
         }
 
-        /**
-         * Builds an immutable {@link MxGatewayClientOptions} from the current state.
-         *
-         * @return a new options instance
-         * @throws IllegalArgumentException if {@code endpoint} was not set or is blank
-         */
         public MxGatewayClientOptions build() {
             return new MxGatewayClientOptions(this);
         }

clients/java/mxgateway-client/src/main/java/com/dohertylan/mxgateway/client/MxGatewayClientVersion.java

@@ -0,0 +1,22 @@
+package com.dohertylan.mxgateway.client;
+
+public final class MxGatewayClientVersion {
+    private static final int GATEWAY_PROTOCOL_VERSION = 2;
+    private static final int WORKER_PROTOCOL_VERSION = 1;
+    private static final String CLIENT_VERSION = "0.1.0";
+
+    private MxGatewayClientVersion() {
+    }
+
+    public static String clientVersion() {
+        return CLIENT_VERSION;
+    }
+
+    public static int gatewayProtocolVersion() {
+        return GATEWAY_PROTOCOL_VERSION;
+    }
+
+    public static int workerProtocolVersion() {
+        return WORKER_PROTOCOL_VERSION;
+    }
+}

clients/java/mxgateway-client/src/main/java/com/dohertylan/mxgateway/client/MxGatewayCommandException.java

@@ -0,0 +1,23 @@
+package com.dohertylan.mxgateway.client;
+
+import mxaccess_gateway.v1.MxaccessGateway.MxCommandReply;
+import mxaccess_gateway.v1.MxaccessGateway.ProtocolStatus;
+
+public class MxGatewayCommandException extends MxGatewayException {
+    private final ProtocolStatus protocolStatus;
+    private final MxCommandReply reply;
+
+    public MxGatewayCommandException(String operation, ProtocolStatus protocolStatus, MxCommandReply reply) {
+        super(MxGatewayErrors.protocolStatusMessage(operation, protocolStatus));
+        this.protocolStatus = protocolStatus;
+        this.reply = reply;
+    }
+
+    public ProtocolStatus protocolStatus() {
+        return protocolStatus;
+    }
+
+    public MxCommandReply reply() {
+        return reply;
+    }
+}