Remove buggy Chatbot component - use Markdown display instead

app.py

@@ -1,5 +1,6 @@
 """
 NVC Deep Practice - A Multi-Stage Nonviolent Communication Learning Space
+Simplified version without Chatbot component to avoid Gradio bugs
 """
 
 import gradio as gr
@@ -23,546 +24,218 @@ print(f"=== STARTUP: API key configured: {API_KEY_CONFIGURED} ===")
 
 NEEDS_LIST = {
     "Emotional Needs": [
-        "acceptance", "accountability", "acknowledgement", "affection",
-        "appreciation", "attention", "autonomy", "belonging", "care",
-        "consideration", "consistency", "dependability", "dignity",
-        "emotional attunement", "freedom", "inclusion", "nurturance",
-        "privacy", "protection", "reassurance", "respect", "security",
-        "self-connection", "self-worth", "shared reality", "space",
-        "to be heard", "to be known", "to be seen", "to matter",
-        "trust", "understanding"
+        "acceptance", "acknowledgement", "affection", "appreciation",
+        "autonomy", "belonging", "care", "respect", "security",
+        "to be heard", "to be seen", "to matter", "trust", "understanding"
     ],
     "Relational Needs": [
-        "awareness", "clarity", "closeness", "collaboration",
-        "communication", "community", "companionship", "compassion",
-        "connection", "emotional intimacy", "empathy", "friendship",
-        "harmony", "help", "honesty", "integrity", "kindness",
-        "listening", "love", "openness", "reconciliation",
-        "shared values", "support", "synergy"
+        "closeness", "collaboration", "communication", "community",
+        "companionship", "connection", "empathy", "honesty",
+        "kindness", "love", "support"
     ],
     "Value Needs": [
-        "authenticity", "celebration", "choice", "courage", "curiosity",
-        "creativity", "emotional integration", "empowerment", "equality",
-        "fulfillment", "forgiveness", "gratefulness", "growth", "healing",
-        "hope", "inspiration", "justice", "learning", "meaning",
-        "mourning", "presence", "purpose", "reciprocity", "resilience",
-        "resourcefulness", "self-advocacy", "self-expression", "solidarity"
+        "authenticity", "creativity", "growth", "healing", "hope",
+        "learning", "meaning", "purpose", "self-expression"
     ],
     "Lifestyle Needs": [
-        "adaptability", "beauty", "balance", "competence", "ease",
-        "effectiveness", "fun", "financial wellbeing", "flexibility",
-        "grace", "health", "joy", "movement", "nature", "novelty",
-        "order", "passion", "peace", "play", "predictability", "rest",
-        "safety", "self-care", "sexuality", "spontaneity", "structure",
-        "vitality"
+        "balance", "ease", "fun", "health", "peace", "play",
+        "rest", "safety", "vitality"
     ]
 }
 
 FEELINGS_CONNECTED = [
-    "affectionate", "amazed", "animated", "appreciative", "calm", "centered",
-    "clear-headed", "comfortable", "compassionate", "confident", "content",
-    "curious", "delighted", "eager", "ecstatic", "elated", "empowered",
-    "encouraged", "energetic", "engaged", "enlivened", "enthralled",
-    "enthusiastic", "equanimous", "excited", "exhilarated", "expectant",
-    "exuberant", "fascinated", "focused", "friendly", "fulfilled", "grateful",
-    "happy", "hopeful", "inspired", "interested", "intrigued", "invigorated",
-    "joyful", "loving", "mellow", "moved", "open", "optimistic", "passionate",
-    "peaceful", "pleased", "proud", "radiant", "refreshed", "rejuvenated",
-    "relaxed", "relieved", "rested", "safe", "satisfied", "secure", "tender",
-    "thankful", "thrilled", "touched", "trusting", "vulnerable", "warm"
+    "grateful", "peaceful", "joyful", "content", "hopeful",
+    "confident", "curious", "excited", "relieved", "touched"
 ]
 
 FEELINGS_WANTING = [
-    "afraid", "agitated", "alarmed", "angry", "annoyed", "anxious", "apathetic",
-    "ashamed", "baffled", "bewildered", "bored", "confused", "depleted",
-    "depressed", "despair", "devastated", "disappointed", "discouraged",
-    "disgusted", "distant", "distracted", "distressed", "disturbed", "dread",
-    "embarrassed", "enraged", "envious", "exasperated", "exhausted", "frustrated",
-    "furious", "grief", "grumpy", "guarded", "guilty", "heartbroken",
-    "heavy-hearted", "helpless", "hesitant", "hopeless", "horrified", "hurt",
-    "impatient", "insecure", "irritated", "jealous", "lonely", "lost",
-    "miserable", "mistrusting", "nervous", "nostalgic", "numb", "overwhelmed",
-    "panicked", "perplexed", "rattled", "regretful", "resentful", "restless",
-    "sad", "scared", "scattered", "self-conscious", "sensitive", "shocked",
-    "stressed", "suspicious", "tense", "terrified", "tired", "torn", "troubled",
-    "turmoil", "uncomfortable", "uneasy", "unhappy", "unsettled", "upset",
-    "vulnerable", "withdrawn", "worried"
-]
-
-FEELINGS_ADVOCACY = [
-    "abandoned", "abused", "attacked", "belittled", "betrayed", "blamed",
-    "bullied", "coerced", "controlled", "criticized", "demeaned", "discriminated",
-    "dismissed", "disrespected", "excluded", "humiliated", "ignored", "insulted",
-    "invisible", "judged", "manipulated", "misunderstood", "neglected",
-    "patronized", "put down", "pressured", "provoked", "rejected", "shamed",
-    "targeted", "unappreciated", "unheard", "used", "violated", "wronged"
+    "frustrated", "anxious", "sad", "hurt", "disappointed",
+    "overwhelmed", "confused", "lonely", "scared", "angry"
 ]
 
 # ============ SYSTEM PROMPTS ============
 
 BASE_TONE = """
-Infused with the exquisite warmth of Sarah Peyton and Tara Brach -
-resonant empathy meeting radical acceptance, holding space with
-the tenderness of complete belonging.
+Infused with the warmth of Sarah Peyton and Tara Brach - resonant empathy meeting radical acceptance.
 
 CRITICAL LANGUAGE RULES:
-- NEVER use first person ("I", "I'm", "I sense", "I hear", "I wonder", etc.)
+- NEVER use first person ("I", "I'm", "I sense", "I hear")
 - DO use second person warmly ("you", "your")
 - Use impersonal constructions: "What's here is...", "There's...", "It sounds like..."
-- Ask "you" questions: "Are you feeling...?", "Does this resonate with you?"
 """
 
 STAGE_PROMPTS = {
     1: f"""
-Embody the presence of an ideal secure attachment figure - warm,
-steady, deeply attuned. Hold space with the quality of exquisite
-attunement, as if the most loving relational presence is witnessing
-what's alive here.
-
 {BASE_TONE}
 
-This is NVC training in the lineage of Marshall Rosenberg and
-Sarah Peyton, but delivered with the warmth of secure attachment -
-the kind of presence that sees, honors, and holds.
-
 The raw message has been shared. Offer:
 1. Warm acknowledgment of what's present
 2. Reflection of the emotional energy sensed
-3. NO judgment or correction - just tender presence
-4. Deep honoring of what's being expressed
+3. NO judgment - just tender presence
 
-TONE: Like the most attuned caregiver reflecting back what they sense,
-with complete acceptance and warmth. Gentle, unhurried, fully present.
-The quality of "what's here is completely seen and welcome."
-
-Keep it brief (2-3 sentences) but saturated with warmth and presence.
+Keep it brief (2-3 sentences) but saturated with warmth.
 """,
 
     2: f"""
-Offer empathic reflection using NVC feelings vocabulary.
-
 {BASE_TONE}
 
-FEELINGS VOCABULARY - Use these rich distinctions:
-
-When connected to needs: {', '.join(FEELINGS_CONNECTED[:20])}... and more.
-
-When wanting more connection to needs: {', '.join(FEELINGS_WANTING[:20])}... and more.
-
-When advocacy/healing is needed: {', '.join(FEELINGS_ADVOCACY[:15])}... and more.
-
-SARAH PEYTON RESONANCE with TARA BRACH WARMTH:
-- Warm, gentle, curious tone - like the most attuned presence
-- Multiple feeling guesses (honor complexity and depth)
-- Phrases like "Are you feeling...?" "Is there...?" "Could it be...?" "Might you be...?"
-- Go for depth and nuance, not surface emotions
-- Name layers (e.g., "frustrated, and underneath that, perhaps hurt?")
-- Hold space with complete presence
-- Radical acceptance - whatever's here is completely welcome
+Offer empathic reflection using NVC feelings vocabulary.
 
-Offer 2-4 feeling guesses that honor the complexity and depth.
-Use specific, nuanced feelings vocabulary.
+FEELINGS when connected: {', '.join(FEELINGS_CONNECTED)}
+FEELINGS when wanting: {', '.join(FEELINGS_WANTING)}
 
-End with gentle invitation: "Does any of this land for you?" or "What resonates?"
+Offer 2-4 feeling guesses with phrases like "Are you feeling...?" "Could it be...?"
+End with: "What resonates?"
 """,
 
     3: f"""
-Guide a brief somatic check-in with the tenderness of an ideal
-caregiver helping someone connect to their body's wisdom.
-
 {BASE_TONE}
 
-EMBODIMENT PRINCIPLES:
-- Somatic awareness creates integration
-- The body holds wisdom about needs
-- Slowing down to feel creates space for choice
-- This is an invitation, not a demand - gentle, spacious
-- Complete safety in whatever arises (or doesn't)
-
-TONE: Like the most patient, loving presence guiding someone
-to reconnect with themselves. No rush. Complete safety.
-The quality of "whatever's here is completely welcome."
+Guide a brief somatic check-in:
+- "Where might you be feeling this in your body?"
+- "What's the quality of sensation there?"
 
-Offer 2-3 gentle questions:
-- "Where might you be feeling this in your body right now?"
-- "What's the quality of sensation there?" (tight, warm, heavy, buzzing...)
-- "What does your body want to do with this energy?"
-
-Keep it brief (2-3 sentences) and completely non-pressuring.
-
-End with: "And if your body's not speaking clearly right now,
-that's completely okay too. Sometimes the body needs more time
-and safety to share what it knows."
+Keep it brief and non-pressuring. End with permission to skip if the body isn't speaking clearly.
 """,
 
     4: f"""
-Deliver the foundational teaching: feelings communicate needs.
-This is the heart of NVC - feelings are messengers.
-
 {BASE_TONE}
 
-CORE TEACHING TO DELIVER:
-
-Feelings are messengers. They're not the problem - they're information
-about what's needed.
-
-When feelings are pleasant (grateful, peaceful, joyful), they're saying:
-"Needs are being met. This is nourishing."
-
-When feelings are uncomfortable (frustrated, lonely, scared), they're saying:
-"There's a need here wanting attention."
-
-Marshall Rosenberg: "Feelings are the voice of our needs. They tell us
-whether our needs are being met or not."
+TEACH: Feelings are messengers - they communicate needs.
 
-This changes everything. Instead of pushing feelings away or getting
-lost in them, we can listen. "What is this feeling telling me about
-what I need?"
+When feelings are pleasant, needs are being met.
+When feelings are uncomfortable, there's a need wanting attention.
 
-Anger points to needs like respect, autonomy, fairness.
-Sadness points to needs like connection, understanding, mourning.
-Fear points to needs like safety, predictability, reassurance.
-Loneliness points to needs like belonging, companionship, to be seen.
+Marshall Rosenberg: "Feelings are the voice of our needs."
 
-The practice: Feel the feeling, then get curious about the need.
-
-PEDAGOGICAL APPROACH:
-- Keep it clear and brief (4-5 sentences)
-- Use Marshall Rosenberg quote
-- Give concrete examples connecting feelings to needs
-- End with invitation to discover their own needs
-
-TONE: Teaching with warmth and reverence. The quality of "this is
-such important wisdom - feelings as messengers, not problems."
-
-After delivering this teaching, transition warmly: "So... what needs
-might be calling for attention in what you're feeling?"
+Keep it to 4-5 sentences. End with: "What needs might be calling for attention?"
 """,
 
     5: f"""
-Guide the identification of universal needs with the warmth of
-someone helping another discover their own inner truth.
-
 {BASE_TONE}
 
-Based on the feelings identified earlier, offer gentle guesses about
-which needs might be present:
-
-If feeling frustrated/angry -> might need: respect, autonomy, understanding,
-to be heard, fairness, choice
-
-If feeling hurt/sad -> might need: care, empathy, connection, to matter,
-emotional intimacy, reassurance
-
-If feeling scared/anxious -> might need: safety, security, predictability,
-reassurance, protection, trust
+Based on the feelings, offer gentle guesses about needs present.
 
-If feeling lonely/disconnected -> might need: belonging, companionship,
-closeness, to be seen, to be known, connection
+Needs are universal - every human shares them. They're NOT strategies.
 
-If feeling dismissed/invisible -> might need: acknowledgement, to be heard,
-to be seen, respect, dignity, to matter
-
-If feeling exhausted/depleted -> might need: rest, support, care, ease,
-balance, nurturance
-
-Offer 2-4 need guesses warmly, then invite them to explore:
-"These are guesses - what resonates? And there's a rich list below to
-explore what's most true for you."
-
-TEACH THE UNIVERSALITY OF NEEDS:
-
-Needs are universal - every human being shares these needs.
-They're what's essential for thriving and flourishing.
-
-Needs are NOT strategies. A need is universal (connection). A strategy
-is specific (wanting this particular person to call).
-
-Example:
-Need = understanding, to be known
-Strategy = "I need you to listen to me for an hour"
-
-Marshall Rosenberg: "When we express our needs rather than our
-interpretations of others' behavior, we increase the likelihood
-of meeting those needs."
-
-TONE: Gentle guidance with assistive support. The quality of
-"here's some help finding your way, and trust your own knowing."
+Offer 2-4 need guesses warmly. Invite them to explore: "What resonates?"
 """,
 
     6: f"""
-The needs have been identified. Offer deep resonance in Sarah Peyton's
-and Tara Brach's style.
-
 {BASE_TONE}
 
-RESONANCE PRINCIPLES:
+The needs have been identified. Offer deep resonance:
 - Acknowledge the beauty and legitimacy of these needs
-- Reflect back the universality ("Of course there's longing for...")
+- "Of course there's longing for..."
 - Create warmth and self-compassion
-- Brief but touching (2-3 sentences)
-- The quality of "this need is so deeply human and completely welcome"
-
-Example: "Of course there's longing for understanding - to be truly
-seen and known. That's such a tender, human need. Can you feel how
-natural it is to want that?"
-
-Use the specific needs identified. Make it personal and saturated with warmth.
-This is a moment of deep honoring and belonging.
 
-TONE: Pure resonance and acceptance. The quality of "these needs are
-beautiful and completely legitimate - of course this matters to you."
+Keep it to 2-3 sentences, saturated with acceptance.
 """,
 
     7: f"""
-Based on the feelings and context, deliver a relevant micro-lesson
-with warmth and honoring.
-
 {BASE_TONE}
 
-AVAILABLE LESSONS (choose the most relevant):
-
-ANGER FAMILY: Anger is a messenger - it arrives to say a boundary has been
-crossed or a need isn't met. It's protective energy with wisdom in it.
-Marshall Rosenberg: "At the core of all anger is a need that is not being fulfilled."
-
-I-LANGUAGE: Notice the difference:
-"You never listen!" triggers defensiveness.
-"I feel unheard because I need understanding" creates an opening.
-Marshall Rosenberg: "When we express our needs rather than our interpretations
-of others' behavior, we increase the likelihood of meeting those needs."
+Deliver a relevant micro-lesson based on context:
+- ANGER: A messenger that a boundary was crossed
+- I-LANGUAGE: "I feel..." instead of "You never..."
+- VULNERABILITY: What's underneath the anger?
 
-FEELINGS VS THOUGHTS: This distinction matters:
-NOT feelings: "I feel like you don't care" (thought), "I feel ignored" (interpretation)
-REAL feelings: "I feel hurt", "I feel sad", "I feel scared"
-Feelings are one-word descriptions of the inner landscape.
-
-VULNERABILITY: What's underneath the anger or frustration? Often there's
-something more tender - hurt, fear, longing, sadness. It takes courage
-to let that softer layer be seen.
-
-ADVOCACY FEELINGS: Some feelings point to experiences needing acknowledgment:
-abandoned, betrayed, dismissed, ignored, judged, rejected...
-These name real experiences of harm AND usually have a more vulnerable
-feeling underneath (hurt, scared, heartbroken).
-
-PEDAGOGICAL APPROACH:
-- Keep it brief (3-4 sentences max)
-- Include a Marshall Rosenberg quote when applicable
-- Connect to the specific situation with tenderness
-- End with an invitation or gentle insight
-
-TONE: Like a wise, loving teacher who sees capacity and offers
-wisdom with complete faith in unfolding.
+Keep it brief (3-4 sentences) with a Marshall Rosenberg quote if applicable.
 """,
 
     8: f"""
-Deliver micro-lesson on relational fields and early patterning.
-
 {BASE_TONE}
 
-KEY CONCEPTS TO WEAVE IN:
-1. Interpersonal neurobiology - we're wired for connection
-2. Early attachment patterns create default responses
-3. Unintegrated emotional charge in relational fields
-4. Neuroplasticity - we can create new patterns through practice
-5. Reactivity vs. responsiveness
-
-TEACHING APPROACH:
-- Make it personal to their situation
-- Normalize the difficulty (not their fault)
-- Inspire hope (change is possible)
-- Keep to 4-5 sentences
-- Deep compassion for the old patterns
-
-Example frame: "The reactivity that's here isn't a character flaw -
-it's old wiring from early relationships. When needs didn't get met
-as a child, the nervous system learned to protect. The beautiful news:
-your brain is neuroplastic. Each time you practice pausing and naming
-your needs, you're creating new neural pathways."
-
-TONE: Tender psychoeducation. The quality of "this makes complete sense
-given where you've been, and there's so much possibility ahead."
+Teach about relational patterns:
+- We're wired for connection
+- Early patterns create default responses
+- Neuroplasticity means we can create new patterns
+
+Keep to 4-5 sentences. Normalize the difficulty, inspire hope.
 """,
 
     9: f"""
-Help craft an NVC request with warmth and clarity.
-
 {BASE_TONE}
 
-MARSHALL ROSENBERG ON REQUESTS:
-"Requests are the third component of NVC. We express what we are
-requesting rather than what we are NOT requesting."
-
-"A request is a specific action that we would like the other person
-to take. It's important that we make requests that are doable,
-concrete, and positive."
+Help craft an NVC request:
 
 REQUEST CRITERIA:
 1. Specific (not vague)
 2. Doable (concrete action)
-3. Positive language (what you want, not what you don't want)
-4. Present moment or near future
-5. Honors other's autonomy (genuine request, not demand)
-
-DEMANDS VS REQUESTS:
-Demand: Blame/punishment if they say no
-Request: Empathy for their needs if they say no
-
-Guide: "What specific, doable action would meet your need for [their identified need]?"
+3. Positive language (what you want, not don't want)
+4. Honors other's autonomy
 
-Offer 1-2 example requests based on their needs, then invite them to craft their own.
-
-TONE: Encouraging, clear, with deep trust in their capacity to ask
-for what they need. The quality of "you deserve to have your needs met."
+Guide: "What specific, doable action would meet your need?"
 """,
 
     10: f"""
-Deliver micro-lesson on autonomy and receiving "no."
-
 {BASE_TONE}
 
-MARSHALL ROSENBERG QUOTES TO USE:
-
-"NVC's most important use may be in developing self-compassion."
+Teach about autonomy and receiving "no":
 
-"We are never angry because of what someone else did. We can identify
-the other person's behavior as a stimulus, but it is important to
-establish a clear separation between stimulus and cause."
+True requests allow for "no." If you're not willing to hear "no," it's a demand.
 
-"When we hear the other person's feelings and needs, we recognize
-our common humanity."
+"No" protects their needs - just as valid as yours.
 
-TEACHING POINTS:
-- True requests allow for "no"
-- "No" protects their needs (just as valid as yours)
-- The practice: Get curious about their needs if they decline
-- This is how mutuality works - both people's needs matter
-
-Frame: "If you're not willing to hear 'no,' it's a demand, not a
-request. The practice is: Can you care about their needs even when
-they don't meet your strategy?"
-
-Keep it compassionate but clear. This is crucial NVC teaching.
-
-TONE: Tender but firm. The quality of "this is where real love lives -
-in honoring each other's autonomy."
+Keep it compassionate but clear.
 """,
 
     11: f"""
-Invite rewriting of the original message with encouragement and structure.
-
 {BASE_TONE}
 
-SCAFFOLDING PROMPT:
-"Now, with awareness of your feelings, needs, and request,
-would you like to try rewriting your message? Here's a structure
-if it's helpful:
-
-- When [observation - concrete, specific]
-- I feel [feeling word]
-- Because I need [universal need]
-- Would you be willing to [specific, doable request]?
-
-Or use whatever language feels authentic. The structure is training
-wheels - connection is the goal."
-
-Provide encouragement and remind: this is practice, not perfection.
+Invite rewriting the original message:
 
-Show them their original message for reference.
+Structure if helpful:
+- When [observation]
+- I feel [feeling]
+- Because I need [need]
+- Would you be willing to [request]?
 
-TONE: Warm encouragement. The quality of "you've got this, and whatever
-emerges will be a step forward."
+Remind: This is practice, not perfection.
 """,
 
     12: f"""
-Provide warm, constructive feedback on the revised message.
-
 {BASE_TONE}
 
-FEEDBACK APPROACH:
-1. Name what's working (specific praise)
-2. Offer one growth edge (gently)
-3. Reflect on the shift from original to revised
-4. Invite somatic reflection: "How does it feel in your body to express it this way?"
-
-GROWTH EDGES TO WATCH FOR:
-- Faux feelings ("I feel like you..." "I feel that...")
-- Needs confused with strategies
-- Requests as demands
-- Blame language sneaking in
-- Vagueness (not specific/doable)
+Provide warm feedback on the revised message:
+1. Name what's working
+2. Offer one gentle growth edge
+3. Invite: "How does it feel to express it this way?"
 
 Keep feedback ratio 3:1 positive to constructive.
-Always end with encouragement and invitation to notice body/energy.
-
-TONE: Celebratory of effort, gentle with growth edges. The quality
-of "look at this beautiful step you're taking."
 """,
 
     13: f"""
-Close the practice session with integration and honoring.
-
 {BASE_TONE}
 
-INTEGRATION ELEMENTS:
+Close the practice with integration:
 1. Honor the work done
-2. Name key learning (ask: "What's one thing you'll take with you?")
-3. Connect to neuroplasticity ("Each practice strengthens new pathways")
-4. Offer encouragement for real-world application
-5. Remind: progress over perfection
-
-CLOSING FRAME:
-Marshall Rosenberg: "The more we empathize with the other party,
-the safer we feel."
-
-Invite noticing how this practice shows up in the next real conversation.
-Neuroplasticity requires repetition - each attempt rewires relational capacity.
-
-TONE: Warm, honoring, hopeful. Vulnerable work has been done and deserves
-deep acknowledgment. The quality of "you showed up for yourself today,
-and that matters so much."
+2. Ask: "What's one thing you'll take with you?"
+3. Remind: Each practice strengthens new neural pathways
 
-End with an invitation to start a new practice if they'd like.
+End warmly with invitation to practice again.
 """
 }
 
 STAGE_NAMES = {
-    1: "Raw Input",
+    1: "Share Your Message",
     2: "Feeling Reflection",
-    3: "Somatic Check-In",
-    4: "Feelings Communicate Needs",
-    5: "Needs Identification",
+    3: "Body Check-In",
+    4: "Feelings as Messengers",
+    5: "Identify Needs",
     6: "Needs Resonance",
-    7: "Feelings Lesson",
-    8: "Relational Field Lesson",
-    9: "Request Formulation",
-    10: "Autonomy Lesson",
-    11: "Rewrite Practice",
-    12: "Feedback & Reflection",
-    13: "Integration & Close"
-}
-
-STAGE_FOCUS = {
-    1: "Emotional awareness",
-    2: "Feelings vocabulary",
-    3: "Embodiment",
-    4: "Feelings as messengers",
-    5: "Needs literacy",
-    6: "Self-compassion",
-    7: "Conceptual understanding",
-    8: "Systemic awareness",
-    9: "Clear asking",
-    10: "Mutuality",
-    11: "Application",
-    12: "Integration",
-    13: "Completion"
+    7: "Deeper Understanding",
+    8: "Relational Patterns",
+    9: "Make a Request",
+    10: "Honoring Autonomy",
+    11: "Rewrite Your Message",
+    12: "Reflection",
+    13: "Integration"
 }
 
 # ============ CLAUDE INTEGRATION ============
 
 def get_client():
-    """Initialize Anthropic client - try multiple possible secret names"""
     api_key = (
         os.environ.get("ANTHROPIC_API_KEY") or
         os.environ.get("anthropic_key") or
@@ -573,626 +246,229 @@ def get_client():
         return None
     return anthropic.Anthropic(api_key=api_key)
 
-def call_claude(system_prompt, messages, context=""):
-    """Call Claude API with given prompts"""
+def call_claude(system_prompt, user_message, context=""):
     client = get_client()
 
     if client is None:
-        return None  # Return None to indicate API not available
+        return None
 
-    if context:
-        user_content = f"{context}\n\nUser message: {messages[-1]['content']}" if messages else context
-    else:
-        user_content = messages[-1]['content'] if messages else ""
+    full_message = f"{context}\n\nUser: {user_message}" if context else user_message
 
     response = client.messages.create(
         model="claude-sonnet-4-20250514",
         max_tokens=1500,
         system=system_prompt,
-        messages=[{"role": "user", "content": user_content}]
+        messages=[{"role": "user", "content": full_message}]
     )
 
     return response.content[0].text
 
-# ============ STAGE PROCESSING ============
+# ============ MAIN APP ============
 
-API_ERROR_MESSAGE = """**API Configuration Required**
+def format_history(history):
+    """Format conversation history as markdown"""
+    if not history:
+        return "*Start by sharing a message you'd like to communicate more skillfully...*"
 
-To use this NVC practice tool, the Space owner needs to add an Anthropic API key:
+    output = ""
+    for entry in history:
+        if entry.get("user"):
+            output += f"**You:** {entry['user']}\n\n"
+        if entry.get("assistant"):
+            output += f"**Guide:** {entry['assistant']}\n\n"
+        output += "---\n\n"
+    return output
 
-1. Go to **Settings** (gear icon) in this Space
-2. Click **Repository secrets**
-3. Add a new secret named `ANTHROPIC_API_KEY`
-4. Paste your API key from [console.anthropic.com](https://console.anthropic.com)
-5. **Restart the Space** (Factory reboot)
+def process_message(user_input, history, stage, session_data, somatic_enabled, selected_needs_str):
+    """Process user message and return updated state"""
 
-If you're the Space owner and have already added the key, try restarting the Space."""
-
-def process_stage(user_input, stage, session_data, somatic_enabled):
-    """Process current stage and return response"""
+    if not user_input.strip():
+        user_input = "continue"
 
+    # Skip somatic if disabled
     if stage == 3 and not somatic_enabled:
-        return "", 4, session_data, "Skipping somatic check-in..."
+        stage = 4
+
+    # Build context
+    context_parts = []
+    if session_data.get("original_message"):
+        context_parts.append(f"Original message: \"{session_data['original_message']}\"")
+    if session_data.get("feelings"):
+        context_parts.append(f"Feelings: {session_data['feelings']}")
+    if session_data.get("needs"):
+        context_parts.append(f"Needs: {session_data['needs']}")
+    context = "\n".join(context_parts)
 
-    context = build_context(stage, session_data)
+    # Get response from Claude
     system_prompt = STAGE_PROMPTS.get(stage, STAGE_PROMPTS[1])
 
     try:
-        response = call_claude(
-            system_prompt,
-            [{"role": "user", "content": user_input}],
-            context
-        )
+        response = call_claude(system_prompt, user_input, context)
 
-        # Check if API key was not configured
         if response is None:
-            return "", stage, session_data, API_ERROR_MESSAGE
-
-    except anthropic.AuthenticationError:
-        return "", stage, session_data, "**Invalid API Key** - The API key appears to be invalid. Please check that you've entered a valid Anthropic API key in the Space secrets."
-    except anthropic.RateLimitError:
-        return "", stage, session_data, "**Rate Limited** - Too many requests. Please wait a moment and try again."
-    except anthropic.APIConnectionError:
-        return "", stage, session_data, "**Connection Error** - Unable to connect to the Anthropic API. Please try again in a moment."
-    except Exception as e:
-        error_type = type(e).__name__
-        return "", stage, session_data, f"**Error** ({error_type}): {str(e)}"
+            error_msg = "**Setup Required:** Please add ANTHROPIC_API_KEY in Space Settings > Repository secrets, then restart."
+            history.append({"user": user_input, "assistant": error_msg})
+            return format_history(history), "", history, stage, session_data, f"Stage {stage}: {STAGE_NAMES[stage]}"
 
-    session_data = update_session_data(stage, user_input, session_data)
-    next_stage = stage + 1 if stage < 13 else 1
+    except Exception as e:
+        error_msg = f"**Error:** {str(e)}"
+        history.append({"user": user_input, "assistant": error_msg})
+        return format_history(history), "", history, stage, session_data, f"Stage {stage}: {STAGE_NAMES[stage]}"
 
-    return response, next_stage, session_data, None
+    # Update session data
+    if stage == 1:
+        session_data["original_message"] = user_input
+    elif stage == 2:
+        session_data["feelings"] = user_input
+    elif stage == 5 and selected_needs_str:
+        session_data["needs"] = selected_needs_str
 
-def build_context(stage, session_data):
-    """Build context string for Claude based on stage"""
-    context_parts = []
+    # Add to history
+    if user_input != "continue":
+        history.append({"user": user_input, "assistant": response})
+    else:
+        history.append({"assistant": response})
 
-    if session_data.get("original_message"):
-        context_parts.append(f"Original message: \"{session_data['original_message']}\"")
+    # Advance stage
+    next_stage = stage + 1 if stage < 13 else 1
 
-    if session_data.get("feelings") and stage > 2:
-        context_parts.append(f"Feelings identified: {', '.join(session_data['feelings'])}")
+    # Reset if completed
+    if stage == 13:
+        next_stage = 1
+        session_data = {}
+
+    return (
+        format_history(history),
+        "",
+        history,
+        next_stage,
+        session_data,
+        f"Stage {next_stage}/13: {STAGE_NAMES[next_stage]}"
+    )
 
-    if session_data.get("body_sensations") and stage > 3:
-        context_parts.append(f"Body sensations: {session_data['body_sensations']}")
+def reset_session():
+    """Reset everything"""
+    return (
+        "*Start by sharing a message you'd like to communicate more skillfully...*",
+        "",
+        [],
+        1,
+        {},
+        "Stage 1/13: Share Your Message",
+        [], [], [], []
+    )
 
-    if session_data.get("needs") and stage > 5:
-        context_parts.append(f"Needs identified: {', '.join(session_data['needs'])}")
+def update_needs_display(e1, e2, e3, e4):
+    """Combine selected needs"""
+    all_needs = e1 + e2 + e3 + e4
+    return ", ".join(all_needs) if all_needs else ""
 
-    if session_data.get("request") and stage > 9:
-        context_parts.append(f"Request formulated: {session_data['request']}")
+# ============ BUILD INTERFACE ============
 
-    if session_data.get("revised_message") and stage > 11:
-        context_parts.append(f"Revised message: \"{session_data['revised_message']}\"")
+with gr.Blocks(
+    title="NVC Deep Practice",
+    theme=gr.themes.Soft(primary_hue="green", secondary_hue="amber")
+) as demo:
 
-    return "\n".join(context_parts)
+    # State
+    history_state = gr.State([])
+    stage_state = gr.State(1)
+    session_state = gr.State({})
 
-def update_session_data(stage, user_input, session_data):
-    """Update session data based on completed stage"""
-    if stage == 1:
-        session_data["original_message"] = user_input
-    elif stage == 2:
-        session_data["feelings"] = session_data.get("feelings", [])
-    elif stage == 3:
-        session_data["body_sensations"] = user_input
-    elif stage == 9:
-        session_data["request"] = user_input
-    elif stage == 11:
-        session_data["revised_message"] = user_input
-
-    return session_data
-
-# ============ GRADIO INTERFACE ============
-
-def create_app():
-    """Create the Gradio interface with custom color palette"""
-
-    custom_css = """
-    :root {
-        --warm-gold: #B8941E;
-        --olive-yellow: #A8A832;
-        --deep-forest: #3D5932;
-        --sage-green: #6B8070;
-        --soft-cream: #F8F6F0;
-        --warm-beige: #EAE6DC;
-    }
-
-    .gradio-container {
-        font-family: 'Inter', 'Segoe UI', system-ui, sans-serif !important;
-        background: var(--soft-cream) !important;
-    }
-
-    .main-header {
-        background: linear-gradient(135deg, var(--warm-gold) 0%, #C9A52E 100%);
-        padding: 2.5rem 2rem;
-        border-radius: 16px;
-        margin-bottom: 2rem;
-        border: none;
-        box-shadow: 0 4px 20px rgba(184, 148, 30, 0.2);
-    }
-
-    .main-header h1 {
-        color: white;
-        font-size: 2.2rem;
-        font-weight: 600;
-        margin-bottom: 0.5rem;
-        letter-spacing: -0.02em;
-        text-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-    }
-
-    .main-header p {
-        color: rgba(255, 255, 255, 0.95);
-        font-size: 1.05rem;
-        line-height: 1.6;
-        margin-top: 0.5rem;
-    }
-
-    .intro-text {
-        color: var(--deep-forest);
-        font-size: 1.05rem;
-        line-height: 1.7;
-        padding: 1.25rem 1.5rem;
-        background: white;
-        border-radius: 12px;
-        border-left: 4px solid var(--sage-green);
-        margin-bottom: 1.5rem;
-        box-shadow: 0 2px 8px rgba(61, 89, 50, 0.08);
-    }
-
-    #chatbot {
-        border: 2px solid var(--sage-green) !important;
-        border-radius: 16px !important;
-        background: white !important;
-        box-shadow: 0 4px 16px rgba(61, 89, 50, 0.1) !important;
-    }
-
-    .message.user {
-        background: linear-gradient(135deg, var(--olive-yellow) 0%, #B8B840 100%) !important;
-        color: white !important;
-        border: none !important;
-        border-radius: 18px 18px 4px 18px !important;
-        padding: 0.85rem 1.1rem !important;
-        margin: 0.5rem 0 !important;
-        box-shadow: 0 2px 8px rgba(168, 168, 50, 0.2) !important;
-    }
-
-    .message.bot {
-        background: linear-gradient(135deg, var(--sage-green) 0%, #7A9080 100%) !important;
-        color: white !important;
-        border: none !important;
-        border-radius: 18px 18px 18px 4px !important;
-        padding: 0.85rem 1.1rem !important;
-        margin: 0.5rem 0 !important;
-        box-shadow: 0 2px 8px rgba(107, 128, 112, 0.2) !important;
-    }
-
-    textarea {
-        border: 2px solid var(--sage-green) !important;
-        border-radius: 12px !important;
-        padding: 1rem !important;
-        font-size: 1rem !important;
-        background: white !important;
-        transition: all 0.3s ease !important;
-        color: var(--deep-forest) !important;
-    }
-
-    textarea:focus {
-        border-color: var(--deep-forest) !important;
-        box-shadow: 0 0 0 3px rgba(61, 89, 50, 0.1) !important;
-        outline: none !important;
-    }
-
-    textarea::placeholder {
-        color: var(--sage-green) !important;
-        opacity: 0.7 !important;
-    }
-
-    .primary-button button {
-        background: linear-gradient(135deg, var(--deep-forest) 0%, #2D4426 100%) !important;
-        color: white !important;
-        border: none !important;
-        border-radius: 10px !important;
-        padding: 0.85rem 1.75rem !important;
-        font-weight: 600 !important;
-        font-size: 1rem !important;
-        transition: all 0.3s ease !important;
-        box-shadow: 0 3px 12px rgba(61, 89, 50, 0.3) !important;
-    }
-
-    .primary-button button:hover {
-        background: linear-gradient(135deg, #2D4426 0%, #1D3416 100%) !important;
-        box-shadow: 0 5px 16px rgba(61, 89, 50, 0.4) !important;
-        transform: translateY(-2px) !important;
-    }
-
-    .secondary-button button {
-        background: linear-gradient(135deg, var(--sage-green) 0%, #7A9080 100%) !important;
-        color: white !important;
-        border: none !important;
-        border-radius: 10px !important;
-        padding: 0.85rem 1.5rem !important;
-        font-weight: 500 !important;
-        transition: all 0.3s ease !important;
-        box-shadow: 0 2px 8px rgba(107, 128, 112, 0.2) !important;
-    }
-
-    .secondary-button button:hover {
-        background: linear-gradient(135deg, #7A9080 0%, #8AA090 100%) !important;
-        box-shadow: 0 4px 12px rgba(107, 128, 112, 0.3) !important;
-        transform: translateY(-1px) !important;
-    }
-
-    .sidebar-section {
-        background: white;
-        border-radius: 12px;
-        padding: 1.25rem;
-        margin-bottom: 1.25rem;
-        border: 2px solid var(--warm-beige);
-        box-shadow: 0 2px 8px rgba(61, 89, 50, 0.06);
-    }
-
-    .sidebar-section h3 {
-        color: var(--deep-forest);
-        font-size: 1.1rem;
-        font-weight: 600;
-        margin-bottom: 0.75rem;
-        padding-bottom: 0.5rem;
-        border-bottom: 2px solid var(--olive-yellow);
-    }
-
-    .focus-display input {
-        background: linear-gradient(135deg, var(--warm-gold) 0%, #C9A52E 100%) !important;
-        border: none !important;
-        border-radius: 10px !important;
-        padding: 1rem !important;
-        font-size: 1.05rem !important;
-        font-weight: 600 !important;
-        color: white !important;
-        text-align: center !important;
-        box-shadow: 0 3px 12px rgba(184, 148, 30, 0.25) !important;
-    }
-
-    input[type="checkbox"] {
-        accent-color: var(--deep-forest) !important;
-    }
-
-    .checkbox-label {
-        color: var(--deep-forest) !important;
-        font-weight: 500 !important;
-    }
-
-    label {
-        color: var(--deep-forest) !important;
-        font-weight: 500 !important;
-    }
-
-    .card-shadow {
-        box-shadow: 0 3px 15px rgba(61, 89, 50, 0.1);
-    }
-    """
-
-    with gr.Blocks(css=custom_css, theme=gr.themes.Soft(
-        primary_hue="green",
-        secondary_hue="amber",
-        neutral_hue="stone",
-        font=["Inter", "system-ui", "sans-serif"]
-    )) as demo:
-
-        # State variables
-        current_stage = gr.State(value=1)
-        session_data = gr.State(value={})
-        selected_needs = gr.State(value=[])
-
-        # Header
-        gr.HTML("""
-        <div class="main-header card-shadow">
-            <h1>NVC Deep Practice</h1>
-            <p><strong>Learn <a href="https://www.cnvc.org/" target="_blank" style="color: white; text-decoration: underline;">Nonviolent Communication</a> through embodied practice</strong></p>
-        </div>
-        """)
+    # Header
+    gr.Markdown("""
+    # NVC Deep Practice
+    **Learn Nonviolent Communication through guided practice**
 
-        # Show warning if API key not configured
-        if not API_KEY_CONFIGURED:
-            gr.HTML("""
-            <div style="background: #FEF3C7; border: 2px solid #F59E0B; border-radius: 12px; padding: 1rem 1.5rem; margin-bottom: 1.5rem;">
-                <p style="color: #92400E; margin: 0; font-weight: 500;">
-                    <strong>Setup Required:</strong> This Space needs an Anthropic API key to function.
-                    If you're the owner, go to Settings > Repository secrets > Add <code>ANTHROPIC_API_KEY</code>, then restart the Space.
-                </p>
-            </div>
-            """)
+    Share a message you want to communicate, and this guide will help you explore
+    your feelings, needs, and how to express yourself with clarity and compassion.
+    """)
 
-        gr.HTML("""
-        <div class="intro-text">
-            Write a raw message you want to send someone. This practice will guide you through
-            understanding your feelings, needs, and how to express them with clarity and compassion.
-        </div>
+    if not API_KEY_CONFIGURED:
+        gr.Markdown("""
+        > **Setup Required:** Add `ANTHROPIC_API_KEY` in Space Settings > Repository secrets, then restart.
         """)
 
-        with gr.Row():
-            # Main chat area
-            with gr.Column(scale=2):
-                chatbot = gr.Chatbot(
-                    label="Practice Session",
-                    height=500,
-                    show_label=True,
-                    elem_id="chatbot",
-                    bubble_full_width=False,
-                    type="messages"
-                )
-
-                # Needs selector (hidden until stage 5)
-                with gr.Accordion("Select Your Needs", open=False, visible=False) as needs_accordion:
-                    gr.Markdown("""
-                    **Select 1-3 needs that resonate most deeply.**
-                    Trust what arises - there's no wrong answer.
-                    """)
-
-                    with gr.Row():
-                        with gr.Column():
-                            emotional_needs = gr.CheckboxGroup(
-                                choices=NEEDS_LIST["Emotional Needs"],
-                                label="Emotional Needs (inner security, worth, safety)",
-                                interactive=True
-                            )
-                        with gr.Column():
-                            relational_needs = gr.CheckboxGroup(
-                                choices=NEEDS_LIST["Relational Needs"],
-                                label="Relational Needs (connection, mutuality)",
-                                interactive=True
-                            )
-
-                    with gr.Row():
-                        with gr.Column():
-                            value_needs = gr.CheckboxGroup(
-                                choices=NEEDS_LIST["Value Needs"],
-                                label="Value Needs (meaning, growth, contribution)",
-                                interactive=True
-                            )
-                        with gr.Column():
-                            lifestyle_needs = gr.CheckboxGroup(
-                                choices=NEEDS_LIST["Lifestyle Needs"],
-                                label="Lifestyle Needs (wellbeing, vitality)",
-                                interactive=True
-                            )
-
-                    selected_display = gr.Textbox(
-                        label="Your Selected Needs",
-                        interactive=False,
-                        placeholder="Selected needs will appear here..."
-                    )
-
-                    confirm_needs_btn = gr.Button("Confirm My Needs", variant="primary")
-
-                msg = gr.Textbox(
-                    label="Your Message",
-                    placeholder="What would you like to say? Share what's alive in you...",
-                    lines=3,
-                    show_label=False
-                )
+    with gr.Row():
+        with gr.Column(scale=2):
+            # Conversation display
+            conversation = gr.Markdown(
+                value="*Start by sharing a message you'd like to communicate more skillfully...*",
+                label="Conversation"
+            )
 
+            # Needs selector (collapsible)
+            with gr.Accordion("Select Your Needs (for Stage 5)", open=False):
+                gr.Markdown("**Select needs that resonate:**")
+                with gr.Row():
+                    needs1 = gr.CheckboxGroup(NEEDS_LIST["Emotional Needs"], label="Emotional")
+                    needs2 = gr.CheckboxGroup(NEEDS_LIST["Relational Needs"], label="Relational")
                 with gr.Row():
-                    submit_btn = gr.Button(
-                        "Continue Practice",
-                        variant="primary",
-                        elem_classes=["primary-button"],
-                        scale=2
-                    )
-                    reset_btn = gr.Button(
-                        "Start Fresh",
-                        elem_classes=["secondary-button"],
-                        scale=1
-                    )
-
-            # Sidebar
-            with gr.Column(scale=1):
-                gr.HTML("""
-                <div class="sidebar-section card-shadow">
-                    <h3>Practice Settings</h3>
-                </div>
-                """)
-
-                somatic_check = gr.Checkbox(
-                    label="Include body check-ins",
-                    value=True,
-                    info="Pause to notice body sensations",
-                    elem_classes=["checkbox-label"]
-                )
-
-                gr.HTML("""
-                <div class="sidebar-section card-shadow" style="margin-top: 1.5rem;">
-                    <h3>Current Focus</h3>
-                    <p style="color: #6B8070; font-size: 0.9rem; margin-bottom: 0.75rem;">
-                        Track your learning journey
-                    </p>
-                </div>
-                """)
-
-                focus_display = gr.Textbox(
-                    value="Emotional awareness",
-                    interactive=False,
-                    elem_classes=["focus-display"],
-                    show_label=False
-                )
-
-                stage_display = gr.Textbox(
-                    label="Stage",
-                    value="1/13: Raw Input",
-                    interactive=False
-                )
-
-                gr.HTML("""
-                <div class="sidebar-section card-shadow" style="margin-top: 1.5rem;">
-                    <h3>About This Practice</h3>
-                    <p style="color: #3D5932; font-size: 0.9rem; line-height: 1.6;">
-                        This practice uses AI to guide you through the NVC process with warmth
-                        and attunement. Each stage builds on the last, helping you discover
-                        what's truly alive in you and how to express it with clarity.
-                    </p>
-                </div>
-                """)
-
-        # Event handlers
-        def handle_submit(message, history, stage, session, somatic, sel_needs):
-            """Handle message submission"""
-            if not message.strip():
-                message = "continue"
-
-            if stage == 5 and not sel_needs:
-                bot_response = "Please take a moment to select your needs from the list above, then click 'Confirm My Needs' to continue."
-                history = history + [
-                    {"role": "user", "content": message},
-                    {"role": "assistant", "content": bot_response}
-                ]
-                return (
-                    history, "", stage, session, sel_needs,
-                    f"{stage}/13: {STAGE_NAMES[stage]}",
-                    STAGE_FOCUS[stage],
-                    gr.update(visible=True)
-                )
-
-            if stage == 5 and sel_needs:
-                session["needs"] = sel_needs
-                message = f"I've identified these needs: {', '.join(sel_needs)}"
-
-            response, next_stage, updated_session, error = process_stage(
-                message, stage, session, somatic
+                    needs3 = gr.CheckboxGroup(NEEDS_LIST["Value Needs"], label="Values")
+                    needs4 = gr.CheckboxGroup(NEEDS_LIST["Lifestyle Needs"], label="Lifestyle")
+                selected_needs = gr.Textbox(label="Selected Needs", interactive=False)
+
+            # Input
+            user_input = gr.Textbox(
+                label="Your Response",
+                placeholder="Type your message or click Continue...",
+                lines=3
             )
 
-            if error:
-                history = history + [
-                    {"role": "user", "content": message},
-                    {"role": "assistant", "content": error}
-                ]
-                return (
-                    history, "", stage, session, sel_needs,
-                    f"{stage}/13: {STAGE_NAMES[stage]}",
-                    STAGE_FOCUS[stage],
-                    gr.update(visible=(stage == 5))
-                )
-
-            if message != "continue":
-                history = history + [
-                    {"role": "user", "content": message},
-                    {"role": "assistant", "content": response}
-                ]
-            else:
-                history = history + [{"role": "assistant", "content": response}]
-
-            show_needs = (next_stage == 5)
-
-            if stage == 13:
-                next_stage = 1
-                updated_session = {}
-                sel_needs = []
-
-            return (
-                history,
-                "",
-                next_stage,
-                updated_session,
-                sel_needs,
-                f"{next_stage}/13: {STAGE_NAMES[next_stage]}",
-                STAGE_FOCUS[next_stage],
-                gr.update(visible=show_needs)
-            )
+            with gr.Row():
+                submit_btn = gr.Button("Continue", variant="primary")
+                reset_btn = gr.Button("Start Over")
 
-        def handle_reset():
-            """Reset the practice session"""
-            return (
-                [],
-                "",
-                1,
-                {},
-                [],
-                "1/13: Raw Input",
-                "Emotional awareness",
-                gr.update(visible=False),
-                [], [], [], []
-            )
+        with gr.Column(scale=1):
+            gr.Markdown("### Settings")
+            somatic_check = gr.Checkbox(label="Include body check-ins", value=True)
 
-        def update_selected_needs(emotional, relational, value, lifestyle):
-            """Update the selected needs display"""
-            all_selected = emotional + relational + value + lifestyle
-            return ", ".join(all_selected) if all_selected else "No needs selected yet"
-
-        def confirm_needs(emotional, relational, value, lifestyle, history, stage, session):
-            """Confirm selected needs and continue"""
-            all_selected = emotional + relational + value + lifestyle
-
-            if not all_selected:
-                return (
-                    all_selected,
-                    history + [{"role": "assistant", "content": "Please select at least one need before continuing."}],
-                    stage,
-                    session
-                )
-
-            session["needs"] = all_selected
-
-            response, next_stage, updated_session, error = process_stage(
-                f"I've identified these needs: {', '.join(all_selected)}",
-                stage,
-                session,
-                True
+            gr.Markdown("### Progress")
+            stage_display = gr.Textbox(
+                value="Stage 1/13: Share Your Message",
+                label="Current Stage",
+                interactive=False
             )
 
-            history = history + [
-                {"role": "user", "content": f"Selected needs: {', '.join(all_selected)}"},
-                {"role": "assistant", "content": response}
-            ]
-
-            return all_selected, history, next_stage, updated_session
-
-        # Wire up events
-        submit_btn.click(
-            fn=handle_submit,
-            inputs=[msg, chatbot, current_stage, session_data, somatic_check, selected_needs],
-            outputs=[
-                chatbot, msg, current_stage, session_data, selected_needs,
-                stage_display, focus_display, needs_accordion
-            ]
-        )
+            gr.Markdown("""
+            ### About NVC
+            Nonviolent Communication helps us:
+            - Express feelings honestly
+            - Identify universal needs
+            - Make clear requests
+            - Connect with compassion
 
-        msg.submit(
-            fn=handle_submit,
-            inputs=[msg, chatbot, current_stage, session_data, somatic_check, selected_needs],
-            outputs=[
-                chatbot, msg, current_stage, session_data, selected_needs,
-                stage_display, focus_display, needs_accordion
-            ]
-        )
+            [Learn more at CNVC.org](https://www.cnvc.org/)
+            """)
 
-        reset_btn.click(
-            fn=handle_reset,
-            outputs=[
-                chatbot, msg, current_stage, session_data, selected_needs,
-                stage_display, focus_display, needs_accordion,
-                emotional_needs, relational_needs, value_needs, lifestyle_needs
-            ]
+    # Update needs display
+    for cb in [needs1, needs2, needs3, needs4]:
+        cb.change(
+            update_needs_display,
+            [needs1, needs2, needs3, needs4],
+            selected_needs
         )
 
-        for checkbox in [emotional_needs, relational_needs, value_needs, lifestyle_needs]:
-            checkbox.change(
-                fn=update_selected_needs,
-                inputs=[emotional_needs, relational_needs, value_needs, lifestyle_needs],
-                outputs=[selected_display]
-            )
-
-        confirm_needs_btn.click(
-            fn=confirm_needs,
-            inputs=[emotional_needs, relational_needs, value_needs, lifestyle_needs, chatbot, current_stage, session_data],
-            outputs=[selected_needs, chatbot, current_stage, session_data]
-        ).then(
-            fn=lambda s: (f"{s}/13: {STAGE_NAMES[s]}", STAGE_FOCUS[s], gr.update(visible=False)),
-            inputs=[current_stage],
-            outputs=[stage_display, focus_display, needs_accordion]
-        )
+    # Submit handler
+    submit_btn.click(
+        process_message,
+        [user_input, history_state, stage_state, session_state, somatic_check, selected_needs],
+        [conversation, user_input, history_state, stage_state, session_state, stage_display]
+    )
 
-    return demo
+    user_input.submit(
+        process_message,
+        [user_input, history_state, stage_state, session_state, somatic_check, selected_needs],
+        [conversation, user_input, history_state, stage_state, session_state, stage_display]
+    )
 
-# ============ LAUNCH ============
+    # Reset handler
+    reset_btn.click(
+        reset_session,
+        [],
+        [conversation, user_input, history_state, stage_state, session_state, stage_display,
+         needs1, needs2, needs3, needs4]
+    )
 
 if __name__ == "__main__":
-    demo = create_app()
     demo.launch()