Update app.py

app.py

@@ -30,7 +30,6 @@ try:
     print("model_logic.py loaded successfully.")
 except ImportError:
     print("Warning: Local modules (build_logic.py, model_logic.py) not found. Using dummy functions.")
-    # Define dummy functions so the app can at least start
     def get_available_providers(): return ["DummyProvider"]
     def get_models_for_provider(p): return ["dummy-model"]
     def get_default_model_for_provider(p): return "dummy-model"
@@ -42,10 +41,11 @@ except ImportError:
     def list_space_files_for_browsing(*args): return ([], "Error: build_logic not found.")
     def get_space_repository_info(*args): return (None, [], "Error: build_logic not found.")
     def get_space_file_content(*args): return ("", "Error: build_logic not found.")
-    def update_space_file(*args): return "Error: build_logic not found."
+    def update_space_file(*args, **kwargs): return "Error: build_logic not found."
     def build_logic_parse_markdown(md): return {"files": []}
     def build_logic_delete_space_file(*args): return "Error: build_logic not found."
     def get_space_runtime_status(*args): return (None, "Error: build_logic not found.")
+# --- END: Dummy functions ---
 
 
 # --- New Feature Functions (can be moved to build_logic.py) ---
@@ -133,7 +133,7 @@ You can issue multiple actions. For example, to delete a file and then add a new
 Use these actions when the user's request explicitly calls for them (e.g., "delete the readme file", "make this space private", "create a new private space called my-test-app"). If no code is provided, assist the user with their tasks.
 """
 
-
+# --- Helper Functions (largely unchanged) ---
 def escape_html_for_markdown(text):
     if not isinstance(text, str): return ""
     return text.replace("&", "&").replace("<", "<").replace(">", ">")
@@ -310,32 +310,111 @@ def _generate_ui_outputs_from_cache(owner, space_name):
 
     return formatted_md_val, preview_md_val, gr.update(value=download_file, interactive=download_file is not None)
 
-def handle_chat_submit(user_message, chat_history, hf_api_key_input, provider_select, model_select, system_prompt, hf_owner_name, hf_repo_name, _current_formatted_markdown):
+# --- NEW: Core logic for Change Staging and Confirmation ---
+
+def generate_and_stage_changes(ai_response_content, current_files_state, hf_owner_name, hf_repo_name):
+    """
+    Parses AI response, compares with current state, and generates a structured changeset.
+    Returns the changeset and a markdown summary for display.
+    """
+    changeset = []
+    current_files_dict = {f["filename"]: f for f in current_files_state if not f.get("is_structure_block")}
+    
+    # 1. Parse proposed files from AI response
+    parsing_result = _parse_chat_stream_logic(ai_response_content, existing_files_state=current_files_state)
+    proposed_files = parsing_result.get("parsed_code_blocks", [])
+    
+    # 2. Parse HF_ACTION commands from AI response
+    action_pattern = re.compile(r"### HF_ACTION:\s*(?P<command_line>[^\n]+)")
+    for match in action_pattern.finditer(ai_response_content):
+        cmd_parts = shlex.split(match.group("command_line").strip())
+        if not cmd_parts: continue
+        command, args = cmd_parts[0].upper(), cmd_parts[1:]
+        
+        # Add actions to the changeset
+        if command == "DELETE_FILE" and args:
+            changeset.append({"type": "DELETE_FILE", "path": args[0]})
+        elif command == "SET_PRIVATE" and args:
+            changeset.append({"type": "SET_PRIVACY", "private": args[0].lower() == 'true', "repo_id": f"{hf_owner_name}/{hf_repo_name}"})
+        elif command == "DELETE_SPACE":
+            changeset.append({"type": "DELETE_SPACE", "owner": hf_owner_name, "space_name": hf_repo_name})
+        elif command == "CREATE_SPACE" and args:
+            repo_id = args[0]
+            sdk = "gradio"  # default
+            private = False # default
+            if '--sdk' in args: sdk = args[args.index('--sdk') + 1]
+            if '--private' in args: private = args[args.index('--private') + 1].lower() == 'true'
+            changeset.append({"type": "CREATE_SPACE", "repo_id": repo_id, "sdk": sdk, "private": private})
+    
+    # 3. Compare proposed files with current files to determine CREATE/UPDATE
+    for file_block in proposed_files:
+        if file_block.get("is_structure_block"): continue
+        
+        filename = file_block["filename"]
+        if filename not in current_files_dict:
+            changeset.append({"type": "CREATE_FILE", "path": filename, "content": file_block["code"], "lang": file_block["language"]})
+        elif file_block["code"] != current_files_dict[filename]["code"]:
+            changeset.append({"type": "UPDATE_FILE", "path": filename, "content": file_block["code"], "lang": file_block["language"]})
+            
+    # 4. Format the changeset into a human-readable Markdown string
+    if not changeset:
+        return [], "The AI did not propose any specific changes to files or the space.", parsing_result
+
+    md_summary = ["### 📋 Proposed Changes Plan\n"]
+    md_summary.append("The AI has proposed the following changes. Please review and confirm.")
+    
+    for change in changeset:
+        if change["type"] == "CREATE_FILE":
+            md_summary.append(f"- **➕ Create File:** `{change['path']}`")
+        elif change["type"] == "UPDATE_FILE":
+            md_summary.append(f"- **🔄 Update File:** `{change['path']}`")
+        elif change["type"] == "DELETE_FILE":
+            md_summary.append(f"- **➖ Delete File:** `{change['path']}`")
+        elif change["type"] == "CREATE_SPACE":
+            md_summary.append(f"- **🚀 Create New Space:** `{change['repo_id']}` (SDK: {change['sdk']}, Private: {change['private']})")
+        elif change["type"] == "SET_PRIVACY":
+            md_summary.append(f"- **🔒 Set Privacy:** Set `{change['repo_id']}` to `private={change['private']}`")
+        elif change["type"] == "DELETE_SPACE":
+            md_summary.append(f"- **💥 DELETE ENTIRE SPACE:** `{change['owner']}/{change['space_name']}` **(DESTRUCTIVE ACTION)**")
+            
+    return changeset, "\n".join(md_summary), parsing_result
+
+# --- Gradio Event Handlers ---
+
+def handle_chat_submit(user_message, chat_history, hf_api_key_input, provider_select, model_select, system_prompt, hf_owner_name, hf_repo_name):
     global parsed_code_blocks_state_cache
-    _chat_msg_in = ""
-    _chat_hist = list(chat_history)
-    _status = "Initializing..."
-    _detected_files_update, _formatted_output_update, _download_btn_update = gr.update(), gr.update(), gr.update(interactive=False, value=None)
+    _chat_msg_in, _chat_hist = "", list(chat_history)
+    
+    # UI updates for streaming
+    yield (
+        _chat_msg_in, _chat_hist, "Initializing...",
+        gr.update(), gr.update(), gr.update(interactive=False),
+        [], gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
+    )
 
     if not user_message.strip():
-        _status = "Cannot send an empty message."
-        yield (_chat_msg_in, _chat_hist, _status, _detected_files_update, _formatted_output_update, _download_btn_update); return
-
-    _chat_hist.append((user_message, None)); _status = f"Sending to {model_select}..."
-    yield (_chat_msg_in, _chat_hist, _status, _detected_files_update, _formatted_output_update, _download_btn_update)
+        yield (
+            _chat_msg_in, _chat_hist, "Cannot send an empty message.",
+            gr.update(), gr.update(), gr.update(),
+            [], gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
+        )
+        return
 
+    _chat_hist.append((user_message, None))
+    yield (
+        _chat_msg_in, _chat_hist, f"Sending to {model_select}...",
+        gr.update(), gr.update(), gr.update(),
+        [], gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
+    )
+    
+    # Prepare context for the AI
     current_sys_prompt = system_prompt.strip() or DEFAULT_SYSTEM_PROMPT
-    current_files_context = f"\n\n## Current Space Context: {hf_owner_name}/{hf_repo_name}\n"
     export_result = _export_selected_logic(None, f"{hf_owner_name}/{hf_repo_name}", parsed_code_blocks_state_cache)
-    current_files_context += export_result["output_str"]
-
+    current_files_context = f"\n\n## Current Space Context: {hf_owner_name}/{hf_repo_name}\n{export_result['output_str']}"
     user_message_with_context = user_message.strip() + "\n" + current_files_context
     api_msgs = _convert_gr_history_to_api_messages(current_sys_prompt, _chat_hist[:-1], user_message_with_context)
 
     try:
-        _status = f"Waiting for {model_select}..."
-        yield (_chat_msg_in, _chat_hist, _status, gr.update(), gr.update(), gr.update())
-
         full_bot_response_content = ""
         for chunk in generate_stream(provider_select, model_select, None, api_msgs):
             if chunk is None: continue
@@ -343,65 +422,137 @@ def handle_chat_submit(user_message, chat_history, hf_api_key_input, provider_se
                 full_bot_response_content = chunk; break
             full_bot_response_content += str(chunk)
             _chat_hist[-1] = (user_message, full_bot_response_content)
-            _status = f"Streaming from {model_select}..."
-            yield (_chat_msg_in, _chat_hist, _status, gr.update(), gr.update(), gr.update())
+            yield (
+                _chat_msg_in, _chat_hist, f"Streaming from {model_select}...",
+                gr.update(), gr.update(), gr.update(),
+                [], gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
+            )
 
         if "Error:" in full_bot_response_content:
             _status = full_bot_response_content
+            yield (_chat_msg_in, _chat_hist, _status, gr.update(), gr.update(), gr.update(), [], gr.update(), gr.update(), gr.update(), gr.update())
+            return
+
+        # NEW: Instead of applying, generate and stage changes
+        _status = "Stream complete. Generating change plan..."
+        yield (_chat_msg_in, _chat_hist, _status, gr.update(), gr.update(), gr.update(), [], gr.update(), gr.update(), gr.update(), gr.update())
+        
+        staged_changeset, summary_md, parsing_res = generate_and_stage_changes(full_bot_response_content, parsed_code_blocks_state_cache, hf_owner_name, hf_repo_name)
+
+        if parsing_res["error_message"]:
+            _status = f"Parsing Error: {parsing_res['error_message']}"
+            yield (_chat_msg_in, _chat_hist, _status, gr.update(), gr.update(), gr.update(), [], gr.update(), gr.update(), gr.update(), gr.update())
+            return
+
+        if not staged_changeset:
+            _status = summary_md # "No changes proposed" message
+            # Still update the cache with the AI's *view* of the world, even if no changes.
+            parsed_code_blocks_state_cache = parsing_res["parsed_code_blocks"]
+            _formatted, _detected, _download = _generate_ui_outputs_from_cache(hf_owner_name, hf_repo_name)
+            yield (_chat_msg_in, _chat_hist, _status, _detected, _formatted, _download, [], gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False))
         else:
-            _status = "Stream complete. Processing response..."
-            action_results = []
-            action_pattern = re.compile(r"### HF_ACTION:\s*(?P<command_line>[^\n]+)")
-
-            # Process destructive actions first
-            for match in action_pattern.finditer(full_bot_response_content):
-                cmd_parts = shlex.split(match.group("command_line").strip())
-                if not cmd_parts: continue
-                command, args = cmd_parts[0].upper(), cmd_parts[1:]
-                if command == "DELETE_FILE":
-                    if not args: action_results.append("Action Failed: DELETE_FILE needs a path."); continue
-                    filepath = args[0]
-                    status_msg = build_logic_delete_space_file(hf_api_key_input, hf_repo_name, hf_owner_name, filepath)
-                    action_results.append(f"DELETE '{filepath}': {status_msg}")
-                    if "Successfully" in status_msg:
-                        parsed_code_blocks_state_cache = [b for b in parsed_code_blocks_state_cache if b["filename"] != filepath]
-                elif command == "DELETE_SPACE":
-                    status_msg = build_logic_delete_space(hf_api_key_input, hf_owner_name, hf_repo_name)
-                    action_results.append(f"DELETE_SPACE '{hf_owner_name}/{hf_repo_name}': {status_msg}")
-                    if "Successfully" in status_msg: parsed_code_blocks_state_cache = []
-
-            # Process other actions
-            for match in action_pattern.finditer(full_bot_response_content):
-                cmd_parts = shlex.split(match.group("command_line").strip())
-                if not cmd_parts: continue
-                command, args = cmd_parts[0].upper(), cmd_parts[1:]
-                if command == "SET_PRIVATE":
-                    if not args: action_results.append("Action Failed: SET_PRIVATE needs true/false."); continue
-                    is_private = args[0].lower() == 'true'
-                    status_msg = build_logic_set_space_privacy(hf_api_key_input, f"{hf_owner_name}/{hf_repo_name}", private=is_private)
-                    action_results.append(f"SET_PRIVATE to {is_private}: {status_msg}")
-
-            parsing_res = _parse_chat_stream_logic(full_bot_response_content, existing_files_state=parsed_code_blocks_state_cache)
-            if parsing_res["error_message"]:
-                action_results.append(f"Parsing Error: {parsing_res['error_message']}")
-            else:
-                parsed_code_blocks_state_cache = parsing_res["parsed_code_blocks"]
-                if any(f.get("filename") for f in parsing_res["parsed_code_blocks"]):
-                    action_results.append("File content updated from AI response.")
-
-            _status = " | ".join(action_results) if action_results else "No actions performed. Files parsed."
-
-        _formatted_output_update, _detected_files_update, _download_btn_update = _generate_ui_outputs_from_cache(hf_owner_name, hf_repo_name)
+            _status = "Change plan generated. Please review and confirm below."
+            yield (
+                _chat_msg_in, _chat_hist, _status,
+                gr.update(), gr.update(), gr.update(),
+                staged_changeset,  # Send changeset to state
+                gr.update(value=summary_md), # Display summary
+                gr.update(visible=True), # Show the accordion
+                gr.update(visible=True), # Show confirm button
+                gr.update(visible=True)  # Show cancel button
+            )
 
     except Exception as e:
         error_msg = f"An unexpected error occurred: {e}"
         print(f"Error in handle_chat_submit: {e}")
-        if _chat_hist:
-            _chat_hist[-1] = (user_message, error_msg)
-        _status = error_msg
-        _formatted_output_update, _detected_files_update, _download_btn_update = _generate_ui_outputs_from_cache(hf_owner_name, hf_repo_name)
+        if _chat_hist: _chat_hist[-1] = (user_message, error_msg)
+        yield (
+            _chat_msg_in, _chat_hist, error_msg,
+            gr.update(), gr.update(), gr.update(),
+            [], gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
+        )
+
+def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
+    """Applies the staged changes from the changeset."""
+    global parsed_code_blocks_state_cache
+    if not changeset:
+        return "No changes to apply.", gr.update(), gr.update(), gr.update(), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
+
+    status_messages = []
+    
+    # Handle space creation first, as other ops might depend on it
+    create_space_op = next((c for c in changeset if c['type'] == 'CREATE_SPACE'), None)
+    if create_space_op:
+        repo_parts = create_space_op['repo_id'].split('/')
+        if len(repo_parts) == 2:
+            owner, repo = repo_parts
+            # We need to pass the full markdown for creation. Let's build it from the plan.
+            # This is a simplification; a more robust solution would pass the planned files directly.
+            # For now, we assume the AI provides file content for the new space.
+            
+            planned_files_md = [f"# Space: {create_space_op['repo_id']}"]
+            for change in changeset:
+                if change['type'] in ['CREATE_FILE', 'UPDATE_FILE']:
+                     planned_files_md.append(f"### File: {change['path']}\n{bbb}{change.get('lang', 'plaintext')}\n{change['content']}\n{bbb}")
+            
+            markdown_for_creation = "\n\n".join(planned_files_md)
+
+            result = build_logic_create_space(
+                ui_api_token_from_textbox=hf_api_key,
+                space_name_ui=repo,
+                owner_ui=owner,
+                sdk_ui=create_space_op['sdk'],
+                private=create_space_op['private'],
+                markdown_input=markdown_for_creation
+            )
+            status_messages.append(f"CREATE_SPACE: {result}")
+            if "Error" in result:
+                # Stop if space creation failed
+                final_status = " | ".join(status_messages)
+                return final_status, gr.update(), gr.update(), gr.update(), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), []
+
+    # Apply all other changes
+    for change in changeset:
+        try:
+            if change['type'] == 'UPDATE_FILE':
+                msg = update_space_file(hf_api_key, space_name, owner_name, change['path'], change['content'], f"AI: Update {change['path']}")
+                status_messages.append(f"UPDATE '{change['path']}': {msg}")
+                if "Success" in msg:
+                    # Update cache on success
+                    for block in parsed_code_blocks_state_cache:
+                        if block['filename'] == change['path']:
+                            block['code'] = change['content']
+                            break
+            elif change['type'] == 'CREATE_FILE' and not create_space_op: # Don't re-create if handled by CREATE_SPACE
+                msg = update_space_file(hf_api_key, space_name, owner_name, change['path'], change['content'], f"AI: Create {change['path']}")
+                status_messages.append(f"CREATE '{change['path']}': {msg}")
+                if "Success" in msg:
+                    parsed_code_blocks_state_cache.append({'filename': change['path'], 'code': change['content'], 'language': change['lang'], 'is_binary': False})
+            elif change['type'] == 'DELETE_FILE':
+                msg = build_logic_delete_space_file(hf_api_key, space_name, owner_name, change['path'])
+                status_messages.append(f"DELETE '{change['path']}': {msg}")
+                if "Success" in msg:
+                    parsed_code_blocks_state_cache = [b for b in parsed_code_blocks_state_cache if b["filename"] != change['path']]
+            elif change['type'] == 'SET_PRIVACY':
+                msg = build_logic_set_space_privacy(hf_api_key, change['repo_id'], change['private'])
+                status_messages.append(f"SET_PRIVACY: {msg}")
+            elif change['type'] == 'DELETE_SPACE':
+                msg = build_logic_delete_space(hf_api_key, change['owner'], change['space_name'])
+                status_messages.append(f"DELETE_SPACE: {msg}")
+                if "Success" in msg:
+                    parsed_code_blocks_state_cache = [] # Clear everything
+        except Exception as e:
+            status_messages.append(f"Error applying {change['type']} for {change.get('path', '')}: {e}")
+            
+    final_status = " | ".join(status_messages)
+    _formatted, _detected, _download = _generate_ui_outputs_from_cache(owner_name, space_name)
+    
+    # Hide the confirmation UI and clear the state
+    return final_status, _formatted, _detected, _download, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), []
 
-    yield (_chat_msg_in, _chat_hist, _status, _detected_files_update, _formatted_output_update, _download_btn_update)
+def handle_cancel_changes():
+    """Clears the staged changeset and hides the confirmation UI."""
+    return "Changes cancelled.", [], gr.update(value="*No changes proposed.*"), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
 
 def update_models_dropdown(provider_select):
     if not provider_select: return gr.update(choices=[], value=None)
@@ -534,79 +685,30 @@ def handle_refresh_space_status(hf_api_key_ui, ui_owner_name, ui_space_name):
     for key, val in status.items():
         md += f"- **{key.replace('_', ' ').title()}:** `{val}`\n"
     return md
-custom_theme = gr.themes.Base(
-    primary_hue="teal",
-    secondary_hue="purple",
-    neutral_hue="zinc",
-    text_size="sm",
-    spacing_size="md",
-    radius_size="sm",
-    font=["System UI", "sans-serif"]
-)
 
+# --- UI Theming and CSS (Unchanged) ---
+custom_theme = gr.themes.Base(primary_hue="teal", secondary_hue="purple", neutral_hue="zinc", text_size="sm", spacing_size="md", radius_size="sm", font=["System UI", "sans-serif"])
 custom_css = """
-body {
-  background: linear-gradient(to bottom right, #2c3e50, #34495e);
-  color: #ecf0f1;
-}
-.gradio-container {
-    background: transparent !important;
-}
-.gr-box, .gr-panel, .gr-pill {
-    background-color: rgba(44, 62, 80, 0.8) !important;
-    border-color: rgba(189, 195, 199, 0.2) !important;
-}
-.gr-textbox, .gr-dropdown, .gr-button, .gr-code, .gr-chat-message {
-    border-color: rgba(189, 195, 199, 0.3) !important;
-    background-color: rgba(52, 73, 94, 0.9) !important;
-    color: #ecf0f1 !important;
-}
-.gr-button.gr-button-primary {
-    background-color: #1abc9c !important;
-    color: white !important;
-    border-color: #16a085 !important;
-}
-.gr-button.gr-button-secondary {
-     background-color: #9b59b6 !important;
-     color: white !important;
-     border-color: #8e44ad !important;
-}
-.gr-button.gr-button-stop {
-    background-color: #e74c3c !important;
-    color: white !important;
-    border-color: #c0392b !important;
-}
-.gr-markdown {
-    background-color: rgba(44, 62, 80, 0.7) !important;
-    padding: 10px;
-    border-radius: 5px;
-}
-.gr-markdown h1, .gr-markdown h2, .gr-markdown h3, .gr-markdown h4, .gr-markdown h5, .gr-markdown h6 {
-    color: #ecf0f1 !important;
-    border-bottom-color: rgba(189, 195, 199, 0.3) !important;
-}
-.gr-markdown pre code {
-    background-color: rgba(52, 73, 94, 0.95) !important;
-    border-color: rgba(189, 195, 199, 0.3) !important;
-}
-.gr-chatbot {
-    background-color: rgba(44, 62, 80, 0.7) !important;
-    border-color: rgba(189, 195, 199, 0.2) !important;
-}
-.gr-chatbot .message {
-    background-color: rgba(52, 73, 94, 0.9) !important;
-    color: #ecf0f1 !important;
-    border-color: rgba(189, 195, 199, 0.3) !important;
-}
-.gr-chatbot .message.user {
-    background-color: rgba(46, 204, 113, 0.9) !important;
-    color: black !important;
-}
+body { background: linear-gradient(to bottom right, #2c3e50, #34495e); color: #ecf0f1; }
+.gradio-container { background: transparent !important; }
+.gr-box, .gr-panel, .gr-pill { background-color: rgba(44, 62, 80, 0.8) !important; border-color: rgba(189, 195, 199, 0.2) !important; }
+.gr-textbox, .gr-dropdown, .gr-button, .gr-code, .gr-chat-message { border-color: rgba(189, 195, 199, 0.3) !important; background-color: rgba(52, 73, 94, 0.9) !important; color: #ecf0f1 !important; }
+.gr-button.gr-button-primary { background-color: #1abc9c !important; color: white !important; border-color: #16a085 !important; }
+.gr-button.gr-button-secondary { background-color: #9b59b6 !important; color: white !important; border-color: #8e44ad !important; }
+.gr-button.gr-button-stop { background-color: #e74c3c !important; color: white !important; border-color: #c0392b !important; }
+.gr-markdown { background-color: rgba(44, 62, 80, 0.7) !important; padding: 10px; border-radius: 5px; }
+.gr-markdown h1, .gr-markdown h2, .gr-markdown h3, .gr-markdown h4, .gr-markdown h5, .gr-markdown h6 { color: #ecf0f1 !important; border-bottom-color: rgba(189, 195, 199, 0.3) !important; }
+.gr-markdown pre code { background-color: rgba(52, 73, 94, 0.95) !important; border-color: rgba(189, 195, 199, 0.3) !important; }
+.gr-chatbot { background-color: rgba(44, 62, 80, 0.7) !important; border-color: rgba(189, 195, 199, 0.2) !important; }
+.gr-chatbot .message { background-color: rgba(52, 73, 94, 0.9) !important; color: #ecf0f1 !important; border-color: rgba(189, 195, 199, 0.3) !important; }
+.gr-chatbot .message.user { background-color: rgba(46, 204, 113, 0.9) !important; color: black !important; }
 """
 
 # --- Gradio UI Definition ---
-#with gr.Blocks(theme=gr.themes.Soft(), css=".gradio-container {background: linear-gradient(to bottom right, #eff6ff, #dbeafe);}") as demo:
 with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
+    # --- NEW: State to hold the plan ---
+    changeset_state = gr.State([])
+    
     gr.Markdown("# 🤖 AI-Powered Hugging Face Space Builder")
     gr.Markdown("Use an AI assistant to create, modify, build, and manage your Hugging Face Spaces directly from this interface.")
 
@@ -631,6 +733,13 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
                 send_chat_button = gr.Button("Send", variant="primary", scale=1)
             status_output = gr.Textbox(label="Last Action Status", interactive=False, value="Ready.")
 
+    # --- NEW: Confirmation Accordion ---
+    with gr.Accordion("📝 Proposed Changes (Pending Confirmation)", visible=False) as confirm_accordion:
+        changeset_display = gr.Markdown("No changes proposed.")
+        with gr.Row():
+            confirm_button = gr.Button("✅ Confirm & Apply Changes", variant="primary", visible=False)
+            cancel_button = gr.Button("❌ Cancel", variant="stop", visible=False)
+
     with gr.Tabs():
         with gr.TabItem("📝 Generated Markdown & Build"):
             with gr.Row():
@@ -641,7 +750,7 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
                     gr.Markdown("### Build Controls")
                     space_sdk_select = gr.Dropdown(label="Space SDK", choices=["gradio", "streamlit", "docker", "static"], value="gradio")
                     space_private_checkbox = gr.Checkbox(label="Make Space Private", value=False)
-                    build_space_button = gr.Button("🚀 Build / Update Space on HF", variant="primary")
+                    build_space_button = gr.Button("🚀 Build / Update Space from Manual Edit", variant="primary")
                     build_status_display = gr.Textbox(label="Build Operation Status", interactive=False)
                     refresh_status_button = gr.Button("🔄 Refresh Runtime Status")
                     space_runtime_status_display = gr.Markdown("*Runtime status will appear here.*")
@@ -667,11 +776,30 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
     # --- Event Listeners ---
     provider_select.change(update_models_dropdown, inputs=provider_select, outputs=model_select)
 
-    chat_inputs = [chat_message_input, chatbot_display, hf_api_key_input, provider_select, model_select, system_prompt_input, owner_name_input, space_name_input, formatted_space_output_display]
-    chat_outputs = [chat_message_input, chatbot_display, status_output, detected_files_preview, formatted_space_output_display, download_button]
+    chat_inputs = [chat_message_input, chatbot_display, hf_api_key_input, provider_select, model_select, system_prompt_input, owner_name_input, space_name_input]
+    chat_outputs = [
+        chat_message_input, chatbot_display, status_output,
+        detected_files_preview, formatted_space_output_display, download_button,
+        changeset_state, changeset_display, confirm_accordion, confirm_button, cancel_button
+    ]
     send_chat_button.click(handle_chat_submit, inputs=chat_inputs, outputs=chat_outputs)
     chat_message_input.submit(handle_chat_submit, inputs=chat_inputs, outputs=chat_outputs)
 
+    # --- NEW: Confirmation Button Listeners ---
+    confirm_inputs = [hf_api_key_input, owner_name_input, space_name_input, changeset_state]
+    confirm_outputs = [
+        status_output, formatted_space_output_display, detected_files_preview, download_button,
+        confirm_accordion, confirm_button, cancel_button, changeset_state
+    ]
+    confirm_button.click(handle_confirm_changes, inputs=confirm_inputs, outputs=confirm_outputs)
+
+    cancel_outputs = [
+        status_output, changeset_state, changeset_display,
+        confirm_accordion, confirm_button, cancel_button
+    ]
+    cancel_button.click(handle_cancel_changes, inputs=None, outputs=cancel_outputs)
+
+
     load_space_outputs = [formatted_space_output_display, detected_files_preview, status_output, file_browser_dropdown, owner_name_input, space_name_input, space_iframe_display, download_button, build_status_display, edit_status_display, space_runtime_status_display, chatbot_display]
     load_space_button.click(fn=handle_load_existing_space, inputs=[hf_api_key_input, owner_name_input, space_name_input], outputs=load_space_outputs)