@sebastienrousseau/dotfiles 0.2.519 → 0.2.521

package/scripts/ops/chezmoi-apply.sh

@@ -1,333 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
-# Copyright (c) 2015-2026 Sebastien Rousseau
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../../lib/dot/ui.sh
-# shellcheck disable=SC1091
-source "$SCRIPT_DIR/../../lib/dot/ui.sh"
-# shellcheck source=../../lib/dot/log.sh
-# shellcheck disable=SC1091
-source "$SCRIPT_DIR/../../lib/dot/log.sh"
-# shellcheck source=../../lib/dot/ai-install.sh
-# shellcheck disable=SC1091
-source "$SCRIPT_DIR/../../lib/dot/ai-install.sh"
-export DOT_COMMAND="apply"
-
-# Temp file cleanup. `set +u` guards the array expansion: on bash 3.2
-# (macOS) expanding an empty array under `set -u` is an "unbound
-# variable" error, which would fire on every clean `dot sync`.
-_TMPFILES=()
-_LOCK_DIR=""
-cleanup() {
-  set +u
-  rm -f "${_TMPFILES[@]}" 2>/dev/null
-  [[ -n "$_LOCK_DIR" ]] && rmdir "$_LOCK_DIR" 2>/dev/null
-  set -u
-}
-trap cleanup EXIT
-
-# Help flag
-case "${1:-}" in
-  -h | --help)
-    cat <<HELP
-chezmoi-apply.sh - Apply dotfiles with enhanced diagnostics
-
-Usage:
-  dot apply [OPTIONS] [-- CHEZMOI_ARGS]
-
-Environment Variables:
-  DOTFILES_CHEZMOI_APPLY_FLAGS    Extra flags for chezmoi apply
-  DOTFILES_CHEZMOI_VERBOSE=1      Enable verbose output
-  DOTFILES_CHEZMOI_KEEP_GOING=1   Continue on errors
-  DOTFILES_NONINTERACTIVE=1       Skip interactive menus (AI provider installer)
-  DOTFILES_INTERACTIVE_APPLY=1    Re-enable chezmoi overwrite prompts
-                                  (apply is unattended/--force by default)
-  DOTFILES_ALIAS_STRICT_MODE=1    Run alias governance checks
-  DOTFILES_SNAPSHOT_ON_APPLY=1    Create baseline snapshot (default)
-  DOTFILES_POST_APPLY_REPAIR=1   Run post-apply repairs (default)
-  DOTFILES_CHEZMOI_STATUS=1      Show status after apply (default)
-HELP
-    exit 0
-    ;;
-esac
-
-args=("$@")
-if [[ -n "${DOTFILES_CHEZMOI_APPLY_FLAGS:-}" ]]; then
-  # Safely parse space-separated flags into array
-  read -ra flag_array <<<"$DOTFILES_CHEZMOI_APPLY_FLAGS"
-  args+=("${flag_array[@]}")
-fi
-
-if [[ "${DOTFILES_CHEZMOI_VERBOSE:-0}" = "1" ]]; then
-  args+=("--verbose")
-fi
-
-if [[ "${DOTFILES_CHEZMOI_KEEP_GOING:-0}" = "1" ]]; then
-  args+=("--keep-going")
-fi
-
-has_flag() {
-  local needle="$1"
-  local arg
-  # Guard the expansion: on bash 3.2 (macOS) iterating an empty array
-  # under `set -u` is an unbound-variable error.
-  [[ ${#args[@]} -eq 0 ]] && return 1
-  for arg in "${args[@]}"; do
-    [[ "$arg" == "$needle" ]] && return 0
-  done
-  return 1
-}
-
-# Apply unattended by default, like an OS package manager. chezmoi is
-# always run below under `gum spin` or with its output captured, so it
-# never has a controlling TTY; its "<file> has changed since chezmoi last
-# wrote it" confirmation prompt therefore cannot be answered and aborts
-# the run with "could not open a new TTY". Passing --force applies the
-# canonical source without prompting, so local drift to *managed* files
-# yields to the source — exactly how `apt`/system updates behave. Keep
-# machine-specific tweaks in the unmanaged ~/.zshrc.local or
-# ~/.config/zsh/rc.d.local/*.zsh, which chezmoi never overwrites.
-# Opt back into chezmoi's prompts with DOTFILES_INTERACTIVE_APPLY=1.
-if [[ "${DOTFILES_INTERACTIVE_APPLY:-0}" != "1" ]] && ! has_flag "--force"; then
-  args+=("--force")
-fi
-
-# Whether interactive menus (the optional AI-provider installer below) may
-# prompt. Suppressed without a TTY, under CI, or when non-interactive is
-# requested — so unattended runs never hang waiting on input.
-INTERACTIVE=1
-if [[ "${DOTFILES_NONINTERACTIVE:-0}" == "1" ]] || [[ -n "${CI:-}" ]] || [[ ! -t 0 ]] || [[ ! -t 1 ]]; then
-  INTERACTIVE=0
-fi
-
-ui_init
-
-# Prevent concurrent execution. flock(1) is Linux-only — it does not exist
-# on macOS, where `! flock` previously took the "already running" branch and
-# made `dot apply` a silent no-op. Use flock where present, otherwise fall
-# back to an atomic mkdir lock (portable to macOS/BSD).
-_lock_base="${XDG_RUNTIME_DIR:-${TMPDIR:-/tmp}}/dotfiles-chezmoi-apply"
-if command -v flock >/dev/null 2>&1; then
-  exec 9>"${_lock_base}.lock"
-  if ! flock -n 9; then
-    ui_warn "Already running" "Another instance is active"
-    exit 0
-  fi
-elif ! mkdir "${_lock_base}.lock.d" 2>/dev/null; then
-  ui_warn "Already running" "Another instance is active"
-  exit 0
-else
-  _LOCK_DIR="${_lock_base}.lock.d" # removed by cleanup() on exit
-fi
-
-run_step() {
-  local title="$1"
-  shift
-  local out
-  out="$(umask 077 && mktemp)"
-  _TMPFILES+=("$out")
-  if [[ "$UI_ENABLED" = "1" ]]; then
-    if gum spin --spinner dot --title "$title" -- "$@" >"$out" 2>&1; then
-      ui_ok "$title"
-      if [[ "${DOTFILES_CHEZMOI_VERBOSE:-0}" = "1" ]] && [[ -s "$out" ]]; then
-        cat "$out"
-      fi
-    else
-      ui_err "$title"
-      cat "$out"
-      rm -f "$out"
-      exit 1
-    fi
-  else
-    echo "$title..."
-    if "$@" >"$out" 2>&1; then
-      if [[ "${DOTFILES_CHEZMOI_VERBOSE:-0}" = "1" ]] && [[ -s "$out" ]]; then
-        cat "$out"
-      fi
-    else
-      cat "$out"
-      rm -f "$out"
-      exit 1
-    fi
-  fi
-  rm -f "$out"
-}
-
-dot_log info "apply_start"
-_apply_start=$(date +%s)
-ui_header "Applying dotfiles"
-if [[ "${DOTFILES_ALIAS_STRICT_MODE:-0}" == "1" ]]; then
-  governance_script="$SCRIPT_DIR/../diagnostics/alias-governance.sh"
-  if [[ -f "$governance_script" ]]; then
-    run_step "Alias governance (strict)" env DOTFILES_ALIAS_POLICY=strict bash "$governance_script"
-  fi
-fi
-run_step "Chezmoi apply" chezmoi apply "${args[@]}"
-
-if [[ "${DOTFILES_SNAPSHOT_ON_APPLY:-1}" = "1" ]]; then
-  snapshot_script="$SCRIPT_DIR/../diagnostics/snapshot.sh"
-  snapshot_dir="${XDG_STATE_HOME:-$HOME/.local/state}/dotfiles/snapshots"
-  snapshot_file="${snapshot_dir}/baseline.json"
-  if [[ -f "$snapshot_script" && ! -f "$snapshot_file" ]]; then
-    mkdir -p "$snapshot_dir"
-    bash "$snapshot_script" --baseline >/dev/null 2>&1 || true
-  fi
-fi
-
-check_cmd() {
-  local cmd="$1"
-  if command -v "$cmd" &>/dev/null; then
-    return 0
-  fi
-  if command -v mise &>/dev/null; then
-    if mise ls --installed 2>/dev/null | grep -qE "($cmd|aqua:.*$cmd)"; then
-      return 0
-    fi
-  fi
-  return 1
-}
-
-echo ""
-ui_header "AI provider CLI checks (optional)"
-
-# binary|mise_package|label  (claude uses the native installer, not mise)
-_AI_PROVIDERS=(
-  "claude|native|Claude Code"
-  "codex|npm:@openai/codex|Codex CLI"
-  "copilot|npm:@github/copilot|Copilot CLI"
-  "goose|native|Goose"
-  "agy|native|Antigravity CLI"
-  "kimi|native|Kimi CLI"
-  "sgpt|pipx:shell-gpt|Shell-GPT"
-  "ollama|aqua:ollama/ollama|Ollama"
-  "opencode|npm:opencode-ai|OpenCode"
-  "aider|pipx:aider-chat|Aider"
-  "kiro-cli|kiro-cli|Kiro CLI"
-  "autohand|npm:autohand-cli|Autohand Code"
-  "vibe|pipx:mistral-vibe|Mistral Vibe"
-  "qwen|npm:@qwen-code/qwen-code|Qwen Code"
-  "zai|npm:@guizmo-ai/zai-cli|ZAI"
-)
-
-_ai_missing=()
-for _entry in "${_AI_PROVIDERS[@]}"; do
-  IFS='|' read -r _bin _pkg _label <<<"$_entry"
-  if check_cmd "$_bin"; then
-    ui_ok "$_label"
-  else
-    ui_info "$_label" "not installed"
-    _ai_missing+=("$_entry")
-  fi
-done
-
-if [[ ${#_ai_missing[@]} -gt 0 ]] && [[ "$INTERACTIVE" == "1" ]]; then
-  if command -v mise &>/dev/null; then
-    echo ""
-    _ai_install_action=""
-    if command -v gum &>/dev/null; then
-      _ai_install_action=$(printf '%s\n' "Install all" "Choose which to install" "Skip" |
-        gum choose --header "Missing AI providers — install via mise?") || _ai_install_action=""
-    else
-      ui_info "Tip" "Install all missing AI providers with: mise install"
-      ui_info "Tip" "Or individually: mise use -g <package>@latest"
-    fi
-
-    _ai_to_install=()
-    case "$_ai_install_action" in
-      "Install all")
-        _ai_to_install=("${_ai_missing[@]}")
-        ;;
-      "Choose which to install")
-        _ai_pick_choices=()
-        for _entry in "${_ai_missing[@]}"; do
-          IFS='|' read -r _bin _pkg _label <<<"$_entry"
-          _ai_pick_choices+=("$_label")
-        done
-        _ai_picked=$(printf '%s\n' "${_ai_pick_choices[@]}" |
-          gum choose --no-limit --header "Select providers to install (Space to toggle, Enter to confirm)") || _ai_picked=""
-        if [[ -n "$_ai_picked" ]]; then
-          while IFS= read -r _selected; do
-            [[ -z "$_selected" ]] && continue
-            for _entry in "${_ai_missing[@]}"; do
-              IFS='|' read -r _bin _pkg _label <<<"$_entry"
-              if [[ "$_label" == "$_selected" ]]; then
-                _ai_to_install+=("$_entry")
-              fi
-            done
-          done <<<"$_ai_picked"
-        fi
-        ;;
-    esac
-
-    if [[ ${#_ai_to_install[@]} -gt 0 ]]; then
-      echo ""
-      for _entry in "${_ai_to_install[@]}"; do
-        IFS='|' read -r _bin _pkg _label <<<"$_entry"
-        if [[ "$_bin" == "claude" ]]; then
-          install_claude_native "$_label"
-          continue
-        fi
-        if [[ "$_bin" == "goose" ]]; then
-          install_goose_native "$_label"
-          continue
-        fi
-        if [[ "$_bin" == "agy" ]]; then
-          install_agy_native "$_label"
-          continue
-        fi
-        if [[ "$_bin" == "kimi" ]]; then
-          install_kimi_native "$_label"
-          continue
-        fi
-        if command -v gum &>/dev/null; then
-          if gum spin --spinner dot --title "Installing $_label ($_pkg)" -- \
-            mise use -g "$_pkg@latest" 2>&1; then
-            ui_ok "$_label" "installed"
-          else
-            ui_warn "$_label" "install failed (continuing)"
-          fi
-        else
-          ui_info "Installing" "$_label via mise ($_pkg)"
-          mise use -g "$_pkg@latest" 2>&1 || ui_warn "$_label" "install failed (continuing)"
-        fi
-      done
-    fi
-  else
-    ui_warn "mise" "not found — install mise first to manage AI providers"
-  fi
-fi
-
-if [[ "${DOTFILES_CHEZMOI_STATUS:-1}" = "1" ]]; then
-  printf "\n"
-  ui_header "Status"
-  status_out="$(chezmoi status || true)"
-  if [[ -z "$status_out" ]]; then
-    ui_ok "Clean"
-  else
-    printf "%s\n" "$status_out"
-  fi
-fi
-
-if [[ "${DOTFILES_POST_APPLY_REPAIR:-1}" = "1" ]]; then
-  post_apply_script="$SCRIPT_DIR/post-apply-repair.sh"
-  if [[ -f "$post_apply_script" ]]; then
-    printf "\n"
-    bash "$post_apply_script" || true
-  fi
-fi
-
-if [[ "${DOTFILES_PREWARM_ON_APPLY:-1}" = "1" ]]; then
-  prewarm_script="$SCRIPT_DIR/prewarm.sh"
-  if [[ -f "$prewarm_script" ]]; then
-    printf "\n"
-    run_step "Pre-warming shell caches" bash "$prewarm_script"
-  fi
-fi
-
-printf "\n"
-_apply_end=$(date +%s)
-dot_log info "apply_end" "duration_s=$((_apply_end - _apply_start))"
-dot_metric "chezmoi_apply_duration" "$((_apply_end - _apply_start))" "s"
-ui_info "Shell reload" "Run 'exec zsh' or restart your terminal to reload aliases/functions."

package/scripts/ops/chezmoi-diff.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
-# Copyright (c) 2015-2026 Sebastien Rousseau
-set -euo pipefail
-
-excludes=(scripts)
-if [[ -n "${DOTFILES_CHEZMOI_DIFF_EXCLUDES:-}" ]]; then
-  IFS=',' read -r -a excludes <<<"${DOTFILES_CHEZMOI_DIFF_EXCLUDES}"
-fi
-
-args=()
-for ex in "${excludes[@]}"; do
-  args+=("--exclude" "$ex")
-done
-
-chezmoi diff "${args[@]}" "$@"

package/scripts/ops/chezmoi-remove.sh

@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
-# Copyright (c) 2015-2026 Sebastien Rousseau
-set -euo pipefail
-
-if [[ $# -lt 1 ]]; then
-  echo "Usage: dot remove <path> [--source] [--dry-run]" >&2
-  exit 1
-fi
-
-remove_source=0
-args=()
-paths=()
-
-for arg in "$@"; do
-  case "$arg" in
-    --source)
-      remove_source=1
-      ;;
-    --dry-run)
-      args+=("--dry-run")
-      ;;
-    *)
-      paths+=("$arg")
-      ;;
-  esac
-done
-
-if [[ ${#paths[@]} -eq 0 ]]; then
-  echo "No path provided." >&2
-  exit 1
-fi
-
-# shellcheck disable=SC1091
-if [[ $remove_source -eq 0 ]]; then
-  args+=("--keep-source")
-fi
-
-printf "About to run: chezmoi remove %s %s\n" "${args[*]}" "${paths[*]}"
-read -r -p "Proceed? [y/N] " confirm
-if [[ "$confirm" != "y" && "$confirm" != "Y" ]]; then
-  echo "Aborted."
-  exit 1
-fi
-
-chezmoi remove "${args[@]}" "${paths[@]}"

package/scripts/ops/chezmoi-update.sh

@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
-# Copyright (c) 2015-2026 Sebastien Rousseau
-set -euo pipefail
-
-args=()
-if [[ -n "${DOTFILES_CHEZMOI_UPDATE_FLAGS:-}" ]]; then
-  # Safely parse space-separated flags into array
-  read -ra flag_array <<<"$DOTFILES_CHEZMOI_UPDATE_FLAGS"
-  args+=("${flag_array[@]}")
-fi
-
-if [[ "${DOTFILES_CHEZMOI_VERBOSE:-0}" = "1" ]]; then
-  args+=("--verbose")
-fi
-
-# Apply unattended by default (see chezmoi-apply.sh). `chezmoi update` runs
-# `apply` internally, so without --force it blocks on the "<file> has
-# changed since chezmoi last wrote it" prompt — and `dot update` is often
-# run from cron/CI/--async with no TTY, where that prompt aborts the run.
-# --force makes updates land like an OS package-manager update; opt back
-# into prompting with DOTFILES_INTERACTIVE_APPLY=1.
-if [[ "${DOTFILES_INTERACTIVE_APPLY:-0}" != "1" ]]; then
-  _has_force=0
-  if [[ ${#args[@]} -gt 0 ]]; then
-    for _a in "${args[@]}"; do [[ "$_a" == "--force" ]] && _has_force=1; done
-  fi
-  [[ "$_has_force" == "0" ]] && args+=("--force")
-fi
-
-ASYNC=false
-if [[ "${DOTFILES_ASYNC_UPDATE:-0}" = "1" ]]; then
-  ASYNC=true
-fi
-if [[ "${1:-}" == "--async" ]]; then
-  ASYNC=true
-  shift
-fi
-
-STATE_DIR="${XDG_STATE_HOME:-$HOME/.local/state}/dotfiles/update"
-mkdir -p "$STATE_DIR"
-LOG_FILE="$STATE_DIR/last.log"
-STATUS_FILE="$STATE_DIR/last.status"
-NOTICE_FILE="$STATE_DIR/notice"
-
-run_update() {
-  echo "Updating dotfiles..."
-  chezmoi update "${args[@]}"
-}
-
-if $ASYNC; then
-  echo "Update running in background..."
-  {
-    run_update
-    echo $? >"$STATUS_FILE"
-  } >"$LOG_FILE" 2>&1 &
-  date -u +%Y-%m-%dT%H:%M:%SZ >"$NOTICE_FILE"
-  disown || true
-  exit 0
-fi
-
-run_update
-echo $? >"$STATUS_FILE"

package/scripts/ops/heal-chezmoi.sh

@@ -1,87 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
-# Copyright (c) 2015-2026 Sebastien Rousseau
-# shellcheck disable=SC2034
-# =============================================================================
-# heal-chezmoi.sh — Chezmoi drift and backup repair functions for heal.sh
-# Sourced by heal.sh; inherits set -euo pipefail, ui.sh, and shared variables.
-# =============================================================================
-
-create_pre_heal_backup() {
-  local rollback_script="$REPO_ROOT/scripts/ops/rollback.sh"
-  if [[ -f "$rollback_script" ]]; then
-    log_info "Creating backup before heal..."
-    bash "$rollback_script" backup --force 2>/dev/null || true
-  else
-    # Minimal inline backup
-    local timestamp
-    timestamp=$(date +"%Y%m%d_%H%M%S")
-    local backup_path="$BACKUP_DIR/backup_${timestamp}_pre_heal"
-    mkdir -p "$backup_path"
-    for f in "$HOME/.bashrc" "$HOME/.zshrc" "$HOME/.profile"; do
-      if [[ -f "$f" ]]; then
-        cp -a "$f" "$backup_path/" 2>/dev/null || true
-      fi
-    done
-    log_info "Backup created at $backup_path"
-  fi
-}
-
-heal_chezmoi_drift() {
-  if ! command -v chezmoi >/dev/null 2>&1; then return 0; fi
-
-  local status_output
-  status_output=$(chezmoi status 2>/dev/null || echo "")
-
-  if [[ -z "$status_output" ]]; then
-    printf '  \033[38;5;42m✓\033[0m chezmoi state\n'
-    return 0
-  fi
-
-  # Partition the drift: column 2 is what `chezmoi apply` would fix
-  # (destination differs from source). Column 1 is source-only drift
-  # (unstaged edits in the chezmoi source tree). Apply can't help with
-  # the second case — that needs `git commit` in the source repo.
-  local applicable
-  local source_only
-  applicable=$(printf '%s\n' "$status_output" | awk 'substr($0,2,1)!=" "' | wc -l | tr -d ' ')
-  source_only=$(printf '%s\n' "$status_output" | awk 'substr($0,1,1)!=" " && substr($0,2,1)==" "' | wc -l | tr -d ' ')
-
-  ISSUES_FOUND=$((ISSUES_FOUND + 1))
-
-  if [[ "$DRY_RUN" == "1" ]]; then
-    log_dry "run 'chezmoi apply --force' to re-sync ($applicable file(s))"
-    return 0
-  fi
-
-  # Skip the apply if every file is source-only drift; nothing to fix.
-  if [[ "$applicable" -eq 0 ]]; then
-    printf '  \033[38;5;220m⚠\033[0m chezmoi state                       %s file(s) modified in source only — commit or revert in the source repo\n' "$source_only"
-    return 0
-  fi
-
-  # Capture apply output so we can surface failure reasons.
-  local apply_log
-  apply_log=$(mktemp)
-  if chezmoi apply --force >"$apply_log" 2>&1; then
-    FIXES_APPLIED=$((FIXES_APPLIED + 1))
-    CHEZMOI_APPLIED=1
-    persist_log "HEAL: chezmoi apply --force"
-
-    # Verify: did apply actually clean the drift?
-    local remaining
-    remaining=$(chezmoi status 2>/dev/null | awk 'substr($0,2,1)!=" "' | wc -l | tr -d ' ')
-    if [[ "$remaining" -eq 0 ]]; then
-      printf '  \033[38;5;42m✓\033[0m chezmoi re-apply                     %s file(s) synced\n' "$applicable"
-    else
-      # shellcheck disable=SC2016
-      printf '  \033[38;5;220m⚠\033[0m chezmoi re-apply                     %s applied, %s still drifted — run `chezmoi diff` to inspect\n' \
-        "$((applicable - remaining))" "$remaining"
-    fi
-  else
-    printf '  \033[38;5;196m✗\033[0m chezmoi re-apply                     failed; see %s\n' "$apply_log"
-    tail -5 "$apply_log" | sed 's/^/      /'
-    return 1
-  fi
-  rm -f "$apply_log"
-}

package/scripts/ops/heal-system.sh

@@ -1,129 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
-# Copyright (c) 2015-2026 Sebastien Rousseau
-# shellcheck disable=SC2034
-# =============================================================================
-# heal-system.sh — System-level repair functions for heal.sh
-# Sourced by heal.sh; inherits set -euo pipefail, ui.sh, and shared variables.
-# =============================================================================
-
-heal_broken_symlinks() {
-  local broken=()
-
-  while IFS= read -r -d '' link; do
-    local filename
-    filename=$(basename "$link")
-
-    # Skip known false positives (e.g., Chrome lock files in backups)
-    [[ "$link" == *"google-chrome-backup"* ]] && continue
-    [[ "$filename" == "SingletonLock" || "$filename" == "SingletonCookie" || "$filename" == "SingletonSocket" ]] && continue
-
-    if [[ ! -e "$link" ]]; then
-      broken+=("$link")
-    fi
-  done < <(find "$HOME" -maxdepth 3 -type l -print0 2>/dev/null || true)
-
-  # Special handling for common transient/app locks that dot doctor reported
-  local lock_patterns=("SingletonLock" "SingletonCookie")
-
-  if [[ ${#broken[@]} -eq 0 ]]; then
-    printf '  \033[38;5;42m✓\033[0m symlinks\n'
-    return 0
-  fi
-
-  ISSUES_FOUND=$((ISSUES_FOUND + ${#broken[@]}))
-
-  for link in "${broken[@]}"; do
-    local target
-    target=$(readlink "$link" 2>/dev/null || echo "unknown")
-    local filename
-    filename=$(basename "$link")
-
-    local is_lock=0
-    for pat in "${lock_patterns[@]}"; do
-      if [[ "$filename" == *"$pat"* ]]; then
-        is_lock=1
-        break
-      fi
-    done
-
-    if [[ "$DRY_RUN" == "1" ]]; then
-      log_dry "remove broken symlink: $link -> $target"
-    else
-      if [[ "$is_lock" == "0" ]] && [[ "$FORCE" != "1" ]] && [[ "${DOTFILES_NONINTERACTIVE:-0}" != "1" ]]; then
-        read -rp "Remove broken symlink $link -> $target? [y/N] " response
-        if [[ ! "$response" =~ ^[Yy]$ ]]; then
-          continue
-        fi
-      fi
-      if rm -f "$link" 2>/dev/null; then
-        printf '  \033[38;5;42m✓\033[0m removed %s\n' "$link"
-        FIXES_APPLIED=$((FIXES_APPLIED + 1))
-        persist_log "HEAL: removed broken symlink $link"
-      else
-        printf '  \033[38;5;214m⚠\033[0m could not remove %s\n' "$link"
-      fi
-    fi
-  done
-}
-
-heal_missing_critical_files() {
-  local critical_files=("$HOME/.zshrc" "$HOME/.bashrc" "$HOME/.profile")
-  local missing=()
-
-  for file in "${critical_files[@]}"; do
-    if [[ ! -f "$file" ]] && [[ ! -L "$file" ]]; then
-      missing+=("$file")
-      ISSUES_FOUND=$((ISSUES_FOUND + 1))
-    fi
-  done
-
-  if [[ ${#missing[@]} -eq 0 ]]; then
-    printf '  \033[38;5;42m✓\033[0m shell configs\n'
-    return 0
-  fi
-
-  if ! command -v chezmoi >/dev/null 2>&1; then return 1; fi
-
-  if [[ "$DRY_RUN" == "1" ]]; then
-    log_dry "regenerate missing files via chezmoi"
-  elif [[ "$CHEZMOI_APPLIED" != "1" ]]; then
-    if _pkg_install "shell configs" 0 1 chezmoi apply --force; then
-      CHEZMOI_APPLIED=1
-      local restored=0
-      for file in "${missing[@]}"; do
-        if [[ -f "$file" ]] || [[ -L "$file" ]]; then
-          restored=$((restored + 1))
-        fi
-      done
-      FIXES_APPLIED=$((FIXES_APPLIED + restored))
-      persist_log "HEAL: regenerated $restored critical file(s)"
-    fi
-  fi
-}
-
-heal_missing_xdg_dirs() {
-  local xdg_dirs=("$HOME/.config/shell" "$HOME/.config/nvim" "$HOME/.config/git")
-  local missing=()
-
-  for dir in "${xdg_dirs[@]}"; do
-    [[ -d "$dir" ]] || missing+=("$dir")
-  done
-
-  if [[ ${#missing[@]} -eq 0 ]]; then
-    printf '  \033[38;5;42m✓\033[0m xdg directories\n'
-    return 0
-  fi
-
-  ISSUES_FOUND=$((ISSUES_FOUND + ${#missing[@]}))
-  for dir in "${missing[@]}"; do
-    if [[ "$DRY_RUN" == "1" ]]; then
-      log_dry "create directory: $dir"
-    else
-      mkdir -p "$dir"
-      printf '  \033[38;5;42m✓\033[0m %s\n' "$(basename "$dir")"
-      FIXES_APPLIED=$((FIXES_APPLIED + 1))
-      persist_log "HEAL: created directory $dir"
-    fi
-  done
-}