Update app.py

app.py

@@ -1,4 +1,4 @@
-# app.py (Refactored & Consolidated - Checked Indentation)
+# app.py (Refactored & Consolidated)
 import streamlit as st
 import asyncio
 import websockets
@@ -26,7 +26,7 @@ from streamlit_marquee import streamlit_marquee
 from collections import defaultdict, Counter
 import pandas as pd # Still used for fallback CSV load? Keep for now.
 from streamlit_js_eval import streamlit_js_eval
-from PIL import Image # Needed for paste_image_component
+from PIL import Image
 
 # ==============================================================================
 # Configuration & Constants
@@ -74,20 +74,29 @@ WORLD_STATE_FILE_MD_PREFIX = "🌍_" # Prefix for world save files
 # File Emojis
 FILE_EMOJIS = {"md": "📝", "mp3": "🎵", "png": "🖼️", "mp4": "🎥", "zip": "📦", "json": "📄"}
 
-
-# --- Directories ---
-for d in [CHAT_DIR, AUDIO_DIR, AUDIO_CACHE_DIR, SAVED_WORLDS_DIR]:
-    os.makedirs(d, exist_ok=True)
-
-# --- API Keys (Placeholder) ---
+# API Keys (Load from .env or secrets)
 load_dotenv()
 # ANTHROPIC_KEY = os.getenv('ANTHROPIC_API_KEY', st.secrets.get('ANTHROPIC_API_KEY', ""))
 # OPENAI_KEY = os.getenv('OPENAI_API_KEY', st.secrets.get('OPENAI_API_KEY', ""))
 
-# --- Global State & Locks ---
+# Mapping Emojis to Primitive Types
+PRIMITIVE_MAP = {
+    "🌳": "Tree", "🗿": "Rock", "🏛️": "Simple House", "🌲": "Pine Tree", "🧱": "Brick Wall",
+    "🔵": "Sphere", "📦": "Cube", "🧴": "Cylinder", "🍦": "Cone", "🍩": "Torus",
+    "🍄": "Mushroom", "🌵": "Cactus", "🔥": "Campfire", "⭐": "Star", "💎": "Gem",
+    "🗼": "Tower", "🚧": "Barrier", "⛲": "Fountain", "🏮": "Lantern", "팻": "Sign Post"
+}
+
+# ==============================================================================
+# Global State & Locks
+# ==============================================================================
+
+# Thread lock for accessing shared world state
 world_objects_lock = threading.Lock()
-world_objects = defaultdict(dict) # In-memory world state {obj_id: data}
-connected_clients = set() # Holds client_id strings
+# In-memory world state {obj_id: data} - Use defaultdict for convenience
+world_objects = defaultdict(dict)
+# Set of active WebSocket client IDs
+connected_clients = set()
 
 # ==============================================================================
 # Utility Functions
@@ -97,12 +106,16 @@ def get_current_time_str(tz='UTC'):
     """Gets formatted timestamp string in specified timezone (default UTC)."""
     try:
         timezone = pytz.timezone(tz)
+        # Get current datetime localized to the specified timezone
         now_aware = datetime.now(timezone)
     except pytz.UnknownTimeZoneError:
+        # Fallback to UTC if timezone is unknown
         now_aware = datetime.now(pytz.utc)
     except Exception as e:
+         # General fallback if timezone localization fails
          print(f"Timezone error ({tz}), using UTC. Error: {e}")
          now_aware = datetime.now(pytz.utc)
+
     return now_aware.strftime('%Y%m%d_%H%M%S')
 
 
@@ -114,21 +127,18 @@ def clean_filename_part(text, max_len=30):
     return text[:max_len]
 
 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.
+    """Runs an async function safely from a sync context."""
     try:
         loop = asyncio.get_running_loop()
+        # Schedule as task if loop is running
         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.")
+    except RuntimeError: # No running loop
+        # Run in a new loop (blocks until completion)
         try:
             return asyncio.run(async_func(*args, **kwargs))
         except Exception as e:
             print(f"Error running async func {async_func.__name__} in new loop: {e}")
-            return None
+            return None # Indicate error or failure
     except Exception as e:
         print(f"Error scheduling async task {async_func.__name__}: {e}")
         return None
@@ -155,56 +165,49 @@ def generate_world_save_filename(name="World"):
 def parse_world_filename(filename):
     """Extracts info from filename if possible, otherwise returns defaults."""
     basename = os.path.basename(filename)
-    # Check prefix and suffix
+    # Ensure prefix and suffix are correct
     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('_')
+        parts = basename[len(WORLD_STATE_FILE_MD_PREFIX):-3].split('_') # Remove prefix and suffix before 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 = " ".join(parts[:-2]) # Join potentially multiple parts for name
             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
+                dt_obj = pytz.utc.localize(dt_obj) # Assume UTC since generated with UTC
             except (ValueError, pytz.exceptions.AmbiguousTimeError, pytz.exceptions.NonExistentTimeError):
-                dt_obj = None # Parsing failed
-            return {"name": name.replace('_', ' '), "timestamp": timestamp_str, "dt": dt_obj, "filename": filename}
+                dt_obj = None # Parsing failed or timezone issue
+            return {"name": name or "Untitled", "timestamp": timestamp_str, "dt": dt_obj, "filename": filename}
 
-    # Fallback for unknown format
+    # Fallback for unknown format or parsing failure
     dt_fallback = None
     try:
          mtime = os.path.getmtime(filename)
          dt_fallback = datetime.fromtimestamp(mtime, tz=pytz.utc)
-    except Exception: pass
+    except Exception: pass # Ignore errors getting mtime
     return {"name": basename.replace('.md',''), "timestamp": "Unknown", "dt": dt_fallback, "filename": filename}
 
-
 def save_world_state_to_md(target_filename_base):
     """Saves the current in-memory world state to a specific MD file (basename)."""
     global world_objects
     save_path = os.path.join(SAVED_WORLDS_DIR, target_filename_base)
-    print(f"Acquiring lock to save world state to: {save_path}...")
+    print(f"Acquiring lock to save {len(world_objects)} objects 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
+        world_data_dict = dict(world_objects) # Create copy inside lock
         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
+        parsed_info = parse_world_filename(target_filename_base) # Use original filename for info
         timestamp_save = get_current_time_str()
         md_content = f"""# World State: {parsed_info['name']}
 * **File Saved:** {timestamp_save} (UTC)
-* **Source Timestamp:** {parsed_info['timestamp']}
+* **Original Timestamp:** {parsed_info['timestamp']}
 * **Objects:** {len(world_data_dict)}
 
 ```json
 {json.dumps(world_data_dict, indent=2)}
 ```"""
         try:
-            ensure_dir(SAVED_WORLDS_DIR)
+            ensure_dir(SAVED_WORLDS_DIR) # Ensure dir exists
             with open(save_path, 'w', encoding='utf-8') as f: f.write(md_content)
             print(f"World state saved successfully to {target_filename_base}")
             success = True
@@ -213,7 +216,6 @@ def save_world_state_to_md(target_filename_base):
             # Avoid st.error in potentially non-main thread
     return success
 
-
 def load_world_state_from_md(filename_base):
     """Loads world state from an MD file (basename), updates global state, returns success bool."""
     global world_objects
@@ -225,16 +227,15 @@ def load_world_state_from_md(filename_base):
 
     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*```", content, re.DOTALL | re.IGNORECASE)
         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))
 
         print(f"Acquiring lock to update world state from {filename_base}...")
         with world_objects_lock:
-             world_objects.clear()
-             for k, v in world_data_dict.items(): world_objects[str(k)] = v
+             world_objects.clear() # Clear previous state
+             for k, v in world_data_dict.items(): world_objects[str(k)] = v # Update with loaded data
              loaded_count = len(world_objects)
         print(f"Loaded {loaded_count} objects from {filename_base}. Lock released.")
         st.session_state.current_world_file = filename_base # Track loaded file (basename)
@@ -244,13 +245,12 @@ def load_world_state_from_md(filename_base):
     except Exception as e: st.error(f"Error loading world state from {filename_base}: {e}"); st.exception(e); return False
 
 def get_saved_worlds():
-    """Scans the saved worlds directory for world MD files and parses them."""
+    """Scans the saved worlds directory for 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
+        # Sort by datetime object if available (newest first)
         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:
@@ -305,16 +305,17 @@ 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())
+    text = re.sub(r'\[([^\]]+)\]\([^\)]+\)', r'\1', text) # Remove markdown links, keep text
+    text = re.sub(r'[#*_`!]', '', text) # Remove some markdown chars
+    text = ' '.join(text.split()) # Normalize whitespace
     return text[:250] or "No text"
 
 def create_file(content, username, file_type="md", save_path=None):
     if not save_path:
+         # Generate filename if specific path not given
          filename = generate_filename(content, username, file_type)
-         save_path = os.path.join(MEDIA_DIR, filename)
-    ensure_dir(os.path.dirname(save_path))
+         save_path = os.path.join(MEDIA_DIR, filename) # Save to base dir by default
+    ensure_dir(os.path.dirname(save_path)) # Ensure directory exists
     try:
         with open(save_path, 'w', encoding='utf-8') as f: f.write(content)
         print(f"Created file: {save_path}"); return save_path
@@ -334,8 +335,7 @@ def get_download_link(file_path, file_type="md"):
             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>'
+            link_html = f'<a href="data:{mime_types.get(file_type, "application/octet-stream")};base64,{b64}" download="{basename}">{FILE_EMOJIS.get(file_type, "📄")} DL</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}")
@@ -346,6 +346,7 @@ def get_download_link(file_path, file_type="md"):
 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 based on text hash and voice
     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)
@@ -369,8 +370,8 @@ def play_and_download_audio(file_path):
              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
+        except Exception as e: st.error(f"Audio display error: {e}")
+    else: st.warning(f"Audio file not found: {os.path.basename(file_path) if file_path else 'N/A'}")
 
 # --- Chat ---
 async def save_chat_entry(username, message, voice, is_markdown=False):
@@ -378,8 +379,7 @@ async def save_chat_entry(username, message, voice, is_markdown=False):
     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```"
-    md_filename_base = generate_filename(message, username, "md"); md_file_path = os.path.join(CHAT_DIR, md_filename_base);
-    md_file = create_file(entry, username, "md", save_path=md_file_path) # Save to file
+    md_filename_base = generate_filename(message, username, "md"); md_file_path = os.path.join(CHAT_DIR, md_filename_base); md_file = create_file(entry, username, "md", save_path=md_file_path)
     if 'chat_history' not in st.session_state: st.session_state.chat_history = [];
     st.session_state.chat_history.append(entry) # Add to live history
     audio_file = None;
@@ -390,7 +390,6 @@ async def save_chat_entry(username, message, voice, is_markdown=False):
 
 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:
         ensure_dir(CHAT_DIR)
@@ -401,7 +400,7 @@ async def load_chat_history():
              try:
                   with open(f_path, 'r', encoding='utf-8') as file: temp_history.append(file.read().strip()); loaded_count += 1
              except Exception as e: print(f"Err read chat {f_path}: {e}")
-        st.session_state.chat_history = temp_history # Assign loaded history
+        st.session_state.chat_history = temp_history
         print(f"Loaded {loaded_count} chat entries from files.")
     return st.session_state.chat_history
 
@@ -419,24 +418,20 @@ def create_zip_of_files(files_to_zip, prefix="Archive"):
     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
+    # Dynamically protect all currently saved world files unless explicitly targeted
+    try:
+        current_worlds = [os.path.basename(w['filename']) for w in get_saved_worlds()]
+        protected.extend(current_worlds)
+    except Exception: pass # Ignore if world listing fails
     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)
-         print(f"Attempting to delete files matching: {pattern_path}")
+         pattern_path = os.path.join(MEDIA_DIR, pattern) # Assume relative to app dir
          try:
               files_to_delete = glob.glob(pattern_path)
-              if not files_to_delete: print(f"No files found for pattern: {pattern}"); continue
-
+              if not files_to_delete: continue
               for f_path in files_to_delete:
                    basename = os.path.basename(f_path)
                    # Check if it's a file and NOT protected
@@ -444,17 +439,13 @@ def delete_files(file_patterns, exclude_files=None):
                         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
-
+         except Exception as glob_e: print(f"Err matching {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 ---
 async def save_pasted_image(image, username):
@@ -467,7 +458,7 @@ 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 📋")
+           paste_input = st.text_area("Paste Image Data Here (Ctrl+V)", 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'):
                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]
@@ -475,11 +466,12 @@ def paste_image_component():
                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 the image object if successfully pasted and submitted
       return pasted_img if submit_button and pasted_img else None
 
 
 # --- PDF Processing ---
+# Note: Depends on PyPDF2 and potentially AudioProcessor class if generating audio
 class AudioProcessor:
       def __init__(self): self.cache_dir=AUDIO_CACHE_DIR; ensure_dir(self.cache_dir); self.metadata=json.load(open(f"{self.cache_dir}/metadata.json", 'r')) if os.path.exists(f"{self.cache_dir}/metadata.json") else {}
       def _save_metadata(self):
@@ -487,7 +479,7 @@ 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=f"{self.cache_dir}/{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
@@ -502,55 +494,40 @@ class AudioProcessor:
 
 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()
+      if pdf_file is None:
+           st.info("Upload a PDF file to begin.")
+           return
+      audio_processor = AudioProcessor() # Instance for this run
       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}'...");
+          reader=PdfReader(pdf_file); 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):
+              # Runs async audio generation in a separate thread
               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
+              try: audio_path = asyncio.run(run_async_audio());
                    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:")
+               text=reader.pages[i].extract_text();
+               if text: 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]"
+
+          # Display results as they become available (or after join)
+          st.progress(0) # Placeholder for progress
+          # Wait for threads and display - consider using st.empty() for updates
+          for thread in page_threads: thread.join()
+
           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.")
+                     else: st.caption("Audio generation failed or pending.")
 
       except Exception as pdf_e: st.error(f"Err read PDF: {pdf_e}"); st.exception(pdf_e)
 
@@ -596,11 +573,7 @@ async def broadcast_world_update():
 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]}")
-
+    username = st.session_state.get('username', f"User_{client_id[:4]}") # Get username for this session
     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 +585,14 @@ 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
+                # Use username from payload if provided, otherwise session username
+                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
+                    # Schedule save/TTS, but broadcast immediately
+                    run_async(save_chat_entry, sender_username, chat_text, voice) # Fire and forget save
+                    await broadcast_message(message, exclude_id=client_id) # Forward original msg
 
                 elif msg_type == "place_object":
                     obj_data = payload.get("object_data");
@@ -638,18 +613,21 @@ async def websocket_handler(websocket, path):
                      else: print(f"WS Invalid delete_object payload: {payload}")
 
                 elif msg_type == "player_position":
-                     pos_data = payload.get("position"); rot_data = payload.get("rotation")
+                     pos_data = payload.get("position")
+                     rot_data = payload.get("rotation") # Optionally include rotation
                      if pos_data:
                           broadcast_payload = json.dumps({"type": "player_moved", "payload": {"username": sender_username, "id": client_id, "position": pos_data, "rotation": rot_data}});
                           await broadcast_message(broadcast_payload, exclude_id=client_id)
 
+                # Add more handlers here
+
             except json.JSONDecodeError: print(f"WS Invalid JSON from {client_id}: {message[:100]}...")
             except Exception as e: print(f"WS Error processing msg from {client_id}: {e}")
     except websockets.ConnectionClosed: print(f"WS Client disconnected: {client_id} ({username})")
     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():
@@ -659,12 +637,11 @@ async def run_websocket_server():
     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
+    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.")
@@ -676,32 +653,15 @@ def start_websocket_server_thread():
     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 = asyncio.new_event_loop(); asyncio.set_event_loop(loop)
+        try: loop.run_until_complete(run_websocket_server())
+        finally: loop.close(); print("Server thread loop closed.")
     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!")
 
 
 # ==============================================================================
-# Streamlit UI Layout Functions
+# Streamlit UI Layout
 # ==============================================================================
 
 def render_sidebar():
@@ -710,70 +670,72 @@ def render_sidebar():
         st.header("💾 World Versions")
         st.caption("Load or save named world states.")
 
+        # World Selector
         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
+        # Create display text mapping filename to formatted string
+        world_options = {w['filename']: f"{w['name']} ({w['timestamp']})" for w in saved_worlds}
+        # Get the currently selected filename (basename) from session state
+        current_selection_basename = st.session_state.get('current_world_file', None)
+
+        # Prepare options for radio button: None first, then filenames
+        radio_options_list = [None] + [w['filename'] for w in saved_worlds] # Store full path initially? No, use basename.
         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
+        # Find the index of the current selection in the options list
+        current_radio_index = 0 # Default to "Live State"
         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
+             try:
+                  current_radio_index = radio_options_basenames.index(current_selection_basename)
+             except ValueError:
+                  current_radio_index = 0 # Fallback if filename somehow not in list
 
+        # Display radio buttons
         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
+             "Load World:",
+             options=radio_options_basenames,
+             index=current_radio_index,
+             format_func=lambda x: "Live State (Unsaved)" if x is None else world_options.get(os.path.join(SAVED_WORLDS_DIR, x), x), # Format using full path to get name/time? complex
              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 # Store 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
                           st.toast("World loaded!", icon="✅")
-                      else: st.error("Failed to load world."); st.session_state.current_world_file = None
-             else: # Switched to "Live State"
+                      else:
+                          st.error("Failed to load world."); st.session_state.current_world_file = None # Reset on failure
+             else:
                   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)
+                  # Optionally clear world or just stop tracking file? Stop tracking.
+                  # Maybe broadcast current live state if switching TO live?
+                  # run_async(broadcast_world_update) # Broadcast current live state
                   st.toast("Switched to Live State.")
              st.rerun()
 
-        # Download Links for Worlds
+        # Display download links
         st.caption("Download:")
-        cols = st.columns([4, 1]) # Columns for name and download button
-        with cols[0]: st.write("**World 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
+        cols = st.columns([3, 1]) # Columns for name and download button
+        with cols[0]: st.write("**Name**")
+        with cols[1]: st.write("**Link**")
+        for world_info in saved_worlds:
             f_basename = os.path.basename(world_info['filename'])
-            f_fullpath = os.path.join(SAVED_WORLDS_DIR, f_basename) # Reconstruct full path for link
+            f_fullpath = world_info['filename'] # Full path needed for reading file
             display_name = world_info.get('name', f_basename)
             timestamp = world_info.get('timestamp', 'N/A')
-            col1, col2 = st.columns([4, 1])
+            col1, col2 = st.columns([3, 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
+        # Save New Version moved to Files Tab
+
+        # Build Tools section
         st.header("🏗️ Build Tools")
         st.caption("Select an object to place.")
         cols = st.columns(5)
@@ -784,8 +746,7 @@ 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}"))
+                    run_async(lambda: streamlit_js_eval(f"updateSelectedObjectType({json.dumps(name)});", key=f"update_tool_js_{name}")) # Fire-and-forget JS update
                     st.rerun()
             col_idx += 1
         st.markdown("---")
@@ -795,18 +756,18 @@ def render_sidebar():
                   run_async(lambda: streamlit_js_eval("updateSelectedObjectType('None');", key="update_tool_js_none"))
                   st.rerun()
 
-        # Voice/User Section
+        # 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))
@@ -822,24 +783,20 @@ def render_main_content():
     with tab_world:
         st.header("Shared 3D World")
         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}`)")
-        else: st.info("Live State Active (Unsaved changes only persist if saved)")
+        current_file = st.session_state.get('current_world_file', None)
+        if current_file: parsed = parse_world_filename(current_file); st.info(f"Current World: **{parsed['name']}** (`{os.path.basename(current_file)}`)")
+        else: st.info("Live State Active (Unsaved changes will be lost unless saved as new version)")
 
         # 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
+            try: # Get WS URL
                  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]
                  ws_url = f"ws://{server_host}:8765"
-            except Exception as e: print(f"WS URL detection failed ({e}), using localhost.")
+            except Exception: ws_url = "ws://localhost:8765"
 
             js_injection_script = f"""<script>
     window.USERNAME = {json.dumps(st.session_state.username)};
@@ -857,15 +814,10 @@ 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 = run_async(load_chat_history).result() if 'chat_history' not in st.session_state else st.session_state.chat_history # Load sync if needed
         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
@@ -876,59 +828,56 @@ 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)
+                run_async(broadcast_message, ws_message) # Send via WS
+                run_async(save_chat_entry, st.session_state.username, message_to_send, voice) # Save locally
                 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
 
     # --- PDF Tab ---
     with tab_pdf:
          st.header("📚 PDF Tools")
          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")
+         max_pages = st.slider('Max Pages to Process', 1, 50, 10, key="pdf_pages") # Limit 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)
+              process_pdf_tab(pdf_file, max_pages, st.session_state.tts_voice)
+
 
     # --- Files & Settings Tab ---
     with tab_files:
         st.header("📂 Files & Settings")
         st.subheader("💾 World State Management")
-        current_file_basename = st.session_state.get('current_world_file', None)
+        current_file = 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.")
+        if current_file:
+             parsed = parse_world_filename(current_file); save_label = f"Save Changes to '{parsed['name']}'"
+             if st.button(save_label, key="save_current_world", help=f"Overwrite '{os.path.basename(current_file)}' with current live state."):
+                 with st.spinner(f"Overwriting {os.path.basename(current_file)}..."):
+                     if save_world_state_to_md(current_file): st.success("Current world version saved!")
+                     else: st.error("Failed to save world state.")
          else:
-             st.info("Load a world from the sidebar to enable saving changes to it.")
+             st.info("Load a world version from the sidebar or use 'Save New Version' below to save the current live state.")
 
         # 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'))
+        new_name_files = st.text_input("New World Name:", key="new_world_name_files") # Use different key from sidebar one if kept there
         if st.button("💾 Save Live State as New Version", key="save_new_version_files"):
              if new_name_files.strip():
-                  new_filename_base = generate_world_save_filename(new_name_files)
+                  new_filename = generate_world_save_filename(new_name_files) # Generates basename
                   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
+                      if save_world_state_to_md(new_filename): # Pass basename
+                          st.success(f"Saved as {new_filename}")
+                          st.session_state.current_world_file = new_filename # Switch to new file automatically
+                          st.session_state.new_world_name_files = "" # Reset input
                           st.rerun()
                       else: st.error("Failed to save new version.")
-             else: st.warning("Please enter a name.")
+             else: st.warning("Please enter a name for the new world version.")
 
         st.subheader("⚙️ Server Status")
         col_ws, col_clients = st.columns(2)
@@ -946,24 +895,14 @@ 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", help="Deletes world save files (.md) in saved_worlds"): 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()
 
         # 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("*.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")
-             with col_zip2:
-                   if st.button("Zip Chats"): create_zip_of_files(glob.glob(os.path.join(CHAT_DIR, "*.md")), "Chats")
-             with col_zip3:
-                   if st.button("Zip Audio"): create_zip_of_files(glob.glob(os.path.join(AUDIO_DIR, "*.mp3")) + glob.glob(os.path.join(AUDIO_CACHE_DIR, "*.mp3")), "Audio")
-
-             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.")
 
@@ -974,62 +913,40 @@ 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
     if not st.session_state.get('initial_world_state_loaded', False):
-        print("Performing initial world load for session...")
+        print("Performing initial world load...")
         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.")
+             load_world_state_from_md(latest_world_file_basename) # This updates global state and sets session state 'current_world_file'
          else:
               print("No saved worlds found, starting with empty state.")
+              with world_objects_lock: world_objects.clear() # Ensure empty state
+              st.session_state.current_world_file = None # Ensure no file is marked as loaded
+         st.session_state.initial_world_state_loaded = True
+         print("Initial world load complete.")
 
-        # Ensure global dict is empty if no file loaded successfully
-        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
-        print("Initial world load process complete.")
 
 if __name__ == "__main__":
-    # 1. Initialize session state first (essential for other checks)
+    # 1. Initialize session state first
     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
+    # Use server_running_flag to prevent multiple start attempts within one session
+    if not st.session_state.get('server_running_flag', False):
+         if 'server_task' not in st.session_state or not st.session_state.server_task.is_alive():
+              start_websocket_server_thread()
+         else:
+              # If task exists but flag is false, maybe update flag?
+              if st.session_state.server_task.is_alive():
+                  st.session_state.server_running_flag = True
+                  print("Corrected server_running_flag based on alive thread.")
+
+
+    # 3. Load initial world state from disk if needed
     initialize_world()
 
     # 4. Render the UI (Sidebar and Main Content)
     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()