Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion .github/workflows/p1-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,31 @@ jobs:
/tmp/sonku-p98-scene-candidate > /tmp/sonku-p98-scene-candidate.csv
cat /tmp/sonku-p98-venue-reference.csv /tmp/sonku-p98-scene-candidate.csv
python3 scripts/verify_sonku_p98_scenes.py /tmp/sonku-p98-venue-reference.csv /tmp/sonku-p98-scene-candidate.csv
if [[ "${{ github.head_ref }}" == feat/sonku-p98-p99-* ]]; then
node tests/sonku_p99_gui_contract_test.cjs
g++ -std=c++20 -O2 -Wall -Wextra -Werror -pedantic tests/sonku_p99_vocal_depth_source_test.cpp -o /tmp/sonku-p99-unit
/tmp/sonku-p99-unit
g++ $PRESET_FLAGS -DSONKU_P98_SCENE_VOICING_RESEARCH=1 -DSONKU_P99_MUSICAL_VOCAL_DEPTH_RESEARCH=1 tests/sonku_p99_default_orbit_source_test.cpp -o /tmp/sonku-p99-default-orbit
/tmp/sonku-p99-default-orbit
g++ $PRESET_FLAGS -DSONKU_P98_SCENE_VOICING_RESEARCH=1 -DSONKU_P99_MUSICAL_VOCAL_DEPTH_RESEARCH=1 tests/sonku_p98_integrated_scene_test.cpp -o /tmp/sonku-p99-integrated
/tmp/sonku-p99-integrated > /tmp/sonku-p99-integrated.csv
python3 scripts/verify_sonku_p99_vocal_depth.py /tmp/sonku-p98-scene-candidate.csv /tmp/sonku-p99-integrated.csv
# A separate branded insert may share this native core,
# but its FULL PCM must remain bit-identical to P9.8
# unless that instance explicitly opts into P9.9.
# Prove all 24 front/rear/rate/scene cases, not a grep.
g++ $PRESET_FLAGS -DSONKU_P98_SCENE_VOICING_RESEARCH=1 -DSONKU_P99_MUSICAL_VOCAL_DEPTH_RESEARCH=1 -DSONKU_P99_SHARED_CORE_UNOPTED_TEST=1 tests/sonku_p98_integrated_scene_test.cpp -o /tmp/sonku-p99-unopted-shared-core
/tmp/sonku-p99-unopted-shared-core > /tmp/sonku-p99-unopted-shared-core.csv
python3 scripts/verify_sonku_p99_shared_core_isolation.py /tmp/sonku-p98-scene-candidate.csv /tmp/sonku-p99-unopted-shared-core.csv
# Additional full-graph 320 Hz ROOM BODY probe; preserve
# the old 86 Hz and all approved P9.8 / Venue fixtures.
BODY_FLAGS="$PRESET_FLAGS -DSONKU_P98_SCENE_VOICING_RESEARCH=1 -DSONKU_P99_ROOM_BODY_PROBE=1"
g++ $BODY_FLAGS tests/sonku_p98_integrated_scene_test.cpp -o /tmp/sonku-p99-body-reference
/tmp/sonku-p99-body-reference > /tmp/sonku-p99-body-reference.csv
g++ $BODY_FLAGS -DSONKU_P99_MUSICAL_VOCAL_DEPTH_RESEARCH=1 tests/sonku_p98_integrated_scene_test.cpp -o /tmp/sonku-p99-body-candidate
/tmp/sonku-p99-body-candidate > /tmp/sonku-p99-body-candidate.csv
python3 scripts/verify_sonku_p99_room_body.py /tmp/sonku-p99-body-reference.csv /tmp/sonku-p99-body-candidate.csv
fi
fi
fi
fi
Expand Down Expand Up @@ -760,6 +785,7 @@ jobs:
$p96flag = if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p95-p96-*' -or $env:GITHUB_HEAD_REF -like 'feat/sonku-p98-*') { 'ON' } else { 'OFF' }
$p97flag = if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p95-p96-p97-*' -or $env:GITHUB_HEAD_REF -like 'feat/sonku-p98-*') { 'ON' } else { 'OFF' }
$p98flag = if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p98-*') { 'ON' } else { 'OFF' }
$p99flag = if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p98-p99-*') { 'ON' } else { 'OFF' }
cmake -S . -B build -G "Visual Studio 17 2022" -A x64 `
-DJUCE_ROOT="$env:GITHUB_WORKSPACE/third_party/JUCE" `
-DJUCE_WEBVIEW2_PACKAGE_LOCATION="$env:GITHUB_WORKSPACE/.deps" `
Expand All @@ -780,6 +806,7 @@ jobs:
-DARMIX_SONKU_EXPERIMENTAL_P96_DISTANCE_REINFORCEMENT=$p96flag `
-DARMIX_SONKU_EXPERIMENTAL_P97_STAGE_IMPACT=$p97flag `
-DARMIX_SONKU_EXPERIMENTAL_P98_SCENE_VOICING=$p98flag `
-DARMIX_SONKU_EXPERIMENTAL_P99_VOCAL_DEPTH=$p99flag `
-DBUILD_TESTING=ON
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
$cache = Get-Content build/CMakeCache.txt -Raw
Expand All @@ -797,6 +824,7 @@ jobs:
if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p95-p96-*' -or $env:GITHUB_HEAD_REF -like 'feat/sonku-p98-*') { $targets += 'ARMixSonKuP96DistanceTests' }
if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p95-p96-p97-*' -or $env:GITHUB_HEAD_REF -like 'feat/sonku-p98-*') { $targets += 'ARMixSonKuP97StageTests' }
if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p98-*') { $targets += 'ARMixSonKuP98VoicingTests' }
if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p98-p99-*') { $targets += @('ARMixSonKuP99VocalDepthTests','ARMixSonKuP99DefaultOrbitTests') }
cmake --build build --config Release --parallel 2 --target $targets
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
if (-not (Test-Path -LiteralPath 'build/ARMixConsole_artefacts/Release/AR MIX Studio.exe' -PathType Leaf)) {
Expand All @@ -807,6 +835,7 @@ jobs:
if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p95-p96-*' -or $env:GITHUB_HEAD_REF -like 'feat/sonku-p98-*') { $tests += '|96DistanceBassAndTrebleRetention' }
if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p95-p96-p97-*' -or $env:GITHUB_HEAD_REF -like 'feat/sonku-p98-*') { $tests += '|97BassVocalExternalAirSafety' }
if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p98-*') { $tests += '|98SceneVoicingVenueLock' }
if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p98-p99-*') { $tests += '|99AdaptiveVocalDepthVenueLock|99NewDefaultOrbitNative' }
$tests += ')$'
ctest --test-dir build -C Release --output-on-failure -R $tests
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
Expand All @@ -831,6 +860,9 @@ jobs:
Copy-Item docs/SONKU_P97_STAGE_IMPACT_FAT_20261116.md dist/SONKU_P97_STAGE_FAT.md
if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p98-*') {
Copy-Item docs/SONKU_P98_OPERATOR_VENUE_CHECKPOINT_AND_VOICING_FAT_20261116.md dist/SONKU_P98_SCENE_VOICING_FAT.md
if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p98-p99-*') {
Copy-Item docs/SONKU_P99_MUSICAL_VOCAL_DEPTH_FAT_20261116.md dist/SONKU_P99_VOCAL_DEPTH_FAT.md
}
}
}
}
Expand All @@ -840,7 +872,7 @@ jobs:
throw 'SONKU_P90_SOURCE_COMMIT_MISMATCH'
}
$provenance | Add-Member -Force -NotePropertyName sonkuExperiment -NotePropertyValue @{
mode = if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p98-*') { 'P9.8_SCENE_VOICING_VENUE_LOCKED_RESEARCH' } elseif ($env:GITHUB_HEAD_REF -like 'feat/sonku-p95-p96-p97-*') { 'P9.7_STAGE_IMPACT_EXTERNAL_PRESENCE_RESEARCH' } elseif ($env:GITHUB_HEAD_REF -like 'feat/sonku-p95-p96-*') { 'P9.6_STAGE_BASS_AIR_DISTANCE_RESEARCH' } elseif ($env:GITHUB_HEAD_REF -like 'feat/sonku-p95-*') { 'P9.5_IMMERSIVE_MUSIC_VENUE_FOUNDATION' } else { 'P9.4_FRONT_REAR_DEPTH_EXPERIMENT' }
mode = if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p98-p99-*') { 'P9.9_MUSICAL_VOCAL_DEPTH_VENUE_LOCKED_PRIVATE_FAT' } elseif ($env:GITHUB_HEAD_REF -like 'feat/sonku-p98-*') { 'P9.8_SCENE_VOICING_VENUE_LOCKED_RESEARCH' } elseif ($env:GITHUB_HEAD_REF -like 'feat/sonku-p95-p96-p97-*') { 'P9.7_STAGE_IMPACT_EXTERNAL_PRESENCE_RESEARCH' } elseif ($env:GITHUB_HEAD_REF -like 'feat/sonku-p95-p96-*') { 'P9.6_STAGE_BASS_AIR_DISTANCE_RESEARCH' } elseif ($env:GITHUB_HEAD_REF -like 'feat/sonku-p95-*') { 'P9.5_IMMERSIVE_MUSIC_VENUE_FOUNDATION' } else { 'P9.4_FRONT_REAR_DEPTH_EXPERIMENT' }
stateSchema = if ($env:GITHUB_HEAD_REF -like 'feat/sonku-p98-*') { 12 } else { 11 }
headphoneFat = 'PENDING'
publicRelease = $false
Expand Down
33 changes: 31 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,14 @@ if(ARMIX_SONKU_EXPERIMENTAL_P98_SCENE_VOICING AND
NOT ARMIX_SONKU_EXPERIMENTAL_P97_STAGE_IMPACT)
message(FATAL_ERROR "P9.8 requires P9.7 approved stage; public default OFF")
endif()
# P9.9 adds modest adaptive center-vocal articulation and spatial unmasking.
# Named scenes only; P9.8 is an independent immutable reference on its branch.
option(ARMIX_SONKU_EXPERIMENTAL_P99_VOCAL_DEPTH
"Private low-cost musical vocal focus; keep P9.8/approved Venue unchanged" OFF)
if(ARMIX_SONKU_EXPERIMENTAL_P99_VOCAL_DEPTH AND
NOT ARMIX_SONKU_EXPERIMENTAL_P98_SCENE_VOICING)
message(FATAL_ERROR "P9.9 requires P9.8 native typed scene voicings")
endif()
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

Expand Down Expand Up @@ -357,7 +365,9 @@ target_compile_definitions(ARMixConsole PRIVATE
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P97_STAGE_IMPACT}>:SONKU_P97_STAGE_IMPACT_RESEARCH=1>
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P97_STAGE_IMPACT}>:ARMIX_SONKU_EXPERIMENTAL_P97_STAGE_IMPACT=1>
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P98_SCENE_VOICING}>:SONKU_P98_SCENE_VOICING_RESEARCH=1>
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P98_SCENE_VOICING}>:ARMIX_SONKU_EXPERIMENTAL_P98_SCENE_VOICING=1>)
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P98_SCENE_VOICING}>:ARMIX_SONKU_EXPERIMENTAL_P98_SCENE_VOICING=1>
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P99_VOCAL_DEPTH}>:SONKU_P99_MUSICAL_VOCAL_DEPTH_RESEARCH=1>
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P99_VOCAL_DEPTH}>:ARMIX_SONKU_EXPERIMENTAL_P99_VOCAL_DEPTH=1>)
if(WIN32)
# Windows retains its proven ASIO-first / WASAPI / static WebView2 distribution.
# Never link Windows loader or sound APIs into macOS/Linux builds.
Expand Down Expand Up @@ -894,7 +904,8 @@ if(BUILD_TESTING)
SONKU_P95_MUSICAL_PRESENCE_RESEARCH=1
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P96_DISTANCE_REINFORCEMENT}>:SONKU_P96_DISTANCE_REINFORCEMENT_RESEARCH=1>
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P97_STAGE_IMPACT}>:SONKU_P97_STAGE_IMPACT_RESEARCH=1>
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P98_SCENE_VOICING}>:SONKU_P98_SCENE_VOICING_RESEARCH=1>)
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P98_SCENE_VOICING}>:SONKU_P98_SCENE_VOICING_RESEARCH=1>
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P99_VOCAL_DEPTH}>:SONKU_P99_MUSICAL_VOCAL_DEPTH_RESEARCH=1>)
add_test(NAME NativeSonKuP95MusicPresenceVenue
COMMAND ARMixSonKuP95MusicTests)
endif()
Expand All @@ -919,6 +930,22 @@ if(BUILD_TESTING)
add_test(NAME NativeSonKuP98SceneVoicingVenueLock
COMMAND ARMixSonKuP98VoicingTests)
endif()
if(ARMIX_SONKU_EXPERIMENTAL_P99_VOCAL_DEPTH)
add_executable(ARMixSonKuP99VocalDepthTests
tests/sonku_p99_vocal_depth_source_test.cpp)
target_compile_features(ARMixSonKuP99VocalDepthTests PRIVATE cxx_std_20)
add_test(NAME NativeSonKuP99AdaptiveVocalDepthVenueLock
COMMAND ARMixSonKuP99VocalDepthTests)
add_executable(ARMixSonKuP99DefaultOrbitTests
tests/sonku_p99_default_orbit_source_test.cpp)
target_compile_features(ARMixSonKuP99DefaultOrbitTests PRIVATE cxx_std_20)
# Exactly the same nested P9 physical/native core
# flags as its P95/P96/P97/P98/P99 integrated build.
target_compile_definitions(ARMixSonKuP99DefaultOrbitTests PRIVATE
$<TARGET_PROPERTY:ARMixSonKuP95MusicTests,COMPILE_DEFINITIONS>)
add_test(NAME NativeSonKuP99NewDefaultOrbitNative
COMMAND ARMixSonKuP99DefaultOrbitTests)
endif()
juce_add_console_app(ARMixSonKuP90NativeTests
PRODUCT_NAME "ArSonMix SonKu P90 JUCE v11 State Tests")
target_sources(ARMixSonKuP90NativeTests PRIVATE
Expand All @@ -938,6 +965,8 @@ if(BUILD_TESTING)
ARMIX_SONKU_EXPERIMENTAL_P90_NATIVE_RT=1
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P98_SCENE_VOICING}>:ARMIX_SONKU_EXPERIMENTAL_P98_SCENE_VOICING=1>
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P98_SCENE_VOICING}>:SONKU_P98_SCENE_VOICING_RESEARCH=1>
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P99_VOCAL_DEPTH}>:SONKU_P99_MUSICAL_VOCAL_DEPTH_RESEARCH=1>
$<$<BOOL:${ARMIX_SONKU_EXPERIMENTAL_P99_VOCAL_DEPTH}>:ARMIX_SONKU_EXPERIMENTAL_P99_VOCAL_DEPTH=1>
SONKU_P7_MEASURED_ELEVATION_RESEARCH=1
SONKU_P71_DIRECT_XYZ_RESEARCH=1
SONKU_P72_NATIVE_XYZ_RT=1
Expand Down
43 changes: 43 additions & 0 deletions docs/SONKU_P99_CROSS_THREAD_RECONCILIATION_20261116.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# SonKu P9.9 — cross-thread reconciliation and integration contract (2026-11-16)

This is a deliberately **non-merging** reconciliation of independently active developer threads. This branch is a draft, not public release/main, and this document **does not authorize a force push, PR retarget, cherry-pick of entire files, auto-merge or rewrite of other threads**.

## Live GitHub topology checked

| Work | PR | Head at audit | Base / status | Ownership |
| --- | --- | --- | --- | --- |
| Approved Venue P9.7 | #728 | `fda0eef669e0a59575c489e149662c1bf878c998` | P9.6 draft | Immutable approved audio checkpoint |
| Signature/Cinema/Studio P9.8 | #729 | `4a9e5b2c455818c7a0dc8507ec2b7863be215033` | P9.7 draft | SonKu typed scenes 0–3; original v12 |
| Orbit default / warm vocal-room P9.9 | #730 | `94255ba476d1896cbd54904a87f2b9927851a360` before this reconciliation | P9.8 draft; native Windows 13/13 green | SonKu native audio and GUI |
| ImmerSIB concert / room cohesion | #732 | `c32345f9f638dfb837c60ec84405a5ef315631ac` | Separate ImmerSIB #722 branch; draft; GitHub reported mergeable=false | Product-owned static scene, private voicings 4/5 |
| ImmerSIB single engine | #722 | `b693618cabe9c13e8756633c1d64607b9254cde6` | P9.1/P9.2 draft | Separate product, ONE shared native SonKu PCM core |
| Native floating FX ownership | #731 | `61d64cd76ca56d51a8dcd4d621eea49ac4ca7819` | main, draft | Owner of `NativeFxWin32Owner.h`, `NativeOwnedFloatingWindow.h`, editor lifecycle |
| Factory reset | #708 | `a97462c2730f3e0feae1b9e8982c2784e81ea9a6` | main, draft, non-mergeable at audit | Native session / mixer recovery |
| Guitar FX redesign | #668 | `0a4209b06352f6cc6c0aca27ce99f3615eacd6f5` | main draft | JUCE guitar visuals, independent acceptance |

Main was `37985f02caecd93b22f853183888d81e18dc6736` at audit. `main` is an ancestor of SonKu P9.9, but P9.9 includes **353 commits, 166 file changes compared to main**, most from older stacked research stages. Applying the entire P9.9 branch as a replacement for main or rebasing/merging other branches blindly is **not** a responsible integration. ImmerSIB #732 is divergent from P9.9, with independently developed SonKu voicing/header changes. Do not discard either.

## Confirmed API and sonic conflicts

1. On P9.9 the base class `SonKuSpatialProcessor` was mistakenly `final`, while ImmerSIB's `ImerSipP92Processor` derives from it. **Corrected only P9.9**: base now has a product-specific protected initial-scene constructor, queued-scene admission hook, and unpublished-state adoption with control-side validation and native ACK preservation. The derived product and its identity/state/editor are not copied into the SonKu branch.
2. The P9.9 `SonKuSpatialCore` originally activated its vocalist center/330Hz room stage merely because the project-wide compile flag was ON and a scene was ID 1/2/3. **Corrected**: a branded product sharing the same core is neutral by default; only the **8D-SonKu** native insert explicitly opts in *per instance* before prepare. This is not a second renderer, a new persistent state field, or a listener guess. Other products keep their scene DSP unmodified even in the same compiled application.
3. ImmerSIB #732 has native scene IDs **4/5** and different `SonKuP98SceneVoicing.h` / `SonKuSpatialCore.h` files, while SonKu #730 only has neutral/Signature/Studio/Cinema **0–3**. These remain separate until an explicitly reviewed additive integration preserves **all** IDs and the two product contracts. Do **not** raise SonKu ID validation to 5 without the actual ImmerSIB implementation/tests.
4. FX editor #731 changes `CMakeLists.txt`, `src/Main.cpp`, and native window ownership. Those ownership changes must be replayed with a real three-way merge when integrating, **not** overwritten by the SonKu versions of those shared files. The two native window headers in #732 currently match #731 blob SHA, but future updates must be inspected again.
5. P9.9's **ORBIT STAGE · DEFAULT** (127°, 12s, 2.7m, 100% ER, 77% late, +5.1dB) remains for **new SonKu instances only**. Existing .smix sessions, ImmerSIB's factory, legacy v11/v12 restore, and the P9.7 10m Venue are untouched.

## Objective gates added before any integration

- SonKu P9.9 actual private DSP remains **opted in** in its real native processor, the full integrated scene test and factory Orbit source test.
- A second copy of the **same full KEMAR + directional six-wall + late-room + limiter** test is built with P9.9 compile flag **ON but per-instance opt-in OFF**. The gate compares every complete output row and PCM hash to P9.8 native reference at **44.1/48k, front/rear, all six scenes = 24 cases**, with **zero tolerance**: `scripts/verify_sonku_p99_shared_core_isolation.py`. This is the shared-engine protection for ImmerSIB/other products, not a cosmetic capability check.
- Native JUCE test actually instantiates a branded derived processor, verifies own initial static scene, rejects forbidden moving scenes, checks applied edit ACK/readback, allows control-side unpublished state adoption, and rejects publication-time overwrite. Existing 13 Windows CTests remain active.
- Venue scene=0/ROOM OFF/MIX0 continue their exact P9.8 PCM hash gates, including all independent P9.7 approval fixtures.
- No additional audio latency, heap allocation in the PCM callback, extra HRTF, or duplicated convolution pipeline introduced.

## Safe future integration order (not executed here)

1. Keep separate reviewed source checkpoints. Do not merge P9.9 in isolation from its P9.5/P9.6/P9.7/P9.8 ancestry. The release decision needs owner headphone/ASIO A/B approval and a single explicit coherent integration plan.
2. Integrate **#731** native floating editor lifetime/ownership by three-way code merge of `src/Main.cpp` and `CMakeLists.txt`, preserving its tested ownership and source-specific closing/reopen behavior; avoid overwriting from old SonKu snapshot.
3. Reconcile **#722/#732** independently as ImmerSIB's product-owned branch. Forward-port the typed voicing IDs 4/5, IMRS v7 restore constraints, authorized static-scene constructor, audio-gate and GUI assets deliberately; verify no loss of SonKu IDs 0–3, no new PCM authority, and no accidental P9.9 change to ImmerSIB presets.
4. Only after integrated Windows JUCE/Chromium/PCM and product-specific session regressions pass, and owner explicitly approves acoustic candidate, decide main release. Keep draft PRs and their SHAs as reviewable provenance.

**This reconciliation intentionally changes only P9.9 branch-owned native API compatibility and opt-in guards.** No writes to main, #731, #732, #722, #708, Guitar FX, checkpoint Venue, or shipped installer. Any cross-product *compile* with combined #732 is not yet proven because those PR branches are divergent and their scene IDs/headers still require a manual three-way integration.
Loading
Loading