Update app.py

app.py

@@ -16,14 +16,15 @@ from build_logic import (
     parse_markdown as build_logic_parse_markdown,
     delete_space_file as build_logic_delete_space_file,
     get_space_runtime_status,
-    apply_staged_file_changes, # Renamed to indicate it only handles files
+    apply_staged_file_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,
     build_logic_create_pull_request,
     build_logic_add_comment,
-    build_logic_like_space
+    build_logic_like_space,
+    build_logic_create_space # Added back for manual build flow
 )
 
 from model_logic import (
@@ -110,7 +111,7 @@ def _infer_lang_from_filename(filename):
             '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': 'plaintext', 'err': 'plaintext',
+            'csv': 'plaintext', 'tsv': 'tsv', 'err': 'plaintext',
             '.env': 'plaintext', '.gitignore': 'plaintext', '.npmrc': 'plaintext', '.gitattributes': 'plaintext',
             'makefile': 'makefile',
         }
@@ -354,13 +355,12 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
              print(f"Staged DELETE_SPACE action for {hf_owner_name}/{hf_repo_name}")
 
          elif command == "CREATE_PR" and args:
-             # Expecting: CREATE_PR <target_repo_id> --title "..." --body "..."
              target_repo_id = None
              title = ""
              body = ""
              try:
                  target_repo_id = args[0]
-                 arg_string = shlex.join(args[1:]) # Rejoin remaining args as a string to parse options
+                 arg_string = shlex.join(args[1:])
 
                  title_match = re.search(r'--title\s+"([^"]*)"', arg_string)
                  if title_match: title = title_match.group(1)
@@ -370,7 +370,7 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
                  if body_match: body = body_match.group(1)
                  else: print("Warning: CREATE_PR missing --body argument.")
 
-                 if target_repo_id and title: # Require target and title
+                 if target_repo_id and title:
                      changeset.append({"type": "CREATE_PR", "source_repo_id": f"{hf_owner_name}/{hf_repo_name}", "target_repo_id": target_repo_id, "title": title, "body": body})
                      print(f"Staged CREATE_PR action to {target_repo_id}")
                  else:
@@ -382,16 +382,12 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
 
 
          elif command == "ADD_COMMENT" and args:
-             # Expecting: ADD_COMMENT "Your comment text"
              comment_text = None
              try:
-                 # Attempt to parse the rest of the line as a single quoted string
-                 # Rejoin args and then try to find the quoted string
                  comment_string = shlex.join(args)
-                 comment_match = re.match(r'^"([^"]*)"$', comment_string) # Look for the whole string being a quoted value
+                 comment_match = re.match(r'^"([^"]*)"$', comment_string)
                  if comment_match: comment_text = comment_match.group(1)
                  else:
-                      # Fallback: just use the raw args joined by space if not a perfect quoted string
                       comment_text = " ".join(args)
                       print(f"Warning: ADD_COMMENT argument was not a single quoted string, using raw args: '{comment_text}'")
 
@@ -408,7 +404,6 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
 
 
          elif command == "LIKE_SPACE":
-             # No args expected
              if hf_owner_name and hf_repo_name:
                  changeset.append({"type": "LIKE_SPACE", "repo_id": f"{hf_owner_name}/{hf_repo_name}"})
                  print(f"Staged LIKE_SPACE action on {hf_owner_name}/{hf_repo_name}")
@@ -416,9 +411,6 @@ 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."})
 
-         # 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"]
@@ -456,6 +448,8 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
              for change in space_actions:
                  if change["type"] == "CREATE_SPACE":
                      md_summary.append(f"- **🚀 Create New Space:** `{change.get('repo_id', '...')}` (SDK: {change.get('sdk', 'gradio')}, Private: {change.get('private', False)})")
+                 elif change["type"] == "DUPLICATE_SPACE":
+                      md_summary.append(f"- **📂 Duplicate Space:** From `{change.get('source_repo_id', '...')}` to `{change.get('target_repo_id', '...')}` (Private: {change.get('private', False)})")
                  elif change["type"] == "SET_PRIVACY":
                      md_summary.append(f"- **🔒 Set Privacy:** Set `{change.get('repo_id', '...')}` to `private={change.get('private', False)}`")
                  elif change["type"] == "DELETE_SPACE":
@@ -466,7 +460,7 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
                      if change.get('body'): md_summary.append(f"  - Body: `{change.get('body', '...')}`")
                  elif change["type"] == "ADD_COMMENT":
                       md_summary.append(f"- **💬 Add Comment:** On `{change.get('repo_id', '...')}`")
-                      md_summary.append(f"  - Comment: `{change.get('comment', '...')[:100]}{'...' if len(change.get('comment', '')) > 100 else ''}`") # Truncate long comments
+                      md_summary.append(f"  - Comment: `{change.get('comment', '...')[:100]}{'...' if len(change.get('comment', '')) > 100 else ''}`")
                  elif change["type"] == "LIKE_SPACE":
                       md_summary.append(f"- **👍 Like Space:** `{change.get('repo_id', '...')}`")
                  elif change["type"] == "Error":
@@ -598,15 +592,13 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
     global parsed_code_blocks_state_cache
 
     _status = "Applying changes..."
-    # Yield initial status, hide confirm UI, clear summary
     yield _status, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(value="*Applying changes...*")
-    # Include outputs for potential space load/update
-    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(), gr.update(), gr.update() # Dummy yields to match structure
+    # 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()
 
     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.")
 
-    # Check if the first action is an exclusive action like DUPLICATE_SPACE
     first_action = changeset[0] if changeset else None
     is_exclusive_duplicate = first_action and first_action.get('type') == 'DUPLICATE_SPACE'
     is_exclusive_delete = first_action and first_action.get('type') == 'DELETE_SPACE'
@@ -621,20 +613,17 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
                 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 gr.update(value=_status_reload) # Update status
+            yield gr.update(value=_status_reload)
 
-            # Extract new owner and space name from target_repo_id
             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)
 
-            # If owner was not explicitly provided in target_repo_id, try to get it from the token
             if not new_owner:
                  token, token_err = build_logic_get_api_token(hf_api_key)
                  if token_err:
                      print(f"Error getting token for new owner determination: {token_err}")
-                     new_owner = None # Cannot auto-detect
+                     new_owner = None
                  else:
                     try: user_info = build_logic_whoami(token=token); new_owner = user_info.get('name')
                     except Exception as e:
@@ -642,7 +631,6 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
                          new_owner = None
 
 
-            # Trigger the load logic for the new space if owner and name are available
             if new_owner and new_space_name:
                 sdk, file_list, err_list = get_space_repository_info(hf_api_key, new_space_name, new_owner)
                 if err_list:
@@ -673,36 +661,30 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
                 else:
                      iframe_update = gr.update(value=None, visible=False)
 
-                # Fetch runtime status for the new space
                 runtime_status_md = handle_refresh_space_status(hf_api_key, new_owner, new_space_name)
 
-                # Final yield after loading the new space
                 yield (
-                     gr.update(value=final_overall_status), gr.update(value=_formatted), gr.update(value=_detected), _download, # Status, markdown, preview, download
-                     gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), # Hide confirm UI
-                     [], 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
-                     gr.update(value=runtime_status_md) # Update runtime status
+                     gr.update(value=final_overall_status), gr.update(value=_formatted), gr.update(value=_detected), _download,
+                     gr.update(visible=False), gr.update(visible=False), gr.update(visible=False),
+                     [], gr.update(value="*No changes proposed.*"),
+                     owner_update, space_update, file_browser_update, iframe_update,
+                     gr.update(value=runtime_status_md)
                 )
 
             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
+                 _formatted, _detected, _download = _generate_ui_outputs_from_cache(None, None)
                  final_overall_status = status_message + f" | Reload Status: {reload_error}"
-                 # Keep old UI fields, clear file browser/iframe
                  yield (
                      gr.update(value=final_overall_status), gr.update(value=_formatted), gr.update(value=_detected), _download,
                      gr.update(visible=False), gr.update(visible=False), gr.update(visible=False),
                      [], gr.update(value="*No changes proposed.*"),
                      gr.update(), gr.update(), gr.update(visible=False, choices=[], value=None), gr.update(value=None, visible=False),
-                     gr.update(value="*Runtime status unavailable for new space.*") # Clear runtime status
+                     gr.update(value="*Runtime status unavailable for new space.*")
                  )
 
-
         else:
-             # 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)
              yield (
                  gr.update(value=final_overall_status), gr.update(value=_formatted), gr.update(value=_detected), _download,
@@ -713,7 +695,6 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
 
     elif is_exclusive_delete:
          change = first_action
-         # Confirm DELETE_SPACE is only for the currently loaded space before calling the backend
          delete_owner = change.get('owner') or owner_name
          delete_space = change.get('space_name') or space_name
          delete_repo_id_target = f"{delete_owner}/{delete_space}" if delete_owner and delete_space else None
@@ -725,24 +706,21 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
          else:
              status_message = build_logic_delete_space(hf_api_key, delete_owner, delete_space)
              final_overall_status = status_message
-             # Clear the UI completely after successful deletion
              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) # Clear previews
+                  _formatted, _detected, _download = _generate_ui_outputs_from_cache(None, None)
                   owner_update = gr.update(value="")
                   space_update = gr.update(value="")
                   file_browser_update = gr.update(visible=False, choices=[], value=None)
                   iframe_update = gr.update(value=None, visible=False)
                   runtime_status_update = gr.update(value="*Space deleted, runtime status unavailable.*")
              else:
-                  # If deletion failed, keep the current state and update status
                   _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()
-                  runtime_status_update = gr.update() # Keep existing or trigger refresh?
-                  # Let's trigger a status refresh after failed delete attempt
                   runtime_status_update = handle_refresh_space_status(hf_api_key, owner_name, space_name)
 
 
@@ -755,36 +733,35 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
          )
 
 
-    else: # Not an exclusive action, process other actions and file changes sequentially
-
+    else:
         action_status_messages = []
         file_change_operations = []
 
-        # Process non-file actions first
         for change in changeset:
             try:
                 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, change.get('sdk', 'gradio'), change.get('private', False))
+                         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
                          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':
-                    repo_id_to_set_privacy = change.get('repo_id') or f"{owner_name}/{space_name}"
-                    if repo_id_to_set_privacy and owner_name and space_name: # Ensure current space is loaded
+                     repo_id_to_set_privacy = change.get('repo_id') or f"{owner_name}/{space_name}"
+                     if repo_id_to_set_privacy and owner_name and space_name:
                          msg = build_logic_set_space_privacy(hf_api_key, repo_id_to_set_privacy, change['private'])
                          action_status_messages.append(f"SET_PRIVACY: {msg}")
-                    else:
+                     else:
                          action_status_messages.append("SET_PRIVACY Error: Cannot set privacy, no Space currently loaded.")
                 elif change['type'] == 'CREATE_PR':
-                     # Ensure source is the currently loaded space
                      source_repo = f"{owner_name}/{space_name}" if owner_name and space_name else None
                      if source_repo and change.get('target_repo_id') and change.get('title'):
                           msg = build_logic_create_pull_request(hf_api_key, source_repo, change['target_repo_id'], change['title'], change.get('body', ''))
                           action_status_messages.append(f"CREATE_PR: {msg}")
                      else:
-                          action_status_messages.append("CREATE_PR Error: Source/Target repo, title, or body missing.")
+                          action_status_messages.append("CREATE_PR Error: Source/Target repo, title, or body missing or no Space loaded.")
                 elif change['type'] == 'ADD_COMMENT':
                      repo_id_to_comment = change.get('repo_id') or f"{owner_name}/{space_name}"
                      if repo_id_to_comment and owner_name and space_name and change.get('comment'):
@@ -802,7 +779,6 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
                 elif change['type'] == 'Error':
                      action_status_messages.append(f"Staging Error: {change.get('message', 'Unknown error')}")
 
-                # Collect file changes for the final commit
                 elif change['type'] in ['CREATE_FILE', 'UPDATE_FILE', 'DELETE_FILE']:
                     file_change_operations.append(change)
 
@@ -812,8 +788,6 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
                  import traceback
                  traceback.print_exc()
 
-
-        # Apply file changes if any were staged
         file_commit_status = ""
         if file_change_operations:
              if owner_name and space_name:
@@ -821,18 +795,18 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
              else:
                   file_commit_status = "File Commit Error: Cannot commit file changes, no Space currently loaded."
                   action_status_messages.append(file_commit_status)
+        else:
+             file_commit_status = "No file changes (create/update/delete) to commit."
 
 
-        # Combine all status messages
         final_overall_status = " | ".join(action_status_messages)
         if file_commit_status and file_commit_status != "No file changes (create/update/delete) to commit.":
             if final_overall_status: final_overall_status += " | "
             final_overall_status += file_commit_status
         if not final_overall_status: final_overall_status = "No operations were applied."
 
-        # After applying changes, reload the space state to reflect the actual state on the Hub
         _status_reload = f"{final_overall_status} | Reloading Space state..."
-        yield gr.update(value=_status_reload) # Update status
+        yield gr.update(value=_status_reload)
 
         refreshed_file_list = []
         reload_error = None
@@ -863,7 +837,6 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
             else:
                   iframe_update = gr.update(value=None, visible=False)
 
-            # Refresh runtime status as well
             runtime_status_update = handle_refresh_space_status(hf_api_key, owner_name, space_name)
 
 
@@ -908,6 +881,42 @@ 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):
+    _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...*")
+
+    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.*")
+        return
+
+    try:
+        user_info = build_logic_whoami(token=token)
+        owner_name = user_info.get('name')
+        if not owner_name: raise Exception("Could not find user name from token.")
+        _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}")
+            _status += f" | List Spaces Error: {list_err}"
+        else:
+            list_spaces_update = gr.update(value=list_spaces_md)
+
+        yield gr.update(value=_status), owner_update, list_spaces_update
+
+    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.*")
+
+
 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}..."
@@ -916,7 +925,8 @@ 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 = "*List of spaces will appear here.*"
+    _list_spaces_display_clear = gr.update() # Don't clear list spaces display on load, it's controlled by its own button
+    _target_owner_clear, _target_space_clear, _target_private_clear = gr.update(value=""), gr.update(value=""), gr.update(value=False)
 
 
     yield (
@@ -925,7 +935,7 @@ 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,
-        gr.update(value=_list_spaces_display_clear)
+        _list_spaces_display_clear, _target_owner_clear, _target_space_clear, _target_private_clear
     )
 
     owner_to_use = ui_owner_name
@@ -963,7 +973,7 @@ 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()
+            _download, gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
         )
         return
 
@@ -997,7 +1007,7 @@ 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()
+        _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()
     )
 
 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):
@@ -1032,9 +1042,6 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
          yield gr.update(value=_build_status),
          return
 
-    # Use apply_staged_file_changes and CREATE_SPACE action via confirm handler logic
-    # Or simulate the parts needed here directly? Direct call might be simpler for manual build.
-    # Let's use apply_staged_file_changes directly, but need to handle the CREATE_SPACE part separately first.
     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}"
@@ -1045,19 +1052,17 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
 
     build_status_messages = []
     try:
-        # Attempt to create/ensure space exists first
         api.create_repo(repo_id=repo_id_target, repo_type="space", space_sdk=space_sdk_select, private=is_private_ui, exist_ok=True)
         build_status_messages.append(f"CREATE_SPACE: Successfully created or ensured space [{repo_id_target}](https://huggingface.co/spaces/{repo_id_target}) exists.")
     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), 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), return
 
 
-    # Now apply file changes from the markdown content
     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]
     if file_changes_only_changeset:
         file_commit_status = apply_staged_file_changes(hf_api_key_ui, ui_owner_name_part, ui_space_name_part, file_changes_only_changeset)
@@ -1079,7 +1084,7 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
         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, gr.update() # Keep runtime status
+        gr.update(value=_formatted_md), gr.update(value=_detected_preview_val), _download_btn_update, gr.update()
     )
 
     sdk_built, file_list, err_list = get_space_repository_info(hf_api_key_ui, space_to_use, owner_to_use)
@@ -1207,7 +1212,7 @@ def handle_refresh_space_status(hf_api_key_ui, ui_owner_name, ui_space_name):
     status_details, err = get_space_runtime_status(hf_api_key_ui, ui_space_name, ui_owner_name)
     repo_info = None
     repo_info_err = None
-    if not err: # Only fetch repo info if runtime status succeeded (implies space exists)
+    if not err:
          sdk, file_list, repo_info_err = get_space_repository_info(hf_api_key_ui, ui_space_name, ui_owner_name)
          if not repo_info_err:
               repo_info = {"sdk": sdk, "file_count": len(file_list) if file_list is not None else 'N/A'}
@@ -1282,13 +1287,12 @@ 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}"
     target_repo_id = f"{target_owner}/{target_space_name}"
 
     status_msg = f"Attempting to duplicate `{source_repo_id}` to `{target_repo_id}`..."
-    # Yield initial status
     yield status_msg, gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
 
 
@@ -1296,7 +1300,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) # Update status
+    yield gr.update(value=_status_reload)
 
     new_owner = target_owner
     new_space_name = target_space_name
@@ -1305,7 +1309,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)
@@ -1317,6 +1321,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)
@@ -1382,6 +1387,8 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
                 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()
@@ -1494,7 +1501,7 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
     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 # Added outputs for potential state changes
+        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)
 
@@ -1510,7 +1517,7 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
         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 # Added outputs for List Spaces
+        list_spaces_display, target_owner_input, target_space_name_input, target_private_checkbox
     ]
     load_space_button.click(
         fn=handle_load_existing_space,
@@ -1518,6 +1525,9 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
         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,
@@ -1557,4 +1567,4 @@ with gr.Blocks(theme=custom_theme, css=custom_css) as demo:
 
 
 if __name__ == "__main__":
-    demo.launch(debug=False, mcp_server=True)
+    demo.launch(debug=False, mcp_server=True)