From 864bade7c61314c850b2b37d6235a60ab3baa9c5 Mon Sep 17 00:00:00 2001
From: tw93 <tw93@qq.com>
Date: Mon, 26 Jan 2026 15:22:16 +0800
Subject: [PATCH] fix: improve uninstall guidance and timeouts

---
 lib/uninstall/batch.sh | 20 +++++++++++++++-----
 lib/uninstall/brew.sh  | 14 +++++++++++++-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/lib/uninstall/batch.sh b/lib/uninstall/batch.sh
index 2bbc2df..dba6e55 100755
--- a/lib/uninstall/batch.sh
+++ b/lib/uninstall/batch.sh
@@ -455,22 +455,32 @@ batch_uninstall_applications() {
                 else
                     # Fallback to manual removal if brew fails
                     if [[ "$needs_sudo" == true ]]; then
-                        safe_sudo_remove "$app_path" || reason="remove failed"
+                        if ! safe_sudo_remove "$app_path"; then
+                            reason="brew failed, manual removal failed"
+                        fi
                     else
-                        safe_remove "$app_path" true || reason="remove failed"
+                        if ! safe_remove "$app_path" true; then
+                            reason="brew failed, manual removal failed"
+                        fi
                     fi
                 fi
             elif [[ "$needs_sudo" == true ]]; then
                 if ! safe_sudo_remove "$app_path"; then
                     local app_owner=$(get_file_owner "$app_path")
                     if [[ -n "$app_owner" && "$app_owner" != "$current_user" && "$app_owner" != "root" ]]; then
-                        reason="owned by $app_owner"
+                        reason="owned by $app_owner, try 'sudo chown $(whoami) \"$app_path\"'"
                     else
-                        reason="permission denied"
+                        reason="permission denied, try 'mole touchid' for passwordless sudo"
                     fi
                 fi
             else
-                safe_remove "$app_path" true || reason="remove failed"
+                if ! safe_remove "$app_path" true; then
+                    if [[ ! -w "$(dirname "$app_path")" ]]; then
+                        reason="parent directory not writable"
+                    else
+                        reason="remove failed, check permissions"
+                    fi
+                fi
             fi
         fi
 
diff --git a/lib/uninstall/brew.sh b/lib/uninstall/brew.sh
index 91f9627..93cf65b 100644
--- a/lib/uninstall/brew.sh
+++ b/lib/uninstall/brew.sh
@@ -183,9 +183,21 @@ brew_uninstall_cask() {
     local uninstall_ok=false
     local brew_exit=0
 
+    # Calculate timeout based on app size (large apps need more time)
+    local timeout=300  # Default 5 minutes
+    if [[ -n "$app_path" && -d "$app_path" ]]; then
+        local size_gb=$(($(get_path_size_kb "$app_path") / 1048576))
+        if [[ $size_gb -gt 15 ]]; then
+            timeout=900  # 15 minutes for very large apps (Xcode, Adobe, etc.)
+        elif [[ $size_gb -gt 5 ]]; then
+            timeout=600  # 10 minutes for large apps
+        fi
+        debug_log "App size: ${size_gb}GB, timeout: ${timeout}s"
+    fi
+
     # Run with timeout to prevent hangs from problematic cask scripts
     if HOMEBREW_NO_ENV_HINTS=1 HOMEBREW_NO_AUTO_UPDATE=1 NONINTERACTIVE=1 \
-        run_with_timeout 300 brew uninstall --cask "$cask_name" 2>&1; then
+        run_with_timeout "$timeout" brew uninstall --cask "$cask_name" 2>&1; then
         uninstall_ok=true
     else
         brew_exit=$?