Upload folder using huggingface_hub

api/main.py

@@ -330,7 +330,7 @@ def court_new_session(request: NewSessionRequest):
     )
     
     # Registrar opens the session
-    from src.court.session import get_session, add_transcript_entry
+    from src.court.session import get_session, add_transcript_entry, update_session
     session = get_session(session_id)
     opening = build_round_announcement(session, 0, "briefing")
     add_transcript_entry(
@@ -341,6 +341,9 @@ def court_new_session(request: NewSessionRequest):
         entry_type="announcement",
     )
     
+    # Initialize: User is ready to submit briefing (opening argument)
+    update_session(session_id, {"awaiting_action": "user"})
+    
     return {
         "session_id": session_id,
         "case_brief": case_brief,
@@ -386,7 +389,7 @@ def court_import_session(request: ImportSessionRequest):
         case_brief=case_brief,
     )
     
-    from src.court.session import get_session
+    from src.court.session import get_session, add_transcript_entry, update_session
     session = get_session(session_id)
     opening = build_round_announcement(session, 0, "briefing")
     add_transcript_entry(
@@ -397,6 +400,9 @@ def court_import_session(request: ImportSessionRequest):
         entry_type="announcement",
     )
     
+    # Initialize: User is ready to submit briefing (opening argument)
+    update_session(session_id, {"awaiting_action": "user"})
+    
     return {
         "session_id": session_id,
         "case_brief": case_brief,

frontend/court/court.html

@@ -93,9 +93,9 @@
     </nav>
   </header>
 
-  <main class="relative z-10 pt-28 pb-12 px-8 grid grid-cols-12 gap-8 max-w-6xl mx-auto items-center min-h-screen">
+  <main class="relative z-10 pt-28 pb-12 px-8 flex justify-center items-center min-h-screen">
     <!-- Centre card -->
-    <div class="col-span-12 lg:col-span-7 flex justify-center items-center">
+    <div class="flex justify-center items-center">
       <div class="clay-card p-8 lg:p-10 rounded-xl w-full max-w-2xl text-center">
         <!-- Gavel icon -->
         <div class="mb-6 inline-flex items-center justify-center w-16 h-16 rounded-full bg-surface-container clay-puffy">
@@ -107,35 +107,14 @@
         <div class="flex flex-col sm:flex-row gap-4 justify-center mb-8">
           <button onclick="showScreen('setup')" class="clay-btn-primary flex items-center justify-center gap-2 px-6 py-3 rounded-lg font-sans font-bold text-sm text-white">
             <span class="material-symbols-outlined text-lg">scale</span>
-            New Case
-          </button>
-          <button onclick="showImportFlow()" class="clay-btn-secondary flex items-center justify-center gap-2 border-2 border-secondary/30 px-6 py-3 rounded-lg font-sans font-bold text-sm text-secondary">
-            <span class="material-symbols-outlined text-lg">folder_open</span>
-            Continue
+            Fight A Case
           </button>
         </div>
-        <a onclick="showScreen('sessions')" class="text-secondary font-sans font-bold text-sm hover:underline flex items-center justify-center gap-2 mb-6 cursor-pointer">
-          <span class="material-symbols-outlined text-sm">list_alt</span>
-          Past Sessions
-        </a>
         <div class="pt-4 border-t border-primary/5">
           <p class="text-primary/40 text-xs font-sans italic">For educational simulation only. Not legal advice.</p>
         </div>
       </div>
     </div>
-
-    <!-- Recent sessions sidebar -->
-    <div class="col-span-12 lg:col-span-5 flex flex-col gap-4">
-      <div class="flex items-center justify-between px-3">
-        <h3 class="font-serif text-lg font-bold text-primary">Recent Sessions</h3>
-        <span class="text-[10px] font-mono text-secondary bg-secondary-fixed/30 px-1.5 py-0.5 rounded">LIVE</span>
-      </div>
-      <div id="recent-sessions-list" class="space-y-3">
-        <div class="clay-card p-4 rounded-lg text-center text-primary/40 text-xs font-sans">
-          Loading...
-        </div>
-      </div>
-    </div>
   </main>
 
   <!-- Registrar clock -->

frontend/index_old_judicial.html

@@ -0,0 +1,296 @@
+<!DOCTYPE html>
+<html class="light" lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>NYAYA SETU — Legal Research Registry</title>
+  <script src="https://cdn.tailwindcss.com?plugins=forms,container-queries"></script>
+  <link href="https://fonts.googleapis.com/css2?family=Cormorant+Garamond:ital,wght@0,600;0,700;1,600;1,700&family=Plus+Jakarta+Sans:wght@400;500;600;700&family=Material+Symbols+Outlined:wght,FILL@100..700,0..1&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:wght,FILL@100..700,0..1&display=swap" rel="stylesheet">
+  <script id="tailwind-config">
+    tailwind.config = {
+      darkMode: "class",
+      theme: {
+        extend: {
+          colors: {
+            "on-secondary": "#ffffff",
+            "surface-container-high": "#ece8e0",
+            "surface-container": "#f2ede5",
+            "on-tertiary-fixed-variant": "#4e3e6f",
+            "tertiary": "#342554",
+            "secondary-container": "#fed174",
+            "primary-container": "#2c4a3e",
+            "outline": "#727974",
+            "on-tertiary-fixed": "#221141",
+            "surface-container-highest": "#e7e2da",
+            "secondary": "#795900",
+            "on-surface": "#1d1c17",
+            "secondary-fixed-dim": "#ecc165",
+            "on-tertiary": "#ffffff",
+            "error-container": "#ffdad6",
+            "on-error-container": "#93000a",
+            "surface-tint": "#466558",
+            "error": "#ba1a1a",
+            "surface-bright": "#fef9f1",
+            "on-tertiary-container": "#bba8e1",
+            "secondary-fixed": "#ffdfa0",
+            "inverse-on-surface": "#f5f0e8",
+            "primary": "#153328",
+            "outline-variant": "#c1c8c3",
+            "on-secondary-container": "#785800",
+            "on-secondary-fixed": "#261a00",
+            "on-primary-fixed": "#012016",
+            "surface-variant": "#e7e2da",
+            "on-surface-variant": "#414845",
+            "on-primary-container": "#98b9a9",
+            "tertiary-container": "#4b3b6c",
+            "on-background": "#1d1c17",
+            "inverse-surface": "#32302b",
+            "surface-container-lowest": "#ffffff",
+            "background": "#fef9f1",
+            "tertiary-fixed-dim": "#d1bdf7",
+            "on-primary": "#ffffff",
+            "on-error": "#ffffff",
+            "surface-dim": "#ded9d2",
+            "on-secondary-fixed-variant": "#5c4300",
+            "inverse-primary": "#adcebe",
+            "tertiary-fixed": "#eaddff",
+            "surface": "#fef9f1",
+            "on-primary-fixed-variant": "#2f4d41",
+            "surface-container-low": "#f8f3eb",
+            "primary-fixed": "#c8eada",
+            "primary-fixed-dim": "#adcebe"
+          },
+          borderRadius: {
+            DEFAULT: "1rem",
+            lg: "2rem",
+            xl: "3rem",
+            full: "9999px"
+          },
+          fontFamily: {
+            headline: ["Cormorant Garamond", "serif"],
+            body: ["Plus Jakarta Sans", "sans-serif"],
+            label: ["Cormorant Garamond", "serif"]
+          }
+        }
+      }
+    }
+  </script>
+  <style>
+    .clay-card {
+      background: #ffffff;
+      box-shadow: 8px 8px 16px rgba(0, 0, 0, 0.08), inset 2px 2px 4px rgba(255, 255, 255, 0.8);
+      border-radius: 24px;
+    }
+    .clay-inset {
+      background: #f0ebe2;
+      box-shadow: inset 4px 4px 8px rgba(0, 0, 0, 0.06), inset -4px -4px 8px rgba(255, 255, 255, 0.9);
+      border-radius: 20px;
+    }
+    .clay-button-primary {
+      background: #2c4a3e;
+      box-shadow: 0 10px 20px -5px rgba(44, 74, 62, 0.4), inset 2px 2px 4px rgba(255, 255, 255, 0.3);
+      transition: all 0.2s ease;
+      cursor: pointer;
+    }
+    .clay-button-primary:hover {
+      transform: translateY(-2px);
+      box-shadow: 0 12px 24px -5px rgba(44, 74, 62, 0.5), inset 2px 2px 4px rgba(255, 255, 255, 0.3);
+    }
+    .clay-button-primary:active {
+      transform: scale(0.98);
+      box-shadow: inset 4px 4px 8px rgba(0, 0, 0, 0.3);
+    }
+    .material-symbols-outlined {
+      font-variation-settings: 'FILL' 0, 'wght' 400, 'GRAD' 0, 'opsz' 24;
+    }
+    .custom-scrollbar::-webkit-scrollbar {
+      width: 4px;
+    }
+    .custom-scrollbar::-webkit-scrollbar-track {
+      background: transparent;
+    }
+    .custom-scrollbar::-webkit-scrollbar-thumb {
+      background: #dcd7ce;
+      border-radius: 10px;
+    }
+  </style>
+</head>
+<body class="bg-[#F5F0E8] text-on-surface font-body h-screen flex overflow-hidden">
+<div class="app-container">
+  
+  <!-- SIDEBAR - JUDICIAL PANEL -->
+  <aside class="sidebar" id="sidebar">
+    <!-- Header with Judicial Seal -->
+    <div class="sidebar-header">
+      <div class="judicial-seal">
+        <svg viewBox="0 0 100 100" class="seal-svg">
+          <circle cx="50" cy="50" r="48" fill="none" stroke="currentColor" stroke-width="2"/>
+          <circle cx="50" cy="50" r="42" fill="none" stroke="currentColor" stroke-width="1" opacity="0.5"/>
+          <!-- Scale/Balance symbol -->
+          <path d="M50 20 L35 45 L65 45 Z" fill="none" stroke="currentColor" stroke-width="1.5"/>
+          <line x1="35" y1="45" x2="65" y2="45" stroke="currentColor" stroke-width="2"/>
+          <circle cx="35" cy="55" r="3" fill="currentColor"/>
+          <circle cx="65" cy="55" r="3" fill="currentColor"/>
+          <text x="50" y="75" font-size="8" text-anchor="middle" font-weight="bold" letter-spacing="1">NYAYASETU</text>
+        </svg>
+      </div>
+      <div class="brand-text">
+        <div class="brand-name">NYAYA SETU</div>
+        <div class="brand-sub">Legal Research Registry</div>
+      </div>
+      <button class="sidebar-toggle" onclick="toggleSidebar()">≡</button>
+    </div>
+
+    <!-- Primary Actions -->
+    <div class="action-group">
+      <button class="btn-primary" onclick="newChat()">⊕ New Petition</button>
+      <button class="btn-secondary" onclick="showAnalytics()">📋 Case Analytics</button>
+      <button class="btn-secondary" onclick="window.location.href='/court/ui'">⚔ Moot Court</button>
+    </div>
+
+    <!-- Case Registry -->
+    <div class="registry-section">
+      <div class="registry-header">
+        <span class="registry-title">CASE REGISTRY</span>
+        <div class="registry-divider"></div>
+      </div>
+      <div class="sessions-list" id="sessions-list">
+        <div class="sessions-empty">No active cases</div>
+      </div>
+    </div>
+
+    <!-- Sidebar Footer - Court Info -->
+    <div class="sidebar-footer">
+      <div class="court-info">
+        <p class="disclaimer">⚠ DISCLAIMER</p>
+        <p class="disclaimer-text">Not legal advice. Consult qualified advocate.</p>
+      </div>
+      <div class="court-meta">
+        <p class="meta-text">Supreme Court of India</p>
+        <p class="meta-text">Established 1950</p>
+      </div>
+    </div>
+  </aside>
+
+  <!-- MAIN CONTENT AREA -->
+  <main class="main-content">
+    <!-- Header/Bench -->
+    <header class="topbar">
+      <div class="topbar-left">
+        <h1 class="topbar-title" id="topbar-title">Research Session</h1>
+        <p class="topbar-subtitle" id="topbar-subtitle">Indian Legal Research System</p>
+      </div>
+      <div class="status-indicator" id="status-pill">
+        <span class="status-dot"></span>
+        <span id="status-text">Ready</span>
+      </div>
+    </header>
+
+    <!-- Welcome/Research Section -->
+    <section id="screen-welcome" class="screen active">
+      <div class="welcome-container">
+        <div class="welcome-graphic">
+          <svg viewBox="0 0 200 200" class="welcome-icon">
+            <!-- Judge's Bench -->
+            <rect x="20" y="120" width="160" height="40" fill="none" stroke="currentColor" stroke-width="2" rx="2"/>
+            <!-- Gavel -->
+            <rect x="85" y="30" width="30" height="50" fill="none" stroke="currentColor" stroke-width="2"/>
+            <circle cx="100" cy="20" r="12" fill="currentColor" opacity="0.3"/>
+            <!-- Scales -->
+            <line x1="50" y1="80" x2="50" y2="120" stroke="currentColor" stroke-width="2"/>
+            <line x1="35" y1="100" x2="65" y2="100" stroke="currentColor" stroke-width="2"/>
+            <circle cx="35" cy="105" r="6" fill="none" stroke="currentColor" stroke-width="1.5"/>
+            <circle cx="65" cy="105" r="6" fill="none" stroke="currentColor" stroke-width="1.5"/>
+            <!-- Books -->
+            <rect x="130" y="70" width="15" height="35" fill="currentColor" opacity="0.2" stroke="currentColor" stroke-width="1.5"/>
+            <rect x="148" y="65" width="15" height="40" fill="currentColor" opacity="0.2" stroke="currentColor" stroke-width="1.5"/>
+          </svg>
+        </div>
+        <h2>Indian Legal Research</h2>
+        <p class="welcome-subtitle">Query 26,688 Supreme Court Judgments<br><span class="text-muted">Cited sources | Verified citations | Complete legal brief</span></p>
+        
+        <div class="suggestions">
+          <div class="suggestion-label">Sample Petitions:</div>
+          <button class="suggestion" onclick="usesuggestion(this)">Fundamental Rights — Definition & Scope</button>
+          <button class="suggestion" onclick="usesuggestion(this)">Right to Privacy under Article 21</button>
+          <button class="suggestion" onclick="usesuggestion(this)">Bail — Legal Framework & Supreme Court Tests</button>
+          <button class="suggestion" onclick="usesuggestion(this)">Basic Structure Doctrine — Implications</button>
+          <button class="suggestion" onclick="usesuggestion(this)">Article 15 — Non-discrimination Doctrine</button>
+          <button class="suggestion" onclick="usesuggestion(this)">Freedom of Speech — Reasonable Restrictions</button>
+        </div>
+      </div>
+    </section>
+
+    <!-- Chat/Case Proceedings Section -->
+    <section id="screen-chat" class="screen">
+      <div class="chat-area">
+        <div class="proceedings" id="messages-list"></div>
+      </div>
+      <div class="input-bench">
+        <textarea id="query-input" placeholder="Address the court... (Enter to submit, Shift+Enter for new line)" class="query-input"></textarea>
+        <button id="send-btn" class="btn-submit" onclick="submitQuery()">📤 Submit Petition</button>
+      </div>
+    </section>
+
+    <!-- Analytics Dashboard -->
+    <section id="screen-analytics" class="screen">
+      <div class="analytics-container">
+        <div class="analytics-header">
+          <h2>Case Analytics & System Metrics</h2>
+          <p>Live inference data from NyayaSetu research engine</p>
+        </div>
+        <div class="stats-grid">
+          <div class="stat-card">
+            <div class="stat-icon">📊</div>
+            <div class="stat-value" id="stat-total">—</div>
+            <div class="stat-label">Total Queries</div>
+          </div>
+          <div class="stat-card">
+            <div class="stat-icon">✓</div>
+            <div class="stat-value" id="stat-verified">—</div>
+            <div class="stat-label">Verified Answers</div>
+          </div>
+          <div class="stat-card">
+            <div class="stat-icon">⚡</div>
+            <div class="stat-value" id="stat-latency">—</div>
+            <div class="stat-label">Avg Latency</div>
+          </div>
+          <div class="stat-card">
+            <div class="stat-icon">🔍</div>
+            <div class="stat-value" id="stat-ood">—</div>
+            <div class="stat-label">Out-of-Domain</div>
+          </div>
+          <div class="stat-card">
+            <div class="stat-icon">📚</div>
+            <div class="stat-value" id="stat-sources">—</div>
+            <div class="stat-label">Avg Sources Used</div>
+          </div>
+        </div>
+      </div>
+    </section>
+  </main>
+</div>
+
+<script src="/static/app.js"></script>
+</body>
+</html>
+          </div>
+        </div>
+      </div>
+    </section>
+
+    <!-- INPUT AREA -->
+    <div class="input-area">
+      <div class="input-wrapper">
+        <textarea id="query-input" class="query-input" placeholder="Ask about Indian law..." maxlength="1000"></textarea>
+        <button id="send-btn" class="send-btn" onclick="submitQuery()">→</button>
+      </div>
+      <p class="disclaimer-line">Not a substitute for professional legal advice</p>
+    </div>
+  </main>
+</div>
+
+<script src="/static/app.js"></script>
+</body>
+</html>

src/court/orchestrator.py

@@ -197,6 +197,10 @@ def process_user_argument(
     
     phase = session["phase"]
     
+    # Validate user is allowed to submit
+    if phase not in ["briefing", "rounds", "cross_examination", "closing"]:
+        return {"error": f"Session is in {phase} phase. Cannot accept submissions."}
+    
     # Route to appropriate handler
     try:
         if phase == "briefing":
@@ -319,6 +323,9 @@ def _handle_briefing(session_id: str, user_argument: str, session: Dict) -> Dict
             user_fell_in=False,
         )
     
+    # UPDATE: After briefing, user is now in Round 1 and should submit their argument
+    update_session(session_id, {"awaiting_action": "user"})
+    
     return {
         "opposing_response": opposing_response,
         "judge_question": judge_question,
@@ -340,6 +347,11 @@ def _handle_round(session_id: str, user_argument: str, session: Dict) -> Dict:
     user_side = session["user_side"]
     user_label = "PETITIONER'S COUNSEL" if user_side == "petitioner" else "RESPONDENT'S COUNSEL"
     
+    # TURN VALIDATION: Only user should be able to submit arguments in "rounds" phase
+    awaiting = session.get("awaiting_action", "user")
+    if awaiting != "user":
+        return {"error": f"It is currently waiting for {awaiting}'s submission. You cannot speak now."}
+    
     # Add user argument to transcript
     add_transcript_entry(
         session_id=session_id,
@@ -439,10 +451,17 @@ def _handle_round(session_id: str, user_argument: str, session: Dict) -> Dict:
     # Registrar announcement
     if new_phase == "cross_examination":
         registrar_note = build_round_announcement(session, new_round, "cross_examination")
+        # First cross-exam question will be generated, user will answer it
+        next_awaiting = "user"  
     elif new_round <= max_rounds:
         registrar_note = build_round_announcement(session, new_round, "rounds")
+        next_awaiting = "user"  # User gets to submit next round argument
     else:
         registrar_note = build_round_announcement(session, new_round, "closing")
+        next_awaiting = "user"  # User gives closing arguments
+    
+    # UPDATE: Mark that awaiting_action should be set AFTER round advances
+    update_session(session_id, {"awaiting_action": next_awaiting})
     
     add_transcript_entry(
         session_id=session_id,
@@ -452,6 +471,36 @@ def _handle_round(session_id: str, user_argument: str, session: Dict) -> Dict:
         entry_type="announcement",
     )
     
+    # If transitioning to cross-examination, generate the first cross-exam question now
+    if new_phase == "cross_examination":
+        fresh_session = get_session(session_id)
+        
+        # Retrieve precedents for cross-exam context
+        combined_context = _build_full_context(fresh_session)
+        
+        cross_exam_messages = build_cross_examination_prompt(
+            session=fresh_session,
+            question_number=1,
+            retrieved_context=combined_context,
+        )
+        try:
+            first_cross_question = _call_llm(cross_exam_messages)
+        except Exception as e:
+            logger.error(f"Cross-exam question generation failed: {e}")
+            first_cross_question = (
+                "Counsel, in your submitted brief, you stated that [key assertion]. "
+                "Can you elaborate on the legal precedent supporting this position?"
+            )
+        
+        add_transcript_entry(
+            session_id=session_id,
+            speaker="OPPOSING_COUNSEL",
+            role_label="RESPONDENT'S COUNSEL" if session["user_side"] == "petitioner" else "PETITIONER'S COUNSEL",
+            content=first_cross_question,
+            entry_type="cross_exam_question",
+            metadata={"question_number": 1},
+        )
+    
     # Detect concessions
     new_concessions = _detect_concessions(user_argument, session_id, current_round)
     
@@ -478,12 +527,18 @@ def _handle_cross_exam_answer(
     user_side = session["user_side"]
     user_label = "PETITIONER'S COUNSEL" if user_side == "petitioner" else "RESPONDENT'S COUNSEL"
     
-    # Count how many cross-exam questions have been asked
-    cross_entries = [
+    # TURN VALIDATION: Only user should answer during cross-exam
+    awaiting = session.get("awaiting_action", "user")
+    if awaiting != "user":
+        return {"error": f"Cannot submit answer now. Awaiting {awaiting}'s action."}
+    
+    # Count how many QUESTIONS have been asked by opposing counsel
+    all_questions = [
         e for e in session.get("transcript", [])
-        if e.get("phase") == "cross_examination"
+        if e.get("speaker") == "OPPOSING_COUNSEL" and e.get("entry_type") in ["cross_exam_question", "question", "answer_request"]
     ]
-    question_number = len([e for e in cross_entries if e.get("speaker") == "OPPOSING_COUNSEL"]) + 1
+    current_question_number = len(all_questions)  # This is the question the user is answering
+    next_question_number = current_question_number + 1  # This will be the next question if there is one
     
     # Add user's answer
     add_transcript_entry(
@@ -497,8 +552,8 @@ def _handle_cross_exam_answer(
     # Detect concessions in answer
     new_concessions = _detect_concessions(user_answer, session_id, session["current_round"])
     
-    # If more questions remaining (max 3), get next question
-    if question_number < 3:
+    # If more questions remaining (max 3 total), get next question
+    if next_question_number <= 3:
         query = " ".join(session.get("legal_issues", []))
         retrieved_precedents = _retrieve_for_court(query, session)
         
@@ -508,27 +563,30 @@ def _handle_cross_exam_answer(
         
         cross_messages = build_cross_examination_prompt(
             session=fresh_session,
-            question_number=question_number + 1,
+            question_number=next_question_number,
             retrieved_context=combined_context,
         )
         
         try:
             next_question = _call_llm(cross_messages)
         except Exception as e:
-            next_question = f"Question {question_number + 1}: Counsel, would you agree that [question]?"
+            next_question = f"Question {next_question_number}: Counsel, would you agree that [question]?"
         
         add_transcript_entry(
             session_id=session_id,
             speaker="OPPOSING_COUNSEL",
             role_label="RESPONDENT'S COUNSEL" if user_side == "petitioner" else "PETITIONER'S COUNSEL",
             content=next_question,
-            entry_type="question",
+            entry_type="cross_exam_question",
         )
         
+        # UPDATE awaiting_action: Waiting for answer to next question
+        update_session(session_id, {"awaiting_action": "user"})
+        
         return {
             "opposing_response": next_question,
             "judge_question": "",
-            "registrar_note": f"Question {question_number + 1} of 3.",
+            "registrar_note": f"Question {next_question_number} of 3.",
             "trap_detected": False,
             "trap_warning": "",
             "new_concessions": new_concessions,
@@ -541,7 +599,8 @@ def _handle_cross_exam_answer(
     else:
         # Cross-examination complete — advance to closing
         advance_phase(session_id)
-        registrar_note = build_round_announcement(session, session["current_round"], "closing")
+        fresh_session = get_session(session_id)
+        registrar_note = build_round_announcement(fresh_session, fresh_session["current_round"], "closing")
         
         add_transcript_entry(
             session_id=session_id,
@@ -551,6 +610,30 @@ def _handle_cross_exam_answer(
             entry_type="announcement",
         )
         
+        # If user is RESPONDENT, opposing (PETITIONER) closes first → user rebuts
+        # If user is PETITIONER, user closes first → opposing rebuts
+        if session["user_side"] == "respondent":
+            # Generate petitioner's closing first
+            closing_messages = build_opposing_closing_prompt(fresh_session)
+            try:
+                opposing_closing = _call_llm(closing_messages)
+            except Exception as e:
+                opposing_closing = (
+                    "My Lords, the arguments advanced by Respondent's Counsel are fundamentally flawed. "
+                    "For the reasons submitted, we pray for relief in the Petition."
+                )
+            
+            add_transcript_entry(
+                session_id=session_id,
+                speaker="OPPOSING_COUNSEL",
+                role_label="PETITIONER'S COUNSEL",
+                content=opposing_closing,
+                entry_type="closing_argument",
+            )
+        
+        # UPDATE awaiting_action: User gets to submit their closing
+        update_session(session_id, {"awaiting_action": "user"})
+        
         return {
             "opposing_response": "",
             "judge_question": "",
@@ -558,7 +641,7 @@ def _handle_cross_exam_answer(
             "trap_detected": False,
             "trap_warning": "",
             "new_concessions": new_concessions,
-            "round_number": session["current_round"],
+            "round_number": fresh_session["current_round"],
             "phase": "closing",
             "cross_exam_complete": True,
             "session_ended": False,
@@ -566,11 +649,27 @@ def _handle_cross_exam_answer(
 
 
 def _handle_closing(session_id: str, user_closing: str, session: Dict) -> Dict:
-    """Handle closing arguments from both sides, then generate analysis."""
+    """Handle closing arguments from both sides, then generate analysis.
+    
+    In proper moot court procedure:
+    - Petitioner's counsel gives closing first
+    - Respondent's counsel gives rebuttal closing
+    - Petitioner does NOT get final rebuttal
+    
+    This handler manages both sides appropriately based on user_side.
+    """
     
     user_side = session["user_side"]
     user_label = "PETITIONER'S COUNSEL" if user_side == "petitioner" else "RESPONDENT'S COUNSEL"
     
+    # Check if this is first or second closing
+    closing_count = len([e for e in session.get("transcript", []) if e.get("entry_type") == "closing_argument"])
+    
+    # TURN VALIDATION
+    awaiting = session.get("awaiting_action", "user")
+    if awaiting != "user":
+        return {"error": f"Cannot submit closing now. It is {awaiting}'s turn."}
+    
     # Add user's closing
     add_transcript_entry(
         session_id=session_id,
@@ -582,33 +681,68 @@ def _handle_closing(session_id: str, user_closing: str, session: Dict) -> Dict:
     
     fresh_session = get_session(session_id)
     
-    # Opposing counsel's closing
-    closing_messages = build_opposing_closing_prompt(fresh_session)
-    try:
-        opposing_closing = _call_llm(closing_messages)
-    except Exception as e:
-        opposing_closing = (
-            "My Lords, for the reasons submitted throughout these proceedings, "
-            "we respectfully submit that the petition deserves to be dismissed."
+    # If user is petitioner (first closing), get opposing rebuttal
+    # If user is respondent, we're done and can finalize
+    if user_side == "petitioner":
+        # Get respondent's rebuttal closing
+        closing_messages = build_opposing_closing_prompt(fresh_session)
+        try:
+            opposing_closing = _call_llm(closing_messages)
+        except Exception as e:
+            opposing_closing = (
+                "My Lords, with respect, the submissions of the Petitioner's Counsel "
+                "are fundamentally flawed. For the reasons we have advanced, the petition should be dismissed."
+            )
+        
+        add_transcript_entry(
+            session_id=session_id,
+            speaker="OPPOSING_COUNSEL",
+            role_label="RESPONDENT'S COUNSEL",
+            content=opposing_closing,
+            entry_type="closing_argument",
         )
+        
+        # Mark that session is ending
+        update_session(session_id, {"awaiting_action": "judge"})
+        
+        intermediate_return = {
+            "opposing_response": opposing_closing,
+            "judge_question": "",
+            "registrar_note": "Respondent's counsel has concluded. The matter is now with the Court.",
+            "trap_detected": False,
+            "trap_warning": "",
+            "new_concessions": [],
+            "round_number": session["current_round"],
+            "phase": "closing",
+            "closing_step": "second_closing_done",
+            "ready_for_analysis": False,
+            "session_ended": False,
+        }
+    else:
+        # User is respondent and just gave rebuttal — session is complete
+        update_session(session_id, {"awaiting_action": "judge"})
+        intermediate_return = {
+            "opposing_response": "",
+            "judge_question": "",
+            "registrar_note": "Respondent's counsel has concluded. The matter is now with the Court.",
+            "trap_detected": False,
+            "trap_warning": "",
+            "new_concessions": [],
+            "round_number": session["current_round"],
+            "phase": "closing",
+            "closing_step": "respondent_closing_done",
+            "ready_for_analysis": True,
+            "session_ended": False,
+        }
     
-    add_transcript_entry(
-        session_id=session_id,
-        speaker="OPPOSING_COUNSEL",
-        role_label="RESPONDENT'S COUNSEL" if user_side == "petitioner" else "PETITIONER'S COUNSEL",
-        content=opposing_closing,
-        entry_type="closing_argument",
-    )
-    
-    # Judge's final observations
+    # Get judge's final observations
     fresh_session = get_session(session_id)
     judge_closing_messages = build_judge_closing_prompt(fresh_session)
     try:
         judge_final = _call_llm(judge_closing_messages)
     except Exception as e:
         judge_final = (
-            "The court has heard submissions from both sides. "
-            "The matter is reserved for orders."
+            "The court has heard submissions from both sides. The judgment is reserved."
         )
     
     add_transcript_entry(
@@ -632,7 +766,7 @@ def _handle_closing(session_id: str, user_closing: str, session: Dict) -> Dict:
     advance_phase(session_id)
     
     return {
-        "opposing_response": opposing_closing,
+        "opposing_response": intermediate_return["opposing_response"],
         "judge_question": judge_final,
         "registrar_note": registrar_final,
         "trap_detected": False,
@@ -687,11 +821,16 @@ def process_objection(
     objection_type: str,
     objection_text: str,
 ) -> Dict:
-    """Handle a user-raised objection."""
+    """Handle a user-raised objection. Pauses round and requests judge ruling."""
     session = get_session(session_id)
     if not session:
         return {"error": "Session not found"}
     
+    # Objection pauses the round — mark round as "objection_pending"
+    phase = session.get("phase", "rounds")
+    if phase not in ["rounds", "cross_examination"]:
+        return {"error": "Cannot raise objection in current phase"}
+    
     # Get what the objection is about from last transcript entry
     transcript = session.get("transcript", [])
     last_entry = transcript[-1] if transcript else {}
@@ -722,9 +861,14 @@ def process_objection(
     
     sustained = "sustained" in ruling.lower()
     
+    # After ruling, resume normal flow — mark awaiting_action as "user" to continue
+    update_session(session_id, {"awaiting_action": "user"})
+    
     return {
         "ruling": ruling,
         "sustained": sustained,
+        "objection_resolved": True,
+        "can_continue": True,
     }