@sebastienrousseau/dotfiles 0.2.481 → 0.2.500

package/scripts/ops/chezmoi-apply.sh

@@ -1,7 +1,45 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 set -euo pipefail
 
-args=()
+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"
+export DOT_COMMAND="apply"
+
+# Temp file cleanup
+_TMPFILES=()
+cleanup() { rm -f "${_TMPFILES[@]}"; }
+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       Force non-interactive mode
+  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"
@@ -16,27 +54,217 @@ if [[ "${DOTFILES_CHEZMOI_KEEP_GOING:-0}" = "1" ]]; then
   args+=("--keep-going")
 fi
 
-echo "Applying dotfiles..."
-chezmoi apply "${args[@]}"
+has_flag() {
+  local needle="$1"
+  local arg
+  for arg in "${args[@]}"; do
+    [[ "$arg" == "$needle" ]] && return 0
+  done
+  return 1
+}
+
+# In non-interactive runs, prevent TTY prompts from blocking apply.
+if [[ "${DOTFILES_NONINTERACTIVE:-0}" == "1" ]] && ! has_flag "--force"; then
+  args+=("--force")
+fi
 
-check_ai_cli() {
-  local name="$1"
-  local label="$2"
-  if ! command -v "$name" >/dev/null 2>&1; then
-    echo "NOT FOUND: $label"
+ui_init
+
+# Prevent concurrent execution
+LOCK_FILE="${XDG_RUNTIME_DIR:-/tmp}/dotfiles-chezmoi-apply.lock"
+exec 9>"$LOCK_FILE"
+if ! flock -n 9; then
+  ui_warn "Already running" "Another instance is active"
+  exit 0
+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 ""
-echo "AI provider CLI checks (optional):"
-check_ai_cli "claude" "claude (recommended — install to enable this provider)"
-check_ai_cli "gemini" "gemini (optional — install to enable this provider)"
-check_ai_cli "sgpt" "sgpt (optional — install to enable this provider)"
-check_ai_cli "ollama" "ollama (optional — install to enable this provider)"
-check_ai_cli "opencode" "opencode (optional — install to enable this provider)"
-check_ai_cli "aider" "aider (optional — AI pair programming)"
+ui_header "AI provider CLI checks (optional)"
+
+# binary|mise_package|label
+_AI_PROVIDERS=(
+  "claude|npm:@anthropic-ai/claude-code|Claude Code"
+  "copilot|npm:@github/copilot|Copilot CLI"
+  "gemini|npm:@google/gemini-cli|Gemini 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 ]] && [[ "${DOTFILES_NONINTERACTIVE:-0}" != "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 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 "\nStatus:\n"
-  chezmoi status || true
+  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,4 +1,5 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 set -euo pipefail
 
 excludes=(scripts)

package/scripts/ops/chezmoi-remove.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 set -euo pipefail
 
 if [[ $# -lt 1 ]]; then
@@ -29,6 +30,7 @@ if [[ ${#paths[@]} -eq 0 ]]; then
   exit 1
 fi
 
+# shellcheck disable=SC1091
 if [[ $remove_source -eq 0 ]]; then
   args+=("--keep-source")
 fi

package/scripts/ops/chezmoi-update.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 set -euo pipefail
 
 args=()
@@ -12,5 +13,36 @@ if [[ "${DOTFILES_CHEZMOI_VERBOSE:-0}" = "1" ]]; then
   args+=("--verbose")
 fi
 
-echo "Updating dotfiles..."
-chezmoi update "${args[@]}"
+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

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
+# 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
+
+  ISSUES_FOUND=$((ISSUES_FOUND + 1))
+
+  if [[ "$DRY_RUN" == "1" ]]; then
+    log_dry "run 'chezmoi apply --force' to re-sync"
+  else
+    if _pkg_install "chezmoi re-apply" 0 1 chezmoi apply --force; then
+      FIXES_APPLIED=$((FIXES_APPLIED + 1))
+      CHEZMOI_APPLIED=1
+      persist_log "HEAL: chezmoi apply --force"
+    fi
+  fi
+}

package/scripts/ops/heal-system.sh

@@ -0,0 +1,128 @@
+#!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
+# 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
+}