Update app.py

app.py

@@ -1,6 +1,6 @@
+# app.py (Refactored - Client State Save, Action Log, Radio Tools)
 import streamlit as st
 import asyncio
-import websockets
 import uuid
 from datetime import datetime
 import os
@@ -11,77 +11,59 @@ import glob
 import base64
 import io
 import streamlit.components.v1 as components
-import edge_tts
+import edge_tts # Keep for TTS
 import nest_asyncio
 import re
 import pytz
 import shutil
-from PyPDF2 import PdfReader
-import threading
+# from PyPDF2 import PdfReader # Keep if PDF tab is kept
+import threading # Keep lock for potential future use or background tasks
 import json
 import zipfile
 from dotenv import load_dotenv
-from streamlit_marquee import streamlit_marquee # Keep import if used
-from collections import defaultdict, Counter
-import pandas as pd # Keep for potential fallback logic if needed
-from streamlit_js_eval import streamlit_js_eval
+# from streamlit_marquee import streamlit_marquee # Keep import if used
+from collections import defaultdict, Counter, deque # Use deque for action log
+# import pandas as pd # Removed dependency
+from streamlit_js_eval import streamlit_js_eval, sync
 from PIL import Image # Needed for paste_image_component
 
 # ==============================================================================
 # Configuration & Constants
 # ==============================================================================
-
-# 🛠️ Patch asyncio for nesting
-nest_asyncio.apply()
-
-# 🎨 Page Config
-st.set_page_config(
-    page_title="🤖🏗️ Shared World Builder 🏆",
-    page_icon="🏗️",
-    layout="wide",
-    initial_sidebar_state="expanded"
-)
+st.set_page_config(page_title="🏗️ World Action Builder 🏆", page_icon="🏗️", layout="wide", initial_sidebar_state="expanded")
+nest_asyncio.apply() # Patch asyncio
 
 # General Constants
-icons = '🤖🏗️🗣️💾'
-Site_Name = '🤖🏗️ Shared World Builder 🗣️'
-START_ROOM = "World Lobby 🌍"
-MEDIA_DIR = "." # Base directory for general files
-STATE_FILE = "user_state.txt" # For remembering username
-
-# User/Chat Constants
-FUN_USERNAMES = {
-    "BuilderBot 🤖": "en-US-AriaNeural", "WorldWeaver 🕸️": "en-US-JennyNeural",
-    "Terraformer 🌱": "en-GB-SoniaNeural", "SkyArchitect ☁️": "en-AU-NatashaNeural",
-    "PixelPainter 🎨": "en-CA-ClaraNeural", "VoxelVortex 🌪️": "en-US-GuyNeural",
-    "CosmicCrafter ✨": "en-GB-RyanNeural", "GeoGuru 🗺️": "en-AU-WilliamNeural",
-    "BlockBard 🧱": "en-CA-LiamNeural", "SoundSculptor 🔊": "en-US-AnaNeural",
-}
-EDGE_TTS_VOICES = list(set(FUN_USERNAMES.values()))
-CHAT_DIR = "chat_logs"
+Site_Name = '🏗️ World Action Builder'
+MEDIA_DIR = "."
+STATE_FILE = "user_state.txt"
+DEFAULT_TTS_VOICE = "en-US-AriaNeural"
 
-# Audio Constants
+# Directories
+CHAT_DIR = "chat_logs"
 AUDIO_CACHE_DIR = "audio_cache"
 AUDIO_DIR = "audio_logs"
+SAVED_WORLDS_DIR = "saved_worlds"
 
 # World Builder Constants
-SAVED_WORLDS_DIR = "saved_worlds" # Directory for MD world files
-PLOT_WIDTH = 50.0 # Needed for JS injection
-PLOT_DEPTH = 50.0 # Needed for JS injection
-WORLD_STATE_FILE_MD_PREFIX = "🌍_" # Prefix for world save files
+PLOT_WIDTH = 50.0
+PLOT_DEPTH = 50.0
+WORLD_STATE_FILE_MD_PREFIX = "🌍_"
+MAX_ACTION_LOG_SIZE = 30 # Max entries in sidebar action log
 
 # File Emojis
 FILE_EMOJIS = {"md": "📝", "mp3": "🎵", "png": "🖼️", "mp4": "🎥", "zip": "📦", "json": "📄"}
 
-# --- Mapping Emojis to Primitive Types ---
-# Ensure these types match the createPrimitiveMesh function keys in index.html
+# Primitives Map (Tool Name -> Emoji for Radio Button Display)
 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"
-    # Add more pairs up to ~20 if desired
+    "Tree": "🌳", "Rock": "🗿", "Simple House": "🏛️", "Pine Tree": "🌲", "Brick Wall": "🧱",
+    "Sphere": "🔵", "Cube": "📦", "Cylinder": "🧴", "Cone": "🍦", "Torus": "🍩",
+    "Mushroom": "🍄", "Cactus": "🌵", "Campfire": "🔥", "Star": "⭐", "Gem": "💎",
+    "Tower": "🗼", "Barrier": "🚧", "Fountain": "⛲", "Lantern": "🏮", "Sign Post": "팻"
 }
+# Add None option for clearing tool
+TOOLS_MAP = {"None": "🚫"}
+TOOLS_MAP.update({name: emoji for emoji, name in PRIMITIVE_MAP.items()}) # Combine for radio options
 
 # --- Directories ---
 for d in [CHAT_DIR, AUDIO_DIR, AUDIO_CACHE_DIR, SAVED_WORLDS_DIR]:
@@ -89,109 +71,70 @@ for d in [CHAT_DIR, AUDIO_DIR, AUDIO_CACHE_DIR, SAVED_WORLDS_DIR]:
 
 # --- API Keys (Placeholder) ---
 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 ---
-world_objects_lock = threading.Lock()
-world_objects = defaultdict(dict) # In-memory world state {obj_id: data}
-connected_clients = set() # Holds client_id strings
 
 # ==============================================================================
 # Utility Functions
 # ==============================================================================
-
 def get_current_time_str(tz='UTC'):
-    """Gets formatted timestamp string in specified timezone (default UTC)."""
-    try:
-        timezone = pytz.timezone(tz)
-        now_aware = datetime.now(timezone)
-    except pytz.UnknownTimeZoneError:
-        now_aware = datetime.now(pytz.utc)
-    except Exception as e:
-         print(f"Timezone error ({tz}), using UTC. Error: {e}")
-         now_aware = datetime.now(pytz.utc)
+    try: timezone = pytz.timezone(tz); now_aware = datetime.now(timezone)
+    except Exception: now_aware = datetime.now(pytz.utc)
     return now_aware.strftime('%Y%m%d_%H%M%S')
 
-
-def clean_filename_part(text, max_len=30):
-    """Cleans a string part for use in a filename."""
+def clean_filename_part(text, max_len=25): # Shorter max len
     if not isinstance(text, str): text = "invalid_name"
-    text = re.sub(r'\s+', '_', text) # Replace spaces
-    text = re.sub(r'[^\w\-.]', '', text) # Keep word chars, hyphen, period
+    text = re.sub(r'\s+', '_', text); text = re.sub(r'[^\w\-.]', '', text)
     return text[:max_len]
 
 def run_async(async_func, *args, **kwargs):
     """Runs an async function safely from a sync context using create_task."""
-    try:
-        loop = asyncio.get_running_loop()
-        return loop.create_task(async_func(*args, **kwargs))
-    except RuntimeError: # No running loop in this thread
-        print(f"Warning: Running async func {async_func.__name__} in new event loop.")
-        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
-    except Exception as e:
-        print(f"Error scheduling async task {async_func.__name__}: {e}")
-        return None
-
-def ensure_dir(dir_path):
-     """Creates directory if it doesn't exist."""
-     os.makedirs(dir_path, exist_ok=True)
-
-# Ensure directories exist on startup
-for d in [CHAT_DIR, AUDIO_DIR, AUDIO_CACHE_DIR, SAVED_WORLDS_DIR]:
-    ensure_dir(d)
+    try: loop = asyncio.get_running_loop(); return loop.create_task(async_func(*args, **kwargs))
+    except RuntimeError:
+        try: return asyncio.run(async_func(*args, **kwargs))
+        except Exception as e: print(f"Error run_async new loop: {e}"); return None
+    except Exception as e: print(f"Error run_async schedule task: {e}"); return None
+
+def ensure_dir(dir_path): os.makedirs(dir_path, exist_ok=True)
 
 # ==============================================================================
 # World State File Handling (Markdown + JSON)
 # ==============================================================================
-
-def generate_world_save_filename(name="World"):
-    """Generates a filename for saving world state MD files."""
-    timestamp = get_current_time_str() # Use UTC for consistency
-    clean_name = clean_filename_part(name)
-    rand_hash = hashlib.md5(str(time.time()).encode() + name.encode()).hexdigest()[:6] # Seed hash
-    return f"{WORLD_STATE_FILE_MD_PREFIX}{clean_name}_{timestamp}_{rand_hash}.md"
+def generate_world_save_filename(username="User", world_name="World"):
+    """Generates filename including username, world name, timestamp."""
+    timestamp = get_current_time_str()
+    clean_user = clean_filename_part(username, 15)
+    clean_world = clean_filename_part(world_name, 20)
+    rand_hash = hashlib.md5(str(time.time()).encode() + username.encode() + world_name.encode()).hexdigest()[:4]
+    return f"{WORLD_STATE_FILE_MD_PREFIX}{clean_world}_by_{clean_user}_{timestamp}_{rand_hash}.md"
 
 def parse_world_filename(filename):
-    """Extracts info from filename if possible, otherwise returns defaults."""
+    """Extracts info from filename (Name, User, Time, Hash)."""
     basename = os.path.basename(filename)
-    # Check prefix and suffix
     if basename.startswith(WORLD_STATE_FILE_MD_PREFIX) and basename.endswith(".md"):
-        core_name = basename[len(WORLD_STATE_FILE_MD_PREFIX):-3]
-        parts = core_name.split('_')
-        if len(parts) >= 3: # Expecting Name_Timestamp_Hash
+        core = basename[len(WORLD_STATE_FILE_MD_PREFIX):-3] # Remove prefix/suffix
+        parts = core.split('_') # Split by underscore
+        if len(parts) >= 5 and parts[-3] == "by": # Expect Name_by_User_Timestamp_Hash
             timestamp_str = parts[-2]
-            name_parts = parts[:-2]; name = "_".join(name_parts) if name_parts else "Untitled"
+            username = parts[-4]
+            world_name = " ".join(parts[:-4]) # Join name parts
             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
-            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)
-    except Exception: pass
-    return {"name": basename.replace('.md',''), "timestamp": "Unknown", "dt": dt_fallback, "filename": filename}
+            try: dt_obj = pytz.utc.localize(datetime.strptime(timestamp_str, '%Y%m%d_%H%M%S'))
+            except Exception: dt_obj = None
+            return {"name": world_name or "Untitled", "user": username, "timestamp": timestamp_str, "dt": dt_obj, "filename": filename}
 
+    # Fallback
+    dt_fallback = None; try: mtime = os.path.getmtime(filename); dt_fallback = datetime.fromtimestamp(mtime, tz=pytz.utc)
+    except Exception: pass
+    return {"name": basename.replace('.md','').replace(WORLD_STATE_FILE_MD_PREFIX, ''), "user": "Unknown", "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
+def save_world_to_md(target_filename_base, world_data_dict):
+    """Saves the provided world state dictionary to a specific MD file."""
     save_path = os.path.join(SAVED_WORLDS_DIR, target_filename_base)
-    print(f"Acquiring lock to save world state to: {save_path}...")
+    print(f"Saving {len(world_data_dict)} objects to MD file: {save_path}...")
     success = False
-    with world_objects_lock:
-        world_data_dict = dict(world_objects) # Convert defaultdict for saving
-        print(f"Saving {len(world_data_dict)} objects...")
-        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']}
+    # No lock needed as we're writing data received from JS, not modifying shared state directly
+    parsed_info = parse_world_filename(save_path)
+    timestamp_save = get_current_time_str()
+    md_content = f"""# World State: {parsed_info['name']} by {parsed_info['user']}
 * **File Saved:** {timestamp_save} (UTC)
 * **Source Timestamp:** {parsed_info['timestamp']}
 * **Objects:** {len(world_data_dict)}
@@ -199,63 +142,47 @@ def save_world_state_to_md(target_filename_base):
 ```json
 {json.dumps(world_data_dict, indent=2)}
 ```"""
-        try:
-            ensure_dir(SAVED_WORLDS_DIR)
-            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
-        except Exception as e:
-            print(f"Error saving world state to {save_path}: {e}")
+    try:
+        ensure_dir(SAVED_WORLDS_DIR);
+        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
+    except Exception as e: print(f"Error saving world state to {save_path}: {e}")
     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
+def load_world_from_md(filename_base):
+    """Loads world state dict from an MD file (basename), DOES NOT update global state."""
     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
-
+    print(f"Loading world state dictionary from MD file: {load_path}...")
+    if not os.path.exists(load_path): st.error(f"World file not found: {filename_base}"); return None
     try:
         with open(load_path, 'r', encoding='utf-8') as f: content = f.read()
-        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
-
+        json_match = re.search(r"```json\s*(\{[\s\S]*?\})\s*```", content, re.IGNORECASE)
+        if not json_match: st.error(f"Could not find valid JSON block in {filename_base}"); return None
         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
-             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)
-        return True
-
-    except json.JSONDecodeError as e: st.error(f"Invalid JSON found in {filename_base}: {e}"); return False
-    except Exception as e: st.error(f"Error loading world state from {filename_base}: {e}"); st.exception(e); return False
+        print(f"Parsed {len(world_data_dict)} objects from {filename_base}.")
+        return world_data_dict # Return the dictionary
+    except json.JSONDecodeError as e: st.error(f"Invalid JSON found in {filename_base}: {e}"); return None
+    except Exception as e: st.error(f"Error loading world state from {filename_base}: {e}"); st.exception(e); return None
 
 def get_saved_worlds():
     """Scans the saved worlds directory for world MD files and parses them."""
     try:
-        ensure_dir(SAVED_WORLDS_DIR)
+        ensure_dir(SAVED_WORLDS_DIR);
         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]
         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 []
+    except Exception as e: print(f"Error scanning saved worlds: {e}"); st.error(f"Could not scan saved worlds: {e}"); return []
 
 # ==============================================================================
 # User State & Session Init
 # ==============================================================================
-
-def save_username(username):
+def save_username(username): # Keep as is
     try:
         with open(STATE_FILE, 'w') as f: f.write(username)
     except Exception as e: print(f"Failed save username: {e}")
 
-def load_username():
+def load_username(): # Keep as is
     if os.path.exists(STATE_FILE):
         try:
             with open(STATE_FILE, 'r') as f: return f.read().strip()
@@ -265,47 +192,78 @@ def load_username():
 def init_session_state():
     """Initializes Streamlit session state variables."""
     defaults = {
-        'server_running_flag': False, 'server_instance': None, 'server_task': None,
-        'active_connections': defaultdict(dict), 'last_chat_update': 0, 'message_input': "",
-        'audio_cache': {}, 'tts_voice': "en-US-AriaNeural", 'chat_history': [],
-        'marquee_settings': {"background": "#1E1E1E", "color": "#FFFFFF", "font-size": "14px", "animationDuration": "20s", "width": "100%", "lineHeight": "35px"},
-        'enable_audio': True, 'download_link_cache': {}, 'username': None, 'autosend': False,
-        'last_message': "", 'timer_start': time.time(), 'last_sent_transcript': "",
-        'last_refresh': time.time(), 'auto_refresh': False, 'refresh_rate': 30,
-        'selected_object': 'None', 'initial_world_state_loaded': False,
+        'last_chat_update': 0, 'message_input': "", 'audio_cache': {},
+        'tts_voice': DEFAULT_TTS_VOICE, 'chat_history': [], 'enable_audio': True,
+        'download_link_cache': {}, 'username': None, 'autosend': False,
+        'last_message': "",
+        'selected_object': 'None', # Current building tool
         'current_world_file': None, # Track loaded world filename (basename)
-        'operation_timings': {}, 'performance_metrics': defaultdict(list),
-        'paste_image_base64': "", 'new_world_name': "MyWorld"
+        'new_world_name': "MyWorld",
+        'action_log': deque(maxlen=MAX_ACTION_LOG_SIZE), # Use deque for fixed-size log
+        'world_to_load_data': None, # Temp storage for state loaded from file before sending to JS
+        'js_object_placed_data': None # Temp storage for data coming from JS place event
     }
     for k, v in defaults.items():
-        if k not in st.session_state: st.session_state[k] = v
-    # Ensure complex types initialized correctly
-    if not isinstance(st.session_state.active_connections, defaultdict): st.session_state.active_connections = defaultdict(dict)
+        if k not in st.session_state:
+            if k == 'action_log': st.session_state[k] = deque(maxlen=MAX_ACTION_LOG_SIZE)
+            else: st.session_state[k] = v
+    # Ensure complex types initialized correctly if state is reloaded badly
     if not isinstance(st.session_state.chat_history, list): st.session_state.chat_history = []
-    if not isinstance(st.session_state.marquee_settings, dict): st.session_state.marquee_settings = defaults['marquee_settings']
     if not isinstance(st.session_state.audio_cache, dict): st.session_state.audio_cache = {}
     if not isinstance(st.session_state.download_link_cache, dict): st.session_state.download_link_cache = {}
+    if not isinstance(st.session_state.action_log, deque): st.session_state.action_log = deque(maxlen=MAX_ACTION_LOG_SIZE)
+
+# ==============================================================================
+# Action Log Helper
+# ==============================================================================
+def add_action_log(message):
+    """Adds a message to the session's action log."""
+    if 'action_log' not in st.session_state:
+        st.session_state.action_log = deque(maxlen=MAX_ACTION_LOG_SIZE)
+    timestamp = datetime.now().strftime("%H:%M:%S")
+    st.session_state.action_log.appendleft(f"[{timestamp}] {message}") # Add to front
 
 # ==============================================================================
-# Audio / TTS / Chat / File Handling Helpers
+# JS Communication Handler Function (Called from JS via streamlit_js_eval)
 # ==============================================================================
+# NOTE: Functions called by streamlit_js_eval run in the main Python thread.
+# Avoid blocking operations here. Use session state to pass data if needed.
+
+def handle_js_object_placed(data):
+    """Callback triggered by JS when an object is placed."""
+    print(f"Python received object placed event: {data}") # Debug
+    if isinstance(data, dict) and data.get('obj_id') and data.get('type'):
+        # Store data in session state to be processed in the main script flow
+        st.session_state.js_object_placed_data = data
+        # Add to action log immediately
+        add_action_log(f"Placed {data.get('type', 'object')} ({data.get('obj_id', 'N/A')[:6]}...)")
+        # Need a rerun for the main loop to process st.session_state.js_object_placed_data
+        # However, triggering rerun from here can be complex.
+        # Let the natural Streamlit flow handle picking it up.
+    else:
+        print("Received invalid object placement data from JS.")
+    return True # Acknowledge receipt to JS
 
-# --- Text & File Helpers ---
-def clean_text_for_tts(text):
+
+# ==============================================================================
+# Audio / TTS / Chat / File Handling Helpers (Unchanged from previous)
+# ==============================================================================
+# (Include the full code for these helpers: clean_text_for_tts, create_file,
+#  get_download_link, async_edge_tts_generate, play_and_download_audio,
+#  save_chat_entry, load_chat_history, create_zip_of_files, delete_files,
+#  save_pasted_image, paste_image_component, AudioProcessor, process_pdf_tab)
+# --- Placeholder for brevity ---
+def clean_text_for_tts(text): # ... implementation ...
     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"
-
-def create_file(content, username, file_type="md", save_path=None):
+def create_file(content, username, file_type="md", save_path=None): # ... implementation ...
     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}"); # Can be too verbose
-        return save_path
+        with open(save_path, 'w', encoding='utf-8') as f: f.write(content); 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"):
+def get_download_link(file_path, file_type="md"): # ... implementation ...
     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
@@ -320,9 +278,7 @@ def get_download_link(file_path, file_type="md"):
             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>"
     return st.session_state.download_link_cache.get(cache_key, "<small>CacheErr</small>")
-
-# --- Audio / TTS ---
-async def async_edge_tts_generate(text, voice, username):
+async def async_edge_tts_generate(text, voice, username): # ... implementation ...
     if not text: return None
     cache_key = hashlib.md5(f"{text[:150]}_{voice}".encode()).hexdigest();
     if 'audio_cache' not in st.session_state: st.session_state.audio_cache = {}
@@ -337,67 +293,52 @@ async def async_edge_tts_generate(text, voice, username):
         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):
+def play_and_download_audio(file_path): # ... implementation ...
     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)
+        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}")
-
-# --- Chat ---
-async def save_chat_entry(username, message, voice, is_markdown=False):
+async def save_chat_entry(username, message, voice, is_markdown=False): # ... implementation ...
     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```"
+    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_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
+    st.session_state.chat_history.append(entry)
     audio_file = None;
-    if st.session_state.get('enable_audio', True):
-         tts_message = message # Use original message for TTS
-         audio_file = await async_edge_tts_generate(tts_message, voice, username)
+    if st.session_state.get('enable_audio', True): tts_message = message ; audio_file = await async_edge_tts_generate(tts_message, voice, username)
     return md_file, audio_file
-
-async def load_chat_history():
-    if 'chat_history' not in st.session_state: 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
-        temp_history = []
-        for f_path in chat_files:
-             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
-        print(f"Loaded {loaded_count} chat entries from files.")
-    return st.session_state.chat_history
-
-# --- File Management ---
-def create_zip_of_files(files_to_zip, prefix="Archive"):
+async def load_chat_history(): # ... implementation ...
+     if 'chat_history' not in st.session_state: st.session_state.chat_history = []
+     if not st.session_state.chat_history:
+          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
+          temp_history = []
+          for f_path in chat_files:
+               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
+          print(f"Loaded {loaded_count} chat entries from files.")
+     return st.session_state.chat_history
+def create_zip_of_files(files_to_zip, prefix="Archive"): # ... implementation ...
     if not files_to_zip: st.warning("No files provided to zip."); return None
     timestamp = format_timestamp_prefix(f"Zip_{prefix}"); zip_name = f"{prefix}_{timestamp}.zip"
     try:
         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)) # Use basename in archive
+                 if os.path.exists(f): z.write(f, os.path.basename(f))
                  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."""
+def delete_files(file_patterns, exclude_files=None): # ... implementation ...
     protected = [STATE_FILE, "app.py", "index.html", "requirements.txt", "README.md"]
-    # Don't automatically protect current world file during generic delete
+    current_world_base = st.session_state.get('current_world_file')
+    if current_world_base: protected.append(current_world_base)
     if exclude_files: protected.extend(exclude_files)
-
     deleted_count = 0; errors = 0
     for pattern in file_patterns:
-         pattern_path = pattern # Assume pattern includes path from os.path.join
+         pattern_path = pattern
          print(f"Attempting to delete files matching: {pattern_path}")
          try:
               files_to_delete = glob.glob(pattern_path)
@@ -414,34 +355,30 @@ def delete_files(file_patterns, exclude_files=None):
     elif deleted_count > 0: st.success(msg)
     else: st.info("No matching files found to delete.")
     st.session_state['download_link_cache'] = {}; st.session_state['audio_cache'] = {}
-
-
-# --- Image Handling ---
-async def save_pasted_image(image, username):
+async def save_pasted_image(image, username): # ... implementation ...
      if not image: return None
-     try:
-          img_hash = hashlib.md5(image.tobytes()).hexdigest()[:8]; timestamp = format_timestamp_prefix(username); filename = f"{timestamp}_pasted_{img_hash}.png"; filepath = os.path.join(MEDIA_DIR, filename)
-          image.save(filepath, "PNG"); print(f"Pasted image saved: {filepath}"); return filepath
+     try: img_hash = hashlib.md5(image.tobytes()).hexdigest()[:8]; timestamp = format_timestamp_prefix(username); filename = f"{timestamp}_pasted_{img_hash}.png"; filepath = os.path.join(MEDIA_DIR, filename); image.save(filepath, "PNG"); print(f"Pasted image saved: {filepath}"); return filepath
      except Exception as e: print(f"Failed image save: {e}"); return None
-
-def paste_image_component():
+def paste_image_component(): # ... implementation ...
       pasted_img = None; img_type = None
-      # 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'):
+      paste_input_value = st.text_area("Paste Image Data Here", key="paste_input_area", height=50, value=st.session_state.get('paste_image_base64_input', ""))
+      if st.button("Process Pasted Image 📋", key="process_paste_button"):
+           st.session_state.paste_image_base64_input = paste_input_value
+           if paste_input_value and paste_input_value.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]
+                   mime_type = paste_input_value.split(';')[0].split(':')[1]; base64_str = paste_input_value.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
+                   st.session_state.paste_image_base64_input = ""
+                   st.rerun()
                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 = ""
-           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 ---
-class AudioProcessor:
+               except Exception as e: st.error(f"Img decode err: {e}"); st.session_state.paste_image_base64 = ""; st.session_state.paste_image_base64_input = paste_input_value
+           else: st.warning("No valid image data pasted."); st.session_state.paste_image_base64 = ""; st.session_state.paste_image_base64_input = paste_input_value
+      processed_b64 = st.session_state.get('paste_image_base64', '')
+      if processed_b64:
+           try: img_bytes = base64.b64decode(processed_b64); return Image.open(io.BytesIO(img_bytes))
+           except Exception: return None
+      return None
+class AudioProcessor: # ... implementation ...
       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):
             try:
@@ -458,186 +395,7 @@ class AudioProcessor:
                  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 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
-# ==============================================================================
-
-async def register_client(websocket):
-    client_id = str(websocket.id); connected_clients.add(client_id);
-    if 'active_connections' not in st.session_state: st.session_state.active_connections = defaultdict(dict);
-    st.session_state.active_connections[client_id] = websocket; print(f"Client registered: {client_id}. Total: {len(connected_clients)}")
-
-async def unregister_client(websocket):
-    client_id = str(websocket.id); connected_clients.discard(client_id);
-    if 'active_connections' in st.session_state: st.session_state.active_connections.pop(client_id, None);
-    print(f"Client unregistered: {client_id}. Remaining: {len(connected_clients)}")
-
-async def send_safely(websocket, message, client_id):
-     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):
-    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)
-
-async def broadcast_world_update():
-    with world_objects_lock: current_state_payload = dict(world_objects)
-    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):
-    await register_client(websocket); client_id = str(websocket.id);
-    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)
-        print(f"Sent initial state ({len(initial_state_payload)} objs) to {client_id}")
-        await broadcast_message(json.dumps({"type": "user_join", "payload": {"username": username, "id": client_id}}), exclude_id=client_id)
-    except Exception as e: print(f"Error initial phase {client_id}: {e}")
-
-    try: # Message loop
-        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)
-
-                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)
-                    await broadcast_message(message, exclude_id=client_id)
-
-                elif msg_type == "place_object":
-                    obj_data = payload.get("object_data");
-                    if obj_data and 'obj_id' in obj_data and 'type' in obj_data:
-                        with world_objects_lock: world_objects[obj_data['obj_id']] = obj_data
-                        broadcast_payload = json.dumps({"type": "object_placed", "payload": {"object_data": obj_data, "username": sender_username}});
-                        await broadcast_message(broadcast_payload, exclude_id=client_id)
-                    else: print(f"WS Invalid place_object payload: {payload}")
-
-                elif msg_type == "delete_object":
-                     obj_id = payload.get("obj_id"); removed = False
-                     if obj_id:
-                          with world_objects_lock:
-                              if obj_id in world_objects: del world_objects[obj_id]; removed = True
-                          if removed:
-                               broadcast_payload = json.dumps({"type": "object_deleted", "payload": {"obj_id": obj_id, "username": sender_username}});
-                               await broadcast_message(broadcast_payload, exclude_id=client_id)
-                     else: print(f"WS Invalid delete_object payload: {payload}")
-
-                elif msg_type == "player_position":
-                     pos_data = payload.get("position"); rot_data = payload.get("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)
-
-            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)
-
-
-async def run_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:
-        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()
-    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():
-    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():
-        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!")
+# def process_pdf_tab(pdf_file, max_pages, voice): # ... implementation ... (Keep if needed)
 
 
 # ==============================================================================
@@ -647,90 +405,182 @@ def start_websocket_server_thread():
 def render_sidebar():
     """Renders the Streamlit sidebar contents."""
     with st.sidebar:
-        st.header("💾 World Versions")
-        st.caption("Load or save named world states.")
-
+        st.header("💾 World Management")
+
+        # --- World Save ---
+        current_world_name = "Live State"
+        current_file = st.session_state.get('current_world_file')
+        if current_file:
+            parsed = parse_world_filename(os.path.join(SAVED_WORLDS_DIR, current_file))
+            current_world_name = parsed.get("name", current_file)
+
+        save_button_label = f"💾 Save '{current_world_name}'" if current_file else "💾 Save Live State as New..."
+        if st.button(save_button_label, key="sidebar_save_world", help="Save the current state of the 3D world."):
+            with st.spinner("Requesting world state from client..."):
+                # Ask JS for the current world state
+                js_world_state_str = streamlit_js_eval("getWorldStateForSave();", key="get_world_state_js", want_result=True)
+
+            if js_world_state_str:
+                try:
+                    world_data_dict = json.loads(js_world_state_str)
+                    if isinstance(world_data_dict, dict):
+                        save_filename = ""
+                        if current_file: # Overwrite existing file
+                             save_filename = current_file
+                             op_text = f"Overwriting '{current_world_name}'..."
+                        else: # Save as new - prompt for name? Use session state?
+                            world_name_to_save = st.session_state.get("new_world_name", "NewWorld") # Get name from state
+                            if not world_name_to_save.strip(): world_name_to_save = "NewWorld"
+                            save_filename = generate_world_save_filename(st.session_state.username, world_name_to_save)
+                            op_text = f"Saving as new version '{world_name_to_save}'..."
+
+                        with st.spinner(op_text):
+                            if save_world_to_md(save_filename, world_data_dict):
+                                st.success(f"World saved as {save_filename}")
+                                add_action_log(f"Saved world: {save_filename}")
+                                st.session_state.current_world_file = save_filename # Track saved file
+                                st.rerun() # Refresh sidebar list
+                            else:
+                                st.error("Failed to save world state to file.")
+                    else:
+                         st.error("Received invalid world state format from client.")
+                except json.JSONDecodeError:
+                    st.error("Failed to decode world state received from client.")
+                except Exception as e:
+                     st.error(f"Error during save process: {e}")
+            else:
+                st.warning("Did not receive world state from client.")
+        # Input for "Save As New" name (used if no file loaded)
+        if not current_file:
+             st.text_input("World Name for Save:", key="new_world_name", value=st.session_state.get('new_world_name', 'MyWorld'))
+
+
+        # --- World Load ---
+        st.markdown("---")
+        st.header("📂 Load World")
         saved_worlds = get_saved_worlds()
-        world_options_display = {os.path.basename(w['filename']): f"{w['name']} ({w['timestamp']})" for w in saved_worlds}
-        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
-
-        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),
-             key="world_selector_radio"
-         )
-
-        if selected_basename != current_selection_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)
-                          st.toast("World loaded!", icon="✅")
-                      else: st.error("Failed to load world."); st.session_state.current_world_file = None
-             else:
-                  print("Switched to live state."); st.toast("Switched to Live State.")
-             st.rerun()
-
-        st.caption("Download:")
-        cols = st.columns([4, 1])
-        with cols[0]: st.write("**Name** (Timestamp)")
-        with cols[1]: st.write("**DL**")
-        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 not saved_worlds:
+             st.caption("No saved worlds found.")
+        else:
+             st.caption("Click to load a saved state.")
+             # Display load buttons and download links
+             cols = st.columns([4, 1]) # Columns for name and download button
+             with cols[0]: st.write("**Name** (User, Time)")
+             with cols[1]: st.write("**DL**")
+             display_limit = 15
+             for i, world_info in enumerate(saved_worlds):
+                f_basename = os.path.basename(world_info['filename'])
+                f_fullpath = os.path.join(SAVED_WORLDS_DIR, f_basename) # Reconstruct full path
+                display_name = world_info.get('name', f_basename)
+                user = world_info.get('user', 'N/A')
+                timestamp = world_info.get('timestamp', 'N/A')
+                display_text = f"{display_name} ({user}, {timestamp})"
+
+                # Logic for expander
+                is_last_displayed = i == display_limit -1
+                show_expander_trigger = len(saved_worlds) > display_limit and is_last_displayed
+
+                container = st
+                if show_expander_trigger and i == display_limit :
+                     container = st.expander(f"Show {len(saved_worlds)-display_limit} more...")
+
+                if i < display_limit or show_expander_trigger : # Render items within limit or inside expander
+                     with container:
+                          # Special handling to render first item inside expander if triggered
+                          if show_expander_trigger and i == display_limit:
+                              col1_exp, col2_exp, col3_exp = st.columns([3, 1, 1]);
+                              with col1_exp: btn_load = st.button(f"{display_text}", key=f"load_{f_basename}", help=f"Load {f_basename}", use_container_width=True)
+                              with col3_exp: st.markdown(get_download_link(f_fullpath, "md"), unsafe_allow_html=True)
+                          # Render items normally (either before limit or after limit inside expander)
+                          elif i < display_limit or not show_expander_trigger:
+                               col1, col2, col3 = st.columns([3, 1, 1]) # Added extra col for button
+                               with col1: st.write(f"<small>{display_text}</small>", unsafe_allow_html=True)
+                               with col2: btn_load = st.button("Load", key=f"load_{f_basename}", help=f"Load {f_basename}")
+                               with col3: st.markdown(get_download_link(f_fullpath, "md"), unsafe_allow_html=True)
+                          else: # Render remaining items inside expander
+                                for world_info_more in saved_worlds[display_limit+1:]: # Iterate remaining
+                                    f_bn_more=os.path.basename(world_info_more['filename']); f_fp_more=os.path.join(SAVED_WORLDS_DIR, f_bn_more); dn_more=world_info_more.get('name',f_bn_more); u_more=world_info_more.get('user','N/A'); ts_more=world_info_more.get('timestamp','N/A')
+                                    disp_more = f"{dn_more} ({u_more}, {ts_more})"
+                                    colA, colB, colC = st.columns([3, 1, 1]);
+                                    with colA: st.write(f"<small>{disp_more}</small>", unsafe_allow_html=True)
+                                    with colB: btn_load_more = st.button("Load", key=f"load_{f_bn_more}", help=f"Load {f_bn_more}")
+                                    with colC: st.markdown(get_download_link(f_fp_more, "md"), unsafe_allow_html=True)
+                                    # Handle button click for these items
+                                    if btn_load_more:
+                                        print(f"Load button clicked for: {f_bn_more}")
+                                        world_dict = load_world_from_md(f_bn_more)
+                                        if world_dict is not None:
+                                            st.session_state.world_to_load_data = world_dict # Store data to send to JS
+                                            st.session_state.current_world_file = f_bn_more
+                                            add_action_log(f"Loading world: {f_bn_more}")
+                                            st.rerun() # Trigger rerun to send data via injection/call
+                                        else: st.error(f"Failed to parse world file: {f_bn_more}")
+                                break # Stop outer loop after handling expander fully
+
+                     # Handle button click for items outside/at start of expander
+                     if btn_load:
+                          print(f"Load button clicked for: {f_basename}")
+                          world_dict = load_world_from_md(f_basename)
+                          if world_dict is not None:
+                              st.session_state.world_to_load_data = world_dict
+                              st.session_state.current_world_file = f_basename
+                              add_action_log(f"Loading world: {f_basename}")
+                              st.rerun()
+                          else: st.error(f"Failed to parse world file: {f_basename}")
+
+        # --- Build Tools ---
         st.markdown("---")
         st.header("🏗️ Build Tools")
         st.caption("Select an object to place.")
-        cols = st.columns(5)
-        col_idx = 0
-        current_tool = st.session_state.get('selected_object', 'None')
-        for emoji, name in PRIMITIVE_MAP.items():
-            button_key = f"primitive_{name}"; button_type = "primary" if current_tool == name else "secondary"
-            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
-                    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
+        # Use Radio Buttons for Tool Selection
+        tool_options = list(TOOLS_MAP.keys()) # "None", "Tree", "Rock", etc.
+        current_tool_name = st.session_state.get('selected_object', 'None')
+
+        selected_tool = st.radio(
+            "Select Tool:",
+            options=tool_options,
+            index=tool_options.index(current_tool_name) if current_tool_name in tool_options else 0,
+            format_func=lambda name: f"{TOOLS_MAP.get(name, '')} {name}", # Show emoji + name
+            key="tool_selector_radio",
+            horizontal=True # Make radio horizontal if preferred
+        )
+
+        # Handle tool change
+        if selected_tool != current_tool_name:
+            st.session_state.selected_object = selected_tool
+            add_action_log(f"Selected tool: {selected_tool}")
+            # Update JS via sync call
+            sync(js_code=f"updateSelectedObjectType({json.dumps(selected_tool)});", key=f"update_tool_js_{selected_tool}")
+            st.rerun() # Rerun to confirm selection visually if needed (might not be necessary)
+
+
+        # --- Action Log ---
         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';
-                  run_async(lambda: streamlit_js_eval("updateSelectedObjectType('None');", key="update_tool_js_none"))
-                  st.rerun()
+        st.header("📝 Action Log")
+        log_container = st.container(height=200)
+        with log_container:
+            if 'action_log' in st.session_state and st.session_state.action_log:
+                # Display log entries (newest first)
+                st.code('\n'.join(st.session_state.action_log), language="log")
+            else:
+                st.caption("No actions recorded yet.")
+
 
+        # --- Voice/User ---
         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
+        current_username = st.session_state.get('username', list(FUN_USERNAMES.keys())[0]) if FUN_USERNAMES else "DefaultUser"
+        username_options = list(FUN_USERNAMES.keys()) if FUN_USERNAMES else [current_username]; current_index = 0
         try: current_index = username_options.index(current_username)
         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)
-            st.session_state.username = new_username; st.session_state.tts_voice = FUN_USERNAMES[new_username]; save_username(st.session_state.username)
+            st.session_state.username = new_username;
+            st.session_state.tts_voice = FUN_USERNAMES.get(new_username, DEFAULT_TTS_VOICE);
+            save_username(st.session_state.username)
+            # Add action log entry for name change?
+            add_action_log(f"Username changed to {new_username}")
             st.rerun()
         st.session_state['enable_audio'] = st.toggle("Enable TTS Audio", value=st.session_state.get('enable_audio', True))
 
@@ -739,36 +589,79 @@ def render_main_content():
     """Renders the main content area with tabs."""
     st.title(f"{Site_Name} - User: {st.session_state.username}")
 
+    # Check if we need to send newly loaded world data to JS
+    world_data_to_load = st.session_state.pop('world_to_load_data', None) # Use pop to consume
+    if world_data_to_load is not None:
+        print(f"Sending loaded world state ({len(world_data_to_load)} objects) to JS...")
+        # Call the JS function to load the state
+        sync(js_code=f"loadWorldState({json.dumps(world_data_to_load)});", key="load_world_js")
+        st.toast("World loaded in 3D view.", icon="🔄")
+
+
+    # Check for object placement data coming back from JS
+    # Use streamlit_js_eval to define a Python function callable from JS
+    # Note: This function runs in the main Python thread when called by JS.
+    # It should be quick and ideally just set session state.
+    placed_object_data = streamlit_js_eval(
+        js_code="""
+            // Define function in JS global scope if not already defined
+            if (typeof window.sendPlacedObjectToPython !== 'function') {
+                window.sendPlacedObjectToPython = (objectData) => {
+                    // Call the Python function 'handle_js_object_placed'
+                    // Pass data as a JSON string for safety
+                    streamlit_js_eval(`handle_js_object_placed(json_data='${JSON.stringify(objectData)}')`, key='js_place_event_handler');
+                }
+            }
+            null; // Return null from initial setup call
+        """,
+        key="setup_js_place_event_handler"
+    )
+
+    # Check if the handler function was called (by checking if its key is in session_state)
+    if 'js_place_event_handler' in st.session_state:
+        # The handle_js_object_placed function (defined globally in Python)
+        # would have been called and stored data in st.session_state.js_object_placed_data
+        # Process data stored by the callback
+        processed_data = st.session_state.pop('js_object_placed_data', None) # Use pop to consume
+        if processed_data:
+            print(f"Processing stored placed object data: {processed_data.get('obj_id')}")
+            # Action log entry was already added in the handler function.
+            # Object exists client-side. Server doesn't need to store it live, only on Save.
+            # Might trigger a mini-rerun if processing changes UI elements? Unlikely here.
+            # st.rerun() # Avoid rerun if possible, log entry is enough for now
+            pass # Main processing (adding to server state dict) removed
+
+        # Important: Clear the trigger key from session_state so it doesn't re-process
+        del st.session_state['js_place_event_handler']
+
+
+    # Define Tabs
     tab_world, tab_chat, tab_pdf, tab_files = st.tabs(["🏗️ World Builder", "🗣️ Chat", "📚 PDF Tools", "📂 Files & Settings"])
 
     # --- World Builder Tab ---
     with tab_world:
         st.header("Shared 3D World")
-        st.caption("Place objects using the sidebar tools. Changes are shared live!")
+        st.caption("Place objects using sidebar tools. Use Sidebar to Save/Load.")
         current_file_basename = st.session_state.get('current_world_file', None)
         if 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)")
+             full_path_for_parse = os.path.join(SAVED_WORLDS_DIR, current_file_basename)
+             if os.path.exists(full_path_for_parse): parsed = parse_world_filename(full_path_for_parse); st.info(f"Current World: **{parsed['name']}** (`{current_file_basename}`)")
+             else: st.warning(f"Loaded file '{current_file_basename}' missing."); st.session_state.current_world_file = None
+        else: st.info("Live State Active (Save to persist changes)")
 
         # 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
-            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]
-                 ws_url = f"ws://{server_host}:8765"
-            except Exception as e: print(f"WS URL detection failed ({e}), using localhost.")
-
+            # Inject state needed by JS (Tool, Constants)
+            # Initial world state is loaded via explicit JS call if world_to_load_data exists
             js_injection_script = f"""<script>
     window.USERNAME = {json.dumps(st.session_state.username)};
-    window.WEBSOCKET_URL = {json.dumps(ws_url)};
     window.SELECTED_OBJECT_TYPE = {json.dumps(st.session_state.selected_object)};
     window.PLOT_WIDTH = {json.dumps(PLOT_WIDTH)};
     window.PLOT_DEPTH = {json.dumps(PLOT_DEPTH)};
-    console.log("Streamlit State Injected:", {{ username: window.USERNAME, websocketUrl: window.WEBSOCKET_URL, selectedObject: window.SELECTED_OBJECT_TYPE }});
+    // INITIAL_WORLD_OBJECTS injection removed - handled by loadWorldState JS call
+    console.log("Streamlit State Injected:", {{ username: window.USERNAME, selectedObject: window.SELECTED_OBJECT_TYPE }});
 </script>"""
             html_content_with_state = html_template.replace('</head>', js_injection_script + '\n</head>', 1)
             components.html(html_content_with_state, height=700, scrolling=False)
@@ -777,30 +670,30 @@ def render_main_content():
 
     # --- Chat Tab ---
     with tab_chat:
-        st.header(f"{START_ROOM} Chat")
-        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
+        st.header(f"💬 Chat") # Simplified header
+        # Load chat history
+        chat_history_list = st.session_state.get('chat_history', [])
+        if not chat_history_list: chat_history_list = asyncio.run(load_chat_history()) # Load if empty
+
         chat_container = st.container(height=500)
         with chat_container:
-             if chat_history: st.markdown("----\n".join(reversed(chat_history[-50:])))
+             if chat_history_list: st.markdown("----\n".join(reversed(chat_history_list[-50:])))
              else: st.caption("No chat messages yet.")
 
+        # Chat Input
         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
-
-        if send_button_clicked or should_autosend:
+        send_button_clicked = st.button("Send Chat", key="send_chat_button")
+        # Removed autosend for simplicity, can be added back
+        if send_button_clicked:
             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
-                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}})
-                run_async(broadcast_message, ws_message)
+                voice = st.session_state.get('tts_voice', DEFAULT_TTS_VOICE)
+                # Save entry and generate audio (fire-and-forget)
                 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")
 
     # --- PDF Tab ---
     with tab_pdf:
@@ -808,45 +701,62 @@ 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:
-              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)
+             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)
 
     # --- Files & Settings Tab ---
     with tab_files:
         st.header("📂 Files & Settings")
-        st.subheader("💾 World State Management")
+        st.subheader("💾 World Management")
         current_file_basename = st.session_state.get('current_world_file', None)
 
+        # Save Current Version Button (if a world is loaded)
         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 state.")
-        else: 
-             st.info("Load a world from the sidebar to enable saving changes to it.")
-
+            full_path_for_parse = os.path.join(SAVED_WORLDS_DIR, current_file_basename)
+            save_label = f"Save Changes to '{current_file_basename}'" # Default label
+            if os.path.exists(full_path_for_parse): parsed = parse_world_filename(full_path_for_parse); save_label = f"Save Changes to '{parsed['name']}'"
+            if st.button(save_label, key="save_current_world_files", help=f"Overwrite '{current_file_basename}'"):
+                 if not os.path.exists(full_path_for_parse): st.error(f"Cannot save, file missing.")
+                 else:
+                     with st.spinner("Requesting state & saving..."):
+                          js_world_state_str = streamlit_js_eval("getWorldStateForSave();", key="get_world_state_save_current", want_result=True)
+                          if js_world_state_str:
+                               try:
+                                   world_data_dict = json.loads(js_world_state_str)
+                                   if isinstance(world_data_dict, dict):
+                                       if save_world_to_md(current_file_basename, world_data_dict):
+                                           st.success("Current world saved!"); add_action_log(f"Saved world: {current_file_basename}")
+                                       else: st.error("Failed to save.")
+                                   else: st.error("Invalid format from client.")
+                               except json.JSONDecodeError: st.error("Failed to decode state from client.")
+                          else: st.warning("Did not receive world state from client.")
+        else: st.info("Load a world from the sidebar to enable 'Save Changes'.")
+
+        # 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"):
+        new_name_files = st.text_input("World Name:", key="new_world_name_files_tab", value=st.session_state.get('new_world_name', 'MyWorld'))
+        if st.button("💾 Save Current View as New Version", key="save_new_version_files"):
              if new_name_files.strip():
-                  new_filename_base = generate_world_save_filename(new_name_files)
-                  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; st.session_state.new_world_name = "MyWorld"; st.rerun()
-                      else: st.error("Failed to save new version.")
+                 with st.spinner(f"Requesting state & saving as '{new_name_files}'..."):
+                      js_world_state_str = streamlit_js_eval("getWorldStateForSave();", key="get_world_state_save_new", want_result=True)
+                      if js_world_state_str:
+                           try:
+                               world_data_dict = json.loads(js_world_state_str)
+                               if isinstance(world_data_dict, dict):
+                                   new_filename_base = generate_world_save_filename(st.session_state.username, new_name_files)
+                                   if save_world_to_md(new_filename_base, world_data_dict):
+                                       st.success(f"Saved as {new_filename_base}")
+                                       st.session_state.current_world_file = new_filename_base; st.session_state.new_world_name = "MyWorld";
+                                       add_action_log(f"Saved new world: {new_filename_base}")
+                                       st.rerun()
+                                   else: st.error("Failed to save new version.")
+                               else: st.error("Invalid format from client.")
+                           except json.JSONDecodeError: st.error("Failed to decode state from client.")
+                      else: st.warning("Did not receive world state from client.")
              else: st.warning("Please enter a name.")
 
-        st.subheader("⚙️ Server Status")
-        col_ws, col_clients = st.columns(2)
-        with col_ws:
-             server_alive = st.session_state.get('server_task') and st.session_state.server_task.is_alive(); ws_status = "Running" if server_alive else "Stopped"; st.metric("WebSocket Server", ws_status)
-             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)
@@ -857,60 +767,61 @@ def render_main_content():
         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")]); st.session_state.current_world_file = None; st.rerun()
         with col_del4:
-            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()
+            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"), os.path.join(MEDIA_DIR, "*.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")
+        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, f"{WORLD_STATE_FILE_MD_PREFIX}*.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")
         zip_files = sorted(glob.glob(os.path.join(MEDIA_DIR,"*.zip")), key=os.path.getmtime, reverse=True)
         if zip_files:
-             col_zip1, col_zip2, col_zip3 = st.columns(3)
-             with col_zip1:
-                  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:
-                   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:
-             # Ensure correct indentation here for the else block
-             st.caption("No zip archives found.")
+            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.")
 
 
 # ==============================================================================
 # Main Execution Logic
 # ==============================================================================
 
-def initialize_world():
-    """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:
-             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): 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
-        st.session_state.initial_world_state_loaded = True
-        print("Initial world load process complete.")
-
-if __name__ == "__main__":
-    # 1. Initialize session state
+def initialize_app():
+    """Handles session init and initial world load."""
     init_session_state()
+    # Load username here after init
+    if not st.session_state.username:
+        loaded_user = load_username()
+        if loaded_user and loaded_user in FUN_USERNAMES:
+             st.session_state.username = loaded_user
+             st.session_state.tts_voice = FUN_USERNAMES[loaded_user]
+        else:
+             st.session_state.username = random.choice(list(FUN_USERNAMES.keys())) if FUN_USERNAMES else "User"
+             st.session_state.tts_voice = FUN_USERNAMES.get(st.session_state.username, DEFAULT_TTS_VOICE)
+             save_username(st.session_state.username) # Save the newly assigned name
+
+    # Load initial world state (most recent) if not already handled by load button click
+    # Check 'world_to_load_data' first - if present, it means a load was just triggered.
+    if 'world_to_load_data' not in st.session_state or st.session_state.world_to_load_data is None:
+        # Only load from file if no specific world load is pending
+        if st.session_state.get('current_world_file') is None: # And no world currently selected
+            print("Attempting initial load of most recent world...")
+            saved_worlds = get_saved_worlds()
+            if saved_worlds:
+                 latest_world_file_basename = os.path.basename(saved_worlds[0]['filename'])
+                 print(f"Loading most recent world on startup: {latest_world_file_basename}")
+                 world_dict = load_world_from_md(latest_world_file_basename)
+                 if world_dict is not None:
+                      st.session_state.world_to_load_data = world_dict # Set data to be sent to JS
+                      st.session_state.current_world_file = latest_world_file_basename # Update selection state
+                 else: print("Failed to load most recent world.")
+            else: print("No saved worlds found for initial load.")
 
-    # 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 UI
-    render_sidebar()
-    render_main_content()
+if __name__ == "__main__":
+    initialize_app() # Initialize state, load user, potentially load initial world data state
+    render_sidebar() # Render sidebar UI
+    render_main_content() # Render main UI content (includes logic to send loaded world data to JS)