@sebastienrousseau/dotfiles 0.2.481 → 0.2.500

package/scripts/ops/heal.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 # shellcheck disable=SC2034
 # =============================================================================
 # Dotfiles Heal Script - Auto-repair common dotfiles issues
@@ -8,39 +9,48 @@
 
 set -euo pipefail
 
+_cleanup_files=()
+LOCK_DIR=""
+cleanup() {
+  rm -f "${_cleanup_files[@]:-}"
+  if [[ -n "$LOCK_DIR" ]]; then
+    rmdir "$LOCK_DIR" 2>/dev/null || true
+  fi
+}
+trap cleanup EXIT
+
 # Configuration
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=../dot/lib/ui.sh
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/../dot/lib/ui.sh"
+# shellcheck source=../dot/lib/log.sh
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/../dot/lib/log.sh"
+DOT_COMMAND="heal"
 REPO_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")"
 DOTFILES_SOURCE="$REPO_ROOT"
 BACKUP_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/dotfiles/backups"
 STATE_DIR="${XDG_STATE_HOME:-$HOME/.local/state}/dotfiles"
 HEAL_LOG="$STATE_DIR/heal.log"
 
-# Colors (respect NO_COLOR: https://no-color.org)
-if [[ -z "${NO_COLOR:-}" ]] && [[ -t 1 ]]; then
-  RED='\033[0;31m'
-  GREEN='\033[0;32m'
-  YELLOW='\033[0;33m'
-  BLUE='\033[0;34m'
-  BOLD='\033[1m'
-  NC='\033[0m'
-else
-  RED='' GREEN='' YELLOW='' BLUE='' BOLD='' NC=''
-fi
-
-# Logging
-log() { echo -e "$*"; }
-log_info() { log "${BLUE}[INFO]${NC} $*"; }
-log_success() { log "${GREEN}[OK]${NC} $*"; }
-log_warn() { log "${YELLOW}[WARN]${NC} $*"; }
-log_error() { log "${RED}[ERROR]${NC} $*"; }
-log_step() { log "\n${BOLD}==> $*${NC}"; }
-log_dry() { log "${YELLOW}[DRY-RUN]${NC} Would: $*"; }
+# Logging — delegates to shared ui.sh primitives
+ui_init
+log() { printf '%b\n' "$*"; }
+log_info() { ui_info "$@"; }
+log_success() { ui_ok "$@"; }
+log_warn() { ui_warn "$@"; }
+log_error() { ui_err "$@"; }
+log_step() {
+  echo ""
+  ui_section "$*"
+}
+log_dry() { ui_warn "DRY-RUN" "Would: $*"; }
 
 # Persistent logging
 persist_log() {
   mkdir -p "$STATE_DIR"
-  echo "[$(date -Iseconds)] $*" >>"$HEAL_LOG"
+  echo "[$(date -u +%Y-%m-%dT%H:%M:%SZ)] $*" >>"$HEAL_LOG"
 }
 
 # Options
@@ -49,6 +59,7 @@ FORCE=0
 FIXES_APPLIED=0
 ISSUES_FOUND=0
 CHEZMOI_APPLIED=0
+MISSING_DEPS_FOUND=0
 
 usage() {
   cat <<EOF
@@ -61,8 +72,12 @@ Options:
   -f, --force     Skip confirmation prompts
   -h, --help      Show this help message
 
+Environment:
+  DOTFILES_NONINTERACTIVE=1   Skip all interactive prompts (same as --force)
+
 Repairs:
-  - Missing core dependencies (chezmoi, starship, rg, bat)
+  - Missing tools (zsh, starship, rg, bat, fzf, zoxide, atuin, yazi, zellij,
+    nushell, pueue, wasmtime, sops, age, hyperfine)
   - Broken symlinks in \$HOME (depth 3)
   - Chezmoi drift (re-applies dotfiles)
   - Missing critical files (.zshrc, .bashrc, .profile)
@@ -94,313 +109,46 @@ while [[ $# -gt 0 ]]; do
   esac
 done
 
-# =============================================================================
-# Backup before making changes
-# =============================================================================
-
-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
-}
-
-# =============================================================================
-# Repair Functions
-# =============================================================================
-
-detect_pkg_manager() {
-  if command -v brew >/dev/null 2>&1; then
-    echo "brew"
-  elif command -v apt-get >/dev/null 2>&1; then
-    echo "apt"
-  elif command -v dnf >/dev/null 2>&1; then
-    echo "dnf"
-  elif command -v pacman >/dev/null 2>&1; then
-    echo "pacman"
-  elif command -v nix-env >/dev/null 2>&1; then
-    echo "nix"
-  else
-    echo ""
-  fi
-}
-
-install_package() {
-  local pkg="$1"
-  local pkg_mgr
-  pkg_mgr=$(detect_pkg_manager)
-
-  case "$pkg_mgr" in
-    brew) brew install "$pkg" ;;
-    apt) sudo apt-get install -y "$pkg" ;;
-    dnf) sudo dnf install -y "$pkg" ;;
-    pacman) sudo pacman -S --noconfirm "$pkg" ;;
-    nix) nix-env -iA "nixpkgs.$pkg" ;;
-    *)
-      log_error "No supported package manager found. Install '$pkg' manually."
-      return 1
-      ;;
-  esac
-}
-
-# Map command names to package names per package manager
-get_package_name() {
-  local cmd="$1"
-  local pkg_mgr
-  pkg_mgr=$(detect_pkg_manager)
-
-  case "$cmd" in
-    rg)
-      case "$pkg_mgr" in
-        apt | dnf) echo "ripgrep" ;;
-        *) echo "ripgrep" ;;
-      esac
-      ;;
-    bat)
-      case "$pkg_mgr" in
-        apt) echo "bat" ;;
-        *) echo "bat" ;;
-      esac
-      ;;
-    *) echo "$cmd" ;;
-  esac
-}
-
-heal_missing_dependencies() {
-  log_step "Checking core dependencies"
-  local deps=(chezmoi starship rg bat)
-  local missing=()
-
-  for cmd in "${deps[@]}"; do
-    if ! command -v "$cmd" >/dev/null 2>&1; then
-      missing+=("$cmd")
-      ISSUES_FOUND=$((ISSUES_FOUND + 1))
-    fi
-  done
-
-  if [[ ${#missing[@]} -eq 0 ]]; then
-    log_success "All core dependencies present"
-    return 0
-  fi
-
-  log_warn "Missing dependencies: ${missing[*]}"
-
-  local pkg_mgr
-  pkg_mgr=$(detect_pkg_manager)
-
-  if [[ -z "$pkg_mgr" ]]; then
-    log_error "No supported package manager detected. Install manually: ${missing[*]}"
-    return 1
-  fi
-
-  for cmd in "${missing[@]}"; do
-    local pkg
-    pkg=$(get_package_name "$cmd")
-
-    if [[ "$DRY_RUN" == "1" ]]; then
-      log_dry "install '$pkg' via $pkg_mgr"
-    else
-      log_info "Installing $pkg via $pkg_mgr..."
-      if install_package "$pkg"; then
-        log_success "Installed $pkg"
-        FIXES_APPLIED=$((FIXES_APPLIED + 1))
-        persist_log "HEAL: installed $pkg via $pkg_mgr"
-      else
-        log_error "Failed to install $pkg"
-      fi
-    fi
-  done
-}
-
-heal_broken_symlinks() {
-  log_step "Checking for broken symlinks"
-  local broken=()
-
-  while IFS= read -r -d '' link; do
-    if [[ ! -e "$link" ]]; then
-      broken+=("$link")
-    fi
-  done < <(find "$HOME" -maxdepth 3 -type l -print0 2>/dev/null)
-
-  if [[ ${#broken[@]} -eq 0 ]]; then
-    log_success "No broken symlinks found"
-    return 0
-  fi
-
-  ISSUES_FOUND=$((ISSUES_FOUND + ${#broken[@]}))
-  log_warn "${#broken[@]} broken symlink(s) found"
-
-  for link in "${broken[@]}"; do
-    local target
-    target=$(readlink "$link" 2>/dev/null || echo "unknown")
-    if [[ "$DRY_RUN" == "1" ]]; then
-      log_dry "remove broken symlink: $link -> $target"
-    else
-      if [[ "$FORCE" != "1" ]]; then
-        read -rp "Remove broken symlink $link -> $target? [y/N] " response
-        if [[ ! "$response" =~ ^[Yy]$ ]]; then
-          log_info "Skipped: $link"
-          continue
-        fi
-      fi
-      rm -f "$link"
-      log_success "Removed broken symlink: $link -> $target"
-      FIXES_APPLIED=$((FIXES_APPLIED + 1))
-      persist_log "HEAL: removed broken symlink $link"
-    fi
-  done
-}
-
-heal_chezmoi_drift() {
-  log_step "Checking chezmoi state"
-
-  if ! command -v chezmoi >/dev/null 2>&1; then
-    log_warn "chezmoi not installed, skipping drift check"
-    return 0
-  fi
-
-  local status_output
-  status_output=$(chezmoi status 2>/dev/null || echo "")
-
-  if [[ -z "$status_output" ]]; then
-    log_success "Chezmoi state is synchronized"
-    return 0
-  fi
-
-  local drift_count
-  drift_count=$(echo "$status_output" | wc -l | tr -d ' ')
-  ISSUES_FOUND=$((ISSUES_FOUND + 1))
-  log_warn "$drift_count file(s) out of sync"
-
-  if [[ "$DRY_RUN" == "1" ]]; then
-    log_dry "run 'chezmoi apply --force' to re-sync"
-    echo "$status_output" | while read -r line; do
-      log_info "  $line"
-    done
-  else
-    log_info "Re-applying dotfiles with chezmoi..."
-    if chezmoi apply --force; then
-      log_success "Chezmoi re-applied successfully"
-      FIXES_APPLIED=$((FIXES_APPLIED + 1))
-      CHEZMOI_APPLIED=1
-      persist_log "HEAL: chezmoi apply --force ($drift_count files drifted)"
-    else
-      log_error "Chezmoi apply failed"
-    fi
-  fi
-}
-
-heal_missing_critical_files() {
-  log_step "Checking 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))
+# Prevent concurrent execution
+# Prefer XDG runtime dir when it exists and is writable; fallback to /tmp.
+LOCK_BASE="/tmp"
+if [[ -n "${XDG_RUNTIME_DIR:-}" ]] && [[ -d "${XDG_RUNTIME_DIR}" ]] && [[ -w "${XDG_RUNTIME_DIR}" ]]; then
+  LOCK_BASE="${XDG_RUNTIME_DIR}"
+fi
+LOCK_FILE="${LOCK_BASE}/dotfiles-heal.lock"
+LOCK_DIR="${LOCK_FILE}.d"
+if command -v flock >/dev/null 2>&1; then
+  exec 9>"$LOCK_FILE"
+  if ! flock -n 9; then
+    # Fallback path for systems where flock exists but cannot lock reliably.
+    if ! mkdir "$LOCK_DIR" 2>/dev/null; then
+      ui_warn "Already running" "Another instance is active"
+      exit 0
     fi
-  done
-
-  if [[ ${#missing[@]} -eq 0 ]]; then
-    log_success "All critical shell configs present"
-    return 0
   fi
-
-  log_warn "Missing critical files: ${missing[*]}"
-
-  if ! command -v chezmoi >/dev/null 2>&1; then
-    log_error "chezmoi not available to regenerate files"
-    return 1
-  fi
-
-  if [[ "$DRY_RUN" == "1" ]]; then
-    log_dry "run 'chezmoi apply --force' to regenerate missing files"
-  elif [[ "$CHEZMOI_APPLIED" == "1" ]]; then
-    log_info "chezmoi already re-applied during drift repair, verifying files..."
-    local restored=0
-    for file in "${missing[@]}"; do
-      if [[ -f "$file" ]] || [[ -L "$file" ]]; then
-        log_success "Restored (via earlier apply): $file"
-        restored=$((restored + 1))
-      else
-        log_warn "Still missing after apply: $file"
-      fi
-    done
-    FIXES_APPLIED=$((FIXES_APPLIED + restored))
-  else
-    log_info "Re-applying chezmoi to regenerate missing files..."
-    if chezmoi apply --force; then
-      CHEZMOI_APPLIED=1
-      # Verify files were restored
-      local restored=0
-      for file in "${missing[@]}"; do
-        if [[ -f "$file" ]] || [[ -L "$file" ]]; then
-          log_success "Restored: $file"
-          restored=$((restored + 1))
-        else
-          log_warn "Still missing after apply: $file"
-        fi
-      done
-      FIXES_APPLIED=$((FIXES_APPLIED + restored))
-      persist_log "HEAL: regenerated $restored critical file(s)"
-    else
-      log_error "Chezmoi apply failed"
-    fi
+else
+  # Portable fallback when flock is unavailable (e.g. default macOS envs).
+  if ! mkdir "$LOCK_DIR" 2>/dev/null; then
+    ui_warn "Already running" "Another instance is active"
+    exit 0
   fi
-}
-
-heal_missing_xdg_dirs() {
-  log_step "Checking XDG config directories"
-  local xdg_dirs=(
-    "$HOME/.config/shell"
-    "$HOME/.config/nvim"
-    "$HOME/.config/git"
-  )
-  local missing=()
+fi
 
-  for dir in "${xdg_dirs[@]}"; do
-    if [[ ! -d "$dir" ]]; then
-      missing+=("$dir")
-      ISSUES_FOUND=$((ISSUES_FOUND + 1))
-    fi
-  done
+# =============================================================================
+# Load modules (inherit scope: set -euo pipefail, ui.sh, and all variables)
+# =============================================================================
 
-  if [[ ${#missing[@]} -eq 0 ]]; then
-    log_success "All XDG config directories present"
-    return 0
-  fi
+# shellcheck source=heal-tools.sh
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/heal-tools.sh"
 
-  log_warn "Missing XDG directories: ${missing[*]}"
+# shellcheck source=heal-system.sh
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/heal-system.sh"
 
-  for dir in "${missing[@]}"; do
-    if [[ "$DRY_RUN" == "1" ]]; then
-      log_dry "create directory: $dir"
-    else
-      mkdir -p "$dir"
-      log_success "Created: $dir"
-      FIXES_APPLIED=$((FIXES_APPLIED + 1))
-      persist_log "HEAL: created directory $dir"
-    fi
-  done
-}
+# shellcheck source=heal-chezmoi.sh
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/heal-chezmoi.sh"
 
 # =============================================================================
 # Main
@@ -408,59 +156,67 @@ heal_missing_xdg_dirs() {
 
 main() {
   echo ""
-  echo "=========================================="
-  echo "     Dotfiles Heal - Auto-Repair"
-  echo "=========================================="
+  printf '  \033[1mDotfiles Heal\033[0m\n'
+  echo ""
 
   if [[ "$DRY_RUN" == "1" ]]; then
-    log_info "Running in dry-run mode (no changes will be made)"
+    log_info "Dry-run mode (no changes will be made)"
   fi
 
-  # Confirm before making changes (unless --force or --dry-run)
-  if [[ "$DRY_RUN" != "1" ]] && [[ "$FORCE" != "1" ]]; then
-    echo ""
-    log_warn "This will attempt to auto-repair your dotfiles environment."
-    log_info "A backup will be created before any changes are made."
-    read -rp "Continue? [y/N] " response
+  # Confirm before making changes (unless --force, --dry-run, or non-interactive)
+  if [[ "$DRY_RUN" != "1" ]] && [[ "$FORCE" != "1" ]] && [[ "${DOTFILES_NONINTERACTIVE:-0}" != "1" ]]; then
+    log_warn "This will auto-repair your dotfiles environment."
+    read -rp "  Continue? [y/N] " response
     if [[ ! "$response" =~ ^[Yy]$ ]]; then
       log_info "Aborted."
       exit 0
     fi
+    echo ""
   fi
 
   # Create backup before making changes
   if [[ "$DRY_RUN" != "1" ]]; then
-    create_pre_heal_backup
+    _pkg_install "backup" 0 1 create_pre_heal_backup 2>/dev/null || true
   fi
 
   # Run all repairs
   heal_missing_dependencies || true
-  heal_broken_symlinks || true
+  heal_mise_tools || true
+
+  # Quick checks (no animation needed)
   heal_chezmoi_drift || true
+  heal_broken_symlinks || true
   heal_missing_critical_files || true
   heal_missing_xdg_dirs || true
 
+  # Pre-warm shell caches for fast startup (< 50ms target)
+  local prewarm_script="$SCRIPT_DIR/prewarm.sh"
+  if [[ -f "$prewarm_script" ]] && [[ "$DRY_RUN" != "1" ]]; then
+    log_step "Performance"
+    _pkg_install "shell cache pre-warm" 0 1 bash "$prewarm_script" || true
+  fi
+
   # Summary
   echo ""
-  echo "=========================================="
   if [[ "$DRY_RUN" == "1" ]]; then
     if [[ $ISSUES_FOUND -eq 0 ]]; then
-      log_success "No issues found. System is healthy."
+      printf '  \033[1;38;5;42mHealthy.\033[0m No issues found.\n'
     else
-      log_info "Found $ISSUES_FOUND issue(s). Run without --dry-run to apply fixes."
+      printf '  Found %d issue(s). Run without --dry-run to apply fixes.\n' "$ISSUES_FOUND"
     fi
   else
     if [[ $ISSUES_FOUND -eq 0 ]]; then
-      log_success "No issues found. System is healthy."
+      printf '  \033[1;38;5;42mHealthy.\033[0m No issues found.\n'
     elif [[ $FIXES_APPLIED -gt 0 ]]; then
-      log_success "Applied $FIXES_APPLIED fix(es) for $ISSUES_FOUND issue(s) found."
+      printf '  \033[1;38;5;42mDone!\033[0m Applied %d fix(es) for %d issue(s).\n' "$FIXES_APPLIED" "$ISSUES_FOUND"
       persist_log "HEAL_COMPLETE: $FIXES_APPLIED fixes applied"
+      dot_log info "heal_complete" "fixes=$FIXES_APPLIED" "issues=$ISSUES_FOUND"
     else
-      log_warn "Found $ISSUES_FOUND issue(s) but no fixes could be applied."
-      log_info "Try running 'dot doctor' for detailed diagnostics."
+      printf '  Found %d issue(s) but no fixes could be applied.\n' "$ISSUES_FOUND"
+      printf '  Run \033[38;5;211mdot doctor\033[0m for diagnostics.\n'
     fi
   fi
-  echo "=========================================="
+  echo ""
 }
 
 main

package/scripts/ops/post-apply-repair.sh

@@ -0,0 +1,106 @@
+#!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=../dot/lib/ui.sh
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/../dot/lib/ui.sh"
+
+ZWC_CACHE_DIRS_DEFAULT=("$HOME/.config/shell" "$HOME/.config/zsh")
+
+repair_zwc_cache() {
+  local repaired=0
+  local failed=0
+  local file
+  local dirs=()
+  local raw_dirs="${DOTFILES_ZWC_CACHE_DIRS:-}"
+
+  if [[ -n "$raw_dirs" ]]; then
+    # shellcheck disable=SC2206
+    dirs=($raw_dirs)
+  else
+    dirs=("${ZWC_CACHE_DIRS_DEFAULT[@]}")
+  fi
+
+  while IFS= read -r -d '' file; do
+    if [[ ! -w "$file" ]]; then
+      if rm -f "$file" >/dev/null 2>&1; then
+        ((repaired++)) || true
+      else
+        ((failed++)) || true
+      fi
+    fi
+  done < <(find "${dirs[@]}" -type f -name '*.zwc' -print0 2>/dev/null || true)
+
+  if ((failed > 0)); then
+    ui_err "Zsh cache repair" "failed to remove ${failed} stale .zwc file(s)"
+    return
+  fi
+
+  if ((repaired > 0)); then
+    ui_warn "Zsh cache repair" "removed ${repaired} stale read-only .zwc file(s)"
+  else
+    ui_ok "Zsh cache repair" "no stale .zwc permissions detected"
+  fi
+}
+
+resolve_zsh_bin() {
+  if [[ -n "${DOTFILES_ZSH_BIN:-}" ]]; then
+    printf "%s\n" "${DOTFILES_ZSH_BIN}"
+    return
+  fi
+  if command -v zsh >/dev/null 2>&1; then
+    command -v zsh
+    return
+  fi
+  printf "%s\n" ""
+}
+
+validate_dot_cli() {
+  local dot_bin="${HOME}/.local/bin/dot"
+  local zsh_out dot_alias dot_path
+  local zsh_bin
+
+  if [[ ! -x "$dot_bin" ]]; then
+    ui_err "dot CLI binary" "missing executable at ${dot_bin}"
+    return
+  fi
+  ui_ok "dot CLI binary" "$dot_bin"
+
+  zsh_bin="$(resolve_zsh_bin)"
+  if [[ -z "$zsh_bin" || ! -x "$zsh_bin" ]]; then
+    ui_warn "dot CLI resolution" "zsh not available; skipping shell validation"
+    return
+  fi
+
+  zsh_out="$("$zsh_bin" -lic '
+    alias dot 2>/dev/null || true
+    whence -p dot 2>/dev/null || true
+  ' 2>/dev/null || true)"
+  dot_alias="$(printf "%s\n" "$zsh_out" | head -n 1)"
+  dot_path="$(printf "%s\n" "$zsh_out" | tail -n 1)"
+
+  if [[ "$dot_alias" == *"cd_with_history"* ]]; then
+    ui_warn "dot alias collision" "legacy sessions may still map dot to navigation; run: unalias dot && exec zsh"
+  fi
+
+  if [[ "$dot_path" == "$dot_bin" ]]; then
+    ui_ok "dot CLI resolution" "$dot_path"
+  elif [[ -n "$dot_path" ]]; then
+    ui_warn "dot CLI resolution" "resolved to ${dot_path} (expected ${dot_bin})"
+  else
+    ui_err "dot CLI resolution" "dot not found in a fresh zsh login shell"
+  fi
+}
+
+main() {
+  ui_init
+  ui_header "Post-apply checks"
+  repair_zwc_cache
+  validate_dot_cli
+}
+
+if [[ "${DOTFILES_POST_APPLY_TESTING:-0}" != "1" ]]; then
+  main
+fi