diff --git a/.github/workflows/factoryfx-release-watch.yml b/.github/workflows/factoryfx-release-watch.yml index 18664109c..d9e85f2d5 100644 --- a/.github/workflows/factoryfx-release-watch.yml +++ b/.github/workflows/factoryfx-release-watch.yml @@ -31,7 +31,7 @@ jobs: commit-message: 'chore(factoryfx): record latest upstream release candidates' branch: bot/factoryfx-release-candidates delete-branch: true - title: 'FactoryFX: review new EQ/Verb/Enhancer releases (metadata only)' + title: 'FactoryFX: review new EQ/Comp/Verb/Enhancer releases (metadata only)' body: | Upstream release discovery only. NO plugin is qualified, downloaded, licensed, shipped or enabled by this PR. diff --git a/AGENTS.md b/AGENTS.md index c0c620e2b..234cbb0cb 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,4 +1,4 @@ -> **CUSTOM DEVICE SETUP DESIGN LOCK (2026-10-31) — IMPLEMENTATION PENDING:** Read [PRD](docs/PRD_CUSTOM_AUDIO_DEVICE_SETUP_20261031.md), [ARD](docs/ARD_CUSTOM_AUDIO_DEVICE_SETUP_20261031.md) and [per-file handoff](docs/HANDOFF_CUSTOM_AUDIO_DEVICE_SETUP_20261031.md) before touching AUDIO DEVICE / DEVICE-DRIVER / ASIO / WASAPI. Existing WebView2 Audio I/O Matrix must become the SINGLE real device setup UI: backend, actual capture/playback endpoints, sample rate, buffer, enabled pins, APPLY with verified JUCE readback, fail-closed muted rollback. Keep ONE existing AudioDeviceManager, native routing epoch/ACK, MAIN/MONITOR/OUTPUT1/FX and #15 gate. Currently the DEVICE tab remains inventory-only and opens native AudioDeviceSelectorComponent; this feature is NOT YET IMPLEMENTED. Driver scans/opens may block vendor code: don't claim async bridge eliminates freeze; audit pinned JUCE thread affinity and instrument physical hangs. No second hardware setup UI, manager, audio graph or naive per-dropdown device restart. +> **MANDATORY LIVE PR BACKLOG RECONCILIATION (2026-10-31):** Before any PR merge, audio engine/GUI/device edit, factory plugin release or new cross-thread handoff, read [current-main PR ledger](docs/PR_BACKLOG_RECONCILIATION_20261031.md), then [canonical Product Truth](docs/PRODUCT_TRUTH_CROSS_THREAD_20261031.md), latest main/head/CI and owner-specific PRD/ARD. Merged #223/#224/#227 MUST NOT be overwritten by older #222 (closed superseded) or 18 historical open PRs. FactoryFX #225 older head passed CI but merge conflicted with newer main; only selectively port its distinct four-sibling intake against current main. #226 selected CHANNEL + native AUX MASTER is DRAFT with exact old-head CI success, NOT MERGED; its owner controls native audio/monitor/mixer-io overlap. No stale branch bulk merge, second live graph, invented physical ports, automatic output unmute, fake Factory FX installed or heavy docs-only CI. #15 0FX hardware crackle FAT is still OPEN.\n\n> **CUSTOM DEVICE SETUP DESIGN LOCK (2026-10-31) — IMPLEMENTATION PENDING:** Read [PRD](docs/PRD_CUSTOM_AUDIO_DEVICE_SETUP_20261031.md), [ARD](docs/ARD_CUSTOM_AUDIO_DEVICE_SETUP_20261031.md) and [per-file handoff](docs/HANDOFF_CUSTOM_AUDIO_DEVICE_SETUP_20261031.md) before touching AUDIO DEVICE / DEVICE-DRIVER / ASIO / WASAPI. Existing WebView2 Audio I/O Matrix must become the SINGLE real device setup UI: backend, actual capture/playback endpoints, sample rate, buffer, enabled pins, APPLY with verified JUCE readback, fail-closed muted rollback. Keep ONE existing AudioDeviceManager, native routing epoch/ACK, MAIN/MONITOR/OUTPUT1/FX and #15 gate. Currently the DEVICE tab remains inventory-only and opens native AudioDeviceSelectorComponent; this feature is NOT YET IMPLEMENTED. Driver scans/opens may block vendor code: don't claim async bridge eliminates freeze; audit pinned JUCE thread affinity and instrument physical hangs. No second hardware setup UI, manager, audio graph or naive per-dropdown device restart. > **SOURCE1 + SETUP1 — 2026-10-31:** See [source/real-device integrated milestone](docs/SOURCE1_NATIVE_MUTED_FAST_COMMIT_20261031.md). 64-pin real JUCE ASIO/WASAPI/DirectSound selector; current hardware Input→CH from MIX ROUTE auto-submits via ONE native routingDryApply/ACK only if outputs already MUTED and no other drafts. Armed output fails closed, no auto-mute/unmute; true RT clickless source crossfade and persistent named aliases are NOT IMPLEMENTED. Preserve #223 AUX live, MAIN/MONITOR/OUTPUT1, L2/RAIL3, VST/Show and physical #15 gate.\n\n> **M1 LIVE AUX POST FADER (2026-10-31):** [Native implementation & FAT contract](docs/M1_LIVE_AUX_SEND_FADER_20261031.md). Ordinary gain on an EXISTING native CH→AUX POST edge is a realtime atomic target with callback-only <=64-sample smoothing. Control write via `routingAuxSendGain` is fenced by actual device epoch, published routing revision, existing edge, 0..1 value and native ACK. It does NOT MUTE outputs, recompile topology, detach, instantiate plugins or change MAIN fader. New send/return enable, PRE/PAN and physical I/O remain structural DRAFT→MUTE→APPLY→native ACK. No fake dynamic CH11, Master FX or hardware crackle certification. Preserve source and standalone mixer-io JS parity, L2/RAIL3, DYN1B, OUTPUT1, factory lock and P0 hardware #15. diff --git a/config/factoryfx-upstream-candidates.json b/config/factoryfx-upstream-candidates.json index 2529023f0..58392559b 100644 --- a/config/factoryfx-upstream-candidates.json +++ b/config/factoryfx-upstream-candidates.json @@ -8,6 +8,13 @@ "publishedAt": null, "windowsVst3Asset": null }, + { + "productId": "arson-comp", + "distributionRepo": "masarray/arson-comp", + "releaseTag": null, + "publishedAt": null, + "windowsVst3Asset": null + }, { "productId": "arson-verb", "distributionRepo": "masarray/arsonverb", diff --git a/docs/FACTORYFX_RELEASE_INTAKE_20261031.md b/docs/FACTORYFX_RELEASE_INTAKE_20261031.md index db0faf03b..a559b7877 100644 --- a/docs/FACTORYFX_RELEASE_INTAKE_20261031.md +++ b/docs/FACTORYFX_RELEASE_INTAKE_20261031.md @@ -4,7 +4,7 @@ Owners: issue #185, canonical ADR `ADR_FACTORY_FX_BUNDLE_20261030.md` and PRD `P ## Product behavior, without another DSP host ArSonMix is a LIVE Windows ASIO/WASAPI VST3 mixer, not an audio editor. -Keep `ArSonEQ`, `ArSonVerb` and `ArSonKuPik Enhancer` as separately +Keep `ArSonEQ`, `ArSonComp`, `ArSonVerb` and `ArSonKuPik Enhancer` as separately built/signed-or-attested VST3 packages from their own repositories. FXF2 does not fork algorithms, copy JUCE9 into JUCE8, create a parallel audio callback, add Web Audio effects or replace L2 / all-channel FX Rack. @@ -104,3 +104,35 @@ factory entry as actually installed with working DSP. Application portable/install parity, CH1–N multi-insert/bypass, Save/Recall, plugin latency/PDC, real ASIO/WASAPI audio, CPU and cold GUI tests must pass. Do not mark upstream candidate PR merged as a factory release shipped. + +## 2026-10-31 ArSonComp fourth sibling reconciliation (supersedes older Comp readiness snapshot) +- Public source repository: `masarray/arson-comp`. As verified on 2026-10-31, + `main@57ad06ba` still has README/LICENSE only. Real DSP and JUCE VST3 + code is on PR #1 `feat/zero-latency-compressor@80a41f52`, CI Windows/Linux + `41156358804` SUCCESS. It is an engineering artifact, NOT a public release; + no GitHub Releases exist yet. Do not attempt to build Comp from `main`. +- The sibling targets Windows x64 JUCE8 VST3 + standalone, manufacturer + `ArSn`, plugin `ArCp`, product `ArSonComp`, version `0.1.0`. + Current CI uploads a complete `Plugin/ArSonComp.vst3` with a separate + `Standalone/ArSonComp.exe`. The *official approved public* release must + provide an exact SHA-qualified `...Windows-x64-VST3.zip`, stable actual + VST3 CID, exact ArSonMix JUCE host UID, appropriate AGPL/JUCE notices and + an unambiguous code/release build provenance. The packager now supports + both `Plugin/` (ArSonComp CI layout) and `VST3/` but + extracts ONLY `.vst3`, never a Standalone EXE. Wrong roots, + duplicate VST3 resources and unreviewed binaries fail closed. +- Automatic upstream watcher includes the FOUR sibling distributions + (`arson-eq`, `arson-comp`, `arsonverb`, `vst-enhancer`). A new Comp + release appears as *review candidate*, not automatically activated. + `config/factoryfx-approved-releases.json` remains EMPTY until every + selected item passes source/release SHA, licence and runtime host gates. +- Release acceptance for Comp: true mono/stereo, actual VST3 host + discovery, 2+ instances, zero added plugin samples (NOT zero roundtrip + device latency), external sidechain where supported, parameter ID/state + migration, native bypass and mute-safe graph transaction. Run 44.1/48/96 + kHz / actual buffer sizes, Save/Recall Show, real Windows audio/hardware, + CPU, idle GUI lifecycle and pluginval or a second Windows host. +- All four Factory FX products must ultimately be bundled with ArSonMix + official portable ZIP/installer after qualification; the existing + Factory/My Plugins picker and native FX graph must be reused. No + hard-coded VST source branch checkout or unreviewed binary in the app. diff --git a/docs/PRD_FACTORY_FX_20261030.md b/docs/PRD_FACTORY_FX_20261030.md index cf129f23d..301ac3350 100644 --- a/docs/PRD_FACTORY_FX_20261030.md +++ b/docs/PRD_FACTORY_FX_20261030.md @@ -20,4 +20,16 @@ FXF3 = atomic updates, Show migration, licensing robustness, measured low-spec G The source code milestones MS1/G5A are merged but **not proof that Factory FX is packed**. Actual release proof requires exact source artifact SHA256, whole VST3 resources, host tests, legal approval, Windows ZIP and real hardware FAT. #15 crackle remains independent release blocker. ## 2026-10-31 executable release-intake addition -The binding release-intake/Windows package implementation is in [FactoryFX cross-repo release handoff](FACTORYFX_RELEASE_INTAKE_20261031.md). All new ArSonEQ/ArSonVerb/ArSonKuPik public releases are monitored by low-cost metadata PR; they become factory modules **only after** owner-approved licence/entitlement and SHA-pinned host qualification. This updates deployment mechanics, **not** the original six-plugin goal or any claim of bundled binaries. A release candidate is not an installed FactoryFX module. +The binding release-intake/Windows package implementation is in [FactoryFX cross-repo release handoff](FACTORYFX_RELEASE_INTAKE_20261031.md). All new ArSonEQ/ArSonComp/ArSonVerb/ArSonKuPik public releases are monitored by low-cost metadata PR; they become factory modules **only after** owner-approved licence/entitlement and SHA-pinned host qualification. This updates deployment mechanics, **not** the original six-plugin goal or any claim of bundled binaries. A release candidate is not an installed FactoryFX module. + +## 2026-10-31 verified ArSonComp availability correction +The earlier audit line saying COMP has no verified sibling repository is +**superseded**. `masarray/arson-comp` contains implemented engine, +VST3/standalone, editor, automation, presets and tests on the +`feat/zero-latency-compressor` feature branch (PR #1). Windows/Linux +CI passed at `80a41f52`; no public GitHub Release or qualified ArSonMix +binary exists at this audit. The watcher and stage verifier therefore add +Comp as the FOURTH source without mislabeling the plugin installed. +The owner-approved six-plugin factory target and remaining release gates +are unchanged. Zero *plugin-added* sample delay is not zero total +host/device I/O latency. diff --git a/docs/PR_BACKLOG_RECONCILIATION_20261031.md b/docs/PR_BACKLOG_RECONCILIATION_20261031.md new file mode 100644 index 000000000..6042942b6 --- /dev/null +++ b/docs/PR_BACKLOG_RECONCILIATION_20261031.md @@ -0,0 +1,75 @@ +# ArSonMix — Live Main / PR Reconciliation Ledger (2026-10-31 WIB) +Status: operational source-of-truth for **PR disposition and safe merge order only**. Product architecture continues to be owned by [PRODUCT_TRUTH_CROSS_THREAD_20261031.md](PRODUCT_TRUTH_CROSS_THREAD_20261031.md), the canonical PRD/ARD, and verified executable code. This ledger is not a new architecture or independent roadmap. + +## 0. Verified audit checkpoint +- At audit start, latest `main` = **`44376031932447f97a3bc017af499e8205880a12`** (merged documentation PR #227; custom JUCE Audio Device Setup *design only*). Refresh exact main SHA and open PR status **at every merge**; this snapshot is not a timeless branch pointer. +- The latest source-bearing main merge #224 produced `main@27659119ce8c24341edfdd5e5230b4b7c4a0384e`, with Windows MSVC/CTest/package [41160099477](https://github.com/masarray/arsonmix/actions/runs/41160099477) **SUCCESS** and Chromium UI [41160099173](https://github.com/masarray/arsonmix/actions/runs/41160099173) **SUCCESS**. #227 is docs-only and does not by itself validate a new executable/device capability. +- Initial open PR count = **21**. Of these **18 historical/divergent PRs**, **#222** superseded by #224, **#225** four-sibling FactoryFX, and **#226** current CHANNEL/AUX master milestone. After closing #222: **20 open** (18 historical plus #225/#226). New reconciliation PR(s) are temporary and must not create another parallel product implementation. +- Passing CI at an old branch SHA, a GitHub `mergeable` badge, a mock-device UI test or a successfully packaged EXE must never be misreported as real hardware FAT. [#15](https://github.com/masarray/arsonmix/issues/15) **0-VST physical crackling**, loopback latency, sample dropout and wired soak remain unqualified. + +## 1. Already MERGED — do not reimplement or resurrect from old branches +| Domain | Merged PRs | What is real / what is NOT claimed | +| --- | --- | --- | +| Realtime core | #203 MAIN+MONITOR, #209 independent user-selected secondary output, #215 DYN1B-2A | One native 10-input/4-AUX live mixer; ChannelId replacement kernel and legacy A/B PCM equivalence are **not live dynamic CH11+** | +| Console | #208 L2 FX/Routing layout, #211 pinned MASTER, #216 RAIL3 | Preserve 11 aligned fader strips, master visibility, dark upper groove; no duplicate UI/controller | +| FX/Show | #188 Factory registry, #197 G5E VST3 Show, #210 source release intake | One JUCE VST3 host; `config/factoryfx-approved-releases.json` currently contains `plugins: []` (no original Factory VST3 binary bundled) | +| Operator routing | #218 PATCH1, #219 MS5, #223 native live AUX POST gain, #224 SOURCE1+real driver/64-pin selection | Existing POST-send gain and guarded MUTED source change operate on native ACK; no unrestricted armed-output quick-switch or independently functioning custom WebView2 driver setup | +| Product/docs | #217 convergence, #220 PATCH2 target, #221 product truth, #227 custom device-setup PRD/ARD | #227 designs replacement of native JUCE setup popup, **not implemented**; SOURCE1 #224 is not full PATCH2 seamless switch | + +Do not replace `src/Main.cpp`, `LiveDryRoutingLab`, `web/monitor.js`, `web/mixer-io.js`, standalone GUI resource, `AGENTS.md` or L2 CSS with stale wholesale copies. + +## 2. Current PR disposition (only the latest owners) +| PR | Current disposition / acceptance gate | Overlap and safe next action | +| --- | --- | --- | +| [#222 SETUP1](https://github.com/masarray/arsonmix/pull/222) | **CLOSED SUPERSEDED** after auditing file scope against merged #224. Old PR head CI passed but it is not an additional release. | #224 contains device chooser, native 64 pins, bus view, SOURCE1 ACK and corresponding tests; old diff overlaps `Main.cpp`/`monitor.js`/`mixer-io.js`. Preserve PR branch for narrow salvage only, never merge wholesale. | +| [#225 ArSonComp FactoryFX](https://github.com/masarray/arsonmix/pull/225) | Old PR exact-head Windows [41159434568](https://github.com/masarray/arsonmix/actions/runs/41159434568) **SUCCESS**; **draft and not mergeable into moving main without conflict** (GitHub merge rejected 405). | Port ONLY eight unique factory watcher/staging/test/docs additions onto new main. Do not overwrite newer `AGENTS`; avoid attempting stale squash again. The old PR should be closed as superseded **after** a replacement branch preserves its unique changes and passes the relevant gates. | +| [#226 CHANNEL/AUX MASTER](https://github.com/masarray/arsonmix/pull/226) | **DRAFT, implementation NOT merged**; exact old head Windows [41160392121](https://github.com/masarray/arsonmix/actions/runs/41160392121) + Chromium [41160392139](https://github.com/masarray/arsonmix/actions/runs/41160392139) **SUCCESS**. | Real selected-channel SOURCE→FX→SENDS→OUTPUT readback and realtime native AUX master gain; overlaps #222/#224 in `Main.cpp`, `web/monitor.js`, `mixer-io.js`, standalone UI, tests. Reconcile against latest main and #227 **without** losing device setup, live SEND faders, route ACK or Show. Preserve PR until exact integrated SHA CI + FAT plan. | +| **Custom device setup** | #227 **docs merged**; no implementation PR has been approved in this audit. | Implement later as ONE existing JUCE AudioDeviceManager with a WebView2 device UI, preflight/MUTED APPLY/native ACK/readback/rollback. No second callback or fake device inventory. Source docs: PRD/ARD/HANDOFF_CUSTOM_AUDIO_DEVICE_SETUP_20261031.md. | + +**Ownership fence:** `#226` owns the selected channel and live AUX master / audio graph. FactoryFX source release intake owns its watcher/staging/test/docs and *does not edit* `Main.cpp`, `LiveDryRoutingLab`, `monitor.js`, `mixer-io.js`, FX graph or audio callback. The custom device panel is a separate future implementation requiring explicit reconciliation with #226 and real ASIO/WASAPI device lifecycle. + +## 3. 18 historical OPEN PRs — QUARANTINE / NO BULK MERGE +| Historical PRs | Reason to retain as history; modern owner | +| --- | --- | +| #128 | Old toolbar/audio setup/snapshot concepts; modern source owner #224/#227 and Show #180 | +| #117, #115 | Previous two-AUX and execution graphs; runtime migration #192 DYN1B owns any unique missing behavior | +| #113, #59 | Old handoff/reconciliation snapshots; this ledger and PRODUCT_TRUTH supersede their status | +| #60 | Experimental meter canvas; only use measured low-spec Windows iGPU evidence in #56 | +| #29, #26, #25 | Dual-clock/recovery experiments; real hardware #15 and OUTPUT1 own verified outcomes | +| #10, #9, #8 | Old VST swap/bus/state work; FX #95 / Show #180 own any audited delta | +| #7, #6, #5, #4, #3, #1 | Chained early native P1/P2 prototypes; never graft stale callback/GUI files into current main | + +These 18 historical PRs remain available as audit material. Do not bulk-close or merge without unique-delta assessment. They are **not** 18 executable tasks in the current sprint; their source branch CI state cannot overrule latest main. + +## 4. Factory VST3 cross-repo truth (2026-10-31) +- Four **implemented sibling sources** targeted next for default FactoryFX: ArSonEQ (feature branch; no public release, embedded BUILD SHA mismatch previously found), ArSonComp (`masarray/arson-comp` draft PR #1, latest observed head `673c2ca9`, Windows VST3 engineering artifact; no public release), ArSonVerb (VST3 source on main, no official GitHub Release; confirm outbound licence), and ArSonKuPik Enhancer (public binary distribution from `masarray/vst-enhancer` v0.5.26; entitlement/redistribution approval unresolved). +- The final six first-party product target adds future Harmony and Color. Do not claim built-in binaries simply because a repo contains source or CI is green. +- The reviewed approval lock is **EMPTY**. A new upstream release is detected into a candidate PR, then separately admitted with exact SHA256, source commit, VST3 class ID, actual JUCE host UID, licence+notice, host validation and rollback. No live binary replacement during audio operation. +- ArSonComp actual artifact uses `Plugin/ArSonComp.vst3`; FactoryFX packager must support this and `VST3/` safely while excluding `Standalone`. Source/zip tests must travel with the packager. Source-specific acceptance: [arson-comp #2](https://github.com/masarray/arson-comp/issues/2). + +## 5. Canonical release / merge sequence +1. **M0 hardware P0 #15 remains in parallel and blocks product certification.** Use latest exact source-bearing successful Windows artifact; wired ASIO/WASAPI 44.1/48k, 0 VST, real source/output PCM and 30-minute clean soak. Capture reproducible health trace. No zero-total-latency claim. +2. **Merge self-contained FactoryFX reconciliation ONLY after one branch based on latest main contains the eight source changes + targeted offline tests + successful exact-head Windows gate.** It must not touch the live audio controller. Close old #225 as superseded after that branch is verified/merged; retain history. +3. **Rebase/reconcile #226 selected-channel/AUX native milestone** against actual new main, #224 and #227. Same native ACK status authority, one continuous DSP callback, no duplicate route manager. Pass Windows + Chromium same-head and inspect L2/1366px. Only then merge; hardware FAT still separate. +4. **Next milestone: genuinely custom WebView2 Audio Device Setup** from merged #227 ARD/PRD, not cosmetic button duplication. Test device selection and rollback on actual hardware. Coordinate native owner with #226. +5. **Next whole-product milestones:** PATCH2 safe live source switch, full ChannelId one-graph cutover then runtime +CHANNEL, native all-channel/MASTER VST3/PDC, recall-safe Shows, legal factory VST3 binaries, field release qualification. Never split into parallel competing DSP systems. + +## 5A. Concurrent PR discovered during audit: #228 and new #226 head +**Live refresh after initial audit; supersedes earlier #226 SHA and merge ordering:** As of GitHub read `main@44376031932447f97a3bc017af499e8205880a12`, [#228 DEVICE1](https://github.com/masarray/arsonmix/pull/228) newly opened from this same main with head `8c152945928e45223b439c24cafa912b9458958c`. It is **source implementation**, NOT merged: custom native JUCE device selection, guarded `audioDeviceApply`, readback/rollback and WebView2 AUDIO I/O matrix UI; exact-current-head CI status must be checked fresh. The PR changes `src/Main.cpp`, `web/mixer-io.js`, `web/mixer-io.css`, standalone HTML and operator tests. It does **not** authorize physical ASIO/MAONO/low-latency claims without hardware tests. + +[#226 M1B](https://github.com/masarray/arsonmix/pull/226) was **rebased/rewritten** during this reconciliation to new head `325825a92cfcdb6e37813a78faf903f239ecbd5c` against latest `main@44376031`. Earlier PASS for `4bee5c89` cannot qualify this new head. It touches all #228 UI/Main/test overlap **plus** `LiveAudioEngine.h`, `LiveDryRoutingLab.h`, `PreparedMixerBlock.h`, `LiveChannelFxGraph.h` and `web/monitor.js`. These are **two directly overlapping native/control milestones**, not safely independent merge approvals. + +**Hard merge sequencing:** First land the small self-contained FactoryFX ledger/intake reconciliation if its own exact-head CI passes. For #228 and #226, choose an explicit single integration sequence after BOTH latest tests complete; merge one only with exact-head green and documented source owner review, then rebase and rerun affected native + GUI tests on the other; NEVER click two green 'Merge' buttons on stale bases. Reconcile `src/Main.cpp` audioDeviceApply with AUX bus gain command and lifetime, and reconcile `web/mixer-io.js`/standalone CSS/JS parity and `tests/mixer_io_smoke.py` without dropping SOURCE1 #224, SENDS #223, selected CHANNEL or native ACK. Both require separate real-hardware #15 FAT; neither may claim certification from CI. + +## 6. Merge checklist — use this before EVERY PR +- [ ] Refresh GitHub `main` SHA, open/merged PRs and exact PR head; no cached status. +- [ ] Declare ONE owner/milestone and exact file overlap with open native/UI PRs. +- [ ] Confirm functionality not already merged (include native PCM/ACK proof, not only GUI). +- [ ] Rebase or selectively port against actual current main **without overwriting recent docs/AGENTS or GUI**. +- [ ] Run targeted offline/static tests first; then only applicable native Windows CTest/ZIP and Chromium test for exact integrated SHA. +- [ ] Preserve existing L2/RAIL3/master, ROUTE/FX separation, plugin Show identity, MAIN/MONITOR/OUTPUT1, SOURCE1 and realtime POST sends. +- [ ] No audio-callback allocation, filesystem/network I/O, UI calls or blocking locks; structural changes remain guarded, continuous level changes atomic/dezippered. +- [ ] Distinguish MERGED / SOURCE-BUILT / CI PASS / VERIFIED PACKAGE / PHYSICAL FAT PASSED / RELEASE QUALIFIED. +- [ ] Update this PR disposition ledger + product truth only where product behavior genuinely changed. Do not open a new unrelated handoff for every tiny task. + +Next-thread starting files: `AGENTS.md` top directives -> `docs/PRODUCT_TRUTH_CROSS_THREAD_20261031.md` -> **this ledger** -> latest PR/head/CI -> appropriate feature PRD/ARD/handoff -> source & tests. GitHub source and actual device evidence always outrank this dated ledger. diff --git a/scripts/factoryfx_release_bundle.py b/scripts/factoryfx_release_bundle.py index 0a2334ff6..e1777913f 100644 --- a/scripts/factoryfx_release_bundle.py +++ b/scripts/factoryfx_release_bundle.py @@ -106,7 +106,7 @@ def zip_members(z, bundle): seen = set() total = 0 for info in z.infolist(): - # Ignore zip folder markers and unrelated top-level build metadata. + # Ignore zip folder markers and unrelated top-level build metadata.\n # Owned JUCE Windows packages use VST3/ or Plugin/. if info.is_dir(): continue pp = PurePosixPath(info.filename) @@ -121,7 +121,7 @@ def zip_members(z, bundle): # Standalone EXEs and foreign plugins must never enter the factory. continue i = positions[0] - if i > 1 or (i == 1 and parts[0] not in ("VST3", "vst3")): + if i > 1 or (i == 1 and parts[0] not in ("VST3", "vst3", "Plugin")): fail("unexpected VST3 archive root") sub = parts[i + 1:] if not sub: diff --git a/scripts/factoryfx_upstream_watch.py b/scripts/factoryfx_upstream_watch.py index 90008ec53..2a46667e6 100644 --- a/scripts/factoryfx_upstream_watch.py +++ b/scripts/factoryfx_upstream_watch.py @@ -9,6 +9,7 @@ PRODUCTS = [ ("arson-eq", "masarray/arson-eq"), + ("arson-comp", "masarray/arson-comp"), ("arson-verb", "masarray/arsonverb"), ("arsonkupik-enhancer", "masarray/vst-enhancer"), ] diff --git a/scripts/tests/test_factoryfx_release_bundle.py b/scripts/tests/test_factoryfx_release_bundle.py index d5ba6e88f..3dffa7d00 100644 --- a/scripts/tests/test_factoryfx_release_bundle.py +++ b/scripts/tests/test_factoryfx_release_bundle.py @@ -99,6 +99,43 @@ def test_archive_rejects_traversal_duplicate_and_missing_module(self): with zipfile.ZipFile(p) as z, self.assertRaises(ValueError): bundle.zip_members(z, "ArSonEQ.vst3") + def test_arsoncomp_ci_layout_is_factory_vst3_only(self): + """Real sibling CI uses Plugin/ArSonComp.vst3, not VST3/; no Standalone.""" + (self.notices / "arson-comp.txt").write_text( + "Reviewed Comp redistribution fixture only", encoding="utf-8") + comp_zip = self.root / "comp.zip" + with zipfile.ZipFile(comp_zip, "w") as z: + z.writestr("Plugin/ArSonComp.vst3/Contents/x86_64-win/ArSonComp.vst3", + b"fake-comp-module") + z.writestr("Plugin/ArSonComp.vst3/Contents/Resources/moduleinfo.json", + b'{"name":"ArSonComp"}') + z.writestr("Standalone/ArSonComp.exe", b"this-must-never-ship") + comp = dict(self.approved, productId="arson-comp", + sourceRepo="masarray/arson-comp", + assetName="ArSonComp-Windows-x64-VST3.zip", + artifactSha256=hashlib.sha256(comp_zip.read_bytes()).hexdigest()) + self.save_lock(comp) + with patch.object(bundle, "download_release", + side_effect=lambda _p, target: shutil.copyfile(comp_zip, target)): + bundle.stage(bundle.read_lock(self.lock), self.output, self.notices) + bundle.verify(bundle.read_lock(self.lock), self.output, self.notices) + root = self.output / "FactoryFX" + manifest = json.loads((root / "factoryfx-manifest.json").read_text()) + self.assertEqual(manifest["plugins"][0]["productId"], "arson-comp") + self.assertEqual(manifest["plugins"][0]["category"], "COMP") + self.assertTrue((root / "ArSonComp/ArSonComp.vst3/Contents/x86_64-win/ArSonComp.vst3").is_file()) + self.assertFalse((root / "Standalone").exists()) + self.assertFalse(list(root.rglob("*.exe"))) + + def test_arsoncomp_rejects_mixed_duplicate_bundle_roots(self): + zip_path = self.root / "duplicate-comp.zip" + with zipfile.ZipFile(zip_path, "w") as z: + for root in ("Plugin", "VST3"): + z.writestr(f"{root}/ArSonComp.vst3/Contents/x86_64-win/ArSonComp.vst3", + b"duplicate module") + with zipfile.ZipFile(zip_path) as z, self.assertRaises(ValueError): + bundle.zip_members(z, "ArSonComp.vst3") + def test_extra_factory_file_is_rejected(self): with patch.object(bundle, "download_release", side_effect=lambda _p, target: shutil.copyfile(self.archive, target)): @@ -116,9 +153,27 @@ def fake(repo): assets=[{"name": "ArSonKuPik-v0.5.26-Windows-x64-VST3.zip"}]) return None snapshot = watch.snapshot(fake) - self.assertEqual(len(snapshot["observed"]), 3) + self.assertEqual(len(snapshot["observed"]), 4) + self.assertEqual([x["productId"] for x in snapshot["observed"]], + ["arson-eq", "arson-comp", "arson-verb", "arsonkupik-enhancer"]) self.assertIsNone(snapshot["observed"][0]["releaseTag"]) - self.assertEqual(snapshot["observed"][2]["releaseTag"], "v0.5.26") + self.assertIsNone(snapshot["observed"][1]["releaseTag"]) + self.assertEqual(snapshot["observed"][3]["releaseTag"], "v0.5.26") + + def test_comp_published_release_is_detected_but_never_approved(self): + def fake(repo): + if repo == "masarray/arson-comp": + return dict(tag_name="v0.1.0", published_at="2026-10-31T00:00:00Z", + assets=[{"name": "ArSonComp-v0.1.0-Windows-x64-VST3.zip"}, + {"name": "ArSonComp-v0.1.0-Windows-Standalone.zip"}]) + return None + snapshot = watch.snapshot(fake) + row = snapshot["observed"][1] + self.assertEqual(row["productId"], "arson-comp") + self.assertEqual(row["windowsVst3Asset"], "ArSonComp-v0.1.0-Windows-x64-VST3.zip") + self.assertEqual(row["releaseTag"], "v0.1.0") + self.assertNotIn("approved", json.dumps(row)) + if __name__ == "__main__":