Skip to content

Integration A+B: M2.13 SSOT + M2.14 Browser with unified phasor authority - #566

Draft
masarray wants to merge 15 commits into
feat/ied-browser-m2-model-hierarchy-report-qtime-20261014from
integration/m2-13j-m2-14-canonical-evidence-20261015
Draft

masarray wants to merge 15 commits into
feat/ied-browser-m2-model-hierarchy-report-qtime-20261014from
integration/m2-13j-m2-14-canonical-evidence-20261015

Conversation

@masarray

@masarray masarray commented Oct 15, 2026 •

Copy link
Copy Markdown
Owner

A+B reconciliation candidate — engineering only

Exact source: c2ff6948d8ef225da2a03d8c2db148fc749f19aa

Ancestry / ownership

Actual cross-thread conflict resolved

  • Browser had two separate active vector presenters: strict M2.14 phasor for up to three modeled components versus M2.13 independent vector fallback for 4+ components (including neutral). The fallback could display ∠ from magnitude and angle with incompatible IED timestamps.
  • WPF now invokes only the M2.14 composite facade. It preserves strict compatibility for verified normal polar families and dispatches extra modeled components to independent-evidence presentation. Both use the same association, source, timestamp and staleness compatibility method; incompatible angle remains explicitly separate, not a verified phasor.
  • No fabricated missing phases, cross-FC or phase unit borrowing, no additional MMS operations.
  • CF units compound row explicitly reports current vs stale vs historical discovery evidence; a model-bound historical snapshot is never labeled current.
  • New cross-thread regression covers four-component neutral + mismatched angle timestamp, validated pairing after matching timestamp, strict three-phase route, and stale/historical CF provenance. Existing M2.13 and M2.14 tests preserved and adapted to the single runtime entry point.

Acceptance gates

  1. Exact-SHA Windows WPF compile + full ARSAS tests, pinned ARIEC gate, ArdIrec native + CTest, portable EXE smoke, package provenance.
  2. SCL/field-capture/CI routing; all workflows succeed on this HEAD.
  3. Physical BCUGE field test for MX, units.SIUnit, multiplier, db, dbAng, rangeC, q/t, reconnect and multi-RCB, plus performance/latency.
  4. Review stacked PR dependency ordering prior to any public promotion. No merge without user approval.

Do not claim physical/field acceptance based on CI.

Exact-SHA A+B integration CI checkpoint — VERIFIED 2026-10-15

Copy link
Copy Markdown
Owner Author

Reconciliation checkpoint from M2.14 Thread B — I audited your consolidated #566 against the latest Browser/UI stack. #566 has 2 follow-up commits beyond #563 that were not ancestors of #571: unified composer dispatch and proper CF current/historical/stale authority. I have ported those two missing behaviors, without overwriting any existing improvements, into stacked draft PR #572 at 6da4200031d48ee19a055a0563b1aef604b34602, based on UI #571 head 15947f4efd18.

This preserves #570 scalar MV no-angle protection, #569 SG read binding, #568 SGCB/GoCB safe read, #567 phasor compatibility and #571 UI/icons. Critical delta: neutral/res vector presentations now pass only through IedBrowserEngineeringComposite.TryCompose with one CanPair compatibility rule; CF units parent distinguishes historical discovery, stale, and current read evidence. Three focused regression tests added. Windows CI running; physical ZIV/BCUGE not yet verified. All predecessor branches are untouched and Draft. Please coordinate future CF/SSOT changes against #572; do not independently merge an older phasor dispatcher.

Copy link
Copy Markdown
Owner Author

Exact-SHA integration gate PASS on PR #572 6da4200031d48ee19a055a0563b1aef604b34602. Windows Build #38677626651: ARSAS 1,964/1,964 passed, pinned ARIEC 19/19, native CTest 9/9, packaged managed 6/6, portable smoke passed. Exact-SHA ARSAS-win-x64-portable-single-exe artifact 11947825520 available, not expired. All non-field-capture workflows are success; Field Capture workflow was still running on last check.

The two missing consolidated Thread A #566 semantic corrections (CF source historical/current/stale; one composer dispatcher for neutral/net/res) now coexist with Thread B #570 MV no-angle fix, SG read and GUI icon PR #571 without mutating predecessor branches. Main/stable untouched. Physical BCUGE/ZIV acceptance pending; subsequent canonical SSOT updates should review #572 delta and avoid reintroducing the dual presentation path.

Copy link
Copy Markdown
Owner Author

New shared integration baseline PR #573 #573 — HEAD d7313f11993c32634403153640d2f991ec8e6abc — combines latest Thread B PR #572 first parent 6da42000 with prior PR #566 second parent adca74da, preserving all newer SG/SGCB/GoCB, no-angle scalar MV, WPF operator UI and M2.13 SSOT/CF safeguards. This adds deterministic M2.13K stress tests (8 report channels x 12 points, 6,144 report/read publications; 128 reconnects; exact FC/case) without modifying runtime/engine/main. 10/10 exact-SHA CI SUCCESS, Windows regression 1,967/1,967, native bridge and portable smoke SUCCESS. Artifact https://github.com/masarray/arsas/actions/runs/38679261976/artifacts/11946912970. Physical BCUGE and sustained real multi-RCB/p95 WPF latency remain pending; do not supersede/merge stacked PRs without owner/user review.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant