Update app.py

app.py

@@ -24,7 +24,7 @@ from build_logic import (
     build_logic_create_pull_request,
     build_logic_add_comment,
     build_logic_like_space,
-    build_logic_create_space 
+    build_logic_create_space
 )
 
 from model_logic import (
@@ -95,10 +95,10 @@ If no code or actions are requested, respond conversationally and help the user
 
 def escape_html_for_markdown(text):
     if not isinstance(text, str): return ""
-    return text.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
+    return text.replace("&", "&").replace("<", "<").replace(">", ">")
 
 def _infer_lang_from_filename(filename):
-    if not filename: return "plaintext"
+    if not filename: return "text" # Changed from "plaintext" to "text" for gr.Code compatibility
     if '.' in filename:
         ext = filename.split('.')[-1].lower()
         mapping = {
@@ -110,17 +110,17 @@ def _infer_lang_from_filename(filename):
             'c': 'c', 'h': 'c', 'cpp': 'cpp', 'hpp': 'cpp', 'cs': 'csharp', 'java': 'java',
             'rb': 'ruby', 'php': 'php', 'go': 'go', 'rs': 'rust', 'swift': 'swift', 'kt': 'kotlin', 'kts': 'kotlin',
             'sql': 'sql', 'dockerfile': 'docker', 'tf': 'terraform', 'hcl': 'terraform',
-            'txt': 'plaintext', 'log': 'plaintext', 'ini': 'ini', 'conf': 'plaintext', 'cfg': 'plaintext',
-            'csv': 'plaintext', 'tsv': 'tsv', 'err': 'plaintext',
-            '.env': 'plaintext', '.gitignore': 'plaintext', '.npmrc': 'plaintext', '.gitattributes': 'plaintext',
+            'txt': 'text', 'log': 'text', 'ini': 'ini', 'conf': 'text', 'cfg': 'text', # Changed plaintext to text
+            'csv': 'text', 'tsv': 'text', 'err': 'text', # Changed plaintext to text
+            '.env': 'text', '.gitignore': 'text', '.npmrc': 'text', '.gitattributes': 'text', # Changed plaintext to text
             'makefile': 'makefile',
         }
-        return mapping.get(ext, "plaintext")
+        return mapping.get(ext, "text") # Changed default to text
     base_filename = os.path.basename(filename)
     if base_filename == 'Dockerfile': return 'docker'
     if base_filename == 'Makefile': return 'makefile'
-    if base_filename.startswith('.'): return 'plaintext'
-    return "plaintext"
+    if base_filename.startswith('.'): return 'text' # Changed plaintext to text
+    return "text" # Changed default to text
 
 def _clean_filename(filename_line_content):
     text = filename_line_content.strip()
@@ -141,7 +141,7 @@ def _parse_and_update_state_cache(latest_bot_message_content, current_files_stat
 
     structure_match = structure_pattern.search(content)
     if structure_match:
-        structure_block_state = {"filename": "File Structure (from AI)", "language": structure_match.group("struct_lang") or "plaintext", "code": structure_match.group("structure_code").strip(), "is_binary": False, "is_structure_block": True}
+        structure_block_state = {"filename": "File Structure (from AI)", "language": structure_match.group("struct_lang") or "text", "code": structure_match.group("structure_code").strip(), "is_binary": False, "is_structure_block": True} # Changed plaintext to text
 
     current_message_proposed_filenames = []
     for match in file_pattern.finditer(content):
@@ -200,7 +200,7 @@ def _export_selected_logic(selected_filenames, space_line_name_for_md, parsed_bl
         if block.get('is_binary') or content.startswith(("[Binary file", "[Error loading content:", "[Binary or Skipped file]")):
              output_lines.append(content)
         else:
-            lang = block.get('language', 'plaintext') or 'plaintext'
+            lang = block.get('language', 'text') or 'text' # Changed plaintext to text
             output_lines.extend([f"{bbb}{lang}", content, bbb])
         output_lines.append("")
         exported_content_count += 1
@@ -257,7 +257,7 @@ def _generate_ui_outputs_from_cache(owner, space_name):
                 if block.get('is_binary') or content.startswith(("[Binary file", "[Error loading content:", "[Binary or Skipped file]")):
                      preview_md_lines.append(f"\n`{escape_html_for_markdown(content.strip())}`\n")
                 else:
-                     lang = block.get('language', 'plaintext') or 'plaintext'
+                     lang = block.get('language', 'text') or 'text' # Changed plaintext to text
                      preview_md_lines.append(f"\n{bbb}{lang}\n{content.strip()}\n{bbb}\n")
         preview_md_val = "\n".join(preview_md_lines)
 
@@ -265,7 +265,7 @@ def _generate_ui_outputs_from_cache(owner, space_name):
 
 def generate_and_stage_changes(ai_response_content, current_files_state, hf_owner_name, hf_repo_name):
     changeset = []
-    current_files_dict = {f["filename"]: f for f in current_files_state if not f.get("is_structure_block")}
+    current_files_dict = {f["filename"]: f.copy() for f in current_files_state if not f.get("is_structure_block")}
     ai_parsed_md = build_logic_parse_markdown(ai_response_content)
     ai_proposed_files_list = ai_parsed_md.get("files", [])
     ai_proposed_files_dict = {f["path"]: f for f in ai_proposed_files_list}
@@ -411,6 +411,7 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
                  print(f"Warning: Cannot stage LIKE_SPACE action, no Space currently loaded.")
                  changeset.append({"type": "Error", "message": "Cannot like space, no Space currently loaded."})
 
+
     for file_info in ai_proposed_files_list:
         filename = file_info["path"]
         proposed_content = file_info["content"]
@@ -593,8 +594,8 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
 
     _status = "Applying changes..."
     yield _status, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(value="*Applying changes...*")
-    # Dummy yields for components that might be updated later in the generator
-    yield gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
+    # Explicitly yield None for the other 15 outputs initially
+    yield None, None, None, None, None, None, None, None, None, None, None, None, None, None, None # Ensure 16 None values
 
     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.")
@@ -614,7 +615,7 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
                 private=change.get("private", False)
             )
             _status_reload = f"{status_message} | Attempting to load the new Space [{change['target_repo_id']}]..."
-            yield gr.update(value=_status_reload)
+            yield gr.update(value=_status_reload), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
 
             target_repo_id = change['target_repo_id']
             new_owner, new_space_name = target_repo_id.split('/', 1) if '/' in target_repo_id else (None, target_repo_id)
@@ -683,6 +684,7 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
                      gr.update(value="*Runtime status unavailable for new space.*")
                  )
 
+
         else:
              final_overall_status = "Duplicate Action Error: Invalid duplicate changeset format."
              _formatted, _detected, _download = _generate_ui_outputs_from_cache(owner_name, space_name)
@@ -707,6 +709,7 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
              status_message = build_logic_delete_space(hf_api_key, delete_owner, delete_space)
              final_overall_status = status_message
              if "Successfully" in status_message:
+                  global parsed_code_blocks_state_cache
                   parsed_code_blocks_state_cache = []
                   _formatted, _detected, _download = _generate_ui_outputs_from_cache(None, None)
                   owner_update = gr.update(value="")
@@ -741,10 +744,8 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
                 if change['type'] == 'CREATE_SPACE':
                     repo_id_to_create = change.get('repo_id')
                     if repo_id_to_create:
-                         msg = build_logic_create_space(hf_api_key, repo_id_to_create.split('/')[1], repo_id_to_create.split('/')[0] if '/' in repo_id_to_create else None, change.get('sdk', 'gradio'), "", change.get('private', False)) # Note: Manual create requires markdown, passing empty string
+                         msg = build_logic_create_space(hf_api_key, repo_id_to_create.split('/')[1], repo_id_to_create.split('/')[0] if '/' in repo_id_to_create else None, change.get('sdk', 'gradio'), "", change.get('private', False))
                          action_status_messages.append(f"CREATE_SPACE: {msg}")
-                         # If creation was successful, potentially update the UI fields? No, AI might create a *different* space.
-                         # Just report success/failure. The AI can propose loading it next.
                     else:
                          action_status_messages.append("CREATE_SPACE Error: Target repo_id not specified.")
                 elif change['type'] == 'SET_PRIVACY':
@@ -805,7 +806,7 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
         if not final_overall_status: final_overall_status = "No operations were applied."
 
         _status_reload = f"{final_overall_status} | Reloading Space state..."
-        yield gr.update(value=_status_reload)
+        yield gr.update(value=_status_reload), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update() # Yield status
 
         refreshed_file_list = []
         reload_error = None
@@ -880,15 +881,17 @@ def update_models_dropdown(provider_select):
     selected_value = default_model if default_model in models else (models[0] if models else None)
     return gr.update(choices=models, value=selected_value)
 
-def handle_detect_user(hf_api_key_ui, owner_name_ui):
+def handle_detect_user_and_list_spaces(hf_api_key_ui):
     _status = "Detecting user from token..."
-    # Yield initial state to show loading status and clear potentially outdated owner/spaces list
-    yield gr.update(value=_status), gr.update(value=""), gr.update(value="*Listing spaces...*")
+    # Yield initial state: update status, clear owner/space fields, clear list display, clear duplicate fields
+    yield (gr.update(value=_status), gr.update(value=""), gr.update(value=""), gr.update(value="*Listing spaces...*"), gr.update(visible=False, choices=[], value=None), gr.update(value=None, visible=False), gr.update(value=""), gr.update(value=""), gr.update(value="*Manual build status...*"), gr.update(value="*Select a file...*"), gr.update(value="*Runtime/Repo status will appear here.*"), [], gr.update(value="*No changes proposed.*"), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(value=""), gr.update(value=""), gr.update(value=False))
+
 
     token, token_err = build_logic_get_api_token(hf_api_key_ui)
     if token_err:
         _status = f"Detection Error: {token_err}"
-        yield gr.update(value=_status), gr.update(), gr.update(value="*Could not list spaces due to token error.*")
+        # Yield error status, keep fields cleared, update list display error
+        yield (gr.update(value=_status), gr.update(), gr.update(), gr.update(value="*Could not list spaces due to token error.*"), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update())
         return
 
     try:
@@ -898,7 +901,6 @@ def handle_detect_user(hf_api_key_ui, owner_name_ui):
         _status = f"User detected: {owner_name}"
         owner_update = gr.update(value=owner_name)
 
-        # Immediately trigger listing spaces using the detected owner
         list_spaces_md, list_err = build_logic_list_user_spaces(hf_api_key=token, owner=owner_name)
         if list_err:
             list_spaces_update = gr.update(value=f"List Spaces Error: {list_err}")
@@ -906,14 +908,15 @@ def handle_detect_user(hf_api_key_ui, owner_name_ui):
         else:
             list_spaces_update = gr.update(value=list_spaces_md)
 
-        yield gr.update(value=_status), owner_update, list_spaces_update
+        yield (gr.update(value=_status), owner_update, gr.update(value=""), list_spaces_update, gr.update(visible=False, choices=[], value=None), gr.update(value=None, visible=False), gr.update(value=""), gr.update(value=""), gr.update(value="*Manual build status...*"), gr.update(value="*Select a file...*"), gr.update(value="*Runtime/Repo status will appear here.*"), [], gr.update(value="*No changes proposed.*"), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(value=""), gr.update(value=""), gr.update(value=False))
+
 
     except Exception as e:
         _status = f"Detection Error: Could not detect user from token: {e}"
         print(f"Error in handle_detect_user: {e}")
         import traceback
         traceback.print_exc()
-        yield gr.update(value=_status), gr.update(), gr.update(value="*Could not list spaces due to user detection error.*")
+        yield (gr.update(value=_status), gr.update(), gr.update(), gr.update(value="*Could not list spaces due to user detection error.*"), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update())
 
 
 def handle_load_existing_space(hf_api_key_ui, ui_owner_name, ui_space_name):
@@ -924,7 +927,7 @@ def handle_load_existing_space(hf_api_key_ui, ui_owner_name, ui_space_name):
     _changeset_clear = []
     _changeset_summary_clear = "*No changes proposed.*"
     _confirm_ui_hidden = gr.update(visible=False)
-    _list_spaces_display_clear = gr.update() # Don't clear list spaces display on load, it's controlled by its own button
+    _list_spaces_display_placeholder = "*List of spaces will appear here.*"
     _target_owner_clear, _target_space_clear, _target_private_clear = gr.update(value=""), gr.update(value=""), gr.update(value=False)
 
 
@@ -934,34 +937,34 @@ def handle_load_existing_space(hf_api_key_ui, ui_owner_name, 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,
-        _list_spaces_display_clear, _target_owner_clear, _target_space_clear, _target_private_clear
+        gr.update(value=_list_spaces_display_placeholder), _target_owner_clear, _target_space_clear, _target_private_clear
     )
 
     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),
+        yield (gr.update(value=_status_val), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update())
         return
     if not owner_to_use:
         try:
             user_info = build_logic_whoami(token=token)
             owner_to_use = user_info.get('name')
             if not owner_to_use: raise Exception("Could not find user name from token.")
-            yield gr.update(value=owner_to_use), gr.update(value=f"Loading Space: {owner_to_use}/{ui_space_name} (Auto-detected owner)...")
+            yield gr.update(value=owner_to_use), gr.update(value=f"Loading Space: {owner_to_use}/{ui_space_name} (Auto-detected owner)..."), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
         except Exception as e:
             _status_val = f"Load Error: Error auto-detecting owner: {e}"
-            yield gr.update(value=_status_val),
+            yield (gr.update(value=_status_val), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update())
             return
 
     if not owner_to_use or not ui_space_name:
         _status_val = "Load Error: Owner and Space Name are required."
-        yield gr.update(value=_status_val),
+        yield (gr.update(value=_status_val), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update())
         return
 
     sdk, file_list, err = get_space_repository_info(hf_api_key_ui, ui_space_name, owner_to_use)
 
-    yield gr.update(value=owner_to_use), gr.update(value=ui_space_name),
+    yield gr.update(value=owner_to_use), gr.update(value=ui_space_name), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
 
     if err:
         _status_val = f"Load Error: {err}"
@@ -972,7 +975,8 @@ def handle_load_existing_space(hf_api_key_ui, ui_owner_name, ui_space_name):
             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()
+            _download, gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(),
+            gr.update(value=_list_spaces_display_placeholder), gr.update(value=""), gr.update(value=""), gr.update(value=False)
         )
         return
 
@@ -1006,7 +1010,8 @@ def handle_load_existing_space(hf_api_key_ui, ui_owner_name, ui_space_name):
         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(), gr.update()
+        _download, gr.update(), gr.update(), gr.update(value=runtime_status_md), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(),
+        gr.update(value=_list_spaces_display_placeholder), gr.update(value=""), gr.update(value=""), gr.update(value=False)
     )
 
 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):
@@ -1024,7 +1029,7 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
 
     if not ui_space_name_part or "/" in ui_space_name_part:
         _build_status = f"Build Error: Invalid Space Name '{ui_space_name_part}'."
-        yield gr.update(value=_build_status),
+        yield gr.update(value=_build_status), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
         return
 
     parsed_content = build_logic_parse_markdown(formatted_markdown_content)
@@ -1038,13 +1043,13 @@ 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),
+         yield gr.update(value=_build_status), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
          return
 
     token, token_err = build_logic_get_api_token(hf_api_key_ui)
     if token_err:
          _build_status = f"Build Error: API Token Error: {token_err}"
-         yield gr.update(value=_build_status),
+         yield gr.update(value=_build_status), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
          return
     api = HfApi(token=token)
     repo_id_target = f"{ui_owner_name_part}/{ui_space_name_part}"
@@ -1056,10 +1061,10 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
     except HfHubHTTPError as e_http:
          build_status_messages.append(f"CREATE_SPACE HTTP Error ({e_http.response.status_code if e_http.response else 'N/A'}): {e_http.response.text if e_http.response else str(e_http)}. Check logs.")
          if e_http.response and e_http.response.status_code in (401, 403):
-             _build_status = f"Build Error: {build_status_messages[-1]}. Cannot proceed with file upload."; yield gr.update(value=_build_status); return
+             _build_status = f"Build Error: {build_status_messages[-1]}. Cannot proceed with file upload."; yield gr.update(value=_build_status), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(); return
     except Exception as e:
          build_status_messages.append(f"CREATE_SPACE Error: {e}")
-         _build_status = f"Build Error: {build_status_messages[-1]}. Cannot proceed with file upload."; yield gr.update(value=_build_status); return
+         _build_status = f"Build Error: {build_status_messages[-1]}. Cannot proceed with file upload."; yield gr.update(value=_build_status), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(); return
 
 
     file_changes_only_changeset = [{"type": "CREATE_FILE", "path": f["path"], "content": f["content"], "lang": _infer_lang_from_filename(f["path"])} for f in proposed_files_list]
@@ -1125,11 +1130,11 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
 
 def handle_load_file_for_editing(hf_api_key_ui, ui_space_name_part, ui_owner_name_part, selected_file_path):
     if not selected_file_path:
-        return "", "Select a file.", "", gr.update(language="plaintext")
+        return "", "Select a file.", "", gr.update(language="text") # Changed plaintext to text
 
     content, err = get_space_file_content(hf_api_key_ui, ui_space_name_part, ui_owner_name_part, selected_file_path)
     if err:
-        return "", f"Load Error: {err}", "", gr.update(language="plaintext")
+        return "", f"Load Error: {err}", "", gr.update(language="text") # Changed plaintext to text
 
     lang = _infer_lang_from_filename(selected_file_path)
     commit_msg = f"Update {selected_file_path}"
@@ -1172,9 +1177,9 @@ def handle_commit_file_changes(hf_api_key_ui, ui_space_name_part, ui_owner_name_
 
 def handle_delete_file(hf_api_key_ui, ui_space_name_part, ui_owner_name_part, file_to_delete_path):
     if not ui_owner_name_part or not ui_space_name_part:
-         return "Delete Error: Cannot delete file. Please load a space first.", gr.update(), "", "", "plaintext", gr.update(), gr.update(), gr.update()
+         return "Delete Error: Cannot delete file. Please load a space first.", gr.update(), "", "", "text", gr.update(), gr.update(), gr.update() # Changed plaintext to text
     if not file_to_delete_path:
-        return "Delete Error: No file selected to delete.", gr.update(), "", "", "plaintext", gr.update(), gr.update(), gr.update()
+        return "Delete Error: No file selected to delete.", gr.update(), "", "", "text", gr.update(), gr.update(), gr.update() # Changed plaintext to text
 
     status_msg = build_logic_delete_space_file(hf_api_key_ui, ui_space_name_part, ui_owner_name_part, file_to_delete_path)
 
@@ -1188,7 +1193,7 @@ def handle_delete_file(hf_api_key_ui, ui_space_name_part, ui_owner_name_part, fi
         parsed_code_blocks_state_cache = [b for b in parsed_code_blocks_state_cache if b["filename"] != file_to_delete_path]
         file_content_editor_update = gr.update(value="")
         commit_message_update = gr.update(value="")
-        editor_lang_update = gr.update(language="plaintext")
+        editor_lang_update = gr.update(language="text") # Changed plaintext to text
         file_list, _ = list_space_files_for_browsing(hf_api_key_ui, ui_space_name_part, ui_owner_name_part)
         file_browser_update = gr.update(choices=sorted(file_list or []), value=None)
 
@@ -1286,7 +1291,6 @@ def handle_manual_duplicate_space(hf_api_key_ui, source_owner, source_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(), 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(), gr.update(), gr.update()
-    global parsed_code_blocks_state_cache
 
 
     source_repo_id = f"{source_owner}/{source_space_name}"
@@ -1300,7 +1304,7 @@ def handle_manual_duplicate_space(hf_api_key_ui, source_owner, source_space_name
     status_msg = f"Duplication Result: {result_message}"
 
     _status_reload = f"{status_msg} | Attempting to load the new Space [{target_repo_id}]..."
-    yield gr.update(value=_status_reload)
+    yield gr.update(value=_status_reload), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
 
     new_owner = target_owner
     new_space_name = target_space_name
@@ -1309,6 +1313,7 @@ def handle_manual_duplicate_space(hf_api_key_ui, source_owner, source_space_name
 
     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)
@@ -1320,6 +1325,7 @@ def handle_manual_duplicate_space(hf_api_key_ui, source_owner, source_space_name
             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)
@@ -1345,224 +1351,4 @@ def handle_manual_duplicate_space(hf_api_key_ui, source_owner, source_space_name
         owner_update, space_update,
         gr.update(value=_formatted), gr.update(value=_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 = """
-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; overflow-x: auto; }
-.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-container .gr-accordion { border-color: rgba(189, 195, 199, 0.3) !important; }
-.gradio-container .gr-accordion.closed { background-color: rgba(52, 73, 94, 0.9) !important; }
-.gradio-container .gr-accordion.open { background-color: rgba(44, 62, 80, 0.8) !important; }
-
-"""
-
-with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
-    changeset_state = gr.State([])
-
-    gr.Markdown("# 🤖 AI-Powered Hugging Face Space Commander")
-    gr.Markdown("Use an AI assistant to create, modify, build, and manage your Hugging Face Spaces directly from this interface.")
-    gr.Markdown("## ❗ This will cause changes to your huggingface spaces if you give it your Huggingface Key")
-    gr.Markdown("⚒ Under Development - Use with Caution")
-
-
-    with gr.Sidebar():
-        with gr.Column(scale=1):
-            with gr.Accordion("⚙️ Configuration", open=True):
-                hf_api_key_input = gr.Textbox(label="Hugging Face Token", type="password", placeholder="hf_... (uses env var HF_TOKEN if empty)")
-                owner_name_input = gr.Textbox(label="HF Owner Name", placeholder="e.g., your-username")
-                space_name_input = gr.Textbox(label="HF Space Name", value="")
-                load_space_button = gr.Button("🔄 Load Existing Space", variant="secondary")
-                detect_user_button = gr.Button("👤 Detect User from Token", variant="secondary")
-
-
-            with gr.Accordion("🤖 AI Model Settings", open=True):
-                available_providers = get_available_providers()
-                default_provider = 'Groq'
-                if default_provider not in available_providers:
-                    default_provider = available_providers[0] if available_providers else None
-                elif len(available_providers) < 3:
-                     default_provider = available_providers[0] if available_providers else None
-
-                initial_models = get_models_for_provider(default_provider) if default_provider else []
-                initial_model = get_default_model_for_provider(default_provider) if default_provider else None
-                if initial_model not in initial_models:
-                    initial_model = initial_models[0] if initial_models else None
-
-                provider_select = gr.Dropdown(
-                    label="AI Provider",
-                    choices=available_providers,
-                    value=default_provider,
-                    allow_custom_value=False
-                )
-                model_select = gr.Dropdown(
-                    label="AI Model",
-                    choices=initial_models,
-                    value=initial_model,
-                    allow_custom_value=False
-                )
-                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))
-        with gr.Row():
-            chat_message_input = gr.Textbox(show_label=False, placeholder="Your Message...", scale=7)
-            send_chat_button = gr.Button("Send", variant="primary", scale=1)
-        status_output = gr.Textbox(label="Last Action Status", interactive=False, value="Ready.")
-
-    with gr.Accordion("📝 Proposed Changes (Pending Confirmation)", open=False, 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():
-                with gr.Column(scale=2):
-                    formatted_space_output_display = gr.Textbox(label="Current Space Definition (Generated Markdown)", lines=20, interactive=True, value="*Load or create a space to see its definition.*")
-                    download_button = gr.DownloadButton(label="Download .md", interactive=False)
-                with gr.Column(scale=1):
-                    gr.Markdown("### Manual Build & Status")
-                    space_sdk_select = gr.Dropdown(label="Space SDK", choices=["gradio", "streamlit", "docker", "static"], value="gradio", interactive=True)
-                    space_private_checkbox = gr.Checkbox(label="Make Space Private", value=False, interactive=True)
-                    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/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.*")
-
-        with gr.TabItem("✏️ Live File Editor & Preview"):
-             with gr.Row():
-                with gr.Column(scale=1):
-                    gr.Markdown("### Live Editor")
-                    file_browser_dropdown = gr.Dropdown(label="Select File in Space", choices=[], interactive=True)
-                    file_content_editor = gr.Code(label="File Content Editor", language="python", lines=15, interactive=True, value="")
-                    commit_message_input = gr.Textbox(label="Commit Message", placeholder="e.g., Updated app.py", interactive=True, value="")
-                    with gr.Row():
-                        update_file_button = gr.Button("Commit Changes", variant="primary", interactive=True)
-                        delete_file_button = gr.Button("🗑️ Delete Selected File", variant="stop", interactive=True)
-                    edit_status_display = gr.Textbox(label="File Edit/Delete Status", interactive=False, value="")
-                with gr.Column(scale=1):
-                    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 = [
-        chat_message_input, chatbot_display, hf_api_key_input,
-        provider_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)
-
-    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,
-        owner_name_input, space_name_input, file_browser_dropdown, space_iframe_display, space_runtime_status_display
-    ]
-    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,
-        changeset_state, changeset_display, confirm_accordion, confirm_button, cancel_button,
-        list_spaces_display, target_owner_input, target_space_name_input, target_private_checkbox
-    ]
-    load_space_button.click(
-        fn=handle_load_existing_space,
-        inputs=[hf_api_key_input, owner_name_input, space_name_input],
-        outputs=load_space_outputs
-    )
-
-    detect_user_outputs = [status_output, owner_name_input, list_spaces_display]
-    detect_user_button.click(fn=handle_detect_user, inputs=[hf_api_key_input, owner_name_input], outputs=detect_user_outputs)
-
-    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, space_runtime_status_display
-    ]
-    build_inputs = [
-        hf_api_key_input, space_name_input, owner_name_input, space_sdk_select,
-        space_private_checkbox, formatted_space_output_display
-    ]
-    build_space_button.click(fn=handle_build_space_button, inputs=build_inputs, outputs=build_outputs)
-
-    file_edit_load_outputs = [file_content_editor, edit_status_display, commit_message_input, file_content_editor]
-    file_browser_dropdown.change(fn=handle_load_file_for_editing, inputs=[hf_api_key_input, space_name_input, owner_name_input, file_browser_dropdown], outputs=file_edit_load_outputs)
-
-    commit_file_outputs = [edit_status_display, file_browser_dropdown, formatted_space_output_display, detected_files_preview, download_button]
-    update_file_button.click(fn=handle_commit_file_changes, inputs=[hf_api_key_input, space_name_input, owner_name_input, file_browser_dropdown, file_content_editor, commit_message_input], outputs=commit_file_outputs)
-
-    delete_file_outputs = [
-        edit_status_display, file_browser_dropdown,
-        file_content_editor, commit_message_input, file_content_editor,
-        formatted_space_output_display, detected_files_preview, download_button
-    ]
-    delete_file_button.click(fn=handle_delete_file, inputs=[hf_api_key_input, space_name_input, owner_name_input, file_browser_dropdown], outputs=delete_file_outputs)
-
-    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_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
-    ]
-    duplicate_space_button.click(fn=handle_manual_duplicate_space, inputs=manual_duplicate_inputs, outputs=manual_duplicate_outputs)
-
-    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)
+    )