Update app.py

app.py

@@ -16,11 +16,14 @@ 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_changes,
+    apply_staged_file_changes, # Renamed to indicate it only handles files
     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_delete_space,
+    build_logic_create_pull_request,
+    build_logic_add_comment,
+    build_logic_like_space
 )
 
 from model_logic import (
@@ -77,8 +80,11 @@ Available commands:
 - `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.
+- `CREATE_PR <target_repo_id> --title "..." --body "..."`: Creates a Pull Request from the current space's main branch to the target repository (e.g., a model or dataset repo) main branch. Requires `--title` and `--body` arguments (quoted strings).
+- `ADD_COMMENT "Your comment text"`: Adds a comment to the currently loaded space. Requires a quoted string comment text.
+- `LIKE_SPACE`: Likes the currently loaded 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. Note that the `DUPLICATE_SPACE` command, if present, will override any other file or space actions in the same response.
+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. Actions other than file changes are executed sequentially before any file changes are committed.
 
 **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.
@@ -88,7 +94,7 @@ 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("&", "&").replace("<", "<").replace(">", ">")
+    return text.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
 
 def _infer_lang_from_filename(filename):
     if not filename: return "plaintext"
@@ -264,7 +270,6 @@ 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:
@@ -276,11 +281,9 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
              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]
@@ -289,7 +292,6 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
                 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:
@@ -302,29 +304,24 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
                 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
+            else:
                  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
+                 changeset = []
 
             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"]
 
@@ -355,6 +352,70 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
          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}")
+
+         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
+
+                 title_match = re.search(r'--title\s+"([^"]*)"', arg_string)
+                 if title_match: title = title_match.group(1)
+                 else: print("Warning: CREATE_PR missing --title argument.")
+
+                 body_match = re.search(r'--body\s+"([^"]*)"', arg_string)
+                 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
+                     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:
+                     print("Warning: CREATE_PR requires target_repo_id and --title.")
+                     changeset.append({"type": "Error", "message": "CREATE_PR action requires target_repo_id and --title arguments."})
+             except Exception as e:
+                 print(f"Error parsing CREATE_PR arguments: {e}")
+                 changeset.append({"type": "Error", "message": f"Error parsing CREATE_PR arguments: {e}"})
+
+
+         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
+                 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}'")
+
+                 if comment_text:
+                     changeset.append({"type": "ADD_COMMENT", "repo_id": f"{hf_owner_name}/{hf_repo_name}", "comment": comment_text})
+                     print(f"Staged ADD_COMMENT action on {hf_owner_name}/{hf_repo_name}")
+                 else:
+                      print("Warning: ADD_COMMENT requires comment text.")
+                      changeset.append({"type": "Error", "message": "ADD_COMMENT action requires comment text (in quotes)."})
+
+             except Exception as e:
+                 print(f"Error parsing ADD_COMMENT arguments: {e}")
+                 changeset.append({"type": "Error", "message": f"Error parsing ADD_COMMENT arguments: {e}"})
+
+
+         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}")
+             else:
+                 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
 
 
@@ -399,6 +460,18 @@ def generate_and_stage_changes(ai_response_content, current_files_state, hf_owne
                      md_summary.append(f"- **🔒 Set Privacy:** Set `{change.get('repo_id', '...')}` to `private={change.get('private', False)}`")
                  elif change["type"] == "DELETE_SPACE":
                      md_summary.append(f"- **💥 DELETE ENTIRE SPACE:** `{change.get('owner', '...')}/{change.get('space_name', '...')}` **(DESTRUCTIVE ACTION)**")
+                 elif change["type"] == "CREATE_PR":
+                     md_summary.append(f"- **🤝 Create Pull Request:** From `{change.get('source_repo_id', '...')}` to `{change.get('target_repo_id', '...')}`")
+                     md_summary.append(f"  - Title: `{change.get('title', '...')}`")
+                     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
+                 elif change["type"] == "LIKE_SPACE":
+                      md_summary.append(f"- **👍 Like Space:** `{change.get('repo_id', '...')}`")
+                 elif change["type"] == "Error":
+                      md_summary.append(f"- **❌ Staging Error:** {change.get('message', 'Unknown error')}")
+
              md_summary.append("")
 
         if file_changes:
@@ -525,17 +598,22 @@ 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
 
     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_type = changeset[0].get('type') if changeset else None
-    is_exclusive_action = first_action_type == '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'
+
 
-    if is_exclusive_action:
-        change = changeset[0]
+    if is_exclusive_duplicate:
+        change = first_action
         if change.get("source_repo_id") and change.get("target_repo_id"):
             status_message = build_logic_duplicate_space(
                 hf_api_key=hf_api_key,
@@ -545,21 +623,27 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
             )
             # 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...*")
+            yield gr.update(value=_status_reload) # Update status
 
             # 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
+            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: new_owner = None # Cannot auto-detect
+                 if token_err:
+                     print(f"Error getting token for new owner determination: {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
+                    except Exception as e:
+                         print(f"Error auto-detecting owner from token for new space: {e}")
+                         new_owner = None
 
-            # Trigger the load logic for the new space
+
+            # Trigger the load logic for the new space if owner and name are available
             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}"
@@ -577,29 +661,42 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
                 _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)
+                     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)
 
+                # 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
+                )
 
             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
+                 # 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
+                 )
 
 
         else:
@@ -607,27 +704,136 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
              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: # Not an exclusive action, proceed with standard apply_staged_changes
-        status_message = apply_staged_changes(hf_api_key, owner_name, space_name, changeset)
-
-        _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...*")
+             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(), gr.update(), gr.update()
+             )
+
+    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
+         current_repo_id = f"{owner_name}/{space_name}" if owner_name and space_name else None
+
+         if not delete_repo_id_target or delete_repo_id_target != current_repo_id:
+             final_overall_status = f"DELETE_SPACE Error: Action blocked. Cannot delete '{delete_repo_id_target}'. Only deletion of the currently loaded space ('{current_repo_id}') is permitted via AI action."
+             print(f"Blocked DELETE_SPACE action via confirm: requested '{delete_repo_id_target}', current '{current_repo_id}'.")
+         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
+                  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)
+
+
+         cleared_changeset = []
+         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),
+             cleared_changeset, gr.update(value="*No changes proposed.*"),
+             owner_update, space_update, file_browser_update, iframe_update, runtime_status_update
+         )
+
+
+    else: # Not an exclusive action, process other actions and file changes sequentially
+
+        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))
+                         action_status_messages.append(f"CREATE_SPACE: {msg}")
+                    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
+                         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:
+                         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.")
+                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'):
+                          msg = build_logic_add_comment(hf_api_key, repo_id_to_comment, change['comment'])
+                          action_status_messages.append(f"ADD_COMMENT: {msg}")
+                     else:
+                          action_status_messages.append("ADD_COMMENT Error: Cannot add comment, no Space loaded or comment text missing.")
+                elif change['type'] == 'LIKE_SPACE':
+                     repo_id_to_like = change.get('repo_id') or f"{owner_name}/{space_name}"
+                     if repo_id_to_like and owner_name and space_name:
+                          msg = build_logic_like_space(hf_api_key, repo_id_to_like)
+                          action_status_messages.append(f"LIKE_SPACE: {msg}")
+                     else:
+                          action_status_messages.append("LIKE_SPACE Error: Cannot like space, no Space currently loaded.")
+                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)
+
+            except Exception as e:
+                 action_status_messages.append(f"Error processing action {change.get('type', 'Unknown')}: {e}")
+                 print(f"Error processing action {change.get('type', 'Unknown')}: {e}")
+                 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:
+                  file_commit_status = apply_staged_file_changes(hf_api_key, owner_name, space_name, file_change_operations)
+             else:
+                  file_commit_status = "File Commit Error: Cannot commit file changes, no Space currently loaded."
+                  action_status_messages.append(file_commit_status)
+
+
+        # 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
 
         refreshed_file_list = []
         reload_error = None
@@ -649,9 +855,7 @@ def handle_confirm_changes(hf_api_key, owner_name, space_name, changeset):
                     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'
@@ -660,28 +864,29 @@ 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)
+
+
         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)
+            runtime_status_update = gr.update(value="*Runtime status unavailable after reload failure.*")
 
 
         _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.")
+        final_overall_status_with_reload = final_overall_status + (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
+            gr.update(value=final_overall_status_with_reload),
+            gr.update(value=_formatted), gr.update(value=_detected), _download,
+            gr.update(visible=False), gr.update(visible=False), gr.update(visible=False),
+            cleared_changeset, gr.update(value="*No changes proposed.*"),
+            gr.update(), gr.update(), file_browser_update, iframe_update, runtime_status_update
         )
 
 
@@ -708,35 +913,34 @@ 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 = "*Manual build status...*", "*Select a file...*", "*Runtime status...*"
+    _build_status_clear, _edit_status_clear, _runtime_status_clear = "*Manual build status...*", "*Select a file...*", "*Runtime/Repo status will appear here.*"
     _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.*"
 
 
-    # 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,
-        gr.update(), gr.update(), gr.update() # For list spaces updates
+        gr.update(value=_list_spaces_display_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), # Only update status on early error
+        yield gr.update(value=_status_val),
         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)...") # Update owner and status
+            yield gr.update(value=owner_to_use), gr.update(value=f"Loading Space: {owner_to_use}/{ui_space_name} (Auto-detected owner)...")
         except Exception as e:
             _status_val = f"Load Error: Error auto-detecting owner: {e}"
             yield gr.update(value=_status_val),
@@ -749,7 +953,6 @@ 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
     yield gr.update(value=owner_to_use), gr.update(value=ui_space_name),
 
     if err:
@@ -761,7 +964,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(), gr.update(), gr.update()
+            _download, gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
         )
         return
 
@@ -788,17 +991,14 @@ 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),
         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()
+        _download, gr.update(), gr.update(), gr.update(value=runtime_status_md), 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):
@@ -809,14 +1009,14 @@ 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)
 
-    yield (_build_status, _iframe_html, _file_browser_update, gr.update(value=ui_owner_name_part), gr.update(value=ui_space_name_part),
+    yield (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())
+           gr.update(), gr.update(), gr.update(), gr.update())
 
 
     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), # Only update status
+        yield gr.update(value=_build_status),
         return
 
     parsed_content = build_logic_parse_markdown(formatted_markdown_content)
@@ -833,8 +1033,42 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
          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}"
+    # 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}"
+         yield gr.update(value=_build_status),
+         return
+    api = HfApi(token=token)
+    repo_id_target = f"{ui_owner_name_part}/{ui_space_name_part}"
+
+    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
+    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
+
+
+    # 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)
+        build_status_messages.append(file_commit_status)
+    else:
+         build_status_messages.append("No files parsed from markdown to upload/update.")
+
+
+    _build_status = " | ".join(build_status_messages)
+
 
     owner_to_use = ui_owner_name_part
     space_to_use = ui_space_name_part
@@ -846,7 +1080,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(value=_formatted_md), gr.update(value=_detected_preview_val), _download_btn_update, gr.update() # Keep runtime status
     )
 
     sdk_built, file_list, err_list = get_space_repository_info(hf_api_key_ui, space_to_use, owner_to_use)
@@ -876,12 +1110,8 @@ def handle_build_space_button(hf_api_key_ui, ui_space_name_part, ui_owner_name_p
         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)
-
-    # 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)
 
-
     yield (
         gr.update(value=_build_status), _iframe_html_update, _file_browser_update,
         gr.update(value=owner_to_use), gr.update(value=space_to_use),
@@ -976,30 +1206,44 @@ def handle_refresh_space_status(hf_api_key_ui, ui_owner_name, ui_space_name):
         return "**Status Error:** Owner and Space Name must be provided to get status."
 
     status_details, err = get_space_runtime_status(hf_api_key_ui, ui_space_name, ui_owner_name)
-    if err: return f"**Status Error:** {err}"
-    if not status_details: return "*Could not retrieve status details.*"
-
-    md = f"### Status for {ui_owner_name}/{ui_space_name}\n"
-    md += f"- **Stage:** `{status_details.get('stage', 'N/A')}`\n"
-    md += f"- **Status:** `{status_details.get('status', 'N/A')}`\n"
-    md += f"- **Hardware:** `{status_details.get('hardware', 'N/A')}`\n"
-    requested_hw = status_details.get('requested_hardware')
-    if requested_hw: md += f"- **Requested Hardware:** `{requested_hw}`\n"
-    error_msg = status_details.get('error_message')
-    if error_msg: md += f"- **Error:** `{escape_html_for_markdown(error_msg)}`\n"
-    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)
+    repo_info = None
+    repo_info_err = None
+    if not err: # Only fetch repo info if runtime status succeeded (implies space exists)
+         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'}
+
+
+    md_lines = []
+    md_lines.append(f"### Status for {ui_owner_name}/{ui_space_name}\n")
+
+    if err:
+        md_lines.append(f"- **Runtime Status Error:** {err}\n")
+    elif not status_details:
+        md_lines.append("*Could not retrieve runtime status details.*\n")
+    else:
+        md_lines.append(f"- **Stage:** `{status_details.get('stage', 'N/A')}`\n")
+        md_lines.append(f"- **Status:** `{status_details.get('status', 'N/A')}`\n")
+        md_lines.append(f"- **Hardware:** `{status_details.get('hardware', 'N/A')}`\n")
+        requested_hw = status_details.get('requested_hardware')
+        if requested_hw: md_lines.append(f"- **Requested Hardware:** `{requested_hw}`\n")
+        error_msg = status_details.get('error_message')
+        if error_msg: md_lines.append(f"- **Error:** `{escape_html_for_markdown(error_msg)}`\n")
+        log_link = status_details.get('full_log_link')
+        if log_link and log_link != "#": md_lines.append(f"- [View Full Logs]({log_link})\n")
+
+    md_lines.append("---")
+    md_lines.append("### Repository Info\n")
     if repo_info_err:
-         md += f"- **Repo Info Error:** {repo_info_err}\n"
+         md_lines.append(f"- **Repo Info Error:** {repo_info_err}\n")
+    elif repo_info:
+         md_lines.append(f"- **SDK:** `{repo_info.get('sdk', 'N/A')}`\n")
+         md_lines.append(f"- **File Count:** `{repo_info.get('file_count', 'N/A')}`\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
+         md_lines.append("*Could not retrieve repository info.*")
 
-    return md
+
+    return "\n".join(md_lines)
 
 def handle_list_spaces(hf_api_key_ui, ui_owner_name):
     token, token_err = build_logic_get_api_token(hf_api_key_ui)
@@ -1033,38 +1277,36 @@ def handle_list_spaces(hf_api_key_ui, ui_owner_name):
     return md
 
 def handle_manual_duplicate_space(hf_api_key_ui, source_owner, source_space_name, target_owner, target_space_name, target_private):
-    global parsed_code_blocks_state_cache
     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()
+        return "Duplicate Error: Please load a Space first to duplicate.", gr.update(), gr.update(), 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()
+        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()
+         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()
 
 
     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
+    # Yield initial status
+    yield status_msg, gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
+
 
     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()
+    yield gr.update(value=_status_reload) # Update status
 
-    # 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
+    new_owner = target_owner
+    new_space_name = 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)
@@ -1076,6 +1318,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)
@@ -1087,22 +1330,19 @@ def handle_manual_duplicate_space(hf_api_key_ui, source_owner, source_space_name
         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,
+    yield (
+        gr.update(value=final_overall_status),
         owner_update, space_update,
-        _formatted, _detected, _download,
+        gr.update(value=_formatted), gr.update(value=_detected), _download,
         _file_browser_update, _iframe_html_update, gr.update(value=runtime_status_md)
     )
 
@@ -1252,12 +1492,11 @@ 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,
-        owner_name_input, space_name_input, file_browser_dropdown, space_iframe_display # Added outputs for DUPLICATE_SPACE load
+        owner_name_input, space_name_input, file_browser_dropdown, space_iframe_display, space_runtime_status_display # Added outputs for potential state changes
     ]
     confirm_button.click(handle_confirm_changes, inputs=confirm_inputs, outputs=confirm_outputs)
 
@@ -1267,14 +1506,13 @@ 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,
-        target_owner_input, target_space_name_input, target_private_checkbox # Added outputs for List Spaces
+        list_spaces_display # Added outputs for List Spaces
     ]
     load_space_button.click(
         fn=handle_load_existing_space,
@@ -1282,12 +1520,11 @@ 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, space_runtime_status_display # Added runtime status output
+        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,
@@ -1310,16 +1547,14 @@ 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
+        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 logic
     list_spaces_button.click(fn=handle_list_spaces, inputs=[hf_api_key_input, owner_name_input], outputs=[list_spaces_display])