Update app.py

app.py

@@ -1,6 +1,14 @@
-
 import streamlit as st
 import uuid
+from emotional_engine import (
+    SectionNamer, 
+    get_section_types, 
+    EMOTIONAL_PRESETS,
+    NUMBERED_SECTIONS,
+    SINGLE_SECTIONS,
+    EmotionalContext,
+    EmotionalAdapter
+)
 from harmonic_engine import (
     note_name_to_pc, pc_to_note_name, midi_to_name, midi_to_freq,
     parse_chord_symbol, roman_to_chord,
@@ -8,21 +16,99 @@ from harmonic_engine import (
     MidiExporter, NOTE_NAMES
 )
 
+
+# ═══════════════════════════════════════════════════════════════
+# CHORD PRESET LIBRARY
+# ═══════════════════════════════════════════════════════════════
+
+CHORD_PRESETS = {
+    "Popular Progressions": {
+        "I-V-vi-IV (Axis of Awesome)": "I V vi IV",
+        "vi-IV-I-V (Emotional Pop)": "vi IV I V",
+        "I-IV-V (Classic Rock)": "I IV V",
+        "I-vi-IV-V (50s Progression)": "I vi IV V",
+    },
+    "Pop Progressions": {
+        "I-V-vi-IV": "I V vi IV",
+        "vi-IV-I-V": "vi IV I V",
+        "I-IV-vi-V": "I IV vi V",
+        "I-iii-IV-V": "I iii IV V",
+    },
+    "Jazz Progressions": {
+        "ii-V-I (Turnaround)": "ii7 V7 Imaj7",
+        "I-vi-ii-V (Rhythm Changes)": "Imaj7 vi7 ii7 V7",
+        "iii-vi-ii-V-I": "iii7 vi7 ii7 V7 Imaj7",
+    },
+    "Gospel Progressions": {
+        "I-IV-V-IV (Traditional)": "I IV V IV",
+        "I-V-vi-IV-I (Modern)": "I V vi IV I",
+    },
+    "Blues Progressions": {
+        "12-Bar Blues": "I7 I7 I7 I7 IV7 IV7 I7 I7 V7 IV7 I7 V7",
+        "8-Bar Blues": "I7 IV7 I7 I7 IV7 IV7 I7 V7",
+    },
+    "Bollywood Progressions": {
+        "I-V-vi-III-IV": "I V vi III IV",
+        "i-VII-VI-V (Emotional)": "i VII VI V",
+    },
+    "Latin Progressions": {
+        "i-iv-V (Minor Latin)": "i iv V",
+        "I-IV-V-IV (Salsa)": "I IV V IV",
+    },
+    "Funk Progressions": {
+        "i7-IV7 (Two Chord)": "i7 IV7",
+        "I7-IV7-V7": "I7 IV7 V7",
+    },
+}
+
+
+def get_preset_chord_symbols(preset_roman, key_root_pc):
+    """Convert Roman numeral preset to chord symbols in given key"""
+    tokens = preset_roman.split()
+    chord_symbols = []
+    
+    for token in tokens:
+        try:
+            root_pc, quality = roman_to_chord(token, key_root_pc)
+            root_name = pc_to_note_name(root_pc)
+            
+            if quality == 'maj':
+                symbol = root_name
+            elif quality == 'min':
+                symbol = f"{root_name}m"
+            elif quality == 'maj7':
+                symbol = f"{root_name}maj7"
+            elif quality == 'min7':
+                symbol = f"{root_name}m7"
+            elif quality == 'dom7':
+                symbol = f"{root_name}7"
+            elif quality == 'dim':
+                symbol = f"{root_name}dim"
+            else:
+                symbol = f"{root_name}{quality}"
+            
+            chord_symbols.append(symbol)
+        except:
+            chord_symbols.append(token)
+    
+    return " ".join(chord_symbols)
+
+
+# ═══════════════════════════════════════════════════════════════
+# PAGE CONFIG & STYLING
+# ═══════════════════════════════════════════════════════════════
+
 st.set_page_config(page_title="Harmonic Catalyst PRO", page_icon="🎹", layout="wide")
 
 st.markdown("""
 <style>
     .stApp {background-color: #0d1117; color: #c9d1d9;}
     .stButton>button {
-        width: 100%; border-radius: 8px;
+        border-radius: 8px;
         background: linear-gradient(135deg, #238636, #2ea043);
-        color: white; font-weight: bold; font-size: 16px; padding: 10px;
+        color: white; font-weight: bold;
     }
     hr {border: 0; border-top: 1px solid #30363d;}
-    .chord-header {
-        font-size: 22px; font-weight: bold; color: #f0f6fc;
-        border-left: 4px solid #58a6ff; padding-left: 12px; margin-bottom: 8px;
-    }
     .help-box {
         background: #161b22;
         border-left: 4px solid #58a6ff;
@@ -30,161 +116,52 @@ st.markdown("""
         border-radius: 8px;
         margin: 1rem 0;
     }
-    .example-box {
-        background: #1c2128;
-        border: 1px solid #30363d;
-        padding: 0.75rem;
-        border-radius: 6px;
-        margin: 0.5rem 0;
-        font-family: monospace;
-    }
 </style>
 """, unsafe_allow_html=True)
 
 st.title("🎹 Harmonic Catalyst PRO")
-st.caption("Genre-Aware Chord Voicing Engine • Multi-Section Builder • Professional Mix Planning")
+st.caption("Genre-Aware Chord Voicing Engine • Multi-Section Builder")
 
-# Help/Instructions Section
-with st.expander("📖 Quick Start Guide (Click to expand)", expanded=False):
-    st.markdown("""
-    ### 🎯 What This Tool Does
-    
-    Transform chord progressions into **professional piano voicings** across different genres, 
-    with smart voice leading and frequency-aware arrangement planning.
-    
-    ### 🚀 How to Use
-    
-    1. **Add a Section** - Click ➕ to create verse, chorus, bridge, etc.
-    2. **Enter Chords** - Type your progression (supports 20+ chord types + slash chords!)
-    3. **Pick Genre** - Choose from 17 styles (Pop, Jazz, Gospel, Afrobeats, etc.)
-    4. **Generate** - See piano voicings, frequency analysis, and download MIDI
-    
-    ### 💡 Try These Examples
-    """)
-    
-    col1, col2 = st.columns(2)
-    
-    with col1:
-        st.markdown("""
-        **🎵 Pop Ballad:**
-        ```
-        Section 1 (Verse): C Am F G
-        Section 2 (Chorus): C Am F G
-        Genre: Pop → Gospel (for lift!)
-        ```
-        
-        **🎷 Jazz Standard:**
-        ```
-        Chords: Dm7 G7 Cmaj7 A7
-        Genre: Jazz
-        Tip: Add slash chords for smooth bass!
-        ```
-        
-        **🌍 Afrobeats Vibe:**
-        ```
-        Chords: Em D C Bm
-        Genre: Afrobeats
-        Tip: Try same chords in Trap for contrast
-        ```
-        """)
-    
-    with col2:
-        st.markdown("""
-        **🎸 Slash Chord Magic:**
-        ```
-        C C/B Am Am/G F G/B C
-        Creates smooth bass line!
-        Genre: Any (works everywhere)
-        ```
-        
-        **🇮🇳 Bollywood Fusion:**
-        ```
-        Section 1: Cmaj7 Am7 (Hindustani Classical)
-        Section 2: Fmaj7 G7 (Pop)
-        = Traditional intro → Modern verse
-        ```
-        
-        **🎹 Genre Morphing:**
-        ```
-        Same chords, different sections:
-        Verse: Neo-Soul
-        Chorus: Gospel
-        Bridge: Jazz
-        ```
-        """)
-    
-    st.markdown("""
-    ### 🎼 Supported Chord Types
-    
-    | Type | Example | Type | Example |
-    |------|---------|------|---------|
-    | Major | `C`, `Cmaj` | Minor | `Cm`, `Cmin` |
-    | Major 7th | `Cmaj7` | Minor 7th | `Cm7`, `Cmin7` |
-    | Dominant 7th | `C7` | Suspended | `Csus2`, `Csus4` |
-    | Diminished | `Cdim`, `Cdim7` | Augmented | `Caug`, `C+` |
-    | Add 9 | `Cadd9` | 6th | `C6`, `Cm6` |
-    | Extended | `C9`, `C11`, `C13` | **Slash** | `C/E`, `Am/G` |
-    
-    ### 🎨 All 17 Genres
-    
-    **Western:** Pop • Jazz • Gospel • Blues • Classical • RnB • Waltz • Neo-Soul  
-    **Modern:** Afrobeats • Trap • K-Pop • Lo-fi • Funk  
-    **World:** Bossa Nova • Hindustani Classical • Reggae • Latin
-    
-    ### 💡 Pro Tips
-    
-    - **Use Slash Chords** for smooth bass lines: `C C/B Am Am/G`
-    - **Genre Morphing**: Same chords, different genres per section = dynamic arrangement
-    - **Voice Leading** (enabled by default): Connects sections smoothly even across genre changes
-    - **Frequency Analysis**: Warns if piano clashes with vocals in 160-400Hz zone
-    - **Duplicate Sections**: Use 📋 button to copy verse → verse 2 instantly
-    
-    ### 🎯 Workflow Example: Recreating "Raabta"
-    
-    1. Section 1: "Intro" → Chords: `Cmaj7 Am7` → Genre: Hindustani Classical
-    2. Section 2: "Verse" → Chords: `Cmaj7 Am7 Fmaj7 G7` → Genre: Pop
-    3. Section 3: "Chorus" → Same chords → Genre: Afrobeats (for modern twist!)
-    4. Generate → Download MIDI → Import to DAW → Add your sounds! 🎧
-    """)
 
-with st.expander("❓ FAQ & Troubleshooting", expanded=False):
+# ═══════════════════════════════════════════════════════════════
+# HELP SECTION
+# ═══════════════════════════════════════════════════════════════
+
+with st.expander("📖 Quick Start Guide", expanded=False):
     st.markdown("""
-    **Q: What's the difference between genres?**  
-    A: Each genre uses different voicing techniques:
-    - **Jazz** = Shell voicings (root+7th in LH, 3-7-9-13 in RH)
-    - **Gospel** = Thick clusters with stacked 4ths and suspensions
-    - **Afrobeats** = Open 5ths, modern spacious sound
-    
-    **Q: When should I use slash chords?**  
-    A: When you want a specific bass note instead of the root:
-    - `C/E` = C major chord with E in bass (smoother transitions)
-    - Common in ballads, R&B, and jazz
-    
-    **Q: What does "MUD WARNING" mean?**  
-    A: Your piano has notes in 160-400Hz (where vocals sit). The tool auto-shifts them up an octave to keep your mix clean.
-    
-    **Q: Can I use Roman numerals?**  
-    A: Yes! Switch to Roman Numeral mode in sidebar, select your key, then use: `I vi IV V`
-    
-    **Q: How do I save my work?**  
-    A: Download the MIDI files, then you can reload them in your DAW anytime.
-    
-    **Q: Why are voicings different even with same chords?**  
-    A: That's the magic! Each genre has unique voicing rules. `Cmaj7` in Jazz sounds completely different from `Cmaj7` in Gospel.
+    ### 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
     """)
 
+
+# ═══════════════════════════════════════════════════════════════
+# SESSION STATE
+# ═══════════════════════════════════════════════════════════════
+
 if 'song_sections' not in st.session_state:
     st.session_state.song_sections = []
 
 if 'section_counter' not in st.session_state:
     st.session_state.section_counter = 0
 
+
+# ═══════════════════════════════════════════════════════════════
+# SECTION FUNCTIONS
+# ═══════════════════════════════════════════════════════════════
+
 def add_section():
     st.session_state.section_counter += 1
+    section_type = 'Verse'
+    display_name = SectionNamer.generate_name(section_type, st.session_state.song_sections)
+    
     new_section = {
         'id': str(uuid.uuid4())[:8],
         'number': st.session_state.section_counter,
-        'name': f'Section {st.session_state.section_counter}',
+        'section_type': section_type,
+        'name': display_name,
         'chords': '',
         'genre': 'Pop',
         'lh_octave': 2,
@@ -192,11 +169,13 @@ def add_section():
     }
     st.session_state.song_sections.append(new_section)
 
+
 def remove_section(section_id):
     st.session_state.song_sections = [
         s for s in st.session_state.song_sections if s['id'] != section_id
     ]
 
+
 def duplicate_section(section_id):
     section = next(s for s in st.session_state.song_sections if s['id'] == section_id)
     st.session_state.section_counter += 1
@@ -207,25 +186,31 @@ def duplicate_section(section_id):
     idx = st.session_state.song_sections.index(section)
     st.session_state.song_sections.insert(idx + 1, new_section)
 
+
 def move_section_up(section_id):
     sections = st.session_state.song_sections
     idx = next(i for i, s in enumerate(sections) if s['id'] == section_id)
     if idx > 0:
         sections[idx], sections[idx - 1] = sections[idx - 1], sections[idx]
 
+
 def move_section_down(section_id):
     sections = st.session_state.song_sections
     idx = next(i for i, s in enumerate(sections) if s['id'] == section_id)
     if idx < len(sections) - 1:
         sections[idx], sections[idx + 1] = sections[idx + 1], sections[idx]
 
+
+# ═══════════════════════════════════════════════════════════════
+# SIDEBAR
+# ═══════════════════════════════════════════════════════════════
+
 with st.sidebar:
     st.header("⚙️ Global Settings")
     
     input_mode = st.radio(
         "Input Mode",
-        ["Chord Symbols (Cmaj7, Am7...)", "Roman Numerals (I, vi, IV, V)"],
-        help="Choose how you want to enter chords. Roman numerals require selecting a key."
+        ["Chord Symbols (Cmaj7, Am7...)", "Roman Numerals (I, vi, IV, V)"]
     )
     
     if "Roman" in input_mode:
@@ -235,50 +220,123 @@ with st.sidebar:
         key_pc = 0
     
     st.divider()
-    context = st.radio(
-        "🎚️ Mix Context", 
-        ["Full Band", "Solo Piano"],
-        help="Full Band = Strict frequency checking. Solo Piano = More freedom in mid-range."
-    )
+    
+    # Mix Context with info button
+    mix_col1, mix_col2 = st.columns([4, 1])
+    with mix_col1:
+        st.markdown("**🎚️ Mix Context**")
+    with mix_col2:
+        mix_info = st.toggle("ℹ️", key="mix_info", label_visibility="collapsed")
+    
+    context = st.radio("Mix Context", ["Full Band", "Solo Piano"], label_visibility="collapsed")
+    
+    if mix_info:
+        if context == "Full Band":
+            st.info("""
+**🎚️ FULL BAND MODE**
+
+**WHAT IT DOES:**
+Piano is part of a larger arrangement with other instruments. Tool will:
+• Avoid frequency clashes with vocals (300-500Hz)
+• Keep bass notes cleaner for bass guitar
+• Shift muddy notes automatically
+
+**WHEN TO USE:**
+• Recording with band
+• Producing full tracks
+• Piano + vocals + drums + bass
+
+**EXAMPLE:**
+Your track has bass guitar, drums, and vocals. Full Band mode keeps piano out of their frequency zones.
+            """)
+        else:
+            st.info("""
+**🎹 SOLO PIANO MODE**
+
+**WHAT IT DOES:**
+Piano is the main/only instrument. Tool will:
+• Use full frequency range
+• Richer bass voicings
+• No frequency shifting
+
+**WHEN TO USE:**
+• Piano covers
+• Piano tutorials
+• Solo piano performances
+• Piano + vocals only
+
+**EXAMPLE:**
+You're making a piano cover of a song. Solo Piano mode gives full, rich voicings.
+            """)
     
     st.divider()
-    st.subheader("🔧 Voice Leading")
-    use_voice_leading = st.checkbox(
-        "🔗 Connect sections smoothly", 
-        value=True,
-        help="Automatically finds smoothest voicings between chords (minimal hand movement)"
-    )
+    
+    use_voice_leading = st.checkbox("🔗 Connect sections smoothly", value=True)
     
     st.divider()
-    use_negative = st.checkbox(
-        "🌌 Negative Harmony", 
-        value=False,
-        help="Experimental: Mirror chords around axis (Jacob Collier style)"
-    )
+    
+    # Negative Harmony with info button
+    neg_col1, neg_col2 = st.columns([4, 1])
+    with neg_col1:
+        st.markdown("**🌌 Negative Harmony**")
+    with neg_col2:
+        neg_info = st.toggle("ℹ️", key="neg_info", label_visibility="collapsed")
+    
+    use_negative = st.checkbox("Enable Negative Harmony", value=False, label_visibility="collapsed")
+    
+    if neg_info:
+        st.info("""
+**🌌 NEGATIVE HARMONY**
+
+**WHAT IT DOES:**
+Mirrors notes around an axis (root + 5th). Creates "shadow" versions of chords. Made famous by Jacob Collier.
+
+**HOW IT WORKS:**
+• C major → F minor (mirror image)
+• Happy chords → Sad/mysterious versions
+• Bright → Dark transformation
+
+**WHEN TO USE:**
+• Create unexpected chord colors
+• Add tension to progressions
+• Experimental compositions
+• "What if this chord was dark?"
+
+**EXAMPLE:**
+Original: C - G - Am - F (happy pop)
+Negative: Fm - Bbm - Ab - Cm (mysterious, cinematic)
+
+💡 **TIP:** Try on chorus for dramatic effect!
+        """)
+    
     if use_negative:
-        neg_key = st.selectbox("Mirror Key", NOTE_NAMES, index=0)
+        neg_key = st.selectbox(
+            "Mirror Key", 
+            NOTE_NAMES, 
+            index=0,
+            help="The axis around which notes are mirrored. Usually set to your song's key."
+        )
         neg_key_pc = note_name_to_pc(neg_key)
     
     st.divider()
-    st.markdown("### 💡 Quick Tips")
-    st.info("""
-    **Try these now:**
-    - Enter: `C/E Am/G`
-    - Mix genres in one song
-    - Duplicate sections with 📋
-    - Download MIDI for your DAW
-    """)
+    
+    transpose_semitones = st.slider("🎵 Transpose (semitones)", -12, 12, 0)
+    
+    st.divider()
     
     if st.button("🗑️ Clear All Sections"):
         st.session_state.song_sections = []
         st.session_state.section_counter = 0
         st.rerun()
 
+
+# ═══════════════════════════════════════════════════════════════
+# PIANO VISUALIZATION
+# ═══════════════════════════════════════════════════════════════
+
 def draw_piano_svg(notes, label, start_midi=36, num_keys=37):
-    white_key_w = 22
-    black_key_w = 14
-    white_key_h = 90
-    black_key_h = 55
+    white_key_w, black_key_w = 22, 14
+    white_key_h, black_key_h = 90, 55
     padding = 20
     white_pcs = {0, 2, 4, 5, 7, 9, 11}
     black_x_offset = {1: 0.65, 3: 1.65, 6: 3.65, 8: 4.65, 10: 5.65}
@@ -287,15 +345,14 @@ def draw_piano_svg(notes, label, start_midi=36, num_keys=37):
     w_idx = 0
     for i in range(num_keys):
         midi = start_midi + i
-        pc = midi % 12
-        if pc in white_pcs:
+        if midi % 12 in white_pcs:
             white_positions[midi] = w_idx
             w_idx += 1
     
     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; padding:10px; border:1px solid #30363d;">'
+    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>'
     y_start = 28
     
@@ -304,10 +361,10 @@ def draw_piano_svg(notes, label, start_midi=36, num_keys=37):
         is_active = midi in notes
         fill = "#58a6ff" if is_active else "#e6edf3"
         stroke = "#1f6feb" if is_active else "#8b949e"
-        svg += f'<rect x="{x}" y="{y_start}" width="{white_key_w}" height="{white_key_h}" fill="{fill}" stroke="{stroke}" stroke-width="{"2" if is_active else "1"}" rx="2"/>'
+        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-family="monospace" 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="#0d1117" font-size="8" text-anchor="middle" font-weight="bold">{name}</text>'
     
     for i in range(num_keys):
         midi = start_midi + i
@@ -317,162 +374,332 @@ def draw_piano_svg(notes, label, start_midi=36, num_keys=37):
             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"
-            stroke = "#58a6ff" if is_active else "#30363d"
-            svg += f'<rect x="{x}" y="{y_start}" width="{black_key_w}" height="{black_key_h}" fill="{fill}" stroke="{stroke}" rx="1"/>'
-            if is_active:
-                name = midi_to_name(midi)
-                svg += f'<text x="{x + black_key_w//2}" y="{y_start + black_key_h + 12}" fill="#58a6ff" font-family="monospace" font-size="7" text-anchor="middle">{name}</text>'
+            svg += f'<rect x="{x}" y="{y_start}" width="{black_key_w}" height="{black_key_h}" fill="{fill}" rx="1"/>'
     
     svg += '</svg>'
     return svg
 
+
+# ═══════════════════════════════════════════════════════════════
+# MAIN CONTENT
+# ═══════════════════════════════════════════════════════════════
+
 st.markdown("---")
 st.subheader("🎵 Song Structure Builder")
 
-# Inline help text
-st.markdown("""
-<div class="help-box">
-    <strong>💡 How it works:</strong> Add sections in any order (Verse, Chorus, Bridge, etc.). 
-    Each section can have different chords and genres. Voice leading automatically connects them smoothly!
-</div>
-""", unsafe_allow_html=True)
-
+# Empty state
 if len(st.session_state.song_sections) == 0:
-    st.markdown("""
-    <div class="example-box">
-    <strong>🎯 Try this example:</strong><br>
-    1. Click "Add First Section" below<br>
-    2. Name it "Verse", enter chords: <code>Cmaj7 Am7 Fmaj7 G7</code><br>
-    3. Select genre: Pop<br>
-    4. Add another section with same chords, but choose "Gospel" genre<br>
-    5. Click "Generate" and hear the difference!
-    </div>
-    """, unsafe_allow_html=True)
-    
+    st.info("👆 Click 'Add First Section' to start building your song!")
     if st.button("➕ Add First Section", type="primary", use_container_width=True):
         add_section()
         st.rerun()
 
+
+# ═══════════════════════════════════════════════════════════════
+# SECTION CARDS
+# ═══════════════════════════════════════════════════════════════
+
 for idx, section in enumerate(st.session_state.song_sections):
     with st.container():
-        col_num, col_name, col_up, col_down, col_dup, col_del = st.columns([0.5, 3, 0.5, 0.5, 0.5, 0.5])
+        # Header row
+        col_num, col_type, col_name, col_controls = st.columns([0.5, 2, 2, 2])
         
         with col_num:
-            st.markdown(f"<div style='background: linear-gradient(135deg, #238636, #2ea043); border-radius: 8px; padding: 0.5rem; text-align: center; color: white; font-weight: bold;'>#{idx + 1}</div>", unsafe_allow_html=True)
+            st.markdown(f"**#{idx + 1}**")
         
-        with col_name:
-            section['name'] = st.text_input(
-                "Section Name",
-                value=section['name'],
-                key=f"name_{section['id']}",
+        with col_type:
+            section_types = get_section_types()
+            current_type = section.get('section_type', 'Verse')
+            if current_type not in section_types:
+                current_type = 'Verse'
+            
+            new_type = st.selectbox(
+                "Type",
+                section_types,
+                index=section_types.index(current_type),
+                key=f"type_{section['id']}",
                 label_visibility="collapsed",
-                placeholder="e.g., Verse 1, Chorus, Bridge, Drop...",
-                help="Give this section a name (Verse, Chorus, etc.)"
+                help="Select section type - auto-applies emotional defaults"
             )
+            
+            if new_type != section.get('section_type'):
+                section['section_type'] = new_type
+                if new_type != 'Custom':
+                    section['name'] = SectionNamer.generate_name(
+                        new_type,
+                        [s for s in st.session_state.song_sections if s['id'] != section['id']]
+                    )
         
-        with col_up:
-            if st.button("⬆️", key=f"up_{section['id']}", help="Move section up", disabled=(idx == 0)):
-                move_section_up(section['id'])
-                st.rerun()
-        
-        with col_down:
-            if st.button("⬇️", key=f"down_{section['id']}", help="Move section down", disabled=(idx == len(st.session_state.song_sections) - 1)):
-                move_section_down(section['id'])
-                st.rerun()
-        
-        with col_dup:
-            if st.button("📋", key=f"dup_{section['id']}", help="Duplicate this section"):
-                duplicate_section(section['id'])
-                st.rerun()
+        with col_name:
+            if section.get('section_type') == 'Custom':
+                section['name'] = st.text_input(
+                    "Name",
+                    value=section.get('name', 'Custom'),
+                    key=f"name_{section['id']}",
+                    label_visibility="collapsed",
+                    help="Enter custom section name"
+                )
+            else:
+                auto_name = SectionNamer.generate_name(
+                    section.get('section_type', 'Verse'),
+                    [s for s in st.session_state.song_sections if s['id'] != section['id']]
+                )
+                section['name'] = st.text_input(
+                    "Name",
+                    value=section.get('name', auto_name),
+                    key=f"name_{section['id']}",
+                    label_visibility="collapsed",
+                    help="Auto-generated name, you can edit it"
+                )
         
-        with col_del:
-            if st.button("🗑️", key=f"del_{section['id']}", help="Delete this section"):
-                remove_section(section['id'])
-                st.rerun()
+        with col_controls:
+            c1, c2, c3, c4 = st.columns(4)
+            with c1:
+                if st.button("⬆️", key=f"up_{section['id']}", disabled=(idx == 0), help="Move section up"):
+                    move_section_up(section['id'])
+                    st.rerun()
+            with c2:
+                if st.button("⬇️", key=f"down_{section['id']}", disabled=(idx == len(st.session_state.song_sections) - 1), help="Move section down"):
+                    move_section_down(section['id'])
+                    st.rerun()
+            with c3:
+                if st.button("📋", key=f"dup_{section['id']}", help="Create a copy of this section"):
+                    duplicate_section(section['id'])
+                    st.rerun()
+            with c4:
+                if st.button("🗑️", key=f"del_{section['id']}", help="Remove this section"):
+                    remove_section(section['id'])
+                    st.rerun()
         
-        col1, col2 = st.columns([2, 1])
+        # Chords and Genre row
+        col_chords, col_genre = st.columns([2, 1])
         
-        with col1:
-            if "Roman" in input_mode:
-                help_text = "Roman numerals: I ii iii IV V vi vii°. Add 7 for seventh chords (V7, IVmaj7)"
-                placeholder = "e.g., I vi IV V"
-            else:
-                help_text = "Supports: maj, min, 7, maj7, sus2, sus4, add9, 9, 11, 13, dim, aug. Use / for slash chords!"
-                placeholder = "e.g., Cmaj7 Am7 F/A G or C C/B Am Am/G"
-            
+        with col_chords:
+            placeholder = "e.g., Cmaj7 Am7 F G" if "Chord" in input_mode else "e.g., I vi IV V"
             section['chords'] = st.text_input(
                 "Chord Progression",
                 value=section['chords'],
                 key=f"chords_{section['id']}",
                 placeholder=placeholder,
-                help=help_text
+                help="Enter chords separated by spaces (e.g., Cmaj7 Am7 F G). Supports slash chords like C/E"
             )
         
-        with col2:
+        with col_genre:
+            genre_list = ["Pop", "Jazz", "Gospel", "Blues", "Classical", "RnB", "Waltz", 
+                         "Afrobeats", "Trap", "Bossa Nova", "Hindustani Classical", 
+                         "Neo-Soul", "Reggae", "Latin", "K-Pop", "Lo-fi", "Funk"]
+            current_genre = section.get('genre', 'Pop')
+            if current_genre not in genre_list:
+                current_genre = 'Pop'
+            
             section['genre'] = st.selectbox(
-                "Genre/Style",
-                ["Pop", "Jazz", "Gospel", "Blues", "Classical", "RnB", "Waltz", "Afrobeats", "Trap", "Bossa Nova", "Hindustani Classical", "Neo-Soul", "Reggae", "Latin", "K-Pop", "Lo-fi", "Funk"],
-                index=["Pop", "Jazz", "Gospel", "Blues", "Classical", "RnB", "Waltz", "Afrobeats", "Trap", "Bossa Nova", "Hindustani Classical", "Neo-Soul", "Reggae", "Latin", "K-Pop", "Lo-fi", "Funk"].index(section['genre']),
+                "Genre/Voicing",
+                genre_list,
+                index=genre_list.index(current_genre),
                 key=f"genre_{section['id']}",
-                help="Each genre uses different professional voicing techniques"
+                help="How chords will be voiced - affects piano arrangement style"
+            )
+        
+        # Chord Presets - Two Dropdowns (Category + Preset)
+        st.markdown("**🎵 Chord Presets:**")
+        col_cat, col_preset, col_apply = st.columns([2, 3, 1])
+        
+        with col_cat:
+            # Category dropdown (short list)
+            categories = list(CHORD_PRESETS.keys())
+            selected_category = st.selectbox(
+                "Category",
+                categories,
+                key=f"preset_cat_{section['id']}",
+                label_visibility="collapsed",
+                help="Select progression category (Pop, Jazz, Blues, etc.)"
+            )
+        
+        with col_preset:
+            # Preset dropdown (only shows presets from selected category)
+            if selected_category:
+                presets_in_category = list(CHORD_PRESETS[selected_category].keys())
+                selected_preset = st.selectbox(
+                    "Preset",
+                    ["Select..."] + presets_in_category,
+                    key=f"preset_name_{section['id']}",
+                    label_visibility="collapsed",
+                    help="Select chord progression to auto-fill"
+                )
+            else:
+                selected_preset = "Select..."
+        
+        with col_apply:
+            # Apply button
+            if selected_preset != "Select...":
+                if st.button("✨", key=f"apply_{section['id']}", help="Apply selected preset to chord progression"):
+                    preset_roman = CHORD_PRESETS[selected_category][selected_preset]
+                    
+                    if "Roman" in input_mode:
+                        section['chords'] = preset_roman
+                    else:
+                        section['chords'] = get_preset_chord_symbols(preset_roman, key_pc)
+                    
+                    st.rerun()
+        
+        # Emotional Context
+        with st.expander("🎭 Emotional Context", expanded=False):
+            # Preset selector
+            preset_col1, preset_col2 = st.columns([4, 1])
+            with preset_col1:
+                emotional_presets = list(EMOTIONAL_PRESETS.keys())
+                current_preset = section.get('emotional_preset', 'Supportive Verse')
+                if current_preset not in emotional_presets:
+                    current_preset = 'Supportive Verse'
+                
+                selected_emotional = st.selectbox(
+                    "Preset",
+                    emotional_presets,
+                    index=emotional_presets.index(current_preset),
+                    key=f"emo_preset_{section['id']}",
+                    help="Quick emotional presets"
+                )
+            
+            with preset_col2:
+                if st.button("✨", key=f"apply_emo_{section['id']}", help="Apply preset"):
+                    preset_values = EMOTIONAL_PRESETS[selected_emotional]
+                    section['emotional_preset'] = selected_emotional
+                    section['energy'] = preset_values['energy']
+                    section['density'] = preset_values['density']
+                    section['role'] = preset_values['role']
+                    section['movement'] = preset_values['movement']
+                    st.rerun()
+            
+            # Show preset description
+            if selected_emotional in EMOTIONAL_PRESETS:
+                st.caption(f"💡 {EMOTIONAL_PRESETS[selected_emotional].get('description', '')}")
+            
+            st.markdown("---")
+            
+            # Energy slider
+            section['energy'] = st.slider(
+                "🔥 Energy",
+                0.0, 1.0,
+                section.get('energy', 0.5),
+                step=0.1,
+                key=f"energy_{section['id']}",
+                help="0.0 = Quiet/Delicate, 1.0 = Loud/Powerful"
+            )
+            
+            # Density radio
+            density_options = ['Sparse', 'Medium', 'Thick']
+            current_density = section.get('density', 'Medium')
+            if current_density not in density_options:
+                current_density = 'Medium'
+            
+            section['density'] = st.radio(
+                "🎹 Density",
+                density_options,
+                index=density_options.index(current_density),
+                key=f"density_{section['id']}",
+                horizontal=True,
+                help="Sparse = 2-3 notes, Medium = 4-5 notes, Thick = 6-8 notes"
+            )
+            
+            # Role radio
+            role_options = ['Lead', 'Support', 'Ambient']
+            current_role = section.get('role', 'Support')
+            if current_role not in role_options:
+                current_role = 'Support'
+            
+            section['role'] = st.radio(
+                "🎚️ Role",
+                role_options,
+                index=role_options.index(current_role),
+                key=f"role_{section['id']}",
+                horizontal=True,
+                help="Lead = Front of mix, Support = Behind vocals, Ambient = Background"
+            )
+            
+            # Movement radio
+            movement_options = ['Static', 'Flowing', 'Agitated']
+            current_movement = section.get('movement', 'Flowing')
+            if current_movement not in movement_options:
+                current_movement = 'Flowing'
+            
+            section['movement'] = st.radio(
+                "🌊 Movement",
+                movement_options,
+                index=movement_options.index(current_movement),
+                key=f"movement_{section['id']}",
+                horizontal=True,
+                help="Static = Block chords, Flowing = Smooth transitions, Agitated = Dramatic"
             )
         
-        with st.expander("⚙️ Advanced Settings", expanded=False):
-            col_lh, col_rh = st.columns(2)
-            with col_lh:
+        # Advanced settings
+        with st.expander("⚙️ Advanced", expanded=False):
+            c1, c2 = st.columns(2)
+            with c1:
                 section['lh_octave'] = st.slider(
-                    "Left Hand Octave",
-                    1, 4, section['lh_octave'],
+                    "LH Octave", 1, 4, section.get('lh_octave', 2),
                     key=f"lh_{section['id']}",
-                    help="Lower = deeper bass. Default: 2"
+                    help="Left hand octave - lower = deeper bass"
                 )
-            with col_rh:
+            with c2:
                 section['rh_octave'] = st.slider(
-                    "Right Hand Octave",
-                    3, 6, section['rh_octave'],
+                    "RH Octave", 3, 6, section.get('rh_octave', 4),
                     key=f"rh_{section['id']}",
-                    help="Higher = brighter sound. Default: 4"
+                    help="Right hand octave - higher = brighter sound"
                 )
         
         st.markdown("---")
 
-col_add, col_space = st.columns([1, 3])
-with col_add:
-    if st.button("➕ Add Section", use_container_width=True, help="Add another section to your song"):
+
+# Add Section Button
+if len(st.session_state.song_sections) > 0:
+    if st.button("➕ Add Section", use_container_width=True):
         add_section()
         st.rerun()
 
 st.markdown("---")
 
+
+# ═══════════════════════════════════════════════════════════════
+# GENERATE BUTTON
+# ═══════════════════════════════════════════════════════════════
+
 if st.button("🎹 Generate Full Song", type="primary", use_container_width=True):
     if len(st.session_state.song_sections) == 0:
-        st.error("❌ Please add at least one section first!")
+        st.error("❌ Add at least one section first!")
     else:
         all_results = []
         progression_data = []
         prev_rh = None
         
-        for section_idx, section in enumerate(st.session_state.song_sections):
+        for section in st.session_state.song_sections:
             if not section['chords'].strip():
-                st.warning(f"⚠️ Section '{section['name']}' has no chords. Skipping.")
+                st.warning(f"⚠️ '{section['name']}' has no chords. Skipping.")
                 continue
             
             st.markdown(f"### 🎵 {section['name']}")
-            st.caption(f"**Genre:** {section['genre']} • **Chords:** {section['chords']}")
+            st.caption(f"**Genre/Voicing:** {section['genre']} • **Chords:** {section['chords']}")
             
             tokens = section['chords'].strip().split()
-            section_results = []
             
             for token in tokens:
                 try:
                     if "Roman" in input_mode:
                         root_pc, quality = roman_to_chord(token, key_pc)
-                        chord_label = f"{pc_to_note_name(root_pc)}{quality} ({token})"
+                        chord_label = f"{pc_to_note_name(root_pc)}{quality}"
                         slash_bass = None
                     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:
+                            slash_bass_pc = note_name_to_pc(slash_bass)
+                            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'],
@@ -480,11 +707,29 @@ if st.button("🎹 Generate Full Song", type="primary", use_container_width=True
                         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)
                     
-                    if use_voice_leading and prev_rh:
+                    # 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)
@@ -508,81 +753,82 @@ if st.button("🎹 Generate Full Song", type="primary", use_container_width=True
                         'genre': section['genre']
                     }
                     
-                    section_results.append(result)
                     all_results.append(result)
                     progression_data.append({'lh': lh, 'rh': rh})
                     
-                except Exception as e:
-                    st.error(f"❌ Error parsing '{token}' in {section['name']}: {e}")
-            
-            if section_results:
-                for r in section_results:
+                    # Display
                     cols = st.columns([1.5, 2.5, 2.5])
-                    
                     with cols[0]:
-                        st.markdown(f"**{r['label']}**")
-                        st.caption(f"🎨 {r['genre']}")
-                        st.code(f"LH: {', '.join(r['lh_names'])}", language=None)
-                        st.code(f"RH: {', '.join(r['rh_names'])}", language=None)
-                        if r['has_issues']:
-                            st.warning(r['report'])
+                        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(r['report'])
-                    
+                            st.success(result['report'])
                     with cols[1]:
-                        piano_lh = draw_piano_svg(r['lh'], "LEFT HAND", 24, 36)
-                        st.markdown(piano_lh, unsafe_allow_html=True)
-                    
+                        st.markdown(draw_piano_svg(result['lh'], "LEFT HAND", 24, 36), unsafe_allow_html=True)
                     with cols[2]:
-                        piano_rh = draw_piano_svg(r['rh'], "RIGHT HAND", 48, 37)
-                        st.markdown(piano_rh, unsafe_allow_html=True)
-                
-                st.markdown("---")
+                        st.markdown(draw_piano_svg(result['rh'], "RIGHT HAND", 48, 37), unsafe_allow_html=True)
+                    
+                except Exception as e:
+                    st.error(f"❌ Error parsing '{token}': {e}")
+            
+            st.markdown("---")
         
+        # Export
         if progression_data:
-            st.subheader("💾 Export Full Song")
-            st.info("💡 **Tip:** Import these MIDI files into your DAW, assign sounds, and produce your track!")
+            st.subheader("💾 Export MIDI")
             
             try:
+                # Generate all MIDI files
                 files = MidiExporter.export(progression_data, filename_prefix="full_song")
-                col1, col2 = st.columns(2)
-                with col1:
-                    with open(files['lh'], 'rb') as f:
-                        st.download_button(
-                            "⬇️ Download Left Hand MIDI",
-                            f, file_name="full_song_LH.mid",
-                            mime="audio/midi",
-                            use_container_width=True
-                        )
-                with col2:
-                    with open(files['rh'], 'rb') as f:
-                        st.download_button(
-                            "⬇️ Download Right Hand MIDI",
-                            f, file_name="full_song_RH.mid",
-                            mime="audio/midi",
-                            use_container_width=True
-                        )
+                combined_file = MidiExporter.export_combined(progression_data, filename_prefix="full_song")
+                
+                # Main button - Combined MIDI
+                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"
+                    )
+                
+                # 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"❌ MIDI export error: {e}")
+                st.error(f"❌ Export error: {e}")
             
-            st.subheader("📊 Full Song Summary")
-            summary_data = []
-            for r in all_results:
-                summary_data.append({
-                    'Section': r['section'],
-                    'Chord': r['label'],
-                    'Genre': r['genre'],
-                    'LH Notes': ", ".join(r['lh_names']),
-                    'RH Notes': ", ".join(r['rh_names']),
-                    'Status': '✅ Clear' if not r['has_issues'] else '⚠️ Fixed'
-                })
-            st.dataframe(summary_data, use_container_width=True)
-
-# Footer
+            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.markdown("""
-<div style='text-align: center; color: #8b949e; padding: 2rem 0;'>
-    <p>🎹 Built for musicians, by musicians • Free & Open Source</p>
-    <p>Found a bug or have a suggestion? Let us know!</p>
-</div>
-""", unsafe_allow_html=True)
+st.caption("🎹 Harmonic Catalyst PRO")