From c67158116a189c5d84dafc8cd62ed5bd569c5881 Mon Sep 17 00:00:00 2001
From: Meta Vens <rwvens@hotmail.com>
Date: Mon, 15 Jun 2026 00:32:54 +0100
Subject: [PATCH] Repair AquaSynth merge witnesses

---
 patches/aquasynth-patch-cultcache.cc          | Bin 17746 -> 17985 bytes
 src/AquaSynth.Core/CultCachePatchDocument.cs  |   1 +
 tests/AquaSynth.Dsl.Tests/PatchScriptTests.cs |  12 ++++++------
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/patches/aquasynth-patch-cultcache.cc b/patches/aquasynth-patch-cultcache.cc
index 40b1f1f988c35056286af6fb3b37f152467b3281..d3dfe381d31be55102d6bb7209b385155767e944 100644
GIT binary patch
delta 275
zcmccA#dxrXaYHD(oSCknNr;iLm64g1v6-H^g_*gzrMb3&ft7*5QM+@Ki`j26YHar7
z*vT^a3ZGDYYEEi$Nm0ITN>P4+Zc1uyzFuNsY2u2+l(NLU<kXan81grj9f1mhEAvV+
z6pHin(shf=6N_>cia`RY#hJwlAVY38yF$#>PtMOR$VsgLS^<_&D9;4y%gh7v^^;07
zbHY>fK{hKC16`4spQn(XSdv<-qmYwWnOc;ZqL7qWT&$3skzW85OH4`0EXgcORVYs^
n&d^aP&PXf(swe@PU0Re1l+H_0$jz)!NGvVM&rRIK8)N|hg<WMO

delta 56
zcmX@u!+5ESaYHD(oT;v{VTggHm5GIwvALd^v4N49iGj9(ft7*5QQP~Ii`j26s&Dq=
M*vYc_8?Uzo0N61RN&o-=

diff --git a/src/AquaSynth.Core/CultCachePatchDocument.cs b/src/AquaSynth.Core/CultCachePatchDocument.cs
index fbc55fe..6f910f7 100644
--- a/src/AquaSynth.Core/CultCachePatchDocument.cs
+++ b/src/AquaSynth.Core/CultCachePatchDocument.cs
@@ -142,6 +142,7 @@ public static class CultCachePatchDocumentCatalog
         new("patches/advanced/additive-pad.aqua", "advanced", "additive-pad", "BuiltInScripts.ReferenceScripts", "Additive body plus PAD spectral halo; slow controls own bloom and air."),
         new("patches/advanced/aurora-pad.aqua", "advanced", "aurora-pad", "BuiltInScripts.ReferenceScripts", "Stock reference patch exported from the in-code catalog."),
         new("patches/advanced/bird-syrinx.aqua", "advanced", "bird-syrinx", "Graph-native syrinx patch", "Paired labial source-port bird voice for differentiable training and audition."),
+        new("patches/advanced/electro-drop-demo.aqua", "advanced", "electro-drop-demo", "AquaSynth song-swarm synthesis demo", "Electro/complextro demo with intro/build/drop section gates, layered bass chops, additive wash, shaped texture, and mix automation."),
         new("patches/advanced/glass-creature.aqua", "advanced", "glass-creature", "BuiltInScripts.ReferenceScripts", "Stock reference patch exported from the in-code catalog."),
         new("patches/advanced/machine-breath.aqua", "advanced", "machine-breath", "BuiltInScripts.ReferenceScripts", "Stock reference patch exported from the in-code catalog."),
         new("patches/advanced/ritual-sequence.aqua", "advanced", "ritual-sequence", "BuiltInScripts.ReferenceScripts", "Stock reference patch exported from the in-code catalog."),
diff --git a/tests/AquaSynth.Dsl.Tests/PatchScriptTests.cs b/tests/AquaSynth.Dsl.Tests/PatchScriptTests.cs
index 54ccf96..1d00e05 100644
--- a/tests/AquaSynth.Dsl.Tests/PatchScriptTests.cs
+++ b/tests/AquaSynth.Dsl.Tests/PatchScriptTests.cs
@@ -1704,7 +1704,7 @@ public sealed class PatchScriptTests
         Assert.Equal(.1f, voice.Envelope.AttackSeconds, 5);
         Assert.Equal(.5f, voice.Envelope.SustainLevel, 5);
         Assert.Equal(RateLevelCurve.Exponential, voice.RateLevelEnvelope.Curve2);
-        Assert.Contains("rl4_env(0.1, 1, 0, 0.2, 0.8, 1, 0.3, 0.5, 1, 0.4, 0, 0, patch_param_0)", export.Source);
+        Assert.Contains("rl4_env_at(voice_0_age, 0.1, 1, 0, 0.2, 0.8, 1, 0.3, 0.5, 1, 0.4, 0, 0, patch_param_0)", export.Source);
     }
 
     [Fact]
@@ -1945,7 +1945,7 @@ public sealed class PatchScriptTests
         Assert.Equal(0, envelope.Level4);
         Assert.Equal(.75f, op2.Note.GateSeconds, 5);
         Assert.Equal(RateLevelCurve.Linear, envelope.Curve1);
-        Assert.Contains("rl4_env(0.004, 1, 0, 0.12, 0.7, 0, 0.2, 0.25, 0, 0.4, 0, 0, 0.75)", export.Source);
+        Assert.Contains("rl4_env_at(age, 0.004, 1, 0, 0.12, 0.7, 0, 0.2, 0.25, 0, 0.4, 0, 0, 0.75)", export.Source);
     }
 
     [Fact]
@@ -1966,7 +1966,7 @@ public sealed class PatchScriptTests
         Assert.Equal(RateLevelCurve.Exponential, envelope.Curve2);
         Assert.Equal(RateLevelCurve.Exponential, envelope.Curve3);
         Assert.Equal(RateLevelCurve.Linear, envelope.Curve4);
-        Assert.Contains("rl4_env(0.004, 1.2, 0, 0.12, 0.7, 1, 0.2, 0.25, 1, 0.4, 0, 0, 0.75)", export.Source);
+        Assert.Contains("rl4_env_at(age, 0.004, 1.2, 0, 0.12, 0.7, 1, 0.2, 0.25, 1, 0.4, 0, 0, 0.75)", export.Source);
     }
 
     [Fact]
@@ -1989,7 +1989,7 @@ public sealed class PatchScriptTests
         Assert.Contains(patch.ParameterBindings, binding => binding.FieldPath == "/opgraphs/0/operators/2/env/decay" && binding.ParameterPath == "/macro/strike");
         Assert.Contains(patch.ParameterBindings, binding => binding.FieldPath == "/opgraphs/0/routes/2>1/index" && binding.ParameterPath == "/macro/brightness");
         Assert.Contains("opgraph_0_op_2 * patch_param_0", export.Source);
-        Assert.Contains("oneshot_adsr(0.01, patch_param_1, 0, 0", export.Source);
+        Assert.Contains("oneshot_adsr_at(age, 0.01, patch_param_1, 0, 0", export.Source);
         Assert.Contains("opgraph_0 = (opgraph_0_op_1) * patch_param_0;", export.Source);
         Assert.Empty(export.Warnings);
     }
@@ -2022,7 +2022,7 @@ public sealed class PatchScriptTests
         var export = FaustEmitter.EmitScript("param path=/macro/brightness default=.45 min=0 max=1 step=.001;v w=saw f=80 lpf=@/macro/brightness");
 
         Assert.Contains("patch_param_0 = hslider(\"/macro/brightness\", 0.45, 0, 1, 0.001) : si.smoo;", export.Source);
-        Assert.Contains("clip01(patch_param_0 * (1.0 + 0 * age * 1.8) + patch_mod_lpf + 0.0)", export.Source);
+        Assert.Contains("clip01(patch_param_0 * (1.0 + 0 * voice_0_age * 1.8) + patch_mod_lpf + 0.0)", export.Source);
         Assert.Empty(export.Warnings);
     }
 
@@ -2071,7 +2071,7 @@ public sealed class PatchScriptTests
         Assert.NotNull(envelope);
         Assert.Equal(.4f, envelope.StartLevel, 5);
         Assert.Equal(.3f, envelope.Level1, 5);
-        Assert.Contains("rl4_env_from(0.4", export.Source);
+        Assert.Contains("rl4_env_from_at(voice_0_age, 0.4", export.Source);
     }
 
     [Fact]