From 72bfe83e3d26fcdec5a2e8e964dd8d69d80048dd Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Fri, 13 Nov 2026 10:25:26 +0700 Subject: [PATCH 1/8] fix(sof): expose exact accepted parallel EdgeId admission to native WIRE inspector --- web/approved-native-bridge.js | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/web/approved-native-bridge.js b/web/approved-native-bridge.js index ab7831212..3aa78e0d6 100644 --- a/web/approved-native-bridge.js +++ b/web/approved-native-bridge.js @@ -372,14 +372,25 @@ return; // next coalesced target follows ACK + independent readback } } - function requestWireGain(op){ + // Every editable WIRE scalar must resolve an exact native ChannelId + + // EdgeId, not a destination kind, strip label, or reference graph index. + // A PARALLEL_SEND can legally point to MAIN; a PRIMARY_OUT can point to BUS. + function admittedParallelWire(uiSourceId,uiEdgeId,operation){ const current=controller?.state()?.current; - const edgeId=wireByUiId.get(op.edgeId),source=nativeByUiId.get(op.sourceId); + const source=nativeByUiId.get(uiSourceId),edgeId=wireByUiId.get(uiEdgeId); + if(!flags.acceptedGraphConnected||!current?.admitted||current.retained|| + !source||!edgeId||!current.graph.capabilities.supportedOps.includes(operation)) + return null; + const matches=current.graph.edges.filter(e=>e.enabled&& + e.edgeId===edgeId&&e.from===source&&e.primaryOutput===false); + return matches.length===1?matches[0]:null; + } + function requestWireGain(op){ const db=Number(op.levelDb); - if(!current?.admitted||!current.graph.capabilities.supportedOps.includes("SET_WIRE_GAIN")|| - !Number.isFinite(db)||db< -60||db>6)return false; - const edge=current.graph.edges.find(e=>e.enabled&&e.edgeId===edgeId&&e.from===source); - if(!edge||edge.primaryOutput!==false)return false; + if(!Number.isFinite(db)||db< -60||db>6|| + !admittedParallelWire(op.sourceId,op.edgeId,"SET_WIRE_GAIN"))return false; + const current=controller.state().current; + const edgeId=wireByUiId.get(op.edgeId),source=nativeByUiId.get(op.sourceId); // A physical SEND fader floor is -infinity (zero PCM), NOT -60 dB linear. pendingWireGains.set(edgeId,{source,gain:db<=-60?0:Math.pow(10,db/20),identity:current.identity}); queueWireGainFlush();return true; @@ -3643,6 +3654,14 @@ } status("NATIVE: "+action+" is not an accepted ChannelId operation");return true; }, + canWireGain(uiEdgeId,uiSourceId){ + return !!admittedParallelWire(uiSourceId,uiEdgeId,"SET_WIRE_GAIN"); + }, + canWireTap(uiEdgeId,uiSourceId){ + const edge=admittedParallelWire(uiSourceId,uiEdgeId,"APPLY_WIRE_TRANSACTION"); + return !!edge&&["PRE_FADER","POST_FADER"].includes(edge.tap)&& + !controller?.state()?.pending; + }, consumeWire(ops,retries=0) { if (!connected)return false; if(logicalView) { From 6739f23d90105a62b87ff1b8e1c082a7fa6ebc49 Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Fri, 13 Nov 2026 10:26:47 +0700 Subject: [PATCH 2/8] fix(gui): WIRE inspector distinguishes PRIMARY unity from parallel sends incl MAIN; native edits await PCM readback --- site/preview-v2/index.html | 51 ++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/site/preview-v2/index.html b/site/preview-v2/index.html index 2a1058a83..338448c87 100644 --- a/site/preview-v2/index.html +++ b/site/preview-v2/index.html @@ -1275,12 +1275,20 @@ const native=!!window.__JUCE__?.backend; const tapValue=edge?.nativeTap==='PRE_FADER'?'split': edge?.nativeTap==='POST_FADER'?'send':edge?.mode; - const tapEditable=!native||(src.nativeTapAvailable===true&& - edge?.kind==='send'&&['PRE_FADER','POST_FADER'].includes(edge.nativeTap)); + // A PRIMARY_OUT is fixed unity even when its destination is a BUS. + // An independently admitted PARALLEL_SEND remains editable even to MAIN. + // Only the connected native bridge can grant PCM control capability. + const gainEditable=edge&&(!native?edge.kind!=='primary': + window.__ARMIX_NATIVE_M2__?.canWireGain?.(edge.id,edge.sourceId)===true); + const tapEditable=edge&&(!native?edge.kind!=='primary': + window.__ARMIX_NATIVE_M2__?.canWireTap?.(edge.id,edge.sourceId)===true); const controls=edge? '
'+ - ''+ - ''+edge.levelDb+' dB'+ + ''+ + ''+(edge.kind==='primary'?'PRIMARY · UNITY': + edge.levelDb+' dB')+''+ ''+ ''+ - ''+(edge.kind==='primary'?'PRIMARY · UNITY': - edge.levelDb+' dB')+''+ + ''+ + ''+edge.levelDb+' dB'+ ''+ ''+\n ''+edge.levelDb+' dB'+\n ''+\n ''+\n '
':\n '
Managed by existing '+escapeHtml(info.kind.toUpperCase())+' routing. No duplicate WIRE edge.
';\n", + " const controls=edge?\n '
'+\n ''+\n ''+(edge.kind==='primary'?'PRIMARY · UNITY':\n edge.levelDb+' dB')+''+\n ''+\n ''+\n '
':\n '
Managed by existing '+escapeHtml(info.kind.toUpperCase())+' routing. No duplicate WIRE edge.
';\n"), + ("document.getElementById('wireWsInspector').addEventListener('input',e=>{\n const gain=e.target.closest?.('[data-ws-gain]');\n if(!gain)return;\n const edge=wireEdges.find(x=>x.id===Number(gain.dataset.wsGain)&&x.enabled);\n if(!edge||edge.destId===master.id)return;\n const amount=Math.max(-60,Math.min(6,Math.round(Number(gain.value)||0)));\n if(!wireGraphCommit([{type:'GAIN',sourceId:edge.sourceId,edgeId:edge.id,\n levelDb:amount}],{record:false}))return;\n document.getElementById('wireWsGainText').textContent=amount+' dB';\n});\ndocument.getElementById('wireWsInspector').addEventListener('change',e=>{\n const gain=e.target.closest?.('[data-ws-gain]'),tap=e.target.closest?.('[data-ws-tap]');\n if(tap){\n const edge=wireEdges.find(x=>x.id===Number(tap.dataset.wsTap)&&x.enabled);\n if(!edge||!wireGraphCommit([{type:'MODE',sourceId:edge.sourceId,edgeId:edge.id,\n mode:tap.value==='split'?'split':'send'}],{record:false}))return;\n const owner=wireSourceTrack(edge.sourceId);if(owner)owner.wireTapMode=tap.value==='split'?'split':'send';\n }\n if(gain||tap){\n wireWsRecord(wireWsEditBefore);wireWsEditBefore=null;render();renderWireWorkspace();\n say('WIRE inspector accepted · reference graph only');\n }\n});\n\n", + "document.getElementById('wireWsInspector').addEventListener('input',e=>{\n const gain=e.target.closest?.('[data-ws-gain]');\n if(!gain)return;\n const edge=wireEdges.find(x=>x.id===Number(gain.dataset.wsGain)&&x.enabled);\n if(!edge||edge.kind==='primary')return;\n const amount=Math.max(-60,Math.min(6,Math.round(Number(gain.value)||0)));\n if(window.__JUCE__?.backend){\n if(window.__ARMIX_NATIVE_M2__?.canWireGain?.(edge.id,edge.sourceId)!==true)return;\n // Coalesce rapid gestures in the existing native control queue. This LCD\n // shows a pending operation, NEVER a speculative accepted PCM level.\n window.__ARMIX_NATIVE_M2__?.consumeWire?.([{type:'GAIN',\n sourceId:edge.sourceId,edgeId:edge.id,levelDb:amount}]);\n const readout=document.getElementById('wireWsGainText');\n if(readout)readout.textContent='PENDING · '+amount+' dB';\n return;\n }\n if(!wireGraphCommit([{type:'GAIN',sourceId:edge.sourceId,edgeId:edge.id,\n levelDb:amount}],{record:false}))return;\n document.getElementById('wireWsGainText').textContent=amount+' dB';\n});\ndocument.getElementById('wireWsInspector').addEventListener('change',e=>{\n const gain=e.target.closest?.('[data-ws-gain]'),tap=e.target.closest?.('[data-ws-tap]');\n if(window.__JUCE__?.backend){\n if(gain){\n const edge=wireEdges.find(x=>x.id===Number(gain.dataset.wsGain)&&x.enabled);\n if(edge?.kind!=='primary'&&window.__ARMIX_NATIVE_M2__?.canWireGain?.(edge.id,edge.sourceId)===true){\n // Keyboard-only range change may not have emitted 'input'.\n window.__ARMIX_NATIVE_M2__?.consumeWire?.([{type:'GAIN',sourceId:edge.sourceId,\n edgeId:edge.id,levelDb:Math.max(-60,Math.min(6,Math.round(Number(gain.value)||0)))}]);\n }\n }\n if(tap){\n const edge=wireEdges.find(x=>x.id===Number(tap.dataset.wsTap)&&x.enabled);\n const requested=tap.value==='split'?'split':'send';\n // Restore the accepted selector position immediately. An independent\n // structural readback will move it after the engine actually publishes.\n tap.value=edge?.nativeTap==='PRE_FADER'?'split':'send';\n if(edge&&window.__ARMIX_NATIVE_M2__?.canWireTap?.(edge.id,edge.sourceId)===true){\n window.__ARMIX_NATIVE_M2__?.consumeWire?.([{type:'MODE',sourceId:edge.sourceId,\n edgeId:edge.id,mode:requested}]);\n say('WIRE tap requested · awaiting accepted native PCM readback');\n }else say('WIRE tap unavailable · native graph or EdgeId changed');\n }\n wireWsEditBefore=null;return; // native owns state; no demo undo or full repaint\n }\n if(tap){\n const edge=wireEdges.find(x=>x.id===Number(tap.dataset.wsTap)&&x.enabled);\n if(!edge||!wireGraphCommit([{type:'MODE',sourceId:edge.sourceId,edgeId:edge.id,\n mode:tap.value==='split'?'split':'send'}],{record:false}))return;\n const owner=wireSourceTrack(edge.sourceId);if(owner)owner.wireTapMode=tap.value==='split'?'split':'send';\n }\n if(gain||tap){\n wireWsRecord(wireWsEditBefore);wireWsEditBefore=null;render();renderWireWorkspace();\n say('WIRE inspector accepted · reference graph only');\n }\n});\n\n"), +) + + + def native_html(approved: str | None = None) -> str: original = accepted_pages_html() if approved is None else approved newline = "\r\n" if "\r\n" in original else "\n" From ba7c712ec73ea08d5b96b3a973ea7f14c77fcd06 Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Fri, 13 Nov 2026 10:32:17 +0700 Subject: [PATCH 7/8] test(native-gui): execute assembled native-only WIRE inspector and assert public Pages untouched --- tests/approved_native_m2_contract.test.cjs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/approved_native_m2_contract.test.cjs b/tests/approved_native_m2_contract.test.cjs index d67e03b0c..f5ea8b916 100644 --- a/tests/approved_native_m2_contract.test.cjs +++ b/tests/approved_native_m2_contract.test.cjs @@ -28,7 +28,13 @@ function acceptedFixture(){ return s; } test("WIRE inspector controls PRIMARY BUS and PARALLEL MAIN by actual EdgeId, with native readback only",()=>{ - const vm=require("node:vm"),html=read("site/preview-v2/index.html"); + const vm=require("node:vm"),{execFileSync}=require("node:child_process"); + const publicHtml=read("site/preview-v2/index.html"); + assert.doesNotMatch(publicHtml,/__ARMIX_NATIVE_M2__/, + "public approved /preview/ must never own native control authority"); + const html=execFileSync("python3",["-c", + "from scripts.build_approved_native_gui import native_html; from pathlib import Path; print(native_html(Path('site/preview-v2/index.html').read_text(encoding='utf-8')))" + ],{encoding:"utf8",maxBuffer:10*1024*1024}); const bridge=read("web/approved-native-bridge.js"); const builder=read("scripts/build_approved_native_gui.py"); assert.match(bridge,/function admittedParallelWire\(uiSourceId,uiEdgeId,operation\)/); From 5e86f45c05b248420127ac665cc510bd57ef83a6 Mon Sep 17 00:00:00 2001 From: Ari Sulistiono Date: Fri, 13 Nov 2026 10:33:17 +0700 Subject: [PATCH 8/8] fix(native-gui): include exact gainEditable admission in reversible WIRE inspector hook --- scripts/build_approved_native_gui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_approved_native_gui.py b/scripts/build_approved_native_gui.py index a451cc7d9..3dbc667a7 100644 --- a/scripts/build_approved_native_gui.py +++ b/scripts/build_approved_native_gui.py @@ -300,7 +300,7 @@ def accepted_pages_html() -> str: # are never accepted by the browser mock before installed PCM readback. NATIVE_EVENT_HOOKS += ( (" const tapEditable=!native||(src.nativeTapAvailable===true&&\n edge?.kind==='send'&&['PRE_FADER','POST_FADER'].includes(edge.nativeTap));\n", - " const tapEditable=edge&&(!native?edge.kind!=='primary':\n window.__ARMIX_NATIVE_M2__?.canWireTap?.(edge.id,edge.sourceId)===true);\n"), + " const gainEditable=edge&&(!native?edge.kind!=='primary':\n window.__ARMIX_NATIVE_M2__?.canWireGain?.(edge.id,edge.sourceId)===true);\n const tapEditable=edge&&(!native?edge.kind!=='primary':\n window.__ARMIX_NATIVE_M2__?.canWireTap?.(edge.id,edge.sourceId)===true);\n"), (" const controls=edge?\n '
'+\n ''+\n ''+edge.levelDb+' dB'+\n ''+\n ''+\n '
':\n '
Managed by existing '+escapeHtml(info.kind.toUpperCase())+' routing. No duplicate WIRE edge.
';\n", " const controls=edge?\n '
'+\n ''+\n ''+(edge.kind==='primary'?'PRIMARY · UNITY':\n edge.levelDb+' dB')+''+\n ''+\n ''+\n '
':\n '
Managed by existing '+escapeHtml(info.kind.toUpperCase())+' routing. No duplicate WIRE edge.
';\n"), ("document.getElementById('wireWsInspector').addEventListener('input',e=>{\n const gain=e.target.closest?.('[data-ws-gain]');\n if(!gain)return;\n const edge=wireEdges.find(x=>x.id===Number(gain.dataset.wsGain)&&x.enabled);\n if(!edge||edge.destId===master.id)return;\n const amount=Math.max(-60,Math.min(6,Math.round(Number(gain.value)||0)));\n if(!wireGraphCommit([{type:'GAIN',sourceId:edge.sourceId,edgeId:edge.id,\n levelDb:amount}],{record:false}))return;\n document.getElementById('wireWsGainText').textContent=amount+' dB';\n});\ndocument.getElementById('wireWsInspector').addEventListener('change',e=>{\n const gain=e.target.closest?.('[data-ws-gain]'),tap=e.target.closest?.('[data-ws-tap]');\n if(tap){\n const edge=wireEdges.find(x=>x.id===Number(tap.dataset.wsTap)&&x.enabled);\n if(!edge||!wireGraphCommit([{type:'MODE',sourceId:edge.sourceId,edgeId:edge.id,\n mode:tap.value==='split'?'split':'send'}],{record:false}))return;\n const owner=wireSourceTrack(edge.sourceId);if(owner)owner.wireTapMode=tap.value==='split'?'split':'send';\n }\n if(gain||tap){\n wireWsRecord(wireWsEditBefore);wireWsEditBefore=null;render();renderWireWorkspace();\n say('WIRE inspector accepted · reference graph only');\n }\n});\n\n",