Upload 4 files

app.py

@@ -1,5 +1,6 @@
 import streamlit as st
 import uuid
+from audio_engine import AudioEngine
 from emotional_engine import (
     SectionNamer, 
     get_section_types, 
@@ -88,8 +89,8 @@ def get_preset_chord_symbols(preset_roman, key_root_pc):
                 symbol = f"{root_name}{quality}"
             
             chord_symbols.append(symbol)
-        except:
-            chord_symbols.append(token)
+        except Exception:
+            chord_symbols.append(token)  # pass through unrecognized tokens as-is
     
     return " ".join(chord_symbols)
 
@@ -102,38 +103,275 @@ st.set_page_config(page_title="Harmonic Catalyst PRO", page_icon="🎹", layout=
 
 st.markdown("""
 <style>
-    .stApp {background-color: #0d1117; color: #c9d1d9;}
-    .stButton>button {
-        border-radius: 8px;
-        background: linear-gradient(135deg, #238636, #2ea043);
-        color: white; font-weight: bold;
+    /* ── Base ── */
+    .stApp { background-color: #0a0d12; color: #c9d1d9; }
+    .block-container { padding-top: 1.5rem !important; }
+
+    /* ── Sidebar ── */
+    [data-testid="stSidebar"] {
+        background: #0d1117;
+        border-right: 1px solid #1e2530;
+    }
+    [data-testid="stSidebar"] .stMarkdown h1,
+    [data-testid="stSidebar"] .stMarkdown h2,
+    [data-testid="stSidebar"] .stMarkdown h3 {
+        color: #00bfa5;
+        font-size: 0.75rem;
+        text-transform: uppercase;
+        letter-spacing: 0.1em;
+        font-weight: 700;
+        margin-bottom: 0.5rem;
     }
-    hr {border: 0; border-top: 1px solid #30363d;}
-    .help-box {
+
+    /* ── Buttons ── */
+    .stButton > button {
+        border-radius: 6px;
+        border: 1px solid #1e2530;
         background: #161b22;
-        border-left: 4px solid #58a6ff;
-        padding: 1rem;
+        color: #8b949e;
+        font-weight: 600;
+        font-size: 0.82rem;
+        transition: all 0.15s ease;
+    }
+    .stButton > button:hover {
+        border-color: #00bfa5;
+        color: #00bfa5;
+        background: #0d1f1e;
+    }
+    /* Primary button */
+    .stButton > button[kind="primary"],
+    button[data-testid="baseButton-primary"] {
+        background: linear-gradient(135deg, #00897b, #00bfa5) !important;
+        border: none !important;
+        color: #000 !important;
+        font-weight: 700 !important;
+        letter-spacing: 0.04em;
+    }
+    .stButton > button[kind="primary"]:hover,
+    button[data-testid="baseButton-primary"]:hover {
+        background: linear-gradient(135deg, #00bfa5, #1de9b6) !important;
+    }
+
+    /* ── Inputs ── */
+    .stTextInput > div > div > input,
+    .stSelectbox > div > div,
+    .stRadio > div {
+        background: #0d1117 !important;
+        border-color: #1e2530 !important;
+        color: #c9d1d9 !important;
+        border-radius: 6px !important;
+    }
+    .stTextInput > div > div > input:focus {
+        border-color: #00bfa5 !important;
+        box-shadow: 0 0 0 2px rgba(0,191,165,0.15) !important;
+    }
+
+    /* ── Expanders ── */
+    .streamlit-expanderHeader {
+        background: #0d1117 !important;
+        border: 1px solid #1e2530 !important;
+        border-radius: 6px !important;
+        color: #8b949e !important;
+        font-size: 0.83rem !important;
+    }
+    .streamlit-expanderContent {
+        background: #0d1117 !important;
+        border: 1px solid #1e2530 !important;
+        border-top: none !important;
+    }
+
+    /* ── Dividers ── */
+    hr { border: 0; border-top: 1px solid #1e2530; }
+
+    /* ── Section card ── */
+    .section-card {
+        background: #0d1117;
+        border: 1px solid #1e2530;
+        border-radius: 10px;
+        padding: 1rem 1.2rem 0.6rem;
+        margin-bottom: 1rem;
+        position: relative;
+        overflow: hidden;
+    }
+    .section-card::before {
+        content: '';
+        position: absolute;
+        top: 0; left: 0;
+        width: 4px; height: 100%;
+        border-radius: 10px 0 0 10px;
+    }
+    /* Section type color strips */
+    .sc-intro::before    { background: #4e9eff; }
+    .sc-verse::before    { background: #3fb950; }
+    .sc-prechorus::before { background: #d29922; }
+    .sc-chorus::before   { background: #f78166; }
+    .sc-postchorus::before { background: #f78166; }
+    .sc-bridge::before   { background: #bc8cff; }
+    .sc-breakdown::before { background: #8b949e; }
+    .sc-drop::before     { background: #ff6e6e; }
+    .sc-outro::before    { background: #4e9eff; }
+    .sc-custom::before   { background: #00bfa5; }
+
+    /* ── Section type badge ── */
+    .section-badge {
+        display: inline-block;
+        padding: 2px 10px;
+        border-radius: 20px;
+        font-size: 0.7rem;
+        font-weight: 700;
+        text-transform: uppercase;
+        letter-spacing: 0.08em;
+        margin-bottom: 0.7rem;
+    }
+    .badge-intro    { background: rgba(78,158,255,0.15); color: #4e9eff; }
+    .badge-verse    { background: rgba(63,185,80,0.15);  color: #3fb950; }
+    .badge-prechorus { background: rgba(210,153,34,0.15); color: #d29922; }
+    .badge-chorus   { background: rgba(247,129,102,0.15); color: #f78166; }
+    .badge-postchorus { background: rgba(247,129,102,0.15); color: #f78166; }
+    .badge-bridge   { background: rgba(188,140,255,0.15); color: #bc8cff; }
+    .badge-breakdown { background: rgba(139,148,158,0.15); color: #8b949e; }
+    .badge-drop     { background: rgba(255,110,110,0.15); color: #ff6e6e; }
+    .badge-outro    { background: rgba(78,158,255,0.15);  color: #4e9eff; }
+    .badge-custom   { background: rgba(0,191,165,0.15);   color: #00bfa5; }
+
+    /* ── Chord result card ── */
+    .chord-result-card {
+        background: #0d1117;
+        border: 1px solid #1e2530;
+        border-left: 3px solid #00bfa5;
         border-radius: 8px;
+        padding: 0.8rem 1rem;
+        margin-bottom: 0.5rem;
+    }
+    .chord-name {
+        font-size: 1.6rem;
+        font-weight: 800;
+        color: #e6edf3;
+        letter-spacing: -0.02em;
+        line-height: 1;
+        font-family: 'Georgia', serif;
+    }
+    .chord-energy-badge {
+        display: inline-flex;
+        gap: 6px;
+        align-items: center;
+        margin-top: 4px;
+        margin-bottom: 8px;
+    }
+    .energy-dot {
+        display: inline-block;
+        width: 8px; height: 8px;
+        border-radius: 50%;
+        background: #00bfa5;
+    }
+    .energy-label {
+        font-size: 0.7rem;
+        color: #8b949e;
+        font-weight: 600;
+        text-transform: uppercase;
+        letter-spacing: 0.06em;
+    }
+
+    /* ── Note pills ── */
+    .note-row { display: flex; flex-wrap: wrap; gap: 4px; margin: 4px 0 8px; }
+    .note-label {
+        font-size: 0.65rem;
+        font-weight: 700;
+        text-transform: uppercase;
+        color: #8b949e;
+        letter-spacing: 0.06em;
+        margin-bottom: 2px;
+    }
+    .note-pill {
+        display: inline-block;
+        background: #161b22;
+        border: 1px solid #30363d;
+        border-radius: 20px;
+        padding: 2px 8px;
+        font-size: 0.72rem;
+        font-weight: 600;
+        font-family: 'Courier New', monospace;
+        color: #c9d1d9;
+    }
+    .note-pill-lh { border-color: #1f6feb; color: #79c0ff; }
+    .note-pill-rh { border-color: #238636; color: #7ee787; }
+
+    /* ── Section result header ── */
+    .section-result-header {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+        padding: 8px 0;
+        margin: 16px 0 8px;
+        border-bottom: 1px solid #1e2530;
+    }
+    .section-result-title {
+        font-size: 1rem;
+        font-weight: 700;
+        color: #e6edf3;
+    }
+    .section-result-meta {
+        font-size: 0.72rem;
+        color: #8b949e;
+    }
+
+    /* ── Audio/Export bar ── */
+    .output-section {
+        background: #0d1117;
+        border: 1px solid #1e2530;
+        border-radius: 10px;
+        padding: 1rem 1.2rem;
         margin: 1rem 0;
     }
+    .output-section-title {
+        font-size: 0.7rem;
+        font-weight: 700;
+        text-transform: uppercase;
+        letter-spacing: 0.1em;
+        color: #00bfa5;
+        margin-bottom: 0.75rem;
+    }
+
+    /* ── Spectral status ── */
+    .spectral-ok  { color: #3fb950; font-size: 0.72rem; }
+    .spectral-warn { color: #d29922; font-size: 0.72rem; }
+
+    /* ── Captions ── */
+    .stCaption { color: #6e7681 !important; }
+
+    /* ── Dataframe ── */
+    .stDataFrame { border: 1px solid #1e2530 !important; border-radius: 8px !important; }
 </style>
 """, unsafe_allow_html=True)
 
-st.title("🎹 Harmonic Catalyst PRO")
-st.caption("Genre-Aware Chord Voicing Engine • Multi-Section Builder")
+# ── Header banner ──
+st.markdown("""
+<div style="display:flex; align-items:baseline; gap:12px; margin-bottom:4px;">
+  <span style="font-size:1.9rem; font-weight:900; letter-spacing:-0.03em; color:#e6edf3;">
+    HARMONIC <span style="color:#00bfa5;">CATALYST</span>
+  </span>
+  <span style="font-size:0.7rem; font-weight:700; text-transform:uppercase; letter-spacing:0.1em;
+               color:#8b949e; padding:3px 8px; border:1px solid #1e2530; border-radius:20px;">
+    PRO
+  </span>
+</div>
+<div style="font-size:0.8rem; color:#6e7681; margin-bottom:1rem; letter-spacing:0.02em;">
+  Genre-Aware Chord Voicing Engine &nbsp;·&nbsp; Multi-Section Builder &nbsp;·&nbsp; MIDI Export
+</div>
+<div style="height:2px; background:linear-gradient(90deg, #00bfa5, transparent); margin-bottom:1.5rem; border-radius:2px;"></div>
+""", unsafe_allow_html=True)
 
 
 # ═══════════════════════════════════════════════════════════════
 # HELP SECTION
 # ═══════════════════════════════════════════════════════════════
 
-with st.expander("📖 Quick Start Guide", expanded=False):
+with st.expander("📖 Quick Start", expanded=False):
     st.markdown("""
-    ### How to Use
-    1. **Add a Section** - Select type (Verse, Chorus, etc.)
-    2. **Enter Chords** - Type progression or use presets
-    3. **Pick Genre/Voicing** - Choose voicing style
-    4. **Generate** - See voicings and download MIDI
+    1. **Add Section** → choose type (Verse, Chorus, etc.)
+    2. **Enter Chords** → type symbols like `Cmaj7 Am7 F G` or use a preset
+    3. **Pick Genre** → sets the voicing style
+    4. **Generate Full Song** → see voicings, play audio, export MIDI
     """)
 
 
@@ -147,6 +385,15 @@ if 'song_sections' not in st.session_state:
 if 'section_counter' not in st.session_state:
     st.session_state.section_counter = 0
 
+if 'last_results' not in st.session_state:
+    st.session_state.last_results = []
+
+if 'last_progression_data' not in st.session_state:
+    st.session_state.last_progression_data = []
+
+if 'last_gen_settings' not in st.session_state:
+    st.session_state.last_gen_settings = {}
+
 
 # ═══════════════════════════════════════════════════════════════
 # SECTION FUNCTIONS
@@ -206,25 +453,31 @@ def move_section_down(section_id):
 # ═══════════════════════════════════════════════════════════════
 
 with st.sidebar:
-    st.header("⚙️ Global Settings")
-    
+    st.markdown("""
+    <div style="padding:1rem 0 0.5rem; font-size:1rem; font-weight:800; color:#e6edf3; letter-spacing:-0.01em;">
+      🎹 Settings
+    </div>
+    """, unsafe_allow_html=True)
+
+    st.markdown("**INPUT**")
     input_mode = st.radio(
         "Input Mode",
-        ["Chord Symbols (Cmaj7, Am7...)", "Roman Numerals (I, vi, IV, V)"]
+        ["Chord Symbols (Cmaj7, Am7...)", "Roman Numerals (I, vi, IV, V)"],
+        label_visibility="collapsed"
     )
-    
+
     if "Roman" in input_mode:
         key_name = st.selectbox("Key", NOTE_NAMES, index=0)
         key_pc = note_name_to_pc(key_name)
     else:
         key_pc = 0
-    
+
     st.divider()
     
-    # Mix Context with info button
+    st.markdown("**MIX CONTEXT**")
     mix_col1, mix_col2 = st.columns([4, 1])
     with mix_col1:
-        st.markdown("**🎚️ Mix Context**")
+        st.markdown("")
     with mix_col2:
         mix_info = st.toggle("ℹ️", key="mix_info", label_visibility="collapsed")
     
@@ -270,15 +523,16 @@ You're making a piano cover of a song. Solo Piano mode gives full, rich voicings
             """)
     
     st.divider()
-    
-    use_voice_leading = st.checkbox("🔗 Connect sections smoothly", value=True)
-    
+
+    st.markdown("**VOICE LEADING**")
+    use_voice_leading = st.checkbox("Connect sections smoothly", value=True)
+
     st.divider()
-    
-    # Negative Harmony with info button
+
+    st.markdown("**NEGATIVE HARMONY**")
     neg_col1, neg_col2 = st.columns([4, 1])
     with neg_col1:
-        st.markdown("**🌌 Negative Harmony**")
+        st.markdown("")
     with neg_col2:
         neg_info = st.toggle("ℹ️", key="neg_info", label_visibility="collapsed")
     
@@ -319,14 +573,18 @@ Negative: Fm - Bbm - Ab - Cm (mysterious, cinematic)
         neg_key_pc = note_name_to_pc(neg_key)
     
     st.divider()
-    
-    transpose_semitones = st.slider("🎵 Transpose (semitones)", -12, 12, 0)
-    
+
+    st.markdown("**TRANSPOSE & TEMPO**")
+    transpose_semitones = st.slider("Transpose (semitones)", -12, 12, 0)
+    bpm = st.slider("Playback BPM", 60, 200, 120, help="Affects audio preview in real time — no need to regenerate")
+
     st.divider()
-    
+
     if st.button("🗑️ Clear All Sections"):
         st.session_state.song_sections = []
         st.session_state.section_counter = 0
+        st.session_state.last_results = []
+        st.session_state.last_progression_data = []
         st.rerun()
 
 
@@ -352,20 +610,20 @@ def draw_piano_svg(notes, label, start_midi=36, num_keys=37):
     total_width = w_idx * (white_key_w + 1) + padding * 2
     total_height = white_key_h + 60
     
-    svg = f'<svg width="{total_width}" height="{total_height}" style="background:#161b22; border-radius:10px; border:1px solid #30363d;">'
-    svg += f'<text x="{padding}" y="18" fill="#8b949e" font-family="monospace" font-size="12" font-weight="bold">{label}</text>'
+    svg = f'<svg width="{total_width}" height="{total_height}" style="background:#0d1117; border-radius:8px; border:1px solid #1e2530;">'
+    svg += f'<text x="{padding}" y="18" fill="#6e7681" font-family="monospace" font-size="10" font-weight="700" letter-spacing="0.08em">{label}</text>'
     y_start = 28
-    
+
     for midi, wx in white_positions.items():
         x = padding + wx * (white_key_w + 1)
         is_active = midi in notes
-        fill = "#58a6ff" if is_active else "#e6edf3"
-        stroke = "#1f6feb" if is_active else "#8b949e"
+        fill = "#00bfa5" if is_active else "#d0d7de"
+        stroke = "#008c7a" if is_active else "#6e7681"
         svg += f'<rect x="{x}" y="{y_start}" width="{white_key_w}" height="{white_key_h}" fill="{fill}" stroke="{stroke}" rx="2"/>'
         if is_active:
             name = midi_to_name(midi)
-            svg += f'<text x="{x + white_key_w//2}" y="{y_start + white_key_h - 6}" fill="#0d1117" font-size="8" text-anchor="middle" font-weight="bold">{name}</text>'
-    
+            svg += f'<text x="{x + white_key_w//2}" y="{y_start + white_key_h - 6}" fill="#0a0d12" font-size="8" text-anchor="middle" font-weight="bold">{name}</text>'
+
     for i in range(num_keys):
         midi = start_midi + i
         pc = midi % 12
@@ -373,7 +631,7 @@ def draw_piano_svg(notes, label, start_midi=36, num_keys=37):
             octave_offset = (midi - pc - start_midi) // 12
             x = padding + (black_x_offset[pc] + (octave_offset * 7)) * (white_key_w + 1)
             is_active = midi in notes
-            fill = "#1f6feb" if is_active else "#0d1117"
+            fill = "#00897b" if is_active else "#0d1117"
             svg += f'<rect x="{x}" y="{y_start}" width="{black_key_w}" height="{black_key_h}" fill="{fill}" rx="1"/>'
     
     svg += '</svg>'
@@ -384,12 +642,28 @@ def draw_piano_svg(notes, label, start_midi=36, num_keys=37):
 # MAIN CONTENT
 # ═══════════════════════════════════════════════════════════════
 
-st.markdown("---")
-st.subheader("🎵 Song Structure Builder")
+SECTION_CSS_CLASS = {
+    'Intro': 'intro', 'Verse': 'verse', 'Pre-Chorus': 'prechorus',
+    'Chorus': 'chorus', 'Post-Chorus': 'postchorus', 'Bridge': 'bridge',
+    'Breakdown': 'breakdown', 'Drop': 'drop', 'Outro': 'outro', 'Custom': 'custom'
+}
+
+st.markdown("""
+<div style="font-size:0.7rem; font-weight:700; text-transform:uppercase;
+            letter-spacing:0.1em; color:#8b949e; margin-bottom:0.75rem;">
+  Song Structure
+</div>
+""", unsafe_allow_html=True)
 
 # Empty state
 if len(st.session_state.song_sections) == 0:
-    st.info("👆 Click 'Add First Section' to start building your song!")
+    st.markdown("""
+    <div style="text-align:center; padding:2.5rem 1rem; background:#0d1117;
+                border:1px dashed #1e2530; border-radius:10px; margin-bottom:1rem;">
+      <div style="font-size:2rem; margin-bottom:0.5rem;">🎹</div>
+      <div style="color:#6e7681; font-size:0.88rem;">No sections yet — add your first section to start building</div>
+    </div>
+    """, unsafe_allow_html=True)
     if st.button("➕ Add First Section", type="primary", use_container_width=True):
         add_section()
         st.rerun()
@@ -400,6 +674,9 @@ if len(st.session_state.song_sections) == 0:
 # ═══════════════════════════════════════════════════════════════
 
 for idx, section in enumerate(st.session_state.song_sections):
+    stype = section.get('section_type', 'Verse')
+    css_cls = SECTION_CSS_CLASS.get(stype, 'custom')
+    st.markdown(f'<div class="section-card sc-{css_cls}"><span class="section-badge badge-{css_cls}">{stype}</span></div>', unsafe_allow_html=True)
     with st.container():
         # Header row
         col_num, col_type, col_name, col_controls = st.columns([0.5, 2, 2, 2])
@@ -483,6 +760,22 @@ for idx, section in enumerate(st.session_state.song_sections):
                 placeholder=placeholder,
                 help="Enter chords separated by spaces (e.g., Cmaj7 Am7 F G). Supports slash chords like C/E"
             )
+            # Inline chord validation
+            if section['chords'].strip():
+                tokens = section['chords'].strip().split()
+                invalid = []
+                for token in tokens:
+                    try:
+                        if "Roman" in input_mode:
+                            roman_to_chord(token, key_pc)
+                        else:
+                            parse_chord_symbol(token)
+                    except Exception:
+                        invalid.append(token)
+                if invalid:
+                    st.caption(f"❌ Unrecognized: {', '.join(invalid)}")
+                else:
+                    st.caption(f"✅ {len(tokens)} chord(s)")
         
         with col_genre:
             genre_list = ["Pop", "Jazz", "Gospel", "Blues", "Classical", "RnB", "Waltz", 
@@ -646,8 +939,15 @@ for idx, section in enumerate(st.session_state.song_sections):
                     key=f"rh_{section['id']}",
                     help="Right hand octave - higher = brighter sound"
                 )
+            section['beats_per_chord'] = st.select_slider(
+                "⏱️ Beats per chord",
+                options=[1, 2, 4, 8],
+                value=section.get('beats_per_chord', 4),
+                key=f"bpc_{section['id']}",
+                help="Duration of each chord in MIDI export (1=quarter note, 4=one bar, 8=two bars)"
+            )
         
-        st.markdown("---")
+        st.markdown('<div style="height:1px; background:#1e2530; margin:0.5rem 0 0.8rem;"></div>', unsafe_allow_html=True)
 
 
 # Add Section Button
@@ -656,13 +956,17 @@ if len(st.session_state.song_sections) > 0:
         add_section()
         st.rerun()
 
-st.markdown("---")
+st.markdown('<div style="height:1px; background:#1e2530; margin:1rem 0;"></div>', unsafe_allow_html=True)
 
 
 # ═══════════════════════════════════════════════════════════════
 # GENERATE BUTTON
 # ═══════════════════════════════════════════════════════════════
 
+# ═══════════════════════════════════════════════════════════════
+# GENERATE — processes chords and stores results in session state
+# ═══════════════════════════════════════════════════════════════
+
 if st.button("🎹 Generate Full Song", type="primary", use_container_width=True):
     if len(st.session_state.song_sections) == 0:
         st.error("❌ Add at least one section first!")
@@ -670,17 +974,14 @@ if st.button("🎹 Generate Full Song", type="primary", use_container_width=True
         all_results = []
         progression_data = []
         prev_rh = None
-        
+
         for section in st.session_state.song_sections:
             if not section['chords'].strip():
                 st.warning(f"⚠️ '{section['name']}' has no chords. Skipping.")
                 continue
-            
-            st.markdown(f"### 🎵 {section['name']}")
-            st.caption(f"**Genre/Voicing:** {section['genre']} • **Chords:** {section['chords']}")
-            
+
             tokens = section['chords'].strip().split()
-            
+
             for token in tokens:
                 try:
                     if "Roman" in input_mode:
@@ -690,8 +991,7 @@ if st.button("🎹 Generate Full Song", type="primary", use_container_width=True
                     else:
                         root_pc, quality, slash_bass = parse_chord_symbol(token)
                         chord_label = token
-                    
-                    # Transpose
+
                     if transpose_semitones != 0:
                         root_pc = (root_pc + transpose_semitones) % 12
                         if slash_bass:
@@ -699,50 +999,54 @@ if st.button("🎹 Generate Full Song", type="primary", use_container_width=True
                             slash_bass_pc = (slash_bass_pc + transpose_semitones) % 12
                             slash_bass = pc_to_note_name(slash_bass_pc)
                         chord_label = f"{pc_to_note_name(root_pc)}{quality if quality != 'maj' else ''}"
-                    
+
                     lh, rh = GenreVoicer.voice(
                         root_pc, quality, section['genre'],
                         octave_lh=section['lh_octave'],
                         octave_rh=section['rh_octave'],
                         slash_bass=slash_bass
                     )
-                    
-                    # Apply emotional adaptation
+
                     emotional_ctx = EmotionalContext(
                         energy=section.get('energy', 0.5),
                         density=section.get('density', 'Medium'),
                         role=section.get('role', 'Support'),
                         movement=section.get('movement', 'Flowing')
                     )
-                    
+
                     if context == "Solo Piano":
                         lh, rh = EmotionalAdapter.adapt_solo_piano(lh, rh, emotional_ctx)
                     else:
                         lh, rh = EmotionalAdapter.adapt_arrangement(lh, rh, emotional_ctx)
-                    
+
                     if use_negative:
                         lh = NegativeHarmony.mirror_in_key(lh, neg_key_pc)
                         rh = NegativeHarmony.mirror_in_key(rh, neg_key_pc)
-                    
-                    # Apply voice leading based on Movement setting
+
                     voice_settings = EmotionalAdapter.get_voice_leading_settings(
                         section.get('movement', 'Flowing')
                     )
-                    
+
                     if use_voice_leading and prev_rh and voice_settings['enabled']:
                         rh = VoiceLeader.lead(prev_rh, rh)
-                    
+
                     has_issues, report, mud = SpectralAuditor.audit(lh, rh, context)
-                    
+
                     if has_issues and context == "Full Band":
                         mud_midis = {n for n, f in mud}
-                        rh = sorted([n + 12 if n in mud_midis and n < 60 else n for n in rh])
-                        has_issues, report, mud = SpectralAuditor.audit(lh, rh, context)
-                    
+                        shifted = [n for n in rh if n in mud_midis and n < 60]
+                        if shifted:
+                            rh = sorted([n + 12 if n in mud_midis and n < 60 else n for n in rh])
+                            has_issues, report, mud = SpectralAuditor.audit(lh, rh, context)
+                            report = report + f"\n💡 Auto-shifted {len(shifted)} note(s) up one octave"
+
                     prev_rh = rh
-                    
+                    beats = section.get('beats_per_chord', 4)
+
                     result = {
                         'section': section['name'],
+                        'section_genre': section['genre'],
+                        'section_chords': section['chords'],
                         'label': chord_label,
                         'lh': lh,
                         'rh': rh,
@@ -750,85 +1054,171 @@ if st.button("🎹 Generate Full Song", type="primary", use_container_width=True
                         'has_issues': has_issues,
                         'lh_names': [midi_to_name(n) for n in lh],
                         'rh_names': [midi_to_name(n) for n in rh],
-                        'genre': section['genre']
+                        'genre': section['genre'],
+                        'energy': emotional_ctx.energy,
+                        'density': emotional_ctx.density,
+                        'role': emotional_ctx.role,
+                        'beats': beats,
                     }
-                    
+
                     all_results.append(result)
-                    progression_data.append({'lh': lh, 'rh': rh})
-                    
-                    # Display
-                    cols = st.columns([1.5, 2.5, 2.5])
-                    with cols[0]:
-                        st.markdown(f"**{result['label']}**")
-                        st.code(f"LH: {', '.join(result['lh_names'])}")
-                        st.code(f"RH: {', '.join(result['rh_names'])}")
-                        if result['has_issues']:
-                            st.warning(result['report'])
-                        else:
-                            st.success(result['report'])
-                    with cols[1]:
-                        st.markdown(draw_piano_svg(result['lh'], "LEFT HAND", 24, 36), unsafe_allow_html=True)
-                    with cols[2]:
-                        st.markdown(draw_piano_svg(result['rh'], "RIGHT HAND", 48, 37), unsafe_allow_html=True)
-                    
+                    progression_data.append({'lh': lh, 'rh': rh, 'beats': beats})
+
                 except Exception as e:
                     st.error(f"❌ Error parsing '{token}': {e}")
-            
-            st.markdown("---")
-        
-        # Export
-        if progression_data:
-            st.subheader("💾 Export MIDI")
-            
-            try:
-                # Generate all MIDI files
-                files = MidiExporter.export(progression_data, filename_prefix="full_song")
-                combined_file = MidiExporter.export_combined(progression_data, filename_prefix="full_song")
-                
-                # Main button - Combined MIDI
-                with open(combined_file, 'rb') as f:
+
+        # Store in session state — display block reads from here on every rerun
+        st.session_state.last_results = all_results
+        st.session_state.last_progression_data = progression_data
+        st.session_state.last_gen_settings = {
+            'transpose': transpose_semitones,
+            'context': context,
+            'key_pc': key_pc,
+            'input_mode': input_mode,
+            'use_voice_leading': use_voice_leading,
+            'use_negative': use_negative,
+            'neg_key_pc': neg_key_pc if use_negative else None,
+        }
+
+
+# ═══════════════════════════════════════════════════════════════
+# DISPLAY — always runs if results exist, audio uses current BPM
+# ═══════════════════════════════════════════════════════════════
+
+if st.session_state.last_results:
+    # Check if any generation-affecting settings changed since last Generate
+    current_gen_settings = {
+        'transpose': transpose_semitones,
+        'context': context,
+        'key_pc': key_pc,
+        'input_mode': input_mode,
+        'use_voice_leading': use_voice_leading,
+        'use_negative': use_negative,
+        'neg_key_pc': neg_key_pc if use_negative else None,
+    }
+    if st.session_state.last_gen_settings and current_gen_settings != st.session_state.last_gen_settings:
+        st.warning("⚠️ Settings changed since last generation — click **Generate** to update results.")
+
+    current_section = None
+
+    for result in st.session_state.last_results:
+        # Section header when section changes
+        if result['section'] != current_section:
+            current_section = result['section']
+            st.markdown(f"""
+            <div class="section-result-header">
+              <span class="section-result-title">{result['section']}</span>
+              <span class="section-result-meta">{result['section_genre']} &nbsp;·&nbsp; {result['section_chords']}</span>
+            </div>
+            """, unsafe_allow_html=True)
+
+        # Generate audio fresh at current BPM on every rerun
+        chord_wav = AudioEngine.chord_to_wav(result['lh'], result['rh'], result['beats'], bpm)
+
+        # Build note pills HTML
+        lh_pills = " ".join(f'<span class="note-pill note-pill-lh">{n}</span>' for n in result['lh_names'])
+        rh_pills = " ".join(f'<span class="note-pill note-pill-rh">{n}</span>' for n in result['rh_names'])
+        spectral_class = "spectral-warn" if result['has_issues'] else "spectral-ok"
+        spectral_icon = "⚠" if result['has_issues'] else "✓"
+        spectral_line = result['report'].split('\n')[0]
+
+        energy_pct = int(result['energy'] * 100)
+
+        cols = st.columns([1.5, 2.5, 2.5])
+        with cols[0]:
+            st.markdown(f"""
+            <div class="chord-result-card">
+              <div class="chord-name">{result['label']}</div>
+              <div class="chord-energy-badge">
+                <span class="energy-dot" style="opacity:{0.3 + result['energy'] * 0.7:.2f};"></span>
+                <span class="energy-label">{energy_pct}% · {result['density']} · {result['role']}</span>
+              </div>
+              <div class="note-label">Left Hand</div>
+              <div class="note-row">{lh_pills if lh_pills else '<span style="color:#6e7681;font-size:0.7rem;">—</span>'}</div>
+              <div class="note-label">Right Hand</div>
+              <div class="note-row">{rh_pills if rh_pills else '<span style="color:#6e7681;font-size:0.7rem;">—</span>'}</div>
+              <div class="{spectral_class}" style="margin-top:6px;">{spectral_icon} {spectral_line}</div>
+            </div>
+            """, unsafe_allow_html=True)
+            st.audio(chord_wav, format='audio/wav')
+        with cols[1]:
+            st.markdown(draw_piano_svg(result['lh'], "LEFT HAND", 24, 36), unsafe_allow_html=True)
+        with cols[2]:
+            st.markdown(draw_piano_svg(result['rh'], "RIGHT HAND", 48, 37), unsafe_allow_html=True)
+
+    progression_data = st.session_state.last_progression_data
+
+    # Audio Preview
+    st.markdown("""
+    <div style="height:1px; background:#1e2530; margin:1.2rem 0 0.8rem;"></div>
+    <div class="output-section-title">Full Song Preview</div>
+    """, unsafe_allow_html=True)
+    try:
+        full_wav = AudioEngine.progression_to_wav(progression_data, bpm=bpm)
+        st.audio(full_wav, format='audio/wav')
+        st.caption(f"{bpm} BPM · {len(progression_data)} chord(s)")
+    except Exception as e:
+        st.warning(f"Audio preview unavailable: {e}")
+
+    # Export MIDI
+    st.markdown("""
+    <div style="height:1px; background:#1e2530; margin:0.8rem 0;"></div>
+    <div class="output-section-title">Export MIDI</div>
+    """, unsafe_allow_html=True)
+    try:
+        files = MidiExporter.export(progression_data, filename_prefix="full_song")
+        combined_file = MidiExporter.export_combined(progression_data, filename_prefix="full_song")
+
+        with open(combined_file, 'rb') as f:
+            st.download_button(
+                "⬇️ Download Complete MIDI",
+                f,
+                "song_COMPLETE.mid",
+                "audio/midi",
+                use_container_width=True,
+                type="primary"
+            )
+
+        with st.expander("Download Individual Parts"):
+            c1, c2 = st.columns(2)
+            with c1:
+                with open(files['lh'], 'rb') as f:
                     st.download_button(
-                        "⬇️ Download Complete MIDI",
+                        "⬇️ LH / Bass",
                         f,
-                        "song_COMPLETE.mid",
+                        "song_LH_Bass.mid",
                         "audio/midi",
-                        use_container_width=True,
-                        type="primary"
+                        use_container_width=True
                     )
-                
-                # Expander for individual parts
-                with st.expander("📂 Download Individual Parts"):
-                    c1, c2 = st.columns(2)
-                    with c1:
-                        with open(files['lh'], 'rb') as f:
-                            st.download_button(
-                                "⬇️ LH / Bass",
-                                f,
-                                "song_LH_Bass.mid",
-                                "audio/midi",
-                                use_container_width=True
-                            )
-                    with c2:
-                        with open(files['rh'], 'rb') as f:
-                            st.download_button(
-                                "⬇️ RH / Chords",
-                                f,
-                                "song_RH_Chords.mid",
-                                "audio/midi",
-                                use_container_width=True
-                            )
-            except Exception as e:
-                st.error(f"❌ Export error: {e}")
-            
-            st.subheader("📊 Summary")
-            summary = [{
-                'Section': r['section'],
-                'Chord': r['label'],
-                'LH': ", ".join(r['lh_names']),
-                'RH': ", ".join(r['rh_names'])
-            } for r in all_results]
-            st.dataframe(summary, use_container_width=True)
-
-
-st.markdown("---")
-st.caption("🎹 Harmonic Catalyst PRO")
+            with c2:
+                with open(files['rh'], 'rb') as f:
+                    st.download_button(
+                        "⬇️ RH / Chords",
+                        f,
+                        "song_RH_Chords.mid",
+                        "audio/midi",
+                        use_container_width=True
+                    )
+    except Exception as e:
+        st.error(f"❌ Export error: {e}")
+
+    # Summary
+    st.markdown("""
+    <div style="height:1px; background:#1e2530; margin:0.8rem 0;"></div>
+    <div class="output-section-title">Summary</div>
+    """, unsafe_allow_html=True)
+    summary = [{
+        'Section': r['section'],
+        'Chord': r['label'],
+        'LH': ", ".join(r['lh_names']),
+        'RH': ", ".join(r['rh_names'])
+    } for r in st.session_state.last_results]
+    st.dataframe(summary, use_container_width=True)
+
+
+st.markdown("""
+<div style="height:1px; background:#1e2530; margin:2rem 0 0.5rem;"></div>
+<div style="text-align:center; font-size:0.65rem; color:#3d4451; letter-spacing:0.1em; text-transform:uppercase;">
+  Harmonic Catalyst PRO · Guide, Don't Control
+</div>
+""", unsafe_allow_html=True)

audio_engine.py

@@ -0,0 +1,83 @@
+"""
+Audio Engine for Harmonic Catalyst
+Synthesizes browser-playable WAV audio from MIDI note data.
+Pure Python — numpy + wave, no external audio libraries required.
+"""
+
+import io
+import wave
+import numpy as np
+
+
+class AudioEngine:
+    SAMPLE_RATE = 44100
+
+    @staticmethod
+    def _note_to_freq(midi_note):
+        return 440.0 * (2 ** ((midi_note - 69) / 12))
+
+    @staticmethod
+    def _synthesize(lh_notes, rh_notes, duration_sec, sample_rate=44100):
+        n = int(sample_rate * duration_sec)
+        t = np.linspace(0, duration_sec, n, endpoint=False)
+        audio = np.zeros(n)
+
+        # LH: warm, soft, slower decay — bass character
+        for note in lh_notes:
+            freq = AudioEngine._note_to_freq(note)
+            env = 0.55 * np.exp(-1.8 * t)
+            audio += env * np.sin(2 * np.pi * freq * t)
+            audio += env * 0.25 * np.sin(2 * np.pi * 2 * freq * t)
+
+        # RH: brighter, more harmonic content, slightly faster decay — chord character
+        for note in rh_notes:
+            freq = AudioEngine._note_to_freq(note)
+            env = np.exp(-2.2 * t)
+            audio += env * np.sin(2 * np.pi * freq * t)
+            audio += env * 0.35 * np.sin(2 * np.pi * 2 * freq * t)
+            audio += env * 0.15 * np.sin(2 * np.pi * 3 * freq * t)
+
+        return audio
+
+    @staticmethod
+    def _to_wav_bytes(audio, sample_rate=44100):
+        peak = np.max(np.abs(audio))
+        if peak > 0:
+            audio = audio / peak * 0.8
+        pcm = (audio * 32767).astype(np.int16)
+        buf = io.BytesIO()
+        with wave.open(buf, 'wb') as wf:
+            wf.setnchannels(1)
+            wf.setsampwidth(2)
+            wf.setframerate(sample_rate)
+            wf.writeframes(pcm.tobytes())
+        buf.seek(0)
+        return buf.read()
+
+    @staticmethod
+    def chord_to_wav(lh_notes, rh_notes, beats=4, bpm=120):
+        """WAV bytes for a single chord at given beat duration and tempo"""
+        duration_sec = (beats / bpm) * 60
+        # Cap at 4 seconds for per-chord preview to keep it snappy
+        duration_sec = min(duration_sec, 4.0)
+        audio = AudioEngine._synthesize(lh_notes, rh_notes, duration_sec)
+        return AudioEngine._to_wav_bytes(audio)
+
+    @staticmethod
+    def progression_to_wav(progression_data, bpm=120):
+        """WAV bytes for a full progression — all chords concatenated in sequence"""
+        sample_rate = AudioEngine.SAMPLE_RATE
+        segments = []
+        for chord in progression_data:
+            beats = chord.get('beats', 4)
+            duration_sec = (beats / bpm) * 60
+            seg = AudioEngine._synthesize(
+                chord.get('lh', []), chord.get('rh', []),
+                duration_sec, sample_rate
+            )
+            # Small silence gap between chords (20ms)
+            gap = np.zeros(int(sample_rate * 0.02))
+            segments.append(np.concatenate([seg, gap]))
+
+        full = np.concatenate(segments) if segments else np.zeros(sample_rate)
+        return AudioEngine._to_wav_bytes(full, sample_rate)

harmonic_engine.py

@@ -179,7 +179,8 @@ class GenreVoicer:
                 seventh = s
                 break
 
-        method = getattr(GenreVoicer, f'_voice_{genre.lower()}', GenreVoicer._voice_pop)
+        method_name = f'_voice_{genre.lower().replace(" ", "_").replace("-", "_")}'
+        method = getattr(GenreVoicer, method_name, GenreVoicer._voice_pop)
         lh, rh = method(root_pc, root_lh, root_rh, intervals, third, fifth, seventh, quality)
         
         if slash_bass:
@@ -265,17 +266,16 @@ class GenreVoicer:
 
     @staticmethod
     def _voice_rnb(root_pc, root_lh, root_rh, intervals, third, fifth, seventh, quality):
+        """RnB: Warm soul voicing, 5th in LH for warmth, compact 3rd+7th+9th RH"""
         lh = [root_lh]
+        if fifth:
+            lh.append(root_lh + fifth)
         rh = []
         if third:
             rh.append(root_rh + third)
         sev = seventh if seventh else (10 if third == 3 else 11)
         rh.append(root_rh + sev)
         rh.append(root_rh + 14)
-        if third == 3:
-            rh.append(root_rh + 17)
-        else:
-            rh.append(root_rh + 21)
         return lh, sorted(rh)
 
     @staticmethod
@@ -346,18 +346,15 @@ class GenreVoicer:
 
     @staticmethod
     def _voice_neo_soul(root_pc, root_lh, root_rh, intervals, third, fifth, seventh, quality):
-        """Neo-Soul: Rich 9ths, 11ths, no 5th"""
+        """Neo-Soul: Wide open spread voicing — 7th low, 3rd+9th an octave up, no 5th"""
         lh = [root_lh]
-        rh = []
-        if third:
-            rh.append(root_rh + third)
         sev = seventh if seventh else 10
-        rh.append(root_rh + sev)
-        rh.append(root_rh + 14)
+        rh = [root_rh + sev]               # 7th at base octave (low, open)
+        if third:
+            rh.append(root_rh + 12 + third)   # 3rd an octave up
+        rh.append(root_rh + 12 + 14)          # 9th an octave up
         if third == 3:
-            rh.append(root_rh + 17)
-        else:
-            rh.append(root_rh + 21)
+            rh.append(root_rh + 12 + 17)      # 11th for minor color
         return lh, sorted(rh)
 
     @staticmethod
@@ -400,14 +397,14 @@ class GenreVoicer:
 
     @staticmethod
     def _voice_lo_fi(root_pc, root_lh, root_rh, intervals, third, fifth, seventh, quality):
-        """Lo-fi: Jazzy 7ths, close voicings, nostalgic"""
+        """Lo-fi: Intimate 7th chords, no 5th, warm 9th on top — simpler than Jazz"""
         lh = [root_lh]
         rh = []
         if third:
             rh.append(root_rh + third)
-        rh.append(root_rh + 7)
-        sev = seventh if seventh else 11
+        sev = seventh if seventh else (10 if third == 3 else 11)
         rh.append(root_rh + sev)
+        rh.append(root_rh + 14)  # 9th on top — the lo-fi color note
         return lh, sorted(rh)
 
     @staticmethod
@@ -431,7 +428,10 @@ class VoiceLeader:
         result = []
         for note in current_rh:
             pc = note % 12
-            candidates = [pc + (oct * 12) for oct in range(2, 8)]
+            candidates = [pc + (oct * 12) for oct in range(2, 8) if 36 <= pc + (oct * 12) <= 96]
+            if not candidates:
+                result.append(note)
+                continue
             best = min(candidates, key=lambda x: abs(x - centroid))
             result.append(best)
 
@@ -491,12 +491,13 @@ class MidiExporter:
             for chord_data in progression_data:
                 notes = chord_data[lane]
                 velocity = 70 if lane == "lh" else 85
+                duration = chord_data.get('beats', 4) * 480
 
                 for n in notes:
                     n = max(0, min(127, n))
                     track.append(mido.Message('note_on', note=n, velocity=velocity, time=0))
 
-                track.append(mido.Message('note_off', note=max(0, min(127, notes[0])), velocity=0, time=1920))
+                track.append(mido.Message('note_off', note=max(0, min(127, notes[0])), velocity=0, time=duration))
                 for n in notes[1:]:
                     n = max(0, min(127, n))
                     track.append(mido.Message('note_off', note=n, velocity=0, time=0))
@@ -520,36 +521,38 @@ class MidiExporter:
         for chord_data in progression_data:
             notes = chord_data['lh']
             velocity = 70
-            
+            duration = chord_data.get('beats', 4) * 480
+
             for n in notes:
                 n = max(0, min(127, n))
                 track_lh.append(mido.Message('note_on', note=n, velocity=velocity, time=0))
-            
+
             if notes:
-                track_lh.append(mido.Message('note_off', note=max(0, min(127, notes[0])), velocity=0, time=1920))
+                track_lh.append(mido.Message('note_off', note=max(0, min(127, notes[0])), velocity=0, time=duration))
                 for n in notes[1:]:
                     n = max(0, min(127, n))
                     track_lh.append(mido.Message('note_off', note=n, velocity=0, time=0))
-        
+
         # Track 2: RH/Chords
         track_rh = mido.MidiTrack()
         mid.tracks.append(track_rh)
         track_rh.append(mido.MetaMessage('track_name', name='RH/Chords'))
-        
+
         for chord_data in progression_data:
             notes = chord_data['rh']
             velocity = 85
-            
+            duration = chord_data.get('beats', 4) * 480
+
             for n in notes:
                 n = max(0, min(127, n))
                 track_rh.append(mido.Message('note_on', note=n, velocity=velocity, time=0))
-            
+
             if notes:
-                track_rh.append(mido.Message('note_off', note=max(0, min(127, notes[0])), velocity=0, time=1920))
+                track_rh.append(mido.Message('note_off', note=max(0, min(127, notes[0])), velocity=0, time=duration))
                 for n in notes[1:]:
                     n = max(0, min(127, n))
                     track_rh.append(mido.Message('note_off', note=n, velocity=0, time=0))
         
         fname = f"{filename_prefix}_COMPLETE.mid"
         mid.save(fname)
-        return fname
+        return fname