merge: resolve master conflicts keeping acetylcholine VFX + glow_sinusoidal

Author: cursoragent

backend/neuromodulation.py

@@ -51,10 +51,10 @@ class ClassificationResult(TypedDict):
 # Canonical glow hex for API echo / UI sync (plan 3.3a); cortisol uses piecewise in build_vfx_profile
 NEUROMOD_GLOW_HEX: dict[str, str] = {
     "adrenaline": "#FF4500",
-    "noradrenaline": "#FF4500",
+    "noradrenaline": "#FF8C00",
     "dopamine": "#FFD700",
-    "acetylcholine": "#FFD700",
-    "serotonin": "#E0FFFF",
+    "acetylcholine": "#32CD32",
+    "serotonin": "#40E0D0",
     "baseline": "#E0FFFF",
     "gaba": "#8A2BE2",
     "cortisol": "#FFBF00",
@@ -77,7 +77,7 @@ class SnnModulationSpec:
     "adrenaline": SnnModulationSpec(1.35, 1.25, -0.06, 0.85, 0.75, 1.1, 1.3),
     "noradrenaline": SnnModulationSpec(1.45, 0.85, -0.04, 0.9, 0.85, 1.05, 1.15),
     "dopamine": SnnModulationSpec(1.25, 1.05, -0.03, 0.95, 0.9, 1.15, 1.25),
-    "serotonin": SnnModulationSpec(1.05, 1.0, 0.04, 1.15, 1.15, 0.95, 0.85),
+    "serotonin": SnnModulationSpec(0.95, 1.0, 0.04, 1.15, 1.15, 0.95, 0.85),
     "gaba": SnnModulationSpec(0.75, 0.7, 0.08, 1.25, 1.2, 0.75, 0.7),
     "acetylcholine": SnnModulationSpec(1.4, 0.75, -0.02, 0.95, 1.0, 1.1, 1.1),
 }
@@ -361,22 +361,22 @@ def _vfx_cortisol_piecewise(u: float) -> VfxProfileDict:
         "tween_in_ms": 900,
         "tween_out_ms": 1200,
         "idle_breath_speed_mult": 0.55,
-        "idle_breath_amp_mult": 1.25,
+        "idle_breath_amp_mult": 0.72,
         "vertex_wave_mult": 0.6,
         "burst_threshold": 0.72,
         "active_lobe_bloom_scale": 1.0,
         "glow_sinusoidal_amp_mult": 0.0,
     },
     "acetylcholine": {
-        "bloom_mult": 1.05,
-        "bloom_activity_boost_mult": 1.08,
-        "tween_in_ms": 520,
-        "tween_out_ms": 680,
-        "idle_breath_speed_mult": 0.95,
-        "idle_breath_amp_mult": 0.8,
-        "vertex_wave_mult": 1.12,
-        "burst_threshold": 0.55,
-        "active_lobe_bloom_scale": 1.12,
+        "bloom_mult": 1.2,
+        "bloom_activity_boost_mult": 1.22,
+        "tween_in_ms": 400,
+        "tween_out_ms": 560,
+        "idle_breath_speed_mult": 1.1,
+        "idle_breath_amp_mult": 0.95,
+        "vertex_wave_mult": 1.25,
+        "burst_threshold": 0.48,
+        "active_lobe_bloom_scale": 1.2,
         "glow_sinusoidal_amp_mult": 0.0,
     },
     "baseline": {

frontend/js/ui.js

@@ -29,7 +29,16 @@ export function mergeVfxProfile(raw) {
 
 export function neuromodPillTextClass(hex) {
   const h = (hex || "").toUpperCase();
-  if (h === "#E0FFFF" || h === "#FFD700" || h === "#FFBF00" || h === "#FFF8F0") return "text-slate-900";
+  if (
+    h === "#E0FFFF" ||
+    h === "#40E0D0" ||
+    h === "#FFD700" ||
+    h === "#32CD32" ||
+    h === "#FFBF00" ||
+    h === "#FFF8F0"
+  ) {
+    return "text-slate-900";
+  }
   return "text-white";
 }
 

tests/test_neuromodulation.py

@@ -168,17 +168,31 @@ def test_validate_rationale_too_long() -> None:
 
 def test_glow_hex_per_modulator() -> None:
     assert NEUROMOD_GLOW_HEX["adrenaline"] == "#FF4500"
+    assert NEUROMOD_GLOW_HEX["noradrenaline"] == "#FF8C00"
     assert NEUROMOD_GLOW_HEX["dopamine"] == "#FFD700"
+    assert NEUROMOD_GLOW_HEX["acetylcholine"] == "#32CD32"
+    assert NEUROMOD_GLOW_HEX["serotonin"] == "#40E0D0"
     assert NEUROMOD_GLOW_HEX["baseline"] == "#E0FFFF"
     assert NEUROMOD_GLOW_HEX["gaba"] == "#8A2BE2"
 
 
+def test_glow_hex_all_non_cortisol_modulators_distinct() -> None:
+    non_cortisol = [m for m in NEUROMOD_GLOW_HEX if m != "cortisol"]
+    hexes = [NEUROMOD_GLOW_HEX[m] for m in non_cortisol]
+    assert len(hexes) == len(set(hexes))
+
+
 def test_build_vfx_includes_glow_hex() -> None:
     v = build_vfx_profile("noradrenaline", 0.8)
-    assert v["glow_hex"] == "#FF4500"
+    assert v["glow_hex"] == "#FF8C00"
     assert v["tween_in_ms"] < 600
 
 
+def test_gaba_idle_breath_amp_mult_at_full_intensity() -> None:
+    v = build_vfx_profile("gaba", 1.0)
+    assert v["idle_breath_amp_mult"] == pytest.approx(0.72, abs=1e-9)
+
+
 def test_gaba_resolves_lower_rates_than_adrenaline() -> None:
     g = resolve_snn_modulation("gaba", 1.0)
     a = resolve_snn_modulation("adrenaline", 1.0)

tests/test_neuromodulation_parametric.py

@@ -20,7 +20,7 @@
 # ---------------------------------------------------------------------------
 _SNN_FULL = {
     "dopamine": (0.77, 19.0, 4.5, 0.46, 125.0, 10.5),
-    "serotonin": (0.84, 23.0, 5.75, 0.38, 105.0, 10.0),
+    "serotonin": (0.84, 23.0, 5.75, 0.38, 95.0, 10.0),
     "acetylcholine": (0.78, 19.0, 5.0, 0.44, 140.0, 7.5),
     "noradrenaline": (0.76, 18.0, 4.25, 0.42, 145.0, 8.5),
     "baseline": (0.80, 20.0, 5.0, 0.40, 100.0, 10.0),
@@ -32,12 +32,12 @@
 # Format: (glow_hex, bloom_mult, tween_in_ms, burst_threshold, active_lobe_bloom_scale)
 _VFX_FULL = {
     "dopamine": ("#FFD700", 1.12, 480, 0.52, 1.05),
-    "serotonin": ("#E0FFFF", 0.95, 720, 0.68, 1.00),
-    "acetylcholine": ("#FFD700", 1.05, 520, 0.55, 1.12),
+    "serotonin": ("#40E0D0", 0.95, 720, 0.68, 1.00),
+    "acetylcholine": ("#32CD32", 1.2, 400, 0.48, 1.2),
     "adrenaline": ("#FF4500", 1.25, 350, 0.45, 1.00),
     "gaba": ("#8A2BE2", 0.80, 900, 0.72, 1.00),
     "baseline": ("#E0FFFF", 1.00, 600, 0.60, 1.00),
-    "noradrenaline": ("#FF4500", 1.20, 420, 0.50, 1.35),
+    "noradrenaline": ("#FF8C00", 1.20, 420, 0.50, 1.35),
 }
 
 
@@ -124,3 +124,9 @@ def test_zero_intensity_bloom_equals_baseline_for_all_mods(self) -> None:
         for mod in _VFX_FULL:
             p = build_vfx_profile(mod, 0.0)
             assert p["bloom_mult"] == pytest.approx(baseline_bloom, abs=1e-9), mod
+
+    def test_gaba_idle_breath_amp_mult_reduced_for_inhibitory_profile(self) -> None:
+        gaba_amp = build_vfx_profile("gaba", 1.0)["idle_breath_amp_mult"]
+        assert gaba_amp == pytest.approx(0.72, abs=1e-9)
+        assert gaba_amp < build_vfx_profile("adrenaline", 1.0)["idle_breath_amp_mult"]
+        assert gaba_amp < build_vfx_profile("baseline", 1.0)["idle_breath_amp_mult"]