merge main into bug-403

lib/clean/apps.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 # Application Data Cleanup Module
 set -euo pipefail
+
+readonly ORPHAN_AGE_THRESHOLD=${ORPHAN_AGE_THRESHOLD:-${MOLE_ORPHAN_AGE_DAYS:-60}}
 # Args: $1=target_dir, $2=label
 clean_ds_store_tree() {
     local target="$1"
@@ -282,9 +284,21 @@ clean_orphaned_app_data() {
             file_patterns+=("$base_path/$pat")
         done
         if [[ ${#file_patterns[@]} -gt 0 ]]; then
+            local _nullglob_state
+            _nullglob_state=$(shopt -p nullglob || true)
+            shopt -s nullglob
             for item_path in "${file_patterns[@]}"; do
                 local iteration_count=0
-                for match in $item_path; do
+                local old_ifs=$IFS
+                IFS=$'\n'
+                local -a matches=()
+                # shellcheck disable=SC2206
+                matches=($item_path)
+                IFS=$old_ifs
+                if [[ ${#matches[@]} -eq 0 ]]; then
+                    continue
+                fi
+                for match in "${matches[@]}"; do
                     [[ -e "$match" ]] || continue
                     ((iteration_count++))
                     if [[ $iteration_count -gt $MOLE_MAX_ORPHAN_ITERATIONS ]]; then
@@ -299,12 +313,14 @@ clean_orphaned_app_data() {
                         if [[ -z "$size_kb" || "$size_kb" == "0" ]]; then
                             continue
                         fi
-                        safe_clean "$match" "Orphaned $label: $bundle_id"
-                        ((orphaned_count++))
-                        ((total_orphaned_kb += size_kb))
+                        if safe_clean "$match" "Orphaned $label: $bundle_id"; then
+                            ((orphaned_count++))
+                            ((total_orphaned_kb += size_kb))
+                        fi
                     fi
                 done
             done
+            eval "$_nullglob_state"
         fi
     done
     stop_section_spinner
@@ -517,3 +533,197 @@ clean_orphaned_system_services() {
     fi
 
 }
+
+# ============================================================================
+# Orphaned LaunchAgent/LaunchDaemon Cleanup (Generic Detection)
+# ============================================================================
+
+# Extract program path from plist (supports both ProgramArguments and Program)
+_extract_program_path() {
+    local plist="$1"
+    local program=""
+
+    program=$(plutil -extract ProgramArguments.0 raw "$plist" 2> /dev/null)
+    if [[ -z "$program" ]]; then
+        program=$(plutil -extract Program raw "$plist" 2> /dev/null)
+    fi
+
+    echo "$program"
+}
+
+# Extract associated bundle identifier from plist
+_extract_associated_bundle() {
+    local plist="$1"
+    local associated=""
+
+    # Try array format first
+    associated=$(plutil -extract AssociatedBundleIdentifiers.0 raw "$plist" 2> /dev/null)
+    if [[ -z "$associated" ]] || [[ "$associated" == "1" ]]; then
+        # Try string format
+        associated=$(plutil -extract AssociatedBundleIdentifiers raw "$plist" 2> /dev/null)
+        # Filter out dict/array markers
+        if [[ "$associated" == "{"* ]] || [[ "$associated" == "["* ]]; then
+            associated=""
+        fi
+    fi
+
+    echo "$associated"
+}
+
+# Check if a LaunchAgent/LaunchDaemon is orphaned using multi-layer verification
+# Returns 0 if orphaned, 1 if not orphaned
+is_launch_item_orphaned() {
+    local plist="$1"
+
+    # Layer 1: Check if program path exists
+    local program=$(_extract_program_path "$plist")
+
+    # No program path - skip (not a standard launch item)
+    [[ -z "$program" ]] && return 1
+
+    # Program exists -> not orphaned
+    [[ -e "$program" ]] && return 1
+
+    # Layer 2: Check AssociatedBundleIdentifiers
+    local associated=$(_extract_associated_bundle "$plist")
+    if [[ -n "$associated" ]]; then
+        # Check if associated app exists via mdfind
+        if run_with_timeout 2 mdfind "kMDItemCFBundleIdentifier == '$associated'" 2> /dev/null | head -1 | grep -q .; then
+            return 1 # Associated app found -> not orphaned
+        fi
+
+        # Extract vendor name from bundle ID (com.vendor.app -> vendor)
+        local vendor=$(echo "$associated" | cut -d'.' -f2)
+        if [[ -n "$vendor" ]] && [[ ${#vendor} -ge 3 ]]; then
+            # Check if any app from this vendor exists
+            if find /Applications ~/Applications -maxdepth 2 -iname "*${vendor}*" -type d 2> /dev/null | grep -iq "\.app"; then
+                return 1 # Vendor app exists -> not orphaned
+            fi
+        fi
+    fi
+
+    # Layer 3: Check Application Support directory activity
+    if [[ "$program" =~ /Library/Application\ Support/([^/]+)/ ]]; then
+        local app_support_name="${BASH_REMATCH[1]}"
+
+        # Check both user and system Application Support
+        for base in "$HOME/Library/Application Support" "/Library/Application Support"; do
+            local support_path="$base/$app_support_name"
+            if [[ -d "$support_path" ]]; then
+                # Check if there are files modified in last 7 days (active usage)
+                local recent_file=$(find "$support_path" -type f -mtime -7 2> /dev/null | head -1)
+                if [[ -n "$recent_file" ]]; then
+                    return 1 # Active Application Support -> not orphaned
+                fi
+            fi
+        done
+    fi
+
+    # Layer 4: Check if app name from program path exists
+    if [[ "$program" =~ /Applications/([^/]+)\.app/ ]]; then
+        local app_name="${BASH_REMATCH[1]}"
+        # Look for apps with similar names (case-insensitive)
+        if find /Applications ~/Applications -maxdepth 2 -iname "*${app_name}*" -type d 2> /dev/null | grep -iq "\.app"; then
+            return 1 # Similar app exists -> not orphaned
+        fi
+    fi
+
+    # Layer 5: PrivilegedHelper special handling
+    if [[ "$program" =~ ^/Library/PrivilegedHelperTools/ ]]; then
+        local filename=$(basename "$plist")
+        local bundle_id="${filename%.plist}"
+
+        # Extract app hint from bundle ID (com.vendor.app.helper -> vendor)
+        local app_hint=$(echo "$bundle_id" | sed 's/com\.//; s/\..*helper.*//')
+
+        if [[ -n "$app_hint" ]] && [[ ${#app_hint} -ge 3 ]]; then
+            # Look for main app
+            if find /Applications ~/Applications -maxdepth 2 -iname "*${app_hint}*" -type d 2> /dev/null | grep -iq "\.app"; then
+                return 1 # Helper's main app exists -> not orphaned
+            fi
+        fi
+    fi
+
+    # All checks failed -> likely orphaned
+    return 0
+}
+
+# Clean orphaned user-level LaunchAgents
+# Only processes ~/Library/LaunchAgents (safer than system-level)
+clean_orphaned_launch_agents() {
+    local launch_agents_dir="$HOME/Library/LaunchAgents"
+
+    [[ ! -d "$launch_agents_dir" ]] && return 0
+
+    start_section_spinner "Scanning orphaned launch agents..."
+
+    local -a orphaned_items=()
+    local total_orphaned_kb=0
+
+    # Scan user LaunchAgents
+    while IFS= read -r -d '' plist; do
+        local filename=$(basename "$plist")
+
+        # Skip Apple's LaunchAgents
+        [[ "$filename" == com.apple.* ]] && continue
+
+        local bundle_id="${filename%.plist}"
+
+        # Check if orphaned using multi-layer verification
+        if is_launch_item_orphaned "$plist"; then
+            local size_kb=$(get_path_size_kb "$plist")
+            orphaned_items+=("$bundle_id|$plist")
+            ((total_orphaned_kb += size_kb))
+        fi
+    done < <(find "$launch_agents_dir" -maxdepth 1 -name "*.plist" -print0 2> /dev/null)
+
+    stop_section_spinner
+
+    local orphaned_count=${#orphaned_items[@]}
+
+    if [[ $orphaned_count -eq 0 ]]; then
+        return 0
+    fi
+
+    # Clean the orphaned items automatically
+    local removed_count=0
+    local dry_run_count=0
+    local is_dry_run=false
+    if [[ "${MOLE_DRY_RUN:-0}" == "1" ]]; then
+        is_dry_run=true
+    fi
+    for item in "${orphaned_items[@]}"; do
+        IFS='|' read -r bundle_id plist_path <<< "$item"
+
+        if [[ "$is_dry_run" == "true" ]]; then
+            ((dry_run_count++))
+            log_operation "clean" "DRY_RUN" "$plist_path" "orphaned launch agent"
+            continue
+        fi
+
+        # Try to unload first (if currently loaded)
+        launchctl unload "$plist_path" 2> /dev/null || true
+
+        # Remove the plist file
+        if safe_remove "$plist_path" false; then
+            ((removed_count++))
+            log_operation "clean" "REMOVED" "$plist_path" "orphaned launch agent"
+        else
+            log_operation "clean" "FAILED" "$plist_path" "permission denied"
+        fi
+    done
+
+    if [[ "$is_dry_run" == "true" ]]; then
+        if [[ $dry_run_count -gt 0 ]]; then
+            local cleaned_mb=$(echo "$total_orphaned_kb" | awk '{printf "%.1f", $1/1024}')
+            echo "  ${YELLOW}${ICON_DRY_RUN}${NC} Would remove $dry_run_count orphaned launch agent(s), ${cleaned_mb}MB"
+            note_activity
+        fi
+    else
+        if [[ $removed_count -gt 0 ]]; then
+            local cleaned_mb=$(echo "$total_orphaned_kb" | awk '{printf "%.1f", $1/1024}')
+            echo "  ${GREEN}${ICON_SUCCESS}${NC} Removed $removed_count orphaned launch agent(s), ${cleaned_mb}MB"
+            note_activity
+        fi
+    fi
+}

lib/clean/dev.sh

@@ -207,9 +207,8 @@ clean_dev_mobile() {
     safe_clean ~/.cache/swift-package-manager/* "Swift package manager cache"
 }
 # JVM ecosystem caches.
+# Gradle excluded (default whitelist, like Maven). Remove via: mo clean --whitelist
 clean_dev_jvm() {
-    safe_clean ~/.gradle/caches/* "Gradle caches"
-    safe_clean ~/.gradle/daemon/* "Gradle daemon logs"
     safe_clean ~/.sbt/* "SBT cache"
     safe_clean ~/.ivy2/cache/* "Ivy cache"
 }

lib/clean/system.sh

@@ -5,19 +5,47 @@ set -euo pipefail
 clean_deep_system() {
     stop_section_spinner
     local cache_cleaned=0
-    safe_sudo_find_delete "/Library/Caches" "*.cache" "$MOLE_TEMP_FILE_AGE_DAYS" "f" && cache_cleaned=1 || true
-    safe_sudo_find_delete "/Library/Caches" "*.tmp" "$MOLE_TEMP_FILE_AGE_DAYS" "f" && cache_cleaned=1 || true
-    safe_sudo_find_delete "/Library/Caches" "*.log" "$MOLE_LOG_AGE_DAYS" "f" && cache_cleaned=1 || true
+    # Optimized: Single pass for /Library/Caches (3 patterns in 1 scan)
+    if sudo test -d "/Library/Caches" 2> /dev/null; then
+        while IFS= read -r -d '' file; do
+            if should_protect_path "$file"; then
+                continue
+            fi
+            if safe_sudo_remove "$file"; then
+                cache_cleaned=1
+            fi
+        done < <(sudo find "/Library/Caches" -maxdepth 5 -type f \( \
+            \( -name "*.cache" -mtime "+$MOLE_TEMP_FILE_AGE_DAYS" \) -o \
+            \( -name "*.tmp" -mtime "+$MOLE_TEMP_FILE_AGE_DAYS" \) -o \
+            \( -name "*.log" -mtime "+$MOLE_LOG_AGE_DAYS" \) \
+            \) -print0 2> /dev/null || true)
+    fi
     [[ $cache_cleaned -eq 1 ]] && log_success "System caches"
+    start_section_spinner "Cleaning system temporary files..."
     local tmp_cleaned=0
     safe_sudo_find_delete "/private/tmp" "*" "${MOLE_TEMP_FILE_AGE_DAYS}" "f" && tmp_cleaned=1 || true
     safe_sudo_find_delete "/private/var/tmp" "*" "${MOLE_TEMP_FILE_AGE_DAYS}" "f" && tmp_cleaned=1 || true
+    stop_section_spinner
     [[ $tmp_cleaned -eq 1 ]] && log_success "System temp files"
+    start_section_spinner "Cleaning system crash reports..."
     safe_sudo_find_delete "/Library/Logs/DiagnosticReports" "*" "$MOLE_CRASH_REPORT_AGE_DAYS" "f" || true
+    stop_section_spinner
     log_success "System crash reports"
-    safe_sudo_find_delete "/private/var/log" "*.log" "$MOLE_LOG_AGE_DAYS" "f" || true
-    safe_sudo_find_delete "/private/var/log" "*.gz" "$MOLE_LOG_AGE_DAYS" "f" || true
+    start_section_spinner "Cleaning system logs..."
+    # Optimized: Single pass for /private/var/log (2 patterns in 1 scan)
+    if sudo test -d "/private/var/log" 2> /dev/null; then
+        while IFS= read -r -d '' file; do
+            if should_protect_path "$file"; then
+                continue
+            fi
+            safe_sudo_remove "$file" || true
+        done < <(sudo find "/private/var/log" -maxdepth 5 -type f \( \
+            -name "*.log" -o -name "*.gz" \
+            \) -mtime "+$MOLE_LOG_AGE_DAYS" -print0 2> /dev/null || true)
+    fi
+    stop_section_spinner
     log_success "System logs"
+    start_section_spinner "Scanning system library updates..."
     if [[ -d "/Library/Updates" && ! -L "/Library/Updates" ]]; then
         local updates_cleaned=0
         while IFS= read -r -d '' item; do
@@ -34,8 +62,12 @@ clean_deep_system() {
                 ((updates_cleaned++))
             fi
         done < <(find /Library/Updates -mindepth 1 -maxdepth 1 -print0 2> /dev/null || true)
+        stop_section_spinner
         [[ $updates_cleaned -gt 0 ]] && log_success "System library updates"
+    else
+        stop_section_spinner
     fi
+    start_section_spinner "Scanning macOS installer files..."
     if [[ -d "/macOS Install Data" ]]; then
         local mtime=$(get_file_mtime "/macOS Install Data")
         local age_days=$((($(get_epoch_seconds) - mtime) / 86400))
@@ -81,6 +113,7 @@ clean_deep_system() {
             fi
         fi
     done
+    stop_section_spinner
     [[ $installer_cleaned -gt 0 ]] && debug_log "Cleaned $installer_cleaned macOS installer(s)"
     start_section_spinner "Scanning system caches..."
     local code_sign_cleaned=0
@@ -107,23 +140,54 @@ clean_deep_system() {
     stop_section_spinner
     [[ $code_sign_cleaned -gt 0 ]] && log_success "Browser code signature caches, $code_sign_cleaned items"
 
-    start_section_spinner "Cleaning system diagnostic logs..."
-    local diag_cleaned=0
-    safe_sudo_find_delete "/private/var/db/diagnostics/Special" "*" "$MOLE_LOG_AGE_DAYS" "f" && diag_cleaned=1 || true
-    safe_sudo_find_delete "/private/var/db/diagnostics/Persist" "*" "$MOLE_LOG_AGE_DAYS" "f" && diag_cleaned=1 || true
-    safe_sudo_find_delete "/private/var/db/DiagnosticPipeline" "*" "$MOLE_LOG_AGE_DAYS" "f" && diag_cleaned=1 || true
-    safe_sudo_find_delete "/private/var/db/powerlog" "*" "$MOLE_LOG_AGE_DAYS" "f" && diag_cleaned=1 || true
-    safe_sudo_find_delete "/private/var/db/reportmemoryexception/MemoryLimitViolations" "*" "30" "f" && diag_cleaned=1 || true
-    stop_section_spinner
+    # Optimized: Single pass for diagnostics directory (Special + Persist + tracev3)
+    # Replaces 4 separate find operations with 1 combined operation
+    local diag_base="/private/var/db/diagnostics"
+    if sudo test -d "$diag_base" 2> /dev/null; then
+        while IFS= read -r -d '' file; do
+            if should_protect_path "$file"; then
+                continue
+            fi
+            safe_sudo_remove "$file" || true
+        done < <(sudo find "$diag_base" -maxdepth 5 -type f \( \
+            \( -mtime "+$MOLE_LOG_AGE_DAYS" \) -o \
+            \( -name "*.tracev3" -mtime +30 \) \
+            \) -print0 2> /dev/null || true)
+    fi
+    safe_sudo_find_delete "/private/var/db/DiagnosticPipeline" "*" "$MOLE_LOG_AGE_DAYS" "f" || true
+    log_success "System diagnostic logs"
+    safe_sudo_find_delete "/private/var/db/powerlog" "*" "$MOLE_LOG_AGE_DAYS" "f" || true
+    log_success "Power logs"
+    start_section_spinner "Cleaning memory exception reports..."
+    local mem_reports_dir="/private/var/db/reportmemoryexception/MemoryLimitViolations"
+    if sudo test -d "$mem_reports_dir" 2> /dev/null; then
+        # Count and size old files before deletion
+        local file_count=0
+        local total_size_kb=0
+        while IFS= read -r -d '' file; do
+            ((file_count++))
+            local file_size
+            file_size=$(sudo stat -f%z "$file" 2> /dev/null || echo "0")
+            ((total_size_kb += file_size / 1024))
+        done < <(sudo find "$mem_reports_dir" -type f -mtime +30 -print0 2> /dev/null || true)
 
-    [[ $diag_cleaned -eq 1 ]] && log_success "System diagnostic logs"
-
-    start_section_spinner "Cleaning diagnostic trace logs..."
-    local trace_cleaned=0
-    safe_sudo_find_delete "/private/var/db/diagnostics/Persist" "*.tracev3" "30" "f" && trace_cleaned=1 || true
-    safe_sudo_find_delete "/private/var/db/diagnostics/Special" "*.tracev3" "30" "f" && trace_cleaned=1 || true
+        # For directories with many files, use find -delete for performance
+        if [[ "$file_count" -gt 0 ]]; then
+            if [[ "${MOLE_DRY_RUN:-0}" != "1" ]]; then
+                sudo find "$mem_reports_dir" -type f -mtime +30 -delete 2> /dev/null || true
+                # Log summary to operations.log
+                if oplog_enabled && [[ "$total_size_kb" -gt 0 ]]; then
+                    local size_human
+                    size_human=$(bytes_to_human "$((total_size_kb * 1024))")
+                    log_operation "[clean] REMOVED $mem_reports_dir ($file_count files, $size_human)"
+                fi
+            else
+                log_info "[DRY-RUN] Would remove $file_count old memory exception reports ($total_size_kb KB)"
+            fi
+        fi
+    fi
     stop_section_spinner
-    [[ $trace_cleaned -eq 1 ]] && log_success "System diagnostic trace logs"
+    log_success "Memory exception reports"
 }
 # Incomplete Time Machine backups.
 clean_time_machine_failed_backups() {
@@ -304,15 +368,18 @@ clean_local_snapshots() {
         return 0
     fi
 
+    start_section_spinner "Checking Time Machine status..."
     local rc_running=0
     tm_is_running || rc_running=$?
 
     if [[ $rc_running -eq 2 ]]; then
+        stop_section_spinner
         echo -e "  ${YELLOW}!${NC} Could not determine Time Machine status; skipping snapshot check"
         return 0
     fi
 
     if [[ $rc_running -eq 0 ]]; then
+        stop_section_spinner
         echo -e "  ${YELLOW}!${NC} Time Machine is active; skipping snapshot check"
         return 0
     fi

lib/core/app_protection.sh

@@ -707,7 +707,13 @@ should_protect_data() {
             ;;
     esac
 
-    # Most apps won't match, return early
+    # Fallback: check against the full DATA_PROTECTED_BUNDLES list
+    for pattern in "${DATA_PROTECTED_BUNDLES[@]}"; do
+        if bundle_matches_pattern "$bundle_id" "$pattern"; then
+            return 0
+        fi
+    done
+
     return 1
 }
 
@@ -772,7 +778,8 @@ should_protect_path() {
     # Matches: .../Library/Group Containers/group.id/...
     if [[ "$path" =~ /Library/Containers/([^/]+) ]] || [[ "$path" =~ /Library/Group\ Containers/([^/]+) ]]; then
         local bundle_id="${BASH_REMATCH[1]}"
-        if should_protect_data "$bundle_id"; then
+        # In uninstall mode, only system components are protected; skip data protection
+        if [[ "${MOLE_UNINSTALL_MODE:-0}" != "1" ]] && should_protect_data "$bundle_id"; then
             return 0
         fi
     fi
@@ -1093,30 +1100,32 @@ find_app_files() {
 
     # 7. Raycast
     if [[ "$bundle_id" == "com.raycast.macos" ]]; then
-        local raycast_parents=(
+        # Standard user directories
+        local raycast_dirs=(
             "$HOME/Library/Application Support"
             "$HOME/Library/Application Scripts"
             "$HOME/Library/Containers"
         )
-        for parent in "${raycast_parents[@]}"; do
-            [[ -d "$parent" ]] || continue
-            while IFS= read -r -d '' p; do
+        for dir in "${raycast_dirs[@]}"; do
+            [[ -d "$dir" ]] && while IFS= read -r -d '' p; do
                 files_to_clean+=("$p")
-            done < <(command find "$parent" -maxdepth 1 -type d -iname "*raycast*" -print0 2> /dev/null)
+            done < <(command find "$dir" -maxdepth 1 -type d -iname "*raycast*" -print0 2> /dev/null)
         done
+
+        # Explicit Raycast container directories (hardcoded leftovers)
         [[ -d "$HOME/Library/Containers/com.raycast.macos.BrowserExtension" ]] && files_to_clean+=("$HOME/Library/Containers/com.raycast.macos.BrowserExtension")
         [[ -d "$HOME/Library/Containers/com.raycast.macos.RaycastAppIntents" ]] && files_to_clean+=("$HOME/Library/Containers/com.raycast.macos.RaycastAppIntents")
-        if [[ -d "$HOME/Library/Caches" ]]; then
-            while IFS= read -r -d '' p; do
-                files_to_clean+=("$p")
-            done < <(command find "$HOME/Library/Caches" -maxdepth 2 -type d -iname "*raycast*" -print0 2> /dev/null)
-        fi
-        local code_storage="$HOME/Library/Application Support/Code/User/globalStorage"
-        if [[ -d "$code_storage" ]]; then
-            while IFS= read -r -d '' p; do
-                files_to_clean+=("$p")
-            done < <(command find "$code_storage" -maxdepth 1 -type d -iname "*raycast*" -print0 2> /dev/null)
-        fi
+
+        # Cache (deeper search)
+        [[ -d "$HOME/Library/Caches" ]] && while IFS= read -r -d '' p; do
+            files_to_clean+=("$p")
+        done < <(command find "$HOME/Library/Caches" -maxdepth 2 -type d -iname "*raycast*" -print0 2> /dev/null)
+
+        # VSCode extension storage
+        local vscode_global="$HOME/Library/Application Support/Code/User/globalStorage"
+        [[ -d "$vscode_global" ]] && while IFS= read -r -d '' p; do
+            files_to_clean+=("$p")
+        done < <(command find "$vscode_global" -maxdepth 1 -type d -iname "*raycast*" -print0 2> /dev/null)
     fi
 
     # Output results
@@ -1212,9 +1221,9 @@ find_app_system_files() {
         done < <(command find /private/var/db/receipts -maxdepth 1 \( -name "*$bundle_id*" \) -print0 2> /dev/null)
     fi
 
-    # Raycast system-level (*raycast* under /Library/Application Support)
-    if [[ "$bundle_id" == "com.raycast.macos" && -d "/Library/Application Support" ]]; then
-        while IFS= read -r -d '' p; do
+    # Raycast system-level files
+    if [[ "$bundle_id" == "com.raycast.macos" ]]; then
+        [[ -d "/Library/Application Support" ]] && while IFS= read -r -d '' p; do
             system_files+=("$p")
         done < <(command find "/Library/Application Support" -maxdepth 1 -type d -iname "*raycast*" -print0 2> /dev/null)
     fi

lib/core/base.sh

@@ -63,6 +63,8 @@ declare -a DEFAULT_WHITELIST_PATTERNS=(
     "$HOME/Library/Caches/ms-playwright*"
     "$HOME/.cache/huggingface*"
     "$HOME/.m2/repository/*"
+    "$HOME/.gradle/caches/*"
+    "$HOME/.gradle/daemon/*"
     "$HOME/.ollama/models/*"
     "$HOME/Library/Caches/com.nssurge.surge-mac/*"
     "$HOME/Library/Application Support/com.nssurge.surge-mac/*"

lib/core/file_ops.sh

@@ -467,7 +467,12 @@ safe_sudo_find_delete() {
 
     debug_log "Finding, sudo, in $base_dir: $pattern, age: ${age_days}d, type: $type_filter"
 
-    local find_args=("-maxdepth" "5" "-name" "$pattern" "-type" "$type_filter")
+    local find_args=("-maxdepth" "5")
+    # Skip -name if pattern is "*" (matches everything anyway, but adds overhead)
+    if [[ "$pattern" != "*" ]]; then
+        find_args+=("-name" "$pattern")
+    fi
+    find_args+=("-type" "$type_filter")
     if [[ "$age_days" -gt 0 ]]; then
         find_args+=("-mtime" "+$age_days")
     fi

lib/ui/menu_paginated.sh

@@ -657,6 +657,14 @@ paginated_multi_select() {
                 fi
                 ;;
             "SPACE")
+                # In filter mode with active text, treat space as search character
+                if [[ -n "$filter_text" ]]; then
+                    filter_text+=" "
+                    rebuild_view
+                    cursor_pos=0
+                    need_full_redraw=true
+                    continue
+                fi
                 local idx=$((top_index + cursor_pos))
                 if [[ $idx -lt ${#view_indices[@]} ]]; then
                     local real="${view_indices[idx]}"

lib/uninstall/batch.sh

@@ -300,18 +300,15 @@ batch_uninstall_applications() {
     echo -e "${PURPLE_BOLD}Files to be removed:${NC}"
     echo ""
 
-    # Warn if user data is detected.
-    local has_user_data=false
+    # Warn if brew cask apps are present.
+    local has_brew_cask=false
     for detail in "${app_details[@]}"; do
-        IFS='|' read -r _ _ _ _ _ _ has_sensitive_data <<< "$detail"
-        if [[ "$has_sensitive_data" == "true" ]]; then
-            has_user_data=true
-            break
-        fi
+        IFS='|' read -r _ _ _ _ _ _ _ _ is_brew_cask_flag _ <<< "$detail"
+        [[ "$is_brew_cask_flag" == "true" ]] && has_brew_cask=true
     done
 
-    if [[ "$has_user_data" == "true" ]]; then
-        echo -e "${GRAY}${ICON_WARNING}${NC} ${YELLOW}Note: Some apps contain user configurations/themes${NC}"
+    if [[ "$has_brew_cask" == "true" ]]; then
+        echo -e "${GRAY}${ICON_WARNING}${NC} ${YELLOW}Homebrew apps will be fully cleaned (--zap: removes configs & data)${NC}"
         echo ""
     fi
 
@@ -431,6 +428,7 @@ batch_uninstall_applications() {
         local related_files=$(decode_file_list "$encoded_files" "$app_name")
         local system_files=$(decode_file_list "$encoded_system_files" "$app_name")
         local reason=""
+        local suggestion=""
 
         # Show progress for current app
         local brew_tag=""
@@ -567,7 +565,7 @@ batch_uninstall_applications() {
             [[ "$used_brew_successfully" == "true" ]] && ((brew_apps_removed++))
             ((files_cleaned++))
             ((total_items++))
-            success_items+=("$app_name")
+            success_items+=("$app_path")
         else
             if [[ -t 1 ]]; then
                 if [[ ${#app_details[@]} -gt 1 ]]; then
@@ -593,7 +591,6 @@ batch_uninstall_applications() {
     local -a summary_details=()
 
     if [[ $success_count -gt 0 ]]; then
-        local success_list="${success_items[*]}"
         local success_text="app"
         [[ $success_count -gt 1 ]] && success_text="apps"
         local success_line="Removed ${success_count} ${success_text}"
@@ -602,13 +599,15 @@ batch_uninstall_applications() {
         fi
 
         # Format app list with max 3 per line.
-        if [[ -n "$success_list" ]]; then
+        if [[ ${#success_items[@]} -gt 0 ]]; then
             local idx=0
             local is_first_line=true
             local current_line=""
 
-            for app_name in "${success_items[@]}"; do
-                local display_item="${GREEN}${app_name}${NC}"
+            for success_path in "${success_items[@]}"; do
+                local display_name
+                display_name=$(basename "$success_path" .app)
+                local display_item="${GREEN}${display_name}${NC}"
 
                 if ((idx % 3 == 0)); then
                     if [[ -n "$current_line" ]]; then
@@ -709,20 +708,8 @@ batch_uninstall_applications() {
     fi
 
     # Clean up Dock entries for uninstalled apps.
-    if [[ $success_count -gt 0 ]]; then
-        local -a removed_paths=()
-        for detail in "${app_details[@]}"; do
-            IFS='|' read -r app_name app_path _ _ _ _ <<< "$detail"
-            for success_name in "${success_items[@]}"; do
-                if [[ "$success_name" == "$app_name" ]]; then
-                    removed_paths+=("$app_path")
-                    break
-                fi
-            done
-        done
-        if [[ ${#removed_paths[@]} -gt 0 ]]; then
-            remove_apps_from_dock "${removed_paths[@]}" 2> /dev/null || true
-        fi
+    if [[ $success_count -gt 0 && ${#success_items[@]} -gt 0 ]]; then
+        remove_apps_from_dock "${success_items[@]}" 2> /dev/null || true
     fi
 
     _cleanup_sudo_keepalive
@@ -733,18 +720,8 @@ batch_uninstall_applications() {
     if [[ $success_count -gt 0 ]]; then
         local cache_file="$HOME/.cache/mole/app_scan_cache"
         if [[ -f "$cache_file" ]]; then
-            local -a removed_paths=()
-            for detail in "${app_details[@]}"; do
-                IFS='|' read -r app_name app_path _ _ _ _ <<< "$detail"
-                for success_name in "${success_items[@]}"; do
-                    if [[ "$success_name" == "$app_name" ]]; then
-                        removed_paths+=("$app_path")
-                        break
-                    fi
-                done
-            done
-
-            if [[ ${#removed_paths[@]} -gt 0 ]]; then
+            if [[ ${#success_items[@]} -gt 0 ]]; then
+                local -a removed_paths=("${success_items[@]}")
                 local temp_cache
                 temp_cache=$(create_temp_file)
                 local line_removed=false