From d9c34771bdcdd276cc1eca44c51837bbc1879ef8 Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Wed, 4 Nov 2026 14:42:33 +0700 Subject: [PATCH 1/4] fix(wire): preserve native primary EdgeId across OUT replug and retarget --- engine/core/DynamicChannelRoster.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/engine/core/DynamicChannelRoster.h b/engine/core/DynamicChannelRoster.h index e3e669441..2253d17c6 100644 --- a/engine/core/DynamicChannelRoster.h +++ b/engine/core/DynamicChannelRoster.h @@ -268,9 +268,16 @@ class DynamicChannelRoster final { result.fault=ChannelEditFault::invalidValue;break; } auto& edges=it->sends; - edges.erase(std::remove_if(edges.begin(),edges.end(), - [](const auto& x){return x.primaryOutput;}),edges.end()); - if(op.target.value) { + const auto primary=std::find_if(edges.begin(),edges.end(), + [](const auto& x){return x.primaryOutput;}); + if(!op.target.value) { + if(primary!=edges.end())edges.erase(primary); + } else if(primary!=edges.end()) { + // A replug/OUT retarget is still ONE physical edge. + // Keep stable identity on identical or changed target. + primary->destination=op.target; + primary->gain=1.f;primary->preFader=false;primary->pan=0.f; + } else { if(edges.size()>=budget_.maximumSendsPerChannel) { result.fault=ChannelEditFault::budgetExceeded;break; } From 8c3b196b21462a0699cee8040e547ccaee65a41a Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Wed, 4 Nov 2026 14:43:01 +0700 Subject: [PATCH 2/4] test(wire): OUT selector and native WIRE share exact EdgeId and PCM path --- tests/dynamic_accepted_session_test.cpp | 53 +++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/tests/dynamic_accepted_session_test.cpp b/tests/dynamic_accepted_session_test.cpp index 2899da1c5..85f412367 100644 --- a/tests/dynamic_accepted_session_test.cpp +++ b/tests/dynamic_accepted_session_test.cpp @@ -371,7 +371,60 @@ static void verifyDefaultNativeMainEdgeAndDisconnectedRestore() { session.unpublish();session.pollRetirement(); } + +// Legacy OUT selectors must project the SAME edgeId as native WIRE. +// Clicking an unchanged MAIN target or rerouting its occupied plug does NOT +// create a different edge and does not change the admitted PCM sum. +static void verifyPrimaryOutKeepsCanonicalEdgeIdentity() { + constexpr std::uint64_t epoch=9931; + DynamicAcceptedSession session; + DynamicGraphRequest physical; + physical.physicalInputs=1;physical.maxFrames=64; + const std::array first{ + add(0,ChannelRole::input,"SOURCE"), + add(1,ChannelRole::input,"INTERMEDIATE",ProcessingFormat::stereo), + add(2,ChannelRole::main,"MAIN",ProcessingFormat::stereo) + }; + auto a=session.edit(0,0,first,physical,epoch,epoch,true); + assert(a.ok()); + const auto src=a.edit.createdIds[0],via=a.edit.createdIds[1]; + const auto main=a.edit.createdIds[2]; + const std::array initial{output(src,main),output(via,main)}; + physical.sources={{src,0,-1,false}}; + a=session.edit(1,1,initial,physical,epoch,epoch,true); + assert(a.ok()); + const auto* accepted=session.acceptedRouting(epoch,2); + assert(accepted&&accepted->edges.size()==2); + const auto edgeId=accepted->edges[0].edgeId; + const auto viaId=accepted->edges[1].edgeId; + assert(edgeId!=0&&viaId!=0&&edgeId!=viaId); + std::array impulse{},left{},right{}; + impulse[19]=.25f; + const float* pins[]{impulse.data()}; + const auto noFx=+[](ChannelId,float*,float*,int) noexcept {}; + const auto render=[&] { + return session.render(epoch,pins,1,left.data(),right.data(),64,false,noFx); + }; + assert(render() && near(left[19],.25f*.7071067811865475f)); + const std::array same{output(src,main)}; + a=session.edit(2,2,same,physical,epoch,epoch,true); + assert(a.ok()); + assert(session.acceptedRouting(epoch,3)->edges[0].edgeId==edgeId); + assert(render() && near(left[19],.25f*.7071067811865475f)); + const std::array retarget{output(src,via)}; + a=session.edit(3,3,retarget,physical,epoch,epoch,true); + assert(a.ok()); + accepted=session.acceptedRouting(epoch,4); + assert(accepted->edges[0].edgeId==edgeId); + assert(accepted->edges[0].to==via); + assert(accepted->edges[1].edgeId==viaId); + assert(render() && near(left[19],.25f*.7071067811865475f)); + session.unpublish(); + session.pollRetirement(); +} + int main() { + verifyPrimaryOutKeepsCanonicalEdgeIdentity(); verifyDefaultNativeMainEdgeAndDisconnectedRestore(); verifyAtomicWireTransactionAndZeroSampleHops(); From 06471f6a43699ca68ef2a2c2fe64ffff737704de Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Wed, 4 Nov 2026 14:46:34 +0700 Subject: [PATCH 3/4] fix(wire): never return phantom EdgeId from rejected native PCM transactions --- engine/core/DynamicAcceptedSession.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/engine/core/DynamicAcceptedSession.h b/engine/core/DynamicAcceptedSession.h index d7660b7a5..20268c118 100644 --- a/engine/core/DynamicAcceptedSession.h +++ b/engine/core/DynamicAcceptedSession.h @@ -260,6 +260,7 @@ class DynamicAcceptedSession final { result.native.fault=DynamicNativeSessionPublisher::Fault::invalidCandidate; result.native.revision=publisher_.acceptedRevision(); result.edit.createdIds.clear(); + result.edit.createdEdgeIds.clear(); return result; } // A structural OUT/GROUP/Return edit does NOT implicitly change IN. @@ -284,6 +285,7 @@ class DynamicAcceptedSession final { result.native.graphError={DynamicGraphFault::invalidSource,source.id}; result.native.revision=publisher_.acceptedRevision(); result.edit.createdIds.clear(); + result.edit.createdEdgeIds.clear(); return result; // old audible SOURCE and VST3 leases unchanged } } @@ -294,7 +296,8 @@ class DynamicAcceptedSession final { std::move(fx)); if(!result.native.ok()) { result.fault=Fault::graphRejected; - result.edit.createdIds.clear(); // NEVER advertise phantom Bus + result.edit.createdIds.clear(); + result.edit.createdEdgeIds.clear(); // NEVER advertise phantom Bus return result; // candidate destroyed; accepted state intact } static_assert(std::is_nothrow_move_assignable_v); From 32c4683f660119701e98e95ae2c7692ccff66ec3 Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Wed, 4 Nov 2026 14:46:53 +0700 Subject: [PATCH 4/4] test(wire): rejected DAG publishes neither PCM nor ghost EdgeIds --- tests/dynamic_accepted_session_test.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/dynamic_accepted_session_test.cpp b/tests/dynamic_accepted_session_test.cpp index 85f412367..32a1aa9d9 100644 --- a/tests/dynamic_accepted_session_test.cpp +++ b/tests/dynamic_accepted_session_test.cpp @@ -307,6 +307,8 @@ static void verifyAtomicWireTransactionAndZeroSampleHops() { const std::array feedback{connect(three,one)}; rejected=session.wireTransaction(6,6,feedback,physical,epoch,epoch,true); assert(rejected.fault==DynamicAcceptedSession::Fault::graphRejected); + // An uncommitted edge is not a native/GUI identity: rollback clears it. + assert(rejected.edit.createdEdgeIds.empty()); assert(session.acceptedGraphRevision()==6); assert(render() && near(left[11],.3f*center)); rejected=session.wireTransaction(5,5,unplug,physical,epoch,epoch,true);