Skip to content

reconcile: preserve main V65 WIRE + updater with qualified SOF and SonKu native graph - #642

Merged
masarray merged 16 commits into
feat/8d-sonku-p0-editor-recovery-20261113from
integration/sof-sonku-main-v65-reconcile-20261113
Nov 13, 2026
Merged

masarray merged 16 commits into
feat/8d-sonku-p0-editor-recovery-20261113from
integration/sof-sonku-main-v65-reconcile-20261113

Conversation

@masarray

Copy link
Copy Markdown
Owner

Full graph-preserving reconciliation milestone

Target: current #606 draft, not main. Real 2-parent git merge commit c63226ff366781174f93b3b60106380f17711402 with parents #606 820517df... and main a6b8a3f... (V61–V65 WIRE motion and M4 updater security/probe).

Safety proof before writing

Analyzed complete merge-base→main delta: only five files changed. Three files (installer/ArSonMixAutoUpdate.ps1, tests/pages_v60_fader_wire_tactile_smoke.py, tests/windows_installer_contract_test.mjs) were byte-identical in #606 and merge base, so copied exactly from latest main. In two overlapping files (site/preview-v2/index.html, src/Main.cpp), all 24 individual diff hunks matched uniquely inside #606. Replay on merge-base reproduced main file byte-for-byte before replaying same hunks on #606. No -X ours/theirs, force push, silent overwrites, or unrelated branch merges. Both parents and histories are preserved.

Acceptance gates

  • Fast UI/source provenance including V65 WIRE motion and approved preview
  • Fast native/PCM, logical roster and latest updater installer contract
  • Real Chromium native SonKu + SOF ACK/EdgeId/readback and WIRE visual coverage
  • Selective one exact-SHA Windows MSVC/CTest after cheap gates pass; no automatic public release until physical ASIO listening/field testing.

#629 SonKu V2 remains a separate draft and is NOT silently merged. #614 parallel PCM draft not blindly pulled in. This PR is an integration candidate until checks complete.

…um (#624)

* fix(gui): expose selected cable by focusing source after accepted drag or route choice

* test(chromium): probe encapsulated motion via exact source and support incoming cable jacket
* feat(gui): slower damped WIRE wave and physically falling/reeling unplug with replug animation after render

* test(chromium): verify stronger end damping, relocated WIRE spring and physical unplug drop/retraction

* fix(gui): draw detached cable synchronously at successful unplug before first RAF
* fix(gui): length-adaptive short WIRE whip and true falling-hanging-reeling cable with trailing ripple

* test(chromium): length-scaled WIRE amplitudes and real fall-hang-reel timing with trailing flutter
* fix(gui): OUT-launched damped wave while unplugged cable reels home, no fall or hang

* test(chromium): prove OUT-origin reel wave, active shortening and absence of falling/hanging phases
…pgrade (#628)

* feat(updater): gate on-exit upgrades on exact user acknowledgement

* feat(updater): nonblocking single-OK acknowledgement after verified staging

* test(updater): assert consent gate and safe notification

* fix(updater): exact consent, offline policy fixtures, and nonblocking dialog

* fix(updater): exact consent, offline policy fixtures, and nonblocking dialog

* fix(updater): exact consent, offline policy fixtures, and nonblocking dialog

* feat(updater): silent GUI-only post-install probe with no ASIO auto-rearm or surprise relaunch

* feat(updater): silent GUI-only post-install probe with no ASIO auto-rearm or surprise relaunch

* feat(updater): silent GUI-only post-install probe with no ASIO auto-rearm or surprise relaunch

* test(updater): verify probe short-circuit without indentation-sensitive search

* fix(updater): nonmodal compact OK window keeps live mixer controls usable

* test(updater): require explicit OK and nonmodal no-audio UX

* fix(updater): exit safely when WebView2 probe cannot initialize, preserving rollback

* test(updater): pre-window GUI probe failures do not strand installer recovery

* fix(updater): never dismiss one-click OK until approval is durably saved

* test(updater): failed consent write stays visible and offers retry
* fix(gui): quick 520ms OUT-origin reel, full jacket whip and physically free oscillating plug

* test(chromium): require fast full-jacket wave and free-plug motion during accepted WIRE unplug

* test(chromium): normalize Python continuation escapes in V65 assertions

* test(ui): update fast source contract to V65 full-cable wavefront
…ution point (#641)

Bounded release pagination for legacy baseline and exact SHA checks on both staged packages before Inno and rollback; Windows smoke + policy contracts passed.
…egration

Faithful replay of all 24 exact unique hunks in two overlapping files, verified by reproducing main from merge base. Three non-overlap files copied byte-exact from main; both Git parents retained.

Candidate only: qualify latest Windows MSVC, Chromium and PCM before promotion.
@cloudflare-workers-and-pages

cloudflare-workers-and-pages Bot commented Nov 13, 2026 •

Copy link
Copy Markdown

Deploying arsonmix with  Cloudflare Pages  Cloudflare Pages

Latest commit: 7403f8a
Status: ✅  Deploy successful!
Preview URL: https://4ca6ff59.arsonmix.pages.dev
Branch Preview URL: https://integration-sof-sonku-main-v.arsonmix.pages.dev

View logs

* fix(gui): V66 brisk 330ms reel, amplified full-span OUT whip and freely swinging plug dot

* test(chromium): prove 330ms reel, full-span oscillations and free dot whipping both directions

* test(gui): update V66 source contract to new OUT-front wave statement
Replayed two exact public GUI and three V66 motion-contract hunks;
verified patch replay against prior main reproduces byte-for-byte latest main.
Keep both parents and native WebView/PCM work; no force push or release.
@masarray
masarray marked this pull request as ready for review November 13, 2026 06:33
@masarray
masarray merged commit b2810b5 into feat/8d-sonku-p0-editor-recovery-20261113 Nov 13, 2026
14 checks passed
@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, you can upgrade your account or add credits to your account and enable them for code reviews in your settings.

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