jishushell 0.4.2-beta2 → 0.4.10

package/install/jishu-uninstall.sh

@@ -5,12 +5,8 @@ JISHU_SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 # shellcheck source=jishu-install.sh
 source "${JISHU_SCRIPT_DIR}/jishu-install.sh"
 
-DO_NODE=0
 DO_DOCKER=0
-DO_DOCKER_CLEAN=0
 DO_NOMAD=0
-DO_OPENCLAW=0
-DO_DATA=0
 AUTO_YES=0
 
 # ─── Argument parsing ─────────────────────────────────────────────────────────
@@ -18,16 +14,16 @@ usage() {
     cat <<EOF
 Usage: bash jishu-uninstall.sh [options]
 
-  Run without options to stop all services and remove them from auto-start.
+  Run without options to stop all JishuShell services, clean up runtime
+  artifacts, and optionally delete the data directory (~/.jishushell).
+
+  System-installed tools (colima, docker, nomad, Node.js) are never removed
+  unless you explicitly pass --docker or --nomad.
 
 Options:
-  --node           Remove Node.js versions managed by nvm, and nvm itself
-  --docker         Remove Docker packages (Compose plugin, docker group)
-  --docker-clean   Stop & remove all containers, images, volumes, then remove Docker
-  --nomad          Remove Nomad binary and service registration
-  --openclaw       Remove the OpenClaw npm package and its Docker image(s)
-  --data           Delete the ~/.jishushell data directory (instances, config, logs)
-  --all            Remove all of the above (full uninstall, implies --docker-clean)
+  --docker         Also uninstall Docker/Colima system packages (brew/apt/dnf)
+  --nomad          Also uninstall Nomad system package (brew/apt/dnf)
+  --all            Full uninstall: default cleanup + --docker + --nomad + --yes
   --dry-run        Print the removal plan only, do not execute anything
   --yes, -y        Skip all confirmation prompts (auto-yes)
   --help, -h       Show this help message
@@ -38,13 +34,9 @@ EOF
 parse_args() {
     while [[ $# -gt 0 ]]; do
         case "$1" in
-            --node)          DO_NODE=1 ;;
             --docker)        DO_DOCKER=1 ;;
-            --docker-clean)  DO_DOCKER_CLEAN=1; DO_DOCKER=1 ;;
             --nomad)         DO_NOMAD=1 ;;
-            --openclaw)      DO_OPENCLAW=1 ;;
-            --data)          DO_DATA=1 ;;
-            --all)           DO_NODE=1; DO_DOCKER_CLEAN=1; DO_DOCKER=1; DO_NOMAD=1; DO_OPENCLAW=1; DO_DATA=1; AUTO_YES=1 ;;
+            --all)           DO_DOCKER=1; DO_NOMAD=1; AUTO_YES=1 ;;
             --dry-run)  DRY_RUN=1 ;;
             --yes|-y)   AUTO_YES=1 ;;
             --help|-h)  usage; exit 0 ;;
@@ -54,6 +46,42 @@ parse_args() {
     done
 }
 
+# ─── Helper: kill processes matching our private profile ──────────────────────
+# Usage: _kill_jishu_procs "colima" "jishushell"
+_kill_jishu_procs() {
+    local pattern="$1"
+    local profile_hint="${2:-${_COLIMA_PROFILE}}"
+    local pids
+    pids="$(pgrep -f "${pattern}" 2>/dev/null || true)"
+    [[ -z "$pids" ]] && return 0
+    local killed=0
+    local pid
+    for pid in $pids; do
+        # Only kill processes related to our profile — not system-wide colima/docker
+        local cmdline
+        cmdline="$(ps -p "$pid" -o args= 2>/dev/null || true)"
+        if [[ "$cmdline" == *"${profile_hint}"* || "$cmdline" == *"${_COLIMA_HOME}"* ]]; then
+            kill "$pid" 2>/dev/null || true
+            ((killed++)) || true
+        fi
+    done
+    if [[ $killed -gt 0 ]]; then
+        ui_info "Sent SIGTERM to ${killed} ${pattern} process(es)"
+        # Wait briefly for graceful shutdown
+        sleep 2
+        # Force-kill any survivors
+        for pid in $pids; do
+            if kill -0 "$pid" 2>/dev/null; then
+                local cmdline
+                cmdline="$(ps -p "$pid" -o args= 2>/dev/null || true)"
+                if [[ "$cmdline" == *"${profile_hint}"* || "$cmdline" == *"${_COLIMA_HOME}"* ]]; then
+                    kill -9 "$pid" 2>/dev/null || true
+                fi
+            fi
+        done
+    fi
+}
+
 # ─── Stop & deregister auto-start services ───────────────────────────────────
 stop_services() {
     ui_section "Stopping services and removing auto-start"
@@ -61,6 +89,12 @@ stop_services() {
     if [[ "$DRY_RUN" == "1" ]]; then
         ui_info "[dry-run] Would stop and deregister: com.jishushell.panel, com.jishushell.nomad"
         ui_info "[dry-run] Would: npm uninstall -g jishushell"
+        if [[ "$OS" == "macos" ]]; then
+            ui_info "[dry-run] Would: kill stale colima/limactl/ssh processes for profile ${_COLIMA_PROFILE}"
+            ui_info "[dry-run] Would: COLIMA_HOME=${_COLIMA_HOME} colima stop ${_COLIMA_PROFILE}"
+            ui_info "[dry-run] Would: COLIMA_HOME=${_COLIMA_HOME} colima delete ${_COLIMA_PROFILE} --force"
+            ui_info "[dry-run] Would: docker context rm colima-${_COLIMA_PROFILE}"
+        fi
         return 0
     fi
 
@@ -117,187 +151,193 @@ stop_services() {
         ui_success "jishushell npm package removed"
     fi
 
-    # Kill any nomad agent process started directly by jishushell (non-systemd/launchd)
-    if pgrep -f "nomad agent" &>/dev/null 2>&1; then
-        ui_info "Stopping orphaned Nomad agent process..."
-        pkill -TERM -f "nomad agent" 2>/dev/null || true
-        local _i=0
-        while pgrep -f "nomad agent" &>/dev/null 2>&1 && [[ $_i -lt 10 ]]; do
-            sleep 1
-            ((_i++)) || true
+    # Kill any nomad agent process started by jishushell (match our config path)
+    local _nomad_pids
+    _nomad_pids="$(pgrep -f "nomad agent" 2>/dev/null || true)"
+    if [[ -n "$_nomad_pids" ]]; then
+        local _killed_nomad=0
+        for _pid in $_nomad_pids; do
+            local _cmd
+            _cmd="$(ps -p "$_pid" -o args= 2>/dev/null || true)"
+            # Only kill nomad agents that reference our config directory
+            if [[ "$_cmd" == *"${JISHUSHELL_HOME:-${HOME}/.jishushell}"* ]]; then
+                kill "$_pid" 2>/dev/null || true
+                ((_killed_nomad++)) || true
+            fi
         done
-        if pgrep -f "nomad agent" &>/dev/null 2>&1; then
-            pkill -KILL -f "nomad agent" 2>/dev/null || true
+        if [[ $_killed_nomad -gt 0 ]]; then
+            ui_info "Stopped ${_killed_nomad} JishuShell Nomad agent process(es)"
+            sleep 2
+            # Force-kill survivors
+            for _pid in $_nomad_pids; do
+                if kill -0 "$_pid" 2>/dev/null; then
+                    local _cmd
+                    _cmd="$(ps -p "$_pid" -o args= 2>/dev/null || true)"
+                    if [[ "$_cmd" == *"${JISHUSHELL_HOME:-${HOME}/.jishushell}"* ]]; then
+                        kill -9 "$_pid" 2>/dev/null || true
+                    fi
+                fi
+            done
         fi
-        ui_success "Nomad agent stopped"
-    fi
-
-    local wrapper="${HOME}/.jishushell/bin/jishushell-panel-start"
-    if [[ -f "$wrapper" ]]; then
-        rm -f "$wrapper"
-        ui_success "Removed wrapper: ${wrapper}"
     fi
-}
 
-# ─── Node.js via nvm ──────────────────────────────────────────────────────────
-uninstall_node() {
-    ui_section "Removing Node.js / nvm"
+    # ── macOS: Tear down private Colima VM ────────────────────────────────────
+    if [[ "$OS" == "macos" ]]; then
+        ui_info "Checking for JishuShell Colima VM (profile: ${_COLIMA_PROFILE})..."
 
-    local nvm_dir="${NVM_DIR:-$HOME/.nvm}"
+        # Kill stale colima/limactl/ssh processes for our profile
+        _kill_jishu_procs "colima" "${_COLIMA_PROFILE}"
+        _kill_jishu_procs "limactl" "colima-${_COLIMA_PROFILE}"
+        _kill_jishu_procs "ssh.*colima-${_COLIMA_PROFILE}"
 
-    if [[ -s "$nvm_dir/nvm.sh" ]]; then
-        ui_info "Detected nvm installation: $nvm_dir"
-
-        # shellcheck source=/dev/null
-        \. "$nvm_dir/nvm.sh" 2>/dev/null || true
-
-        local installed_versions
-        installed_versions="$(nvm ls --no-colors 2>/dev/null | grep -oP 'v\d+\.\d+\.\d+' || true)"
-
-        if [[ -n "$installed_versions" ]]; then
-            ui_info "Installed Node.js versions:"
-            echo "$installed_versions" | while read -r ver; do
-                ui_info "  $ver"
-            done
-            if confirm "Remove all listed Node.js versions?"; then
-                echo "$installed_versions" | while read -r ver; do
-                    ui_info "Uninstalling Node.js $ver ..."
-                    run_cmd nvm uninstall "$ver" 2>/dev/null || true
-                done
+        # Graceful stop + delete via colima CLI
+        if command -v colima &>/dev/null; then
+            if _colima list 2>/dev/null | grep -q "${_COLIMA_PROFILE}"; then
+                ui_info "Stopping Colima VM (profile: ${_COLIMA_PROFILE})..."
+                _colima stop "${_COLIMA_PROFILE}" 2>/dev/null || true
+                ui_info "Deleting Colima VM..."
+                _colima delete "${_COLIMA_PROFILE}" --force 2>/dev/null || true
+                ui_success "Colima instance '${_COLIMA_PROFILE}' stopped and deleted"
+            else
+                ui_info "Colima VM '${_COLIMA_PROFILE}' not found"
             fi
         else
-            ui_info "No Node.js versions found managed by nvm"
+            ui_info "Colima CLI not found — skipping VM teardown"
         fi
 
-        if confirm "Delete nvm installation directory ($nvm_dir)?"; then
-            run_cmd rm -rf "$nvm_dir"
-            ui_success "nvm directory removed"
+        # Safety net: remove docker context
+        if command -v docker &>/dev/null; then
+            docker context rm "colima-${_COLIMA_PROFILE}" 2>/dev/null || true
         fi
 
-        local shell_configs=("$HOME/.bashrc" "$HOME/.bash_profile" "$HOME/.profile" "$HOME/.zshrc")
-        for cfg in "${shell_configs[@]}"; do
-            if [[ -f "$cfg" ]] && grep -q 'NVM_DIR' "$cfg" 2>/dev/null; then
-                ui_info "Cleaning nvm init lines from $cfg ..."
-                if [[ "$DRY_RUN" == "1" ]]; then
-                    ui_info "[dry-run] Would remove NVM_DIR lines from $cfg"
-                else
-                    cp "$cfg" "${cfg}.bak-jishu-uninstall"
-                    sed -i '/NVM_DIR/d; /nvm\.sh/d; /bash_completion.*nvm/d' "$cfg"
-                    ui_success "Cleaned $cfg  (backup: ${cfg}.bak-jishu-uninstall)"
+        # Clean leaked ~/.colima directory (Colima stat-guard artifact)
+        local default_colima_home="${HOME}/.colima"
+        if [[ -d "$default_colima_home" ]]; then
+            local real_files
+            real_files="$(find "$default_colima_home" -type f 2>/dev/null | head -1 || true)"
+            if [[ -z "$real_files" ]]; then
+                rm -rf "$default_colima_home" 2>/dev/null || true
+                if [[ ! -d "$default_colima_home" ]]; then
+                    ui_success "Removed leaked ~/.colima (empty)"
                 fi
-            fi
-        done
-    else
-        ui_info "nvm not found ($nvm_dir/nvm.sh does not exist)"
-    fi
-
-    if command -v node &>/dev/null && [[ "$DRY_RUN" != "1" || DO_NODE -eq 1 ]]; then
-        local node_path
-        node_path="$(command -v node 2>/dev/null || true)"
-        if [[ "$node_path" == /usr/* || "$node_path" == /bin/* ]]; then
-            ui_info "Detected system-level Node.js: $node_path"
-            if confirm "Uninstall system-level Node.js via package manager?"; then
-                case "$PKG_MANAGER" in
-                    apt)
-                        run_sudo apt-get remove -y nodejs npm 2>/dev/null || true
-                        run_sudo apt-get autoremove -y 2>/dev/null || true
-                        run_sudo rm -f /etc/apt/sources.list.d/nodesource.list \
-                                       /usr/share/keyrings/nodesource.gpg 2>/dev/null || true
-                        ;;
-                    dnf|yum)
-                        run_sudo "$PKG_MANAGER" remove -y nodejs npm 2>/dev/null || true
-                        ;;
-                esac
-                ui_success "System-level Node.js removed"
+            else
+                ui_info "~/.colima contains files from other profiles — kept"
             fi
         fi
     fi
 
-    if ! command -v node &>/dev/null 2>&1; then
-        ui_success "Node.js successfully removed"
-    else
-        ui_warn "node command still found (you may need to open a new terminal)"
+    local wrapper="${HOME}/.jishushell/bin/jishushell-panel-start"
+    if [[ -f "$wrapper" ]]; then
+        rm -f "$wrapper"
+        ui_success "Removed wrapper: ${wrapper}"
     fi
-}
 
-# ─── Docker containers / images / volumes cleanup ────────────────────────────
-clean_docker_data() {
-    ui_section "Removing Docker containers, images and volumes"
+    # Clean JishuShell PATH entries from shell RC files.
+    local marker="# jishushell-bin-path"
+    local shell_configs=("$HOME/.bashrc" "$HOME/.bash_profile" "$HOME/.profile" "$HOME/.zshrc")
+    for cfg in "${shell_configs[@]}"; do
+        if [[ -f "$cfg" ]] && grep -qF "$marker" "$cfg" 2>/dev/null; then
+            ui_info "Cleaning JishuShell PATH from ${cfg}..."
+            if [[ "$DRY_RUN" == "1" ]]; then
+                ui_info "[dry-run] Would remove jishushell-bin-path lines from ${cfg}"
+            else
+                cp "$cfg" "${cfg}.bak-jishu-uninstall"
+                if [[ "$(uname -s)" == "Darwin" ]]; then
+                    sed -i '' "/${marker//\//\\/}/d; /jishushell.*bin.*PATH/d; /\.jishushell\/bin/d" "$cfg"
+                else
+                    sed -i "/${marker//\//\\/}/d; /jishushell.*bin.*PATH/d; /\.jishushell\/bin/d" "$cfg"
+                fi
+                ui_success "Cleaned ${cfg} (backup: ${cfg}.bak-jishu-uninstall)"
+            fi
+        fi
+    done
+}
 
-    if ! command -v docker &>/dev/null; then
-        ui_info "Docker is not installed, skipping cleanup"
+# ─── Delete ~/.jishushell data directory ──────────────────────────────────────
+delete_data_dir() {
+    local jishu_home="${JISHUSHELL_HOME:-${HOME}/.jishushell}"
+    if [[ ! -d "$jishu_home" ]]; then
+        ui_info "Data directory does not exist: ${jishu_home}"
         return 0
     fi
 
+    local size
+    size="$(du -sh "$jishu_home" 2>/dev/null | cut -f1 || echo "?")"
+    echo ""
+    ui_info "Data directory: ${jishu_home} (${size})"
+    ui_info "This contains your instances, config, Nomad data, and Colima data."
+
     if [[ "$DRY_RUN" == "1" ]]; then
-        ui_info "[dry-run] Would: docker stop all running containers"
-        ui_info "[dry-run] Would: docker rm -f all containers"
-        ui_info "[dry-run] Would: docker rmi -f all images"
-        ui_info "[dry-run] Would: docker volume rm all volumes"
-        ui_info "[dry-run] Would: docker network prune -f"
+        ui_info "[dry-run] Would: ${SUDO} rm -rf ${jishu_home}"
         return 0
     fi
 
-    ui_warn "This will PERMANENTLY delete all Docker containers, images and volumes on this host."
-    if ! confirm "Remove ALL Docker containers, images and volumes?"; then
-        ui_info "Skipping Docker data cleanup"
+    if ! confirm "Delete data directory (~/.jishushell)?"; then
+        ui_info "Data directory kept: ${jishu_home}"
         return 0
     fi
 
-    # Stop all running containers
-    local running_containers
-    running_containers="$(docker ps -q 2>/dev/null || true)"
-    if [[ -n "$running_containers" ]]; then
-        ui_info "Stopping all running containers..."
-        # shellcheck disable=SC2086
-        docker stop $running_containers 2>/dev/null || true
-        ui_success "All containers stopped"
+    # On macOS, Docker Desktop keeps VirtioFS shares open for containers that are
+    # stopped but not removed (docker rm).  Force-remove any such containers first.
+    if command -v docker &>/dev/null; then
+        local _containers_to_rm
+        _containers_to_rm="$(docker ps -a --format '{{.ID}}' 2>/dev/null | xargs -I{} sh -c \
+            'docker inspect {} --format "{{.ID}} {{range .Mounts}}{{.Source}} {{end}}" 2>/dev/null' \
+            | grep -F "$jishu_home" | awk '{print $1}' || true)"
+        if [[ -n "$_containers_to_rm" ]]; then
+            ui_info "Removing Docker containers with bind-mounts from ${jishu_home}..."
+            echo "$_containers_to_rm" | xargs docker rm -f 2>/dev/null || true
+        fi
+    fi
+    if [[ "$(uname -s)" == "Darwin" ]]; then
+        ${SUDO} chflags -R nouchg,noschg "$jishu_home" 2>/dev/null || true
+    fi
+    ${SUDO} rm -rf "$jishu_home" || true
+    if [[ ! -d "$jishu_home" ]]; then
+        ui_success "Data directory removed"
     else
-        ui_info "No running containers"
+        ui_warn "Could not remove ${jishu_home}"
+        return 1
     fi
+}
 
-    # Remove all containers
-    local all_containers
-    all_containers="$(docker ps -aq 2>/dev/null || true)"
-    if [[ -n "$all_containers" ]]; then
-        ui_info "Removing all containers..."
-        # shellcheck disable=SC2086
-        docker rm -f $all_containers 2>/dev/null || true
-        ui_success "All containers removed"
-    else
-        ui_info "No containers to remove"
+# ─── Uninstall Colima system packages (macOS, --docker flag) ──────────────────
+uninstall_colima() {
+    ui_section "Uninstalling Colima / Docker / Lima system packages"
+
+    if [[ "$OS" != "macos" ]]; then
+        return 0
     fi
 
-    # Remove all images
-    local all_images
-    all_images="$(docker images -q 2>/dev/null || true)"
-    if [[ -n "$all_images" ]]; then
-        ui_info "Removing all Docker images..."
-        # shellcheck disable=SC2086
-        docker rmi -f $all_images 2>/dev/null || true
-        ui_success "All images removed"
-    else
-        ui_info "No images to remove"
+    if [[ "$DRY_RUN" == "1" ]]; then
+        ui_info "[dry-run] Would: brew uninstall colima docker lima"
+        return 0
     fi
 
-    # Remove all volumes
-    local all_volumes
-    all_volumes="$(docker volume ls -q 2>/dev/null || true)"
-    if [[ -n "$all_volumes" ]]; then
-        ui_info "Removing all Docker volumes..."
-        # shellcheck disable=SC2086
-        docker volume rm $all_volumes 2>/dev/null || true
-        ui_success "All volumes removed"
-    else
-        ui_info "No volumes to remove"
+    if ! command -v brew &>/dev/null; then
+        ui_info "Homebrew not found — skipping"
+        return 0
     fi
 
-    # Prune custom networks
-    docker network prune -f 2>/dev/null || true
-    ui_success "Docker data cleanup complete"
+    local brew_pkgs_to_remove=()
+    for pkg in colima docker lima; do
+        if brew list "$pkg" &>/dev/null 2>&1; then
+            brew_pkgs_to_remove+=("$pkg")
+        fi
+    done
+    if [[ ${#brew_pkgs_to_remove[@]} -gt 0 ]]; then
+        if confirm "Uninstall Homebrew packages: ${brew_pkgs_to_remove[*]}?"; then
+            brew uninstall "${brew_pkgs_to_remove[@]}" 2>/dev/null || true
+            ui_success "Homebrew packages removed: ${brew_pkgs_to_remove[*]}"
+        else
+            ui_info "Homebrew packages kept"
+        fi
+    else
+        ui_info "No JishuShell-related Homebrew packages found"
+    fi
 }
 
-# ─── Docker ───────────────────────────────────────────────────────────────────
+# ─── Docker (Linux, --docker flag) ───────────────────────────────────────────
 uninstall_docker() {
     ui_section "Removing Docker"
 
@@ -469,43 +509,36 @@ uninstall_docker() {
     ui_success "Docker removed successfully"
 }
 
-# ─── Nomad ────────────────────────────────────────────────────────────────────
+# ─── Nomad system package (--nomad flag) ──────────────────────────────────────
 uninstall_nomad() {
-    ui_section "Removing Nomad"
+    ui_section "Uninstalling Nomad system package"
 
-    local local_bin="${HOME}/.jishushell/bin/nomad"
     local system_nomad
     system_nomad="$(command -v nomad 2>/dev/null || true)"
-    # Ignore if system PATH resolves to our local bin
+    local local_bin="${JISHUSHELL_HOME:-${HOME}/.jishushell}/bin/nomad"
+    # Ignore if system PATH resolves to our local bin (that gets cleaned with ~/.jishushell)
     [[ "$system_nomad" == "$local_bin" ]] && system_nomad=""
 
-    local found_local=0
-    local found_system=0
-    [[ -f "$local_bin" ]] && found_local=1
-    [[ -n "$system_nomad" ]] && found_system=1
-
-    if [[ $found_local -eq 0 && $found_system -eq 0 ]]; then
-        ui_info "Nomad is not installed, skipping"
+    if [[ -z "$system_nomad" ]]; then
+        ui_info "No system Nomad installation found, skipping"
         return 0
     fi
 
-    if [[ $found_local -eq 1 ]]; then
-        local local_ver
-        local_ver="$("$local_bin" version 2>/dev/null | head -n1 || echo 'unknown')"
-        ui_info "Local Nomad: ${local_ver} → ${local_bin}"
-    fi
-    if [[ $found_system -eq 1 ]]; then
-        local sys_ver
-        sys_ver="$(nomad version 2>/dev/null | head -n1 || echo 'unknown')"
-        ui_info "System Nomad: ${sys_ver} → ${system_nomad}"
+    local sys_ver
+    sys_ver="$(nomad version 2>/dev/null | head -n1 || echo 'unknown')"
+    ui_info "System Nomad: ${sys_ver} → ${system_nomad}"
+
+    if [[ "$DRY_RUN" == "1" ]]; then
+        ui_info "[dry-run] Would remove system Nomad via package manager"
+        return 0
     fi
 
-    if ! confirm "Confirm removal of Nomad?"; then
+    if ! confirm "Uninstall system Nomad (${system_nomad})?"; then
         ui_info "Cancelled"
         return 0
     fi
 
-    # Stop systemd service if running
+    # Stop systemd service if running (Linux)
     if command -v systemctl &>/dev/null; then
         if systemctl is-active --quiet nomad 2>/dev/null; then
             ui_info "Stopping Nomad service..."
@@ -517,91 +550,61 @@ uninstall_nomad() {
         fi
     fi
 
-    # Remove local binary (no sudo needed)
-    if [[ $found_local -eq 1 ]]; then
-        ui_info "Removing local Nomad binary: ${local_bin}"
-        run_cmd rm -f "$local_bin"
-        ui_success "Local Nomad binary removed"
-    fi
-
-    # Remove PATH entry from shell configs written by jishu-install.sh
-    local marker="# jishushell-bin-path"
-    local shell_configs=("$HOME/.bashrc" "$HOME/.bash_profile" "$HOME/.profile" "$HOME/.zshrc")
-    for cfg in "${shell_configs[@]}"; do
-        if [[ -f "$cfg" ]] && grep -qF "$marker" "$cfg" 2>/dev/null; then
-            ui_info "Cleaning JishuShell PATH from ${cfg}..."
-            if [[ "$DRY_RUN" == "1" ]]; then
-                ui_info "[dry-run] Would remove jishushell-bin-path lines from ${cfg}"
-            else
-                cp "$cfg" "${cfg}.bak-jishu-uninstall"
-                sed -i "/${marker//\//\\/}/d; /jishushell.*bin.*PATH/d; /\.jishushell\/bin/d" "$cfg"
-                ui_success "Cleaned ${cfg} (backup: ${cfg}.bak-jishu-uninstall)"
+    local removed_via_pkg=0
+    case "$PKG_MANAGER" in
+        brew)
+            if brew list nomad &>/dev/null 2>&1; then
+                ui_info "Removing Nomad via Homebrew..."
+                brew uninstall nomad 2>/dev/null || true
+                removed_via_pkg=1
             fi
-        fi
-    done
-
-    # Remove system binary if found via package manager
-    if [[ $found_system -eq 1 ]]; then
-        local removed_via_pkg=0
-        case "$PKG_MANAGER" in
-            apt)
-                if dpkg -l nomad 2>/dev/null | grep -q '^ii'; then
-                    ui_info "Removing Nomad via apt..."
-                    run_sudo apt-get remove -y nomad 2>/dev/null || true
-                    run_sudo apt-get autoremove -y 2>/dev/null || true
-                    removed_via_pkg=1
-                fi
-                if [[ $removed_via_pkg -eq 1 ]]; then
-                    local hashi_sources=(/etc/apt/sources.list.d/hashicorp.list)
-                    for src in "${hashi_sources[@]}"; do
-                        if [[ -f "$src" ]]; then
-                            if confirm "Delete HashiCorp APT repository config ($src)?"; then
-                                run_sudo rm -f "$src" \
-                                             /usr/share/keyrings/hashicorp-archive-keyring.gpg 2>/dev/null || true
-                            fi
+            ;;
+        apt)
+            if dpkg -l nomad 2>/dev/null | grep -q '^ii'; then
+                ui_info "Removing Nomad via apt..."
+                run_sudo apt-get remove -y nomad 2>/dev/null || true
+                run_sudo apt-get autoremove -y 2>/dev/null || true
+                removed_via_pkg=1
+            fi
+            if [[ $removed_via_pkg -eq 1 ]]; then
+                local hashi_sources=(/etc/apt/sources.list.d/hashicorp.list)
+                for src in "${hashi_sources[@]}"; do
+                    if [[ -f "$src" ]]; then
+                        if confirm "Delete HashiCorp APT repository config ($src)?"; then
+                            run_sudo rm -f "$src" \
+                                         /usr/share/keyrings/hashicorp-archive-keyring.gpg 2>/dev/null || true
                         fi
-                    done
-                fi
-                ;;
-            dnf|yum)
-                if rpm -q nomad &>/dev/null 2>&1; then
-                    ui_info "Removing Nomad via $PKG_MANAGER..."
-                    run_sudo "$PKG_MANAGER" remove -y nomad 2>/dev/null || true
-                    removed_via_pkg=1
-                fi
-                if [[ $removed_via_pkg -eq 1 ]] && [[ -f /etc/yum.repos.d/hashicorp.repo ]]; then
-                    if confirm "Delete HashiCorp YUM repository config (/etc/yum.repos.d/hashicorp.repo)?"; then
-                        run_sudo rm -f /etc/yum.repos.d/hashicorp.repo 2>/dev/null || true
                     fi
+                done
+            fi
+            ;;
+        dnf|yum)
+            if rpm -q nomad &>/dev/null 2>&1; then
+                ui_info "Removing Nomad via $PKG_MANAGER..."
+                run_sudo "$PKG_MANAGER" remove -y nomad 2>/dev/null || true
+                removed_via_pkg=1
+            fi
+            if [[ $removed_via_pkg -eq 1 ]] && [[ -f /etc/yum.repos.d/hashicorp.repo ]]; then
+                if confirm "Delete HashiCorp YUM repository config (/etc/yum.repos.d/hashicorp.repo)?"; then
+                    run_sudo rm -f /etc/yum.repos.d/hashicorp.repo 2>/dev/null || true
                 fi
-                ;;
-        esac
+            fi
+            ;;
+    esac
 
-        # Remove binary directly if still present and not the local one
-        local remaining
-        remaining="$(command -v nomad 2>/dev/null || true)"
-        if [[ -n "$remaining" && "$remaining" != "$local_bin" ]]; then
-            ui_info "Removing remaining system binary: ${remaining}"
-            run_sudo rm -f "$remaining" 2>/dev/null || true
-        fi
+    # Remove binary directly if still present and package manager didn't handle it
+    local remaining
+    remaining="$(command -v nomad 2>/dev/null || true)"
+    if [[ -n "$remaining" && "$remaining" != "$local_bin" ]]; then
+        ui_info "Removing remaining system binary: ${remaining}"
+        run_sudo rm -f "$remaining" 2>/dev/null || true
     fi
 
     # Remove systemd service files
     run_sudo rm -f /etc/systemd/system/nomad.service \
                    /usr/lib/systemd/system/nomad.service 2>/dev/null || true
 
-    # Nomad JishuShell config dir
-    # NOTE: Nomad runs as root and creates root-owned files under data/,
-    #       so sudo is required to remove the entire tree.
-    local jishu_nomad_dir="${HOME}/.jishushell/nomad"
-    if [[ -d "$jishu_nomad_dir" ]]; then
-        if confirm "Delete Nomad config directory (${jishu_nomad_dir})?"; then
-            run_sudo rm -rf "$jishu_nomad_dir"
-            ui_success "Nomad config directory removed"
-        fi
-    fi
-
-    # System Nomad data dirs (optional)
+    # Nomad system data dirs
     if confirm "Delete Nomad system data directories (/etc/nomad.d /var/lib/nomad /var/log/nomad)?"; then
         run_sudo rm -rf /etc/nomad.d /var/lib/nomad /var/log/nomad 2>/dev/null || true
         ui_success "Nomad system data directories removed"
@@ -612,84 +615,13 @@ uninstall_nomad() {
     fi
 
     # Final verification
-    local nomad_ok=1
-    if [[ -f "${HOME}/.jishushell/bin/nomad" ]]; then
-        ui_warn "Local Nomad binary still present: ${HOME}/.jishushell/bin/nomad"
-        nomad_ok=0
-    fi
     local nomad_remaining
     nomad_remaining="$(command -v nomad 2>/dev/null || true)"
-    if [[ -n "$nomad_remaining" ]]; then
+    if [[ -n "$nomad_remaining" && "$nomad_remaining" != "$local_bin" ]]; then
         ui_warn "Nomad still found in PATH: ${nomad_remaining}"
-        nomad_ok=0
-    fi
-    if [[ $nomad_ok -eq 1 ]]; then
-        ui_success "Nomad removed successfully"
-    else
-        ui_error "Nomad removal incomplete"
         return 1
     fi
-}
-
-# ─── OpenClaw ─────────────────────────────────────────────────────────────────
-# Removes: npm package dir + Docker images matching openclaw:* or jishushell-base:*
-uninstall_openclaw() {
-    ui_section "Removing OpenClaw"
-
-    local pkg_dir="${HOME}/.jishushell/packages/openclaw"
-
-    # ── Remove Docker image(s) ────────────────────────────────────
-    if command -v docker &>/dev/null; then
-        # Find all local openclaw:* and jishushell-base:* images
-        local image_tags
-        image_tags="$(docker images --format '{{.Repository}}:{{.Tag}}' 2>/dev/null | grep -E '^openclaw:|^jishushell-base:' || true)"
-
-        if [[ -n "$image_tags" ]]; then
-            ui_info "Found OpenClaw/base Docker image(s):"
-            echo "$image_tags" | while read -r img; do
-                ui_info "  $img"
-            done
-            if confirm "Remove the above OpenClaw Docker image(s)?"; then
-                echo "$image_tags" | while read -r img; do
-                    if [[ "$DRY_RUN" == "1" ]]; then
-                        ui_info "[dry-run] Would: docker rmi -f ${img}"
-                    else
-                        docker rmi -f "$img" 2>/dev/null || ${SUDO} docker rmi -f "$img" 2>/dev/null || true
-                        if ! docker image inspect "$img" &>/dev/null 2>&1; then
-                            ui_success "Removed: ${img}"
-                        else
-                            ui_warn "Could not remove: ${img}"
-                        fi
-                    fi
-                done
-            else
-                ui_info "Docker images kept"
-            fi
-        else
-            ui_info "No local openclaw:* or jishushell-base:* Docker images found"
-        fi
-    else
-        ui_info "Docker not installed — skipping image removal"
-    fi
-
-    # ── Remove npm package directory ──────────────────────────────
-    if [[ -d "$pkg_dir" ]]; then
-        local size
-        size="$(du -sh "$pkg_dir" 2>/dev/null | cut -f1 || echo "?")"
-        ui_info "OpenClaw npm package directory: ${pkg_dir} (${size})"
-        if confirm "Delete OpenClaw npm package directory (${pkg_dir})?"; then
-            if [[ "$DRY_RUN" == "1" ]]; then
-                ui_info "[dry-run] Would: rm -rf ${pkg_dir}"
-            else
-                rm -rf "$pkg_dir"
-                ui_success "OpenClaw npm package directory removed"
-            fi
-        else
-            ui_info "Kept ${pkg_dir}"
-        fi
-    else
-        ui_info "OpenClaw npm package directory not found (${pkg_dir})"
-    fi
+    ui_success "Nomad removed successfully"
 }
 
 # ─── Summary ──────────────────────────────────────────────────────────────────
@@ -697,19 +629,13 @@ show_plan() {
     echo ""
     echo -e "${ACCENT}${BOLD}Uninstall Plan${NC}"
     echo -e "${MUTED}────────────────────────────────${NC}"
-    echo -e "  ${WARN}·${NC} Stop all running services"
-    echo -e "  ${WARN}·${NC} Remove services from auto-start (launchd / systemd)"
-    echo -e "  ${WARN}·${NC} Uninstall jishushell npm package"
-    [[ $DO_NODE     -eq 1 ]] && echo -e "  ${WARN}·${NC} Node.js / nvm"
-    [[ $DO_DOCKER_CLEAN -eq 1 ]] && echo -e "  ${WARN}·${NC} Remove all Docker containers, images and volumes"
-    [[ $DO_DOCKER       -eq 1 ]] && echo -e "  ${WARN}·${NC} Docker packages, docker group, /var/lib/docker, /var/lib/containerd, /etc/docker, ~/.docker"
-    [[ $DO_NOMAD    -eq 1 ]] && echo -e "  ${WARN}·${NC} Nomad binary and config"
-    [[ $DO_OPENCLAW -eq 1 ]] && echo -e "  ${WARN}·${NC} OpenClaw npm package + Docker image(s) (openclaw:*, jishushell-base:*)"
-    if [[ $DO_DATA -eq 1 ]]; then
-        echo -e "  ${WARN}·${NC} Data directory (~/.jishushell) — WILL BE DELETED"
-    else
-        echo -e "  ${MUTED}·${NC} Data directory (~/.jishushell) — will ask, default: keep"
-    fi
+    echo -e "  ${WARN}·${NC} Stop all running services and remove from auto-start"
+    echo -e "  ${WARN}·${NC} Stop and delete JishuShell Colima VM (macOS)"
+    echo -e "  ${WARN}·${NC} Kill JishuShell-related processes"
+    echo -e "  ${WARN}·${NC} Remove docker context, npm package, PATH entries"
+    echo -e "  ${WARN}·${NC} Data directory (~/.jishushell) — will ask"
+    [[ $DO_DOCKER -eq 1 ]] && echo -e "  ${WARN}·${NC} Uninstall Docker/Colima system packages (brew/apt/dnf)"
+    [[ $DO_NOMAD  -eq 1 ]] && echo -e "  ${WARN}·${NC} Uninstall Nomad system package (brew/apt/dnf)"
     if [[ "$DRY_RUN" == "1" ]]; then
         echo ""
         echo -e "${WARN}  Dry-run mode: no changes will be made${NC}"
@@ -734,7 +660,8 @@ main() {
 
     show_plan
 
-    if ! confirm "This will stop all JishuShell services and remove them from auto-start. Proceed?"; then
+    # ── Phase 1: Stop services & clean runtime artifacts ──────────────────────
+    if ! confirm "Stop all JishuShell services and clean up runtime artifacts?"; then
         ui_info "Cancelled"
         exit 0
     fi
@@ -743,62 +670,20 @@ main() {
 
     stop_services || uninstall_errors=1
 
-    [[ $DO_NODE         -eq 1 ]] && { uninstall_node     || uninstall_errors=1; }
-    [[ $DO_OPENCLAW     -eq 1 ]] && { uninstall_openclaw || uninstall_errors=1; }
-    [[ $DO_NOMAD        -eq 1 ]] && { uninstall_nomad    || uninstall_errors=1; }
-    [[ $DO_DOCKER_CLEAN -eq 1 ]] && { clean_docker_data  || uninstall_errors=1; }
-    [[ $DO_DOCKER       -eq 1 ]] && { uninstall_docker   || uninstall_errors=1; }
+    # ── Phase 2: Delete data directory ────────────────────────────────────────
+    delete_data_dir || uninstall_errors=1
 
-    local jishu_home="${HOME}/.jishushell"
-    if [[ -d "$jishu_home" ]]; then
-        local size
-        size="$(du -sh "$jishu_home" 2>/dev/null | cut -f1 || echo "?")"
-        echo ""
-        ui_info "Data directory: ${jishu_home} (${size})"
-        # Auto-delete when --data flag is set (non-interactive, e.g. postuninstall)
-        local _delete_data=0
-        if [[ $DO_DATA -eq 1 ]]; then
-            _delete_data=1
-        else
-            ui_info "This contains your instances, config, and Nomad data."
-            if confirm "Delete data directory? (default: keep)"; then
-                _delete_data=1
-            fi
-        fi
-        if [[ $_delete_data -eq 1 ]]; then
-            if [[ "$DRY_RUN" == "1" ]]; then
-                ui_info "[dry-run] Would: docker rm any containers bind-mounted from ${jishu_home}"
-                ui_info "[dry-run] Would: ${SUDO} rm -rf ${jishu_home}"
-            else
-                # On macOS, Docker Desktop keeps VirtioFS shares open for containers that are
-                # stopped but not removed (docker rm).  Those open shares prevent rm -rf from
-                # deleting the bind-mounted directories.  Force-remove any such containers first.
-                if command -v docker &>/dev/null; then
-                    local _containers_to_rm
-                    _containers_to_rm="$(docker ps -a --format '{{.ID}}' 2>/dev/null | xargs -I{} sh -c \
-                        'docker inspect {} --format "{{.ID}} {{range .Mounts}}{{.Source}} {{end}}" 2>/dev/null' \
-                        | grep -F "$jishu_home" | awk '{print $1}' || true)"
-                    if [[ -n "$_containers_to_rm" ]]; then
-                        ui_info "Removing Docker containers with bind-mounts from ${jishu_home}..."
-                        echo "$_containers_to_rm" | xargs docker rm -f 2>/dev/null || true
-                    fi
-                fi
-                if [[ "$(uname -s)" == "Darwin" ]]; then
-                    ${SUDO} chflags -R nouchg,noschg "$jishu_home" 2>/dev/null || true
-                fi
-                ${SUDO} rm -rf "$jishu_home" || true
-                if [[ ! -d "$jishu_home" ]]; then
-                    ui_success "Data directory removed"
-                else
-                    ui_warn "Could not remove ${jishu_home}"
-                    uninstall_errors=1
-                fi
-            fi
+    # ── Phase 3: System package removal (only with explicit flags) ────────────
+    if [[ $DO_DOCKER -eq 1 ]]; then
+        if [[ "$OS" == "macos" ]]; then
+            uninstall_colima || uninstall_errors=1
         else
-            ui_info "Data directory kept: ${jishu_home}"
+            uninstall_docker || uninstall_errors=1
         fi
     fi
 
+    [[ $DO_NOMAD -eq 1 ]] && { uninstall_nomad || uninstall_errors=1; }
+
     echo ""
     if [[ $uninstall_errors -eq 0 ]]; then
         echo -e "${SUCCESS}${BOLD}Done.${NC}"