Update app.py

app.py

@@ -1,3 +1,5 @@
+### File: app.py
+```python
 import gradio as gr
 import re
 import json
@@ -17,6 +19,10 @@ from build_logic import (
     delete_space_file as build_logic_delete_space_file,
     get_space_runtime_status,
     apply_staged_changes,
+    duplicate_space as build_logic_duplicate_space,
+    list_user_spaces as build_logic_list_user_spaces,
+    build_logic_set_space_privacy,
+    build_logic_delete_space
 )
 
 from model_logic import (
@@ -69,11 +75,12 @@ The system will parse these actions from your response and present them to the u
 
 Available commands:
 - `CREATE_SPACE <owner>/<repo_name> --sdk <sdk> --private <true|false>`: Creates a new, empty space. SDK can be gradio, streamlit, docker, or static. Private is optional and defaults to false. Use this ONLY when the user explicitly asks to create a *new* space with a specific name. When using this action, also provide the initial file structure (e.g., app.py, README.md) using `### File:` blocks in the same response. The system will apply these files to the new space.
+- `DUPLICATE_SPACE <new_owner>/<new_repo_name> --private <true|false>`: Duplicates the *currently loaded* space to a new space. Private is optional and defaults to false. This action is destructive if the target space already exists. Use this ONLY when the user explicitly asks to duplicate the space. If this action is staged, it will be the *only* action applied in that changeset.
 - `DELETE_FILE path/to/file.ext`: Deletes a specific file from the current space.
 - `SET_PRIVATE <true|false>`: Sets the privacy for the current space.
 - `DELETE_SPACE`: Deletes the entire current space. THIS IS PERMANENT AND REQUIRES CAUTION. Only use this if the user explicitly and clearly asks to delete the space.
 
-You can issue multiple file updates and action commands in a single response. The system will process all of them into a single change plan.
+You can issue multiple file updates and action commands in a single response. The system will process all of them into a single change plan. Note that the `DUPLICATE_SPACE` command, if present, will override any other file or space actions in the same response.
 
 **Current Space Context:**
 You will be provided with the current state of the files in the Space the user is interacting with. Use this information to understand the current project structure and content before proposing changes or actions. This context will appear after the user's message, starting with "## Current Space Context:". Do NOT include this context in your response. Only generate your response based on the user's request and the formatting rules above.
@@ -259,40 +266,100 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
     ai_proposed_files_dict = {f["path"]: f for f in ai_proposed_files_list}
 
     action_pattern = re.compile(r"### HF_ACTION:\s*(?P<command_line>[^\n]+)", re.MULTILINE)
+    # Collect all potential actions first
+    potential_actions = []
     for match in action_pattern.finditer(ai_response_content):
         try:
             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 == "CREATE_SPACE" and args:
-                repo_id = args[0]
-                sdk = "gradio"
-                private = False
-                if '--sdk' in args:
-                    try: sdk = args[args.index('--sdk') + 1]
-                    except IndexError: print("Warning: CREATE_SPACE --sdk requires an argument.")
-                if '--private' in args:
-                     try: private_str = args[args.index('--private') + 1].lower()
-                     except IndexError: print("Warning: CREATE_SPACE --private requires an argument.")
-                     else: private = private_str == 'true'
-                changeset.append({"type": "CREATE_SPACE", "repo_id": repo_id, "sdk": sdk, "private": private})
-
-            elif command == "DELETE_FILE" and args:
-                file_path = args[0]
-                changeset.append({"type": "DELETE_FILE", "path": file_path})
-
-            elif command == "SET_PRIVATE" and args:
-                private = args[0].lower() == 'true'
-                changeset.append({"type": "SET_PRIVACY", "private": private, "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})
-
+            potential_actions.append({"command": command, "args": args, "raw_line": match.group("command_line").strip()})
         except Exception as e:
              print(f"Error parsing HF_ACTION line '{match.group('command_line').strip()}': {e}")
 
 
+    # Check for exclusive actions (like DUPLICATE_SPACE)
+    duplicate_action = next((act for act in potential_actions if act["command"] == "DUPLICATE_SPACE"), None)
+
+    if duplicate_action:
+        # If DUPLICATE_SPACE is present, only stage that action
+        cmd_parts = duplicate_action["args"]
+        if cmd_parts:
+            target_repo_id = cmd_parts[0]
+            private = False
+            if '--private' in cmd_parts:
+                try: private_str = cmd_parts[cmd_parts.index('--private') + 1].lower()
+                except IndexError: print("Warning: DUPLICATE_SPACE --private requires an argument.")
+                else: private = private_str == 'true'
+            # Source repo is the currently loaded one
+            source_repo_id = f"{hf_owner_name}/{hf_repo_name}" if hf_owner_name and hf_repo_name else None
+
+            if source_repo_id:
+                changeset.append({
+                    "type": "DUPLICATE_SPACE",
+                    "source_repo_id": source_repo_id,
+                    "target_repo_id": target_repo_id,
+                    "private": private
+                })
+                print(f"Staged exclusive DUPLICATE_SPACE action from {source_repo_id} to {target_repo_id}")
+            else:
+                 print(f"Warning: Cannot stage DUPLICATE_SPACE action, no Space currently loaded.")
+                 # Maybe add an error message to the summary?
+                 changeset.append({"type": "Error", "message": "Cannot duplicate space, no Space currently loaded."})
+
+        else:
+            print(f"Warning: DUPLICATE_SPACE action requires a target repo_id.")
+            changeset.append({"type": "Error", "message": "DUPLICATE_SPACE action requires a target repo_id (<new_owner>/<new_repo_name>)."})
+
+        # If duplication is staged (or failed to stage due to syntax/missing source), skip other actions
+        if changeset:
+            md_summary = ["### 📋 Proposed Changes Plan (Exclusive Action)\n"]
+            if changeset[0]["type"] == "DUPLICATE_SPACE":
+                change = changeset[0]
+                md_summary.append(f"- **📂 Duplicate Space:** Duplicate `{change.get('source_repo_id', '...')}` to `{change.get('target_repo_id', '...')}` (Private: {change.get('private', False)})")
+                md_summary.append("\n**Warning:** This will overwrite the target space if it exists. No other file or space actions proposed by the AI in this turn will be applied.")
+            else: # Handle the staging error case
+                 md_summary.append(f"- **Error staging DUPLICATE_SPACE:** {changeset[0].get('message', 'Unknown error')}")
+                 md_summary.append("\nNo changes were staged due to the error in the DUPLICATE_SPACE command.")
+                 changeset = [] # Clear changeset if the duplicate action itself was malformed/blocked
+
+            return changeset, "\n".join(md_summary)
+
+
+    # If no exclusive action, process other actions and file changes
+    for action in potential_actions:
+         command, args = action["command"], action["args"]
+
+         if command == "CREATE_SPACE" and args:
+             repo_id = args[0]
+             sdk = "gradio"
+             private = False
+             if '--sdk' in args:
+                 try: sdk = args[args.index('--sdk') + 1]
+                 except IndexError: print("Warning: CREATE_SPACE --sdk requires an argument.")
+             if '--private' in args:
+                  try: private_str = args[args.index('--private') + 1].lower()
+                  except IndexError: print("Warning: CREATE_SPACE --private requires an argument.")
+                  else: private = private_str == 'true'
+             changeset.append({"type": "CREATE_SPACE", "repo_id": repo_id, "sdk": sdk, "private": private})
+             print(f"Staged CREATE_SPACE action for {repo_id}")
+
+         elif command == "DELETE_FILE" and args:
+             file_path = args[0]
+             changeset.append({"type": "DELETE_FILE", "path": file_path})
+             print(f"Staged DELETE_FILE action for {file_path}")
+
+         elif command == "SET_PRIVATE" and args:
+             private = args[0].lower() == 'true'
+             changeset.append({"type": "SET_PRIVACY", "private": private, "repo_id": f"{hf_owner_name}/{hf_repo_name}"})
+             print(f"Staged SET_PRIVACY action for {hf_owner_name}/{hf_repo_name} to {private}")
+
+         elif command == "DELETE_SPACE":
+             changeset.append({"type": "DELETE_SPACE", "owner": hf_owner_name, "space_name": hf_repo_name})
+             print(f"Staged DELETE_SPACE action for {hf_owner_name}/{hf_repo_name}")
+         # Note: DUPLICATE_SPACE is handled before this loop
+
+
     for file_info in ai_proposed_files_list:
         filename = file_info["path"]
         proposed_content = file_info["content"]
@@ -315,6 +382,7 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
             else:
                  print(f"Skipping staging create for {filename}: Proposed content is a placeholder.")
 
+
     if not changeset:
         md_summary = ["### 📋 Proposed Changes Plan", "\nThe AI did not propose any specific changes to files or the space.\n"]
     else:
@@ -350,21 +418,20 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
 
 def handle_chat_submit(user_message, chat_history, hf_api_key_input, provider_api_key_input, provider_select, model_select, system_prompt, hf_owner_name, hf_repo_name):
     global parsed_code_blocks_state_cache
-    _chat_msg_in = user_message # Keep user input for clearing later
+    _chat_msg_in = user_message
     _chat_hist = list(chat_history)
-    _chat_hist.append((user_message, None)) # Append user message immediately
+    _chat_hist.append((user_message, None))
 
-    # Initial yield: Show loading state, clear input, clear/hide changes
     yield (
-        "", # Clear chat_message_input
-        _chat_hist, # Update chat_history with user message
-        "Initializing...", # status_output
-        gr.update(), # Keep detected_files_preview
-        gr.update(), # Keep formatted_space_output_display
-        gr.update(interactive=False), # download_button (disable)
-        [], # changeset_state (clear)
-        "*No changes proposed.*", # changeset_display (clear text)
-        gr.update(visible=False), gr.update(visible=False), gr.update(visible=False) # Hide confirm UI
+        "",
+        _chat_hist,
+        "Initializing...",
+        gr.update(),
+        gr.update(),
+        gr.update(interactive=False),
+        [],
+        gr.update(value="*No changes proposed.*"),
+        gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
     )
 
     current_sys_prompt = system_prompt.strip() or DEFAULT_SYSTEM_PROMPT
@@ -383,59 +450,53 @@ def handle_chat_submit(user_message, chat_history, hf_api_key_input, provider_ap
             if chunk is None: continue
             full_bot_response_content += str(chunk)
             _chat_hist[-1] = (user_message, full_bot_response_content)
-            # Yield during streaming - ONLY update chatbot and status
             yield (
-                gr.update(), # Keep chat_message_input cleared
-                _chat_hist, # Update chat_history with new chunk
-                f"Streaming from {model_select}...", # status_output
-                gr.update(), # Keep detected_files_preview
-                gr.update(), # Keep formatted_space_output_display
-                gr.update(), # Keep download_button
-                gr.update(), # Keep changeset_state
-                gr.update(), # Keep changeset_display
-                gr.update(), gr.update(), gr.update() # Keep confirm UI visibility
+                gr.update(),
+                _chat_hist,
+                f"Streaming from {model_select}...",
+                gr.update(),
+                gr.update(),
+                gr.update(),
+                gr.update(),
+                gr.update(),
+                gr.update(), gr.update(), gr.update()
             )
 
-        # --- Post-streaming: Parse AI output, update cache, stage changes, FINAL UI UPDATE ---
-
         if full_bot_response_content.startswith("Error:") or full_bot_response_content.startswith("API HTTP Error"):
             _status = full_bot_response_content
-            # Update chatbot with error in the last message, update status, clear/hide changes
             yield (
                  gr.update(), _chat_hist, _status,
-                 gr.update(), gr.update(), gr.update(), # Keep file previews as they were
-                 [], "*Error occurred, changes plan cleared.*", # Clear changeset state and display
-                 gr.update(visible=False), gr.update(visible=False), gr.update(visible=False) # Hide confirm UI
+                 gr.update(), gr.update(), gr.update(),
+                 [], "*Error occurred, changes plan cleared.*",
+                 gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
             )
-            return # Exit handler
+            return
 
-        # Parse AI output and update state cache
         parsed_code_blocks_state_cache, proposed_filenames_in_turn = _parse_and_update_state_cache(full_bot_response_content, parsed_code_blocks_state_cache)
 
-        # Regenerate UI previews based on the updated cache
         _formatted, _detected, _download = _generate_ui_outputs_from_cache(hf_owner_name, hf_repo_name)
 
-        # Generate changeset and summary
         staged_changeset, summary_md = generate_and_stage_changes(full_bot_response_content, parsed_code_blocks_state_cache, hf_owner_name, hf_repo_name)
 
-        # Final yield based on whether changes were staged
         if not staged_changeset:
-            _status = summary_md # Will be "No changes proposed" message
+            _status = summary_md
             yield (
-                gr.update(), # Keep input box cleared
-                _chat_hist, _status, # Update chatbot (final), status
-                _detected, _formatted, _download, # Update file previews
-                [], summary_md, # Clear changeset state, display summary
-                gr.update(visible=False), gr.update(visible=False), gr.update(visible=False) # Hide confirm UI
+                gr.update(),
+                _chat_hist, _status,
+                _detected, _formatted, _download,
+                [], summary_md,
+                gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
             )
         else:
             _status = "Change plan generated. Please review and confirm below."
             yield (
-                gr.update(), # Keep input box cleared
-                _chat_hist, _status, # Update chatbot (final), status
-                _detected, _formatted, _download, # Update file previews
-                staged_changeset, summary_md, # Set changeset state, display summary
-                gr.update(visible=True), gr.update(visible=True), gr.update(visible=True) # Show confirm UI
+                gr.update(),
+                _chat_hist, _status,
+                _detected, _formatted, _download,
+                staged_changeset, summary_md,
+                gr.update(visible=True),
+                gr.update(visible=True),
+                gr.update(visible=True)
             )
 
     except Exception as e:
@@ -443,26 +504,22 @@ def handle_chat_submit(user_message, chat_history, hf_api_key_input, provider_ap
         print(f"Error in handle_chat_submit: {e}")
         import traceback
         traceback.print_exc()
-        # Update chatbot with error
         if _chat_hist:
-            # Find the last message matching the user's input and append the error
             try:
                 idx = next(i for i in reversed(range(len(_chat_hist))) if _chat_hist[i] and _chat_hist[i][0] == user_message)
                 current_bot_response = _chat_hist[idx][1] or ""
                 _chat_hist[idx] = (user_message, (current_bot_response + "\n\n" if current_bot_response else "") + error_msg)
             except (StopIteration, IndexError):
-                _chat_hist.append((user_message, error_msg)) # Fallback if user message not found
+                _chat_hist.append((user_message, error_msg))
 
-        # Regenerate previews from potentially partially updated cache
         _formatted, _detected, _download = _generate_ui_outputs_from_cache(hf_owner_name, hf_repo_name)
 
-        # Final error yield: Update chatbot, status, file previews, clear/hide changes
         yield (
-            gr.update(), # Keep input box content
-            _chat_hist, error_msg, # Update chatbot, status
-            _detected, _formatted, _download, # Update file previews based on state before error
-            [], "*Error occurred, changes plan cleared.*", # Clear changeset state and display
-            gr.update(visible=False), gr.update(visible=False), gr.update(visible=False) # Hide confirm UI
+            gr.update(),
+            _chat_hist, error_msg,
+            _detected, _formatted, _download,
+            [], "*Error occurred, changes plan cleared.*",
+            gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
         )
 
 
@@ -475,51 +532,159 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
     if not changeset:
         return "No changes to apply.", gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(value="No changes were staged.")
 
-    status_message = apply_staged_changes(hf_api_key, owner_name, space_name, changeset)
+    # Check if the first action is an exclusive action like DUPLICATE_SPACE
+    first_action_type = changeset[0].get('type') if changeset else None
+    is_exclusive_action = first_action_type == 'DUPLICATE_SPACE'
+
+    if is_exclusive_action:
+        change = changeset[0]
+        if change.get("source_repo_id") and change.get("target_repo_id"):
+            status_message = build_logic_duplicate_space(
+                hf_api_key=hf_api_key,
+                source_repo_id=change["source_repo_id"],
+                target_repo_id=change["target_repo_id"],
+                private=change.get("private", False)
+            )
+            # After duplication, attempt to load the *new* space
+            _status_reload = f"{status_message} | Attempting to load the new Space [{change['target_repo_id']}]..."
+            yield _status_reload, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(value="*Loading new Space...*")
+
+            # Extract new owner and space name from target_repo_id
+            new_owner, new_space_name = change["target_repo_id"].split('/', 1) if '/' in change["target_repo_id"] else (None, change["target_repo_id"])
+            if not new_owner: # Try to auto-detect owner if target was just a name
+                 token, token_err = build_logic_get_api_token(hf_api_key)
+                 if token_err: new_owner = None # Cannot auto-detect
+                 else:
+                    try: user_info = build_logic_whoami(token=token); new_owner = user_info.get('name')
+                    except: new_owner = None
+
+            # Trigger the load logic for the new space
+            if new_owner and new_space_name:
+                # Call the load handler directly or replicate its logic
+                # Replicating is safer for yield chains
+                sdk, file_list, err_list = get_space_repository_info(hf_api_key, new_space_name, new_owner)
+                if err_list:
+                    reload_error = f"Error reloading file list after duplication: {err_list}"
+                    parsed_code_blocks_state_cache = []
+                else:
+                    loaded_files = []
+                    for file_path in file_list:
+                        content, err_get = get_space_file_content(hf_api_key, new_space_name, new_owner, file_path)
+                        lang = _infer_lang_from_filename(file_path)
+                        is_binary = lang == "binary" or (err_get is not None)
+                        code = f"[Error loading content: {err_get}]" if err_get else (content or "")
+                        loaded_files.append({"filename": file_path, "code": code, "language": lang, "is_binary": is_binary, "is_structure_block": False})
+                    parsed_code_blocks_state_cache = loaded_files
+
+                _formatted, _detected, _download = _generate_ui_outputs_from_cache(new_owner, new_space_name)
+                final_overall_status = status_message + (f" | Reload Status: {reload_error}" if reload_error else f" | Reload Status: New Space [{new_owner}/{new_space_name}] state refreshed.")
+
+                # Update UI fields to reflect the newly loaded space
+                owner_update = gr.update(value=new_owner)
+                space_update = gr.update(value=new_space_name)
+                file_browser_update = gr.update(visible=True, choices=sorted([f["filename"] for f in parsed_code_blocks_state_cache if not f.get("is_structure_block")] or []), value=None)
+
+                # Update iframe preview for the new space
+                if new_owner and new_space_name:
+                    sub_owner = re.sub(r'[^a-z0-9\-]+', '-', new_owner.lower()).strip('-') or 'owner'
+                    sub_repo = re.sub(r'[^a-z0-9\-]+', '-', new_space_name.lower()).strip('-') or 'space'
+                    iframe_url = f"https://{sub_owner}-{sub_repo}{'.static.hf.space' if sdk == 'static' else '.hf.space'}"
+                    iframe_update = gr.update(value=f'<iframe src="{iframe_url}?__theme=light&embed=true" width="100%" height="500px"></iframe>', visible=True)
+                else:
+                     iframe_update = gr.update(value=None, visible=False)
+
 
-    _status_reload = f"{status_message} | Reloading Space state..."
-    yield _status_reload, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(value="*Reloading Space state...*")
+            else:
+                 reload_error = "Cannot load new Space state: Owner or Space Name missing after duplication."
+                 _formatted, _detected, _download = _generate_ui_outputs_from_cache(None, None) # Clear previews if new space couldn't be loaded
+                 final_overall_status = status_message + f" | Reload Status: {reload_error}"
+                 owner_update = gr.update() # Keep old value
+                 space_update = gr.update() # Keep old value
+                 file_browser_update = gr.update(visible=False, choices=[], value=None) # Clear file browser
+                 iframe_update = gr.update(value=None, visible=False) # Hide iframe
 
-    refreshed_file_list = []
-    reload_error = None
-    repo_id_for_reload = f"{owner_name}/{space_name}" if owner_name and space_name else None
 
-    if repo_id_for_reload:
-        sdk, file_list, err_list = get_space_repository_info(hf_api_key, space_name, owner_name)
-        if err_list:
-            reload_error = f"Error reloading file list after changes: {err_list}"
-            parsed_code_blocks_state_cache = []
         else:
-            refreshed_file_list = file_list
-            loaded_files = []
-            for file_path in refreshed_file_list:
-                content, err_get = get_space_file_content(hf_api_key, space_name, owner_name, file_path)
-                lang = _infer_lang_from_filename(file_path)
-                is_binary = lang == "binary" or (err_get is not None)
-                code = f"[Error loading content: {err_get}]" if err_get else (content or "")
-                loaded_files.append({"filename": file_path, "code": code, "language": lang, "is_binary": is_binary, "is_structure_block": False})
-            parsed_code_blocks_state_cache = loaded_files
+             # Should not happen if staged_changeset exists and type is DUPLICATE_SPACE, but as safeguard
+             final_overall_status = "Duplicate Action Error: Invalid duplicate changeset format."
+             # No state change, just report error
+             _formatted, _detected, _download = _generate_ui_outputs_from_cache(owner_name, space_name)
+             owner_update = gr.update()
+             space_update = gr.update()
+             file_browser_update = gr.update()
+             iframe_update = gr.update()
+
+
+        cleared_changeset = []
+        # Return updates including potentially new space info and file list
+        yield (
+            final_overall_status,
+            gr.update(value=_formatted), gr.update(value=_detected), _download,
+            gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), # Hide confirm UI
+            cleared_changeset, gr.update(value="*No changes proposed.*"), # Clear changeset state and display
+            owner_update, space_update, file_browser_update, iframe_update # Update space/owner fields, file browser, iframe
+        )
 
-    else:
-        reload_error = "Cannot reload Space state: Owner or Space Name missing."
+    else: # Not an exclusive action, proceed with standard apply_staged_changes
+        status_message = apply_staged_changes(hf_api_key, owner_name, space_name, changeset)
 
-    _formatted, _detected, _download = _generate_ui_outputs_from_cache(owner_name, space_name)
+        _status_reload = f"{status_message} | Reloading Space state..."
+        yield _status_reload, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(value="*Reloading Space state...*")
 
-    final_overall_status = status_message + (f" | Reload Status: {reload_error}" if reload_error else " | Reload Status: Space state refreshed.")
+        refreshed_file_list = []
+        reload_error = None
+        repo_id_for_reload = f"{owner_name}/{space_name}" if owner_name and space_name else None
 
-    cleared_changeset = []
+        if repo_id_for_reload:
+            sdk, file_list, err_list = get_space_repository_info(hf_api_key, space_name, owner_name)
+            if err_list:
+                reload_error = f"Error reloading file list after changes: {err_list}"
+                parsed_code_blocks_state_cache = []
+            else:
+                refreshed_file_list = file_list
+                loaded_files = []
+                for file_path in refreshed_file_list:
+                    content, err_get = get_space_file_content(hf_api_key, space_name, owner_name, file_path)
+                    lang = _infer_lang_from_filename(file_path)
+                    is_binary = lang == "binary" or (err_get is not None)
+                    code = f"[Error loading content: {err_get}]" if err_get else (content or "")
+                    loaded_files.append({"filename": file_path, "code": code, "language": lang, "is_binary": is_binary, "is_structure_block": False})
+                parsed_code_blocks_state_cache = loaded_files
+
+            # Update file browser dropdown with refreshed list
+            file_browser_update = gr.update(visible=True, choices=sorted(refreshed_file_list or []), value=None)
+            # Update iframe preview for the current space (might not have changed URL, but status may update)
+            if owner_name and space_name:
+                 sub_owner = re.sub(r'[^a-z0-9\-]+', '-', owner_name.lower()).strip('-') or 'owner'
+                 sub_repo = re.sub(r'[^a-z0-9\-]+', '-', space_name.lower()).strip('-') or 'space'
+                 iframe_url = f"https://{sub_owner}-{sub_repo}{'.static.hf.space' if sdk == 'static' else '.hf.space'}"
+                 iframe_update = gr.update(value=f'<iframe src="{iframe_url}?__theme=light&embed=true" width="100%" height="500px"></iframe>', visible=True)
+            else:
+                  iframe_update = gr.update(value=None, visible=False)
+
+        else:
+            reload_error = "Cannot reload Space state: Owner or Space Name missing."
+            # Clear UI elements related to files if reload fails
+            file_browser_update = gr.update(visible=False, choices=[], value=None)
+            iframe_update = gr.update(value=None, visible=False)
 
-    return (
-        final_overall_status,
-        _formatted,
-        _detected,
-        _download,
-        gr.update(visible=False),
-        gr.update(visible=False),
-        gr.update(visible=False),
-        cleared_changeset,
-        gr.update(value="*No changes proposed.*")
-    )
+
+        _formatted, _detected, _download = _generate_ui_outputs_from_cache(owner_name, space_name)
+
+        final_overall_status = status_message + (f" | Reload Status: {reload_error}" if reload_error else " | Reload Status: Space state refreshed.")
+
+        cleared_changeset = []
+
+        # Return updated UI elements and hide confirmation UI
+        yield (
+            final_overall_status,
+            gr.update(value=_formatted),
+            gr.update(value=_detected),
+            _download,
+            gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), # Hide confirm UI
+            cleared_changeset, gr.update(value="*No changes proposed.*"), # Clear changeset state and display
+            gr.update(), gr.update(), file_browser_update, iframe_update # Keep owner/space, update file browser and iframe
+        )
 
 
 def handle_cancel_changes():
@@ -545,36 +710,30 @@ def handle_load_existing_space(hf_api_key_ui, ui_owner_name, ui_space_name):
     global parsed_code_blocks_state_cache
     _formatted_md_val, _detected_preview_val, _status_val = "*Loading files...*", "*Loading files...*", f"Loading Space: {ui_owner_name}/{ui_space_name}..."
     _file_browser_update, _iframe_html_update, _download_btn_update = gr.update(visible=False, choices=[], value=None), gr.update(value=None, visible=False), gr.update(interactive=False, value=None)
-    _build_status_clear, _edit_status_clear, _runtime_status_clear = "*Build status...*", "*Select a file...*", "*Runtime status...*"
+    _build_status_clear, _edit_status_clear, _runtime_status_clear = "*Manual build status...*", "*Select a file...*", "*Runtime status...*"
     _changeset_clear = []
     _changeset_summary_clear = "*No changes proposed.*"
     _confirm_ui_hidden = gr.update(visible=False)
+    _list_spaces_display_clear = "*List of spaces will appear here.*"
 
-    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,
-        changeset_state, changeset_display, confirm_accordion, confirm_button, cancel_button
-    ]
-    # Use gr.update for components that are not state variables
-    initial_updates = [
+
+    # Initial yield to show loading state
+    yield (
         gr.update(value=_formatted_md_val), gr.update(value=_detected_preview_val), gr.update(value=_status_val), _file_browser_update,
         gr.update(value=ui_owner_name), gr.update(value=ui_space_name),
         _iframe_html_update, _download_btn_update, gr.update(value=_build_status_clear),
         gr.update(value=_edit_status_clear), gr.update(value=_runtime_status_clear),
-        _changeset_clear, gr.update(value=_changeset_summary_clear), _confirm_ui_hidden, _confirm_ui_hidden, _confirm_ui_hidden
-    ]
-
-    yield initial_updates
+        _changeset_clear, gr.update(value=_changeset_summary_clear), _confirm_ui_hidden, _confirm_ui_hidden, _confirm_ui_hidden,
+        gr.update(), gr.update(), gr.update() # For list spaces updates
+    )
 
     owner_to_use = ui_owner_name
+    token, token_err = build_logic_get_api_token(hf_api_key_ui)
+    if token_err:
+        _status_val = f"Load Error: {token_err}"
+        yield gr.update(value=_status_val), # Only update status on early error
+        return
     if not owner_to_use:
-        token, token_err = build_logic_get_api_token(hf_api_key_ui)
-        if token_err:
-            _status_val = f"Load Error: {token_err}"
-            yield gr.update(value=_status_val), # Only update status on early error
-            return
         try:
             user_info = build_logic_whoami(token=token)
             owner_to_use = user_info.get('name')
@@ -582,7 +741,7 @@ def handle_load_existing_space(hf_api_key_ui, ui_owner_name, ui_space_name):
             yield gr.update(value=owner_to_use), gr.update(value=f"Loading Space: {owner_to_use}/{ui_space_name} (Auto-detected owner)...") # Update owner and status
         except Exception as e:
             _status_val = f"Load Error: Error auto-detecting owner: {e}"
-            yield gr.update(value=_status_val), # Only update status on early error
+            yield gr.update(value=_status_val),
             return
 
     if not owner_to_use or not ui_space_name:
@@ -592,20 +751,19 @@ def handle_load_existing_space(hf_api_key_ui, ui_owner_name, ui_space_name):
 
     sdk, file_list, err = get_space_repository_info(hf_api_key_ui, ui_space_name, owner_to_use)
 
-    # Always update owner/space inputs even on error, as user entered them
-    # These were updated in the initial yield, but we might need to update again if owner was auto-detected
-    yield gr.update(value=owner_to_use), gr.update(value=ui_space_name), # Update owner and space textboxes
+    # Always update owner/space inputs even on error
+    yield gr.update(value=owner_to_use), gr.update(value=ui_space_name),
 
     if err:
         _status_val = f"Load Error: {err}"
         parsed_code_blocks_state_cache = []
         _formatted, _detected, _download = _generate_ui_outputs_from_cache(owner_to_use, ui_space_name)
         yield (
-            gr.update(value=_formatted), gr.update(value=_detected), gr.update(value=_status_val), # Update markdown, preview, status
-            gr.update(visible=False, choices=[], value=None), # Hide file browser
-            gr.update(), gr.update(), # Keep owner/space
-            gr.update(value=None, visible=False), # Hide iframe
-            _download, gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update() # Rest are updates
+            gr.update(value=_formatted), gr.update(value=_detected), gr.update(value=_status_val),
+            gr.update(visible=False, choices=[], value=None),
+            gr.update(), gr.update(),
+            gr.update(value=None, visible=False),
+            _download, gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
         )
         return
 
@@ -632,13 +790,17 @@ def handle_load_existing_space(hf_api_key_ui, ui_owner_name, ui_space_name):
     else:
          iframe_update = gr.update(value=None, visible=False)
 
+    # Also fetch and display runtime status after loading
+    runtime_status_md = handle_refresh_space_status(hf_api_key_ui, owner_to_use, ui_space_name)
+
+
     # Final yield after success
     yield (
-        gr.update(value=_formatted), gr.update(value=_detected), gr.update(value=_status_val), # Update markdown, preview, status
-        file_browser_update, # Update file browser
-        gr.update(), gr.update(), # Keep owner/space
-        iframe_update, # Update iframe
-        _download, gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update() # Rest are updates
+        gr.update(value=_formatted), gr.update(value=_detected), gr.update(value=_status_val),
+        file_browser_update,
+        gr.update(), gr.update(),
+        iframe_update,
+        _download, gr.update(), gr.update(), gr.update(value=runtime_status_md), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
     )
 
 def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_part, space_sdk_ui, is_private_ui, formatted_markdown_content):
@@ -649,20 +811,9 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
     _changeset_summary_clear = "*Manual build initiated, changes plan cleared.*"
     _confirm_ui_hidden = gr.update(visible=False)
 
-    outputs = [
-        build_status_display, space_iframe_display, file_browser_dropdown,
-        owner_name_input, space_name_input,
-        changeset_state, changeset_display, confirm_accordion, confirm_button, cancel_button,
-        formatted_space_output_display, detected_files_preview, download_button
-    ]
-    # Initial yield state
-    initial_updates = [
-        gr.update(value=_build_status), _iframe_html, _file_browser_update,
-        gr.update(value=ui_owner_name_part), gr.update(value=ui_space_name_part),
-        _changeset_clear, gr.update(value=_changeset_summary_clear), _confirm_ui_hidden, _confirm_ui_hidden, _confirm_ui_hidden,
-        gr.update(), gr.update(), gr.update() # Don't update markdown/download yet
-    ]
-    yield initial_updates
+    yield (_build_status, _iframe_html, _file_browser_update, gr.update(value=ui_owner_name_part), gr.update(value=ui_space_name_part),
+           _changeset_clear, gr.update(value=_changeset_summary_clear), _confirm_ui_hidden, _confirm_ui_hidden, _confirm_ui_hidden,
+           gr.update(), gr.update(), gr.update())
 
 
     if not ui_space_name_part or "/" in ui_space_name_part:
@@ -681,29 +832,25 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
 
     if not manual_changeset:
          _build_status = "Build Error: No target space specified or no files parsed from markdown."
-         yield gr.update(value=_build_status), # Only update status
+         yield gr.update(value=_build_status),
          return
 
-
     result_message = apply_staged_changes(hf_api_key_ui, ui_owner_name_part, ui_space_name_part, manual_changeset)
     _build_status = f"Manual Build/Update Result: {result_message}"
 
     owner_to_use = ui_owner_name_part
     space_to_use = ui_space_name_part
-    # Keep manual markdown content as is, clear/disable preview/download initially
     _formatted_md = formatted_markdown_content
     _detected_preview_val = "*Loading files after build...*"
     _download_btn_update = gr.update(interactive=False, value=None)
 
-    # Yield intermediate state with build status and placeholders for reloading
     yield (
-        gr.update(value=_build_status), _iframe_html, _file_browser_update, # Build status, iframe, file browser (initial clear state)
-        gr.update(value=owner_to_use), gr.update(value=space_to_use), # Update owner/space textboxes
-        _changeset_clear, gr.update(value=_changeset_summary_clear), _confirm_ui_hidden, _confirm_ui_hidden, _confirm_ui_hidden, # Changeset clear/hide
-        gr.update(value=_formatted_md), gr.update(value=_detected_preview_val), _download_btn_update # Update markdown/preview/download
+        gr.update(value=_build_status), _iframe_html, _file_browser_update,
+        gr.update(value=owner_to_use), gr.update(value=space_to_use),
+        _changeset_clear, gr.update(value=_changeset_summary_clear), _confirm_ui_hidden, _confirm_ui_hidden, _confirm_ui_hidden,
+        gr.update(value=_formatted_md), gr.update(value=_detected_preview_val), _download_btn_update
     )
 
-    # Reload space state to reflect actual content after build attempt
     sdk_built, file_list, err_list = get_space_repository_info(hf_api_key_ui, space_to_use, owner_to_use)
 
     if err_list:
@@ -725,22 +872,23 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
 
         if owner_to_use and space_to_use:
             sub_owner = re.sub(r'[^a-z0-9\-]+', '-', owner_to_use.lower()).strip('-') or 'owner'
-            sub_repo = re.sub(r'[^a-z0-9\-]+', '-', ui_space_name_part.lower()).strip('-') or 'space'
+            sub_repo = re.sub(r'[^a-z0-9\-]+', '-', space_to_use.lower()).strip('-') or 'space'
             iframe_url = f"https://{sub_owner}-{sub_repo}{'.static.hf.space' if sdk_built == 'static' else '.hf.space'}"
             _iframe_html_update = gr.update(value=f'<iframe src="{iframe_url}?__theme=light&embed=true" width="100%" height="700px"></iframe>', visible=True)
         else:
              _iframe_html_update = gr.update(value=None, visible=False)
 
+    _formatted_md, _detected_preview, _download = _generate_ui_outputs_from_cache(owner_to_use, space_to_use)
 
-    _formatted_md, _detected_preview, _download = _generate_ui_outputs_from_cache(owner_to_use, space_to_use) # Regenerate previews from reloaded cache
+    # Also fetch and display runtime status after build
+    runtime_status_md = handle_refresh_space_status(hf_api_key_ui, owner_to_use, space_to_use)
 
 
-    # Final yield after reloading
     yield (
-        gr.update(value=_build_status), _iframe_html_update, _file_browser_update, # Build status, iframe, file browser
-        gr.update(value=owner_to_use), gr.update(value=space_to_use), # Update owner/space textboxes
-        _changeset_clear, gr.update(value=_changeset_summary_clear), _confirm_ui_hidden, _confirm_ui_hidden, _confirm_ui_hidden, # Changeset clear/hide
-        gr.update(value=_formatted_md), gr.update(value=_detected_preview), _download # Update markdown/preview/download
+        gr.update(value=_build_status), _iframe_html_update, _file_browser_update,
+        gr.update(value=owner_to_use), gr.update(value=space_to_use),
+        _changeset_clear, gr.update(value=_changeset_summary_clear), _confirm_ui_hidden, _confirm_ui_hidden, _confirm_ui_hidden,
+        gr.update(value=_formatted_md), gr.update(value=_detected_preview), _download, gr.update(value=runtime_status_md)
     )
 
 
@@ -844,8 +992,122 @@ def handle_refresh_space_status(hf_api_key_ui, ui_owner_name, ui_space_name):
     log_link = status_details.get('full_log_link')
     if log_link and log_link != "#": md += f"- [View Full Logs]({log_link})\n"
 
+    # Get general repo info as well
+    sdk, file_list, repo_info_err = get_space_repository_info(hf_api_key_ui, ui_space_name, ui_owner_name)
+    if repo_info_err:
+         md += f"- **Repo Info Error:** {repo_info_err}\n"
+    else:
+         md += f"- **SDK:** `{sdk or 'N/A'}`\n"
+         md += f"- **File Count:** `{len(file_list) if file_list is not None else 'N/A'}`\n"
+         # Add more repo info if needed from get_space_repository_info result
+
+    return md
+
+def handle_list_spaces(hf_api_key_ui, ui_owner_name):
+    token, token_err = build_logic_get_api_token(hf_api_key_ui)
+    if token_err:
+        return f"**List Spaces Error:** {token_err}"
+
+    owner_to_list = ui_owner_name
+    if not owner_to_list:
+        try:
+            user_info = build_logic_whoami(token=token)
+            owner_to_list = user_info.get('name')
+            if not owner_to_list: raise Exception("Could not find user name from token.")
+        except Exception as e:
+             return f"**List Spaces Error:** Error auto-detecting owner: {e}. Please specify Owner field."
+
+    if not owner_to_list:
+         return "**List Spaces Error:** Owner could not be determined. Please specify it in the Owner field."
+
+    spaces_list, err = build_logic_list_user_spaces(hf_api_key=token, owner=owner_to_list)
+
+    if err:
+        return f"**List Spaces Error:** {err}"
+
+    if not spaces_list:
+        return f"*No spaces found for user/org `{owner_to_list}`.*"
+
+    md = f"### Spaces for `{owner_to_list}`\n"
+    for space in sorted(spaces_list):
+        md += f"- `{space}`\n"
+
     return md
 
+def handle_manual_duplicate_space(hf_api_key_ui, source_owner, source_space_name, target_owner, target_space_name, target_private):
+    if not source_owner or not source_space_name:
+        return "Duplicate Error: Please load a Space first to duplicate.", gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
+    if not target_owner or not target_space_name:
+        return "Duplicate Error: Target Owner and Target Space Name are required.", gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
+    if "/" in target_space_name:
+         return "Duplicate Error: Target Space Name should not contain '/'. Use Target Owner field for the owner part.", gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
+
+
+    source_repo_id = f"{source_owner}/{source_space_name}"
+    target_repo_id = f"{target_owner}/{target_space_name}"
+
+    status_msg = f"Attempting to duplicate `{source_repo_id}` to `{target_repo_id}`..."
+    yield status_msg, gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update() # Update status immediately
+
+    result_message = build_logic_duplicate_space(hf_api_key_ui, source_repo_id, target_repo_id, target_private)
+    status_msg = f"Duplication Result: {result_message}"
+
+    # Attempt to load the new space after duplication attempt
+    _status_reload = f"{status_msg} | Attempting to load the new Space [{target_repo_id}]..."
+    yield _status_reload, gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
+
+    # Replicate load logic for the new space
+    # Note: This replicates parts of handle_load_existing_space, could refactor common parts
+    new_owner = target_owner # Use the provided target owner
+    new_space_name = target_space_name # Use the provided target space name
+
+    sdk, file_list, err_list = get_space_repository_info(hf_api_key_ui, new_space_name, new_owner)
+
+    if err_list:
+        reload_error = f"Error reloading file list after duplication: {err_list}"
+        global parsed_code_blocks_state_cache
+        parsed_code_blocks_state_cache = []
+        _file_browser_update = gr.update(visible=False, choices=[], value=None)
+        _iframe_html_update = gr.update(value=None, visible=False)
+    else:
+        loaded_files = []
+        for file_path in file_list:
+            content, err_get = get_space_file_content(hf_api_key_ui, new_space_name, new_owner, file_path)
+            lang = _infer_lang_from_filename(file_path)
+            is_binary = lang == "binary" or (err_get is not None)
+            code = f"[Error loading content: {err_get}]" if err_get else (content or "")
+            loaded_files.append({"filename": file_path, "code": code, "language": lang, "is_binary": is_binary, "is_structure_block": False})
+        global parsed_code_blocks_state_cache
+        parsed_code_blocks_state_cache = loaded_files
+
+        _file_browser_update = gr.update(visible=True, choices=sorted([f["filename"] for f in parsed_code_blocks_state_cache if not f.get("is_structure_block")] or []), value=None)
+        if new_owner and new_space_name:
+             sub_owner = re.sub(r'[^a-z0-9\-]+', '-', new_owner.lower()).strip('-') or 'owner'
+             sub_repo = re.sub(r'[^a-z0-9\-]+', '-', new_space_name.lower()).strip('-') or 'space'
+             iframe_url = f"https://{sub_owner}-{sub_repo}{'.static.hf.space' if sdk == 'static' else '.hf.space'}"
+             _iframe_html_update = gr.update(value=f'<iframe src="{iframe_url}?__theme=light&embed=true" width="100%" height="500px"></iframe>', visible=True)
+        else:
+             _iframe_html_update = gr.update(value=None, visible=False)
+
+
+    _formatted, _detected, _download = _generate_ui_outputs_from_cache(new_owner, new_space_name)
+    final_overall_status = status_msg + (f" | Reload Status: {reload_error}" if reload_error else f" | Reload Status: New Space [{new_owner}/{new_space_name}] state refreshed.")
+
+    # Fetch runtime status for the new space
+    runtime_status_md = handle_refresh_space_status(hf_api_key_ui, new_owner, new_space_name)
+
+    # Update UI fields to reflect the newly loaded space
+    owner_update = gr.update(value=new_owner)
+    space_update = gr.update(value=new_space_name)
+
+
+    return (
+        final_overall_status,
+        owner_update, space_update,
+        _formatted, _detected, _download,
+        _file_browser_update, _iframe_html_update, gr.update(value=runtime_status_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"])
 custom_css = """
@@ -913,6 +1175,21 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
                 provider_api_key_input = gr.Textbox(label="Model Provider API Key (Optional)", type="password", placeholder="sk_... (overrides backend settings)")
                 system_prompt_input = gr.Textbox(label="System Prompt", lines=10, value=DEFAULT_SYSTEM_PROMPT, elem_id="system-prompt")
 
+            with gr.Accordion("🗄️ Space Management", open=True):
+                gr.Markdown("### Manual Actions")
+                with gr.Group():
+                    gr.Markdown("Duplicate Current Space To:")
+                    target_owner_input = gr.Textbox(label="Target Owner Name", placeholder="e.g., new-username")
+                    target_space_name_input = gr.Textbox(label="Target Space Name", placeholder="e.g., new-space")
+                    target_private_checkbox = gr.Checkbox(label="Make Target Private", value=False)
+                    duplicate_space_button = gr.Button("📂 Duplicate Space", variant="secondary")
+
+                gr.Markdown("---")
+                gr.Markdown("### List Spaces")
+                list_spaces_button = gr.Button("📄 List My Spaces", variant="secondary")
+                list_spaces_display = gr.Markdown("*List of spaces will appear here.*")
+
+
     with gr.Column(scale=2):
         gr.Markdown("## 💬 AI Assistant Chat")
         chatbot_display = gr.Chatbot(label="AI Chat", height=500, bubble_full_width=False, avatar_images=(None))
@@ -940,8 +1217,8 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
                     build_space_button = gr.Button("🚀 Build / Update Space from Markdown", variant="primary")
                     build_status_display = gr.Textbox(label="Manual Build/Update Status", interactive=False, value="*Manual build status...*")
                     gr.Markdown("---")
-                    refresh_status_button = gr.Button("🔄 Refresh Runtime Status")
-                    space_runtime_status_display = gr.Markdown("*Runtime status will appear here.*")
+                    refresh_status_button = gr.Button("🔄 Refresh Runtime/Repo Status")
+                    space_runtime_status_display = gr.Markdown("*Runtime/Repo status will appear here.*")
 
         with gr.TabItem("🔍 Files Preview"):
             detected_files_preview = gr.Markdown(value="*A preview of the latest file versions will appear here.*")
@@ -961,6 +1238,7 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
                     gr.Markdown("### Live Space Preview")
                     space_iframe_display = gr.HTML(value="", visible=True)
 
+
     provider_select.change(update_models_dropdown, inputs=provider_select, outputs=model_select)
 
     chat_inputs = [
@@ -976,10 +1254,12 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
     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)
 
+    # Note: handle_confirm_changes yields multiple sets of outputs for intermediate steps
     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, changeset_display
+        confirm_accordion, confirm_button, cancel_button, changeset_state, changeset_display,
+        owner_name_input, space_name_input, file_browser_dropdown, space_iframe_display # Added outputs for DUPLICATE_SPACE load
     ]
     confirm_button.click(handle_confirm_changes, inputs=confirm_inputs, outputs=confirm_outputs)
 
@@ -989,12 +1269,14 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
     ]
     cancel_button.click(handle_cancel_changes, inputs=None, outputs=cancel_outputs)
 
+    # Note: handle_load_existing_space yields multiple sets of outputs for intermediate steps
     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,
-        changeset_state, changeset_display, confirm_accordion, confirm_button, cancel_button
+        changeset_state, changeset_display, confirm_accordion, confirm_button, cancel_button,
+        target_owner_input, target_space_name_input, target_private_checkbox # Added outputs for List Spaces
     ]
     load_space_button.click(
         fn=handle_load_existing_space,
@@ -1002,11 +1284,12 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
         outputs=load_space_outputs
     )
 
+    # Note: handle_build_space_button yields multiple sets of outputs for intermediate steps
     build_outputs = [
         build_status_display, space_iframe_display, file_browser_dropdown,
         owner_name_input, space_name_input,
         changeset_state, changeset_display, confirm_accordion, confirm_button, cancel_button,
-        formatted_space_output_display, detected_files_preview, download_button
+        formatted_space_output_display, detected_files_preview, download_button, space_runtime_status_display # Added runtime status output
     ]
     build_inputs = [
         hf_api_key_input, space_name_input, owner_name_input, space_sdk_select,
@@ -1029,5 +1312,18 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
 
     refresh_status_button.click(fn=handle_refresh_space_status, inputs=[hf_api_key_input, owner_name_input, space_name_input], outputs=[space_runtime_status_display])
 
+    # Manual Duplicate Space Button logic - Note it yields
+    manual_duplicate_inputs = [hf_api_key_input, owner_name_input, space_name_input, target_owner_input, target_space_name_input, target_private_checkbox]
+    manual_duplicate_outputs = [
+        status_output, owner_name_input, space_name_input,
+        formatted_space_output_display, detected_files_preview, download_button,
+        file_browser_dropdown, space_iframe_display, space_runtime_status_display # Outputs needed after loading the new space
+    ]
+    duplicate_space_button.click(fn=handle_manual_duplicate_space, inputs=manual_duplicate_inputs, outputs=manual_duplicate_outputs)
+
+    # List Spaces Button logic
+    list_spaces_button.click(fn=handle_list_spaces, inputs=[hf_api_key_input, owner_name_input], outputs=[list_spaces_display])
+
+
 if __name__ == "__main__":
     demo.launch(debug=False, mcp_server=True)