Update app.py

app.py

@@ -1,4 +1,4 @@
-# app.py (Refactored & Consolidated - Checked Indentation)
+# app.py (Refactored & Consolidated - Indentation Fixes Applied)
 import streamlit as st
 import asyncio
 import websockets
@@ -22,9 +22,9 @@ import threading
 import json
 import zipfile
 from dotenv import load_dotenv
-from streamlit_marquee import streamlit_marquee
+from streamlit_marquee import streamlit_marquee # Keep import if used
 from collections import defaultdict, Counter
-import pandas as pd # Still used for fallback CSV load? Keep for now.
+import pandas as pd # Keep for potential fallback logic if needed
 from streamlit_js_eval import streamlit_js_eval
 from PIL import Image # Needed for paste_image_component
 
@@ -115,14 +115,10 @@ def clean_filename_part(text, max_len=30):
 
 def run_async(async_func, *args, **kwargs):
     """Runs an async function safely from a sync context using create_task."""
-    # This helper attempts to schedule the async function as a background task
-    # without blocking the main Streamlit thread.
     try:
         loop = asyncio.get_running_loop()
         return loop.create_task(async_func(*args, **kwargs))
     except RuntimeError: # No running loop in this thread
-        # Fallback: Run in a new loop (might block slightly, less ideal for UI responsiveness)
-        # Consider if truly background execution is needed (e.g., ThreadPoolExecutor)
         print(f"Warning: Running async func {async_func.__name__} in new event loop.")
         try:
             return asyncio.run(async_func(*args, **kwargs))
@@ -157,27 +153,21 @@ def parse_world_filename(filename):
     basename = os.path.basename(filename)
     # Check prefix and suffix
     if basename.startswith(WORLD_STATE_FILE_MD_PREFIX) and basename.endswith(".md"):
-        # Remove prefix and suffix before splitting
         core_name = basename[len(WORLD_STATE_FILE_MD_PREFIX):-3]
         parts = core_name.split('_')
         if len(parts) >= 3: # Expecting Name_Timestamp_Hash
             timestamp_str = parts[-2]
-            # Combine parts before timestamp and hash for the name
-            name_parts = parts[:-2]
-            name = "_".join(name_parts) if name_parts else "Untitled" # Handle empty name parts
+            name_parts = parts[:-2]; name = "_".join(name_parts) if name_parts else "Untitled"
             dt_obj = None
             try: # Try parsing timestamp
                 dt_obj = datetime.strptime(timestamp_str, '%Y%m%d_%H%M%S')
                 dt_obj = pytz.utc.localize(dt_obj) # Assume UTC
-            except (ValueError, pytz.exceptions.AmbiguousTimeError, pytz.exceptions.NonExistentTimeError):
-                dt_obj = None # Parsing failed
+            except (ValueError, pytz.exceptions.AmbiguousTimeError, pytz.exceptions.NonExistentTimeError): dt_obj = None
             return {"name": name.replace('_', ' '), "timestamp": timestamp_str, "dt": dt_obj, "filename": filename}
 
     # Fallback for unknown format
     dt_fallback = None
-    try:
-         mtime = os.path.getmtime(filename)
-         dt_fallback = datetime.fromtimestamp(mtime, tz=pytz.utc)
+    try: mtime = os.path.getmtime(filename); dt_fallback = datetime.fromtimestamp(mtime, tz=pytz.utc)
     except Exception: pass
     return {"name": basename.replace('.md',''), "timestamp": "Unknown", "dt": dt_fallback, "filename": filename}
 
@@ -189,10 +179,8 @@ def save_world_state_to_md(target_filename_base):
     print(f"Acquiring lock to save world state to: {save_path}...")
     success = False
     with world_objects_lock:
-        # Create a deep copy for saving if needed, dict() might be shallow
         world_data_dict = dict(world_objects) # Convert defaultdict for saving
         print(f"Saving {len(world_data_dict)} objects...")
-        # Use the target filename to generate header info
         parsed_info = parse_world_filename(save_path) # Parse the full path/intended name
         timestamp_save = get_current_time_str()
         md_content = f"""# World State: {parsed_info['name']}
@@ -210,7 +198,6 @@ def save_world_state_to_md(target_filename_base):
             success = True
         except Exception as e:
             print(f"Error saving world state to {save_path}: {e}")
-            # Avoid st.error in potentially non-main thread
     return success
 
 
@@ -219,14 +206,11 @@ def load_world_state_from_md(filename_base):
     global world_objects
     load_path = os.path.join(SAVED_WORLDS_DIR, filename_base)
     print(f"Loading world state from MD file: {load_path}...")
-    if not os.path.exists(load_path):
-        st.error(f"World file not found: {filename_base}")
-        return False
+    if not os.path.exists(load_path): st.error(f"World file not found: {filename_base}"); return False
 
     try:
         with open(load_path, 'r', encoding='utf-8') as f: content = f.read()
-        # More robust JSON extraction
-        json_match = re.search(r"```json\s*(\{[\s\S]*?\})\s*```", content, re.IGNORECASE)
+        json_match = re.search(r"```json\s*(\{[\s\S]*?\})\s*```", content, re.IGNORECASE) # More robust regex
         if not json_match: st.error(f"Could not find valid JSON block in {filename_base}"); return False
 
         world_data_dict = json.loads(json_match.group(1))
@@ -247,16 +231,12 @@ def get_saved_worlds():
     """Scans the saved worlds directory for world MD files and parses them."""
     try:
         ensure_dir(SAVED_WORLDS_DIR)
-        # Use the prefix in the glob pattern
         world_files = glob.glob(os.path.join(SAVED_WORLDS_DIR, f"{WORLD_STATE_FILE_MD_PREFIX}*.md"))
         parsed_worlds = [parse_world_filename(f) for f in world_files]
-        # Sort by datetime object (newest first), handle None dt values
         parsed_worlds.sort(key=lambda x: x['dt'] if x['dt'] else datetime.min.replace(tzinfo=pytz.utc), reverse=True)
         return parsed_worlds
     except Exception as e:
-         print(f"Error scanning saved worlds: {e}")
-         st.error(f"Could not scan saved worlds: {e}")
-         return []
+         print(f"Error scanning saved worlds: {e}"); st.error(f"Could not scan saved worlds: {e}"); return []
 
 # ==============================================================================
 # User State & Session Init
@@ -305,76 +285,61 @@ def init_session_state():
 # --- Text & File Helpers ---
 def clean_text_for_tts(text):
     if not isinstance(text, str): return "No text"
-    text = re.sub(r'\[([^\]]+)\]\([^\)]+\)', r'\1', text)
-    text = re.sub(r'[#*_`!]', '', text)
-    text = ' '.join(text.split())
-    return text[:250] or "No text"
+    text = re.sub(r'\[([^\]]+)\]\([^\)]+\)', r'\1', text); text = re.sub(r'[#*_`!]', '', text)
+    text = ' '.join(text.split()); return text[:250] or "No text"
 
 def create_file(content, username, file_type="md", save_path=None):
-    if not save_path:
-         filename = generate_filename(content, username, file_type)
-         save_path = os.path.join(MEDIA_DIR, filename)
+    if not save_path: filename = generate_filename(content, username, file_type); save_path = os.path.join(MEDIA_DIR, filename)
     ensure_dir(os.path.dirname(save_path))
     try:
         with open(save_path, 'w', encoding='utf-8') as f: f.write(content)
-        print(f"Created file: {save_path}"); return save_path
+        # print(f"Created file: {save_path}"); # Can be too verbose
+        return save_path
     except Exception as e: print(f"Error creating file {save_path}: {e}"); return None
 
 def get_download_link(file_path, file_type="md"):
-    """Generates a base64 download link for a given file."""
-    if not file_path or not os.path.exists(file_path):
-         basename = os.path.basename(file_path) if file_path else "N/A"
-         return f"<small>Not found: {basename}</small>"
+    if not file_path or not os.path.exists(file_path): basename = os.path.basename(file_path) if file_path else "N/A"; return f"<small>Not found: {basename}</small>"
     try: mtime = os.path.getmtime(file_path)
     except OSError: mtime = 0
-    cache_key = f"dl_{file_path}_{mtime}"
+    cache_key = f"dl_{file_path}_{mtime}";
     if 'download_link_cache' not in st.session_state: st.session_state.download_link_cache = {}
     if cache_key not in st.session_state.download_link_cache:
         try:
             with open(file_path, "rb") as f: b64 = base64.b64encode(f.read()).decode()
             mime_types = {"md": "text/markdown", "mp3": "audio/mpeg", "png": "image/png", "mp4": "video/mp4", "zip": "application/zip", "json": "application/json"}
             basename = os.path.basename(file_path)
-            # Changed emoji and text for clarity
             link_html = f'<a href="data:{mime_types.get(file_type, "application/octet-stream")};base64,{b64}" download="{basename}" title="Download {basename}">{FILE_EMOJIS.get(file_type, "📄")}</a>'
             st.session_state.download_link_cache[cache_key] = link_html
-        except Exception as e:
-             print(f"Error generating DL link for {file_path}: {e}")
-             return f"<small>Err</small>"
+        except Exception as e: print(f"Error generating DL link for {file_path}: {e}"); return f"<small>Err</small>"
     return st.session_state.download_link_cache.get(cache_key, "<small>CacheErr</small>")
 
 # --- Audio / TTS ---
 async def async_edge_tts_generate(text, voice, username):
-    """Generates TTS audio using EdgeTTS and caches the result."""
     if not text: return None
-    cache_key = hashlib.md5(f"{text[:150]}_{voice}".encode()).hexdigest()
+    cache_key = hashlib.md5(f"{text[:150]}_{voice}".encode()).hexdigest();
     if 'audio_cache' not in st.session_state: st.session_state.audio_cache = {}
-    cached_path = st.session_state.audio_cache.get(cache_key)
+    cached_path = st.session_state.audio_cache.get(cache_key);
     if cached_path and os.path.exists(cached_path): return cached_path
-
     text_cleaned = clean_text_for_tts(text);
     if not text_cleaned or text_cleaned == "No text": return None
     filename_base = generate_filename(text_cleaned, username, "mp3"); save_path = os.path.join(AUDIO_DIR, filename_base);
     ensure_dir(AUDIO_DIR)
     try:
         communicate = edge_tts.Communicate(text_cleaned, voice); await communicate.save(save_path);
-        if os.path.exists(save_path) and os.path.getsize(save_path) > 0:
-             st.session_state.audio_cache[cache_key] = save_path; return save_path
+        if os.path.exists(save_path) and os.path.getsize(save_path) > 0: st.session_state.audio_cache[cache_key] = save_path; return save_path
         else: print(f"Audio file {save_path} failed generation."); return None
     except Exception as e: print(f"Edge TTS Error: {e}"); return None
 
 def play_and_download_audio(file_path):
-    """Displays audio player and download link in Streamlit."""
     if file_path and os.path.exists(file_path):
         try:
              st.audio(file_path)
              file_type = file_path.split('.')[-1]
              st.markdown(get_download_link(file_path, file_type), unsafe_allow_html=True)
         except Exception as e: st.error(f"Audio display error for {os.path.basename(file_path)}: {e}")
-    # else: st.warning(f"Audio file not found: {os.path.basename(file_path) if file_path else 'N/A'}") # Can be noisy
 
 # --- Chat ---
 async def save_chat_entry(username, message, voice, is_markdown=False):
-    """Saves chat entry to a file and session state, generates audio."""
     if not message.strip(): return None, None
     timestamp_str = get_current_time_str();
     entry = f"[{timestamp_str}] {username} ({voice}): {message}" if not is_markdown else f"[{timestamp_str}] {username} ({voice}):\n```markdown\n{message}\n```"
@@ -389,10 +354,8 @@ async def save_chat_entry(username, message, voice, is_markdown=False):
     return md_file, audio_file
 
 async def load_chat_history():
-    """Loads chat history from files if session state is empty."""
-    # This ensures history is loaded once per session if needed
     if 'chat_history' not in st.session_state: st.session_state.chat_history = []
-    if not st.session_state.chat_history:
+    if not st.session_state.chat_history: # Only load from files if session state is empty
         ensure_dir(CHAT_DIR)
         print("Loading chat history from files...")
         chat_files = sorted(glob.glob(os.path.join(CHAT_DIR, "*.md")), key=os.path.getmtime); loaded_count = 0
@@ -413,47 +376,36 @@ def create_zip_of_files(files_to_zip, prefix="Archive"):
         print(f"Creating zip: {zip_name}...");
         with zipfile.ZipFile(zip_name, 'w', zipfile.ZIP_DEFLATED) as z:
             for f in files_to_zip:
-                 if os.path.exists(f): z.write(f, os.path.basename(f))
+                 if os.path.exists(f): z.write(f, os.path.basename(f)) # Use basename in archive
                  else: print(f"Skip zip missing: {f}")
         print("Zip success."); st.success(f"Created {zip_name}"); return zip_name
     except Exception as e: print(f"Zip failed: {e}"); st.error(f"Zip failed: {e}"); return None
 
 def delete_files(file_patterns, exclude_files=None):
     """Deletes files matching patterns, excluding protected/specified files."""
-    # Core protected files
     protected = [STATE_FILE, "app.py", "index.html", "requirements.txt", "README.md"]
-    # Dynamically protect currently loaded world file if specified
-    current_world = st.session_state.get('current_world_file')
-    if current_world: protected.append(current_world)
-    # Add user exclusions
+    # Don't automatically protect current world file during generic delete
     if exclude_files: protected.extend(exclude_files)
 
     deleted_count = 0; errors = 0
     for pattern in file_patterns:
-         # Expand pattern relative to current directory or specified dir
-         pattern_path = pattern # Assume pattern includes path if needed (e.g., from os.path.join)
+         pattern_path = pattern # Assume pattern includes path from os.path.join
          print(f"Attempting to delete files matching: {pattern_path}")
          try:
               files_to_delete = glob.glob(pattern_path)
               if not files_to_delete: print(f"No files found for pattern: {pattern}"); continue
-
               for f_path in files_to_delete:
                    basename = os.path.basename(f_path)
-                   # Check if it's a file and NOT protected
                    if os.path.isfile(f_path) and basename not in protected:
                         try: os.remove(f_path); print(f"Deleted: {f_path}"); deleted_count += 1
                         except Exception as e: print(f"Failed delete {f_path}: {e}"); errors += 1
                    elif os.path.isdir(f_path): print(f"Skipping directory: {f_path}")
-                   #else: print(f"Skipping protected/non-file: {f_path}") # Debugging
          except Exception as glob_e: print(f"Error matching pattern {pattern}: {glob_e}"); errors += 1
-
     msg = f"Deleted {deleted_count} files.";
     if errors > 0: msg += f" Encountered {errors} errors."; st.warning(msg)
     elif deleted_count > 0: st.success(msg)
     else: st.info("No matching files found to delete.")
-    # Clear relevant caches
-    st.session_state['download_link_cache'] = {}
-    st.session_state['audio_cache'] = {}
+    st.session_state['download_link_cache'] = {}; st.session_state['audio_cache'] = {}
 
 
 # --- Image Handling ---
@@ -466,17 +418,18 @@ async def save_pasted_image(image, username):
 
 def paste_image_component():
       pasted_img = None; img_type = None
-      with st.form(key="paste_form"):
-           paste_input = st.text_area("Paste Image Data Here", key="paste_input_area", height=50); submit_button = st.form_submit_button("Paste Image 📋")
-           if submit_button and paste_input and paste_input.startswith('data:image'):
+      # Added default value to text_area to ensure key exists even if empty
+      paste_input = st.text_area("Paste Image Data Here", key="paste_input_area", height=50, value="")
+      if st.button("Process Pasted Image 📋", key="paste_form_button"): # Simplified trigger
+           if paste_input and paste_input.startswith('data:image'):
                try:
                    mime_type = paste_input.split(';')[0].split(':')[1]; base64_str = paste_input.split(',')[1]; img_bytes = base64.b64decode(base64_str); pasted_img = Image.open(io.BytesIO(img_bytes)); img_type = mime_type.split('/')[1]
                    st.image(pasted_img, caption=f"Pasted ({img_type.upper()})", width=150); st.session_state.paste_image_base64 = base64_str
                except ImportError: st.error("Pillow library needed for image pasting.")
                except Exception as e: st.error(f"Img decode err: {e}"); st.session_state.paste_image_base64 = ""
-           elif submit_button: st.warning("No valid img data."); st.session_state.paste_image_base64 = ""
-      # Return the image object if successfully pasted and submitted in THIS RUN
-      return pasted_img if submit_button and pasted_img else None
+           else: st.warning("No valid image data pasted."); st.session_state.paste_image_base64 = ""
+      # Return image if processed successfully in this run
+      return pasted_img
 
 
 # --- PDF Processing ---
@@ -487,73 +440,71 @@ class AudioProcessor:
                  with open(f"{self.cache_dir}/metadata.json", 'w') as f: json.dump(self.metadata, f, indent=2)
             except Exception as e: print(f"Failed metadata save: {e}")
       async def create_audio(self, text, voice='en-US-AriaNeural'):
-            cache_key=hashlib.md5(f"{text[:150]}:{voice}".encode()).hexdigest(); cache_path=os.path.join(self.cache_dir, f"{cache_key}.mp3") # Use join
+            cache_key=hashlib.md5(f"{text[:150]}:{voice}".encode()).hexdigest(); cache_path=os.path.join(self.cache_dir, f"{cache_key}.mp3");
             if cache_key in self.metadata and os.path.exists(cache_path): return cache_path
             text_cleaned=clean_text_for_tts(text);
             if not text_cleaned: return None
             ensure_dir(os.path.dirname(cache_path))
             try:
                  communicate=edge_tts.Communicate(text_cleaned,voice); await communicate.save(cache_path)
-                 if os.path.exists(cache_path) and os.path.getsize(cache_path) > 0:
-                    self.metadata[cache_key]={'timestamp': datetime.now().isoformat(), 'text_length': len(text_cleaned), 'voice': voice}; self._save_metadata()
-                    return cache_path
+                 if os.path.exists(cache_path) and os.path.getsize(cache_path) > 0: self.metadata[cache_key]={'timestamp': datetime.now().isoformat(), 'text_length': len(text_cleaned), 'voice': voice}; self._save_metadata(); return cache_path
                  else: return None
             except Exception as e: print(f"TTS Create Audio Error: {e}"); return None
 
 def process_pdf_tab(pdf_file, max_pages, voice):
-      st.subheader("PDF Processing")
-      if pdf_file is None: st.info("Upload a PDF file to begin."); return
-      audio_processor = AudioProcessor()
-      try:
-          reader=PdfReader(pdf_file)
-          if reader.is_encrypted: st.warning("PDF is encrypted."); return
-          total_pages=min(len(reader.pages),max_pages);
-          st.write(f"Processing first {total_pages} pages of '{pdf_file.name}'...");
-          texts, audios={}, {}; page_threads = []; results_lock = threading.Lock()
-
-          def process_page_sync(page_num, page_text):
-              async def run_async_audio(): return await audio_processor.create_audio(page_text, voice)
-              try:
-                   # Use the run_async helper
-                   audio_path = run_async(run_async_audio).result() # Blocking wait here might be okay for thread
-                   if audio_path:
-                        with results_lock: audios[page_num] = audio_path
-              except Exception as page_e: print(f"Err process page {page_num+1}: {page_e}")
-
-          # Start threads
-          for i in range(total_pages):
-               try:
-                   page = reader.pages[i]; text = page.extract_text();
-                   if text and text.strip():
-                       texts[i]=text; thread = threading.Thread(target=process_page_sync, args=(i, text)); page_threads.append(thread); thread.start()
-                   else: texts[i] = "[No text extracted]"
-               except Exception as extract_e: texts[i] = f"[Error extract: {extract_e}]"; print(f"Error page {i+1} extract: {extract_e}")
-
-          # Wait for threads and display progress
-          progress_bar = st.progress(0.0)
-          total_threads = len(page_threads)
-          start_join_time = time.time()
-          while any(t.is_alive() for t in page_threads):
-              completed_threads = total_threads - sum(t.is_alive() for t in page_threads)
-              progress = completed_threads / total_threads if total_threads > 0 else 1.0
-              progress_bar.progress(min(progress, 1.0)) # Cap at 1.0
-              if time.time() - start_join_time > 600: # Timeout after 10 mins
-                   print("PDF processing timed out waiting for threads.")
-                   break
-              time.sleep(0.5)
-          progress_bar.progress(1.0)
-
-          # Display results
-          st.write("Processing complete. Displaying results:")
-          for i in range(total_pages):
-                with st.expander(f"Page {i+1}"):
-                     st.markdown(texts.get(i, "[Error getting text]"))
-                     audio_file = audios.get(i)
-                     if audio_file: play_and_download_audio(audio_file)
-                     else: st.caption("Audio generation failed or was skipped.")
-
-      except Exception as pdf_e: st.error(f"Err read PDF: {pdf_e}"); st.exception(pdf_e)
-
+    st.subheader("PDF Processing Results") # Change header
+    if pdf_file is None: st.info("Upload a PDF file and click 'Process PDF' to begin."); return
+    audio_processor = AudioProcessor()
+    try:
+        reader=PdfReader(pdf_file)
+        if reader.is_encrypted: st.warning("PDF is encrypted."); return
+        total_pages=min(len(reader.pages),max_pages);
+        st.write(f"Processing first {total_pages} pages of '{pdf_file.name}'...")
+        texts, audios={}, {}; page_threads = []; results_lock = threading.Lock()
+
+        def process_page_sync(page_num, page_text):
+            async def run_async_audio(): return await audio_processor.create_audio(page_text, voice)
+            try:
+                # asyncio.run can cause issues if called repeatedly in threads, use run_async helper
+                audio_path_future = run_async(run_async_audio)
+                # This needs careful handling. run_async might return a task or result.
+                # For simplicity here, let's assume it blocks or we retrieve result later.
+                # A better pattern uses concurrent.futures or manages event loop properly.
+                # Sticking to asyncio.run for now as run_async tries it.
+                audio_path = asyncio.run(run_async_audio()) # Revert to simpler asyncio.run for thread context
+                if audio_path:
+                     with results_lock: audios[page_num] = audio_path
+            except Exception as page_e: print(f"Err process page {page_num+1}: {page_e}")
+
+        # Start threads
+        for i in range(total_pages):
+             try:
+                 page = reader.pages[i]; text = page.extract_text();
+                 if text and text.strip(): texts[i]=text; thread = threading.Thread(target=process_page_sync, args=(i, text)); page_threads.append(thread); thread.start()
+                 else: texts[i] = "[No text extracted]"
+             except Exception as extract_e: texts[i] = f"[Error extract: {extract_e}]"; print(f"Error page {i+1} extract: {extract_e}")
+
+        # Wait for threads and display progress
+        progress_bar = st.progress(0.0, text="Processing pages...")
+        total_threads = len(page_threads)
+        start_join_time = time.time()
+        while any(t.is_alive() for t in page_threads):
+            completed_threads = total_threads - sum(t.is_alive() for t in page_threads)
+            progress = completed_threads / total_threads if total_threads > 0 else 1.0
+            progress_bar.progress(min(progress, 1.0), text=f"Processed {completed_threads}/{total_threads} pages...")
+            if time.time() - start_join_time > 600: print("PDF processing timed out."); break # 10 min timeout
+            time.sleep(0.5)
+        progress_bar.progress(1.0, text="Processing complete.")
+
+        # Display results
+        for i in range(total_pages):
+              with st.expander(f"Page {i+1}"):
+                   st.markdown(texts.get(i, "[Error getting text]"))
+                   audio_file = audios.get(i)
+                   if audio_file: play_and_download_audio(audio_file)
+                   else: st.caption("Audio generation failed or was skipped.")
+
+    except Exception as pdf_e: st.error(f"Err read PDF: {pdf_e}"); st.exception(pdf_e)
 
 # ==============================================================================
 # WebSocket Server Logic
@@ -570,37 +521,29 @@ async def unregister_client(websocket):
     print(f"Client unregistered: {client_id}. Remaining: {len(connected_clients)}")
 
 async def send_safely(websocket, message, client_id):
-     """Wrapper to send message and handle potential connection errors."""
      try: await websocket.send(message)
      except websockets.ConnectionClosed: print(f"WS Send failed (Closed) client {client_id}"); raise
      except RuntimeError as e: print(f"WS Send failed (Runtime {e}) client {client_id}"); raise
      except Exception as e: print(f"WS Send failed (Other {e}) client {client_id}"); raise
 
 async def broadcast_message(message, exclude_id=None):
-    """Sends a message to all connected clients except the excluded one."""
     if not connected_clients: return
     tasks = []; current_client_ids = list(connected_clients); active_connections_copy = st.session_state.active_connections.copy()
     for client_id in current_client_ids:
         if client_id == exclude_id: continue
         websocket = active_connections_copy.get(client_id)
         if websocket: tasks.append(asyncio.create_task(send_safely(websocket, message, client_id)))
-    if tasks: await asyncio.gather(*tasks, return_exceptions=True) # Gather results/exceptions
+    if tasks: await asyncio.gather(*tasks, return_exceptions=True)
 
 async def broadcast_world_update():
-    """Broadcasts the current world state to all clients."""
     with world_objects_lock: current_state_payload = dict(world_objects)
-    update_msg = json.dumps({"type": "initial_state", "payload": current_state_payload}) # Force full refresh
+    update_msg = json.dumps({"type": "initial_state", "payload": current_state_payload})
     print(f"Broadcasting full world update ({len(current_state_payload)} objects)...")
     await broadcast_message(update_msg)
 
 async def websocket_handler(websocket, path):
-    """Handles WebSocket connections and messages."""
     await register_client(websocket); client_id = str(websocket.id);
-    # Use username from main session state - ASSUMES session state is accessible here.
-    # This might be unreliable depending on how threads/asyncio interact with Streamlit's context.
-    # A safer approach might involve passing necessary user info during registration if needed.
     username = st.session_state.get('username', f"User_{client_id[:4]}")
-
     try: # Send initial state
         with world_objects_lock: initial_state_payload = dict(world_objects)
         initial_state_msg = json.dumps({"type": "initial_state", "payload": initial_state_payload}); await websocket.send(initial_state_msg)
@@ -612,12 +555,12 @@ async def websocket_handler(websocket, path):
         async for message in websocket:
             try:
                 data = json.loads(message); msg_type = data.get("type"); payload = data.get("payload", {});
-                sender_username = payload.get("username", username) # Get username from payload
+                sender_username = payload.get("username", username)
 
                 if msg_type == "chat_message":
                     chat_text = payload.get('message', ''); voice = payload.get('voice', FUN_USERNAMES.get(sender_username, "en-US-AriaNeural"));
-                    run_async(save_chat_entry, sender_username, chat_text, voice) # Fire-and-forget
-                    await broadcast_message(message, exclude_id=client_id) # Forward
+                    run_async(save_chat_entry, sender_username, chat_text, voice)
+                    await broadcast_message(message, exclude_id=client_id)
 
                 elif msg_type == "place_object":
                     obj_data = payload.get("object_data");
@@ -649,53 +592,42 @@ async def websocket_handler(websocket, path):
     except Exception as e: print(f"WS Unexpected handler error {client_id}: {e}")
     finally:
          await broadcast_message(json.dumps({"type": "user_leave", "payload": {"username": username, "id": client_id}}), exclude_id=client_id);
-         await unregister_client(websocket) # Cleanup
+         await unregister_client(websocket)
 
 
 async def run_websocket_server():
-    """Coroutine to run the WebSocket server."""
     if st.session_state.get('server_running_flag', False): return
     st.session_state['server_running_flag'] = True; print("Attempting start WS server 0.0.0.0:8765...")
     stop_event = asyncio.Event(); st.session_state['websocket_stop_event'] = stop_event
     server = None
     try:
-        # Changed host to 0.0.0.0 for accessibility, ensure firewall allows port 8765
         server = await websockets.serve(websocket_handler, "0.0.0.0", 8765); st.session_state['server_instance'] = server
         print(f"WS server started: {server.sockets[0].getsockname()}. Waiting for stop signal...")
-        await stop_event.wait() # Keep running
-    except OSError as e: print(f"### FAILED START WS SERVER: {e}"); st.session_state['server_running_flag'] = False; # Reset flag on failure
-    except Exception as e: print(f"### UNEXPECTED WS SERVER ERROR: {e}"); st.session_state['server_running_flag'] = False; # Reset flag on failure
+        await stop_event.wait()
+    except OSError as e: print(f"### FAILED START WS SERVER: {e}"); st.session_state['server_running_flag'] = False;
+    except Exception as e: print(f"### UNEXPECTED WS SERVER ERROR: {e}"); st.session_state['server_running_flag'] = False;
     finally:
         print("WS server task finishing...");
         if server: server.close(); await server.wait_closed(); print("WS server closed.")
         st.session_state['server_running_flag'] = False; st.session_state['server_instance'] = None; st.session_state['websocket_stop_event'] = None
 
 def start_websocket_server_thread():
-    """Starts the WebSocket server in a separate thread if not already running."""
     if st.session_state.get('server_task') and st.session_state.server_task.is_alive(): return
     if st.session_state.get('server_running_flag', False): return
     print("Creating/starting new server thread.");
     def run_loop():
-        current_loop = None
-        try:
-            current_loop = asyncio.get_event_loop()
-            if current_loop.is_running():
-                 print("Server thread: Attaching to existing running loop (rare case).")
-                 # If already running, might need different approach, but usually new thread = new loop
-                 # This case is less likely with daemon threads starting fresh.
-            else:
-                 raise RuntimeError("No running loop found initially - expected.")
-        except RuntimeError: # No loop in this thread, create new one
-             print("Server thread: Creating new event loop.")
-             loop = asyncio.new_event_loop(); asyncio.set_event_loop(loop)
-             try: loop.run_until_complete(run_websocket_server())
-             finally:
-                  # Gracefully shutdown tasks if loop is closing
-                  tasks = asyncio.all_tasks(loop)
-                  for task in tasks: task.cancel()
-                  loop.run_until_complete(asyncio.gather(*tasks, return_exceptions=True))
-                  loop.close(); print("Server thread loop closed.")
-
+        loop = None
+        try: loop = asyncio.get_running_loop()
+        except RuntimeError: loop = asyncio.new_event_loop(); asyncio.set_event_loop(loop)
+        try: loop.run_until_complete(run_websocket_server())
+        finally:
+             if loop and not loop.is_closed():
+                tasks = asyncio.all_tasks(loop);
+                for task in tasks: task.cancel()
+                try: loop.run_until_complete(asyncio.gather(*tasks, return_exceptions=True))
+                except asyncio.CancelledError: pass
+                finally: loop.close(); print("Server thread loop closed.")
+             else: print("Server thread loop already closed or None.")
     st.session_state.server_task = threading.Thread(target=run_loop, daemon=True); st.session_state.server_task.start(); time.sleep(1.5)
     if not st.session_state.server_task.is_alive(): print("### Server thread failed to stay alive!")
 
@@ -711,69 +643,54 @@ def render_sidebar():
         st.caption("Load or save named world states.")
 
         saved_worlds = get_saved_worlds()
-        # Format options for radio button display
         world_options_display = {os.path.basename(w['filename']): f"{w['name']} ({w['timestamp']})" for w in saved_worlds}
-        # The actual options list stores basenames
         radio_options_basenames = [None] + [os.path.basename(w['filename']) for w in saved_worlds]
-
         current_selection_basename = st.session_state.get('current_world_file', None)
         current_radio_index = 0
         if current_selection_basename and current_selection_basename in radio_options_basenames:
              try: current_radio_index = radio_options_basenames.index(current_selection_basename)
-             except ValueError: current_radio_index = 0 # Default to None if not found
+             except ValueError: current_radio_index = 0
 
         selected_basename = st.radio(
              "Load World:", options=radio_options_basenames, index=current_radio_index,
-             format_func=lambda x: "Live State (Unsaved)" if x is None else world_options_display.get(x, x), # Display formatted name
+             format_func=lambda x: "Live State (Unsaved)" if x is None else world_options_display.get(x, x),
              key="world_selector_radio"
          )
 
-        # Handle selection change
         if selected_basename != current_selection_basename:
-             st.session_state.current_world_file = selected_basename # Store selected basename
+             st.session_state.current_world_file = selected_basename
              if selected_basename:
                   with st.spinner(f"Loading {selected_basename}..."):
                       if load_world_state_from_md(selected_basename):
-                          run_async(broadcast_world_update) # Broadcast new state
+                          run_async(broadcast_world_update)
                           st.toast("World loaded!", icon="✅")
                       else: st.error("Failed to load world."); st.session_state.current_world_file = None
-             else: # Switched to "Live State"
-                  print("Switched to live state.")
-                  # Optionally clear world state or just stop tracking file? Stop tracking.
-                  # Maybe broadcast current live state to ensure consistency?
-                  # run_async(broadcast_world_update)
-                  st.toast("Switched to Live State.")
+             else:
+                  print("Switched to live state."); st.toast("Switched to Live State.")
              st.rerun()
 
-        # Download Links for Worlds
         st.caption("Download:")
-        cols = st.columns([4, 1]) # Columns for name and download button
-        with cols[0]: st.write("**World Name** (Timestamp)")
+        cols = st.columns([4, 1])
+        with cols[0]: st.write("**Name** (Timestamp)")
         with cols[1]: st.write("**DL**")
-        # Display max 10 worlds initially, add expander if more?
-        for world_info in saved_worlds[:10]: # Limit display
-            f_basename = os.path.basename(world_info['filename'])
-            f_fullpath = os.path.join(SAVED_WORLDS_DIR, f_basename) # Reconstruct full path for link
-            display_name = world_info.get('name', f_basename)
-            timestamp = world_info.get('timestamp', 'N/A')
-            col1, col2 = st.columns([4, 1])
+        display_limit = 10
+        for i, world_info in enumerate(saved_worlds):
+            if i >= display_limit and len(saved_worlds) > display_limit + 1: # Show expander after limit
+                 with st.expander(f"Show {len(saved_worlds)-display_limit} more..."):
+                      for world_info_more in saved_worlds[display_limit:]:
+                            f_basename = os.path.basename(world_info_more['filename']); f_fullpath = os.path.join(SAVED_WORLDS_DIR, f_basename); display_name = world_info_more.get('name', f_basename); timestamp = world_info_more.get('timestamp', 'N/A')
+                            colA, colB = st.columns([4, 1]);
+                            with colA: st.write(f"<small>{display_name} ({timestamp})</small>", unsafe_allow_html=True)
+                            with colB: st.markdown(get_download_link(f_fullpath, "md"), unsafe_allow_html=True)
+                 break # Stop outer loop after showing expander
+
+            f_basename = os.path.basename(world_info['filename']); f_fullpath = os.path.join(SAVED_WORLDS_DIR, f_basename); display_name = world_info.get('name', f_basename); timestamp = world_info.get('timestamp', 'N/A')
+            col1, col2 = st.columns([4, 1]);
             with col1: st.write(f"<small>{display_name} ({timestamp})</small>", unsafe_allow_html=True)
             with col2: st.markdown(get_download_link(f_fullpath, "md"), unsafe_allow_html=True)
-        if len(saved_worlds) > 10:
-             with st.expander(f"Show {len(saved_worlds)-10} more..."):
-                  for world_info in saved_worlds[10:]:
-                      # Repeat display logic
-                      f_basename = os.path.basename(world_info['filename'])
-                      f_fullpath = os.path.join(SAVED_WORLDS_DIR, f_basename)
-                      display_name = world_info.get('name', f_basename)
-                      timestamp = world_info.get('timestamp', 'N/A')
-                      col1, col2 = st.columns([4, 1])
-                      with col1: st.write(f"<small>{display_name} ({timestamp})</small>", unsafe_allow_html=True)
-                      with col2: st.markdown(get_download_link(f_fullpath, "md"), unsafe_allow_html=True)
 
-        st.markdown("---")
 
-        # Build Tools Section
+        st.markdown("---")
         st.header("🏗️ Build Tools")
         st.caption("Select an object to place.")
         cols = st.columns(5)
@@ -784,29 +701,27 @@ def render_sidebar():
             if cols[col_idx % 5].button(emoji, key=button_key, help=name, type=button_type, use_container_width=True):
                 if st.session_state.get('selected_object', 'None') != name:
                     st.session_state.selected_object = name
-                    # Fire and forget JS update
                     run_async(lambda name_arg=name: streamlit_js_eval(f"updateSelectedObjectType({json.dumps(name_arg)});", key=f"update_tool_js_{name_arg}"))
                     st.rerun()
             col_idx += 1
         st.markdown("---")
         if st.button("🚫 Clear Tool", key="clear_tool", use_container_width=True):
              if st.session_state.get('selected_object', 'None') != 'None':
-                  st.session_state.selected_object = 'None'
+                  st.session_state.selected_object = 'None';
                   run_async(lambda: streamlit_js_eval("updateSelectedObjectType('None');", key="update_tool_js_none"))
                   st.rerun()
 
-        # Voice/User Section
         st.markdown("---")
         st.header("🗣️ Voice & User")
         current_username = st.session_state.get('username', list(FUN_USERNAMES.keys())[0])
         username_options = list(FUN_USERNAMES.keys()); current_index = 0
         try: current_index = username_options.index(current_username)
-        except ValueError: current_index = 0 # Handle case where saved username is no longer valid
+        except ValueError: current_index = 0
         new_username = st.selectbox("Change Name/Voice", options=username_options, index=current_index, key="username_select", format_func=lambda x: x.split(" ")[0])
         if new_username != st.session_state.username:
             old_username = st.session_state.username
             change_msg = json.dumps({"type":"user_rename", "payload": {"old_username": old_username, "new_username": new_username}})
-            run_async(broadcast_message, change_msg) # Fire and forget broadcast
+            run_async(broadcast_message, change_msg)
             st.session_state.username = new_username; st.session_state.tts_voice = FUN_USERNAMES[new_username]; save_username(st.session_state.username)
             st.rerun()
         st.session_state['enable_audio'] = st.toggle("Enable TTS Audio", value=st.session_state.get('enable_audio', True))
@@ -824,17 +739,15 @@ def render_main_content():
         st.caption("Place objects using the sidebar tools. Changes are shared live!")
         current_file_basename = st.session_state.get('current_world_file', None)
         if current_file_basename:
-             # Reconstruct full path for parsing if needed, or just use basename
-             parsed = parse_world_filename(os.path.join(SAVED_WORLDS_DIR, current_file_basename)) # Parse info
-             st.info(f"Current World: **{parsed['name']}** (`{current_file_basename}`)")
+             parsed = parse_world_filename(os.path.join(SAVED_WORLDS_DIR, current_file_basename)); st.info(f"Current World: **{parsed['name']}** (`{current_file_basename}`)")
         else: st.info("Live State Active (Unsaved changes only persist if saved)")
 
         # Embed HTML Component
         html_file_path = 'index.html'
         try:
             with open(html_file_path, 'r', encoding='utf-8') as f: html_template = f.read()
-            ws_url = "ws://localhost:8765" # Default for local dev
-            try: # Attempt to get dynamic host
+            ws_url = "ws://localhost:8765" # Default
+            try: # Get WS URL (Best effort)
                  from streamlit.web.server.server import Server
                  session_info = Server.get_current()._get_session_info(st.runtime.scriptrunner.get_script_run_ctx().session_id)
                  server_host = session_info.ws.stream.request.host.split(':')[0]
@@ -857,18 +770,13 @@ def render_main_content():
     # --- Chat Tab ---
     with tab_chat:
         st.header(f"{START_ROOM} Chat")
-        # Load history - use run_async result or session state if already loaded
-        if 'chat_history' not in st.session_state or not st.session_state.chat_history:
-             chat_history = asyncio.run(load_chat_history()) # Blocking load if first time
-        else:
-             chat_history = st.session_state.chat_history
-
+        chat_history_task = run_async(load_chat_history) # Schedule load
+        chat_history = chat_history_task.result() if chat_history_task else st.session_state.chat_history # Get result if task ran sync, else use current state
         chat_container = st.container(height=500)
         with chat_container:
-             if chat_history: st.markdown("----\n".join(reversed(chat_history[-50:]))) # Show last 50, reversed
+             if chat_history: st.markdown("----\n".join(reversed(chat_history[-50:])))
              else: st.caption("No chat messages yet.")
 
-        # Chat Input Area
         message_value = st.text_input("Your Message:", key="message_input", label_visibility="collapsed")
         send_button_clicked = st.button("Send Chat 💬", key="send_chat_button")
         should_autosend = st.session_state.get('autosend', False) and message_value
@@ -876,16 +784,15 @@ def render_main_content():
         if send_button_clicked or should_autosend:
             message_to_send = message_value
             if message_to_send.strip() and message_to_send != st.session_state.get('last_message', ''):
-                st.session_state.last_message = message_to_send # Update tracker
+                st.session_state.last_message = message_to_send
                 voice = FUN_USERNAMES.get(st.session_state.username, "en-US-AriaNeural")
                 ws_message = json.dumps({"type": "chat_message", "payload": {"username": st.session_state.username, "message": message_to_send, "voice": voice}})
-                # Fire and forget async tasks
                 run_async(broadcast_message, ws_message)
                 run_async(save_chat_entry, st.session_state.username, message_to_send, voice)
                 st.session_state.message_input = "" # Clear state for next run
                 st.rerun()
             elif send_button_clicked: st.toast("Message empty or same as last.")
-        st.checkbox("Autosend Chat", key="autosend") # Toggle autosend
+        st.checkbox("Autosend Chat", key="autosend")
 
     # --- PDF Tab ---
     with tab_pdf:
@@ -893,7 +800,6 @@ def render_main_content():
          pdf_file = st.file_uploader("Upload PDF for Audio Conversion", type="pdf", key="pdf_upload")
          max_pages = st.slider('Max Pages to Process', 1, 50, 10, key="pdf_pages")
          if pdf_file:
-              # Use a button to trigger potentially long processing
               if st.button("Process PDF to Audio", key="process_pdf_button"):
                    with st.spinner("Processing PDF... This may take time."):
                         process_pdf_tab(pdf_file, max_pages, st.session_state.tts_voice)
@@ -904,18 +810,15 @@ def render_main_content():
         st.subheader("💾 World State Management")
         current_file_basename = st.session_state.get('current_world_file', None)
 
-        # Save Current Version Button
         if current_file_basename:
              parsed = parse_world_filename(os.path.join(SAVED_WORLDS_DIR, current_file_basename))
              save_label = f"Save Changes to '{parsed['name']}'"
              if st.button(save_label, key="save_current_world", help=f"Overwrite '{current_file_basename}'"):
                  with st.spinner(f"Overwriting {current_file_basename}..."):
                      if save_world_state_to_md(current_file_basename): st.success("Current world saved!")
-                     else: st.error("Failed to save world.")
-         else:
-             st.info("Load a world from the sidebar to enable saving changes to it.")
+                     else: st.error("Failed to save world state.")
+         else: st.info("Load a world from the sidebar to enable saving changes to it.")
 
-        # Save As New Version Section
         st.subheader("Save As New Version")
         new_name_files = st.text_input("New World Name:", key="new_world_name_files", value=st.session_state.get('new_world_name', 'MyWorld'))
         if st.button("💾 Save Live State as New Version", key="save_new_version_files"):
@@ -924,9 +827,7 @@ def render_main_content():
                   with st.spinner(f"Saving new version '{new_name_files}'..."):
                       if save_world_state_to_md(new_filename_base):
                           st.success(f"Saved as {new_filename_base}")
-                          st.session_state.current_world_file = new_filename_base # Switch to new file
-                          st.session_state.new_world_name = "MyWorld" # Reset default for next time
-                          st.rerun()
+                          st.session_state.current_world_file = new_filename_base; st.session_state.new_world_name = "MyWorld"; st.rerun()
                       else: st.error("Failed to save new version.")
              else: st.warning("Please enter a name.")
 
@@ -937,7 +838,6 @@ def render_main_content():
              if not server_alive and st.button("Restart Server Thread", key="restart_ws"): start_websocket_server_thread(); st.rerun()
         with col_clients: st.metric("Connected Clients", len(connected_clients))
 
-        # File Deletion
         st.subheader("🗑️ Delete Files")
         st.warning("Deletion is permanent!", icon="⚠️")
         col_del1, col_del2, col_del3, col_del4 = st.columns(4)
@@ -946,18 +846,16 @@ def render_main_content():
         with col_del2:
             if st.button("🗑️ Audio", key="del_audio_mp3"): delete_files([os.path.join(AUDIO_DIR, "*.mp3"), os.path.join(AUDIO_CACHE_DIR, "*.mp3")]); st.session_state.audio_cache = {}; st.rerun()
         with col_del3:
-            if st.button("🗑️ Worlds", key="del_worlds_md"): delete_files([os.path.join(SAVED_WORLDS_DIR, f"{WORLD_STATE_FILE_MD_PREFIX}*.md")], exclude_files=[st.session_state.get('current_world_file')]); st.session_state.current_world_file = None; st.rerun() # Protect current? No, delete all.
+            if st.button("🗑️ Worlds", key="del_worlds_md"): delete_files([os.path.join(SAVED_WORLDS_DIR, f"{WORLD_STATE_FILE_MD_PREFIX}*.md")]); st.session_state.current_world_file = None; st.rerun()
         with col_del4:
-            if st.button("🗑️ All Gen", key="del_all_gen", help="Deletes Chats, Audio, Worlds, Zips"): delete_files([os.path.join(CHAT_DIR, "*.md"), os.path.join(AUDIO_DIR, "*.mp3"), os.path.join(AUDIO_CACHE_DIR, "*.mp3"), os.path.join(SAVED_WORLDS_DIR, "*.md"), "*.zip"]); st.session_state.chat_history = []; st.session_state.audio_cache = {}; st.session_state.current_world_file = None; st.rerun()
+            if st.button("🗑️ All Gen", key="del_all_gen"): delete_files([os.path.join(CHAT_DIR, "*.md"), os.path.join(AUDIO_DIR, "*.mp3"), os.path.join(AUDIO_CACHE_DIR, "*.mp3"), os.path.join(SAVED_WORLDS_DIR, "*.md"), "*.zip"]); st.session_state.chat_history = []; st.session_state.audio_cache = {}; st.session_state.current_world_file = None; st.rerun()
 
-        # Download Archives
         st.subheader("📦 Download Archives")
-        zip_files = sorted(glob.glob(os.path.join(MEDIA_DIR,"*.zip")), key=os.path.getmtime, reverse=True) # Look in base dir
+        zip_files = sorted(glob.glob(os.path.join(MEDIA_DIR,"*.zip")), key=os.path.getmtime, reverse=True)
         if zip_files:
-             # Zip specific content types
              col_zip1, col_zip2, col_zip3 = st.columns(3)
              with col_zip1:
-                  if st.button("Zip Worlds"): create_zip_of_files(glob.glob(os.path.join(SAVED_WORLDS_DIR, "*.md")), "Worlds")
+                  if st.button("Zip Worlds"): create_zip_of_files([w['filename'] for w in get_saved_worlds()], "Worlds")
              with col_zip2:
                    if st.button("Zip Chats"): create_zip_of_files(glob.glob(os.path.join(CHAT_DIR, "*.md")), "Chats")
              with col_zip3:
@@ -965,7 +863,9 @@ def render_main_content():
 
              st.caption("Existing Zip Files:")
              for zip_file in zip_files: st.markdown(get_download_link(zip_file, "zip"), unsafe_allow_html=True)
-        else: st.caption("No zip archives found.")
+        else:
+             # Ensure correct indentation here for the else block
+             st.caption("No zip archives found.")
 
 
 # ==============================================================================
@@ -973,63 +873,35 @@ def render_main_content():
 # ==============================================================================
 
 def initialize_world():
-    """Loads initial world state (most recent) if not already loaded."""
-    # This check prevents reloading state on every single rerun, only on session start
+    """Loads initial world state (most recent) if not already done for this session."""
     if not st.session_state.get('initial_world_state_loaded', False):
         print("Performing initial world load for session...")
         saved_worlds = get_saved_worlds()
         loaded_successfully = False
         if saved_worlds:
-             # Load the most recent world file (first in sorted list)
              latest_world_file_basename = os.path.basename(saved_worlds[0]['filename'])
              print(f"Loading most recent world on startup: {latest_world_file_basename}")
-             if load_world_state_from_md(latest_world_file_basename): # This updates global state and sets session state 'current_world_file'
-                  loaded_successfully = True
-             else:
-                  print("Failed to load most recent world, starting empty.")
-         else:
-              print("No saved worlds found, starting with empty state.")
-
-        # Ensure global dict is empty if no file loaded successfully
+             if load_world_state_from_md(latest_world_file_basename): loaded_successfully = True
+             else: print("Failed to load most recent world, starting empty.")
+         else: print("No saved worlds found, starting with empty state.")
         if not loaded_successfully:
              with world_objects_lock: world_objects.clear()
-             st.session_state.current_world_file = None # Ensure no file is marked as loaded
-
-        st.session_state.initial_world_state_loaded = True # Mark as loaded for this session
+             st.session_state.current_world_file = None
+        st.session_state.initial_world_state_loaded = True
         print("Initial world load process complete.")
 
 if __name__ == "__main__":
-    # 1. Initialize session state first (essential for other checks)
+    # 1. Initialize session state
     init_session_state()
 
-    # 2. Start WebSocket server thread if needed (check flags and thread life)
-    # Use server_running_flag to prevent multiple start attempts
-    server_thread = st.session_state.get('server_task')
-    server_alive = server_thread is not None and server_thread.is_alive()
-    if not st.session_state.get('server_running_flag', False) and not server_alive:
-         start_websocket_server_thread()
-    elif server_alive and not st.session_state.get('server_running_flag', False):
-         # Correct flag if thread is alive but flag is false
-         st.session_state.server_running_flag = True
-
-    # 3. Load initial world state from disk if not already done for this session
+    # 2. Start WebSocket server thread if needed
+    server_thread = st.session_state.get('server_task'); server_alive = server_thread is not None and server_thread.is_alive()
+    if not st.session_state.get('server_running_flag', False) and not server_alive: start_websocket_server_thread()
+    elif server_alive and not st.session_state.get('server_running_flag', False): st.session_state.server_running_flag = True
+
+    # 3. Load initial world state (once per session)
     initialize_world()
 
-    # 4. Render the UI (Sidebar and Main Content)
+    # 4. Render UI
     render_sidebar()
-    render_main_content()
-
-    # 5. Optional Periodic Save (Example - uncomment to enable)
-    # interval_seconds = 300 # 5 minutes
-    # if 'last_periodic_save' not in st.session_state: st.session_state.last_periodic_save = 0
-    # if time.time() - st.session_state.last_periodic_save > interval_seconds:
-    #     current_file_to_save = st.session_state.get('current_world_file')
-    #     if current_file_to_save: # Only save if a specific file is loaded
-    #         print(f"Triggering periodic save for {current_file_to_save}...")
-    #         if save_world_state_to_md(current_file_to_save):
-    #             st.session_state.last_periodic_save = time.time()
-    #             print("Periodic save successful.")
-    #         else:
-    #             print("Periodic save failed.")
-    #     else:
-    #          st.session_state.last_periodic_save = time.time() # Reset timer even if not saving
+    render_main_content()