Update app.py

app.py

@@ -1,5 +1,31 @@
 # app.py
 import streamlit as st
+import os
+import logging
+
+# --- Streamlit PermissionError Mitigation Attempts (Python level) ---
+# These are fallbacks; Dockerfile ENV STREAMLIT_HOME is the primary fix for '/.streamlit'
+if "STREAMLIT_CLIENT_GATHER_USAGE_STATS" not in os.environ:
+    os.environ["STREAMLIT_CLIENT_GATHER_USAGE_STATS"] = "false"
+    print("INFO: app.py - Disabled Streamlit client usage stats gathering via env var.")
+
+if "STREAMLIT_BROWSER_GATHERUSAGESTATS" not in os.environ: # Another potential flag
+    os.environ["STREAMLIT_BROWSER_GATHERUSAGESTATS"] = "false"
+    print("INFO: app.py - Set STREAMLIT_BROWSER_GATHERUSAGESTATS to false.")
+
+# If running in /app and STREAMLIT_HOME isn't set, try to define a writable one.
+# The Dockerfile's ENV STREAMLIT_HOME should ideally handle this.
+streamlit_home_path_app = "/app/.streamlit_cai_config" # Using a unique name
+if "STREAMLIT_HOME" not in os.environ and os.getcwd().startswith("/app"):
+    os.environ["STREAMLIT_HOME"] = streamlit_home_path_app
+    try:
+        os.makedirs(streamlit_home_path_app, exist_ok=True)
+        # In Docker, this path should already be writable by the app user if Dockerfile is set up correctly.
+        print(f"INFO: app.py - Set STREAMLIT_HOME to: {streamlit_home_path_app}")
+    except Exception as e_mkdir_sh:
+        print(f"WARNING: app.py - Could not create STREAMLIT_HOME '{streamlit_home_path_app}': {e_mkdir_sh}")
+
+
 from core.gemini_handler import GeminiHandler
 from core.visual_engine import VisualEngine
 from core.prompt_engineering import (
@@ -10,25 +36,14 @@ from core.prompt_engineering import (
     create_scene_regeneration_prompt,
     create_visual_regeneration_prompt
 )
-import os
-import logging
-
-# --- Mitigate Streamlit PermissionError on Hugging Face Spaces ---
-# Streamlit tries to write to ~/.streamlit or /.streamlit.
-# By setting global. τότεSIMIT_CONFIG_DIR or specific telemetry flags,
-# we can sometimes avoid this. A common fix is to disable telemetry.
-# However, the error specifically mentions '/.streamlit', which is root.
-# Setting STREAMLIT_HOME in Dockerfile is a more robust fix for this specific path.
-# If that's not enough, disabling usage stats collection is a good fallback.
-if "STREAMLIT_CLIENT_GATHER_USAGE_STATS" not in os.environ:
-    os.environ["STREAMLIT_CLIENT_GATHER_USAGE_STATS"] = "false"
-# Also, ensure Streamlit doesn't try to create a global config dir if HOME is weird
-if "STREAMLIT_HOME" not in os.environ and os.getcwd().startswith("/app"): # Common for HF
-    os.environ["STREAMLIT_HOME"] = "/app/.streamlit_config" # Use a writable path within the app dir
 
-# --- Configuration & Initialization ---
+# --- Page Config & Logging ---
 st.set_page_config(page_title="CineGen AI Ultra+", layout="wide", initial_sidebar_state="expanded")
-logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+# Configure logging (level can be adjusted for production vs. development)
+logging.basicConfig(
+    level=logging.DEBUG, # DEBUG for development, INFO for production
+    format='%(asctime)s - %(name)s [%(levelname)s] - %(message)s (%(module)s.%(funcName)s:%(lineno)d)'
+)
 logger = logging.getLogger(__name__)
 
 # --- Global Definitions ---
@@ -37,325 +52,382 @@ DEFAULT_SCENE_DURATION_SECS = 5
 DEFAULT_SHOT_TYPE = "Director's Choice"
 ASSET_TYPE_OPTIONS = ["Auto (Director's Choice)", "Image", "Video Clip"]
 
+# --- API Key Loading ---
 def load_api_key(key_name_streamlit, key_name_env, service_name):
-    key = None; secrets_available = hasattr(st, 'secrets')
+    key_value = None
+    secrets_available = hasattr(st, 'secrets')
     try:
         if secrets_available and key_name_streamlit in st.secrets:
-            key = st.secrets[key_name_streamlit]
-            if key: logger.info(f"{service_name} API Key found in Streamlit secrets.")
-    except Exception as e: logger.warning(f"Could not access st.secrets for {key_name_streamlit}: {e}")
-    if not key and key_name_env in os.environ:
-        key = os.environ[key_name_env]
-        if key: logger.info(f"{service_name} API Key found in environment variable.")
-    if not key: logger.warning(f"{service_name} API Key NOT FOUND for {service_name}. Related features may be disabled or use fallbacks.")
-    return key
-
-if 'services_initialized' not in st.session_state:
-    logger.info("Initializing services and API keys for the first time this session...")
-    st.session_state.GEMINI_API_KEY = load_api_key("GEMINI_API_KEY", "GEMINI_API_KEY", "Gemini")
-    st.session_state.OPENAI_API_KEY = load_api_key("OPENAI_API_KEY", "OPENAI_API_KEY", "OpenAI/DALL-E")
-    st.session_state.ELEVENLABS_API_KEY = load_api_key("ELEVENLABS_API_KEY", "ELEVENLABS_API_KEY", "ElevenLabs")
-    st.session_state.PEXELS_API_KEY = load_api_key("PEXELS_API_KEY", "PEXELS_API_KEY", "Pexels")
-    st.session_state.ELEVENLABS_VOICE_ID_CONFIG = load_api_key("ELEVENLABS_VOICE_ID", "ELEVENLABS_VOICE_ID", "ElevenLabs Voice ID")
-    st.session_state.RUNWAY_API_KEY = load_api_key("RUNWAY_API_KEY", "RUNWAY_API_KEY", "RunwayML")
-
-    if not st.session_state.GEMINI_API_KEY: st.error("CRITICAL: Gemini API Key missing!"); logger.critical("Gemini API Key missing."); st.stop()
-    try: st.session_state.gemini_handler = GeminiHandler(api_key=st.session_state.GEMINI_API_KEY); logger.info("GeminiHandler initialized.")
-    except Exception as e: st.error(f"Failed to init GeminiHandler: {e}"); logger.critical(f"GeminiHandler init failed: {e}", exc_info=True); st.stop()
+            key_value = st.secrets.get(key_name_streamlit) # Use .get for safety
+            if key_value: logger.info(f"API Key for {service_name} found in Streamlit secrets.")
+    except Exception as e_secrets: logger.warning(f"Could not access st.secrets for {key_name_streamlit} ({service_name}): {e_secrets}")
+    if not key_value and key_name_env in os.environ:
+        key_value = os.environ.get(key_name_env) # Use .get for safety
+        if key_value: logger.info(f"API Key for {service_name} found in env var '{key_name_env}'.")
+    if not key_value: logger.warning(f"API Key for {service_name} (Key: {key_name_streamlit}/{key_name_env}) NOT FOUND. Service may be disabled.")
+    return key_value
+
+# --- Service Initialization (Singleton Pattern using Session State) ---
+if 'services_initialized_flag' not in st.session_state: # Renamed flag for clarity
+    logger.info("APP_INIT: Initializing services and API keys...")
+    # Load all keys first
+    st.session_state.API_KEY_GEMINI = load_api_key("GEMINI_API_KEY", "GEMINI_API_KEY", "Gemini")
+    st.session_state.API_KEY_OPENAI = load_api_key("OPENAI_API_KEY", "OPENAI_API_KEY", "OpenAI/DALL-E")
+    st.session_state.API_KEY_ELEVENLABS = load_api_key("ELEVENLABS_API_KEY", "ELEVENLABS_API_KEY", "ElevenLabs")
+    st.session_state.API_KEY_PEXELS = load_api_key("PEXELS_API_KEY", "PEXELS_API_KEY", "Pexels")
+    st.session_state.CONFIG_ELEVENLABS_VOICE_ID = load_api_key("ELEVENLABS_VOICE_ID", "ELEVENLABS_VOICE_ID", "ElevenLabs Voice ID")
+    st.session_state.API_KEY_RUNWAYML = load_api_key("RUNWAY_API_KEY", "RUNWAY_API_KEY", "RunwayML")
+
+    # Critical services check
+    if not st.session_state.API_KEY_GEMINI:
+        st.error("CRITICAL FAILURE: Gemini API Key is missing! Application cannot function without it."); logger.critical("Gemini API Key missing."); st.stop()
+    
+    # Initialize Gemini Handler
     try:
-        default_voice_id_el = "Rachel"; configured_voice_id_el = st.session_state.ELEVENLABS_VOICE_ID_CONFIG or default_voice_id_el
-        st.session_state.visual_engine = VisualEngine(output_dir="temp_cinegen_media", default_elevenlabs_voice_id=configured_voice_id_el)
-        st.session_state.visual_engine.set_openai_api_key(st.session_state.OPENAI_API_KEY)
-        st.session_state.visual_engine.set_elevenlabs_api_key(st.session_state.ELEVENLABS_API_KEY, voice_id_from_secret=st.session_state.ELEVENLABS_VOICE_ID_CONFIG)
-        st.session_state.visual_engine.set_pexels_api_key(st.session_state.PEXELS_API_KEY)
-        st.session_state.visual_engine.set_runway_api_key(st.session_state.RUNWAY_API_KEY)
-        logger.info("VisualEngine initialized and API keys set.")
-    except Exception as e: st.error(f"Failed to init VisualEngine: {e}"); logger.critical(f"VisualEngine init/key setting failed: {e}", exc_info=True); st.warning("VisualEngine critical setup issue.")
-    st.session_state.services_initialized = True; logger.info("Service initialization complete.")
-
-for key_ss, default_val_ss in [ ('story_treatment_scenes', []), ('scene_generation_prompts', []), ('generated_scene_assets_info', []), ('video_path', None), ('character_definitions', {}), ('global_style_additions', ""), ('overall_narration_audio_path', None), ('narration_script_display', "")]:
-    if key_ss not in st.session_state: st.session_state[key_ss] = default_val_ss
-
-def initialize_new_project_state():
-    st.session_state.story_treatment_scenes = []; st.session_state.scene_generation_prompts = []; st.session_state.generated_scene_assets_info = []
-    st.session_state.video_path, st.session_state.overall_narration_audio_path, st.session_state.narration_script_display = None, None, ""
-    logger.info("New project state initialized.")
-
-def generate_asset_for_scene_wrapper(scene_idx, scene_data_item_for_asset, version_num=1, user_selected_asset_type_override="Auto (Director's Choice)"): # Renamed scene_data
-    generate_as_video_clip_final = False
-    gemini_suggested_asset_type = scene_data_item_for_asset.get('suggested_asset_type_감독', 'image').lower()
-    if user_selected_asset_type_override == "Image": generate_as_video_clip_final = False
-    elif user_selected_asset_type_override == "Video Clip": generate_as_video_clip_final = True
-    elif user_selected_asset_type_override == "Auto (Director's Choice)": generate_as_video_clip_final = (gemini_suggested_asset_type == "video_clip")
+        st.session_state.gemini_service_handler = GeminiHandler(api_key=st.session_state.API_KEY_GEMINI) # Renamed
+        logger.info("APP_INIT: GeminiHandler component initialized successfully.")
+    except Exception as e_gem_init:
+        st.error(f"CRITICAL FAILURE: Failed to initialize GeminiHandler: {e_gem_init}"); logger.critical(f"GeminiHandler init failed: {e_gem_init}", exc_info=True); st.stop()
     
-    image_gen_prompt_text = construct_dalle_prompt(scene_data_item_for_asset, st.session_state.character_definitions, st.session_state.global_style_additions)
-    motion_gen_prompt_text = ""
-    if generate_as_video_clip_final:
-        motion_gen_prompt_text = construct_text_to_video_prompt_for_gen4(scene_data_item_for_asset, st.session_state.global_style_additions)
-        if not motion_gen_prompt_text: motion_gen_prompt_text = scene_data_item_for_asset.get('video_clip_motion_description_감독', "subtle ambient motion"); logger.warning(f"S{scene_data_item_for_asset.get('scene_number', scene_idx+1)}: Empty motion prompt, using default.")
-
-    if not image_gen_prompt_text: logger.error(f"Base image prompt construction failed for S{scene_data_item_for_asset.get('scene_number', scene_idx+1)}"); return False
-    while len(st.session_state.scene_generation_prompts) <= scene_idx: st.session_state.scene_generation_prompts.append("")
-    while len(st.session_state.generated_scene_assets_info) <= scene_idx: st.session_state.generated_scene_assets_info.append(None)
-    st.session_state.scene_generation_prompts[scene_idx] = motion_gen_prompt_text if generate_as_video_clip_final else image_gen_prompt_text
+    # Initialize Visual Engine
+    try:
+        el_default_voice = "Rachel" # Hardcoded fallback default
+        el_resolved_voice_id = st.session_state.CONFIG_ELEVENLABS_VOICE_ID or el_default_voice
+        
+        # <<< THIS IS WHERE VisualEngine IS INSTANTIATED >>>
+        st.session_state.visual_content_engine = VisualEngine( # Renamed
+            output_dir="temp_cinegen_media",
+            default_elevenlabs_voice_id=el_resolved_voice_id
+        )
+        # Set keys for individual services within VisualEngine
+        st.session_state.visual_content_engine.set_openai_api_key(st.session_state.API_KEY_OPENAI)
+        st.session_state.visual_content_engine.set_elevenlabs_api_key(st.session_state.API_KEY_ELEVENLABS, voice_id_from_secret=st.session_state.CONFIG_ELEVENLABS_VOICE_ID)
+        st.session_state.visual_content_engine.set_pexels_api_key(st.session_state.API_KEY_PEXELS)
+        st.session_state.visual_content_engine.set_runway_api_key(st.session_state.API_KEY_RUNWAYML)
+        logger.info("APP_INIT: VisualEngine component initialized and all sub-service API keys configured.")
+    except Exception as e_vis_eng_init:
+        st.error(f"CRITICAL FAILURE: Failed to initialize VisualEngine: {e_vis_eng_init}"); logger.critical(f"VisualEngine init or key setting failed: {e_vis_eng_init}", exc_info=True); st.warning("VisualEngine encountered a critical setup issue. Many features will be disabled or will fail."); st.stop()
+    
+    st.session_state.services_initialized_flag = True
+    logger.info("APP_INIT: All services initialized successfully.")
+
+# Initialize project-specific session state variables
+for project_ss_key, project_ss_default_val in [
+    ('project_treatment_scenes_list', []),
+    ('project_scene_generation_prompts_list', []),
+    ('project_generated_assets_info_list', []),
+    ('project_final_video_path', None),
+    ('project_character_definitions_map', {}),
+    ('project_global_style_keywords_str', ""),
+    ('project_narration_audio_filepath', None),
+    ('project_narration_script_text', "")
+]:
+    if project_ss_key not in st.session_state: st.session_state[project_ss_key] = project_ss_default_val
+
+def initialize_new_project_data_in_session():
+    st.session_state.project_treatment_scenes_list = []
+    st.session_state.project_scene_generation_prompts_list = []
+    st.session_state.project_generated_assets_info_list = []
+    st.session_state.project_final_video_path = None
+    st.session_state.project_overall_narration_audio_path = None # Corrected key
+    st.session_state.project_narration_script_text = ""
+    logger.info("PROJECT_DATA: New project data initialized (treatment, assets, narration). Character defs and global styles persist.")
+
+# --- Asset Generation Wrapper ---
+def generate_asset_for_scene_in_app(scene_idx_num, scene_data_obj, asset_ver_num=1, user_asset_type_choice_ui="Auto (Director's Choice)"):
+    logger.debug(f"APP: generate_asset_for_scene_in_app called for scene index {scene_idx_num}, version {asset_ver_num}, user type: {user_asset_type_choice_ui}")
     
-    filename_base_for_asset = f"scene_{scene_data_item_for_asset.get('scene_number', scene_idx+1)}_asset_v{version_num}"
-    runway_dur_for_scene = scene_data_item_for_asset.get('video_clip_duration_estimate_secs_감독', scene_data_item_for_asset.get('user_scene_duration_secs', DEFAULT_SCENE_DURATION_SECS))
-    if runway_dur_for_scene <= 0 : runway_dur_for_scene = DEFAULT_SCENE_DURATION_SECS
-
-    asset_result_dict = st.session_state.visual_engine.generate_scene_asset(
-        image_generation_prompt_text=image_gen_prompt_text,
-        motion_prompt_text_for_video=motion_gen_prompt_text,
-        scene_data_dict=scene_data_item_for_asset,  # <<< CHANGED 'scene_data' TO 'scene_data_dict'
-        scene_identifier_fn_base=filename_base_for_asset,
-        generate_as_video_clip_flag=generate_as_video_clip_final, # Renamed for clarity
-        runway_target_dur_val=runway_dur_for_scene # Renamed for clarity
+    final_decision_generate_as_video = False
+    gemini_suggested_type = scene_data_obj.get('suggested_asset_type_감독', 'image').lower()
+
+    if user_asset_type_choice_ui == "Image": final_decision_generate_as_video = False
+    elif user_asset_type_choice_ui == "Video Clip": final_decision_generate_as_video = True
+    elif user_asset_type_choice_ui == "Auto (Director's Choice)": final_decision_generate_as_video = (gemini_suggested_type == "video_clip")
+    logger.debug(f"APP: Final decision for asset type: {'Video' if final_decision_generate_as_video else 'Image'}")
+
+    prompt_for_base_img_gen = construct_dalle_prompt(scene_data_obj, st.session_state.project_character_definitions_map, st.session_state.project_global_style_keywords_str)
+    prompt_for_runway_motion = ""
+    if final_decision_generate_as_video:
+        prompt_for_runway_motion = construct_text_to_video_prompt_for_gen4(scene_data_obj, st.session_state.project_global_style_keywords_str)
+        if not prompt_for_runway_motion: prompt_for_runway_motion = scene_data_obj.get('video_clip_motion_description_감독', "subtle ambient cinematic motion"); logger.warning(f"S{scene_data_obj.get('scene_number', scene_idx_num+1)}: Empty motion prompt, using default for Runway.")
+
+    if not prompt_for_base_img_gen: logger.error(f"Base image prompt construction failed for S{scene_data_obj.get('scene_number', scene_idx_num+1)}"); return False
+    
+    # Ensure session state lists are long enough
+    while len(st.session_state.project_scene_generation_prompts_list) <= scene_idx_num: st.session_state.project_scene_generation_prompts_list.append("")
+    while len(st.session_state.project_generated_assets_info_list) <= scene_idx_num: st.session_state.project_generated_assets_info_list.append(None)
+
+    st.session_state.project_scene_generation_prompts_list[scene_idx_num] = prompt_for_runway_motion if final_decision_generate_as_video else prompt_for_base_img_gen
+    
+    filename_base_for_output_asset = f"scene_{scene_data_obj.get('scene_number', scene_idx_num+1)}_asset_v{asset_ver_num}"
+    duration_for_rwy_vid = scene_data_obj.get('video_clip_duration_estimate_secs_감독', scene_data_obj.get('user_scene_duration_secs', DEFAULT_SCENE_DURATION_SECS))
+    if duration_for_rwy_vid <= 0 : duration_for_rwy_vid = DEFAULT_SCENE_DURATION_SECS
+
+    generated_asset_info_dict = st.session_state.visual_content_engine.generate_scene_asset(
+        image_generation_prompt_text=prompt_for_base_img_gen,
+        motion_prompt_text_for_video=prompt_for_runway_motion,
+        scene_data_dict=scene_data_obj,  # <<< CORRECTED KEYWORD ARGUMENT NAME
+        scene_identifier_fn_base=filename_base_for_output_asset,
+        generate_as_video_clip_flag=final_decision_generate_as_video,
+        runway_target_dur_val=duration_for_rwy_vid
     )
-    st.session_state.generated_scene_assets_info[scene_idx] = asset_result_dict
-    if asset_result_dict and asset_result_dict.get('prompt_used'): st.session_state.scene_generation_prompts[scene_idx] = asset_result_dict['prompt_used']
+    st.session_state.project_generated_assets_info_list[scene_idx_num] = generated_asset_info_dict
+    if generated_asset_info_dict and generated_asset_info_dict.get('prompt_used') and \
+       st.session_state.project_scene_generation_prompts_list[scene_idx_num] != generated_asset_info_dict['prompt_used']:
+        st.session_state.project_scene_generation_prompts_list[scene_idx_num] = generated_asset_info_dict['prompt_used']
 
-    if asset_result_dict and not asset_result_dict['error'] and asset_result_dict.get('path') and os.path.exists(asset_result_dict['path']):
-        logger.info(f"Asset ({asset_result_dict.get('type')}) generated for S{scene_data_item_for_asset.get('scene_number', scene_idx+1)}: {os.path.basename(asset_result_dict['path'])}")
+    if generated_asset_info_dict and not generated_asset_info_dict['error'] and generated_asset_info_dict.get('path') and os.path.exists(generated_asset_info_dict['path']):
+        logger.info(f"APP: Asset ({generated_asset_info_dict.get('type')}) generated for S{scene_data_obj.get('scene_number', scene_idx_num+1)}: {os.path.basename(generated_asset_info_dict['path'])}")
         return True
     else:
-        err_msg_asset = asset_result_dict.get('error_message', 'Unknown error') if asset_result_dict else 'Asset result is None'
-        logger.warning(f"Asset gen FAILED for S{scene_data_item_for_asset.get('scene_number', scene_idx+1)}. Type: {'Video' if generate_as_video_clip_final else 'Image'}. Err: {err_msg_asset}")
-        if not st.session_state.generated_scene_assets_info[scene_idx] or not st.session_state.generated_scene_assets_info[scene_idx]['error']:
-             st.session_state.generated_scene_assets_info[scene_idx] = {'path': None, 'type': 'none', 'error': True, 'error_message': err_msg_asset, 'prompt_used': st.session_state.scene_generation_prompts[scene_idx]}
+        error_msg_from_asset_gen = generated_asset_info_dict.get('error_message', 'Unknown error') if generated_asset_info_dict else 'Asset result dictionary is None'
+        logger.warning(f"APP: Asset gen FAILED for S{scene_data_obj.get('scene_number', scene_idx_num+1)}. Type: {'Video' if final_decision_generate_as_video else 'Image'}. Err: {error_msg_from_asset_gen}")
+        current_prompt = st.session_state.project_scene_generation_prompts_list[scene_idx_num]
+        st.session_state.project_generated_assets_info_list[scene_idx_num] = {'path': None, 'type': 'none', 'error': True, 'error_message': error_msg_from_asset_gen, 'prompt_used': current_prompt}
         return False
 
-# --- UI Sidebar ---
+# --- Sidebar UI ---
 with st.sidebar:
-    st.title("🎬 CineGen AI Ultra+")
+    st.image("assets/logo.png", width=150) # Display logo
+    st.title("CineGen AI Ultra+")
     st.markdown("### Creative Seed")
-    user_idea_input = st.text_area("Core Story Idea / Theme:", "A lone wanderer searches for a mythical oasis in a vast, post-apocalyptic desert, haunted by mirages and mechanical scavengers.", height=120, key="user_idea_main_v5_sb_unique")
-    genre_selection = st.selectbox("Primary Genre:", ["Cyberpunk", "Sci-Fi", "Fantasy", "Noir", "Thriller", "Western", "Post-Apocalyptic", "Historical Drama", "Surreal"], index=6, key="genre_main_v5_sb_unique")
-    mood_selection = st.selectbox("Overall Mood:", ["Hopeful yet Desperate", "Mysterious & Eerie", "Gritty & Tense", "Epic & Awe-Inspiring", "Melancholy & Reflective", "Whimsical & Lighthearted"], index=0, key="mood_main_v5_sb_unique")
-    num_scenes_slider = st.slider("Number of Key Scenes:", 1, 10, 1, key="num_scenes_main_v5_sb_unique") # Default to 1 for faster testing
-    creative_guidance_options_map = {"Standard Director": "standard", "Artistic Visionary": "more_artistic", "Experimental Storyteller": "experimental_narrative"}
-    selected_creative_guidance_key_sb = st.selectbox("AI Creative Director Style:", options=list(creative_guidance_options_map.keys()), key="creative_guidance_select_v5_sb_unique")
-    actual_creative_guidance_val = creative_guidance_options_map[selected_creative_guidance_key_sb]
-
-    if st.button("🌌 Generate Cinematic Treatment", type="primary", key="generate_treatment_btn_v5_sb_unique", use_container_width=True):
-        initialize_new_project_state()
-        if not user_idea_input.strip(): st.warning("Please provide a story idea.")
+    ui_user_idea = st.text_area("Core Story Idea / Theme:", "A lone wanderer searches for a mythical oasis in a vast, post-apocalyptic desert, haunted by mirages and mechanical scavengers.", height=100, key="ui_user_idea")
+    ui_genre = st.selectbox("Primary Genre:", ["Cyberpunk", "Sci-Fi", "Fantasy", "Noir", "Thriller", "Western", "Post-Apocalyptic", "Historical Drama", "Surreal"], index=6, key="ui_genre")
+    ui_mood = st.selectbox("Overall Mood:", ["Hopeful yet Desperate", "Mysterious & Eerie", "Gritty & Tense", "Epic & Awe-Inspiring", "Melancholy & Reflective", "Whimsical & Lighthearted"], index=0, key="ui_mood")
+    ui_num_scenes = st.slider("Number of Key Scenes:", 1, 10, 1, key="ui_num_scenes")
+    ui_creative_guidance_map = {"Standard Director": "standard", "Artistic Visionary": "more_artistic", "Experimental Storyteller": "experimental_narrative"}
+    ui_selected_guidance_key = st.selectbox("AI Creative Director Style:", options=list(ui_creative_guidance_map.keys()), key="ui_creative_guidance")
+    ui_actual_guidance = ui_creative_guidance_map[ui_selected_guidance_key]
+
+    if st.button("🌌 Generate Cinematic Treatment", type="primary", key="btn_generate_treatment", use_container_width=True):
+        initialize_new_project_data_in_session()
+        if not ui_user_idea.strip(): st.warning("Please provide a story idea.")
         else:
-            with st.status("AI Director is envisioning your masterpiece...", expanded=True) as status_op_main:
+            with st.status("AI Director is envisioning your masterpiece...", expanded=True) as status_operation:
                 try:
-                    status_op_main.write("Phase 1: Gemini crafting cinematic treatment... 📜"); logger.info("Phase 1: Cinematic Treatment Gen.")
-                    treatment_gen_prompt_gemini = create_cinematic_treatment_prompt(user_idea_input, genre_selection, mood_selection, num_scenes_slider, actual_creative_guidance_val)
-                    raw_treatment_result_list = st.session_state.gemini_handler.generate_story_breakdown(treatment_gen_prompt_gemini)
-                    if not isinstance(raw_treatment_result_list, list) or not raw_treatment_result_list: raise ValueError("Gemini returned invalid scene list format.")
-                    processed_scene_list_init = []
-                    for scene_from_gemini_init in raw_treatment_result_list:
-                        scene_from_gemini_init['user_shot_type'] = scene_from_gemini_init.get('PROACTIVE_camera_work_감독', DEFAULT_SHOT_TYPE)
-                        gemini_dur_est_init = scene_from_gemini_init.get('video_clip_duration_estimate_secs_감독', 0)
-                        scene_from_gemini_init['user_scene_duration_secs'] = gemini_dur_est_init if gemini_dur_est_init > 0 else DEFAULT_SCENE_DURATION_SECS
-                        scene_from_gemini_init['user_selected_asset_type'] = "Auto (Director's Choice)"
-                        processed_scene_list_init.append(scene_from_gemini_init)
-                    st.session_state.story_treatment_scenes = processed_scene_list_init
-                    num_generated_scenes_val = len(st.session_state.story_treatment_scenes)
-                    st.session_state.scene_generation_prompts = [""]*num_generated_scenes_val; st.session_state.generated_scene_assets_info = [None]*num_generated_scenes_val
-                    logger.info(f"Phase 1 complete. {num_generated_scenes_val} scenes."); status_op_main.update(label="Treatment complete! ✅ Generating visuals...", state="running")
-
-                    status_op_main.write("Phase 2: Creating visual assets (Image/Video)... 🖼️🎬"); logger.info("Phase 2: Visual Asset Gen.")
-                    successful_asset_count_val = 0
-                    for i_scene_init, scene_data_item_init in enumerate(st.session_state.story_treatment_scenes):
-                        scene_num_display_init = scene_data_item_init.get('scene_number', i_scene_init+1)
-                        status_op_main.write(f"  Asset for Scene {scene_num_display_init}..."); logger.info(f"  Processing asset for Scene {scene_num_display_init}.")
-                        if generate_asset_for_scene_wrapper(i_scene_init, scene_data_item_init, version_num=1): successful_asset_count_val += 1
+                    status_operation.write("Phase 1: Gemini crafting cinematic treatment... 📜"); logger.info("APP_MAIN_FLOW: Phase 1 - Treatment Gen.")
+                    prompt_for_treatment = create_cinematic_treatment_prompt(ui_user_idea, ui_genre, ui_mood, ui_num_scenes, ui_actual_guidance)
+                    list_of_raw_treatment_scenes = st.session_state.gemini_service_handler.generate_story_breakdown(prompt_for_treatment)
+                    if not isinstance(list_of_raw_treatment_scenes, list) or not list_of_raw_treatment_scenes: raise ValueError("Gemini returned invalid scene list format.")
+                    
+                    temp_processed_scenes = []
+                    for scene_data_gemini in list_of_raw_treatment_scenes:
+                        gemini_dur_est = scene_data_gemini.get('video_clip_duration_estimate_secs_감독', 0)
+                        scene_data_gemini['user_scene_duration_secs'] = gemini_dur_est if gemini_dur_est > 0 else DEFAULT_SCENE_DURATION_SECS
+                        scene_data_gemini['user_shot_type'] = scene_data_gemini.get('PROACTIVE_camera_work_감독', DEFAULT_SHOT_TYPE)
+                        scene_data_gemini['user_selected_asset_type'] = "Auto (Director's Choice)"
+                        temp_processed_scenes.append(scene_data_gemini)
+                    st.session_state.project_story_treatment_scenes = temp_processed_scenes
+                    
+                    num_scenes_generated = len(st.session_state.project_story_treatment_scenes)
+                    st.session_state.project_scene_generation_prompts_list = [""]*num_scenes_generated
+                    st.session_state.project_generated_assets_info_list = [None]*num_scenes_generated
+                    logger.info(f"APP_MAIN_FLOW: Phase 1 complete. {num_scenes_generated} scenes."); status_operation.update(label="Treatment complete! ✅ Generating visual assets...", state="running")
+
+                    status_operation.write("Phase 2: Creating visual assets..."); logger.info("APP_MAIN_FLOW: Phase 2 - Asset Gen.")
+                    num_successful_assets = 0
+                    for idx, scene_item_data in enumerate(st.session_state.project_story_treatment_scenes):
+                        scene_num_log = scene_item_data.get('scene_number', idx+1)
+                        status_operation.write(f"  Processing asset for Scene {scene_num_log}..."); logger.info(f"  APP_MAIN_FLOW: Processing asset for Scene {scene_num_log}.")
+                        if generate_asset_for_scene_in_app(idx, scene_item_data, asset_ver_num=1): num_successful_assets += 1
                         
-                    status_label_phase2_val = "Visual assets ready! "; next_op_state_val = "running"
-                    if successful_asset_count_val == 0 and num_generated_scenes_val > 0:
-                        logger.error("Asset gen failed for all scenes."); status_label_phase2_val = "Asset gen FAILED for all scenes."; next_op_state_val="error";
-                        status_op_main.update(label=status_label_phase2_val, state=next_op_state_val, expanded=True); st.stop()
-                    elif successful_asset_count_val < num_generated_scenes_val: logger.warning(f"Assets partially generated ({successful_asset_count_val}/{num_generated_scenes_val})."); status_label_phase2_val = f"Assets partially generated ({successful_asset_count_val}/{num_generated_scenes_val}). "
-                    status_op_main.update(label=f"{status_label_phase2_val}Generating narration script...", state=next_op_state_val)
-                    if next_op_state_val == "error": st.stop()
-
-                    status_op_main.write("Phase 3: Generating narration script..."); logger.info("Phase 3: Narration Script Gen.")
-                    voice_style_for_narration_prompt_val = st.session_state.get("selected_voice_style_for_generation", "cinematic_trailer")
-                    narration_gen_prompt_val = create_narration_script_prompt_enhanced(st.session_state.story_treatment_scenes, mood_selection, genre_selection, voice_style_for_narration_prompt_val)
-                    st.session_state.narration_script_display = st.session_state.gemini_handler.generate_image_prompt(narration_gen_prompt_val)
-                    logger.info("Narration script generated."); status_op_main.update(label="Narration script ready! Synthesizing voice...", state="running")
-                    status_op_main.write("Phase 4: Synthesizing voice (ElevenLabs)... 🔊"); logger.info("Phase 4: Voice Synthesis.")
-                    st.session_state.overall_narration_audio_path = st.session_state.visual_engine.generate_narration_audio(st.session_state.narration_script_display)
-                    final_status_label_val = "All components ready! Storyboard below. 🚀"; final_op_state_val = "complete"
-                    if not st.session_state.overall_narration_audio_path: final_status_label_val = f"{status_label_phase2_val}Storyboard ready (Voiceover skipped or failed)."; logger.warning("Voiceover generation skipped/failed.")
-                    else: logger.info("Voiceover generated successfully.")
-                    status_op_main.update(label=final_status_label_val, state=final_op_state_val, expanded=False)
-                except ValueError as ve_err_main: logger.error(f"ValueError in main gen: {ve_err_main}", exc_info=True); status_op_main.update(label=f"Input/Gemini response error: {ve_err_main}", state="error", expanded=True);
-                except Exception as e_unhandled_main: logger.error(f"Unhandled Exception in main gen: {e_unhandled_main}", exc_info=True); status_op_main.update(label=f"Unexpected error: {e_unhandled_main}", state="error", expanded=True);
+                    status_label_p2 = "Visual assets generated! "; next_state_p2 = "running"
+                    if num_successful_assets == 0 and num_scenes_generated > 0: logger.error("APP_MAIN_FLOW: Asset gen FAILED for all scenes."); status_label_p2 = "Asset gen FAILED for all scenes."; next_state_p2="error"; status_operation.update(label=status_label_p2, state=next_state_p2, expanded=True); st.stop()
+                    elif num_successful_assets < num_scenes_generated: logger.warning(f"APP_MAIN_FLOW: Assets partially generated ({num_successful_assets}/{num_scenes_generated})."); status_label_p2 = f"Assets partially done ({num_successful_assets}/{num_scenes_generated}). "
+                    status_operation.update(label=f"{status_label_p2}Generating narration...", state=next_state_p2)
+                    if next_state_p2 == "error": st.stop()
+
+                    status_operation.write("Phase 3: Generating narration script..."); logger.info("APP_MAIN_FLOW: Phase 3 - Narration Script.")
+                    voice_style_narr = st.session_state.get("selected_voice_style_for_generation", "cinematic_trailer")
+                    prompt_narr_script = create_narration_script_prompt_enhanced(st.session_state.project_story_treatment_scenes, ui_mood, ui_genre, voice_style_narr)
+                    st.session_state.project_narration_script_text = st.session_state.gemini_service_handler.generate_image_prompt(prompt_narr_script) # generate_image_prompt for general text
+                    logger.info("APP_MAIN_FLOW: Narration script generated."); status_operation.update(label="Narration script ready! Synthesizing voice...", state="running")
+                    
+                    status_operation.write("Phase 4: Synthesizing voice (ElevenLabs)..."); logger.info("APP_MAIN_FLOW: Phase 4 - Voice Synthesis.")
+                    st.session_state.project_overall_narration_audio_path = st.session_state.visual_content_engine.generate_narration_audio(st.session_state.project_narration_script_text)
+                    
+                    final_status_msg = "All initial components ready! Review storyboard. 🚀"; final_op_status_val = "complete"
+                    if not st.session_state.project_overall_narration_audio_path: final_status_msg = f"{status_label_p2}Storyboard ready (Voiceover failed/skipped)."; logger.warning("APP_MAIN_FLOW: Narration audio failed/skipped.")
+                    else: logger.info("APP_MAIN_FLOW: Narration audio generated.")
+                    status_operation.update(label=final_status_msg, state=final_op_status_val, expanded=False)
+                except ValueError as e_val: logger.error(f"APP_MAIN_FLOW: ValueError: {e_val}", exc_info=True); status_operation.update(label=f"Data/Response Error: {e_val}", state="error", expanded=True);
+                except TypeError as e_type: logger.error(f"APP_MAIN_FLOW: TypeError: {e_type}", exc_info=True); status_operation.update(label=f"Type Error: {e_type}", state="error", expanded=True);
+                except Exception as e_gen: logger.error(f"APP_MAIN_FLOW: Unhandled Exception: {e_gen}", exc_info=True); status_operation.update(label=f"Unexpected Error: {e_gen}", state="error", expanded=True);
     
     with st.expander("Define Characters", expanded=False):
-        # ... (Keep as before)
-        char_name_input_sidebar = st.text_input("Character Name", key="char_name_sidebar_unique"); char_desc_input_sidebar = st.text_area("Visual Description", key="char_desc_sidebar_unique", height=100)
-        if st.button("Save Character", key="add_char_sidebar_unique"):
-            if char_name_input_sidebar and char_desc_input_sidebar: st.session_state.character_definitions[char_name_input_sidebar.strip().lower()] = char_desc_input_sidebar.strip(); st.success(f"Char '{char_name_input_sidebar.strip()}' saved.")
-            else: st.warning("Name and description needed.")
-        if st.session_state.character_definitions: st.caption("Current Characters:"); [st.markdown(f"**{k.title()}:** _{v}_") for k,v in st.session_state.character_definitions.items()]
+        # (Keep as before - unique keys for inputs)
+        sb_char_name_input = st.text_input("Character Name", key="sb_char_name_unique_2"); sb_char_desc_input = st.text_area("Visual Description", key="sb_char_desc_unique_2", height=100, placeholder="e.g., Jax: rugged astronaut...")
+        if st.button("Save Character", key="sb_add_char_unique_2"):
+            if sb_char_name_input and sb_char_desc_input: st.session_state.project_character_definitions_map[sb_char_name_input.strip().lower()] = sb_char_desc_input.strip(); st.success(f"Character '{sb_char_name_input.strip()}' saved.")
+            else: st.warning("Both character name and description are required.")
+        if st.session_state.project_character_definitions_map: st.caption("Defined Characters:"); [st.markdown(f"**{char_key.title()}:** _{char_val}_") for char_key,char_val in st.session_state.project_character_definitions_map.items()]
+    
     with st.expander("Global Style Overrides", expanded=False):
-        # ... (Keep as before)
-        style_presets_dict_sidebar = { "Default (Director's Choice)": "", "Hyper-Realistic Gritty Noir": "hyper-realistic gritty neo-noir...", "Surreal Dreamscape Fantasy": "surreal dreamscape...", "Vintage Analog Sci-Fi": "70s/80s analog sci-fi..."}
-        selected_style_key_sidebar = st.selectbox("Base Style Preset:", options=list(style_presets_dict_sidebar.keys()), key="style_preset_sidebar_unique")
-        custom_kw_input_sidebar = st.text_area("Additional Custom Style Keywords:", key="custom_style_sidebar_unique", height=80)
-        current_global_style_val_sidebar = st.session_state.global_style_additions
-        if st.button("Apply Global Styles", key="apply_styles_sidebar_unique"):
-            final_style_str_sidebar = style_presets_dict_sidebar[selected_style_key_sidebar]; 
-            if custom_kw_input_sidebar.strip(): final_style_str_sidebar = f"{final_style_str_sidebar}, {custom_kw_input_sidebar.strip()}" if final_style_str_sidebar else custom_kw_input_sidebar.strip()
-            st.session_state.global_style_additions = final_style_str_sidebar.strip(); current_global_style_val_sidebar = final_style_str_sidebar.strip()
-            if current_global_style_val_sidebar: st.success("Global styles applied!")
-            else: st.info("Global style additions cleared.")
-        if current_global_style_val_sidebar: st.caption(f"Active: \"{current_global_style_val_sidebar}\"")
+        # (Keep as before - unique keys for inputs)
+        sb_style_presets_map = { "Default (Director's Choice)": "", "Hyper-Realistic Gritty Noir": "hyper-realistic gritty neo-noir, extreme detail...", "Surreal Dreamscape Fantasy": "surreal dreamscape, epic fantasy elements...", "Vintage Analog Sci-Fi": "70s/80s analog sci-fi film aesthetic..."}
+        sb_selected_preset_key_style = st.selectbox("Base Style Preset:", options=list(sb_style_presets_map.keys()), key="sb_style_preset_unique_2")
+        sb_custom_keywords_style = st.text_area("Additional Custom Style Keywords:", key="sb_custom_style_unique_2", height=80, placeholder="e.g., 'Dutch angle', 'lens flare'")
+        sb_current_global_style_display = st.session_state.project_global_style_keywords_str
+        if st.button("Apply Global Styles", key="sb_apply_styles_unique_2"):
+            final_style_str_global = sb_style_presets_map[sb_selected_preset_key_style]; 
+            if sb_custom_keywords_style.strip(): final_style_str_global = f"{final_style_str_global}, {sb_custom_keywords_style.strip()}" if final_style_str_global else sb_custom_keywords_style.strip()
+            st.session_state.project_global_style_keywords_str = final_style_str_global.strip(); sb_current_global_style_display = final_style_str_global.strip()
+            if sb_current_global_style_display: st.success("Global visual styles applied!")
+            else: st.info("Global visual style additions cleared.")
+        if sb_current_global_style_display: st.caption(f"Active global styles: \"{sb_current_global_style_display}\"")
+
     with st.expander("Voice & Narration Style", expanded=False):
-        # ... (Keep as before)
-        engine_default_voice_val = "Rachel"
-        if hasattr(st.session_state, 'visual_engine') and st.session_state.visual_engine: engine_default_voice_val = st.session_state.visual_engine.elevenlabs_voice_id
-        user_voice_id_override_input = st.text_input("ElevenLabs Voice ID (override):", value=engine_default_voice_val, key="el_voice_id_sidebar_unique")
-        narration_styles_map_sidebar = {"Cinematic Trailer": "cinematic_trailer", "Neutral Documentary": "documentary_neutral", "Character Introspection": "introspective_character"}
-        selected_narration_style_key_sidebar = st.selectbox("Narration Script Style:", list(narration_styles_map_sidebar.keys()), key="narr_style_sidebar_unique", index=0)
-        if st.button("Set Narrator Voice & Style", key="set_voice_btn_sidebar_unique"):
-            final_voice_id_el_sidebar = user_voice_id_override_input.strip() or st.session_state.get("ELEVENLABS_VOICE_ID_CONFIG", "Rachel")
-            if hasattr(st.session_state, 'visual_engine'): st.session_state.visual_engine.elevenlabs_voice_id = final_voice_id_el_sidebar
-            st.session_state.selected_voice_style_for_generation = narration_styles_map_sidebar[selected_narration_style_key_sidebar]
-            st.success(f"Narrator Voice ID: {final_voice_id_el_sidebar}. Script Style: {selected_narration_style_key_sidebar}")
-            logger.info(f"User updated 11L Voice ID: {final_voice_id_el_sidebar}, Script Style: {selected_narration_style_key_sidebar}")
+        # (Keep as before - unique keys for inputs)
+        sb_engine_default_voice_val_narr = "Rachel"
+        if hasattr(st.session_state, 'visual_content_engine') and st.session_state.visual_content_engine: sb_engine_default_voice_val_narr = st.session_state.visual_content_engine.elevenlabs_voice_id
+        sb_user_voice_id_input_narr = st.text_input("ElevenLabs Voice ID (override):", value=sb_engine_default_voice_val_narr, key="sb_el_voice_id_override_unique_2", help=f"Defaulting to '{sb_engine_default_voice_val_narr}'.")
+        sb_narration_styles_map_narr = {"Cinematic Trailer": "cinematic_trailer", "Neutral Documentary": "documentary_neutral", "Character Introspection": "introspective_character"}
+        sb_selected_narration_style_key_narr = st.selectbox("Narration Script Style:", list(sb_narration_styles_map_narr.keys()), key="sb_narr_style_sel_unique_2", index=0)
+        if st.button("Set Narrator Voice & Style", key="sb_set_voice_btn_unique_2"):
+            final_voice_id_to_use_el_narr = sb_user_voice_id_input_narr.strip() or st.session_state.get("CONFIG_ELEVENLABS_VOICE_ID", "Rachel")
+            if hasattr(st.session_state, 'visual_content_engine'): st.session_state.visual_content_engine.elevenlabs_voice_id = final_voice_id_to_use_el_narr
+            st.session_state.selected_voice_style_for_generation = sb_narration_styles_map_narr[sb_selected_narration_style_key_narr]
+            st.success(f"Narrator Voice ID set to: {final_voice_id_to_use_el_narr}. Script Style: {sb_selected_narration_style_key_narr}")
+            logger.info(f"User updated 11L Voice ID: {final_voice_id_to_use_el_narr}, Narration Script Style: {sb_selected_narration_style_key_narr}")
 
 # --- Main Content Area ---
 st.header("🎬 Cinematic Storyboard & Treatment")
-if st.session_state.narration_script_display:
-    with st.expander("📜 View Full Narration Script", expanded=False): st.markdown(f"> _{st.session_state.narration_script_display}_")
+if st.session_state.project_narration_script_text:
+    with st.expander("📜 View Full Narration Script", expanded=False): st.markdown(f"> _{st.session_state.project_narration_script_text}_")
 
-if not st.session_state.story_treatment_scenes: st.info("Use the sidebar to generate your cinematic treatment.")
+if not st.session_state.project_story_treatment_scenes: st.info("Use the sidebar to generate your cinematic treatment.")
 else:
-    for i_main_loop_content, scene_content_item_display in enumerate(st.session_state.story_treatment_scenes): # Renamed loop variables
-        scene_num_display_val = scene_content_item_display.get('scene_number', i_main_loop_content + 1)
-        scene_title_display_val = scene_content_item_display.get('scene_title', 'Untitled Scene')
-        key_base_for_widgets_main = f"s{scene_num_display_val}_{''.join(filter(str.isalnum, scene_title_display_val[:10]))}_main_content_{i_main_loop_content}" # Renamed for uniqueness
+    for i_loop_main_display, scene_item_for_display in enumerate(st.session_state.project_story_treatment_scenes):
+        scene_num_for_display = scene_item_for_display.get('scene_number', i_loop_main_display + 1)
+        scene_title_for_display_main = scene_item_for_display.get('scene_title', 'Untitled Scene')
+        key_base_main_area_widgets = f"s{scene_num_for_display}_main_widgets_{i_loop_main_display}"
 
-        if "director_note" in scene_content_item_display and scene_content_item_display['director_note']: st.info(f"🎬 Director Note S{scene_num_display_val}: {scene_content_item_display['director_note']}")
-        st.subheader(f"SCENE {scene_num_display_val}: {scene_title_display_val.upper()}"); col_treatment_main, col_visual_main = st.columns([0.45, 0.55])
+        if "director_note" in scene_item_for_display and scene_item_for_display['director_note']: st.info(f"🎬 Director Note S{scene_num_for_display}: {scene_item_for_display['director_note']}")
+        st.subheader(f"SCENE {scene_num_for_display}: {scene_title_for_display_main.upper()}"); main_col_treatment_area, main_col_visual_area = st.columns([0.45, 0.55])
 
-        with col_treatment_main:
+        with main_col_treatment_area:
             with st.expander("📝 Scene Treatment & Controls", expanded=True):
                 # (Display textual scene details - as before)
-                st.markdown(f"**Beat:** {scene_content_item_display.get('emotional_beat', 'N/A')}"); st.markdown(f"**Setting:** {scene_content_item_display.get('setting_description', 'N/A')}"); st.markdown(f"**Chars:** {', '.join(scene_content_item_display.get('characters_involved', ['N/A']))}"); st.markdown(f"**Focus Moment:** _{scene_content_item_display.get('character_focus_moment', 'N/A')}_"); st.markdown(f"**Plot Beat:** {scene_content_item_display.get('key_plot_beat', 'N/A')}"); st.markdown(f"**Dialogue Hook:** `\"{scene_content_item_display.get('suggested_dialogue_hook', '...')}\"`"); st.markdown("---"); st.markdown(f"**Dir. Visual Style:** _{scene_content_item_display.get('PROACTIVE_visual_style_감독', 'N/A')}_"); st.markdown(f"**Dir. Camera:** _{scene_content_item_display.get('PROACTIVE_camera_work_감독', 'N/A')}_"); st.markdown(f"**Dir. Sound:** _{scene_content_item_display.get('PROACTIVE_sound_design_감독', 'N/A')}_"); st.markdown("---")
+                st.markdown(f"**Beat:** {scene_item_for_display.get('emotional_beat', 'N/A')}"); st.markdown(f"**Setting:** {scene_item_for_display.get('setting_description', 'N/A')}"); st.markdown(f"**Chars:** {', '.join(scene_item_for_display.get('characters_involved', ['N/A']))}"); st.markdown(f"**Focus Moment:** _{scene_item_for_display.get('character_focus_moment', 'N/A')}_"); st.markdown(f"**Plot Beat:** {scene_item_for_display.get('key_plot_beat', 'N/A')}"); st.markdown(f"**Dialogue Hook:** `\"{scene_item_for_display.get('suggested_dialogue_hook', '...')}\"`"); st.markdown("---"); st.markdown(f"**Dir. Visual Style:** _{scene_item_for_display.get('PROACTIVE_visual_style_감독', 'N/A')}_"); st.markdown(f"**Dir. Camera:** _{scene_item_for_display.get('PROACTIVE_camera_work_감독', 'N/A')}_"); st.markdown(f"**Dir. Sound:** _{scene_item_for_display.get('PROACTIVE_sound_design_감독', 'N/A')}_"); st.markdown("---")
                 st.markdown("##### Shot, Pacing & Asset Controls")
-                # (Shot Type, Scene Duration, Asset Type Override selectboxes - as before)
-                current_user_shot_type_widget = st.session_state.story_treatment_scenes[i_main_loop_content].get('user_shot_type', DEFAULT_SHOT_TYPE)
-                try: shot_type_idx_widget = SHOT_TYPES_OPTIONS.index(current_user_shot_type_widget)
-                except ValueError: shot_type_idx_widget = SHOT_TYPES_OPTIONS.index(DEFAULT_SHOT_TYPE)
-                new_user_shot_type_widget = st.selectbox("Dominant Shot Type:", options=SHOT_TYPES_OPTIONS, index=shot_type_idx_widget, key=f"shot_type_widget_{key_base_for_widgets_main}")
-                if new_user_shot_type_widget != current_user_shot_type_widget: st.session_state.story_treatment_scenes[i_main_loop_content]['user_shot_type'] = new_user_shot_type_widget
-                current_user_duration_widget = st.session_state.story_treatment_scenes[i_main_loop_content].get('user_scene_duration_secs', DEFAULT_SCENE_DURATION_SECS)
-                new_user_duration_widget = st.number_input("Scene Duration (seconds):", min_value=1, max_value=300, value=current_user_duration_widget, step=1, key=f"duration_widget_{key_base_for_widgets_main}")
-                if new_user_duration_widget != current_user_duration_widget: st.session_state.story_treatment_scenes[i_main_loop_content]['user_scene_duration_secs'] = new_user_duration_widget
-                current_user_asset_type_widget = st.session_state.story_treatment_scenes[i_main_loop_content].get('user_selected_asset_type', "Auto (Director's Choice)")
-                try: asset_type_idx_widget = ASSET_TYPE_OPTIONS.index(current_user_asset_type_widget)
-                except ValueError: asset_type_idx_widget = 0
-                new_user_asset_type_widget = st.selectbox("Asset Type Override:", ASSET_TYPE_OPTIONS, index=asset_type_idx_widget, key=f"asset_type_sel_{key_base_for_widgets_main}", help="Choose asset type. 'Auto' uses AI suggestion.")
-                if new_user_asset_type_widget != current_user_asset_type_widget: st.session_state.story_treatment_scenes[i_main_loop_content]['user_selected_asset_type'] = new_user_asset_type_widget
+                # (Shot Type, Scene Duration, Asset Type Override selectboxes - as before, using unique keys)
+                ui_shot_type_current = st.session_state.project_story_treatment_scenes[i_loop_main_display].get('user_shot_type', DEFAULT_SHOT_TYPE)
+                try: ui_shot_type_idx_val = SHOT_TYPES_OPTIONS.index(ui_shot_type_current)
+                except ValueError: ui_shot_type_idx_val = SHOT_TYPES_OPTIONS.index(DEFAULT_SHOT_TYPE)
+                ui_shot_type_new = st.selectbox("Dominant Shot Type:", options=SHOT_TYPES_OPTIONS, index=ui_shot_type_idx_val, key=f"shot_type_{key_base_main_area_widgets}")
+                if ui_shot_type_new != ui_shot_type_current: st.session_state.project_story_treatment_scenes[i_loop_main_display]['user_shot_type'] = ui_shot_type_new
+                ui_duration_current = st.session_state.project_story_treatment_scenes[i_loop_main_display].get('user_scene_duration_secs', DEFAULT_SCENE_DURATION_SECS)
+                ui_duration_new = st.number_input("Scene Duration (seconds):", min_value=1, max_value=300, value=ui_duration_current, step=1, key=f"duration_{key_base_main_area_widgets}")
+                if ui_duration_new != ui_duration_current: st.session_state.project_story_treatment_scenes[i_loop_main_display]['user_scene_duration_secs'] = ui_duration_new
+                ui_asset_type_override_current = st.session_state.project_story_treatment_scenes[i_loop_main_display].get('user_selected_asset_type', "Auto (Director's Choice)")
+                try: ui_asset_type_idx_val = ASSET_TYPE_OPTIONS.index(ui_asset_type_override_current)
+                except ValueError: ui_asset_type_idx_val = 0
+                ui_asset_type_override_new = st.selectbox("Asset Type Override:", ASSET_TYPE_OPTIONS, index=ui_asset_type_idx_val, key=f"asset_type_{key_base_main_area_widgets}", help="Choose asset type. 'Auto' uses AI suggestion.")
+                if ui_asset_type_override_new != ui_asset_type_override_current: st.session_state.project_story_treatment_scenes[i_loop_main_display]['user_selected_asset_type'] = ui_asset_type_override_new
                 st.markdown("---")
-                prompt_for_current_asset_display = st.session_state.scene_generation_prompts[i_main_loop_content] if i_main_loop_content < len(st.session_state.scene_generation_prompts) else None
-                if prompt_for_current_asset_display:
-                     with st.popover("👁️ View Asset Generation Prompt"): st.markdown(f"**Prompt used:**"); st.code(prompt_for_current_asset_display, language='text')
-                pexels_query_display_val = scene_content_item_display.get('pexels_search_query_감독', None)
-                if pexels_query_display_val: st.caption(f"Pexels Fallback: `{pexels_query_display_val}`")
+                prompt_for_asset_to_display = st.session_state.project_scene_generation_prompts_list[i_loop_main_display] if i_loop_main_display < len(st.session_state.project_scene_generation_prompts_list) else None
+                if prompt_for_asset_to_display:
+                     with st.popover("👁️ View Asset Generation Prompt"): st.markdown(f"**Prompt used for current asset:**"); st.code(prompt_for_asset_to_display, language='text')
+                pexels_query_to_display = scene_item_for_display.get('pexels_search_query_감독', None)
+                if pexels_query_to_display: st.caption(f"Pexels Fallback: `{pexels_query_to_display}`")
 
-        with col_visual_main:
+        with main_col_visual_area:
             # (Display logic for different asset types - as before)
-            asset_info_for_display = st.session_state.generated_scene_assets_info[i_main_loop_content] if i_main_loop_content < len(st.session_state.generated_scene_assets_info) else None
-            if asset_info_for_display and not asset_info_for_display.get('error') and asset_info_for_display.get('path') and os.path.exists(asset_info_for_display['path']):
-                path_to_asset_display = asset_info_for_display['path']; type_of_asset_display = asset_info_for_display.get('type', 'image')
-                if type_of_asset_display == 'image': st.image(path_to_asset_display, caption=f"S{scene_num_display_val} ({type_of_asset_display}): {scene_title_display_val}")
-                elif type_of_asset_display == 'video':
+            current_asset_info_to_display = st.session_state.project_generated_assets_info_list[i_loop_main_display] if i_loop_main_display < len(st.session_state.project_generated_assets_info_list) else None
+            if current_asset_info_to_display and not current_asset_info_to_display.get('error') and current_asset_info_to_display.get('path') and os.path.exists(current_asset_info_to_display['path']):
+                path_of_asset_for_display = current_asset_info_to_display['path']; type_of_asset_for_display = current_asset_info_to_display.get('type', 'image')
+                if type_of_asset_for_display == 'image': st.image(path_of_asset_for_display, caption=f"S{scene_num_for_display} ({type_of_asset_for_display}): {scene_title_for_display_main}")
+                elif type_of_asset_for_display == 'video':
                     try:
-                        with open(path_to_asset_display, 'rb') as vf_read_main: video_bytes_content_main = vf_read_main.read()
-                        st.video(video_bytes_content_main, format="video/mp4", start_time=0); st.caption(f"S{scene_num_display_val} ({type_of_asset_display}): {scene_title_display_val}")
-                    except Exception as e_vid_disp_main: st.error(f"Error displaying video {path_to_asset_display}: {e_vid_disp_main}"); logger.error(f"Error displaying video: {e_vid_disp_main}", exc_info=True)
-                else: st.warning(f"Unknown asset type '{type_of_asset_display}' for S{scene_num_display_val}.")
+                        with open(path_of_asset_for_display, 'rb') as vid_file_obj_read: video_bytes_for_st_video = vid_file_obj_read.read()
+                        st.video(video_bytes_for_st_video, format="video/mp4", start_time=0); st.caption(f"S{scene_num_for_display} ({type_of_asset_for_display}): {scene_title_for_display_main}")
+                    except Exception as e_vid_display_main_loop: st.error(f"Error displaying video {path_of_asset_for_display}: {e_vid_display_main_loop}"); logger.error(f"Error displaying video: {e_vid_display_main_loop}", exc_info=True)
+                else: st.warning(f"Unknown asset type '{type_of_asset_for_display}' for S{scene_num_for_display}.")
             else:
-                if st.session_state.story_treatment_scenes:
-                    error_msg_display_main = asset_info_for_display.get('error_message', 'Visual pending/failed.') if asset_info_for_display else 'Visual pending/failed.'
-                    st.caption(error_msg_display_main)
+                if st.session_state.project_story_treatment_scenes:
+                    error_message_for_asset_display = current_asset_info_to_display.get('error_message', 'Visual pending or failed.') if current_asset_info_to_display else 'Visual pending or failed.'
+                    st.caption(error_message_for_asset_display)
             
-            with st.popover(f"✏️ Edit S{scene_num_display_val} Treatment"):
-                feedback_for_treatment_input = st.text_area("Changes to treatment:", key=f"treat_fb_{key_base_for_widgets_main}", height=150)
-                if st.button(f"🔄 Update S{scene_num_display_val} Treatment", key=f"regen_treat_btn_{key_base_for_widgets_main}"):
-                    if feedback_for_treatment_input:
-                        with st.status(f"Updating S{scene_num_display_val} Treatment & Asset...", expanded=True) as status_treat_regen_main:
-                            user_shot_type_pref_treat = st.session_state.story_treatment_scenes[i_main_loop_content]['user_shot_type']
-                            user_duration_pref_treat = st.session_state.story_treatment_scenes[i_main_loop_content]['user_scene_duration_secs']
-                            user_asset_type_pref_treat = st.session_state.story_treatment_scenes[i_main_loop_content]['user_selected_asset_type']
-                            regen_prompt_gemini_treat = create_scene_regeneration_prompt(scene_content_item_display, feedback_for_treatment_input, st.session_state.story_treatment_scenes)
+            with st.popover(f"✏️ Edit S{scene_num_for_display} Treatment"):
+                # (Treatment Regeneration Popover - using corrected generate_asset_for_scene_in_app call)
+                feedback_for_treatment_regen_input = st.text_area("Changes to treatment:", key=f"treat_fb_input_pop_{widget_key_base_main_area}", height=150)
+                if st.button(f"🔄 Update S{scene_num_for_display} Treatment", key=f"regen_treat_btn_pop_{widget_key_base_main_area}"):
+                    if feedback_for_treatment_regen_input:
+                        with st.status(f"Updating S{scene_num_for_display} Treatment & Asset...", expanded=True) as status_treatment_update_op_pop:
+                            preserved_user_shot_type_pop = st.session_state.project_story_treatment_scenes[i_loop_main_display]['user_shot_type']
+                            preserved_user_duration_pop = st.session_state.project_story_treatment_scenes[i_loop_main_display]['user_scene_duration_secs']
+                            preserved_user_asset_type_pop = st.session_state.project_story_treatment_scenes[i_loop_main_display]['user_selected_asset_type']
+                            prompt_for_gemini_scene_regen_pop = create_scene_regeneration_prompt(scene_item_for_display, feedback_for_treatment_regen_input, st.session_state.project_story_treatment_scenes)
                             try:
-                                updated_scene_data_from_gemini_treat = st.session_state.gemini_handler.regenerate_scene_script_details(regen_prompt_gemini_treat)
-                                final_updated_scene_data_treat = {**updated_scene_data_from_gemini_treat}
-                                final_updated_scene_data_treat['user_shot_type'] = user_shot_type_pref_treat; final_updated_scene_data_treat['user_scene_duration_secs'] = user_duration_pref_treat; final_updated_scene_data_treat['user_selected_asset_type'] = user_asset_type_pref_treat
-                                st.session_state.story_treatment_scenes[i_main_loop_content] = final_updated_scene_data_treat
-                                status_treat_regen_main.update(label="Treatment updated! Regenerating asset...", state="running")
-                                version_num_asset_treat = 1
-                                if asset_info_for_display and asset_info_for_display.get('path') and os.path.exists(asset_info_for_display['path']):
-                                    try: base_fn_treat,_=os.path.splitext(os.path.basename(asset_info_for_display['path'])); version_num_asset_treat = int(base_fn_treat.split('_v')[-1])+1 if '_v' in base_fn_treat else 2
-                                    except: version_num_asset_treat = 2 
-                                if generate_asset_for_scene_wrapper(i_main_loop_content, final_updated_scene_data_treat, version_num=version_num_asset_treat, user_selected_asset_type_override=user_asset_type_pref_treat): status_treat_regen_main.update(label="Treatment & Asset Updated! 🎉", state="complete", expanded=False)
-                                else: status_treat_regen_main.update(label="Treatment updated, asset failed.", state="complete", expanded=False)
+                                updated_scene_data_from_gemini_pop = st.session_state.gemini_service_handler.regenerate_scene_script_details(prompt_for_gemini_scene_regen_pop)
+                                final_merged_updated_scene_data_pop = {**updated_scene_data_from_gemini_pop}
+                                final_merged_updated_scene_data_pop['user_shot_type'] = preserved_user_shot_type_pop; final_merged_updated_scene_data_pop['user_scene_duration_secs'] = preserved_user_duration_pop; final_merged_updated_scene_data_pop['user_selected_asset_type'] = preserved_user_asset_type_pop
+                                st.session_state.project_story_treatment_scenes[i_loop_main_display] = final_merged_updated_scene_data_pop
+                                status_treatment_update_op_pop.update(label="Treatment updated! Regenerating asset...", state="running")
+                                version_for_regenerated_asset_pop = 1
+                                if current_asset_info_to_display and current_asset_info_to_display.get('path') and os.path.exists(current_asset_info_to_display['path']):
+                                    try: base_fn_asset_regen_pop,_=os.path.splitext(os.path.basename(current_asset_info_to_display['path'])); version_for_regenerated_asset_pop = int(base_fn_asset_regen_pop.split('_v')[-1])+1 if '_v' in base_fn_asset_regen_pop else 2
+                                    except: version_for_regenerated_asset_pop = 2 
+                                if generate_asset_for_scene_in_app(i_loop_main_display, final_merged_updated_scene_data_pop, asset_ver_num=version_for_regenerated_asset_pop, user_selected_asset_type_override=preserved_user_asset_type_pop): status_treatment_update_op_pop.update(label="Treatment & Asset Updated! 🎉", state="complete", expanded=False)
+                                else: status_treatment_update_op_pop.update(label="Treatment updated, but asset regeneration failed.", state="complete", expanded=False)
                                 st.rerun()
-                            except Exception as e_treat_regen_loop: status_treat_regen_main.update(label=f"Error: {e_treat_regen_loop}", state="error"); logger.error(f"Scene treatment regen error: {e_treat_regen_loop}", exc_info=True)
-                    else: st.warning("Please provide feedback for treatment.")
-
-            with st.popover(f"🎨 Edit S{scene_num_display_val} Visual Prompt/Asset"):
-                current_gen_prompt_edit_display = st.session_state.scene_generation_prompts[i_main_loop_content] if i_main_loop_content < len(st.session_state.scene_generation_prompts) else "No prompt."
-                st.caption("Current Asset Generation Prompt:"); st.code(current_gen_prompt_edit_display, language='text')
-                feedback_for_visual_input = st.text_area("Describe changes for the visual asset:", key=f"visual_fb_{key_base_for_widgets_main}", height=150)
-                if st.button(f"🔄 Update S{scene_num_display_val} Asset", key=f"regen_visual_btn_{key_base_for_widgets_main}"):
-                    if feedback_for_visual_input:
-                        with st.status(f"Refining prompt & asset for S{scene_num_display_val}...", expanded=True) as status_visual_regen_main:
-                            user_asset_type_choice_viz = st.session_state.story_treatment_scenes[i_main_loop_content]['user_selected_asset_type']
-                            is_video_type_for_regen = (user_asset_type_choice_viz == "Video Clip") or (user_asset_type_choice_viz == "Auto (Director's Choice)" and scene_content_item_display.get('suggested_asset_type_감독') == 'video_clip')
-                            newly_constructed_asset_prompt_regen = ""
-                            if not is_video_type_for_regen:
-                                gemini_refinement_prompt_viz = create_visual_regeneration_prompt(current_gen_prompt_edit_display, feedback_for_visual_input, scene_content_item_display, st.session_state.character_definitions, st.session_state.global_style_additions)
-                                try: newly_constructed_asset_prompt_regen = st.session_state.gemini_handler.refine_image_prompt_from_feedback(gemini_refinement_prompt_viz); st.session_state.scene_generation_prompts[i_main_loop_content] = newly_constructed_asset_prompt_regen; status_visual_regen_main.update(label="Image prompt refined! Regenerating asset...", state="running")
-                                except Exception as e_gemini_refine_viz: status_visual_regen_main.update(label=f"Error refining prompt: {e_gemini_refine_viz}", state="error"); logger.error(f"Visual prompt refinement error: {e_gemini_refine_viz}", exc_info=True); continue
-                            else: 
-                                logger.info(f"Reconstructing video motion prompt for S{scene_num_display_val}. Feedback (indirect): {feedback_for_visual_input}")
-                                newly_constructed_asset_prompt_regen = construct_text_to_video_prompt_for_gen4(scene_content_item_display, st.session_state.global_style_additions); st.session_state.scene_generation_prompts[i_main_loop_content] = newly_constructed_asset_prompt_regen; status_visual_regen_main.update(label="Video prompt reconstructed! Regenerating asset...", state="running")
-                            if not newly_constructed_asset_prompt_regen: status_visual_regen_main.update(label="Prompt construction failed.", state="error"); continue
-                            version_num_viz_asset_regen = 1
-                            if asset_info_for_display and asset_info_for_display.get('path') and os.path.exists(asset_info_for_display['path']):
-                                try: base_fn_viz_regen,_=os.path.splitext(os.path.basename(asset_info_for_display['path'])); version_num_viz_asset_regen = int(base_fn_viz_regen.split('_v')[-1])+1 if '_v' in base_fn_viz_regen else 2
-                                except: version_num_viz_asset_regen = 2
-                            if generate_asset_for_scene_wrapper(i_main_loop_content, st.session_state.story_treatment_scenes[i_main_loop_content], version_num=version_num_viz_asset_regen, user_selected_asset_type_override=user_asset_type_choice_viz): status_visual_regen_main.update(label="Asset Updated! 🎉", state="complete", expanded=False)
-                            else: status_visual_regen_main.update(label="Prompt updated, asset regen failed.", state="complete", expanded=False)
+                            except Exception as e_treatment_regen_op_pop: status_treatment_update_op_pop.update(label=f"Error during treatment regen: {e_treatment_regen_op_pop}", state="error"); logger.error(f"Scene treatment regeneration error: {e_treatment_regen_op_pop}", exc_info=True)
+                    else: st.warning("Please provide feedback to update the treatment.")
+
+            with st.popover(f"🎨 Edit S{scene_num_for_display} Visual Prompt/Asset"):
+                # (Visual Asset Regeneration Popover - using corrected generate_asset_for_scene_in_app call)
+                prompt_to_edit_display_pop = st.session_state.project_scene_generation_prompts_list[i_loop_main_display] if i_loop_main_display < len(st.session_state.project_scene_generation_prompts_list) else "No prompt available."
+                st.caption("Current Asset Generation Prompt:"); st.code(prompt_to_edit_display_pop, language='text')
+                feedback_for_visual_asset_regen_input = st.text_area("Describe changes for the visual asset:", key=f"visual_fb_input_pop_{widget_key_base_main_area}", height=150)
+                if st.button(f"🔄 Update S{scene_num_for_display} Asset", key=f"regen_visual_btn_pop_{widget_key_base_main_area}"):
+                    if feedback_for_visual_asset_regen_input:
+                        with st.status(f"Refining prompt & regenerating asset for S{scene_num_for_display}...", expanded=True) as status_visual_asset_regen_op_pop:
+                            user_selected_asset_type_for_regen_pop = st.session_state.project_story_treatment_scenes[i_loop_main_display]['user_selected_asset_type']
+                            is_video_type_for_regen_pop = (user_selected_asset_type_for_regen_pop == "Video Clip") or (user_selected_asset_type_for_regen_pop == "Auto (Director's Choice)" and scene_item_for_display.get('suggested_asset_type_감독') == 'video_clip')
+                            newly_constructed_asset_prompt_regen_pop = ""
+                            if not is_video_type_for_regen_pop: # IMAGE
+                                gemini_refinement_prompt_viz_pop = create_visual_regeneration_prompt(prompt_to_edit_display_pop, feedback_for_visual_asset_regen_input, scene_item_for_display, st.session_state.project_character_definitions_map, st.session_state.project_global_style_keywords_str)
+                                try: newly_constructed_asset_prompt_regen_pop = st.session_state.gemini_service_handler.refine_image_prompt_from_feedback(gemini_refinement_prompt_viz_pop); st.session_state.project_scene_generation_prompts_list[i_loop_main_display] = newly_constructed_asset_prompt_regen_pop; status_visual_asset_regen_op_pop.update(label="Image prompt refined! Regenerating asset...", state="running")
+                                except Exception as e_gemini_refine_viz_pop: status_visual_asset_regen_op_pop.update(label=f"Error refining prompt: {e_gemini_refine_viz_pop}", state="error"); logger.error(f"Visual prompt refinement (Gemini) error: {e_gemini_refine_viz_pop}", exc_info=True); continue
+                            else: # VIDEO
+                                logger.info(f"Reconstructing video motion prompt for S{scene_num_for_display}. Feedback (indirect): {feedback_for_visual_asset_regen_input}")
+                                newly_constructed_asset_prompt_regen_pop = construct_text_to_video_prompt_for_gen4(scene_item_for_display, st.session_state.project_global_style_keywords_str); st.session_state.project_scene_generation_prompts_list[i_loop_main_display] = newly_constructed_asset_prompt_regen_pop; status_visual_asset_regen_op_pop.update(label="Video prompt reconstructed! Regenerating asset...", state="running")
+                            if not newly_constructed_asset_prompt_regen_pop: status_visual_asset_regen_op_pop.update(label="Prompt construction/refinement failed.", state="error"); continue
+                            version_for_regenerated_visual_asset_pop = 1
+                            if current_asset_info_to_display and current_asset_info_to_display.get('path') and os.path.exists(current_asset_info_to_display['path']):
+                                try: base_fn_viz_regen_pop,_=os.path.splitext(os.path.basename(current_asset_info_to_display['path'])); version_for_regenerated_visual_asset_pop = int(base_fn_viz_regen_pop.split('_v')[-1])+1 if '_v' in base_fn_viz_regen_pop else 2
+                                except: version_for_regenerated_visual_asset_pop = 2
+                            if generate_asset_for_scene_in_app(i_loop_main_display, st.session_state.project_story_treatment_scenes[i_loop_main_display], asset_ver_num=version_for_regenerated_visual_asset_pop, user_selected_asset_type_override=user_selected_asset_type_for_regen_pop): status_visual_asset_regen_op_pop.update(label="Asset Updated! 🎉", state="complete", expanded=False)
+                            else: status_visual_asset_regen_op_pop.update(label="Prompt updated, asset regen failed.", state="complete", expanded=False)
                             st.rerun()
-                    else: st.warning("Please provide feedback for visual asset.")
+                    else: st.warning("Please provide feedback for visual asset regeneration.")
         st.markdown("---")
     
-    if st.session_state.story_treatment_scenes and any(asset_info_item_loop and not asset_info_item_loop.get('error') and asset_info_item_loop.get('path') for asset_info_item_loop in st.session_state.generated_scene_assets_info if asset_info_item_loop is not None):
-        if st.button("🎬 Assemble Narrated Cinematic Animatic", key="assemble_video_main_btn_unique", type="primary", use_container_width=True):
-            with st.status("Assembling Ultra Animatic...", expanded=True) as status_vid_assembly_main:
-                assets_for_final_vid_assembly = []
-                for i_vid_assembly_loop, scene_data_for_vid_loop in enumerate(st.session_state.story_treatment_scenes):
-                    asset_info_curr_scene_vid = st.session_state.generated_scene_assets_info[i_vid_assembly_loop] if i_vid_assembly_loop < len(st.session_state.generated_scene_assets_info) else None
-                    if asset_info_curr_scene_vid and not asset_info_curr_scene_vid.get('error') and asset_info_curr_scene_vid.get('path') and os.path.exists(asset_info_curr_scene_vid['path']):
-                        assets_for_final_vid_assembly.append({'path': asset_info_curr_scene_vid['path'], 'type': asset_info_curr_scene_vid.get('type', 'image'), 'scene_num': scene_data_for_vid_loop.get('scene_number', i_vid_assembly_loop + 1), 'key_action': scene_data_for_vid_loop.get('key_plot_beat', ''), 'duration': scene_data_for_vid_loop.get('user_scene_duration_secs', DEFAULT_SCENE_DURATION_SECS)})
-                        status_vid_assembly_main.write(f"Adding S{scene_data_for_vid_loop.get('scene_number', i_vid_assembly_loop + 1)} ({asset_info_curr_scene_vid.get('type')}).")
-                    else: logger.warning(f"Skipping S{scene_data_for_vid_loop.get('scene_number', i_vid_assembly_loop+1)} for video: No valid asset.")
-                if assets_for_final_vid_assembly:
-                    status_vid_assembly_main.write("Calling video engine...");
-                    st.session_state.video_path = st.session_state.visual_engine.assemble_animatic_from_assets(asset_data_list=assets_for_final_vid_assembly, overall_narration_path=st.session_state.overall_narration_audio_path, output_filename="cinegen_ultra_animatic.mp4", fps=24)
-                    if st.session_state.video_path and os.path.exists(st.session_state.video_path): status_vid_assembly_main.update(label="Ultra animatic assembled! 🎉", state="complete", expanded=False); st.balloons()
-                    else: status_vid_assembly_main.update(label="Video assembly failed. Check logs.", state="error", expanded=False); logger.error("Video assembly returned None or file does not exist.")
-                else: status_vid_assembly_main.update(label="No valid assets for video assembly.", state="error", expanded=False); logger.warning("No valid assets found for video assembly.")
-    elif st.session_state.story_treatment_scenes: st.info("Generate visual assets before assembling the animatic.")
-
-    if st.session_state.video_path and os.path.exists(st.session_state.video_path):
+    # Video Assembly Button Logic
+    if st.session_state.project_story_treatment_scenes and any(asset_info_item_vid_assembly and not asset_info_item_vid_assembly.get('error') and asset_info_item_vid_assembly.get('path') for asset_info_item_vid_assembly in st.session_state.project_generated_assets_info_list if asset_info_item_vid_assembly is not None):
+        if st.button("🎬 Assemble Narrated Cinematic Animatic", key="assemble_video_main_area_btn_final_unique", type="primary", use_container_width=True): # Unique key
+            with st.status("Assembling Ultra Animatic (this may take a few minutes)...", expanded=True) as status_video_assembly_final_op:
+                assets_for_final_video_assembly_list_main = []
+                for i_vid_assembly_main_loop, scene_data_for_vid_assembly_main in enumerate(st.session_state.project_story_treatment_scenes):
+                    asset_info_current_scene_for_vid_main = st.session_state.project_generated_assets_info_list[i_vid_assembly_main_loop] if i_vid_assembly_main_loop < len(st.session_state.project_generated_assets_info_list) else None
+                    if asset_info_current_scene_for_vid_main and not asset_info_current_scene_for_vid_main.get('error') and asset_info_current_scene_for_vid_main.get('path') and os.path.exists(asset_info_current_scene_for_vid_main['path']):
+                        assets_for_final_video_assembly_list_main.append({'path': asset_info_current_scene_for_vid_main['path'], 'type': asset_info_current_scene_for_vid_main.get('type', 'image'), 'scene_num': scene_data_for_vid_assembly_main.get('scene_number', i_vid_assembly_main_loop + 1), 'key_action': scene_data_for_vid_assembly_main.get('key_plot_beat', ''), 'duration': scene_data_for_vid_assembly_main.get('user_scene_duration_secs', DEFAULT_SCENE_DURATION_SECS)})
+                        status_video_assembly_final_op.write(f"Adding S{scene_data_for_vid_assembly_main.get('scene_number', i_vid_assembly_main_loop + 1)} ({asset_info_current_scene_for_vid_main.get('type')}).")
+                    else: logger.warning(f"Skipping S{scene_data_for_vid_assembly_main.get('scene_number', i_vid_assembly_main_loop+1)} for video: No valid asset.")
+                if assets_for_final_video_assembly_list_main:
+                    status_video_assembly_final_op.write("Calling video engine..."); logger.info("APP: Calling visual_engine.assemble_animatic_from_assets")
+                    st.session_state.project_final_video_path = st.session_state.visual_content_engine.assemble_animatic_from_assets(asset_data_list=assets_for_final_video_assembly_list_main, overall_narration_path=st.session_state.project_overall_narration_audio_path, output_filename="cinegen_ultra_animatic.mp4", fps=24)
+                    if st.session_state.project_final_video_path and os.path.exists(st.session_state.project_final_video_path): status_video_assembly_final_op.update(label="Ultra animatic assembled! 🎉", state="complete", expanded=False); st.balloons()
+                    else: status_video_assembly_final_op.update(label="Video assembly failed. Check logs.", state="error", expanded=True); logger.error("APP: Video assembly returned None or file does not exist.")
+                else: status_video_assembly_final_op.update(label="No valid assets for video assembly.", state="error", expanded=True); logger.warning("APP: No valid assets found for video assembly.")
+    elif st.session_state.project_story_treatment_scenes: st.info("Generate visual assets for your scenes before attempting to assemble the animatic.")
+
+    if st.session_state.project_final_video_path and os.path.exists(st.session_state.project_final_video_path):
         st.header("🎬 Generated Cinematic Animatic"); 
         try:
-            with open(st.session_state.video_path, 'rb') as vf_obj_read_final: video_bytes_final_content = vf_obj_read_final.read()
-            st.video(video_bytes_final_content, format="video/mp4") 
-            st.download_button(label="Download Ultra Animatic", data=video_bytes_final_content, file_name=os.path.basename(st.session_state.video_path), mime="video/mp4", use_container_width=True, key="download_video_main_btn_unique" )
-        except Exception as e_vid_final_disp_main: st.error(f"Error displaying final video: {e_vid_final_disp_main}"); logger.error(f"Error displaying final video: {e_vid_final_disp_main}", exc_info=True)
+            with open(st.session_state.project_final_video_path, 'rb') as final_video_file_obj_display: final_video_bytes_for_display = final_video_file_obj_display.read()
+            st.video(final_video_bytes_for_display, format="video/mp4") 
+            st.download_button(label="Download Ultra Animatic", data=final_video_bytes_for_display, file_name=os.path.basename(st.session_state.project_final_video_path), mime="video/mp4", use_container_width=True, key="download_video_main_area_btn_final_unique" )
+        except Exception as e_final_video_display_op_main: st.error(f"Error displaying final animatic video: {e_final_video_display_op_main}"); logger.error(f"Error displaying final animatic video: {e_final_video_display_op_main}", exc_info=True)
 
 st.sidebar.markdown("---"); st.sidebar.caption("CineGen AI Ultra+ | Visionary Cinematic Pre-Production")