@sebastienrousseau/dotfiles 0.2.481 → 0.2.500

package/scripts/ops/prewarm.sh

@@ -0,0 +1,127 @@
+#!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
+# Pre-warm shell initialization caches for ultra-fast startup.
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/dot/lib/ui.sh"
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/dot/lib/log.sh"
+export DOT_COMMAND="prewarm"
+
+# 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-prewarm.lock"
+LOCK_DIR="${LOCK_FILE}.d"
+if command -v flock >/dev/null 2>&1; then
+  exec 9>"$LOCK_FILE"
+  if ! flock -n 9; then
+    ui_warn "Already running" "Another instance is active"
+    exit 0
+  fi
+else
+  # Portable fallback when flock is unavailable (e.g. minimal macOS envs).
+  if ! mkdir "$LOCK_DIR" 2>/dev/null; then
+    ui_warn "Already running" "Another instance is active"
+    exit 0
+  fi
+  trap 'rmdir "$LOCK_DIR" 2>/dev/null || true' EXIT
+fi
+
+CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}"
+mkdir -p "$CACHE_DIR/"{zsh,bash,fish,nushell}
+
+ui_header "Pre-warming Shell Caches"
+
+warm_tool() {
+  local tool="$1"
+  local cmd="$2"
+  local shell="$3"
+  local ext="$4"
+
+  local cache_file="$CACHE_DIR/$shell/$tool-init.$ext"
+  local tmp_file="${cache_file}.tmp.$$"
+
+  if command -v "$tool" >/dev/null 2>&1; then
+    if eval "$cmd" >"$tmp_file" 2>/dev/null && [ -s "$tmp_file" ]; then
+      mv "$tmp_file" "$cache_file"
+      ui_ok "$tool" "Cached for $shell"
+    else
+      rm -f "$tmp_file"
+      ui_warn "$tool" "Failed to cache for $shell"
+    fi
+  fi
+}
+
+ui_section "Zsh"
+warm_tool "mise" "mise activate zsh" "zsh" "zsh"
+warm_tool "starship" "starship init zsh" "zsh" "zsh"
+warm_tool "zoxide" "zoxide init zsh" "zsh" "zsh"
+warm_tool "atuin" "atuin init zsh --disable-up-arrow" "zsh" "zsh"
+warm_tool "fzf" "fzf --zsh" "zsh" "zsh"
+warm_tool "direnv" "direnv hook zsh" "zsh" "zsh"
+
+ui_section "Bash"
+warm_tool "mise" "mise activate bash" "bash" "bash"
+warm_tool "starship" "starship init bash" "bash" "bash"
+warm_tool "zoxide" "zoxide init bash" "bash" "bash"
+warm_tool "atuin" "atuin init bash --disable-up-arrow" "bash" "bash"
+warm_tool "fzf" "fzf --bash" "bash" "bash"
+warm_tool "direnv" "direnv hook bash" "bash" "bash"
+
+ui_section "Fish"
+warm_tool "mise" "mise activate fish" "fish" "fish"
+warm_tool "starship" "starship init fish" "fish" "fish"
+warm_tool "zoxide" "zoxide init fish" "fish" "fish"
+warm_tool "atuin" "atuin init fish" "fish" "fish"
+warm_tool "fzf" "fzf --fish" "fish" "fish"
+warm_tool "direnv" "direnv hook fish" "fish" "fish"
+
+ui_section "Nushell"
+for _nu_entry in "starship:starship init nu:starship.nu" "zoxide:zoxide init nushell:zoxide.nu" "atuin:atuin init nu:atuin.nu"; do
+  _nu_tool="${_nu_entry%%:*}"
+  _nu_rest="${_nu_entry#*:}"
+  _nu_cmd="${_nu_rest%%:*}"
+  _nu_file="${_nu_rest#*:}"
+  if command -v "$_nu_tool" >/dev/null 2>&1; then
+    _nu_tmp="$CACHE_DIR/nushell/${_nu_file}.tmp.$$"
+    if eval "$_nu_cmd" >"$_nu_tmp" 2>/dev/null && [ -s "$_nu_tmp" ]; then
+      mv "$_nu_tmp" "$CACHE_DIR/nushell/$_nu_file"
+      ui_ok "$_nu_tool" "Cached for nushell"
+    else
+      rm -f "$_nu_tmp"
+      ui_warn "$_nu_tool" "Failed to cache for nushell"
+    fi
+  fi
+done
+
+# --- Completions ---
+ui_section "Shell completions"
+ZSH_COMP_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/zsh/completions"
+mkdir -p "$ZSH_COMP_DIR"
+
+_prewarm_completion() {
+  local name="$1" cmd="$2"
+  shift 2
+  if command -v "$cmd" >/dev/null 2>&1; then
+    if "$cmd" "$@" >"${ZSH_COMP_DIR}/_${name}" 2>/dev/null; then
+      ui_ok "$name" "completion generated"
+    fi
+  fi
+}
+
+_prewarm_completion "gh" "gh" completion -s zsh
+_prewarm_completion "just" "just" --completions zsh
+_prewarm_completion "chezmoi" "chezmoi" completion zsh
+_prewarm_completion "kubectl" "kubectl" completion zsh
+_prewarm_completion "mise" "mise" completion zsh
+_prewarm_completion "atuin" "atuin" gen-completions --shell zsh
+
+ui_header "Cache Pre-warming Complete"
+dot_log info "prewarm_complete"

package/scripts/ops/release.sh

@@ -0,0 +1,252 @@
+#!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
+# =============================================================================
+# Dotfiles Release Script
+# Orchestrates a new release: version bump, changelog, tag, and push
+# Usage: ./scripts/ops/release.sh [patch|minor] [--dry-run]
+# =============================================================================
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && 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="release"
+ui_init
+
+log_info() { ui_info "$@"; }
+log_success() { ui_ok "$@"; }
+log_warn() { ui_warn "$@"; }
+log_error() { ui_err "$@"; }
+log_step() {
+  echo ""
+  ui_section "$*"
+}
+
+# Cross-platform sed in-place (BSD vs GNU)
+sed_in_place() {
+  if sed --version >/dev/null 2>&1; then
+    sed -i "$@" # GNU
+  else
+    sed -i '' "$@" # BSD (macOS)
+  fi
+}
+
+usage() {
+  local current
+  current=$(get_version)
+  local next_patch
+  next_patch=$(bump_version "$current" "patch")
+  local next_minor
+  next_minor=$(bump_version "$current" "minor")
+
+  cat <<EOF
+Dotfiles Release Tool
+
+Usage: $(basename "$0") [BUMP_TYPE] [OPTIONS]
+
+Bump Types:
+  patch         Increment patch version ($current → $next_patch) [default]
+  minor         Increment minor version ($current → $next_minor)
+
+Options:
+  -n, --dry-run   Show what would be done without making changes
+  -h, --help      Show this help message
+
+Steps performed:
+  1. Verify clean working tree and up-to-date branch
+  2. Bump version in package.json
+  3. Run version-sync to update docs
+  4. Update CHANGELOG.md with new version header
+  5. Create signed commit and tag
+  6. Push commit and tag to origin
+
+Examples:
+  $(basename "$0")              # Patch release
+  $(basename "$0") minor        # Minor release
+  $(basename "$0") --dry-run    # Preview patch release
+
+EOF
+}
+
+# Get current version from package.json
+get_version() {
+  grep -o '"version": "[^"]*"' "$PROJECT_ROOT/package.json" | grep -o '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*'
+}
+
+# Bump version string
+bump_version() {
+  local current="$1" bump_type="$2"
+  local major minor patch
+  IFS='.' read -r major minor patch <<<"$current"
+
+  case "$bump_type" in
+    patch) patch=$((patch + 1)) ;;
+    minor)
+      minor=$((minor + 1))
+      patch=0
+      ;;
+    *)
+      log_error "Unknown bump type: $bump_type"
+      exit 1
+      ;;
+  esac
+
+  echo "${major}.${minor}.${patch}"
+}
+
+main() {
+  local bump_type="patch"
+  local dry_run=0
+
+  # Parse arguments
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      patch | minor)
+        bump_type="$1"
+        shift
+        ;;
+      -n | --dry-run)
+        dry_run=1
+        shift
+        ;;
+      -h | --help)
+        usage
+        exit 0
+        ;;
+      *)
+        log_error "Unknown argument: $1"
+        usage
+        exit 1
+        ;;
+    esac
+  done
+
+  # Concurrency guard
+  LOCK_FILE="${XDG_RUNTIME_DIR:-/tmp}/dotfiles-release.lock"
+  exec 9>"$LOCK_FILE"
+  if ! flock -n 9; then
+    ui_warn "Already running" "Another release is in progress"
+    exit 0
+  fi
+
+  cd "$PROJECT_ROOT"
+  dot_log info "release_start" "bump_type=$bump_type"
+
+  local current_version new_version
+  current_version=$(get_version)
+  new_version=$(bump_version "$current_version" "$bump_type")
+
+  printf '%b\n' "${BOLD}Dotfiles Release${NC}"
+  echo "  Current:  v${current_version}"
+  echo "  Next:     v${new_version} (${bump_type})"
+  echo ""
+
+  if [[ "$dry_run" == "1" ]]; then
+    log_warn "DRY-RUN MODE — no changes will be made"
+    echo ""
+  fi
+
+  # ── Step 1: Preflight checks ─────────────────────────────────
+  log_step "Preflight checks"
+
+  if [[ -n "$(git status --porcelain)" ]]; then
+    log_error "Working tree is not clean. Commit or stash changes first."
+    exit 1
+  fi
+  log_success "Working tree clean"
+
+  local branch
+  branch=$(git branch --show-current)
+  if [[ "$branch" != "master" && "$branch" != "main" ]]; then
+    log_warn "On branch '$branch' — releases typically happen from master/main"
+    read -rp "Continue anyway? [y/N] " response
+    [[ "$response" =~ ^[Yy]$ ]] || exit 0
+  fi
+  log_success "On branch: $branch"
+
+  git fetch origin "$branch" --quiet
+  local behind
+  behind=$(git rev-list --count "HEAD..origin/$branch" 2>/dev/null || echo "0")
+  if [[ "$behind" -gt 0 ]]; then
+    log_error "Branch is $behind commit(s) behind origin. Pull first."
+    exit 1
+  fi
+  log_success "Branch is up to date with origin"
+
+  if [[ "$dry_run" == "1" ]]; then
+    log_step "Would perform the following"
+    log_info "1. Bump package.json: $current_version → $new_version"
+    log_info "2. Run version-sync.sh"
+    log_info "3. Add v${new_version} header to CHANGELOG.md"
+    log_info "4. Commit: 'chore(release): v${new_version}'"
+    log_info "5. Tag: v${new_version} (signed)"
+    log_info "6. Push commit and tag to origin"
+    echo ""
+    log_success "Dry run complete"
+    exit 0
+  fi
+
+  # ── Step 2: Bump version ──────────────────────────────────────
+  log_step "Bump version in package.json"
+  sed_in_place "s/\"version\": \"${current_version}\"/\"version\": \"${new_version}\"/" "$PROJECT_ROOT/package.json"
+  log_success "package.json: $current_version → $new_version"
+
+  # ── Step 3: Sync versions across docs ─────────────────────────
+  log_step "Sync version across docs"
+  if [[ -x "$SCRIPT_DIR/../version-sync.sh" ]]; then
+    bash "$SCRIPT_DIR/../version-sync.sh" --force 2>&1 | tail -3
+    log_success "Version sync complete"
+  else
+    log_warn "version-sync.sh not found, skipping"
+  fi
+
+  # ── Step 4: Update CHANGELOG ──────────────────────────────────
+  log_step "Update CHANGELOG.md"
+  local today
+  today=$(date +%Y-%m-%d)
+  local changelog="$PROJECT_ROOT/CHANGELOG.md"
+
+  if [[ -f "$changelog" ]]; then
+    # Insert new version header after the first "# Changelog" line
+    sed_in_place "/^## v${current_version}/i\\
+## v${new_version} (${today})\\
+\\
+### Changed\\
+\\
+- Version bump to v${new_version}.\\
+" "$changelog"
+    log_success "Added v${new_version} section to CHANGELOG.md"
+  else
+    log_warn "CHANGELOG.md not found, skipping"
+  fi
+
+  # ── Step 5: Commit and tag ────────────────────────────────────
+  log_step "Create signed commit and tag"
+  git add -A
+  git commit -S -m "chore(release): v${new_version}"
+  git tag -s "v${new_version}" -m "Release v${new_version}"
+  log_success "Committed and tagged v${new_version}"
+
+  # ── Step 6: Push ──────────────────────────────────────────────
+  log_step "Push to origin"
+  read -rp "Push v${new_version} to origin/$branch? [y/N] " response
+  if [[ "$response" =~ ^[Yy]$ ]]; then
+    git push origin "$branch" --follow-tags
+    log_success "Pushed v${new_version} to origin"
+  else
+    log_warn "Skipped push. Run manually:"
+    echo "  git push origin $branch --follow-tags"
+  fi
+
+  echo ""
+  dot_log info "release_end" "version=$new_version"
+  log_success "Release v${new_version} complete"
+}
+
+main "$@"

package/scripts/ops/rollback.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 # shellcheck disable=SC2034
 # =============================================================================
 # Dotfiles Rollback Script - Self-Healing Configuration Recovery
@@ -8,34 +9,43 @@
 
 set -euo pipefail
 
+_cleanup_files=()
+trap 'set +u; rm -f "${_cleanup_files[@]}" 2>/dev/null; set -u' 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"
+export DOT_COMMAND="rollback"
 REPO_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")"
-DOTFILES_SOURCE="${HOME}/.dotfiles"
+# Resolve symlinks for consistent path handling
+if command -v realpath >/dev/null 2>&1; then
+  DOTFILES_SOURCE="$(realpath "${HOME}/.dotfiles" 2>/dev/null || echo "${HOME}/.dotfiles")"
+elif command -v readlink >/dev/null 2>&1; then
+  DOTFILES_SOURCE="$(readlink -f "${HOME}/.dotfiles" 2>/dev/null || echo "${HOME}/.dotfiles")"
+else
+  DOTFILES_SOURCE="${HOME}/.dotfiles"
+fi
 BACKUP_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/dotfiles/backups"
 STATE_DIR="${XDG_STATE_HOME:-$HOME/.local/state}/dotfiles"
 ROLLBACK_LOG="$STATE_DIR/rollback.log"
 MAX_BACKUPS=10
 
-# 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}"; }
+# 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 "$*"
+}
 
 # Persistent logging
 persist_log() {
@@ -100,7 +110,7 @@ list_backups() {
       timestamp=$(stat -f "%Sm" -t "%Y-%m-%d %H:%M:%S" "$backup" 2>/dev/null || stat -c "%y" "$backup" 2>/dev/null | cut -d'.' -f1)
       size=$(du -sh "$backup" 2>/dev/null | cut -f1)
       printf "  %2d. %-30s  %s  %s\n" "$i" "$name" "$timestamp" "$size"
-      ((i++))
+      ((i++)) || true
     fi
   done < <(find "$BACKUP_DIR" -maxdepth 1 -type d -name "backup_*" | sort -r)
 
@@ -148,17 +158,22 @@ create_backup() {
       dest_dir=$(dirname "$backup_path/$rel_path")
       mkdir -p "$dest_dir"
       cp -a "$target" "$backup_path/$rel_path" 2>/dev/null || true
-      ((backed_up++))
+      ((backed_up++)) || true
       [[ "$VERBOSE" == "1" ]] && log_info "Backed up: $rel_path"
     fi
   done
 
+  local git_commit="unknown"
+  if cd "$DOTFILES_SOURCE" 2>/dev/null; then
+    git_commit=$(git rev-parse --short HEAD 2>/dev/null || echo "unknown")
+  fi
+
   # Record metadata
   cat >"$backup_path/.backup_meta" <<EOF
 timestamp=$timestamp
 reason=$reason
 chezmoi_version=$(chezmoi --version 2>/dev/null || echo "unknown")
-git_commit=$(cd "$DOTFILES_SOURCE" 2>/dev/null && git rev-parse --short HEAD 2>/dev/null || echo "unknown")
+git_commit=$git_commit
 files_backed_up=$backed_up
 EOF
 
@@ -229,7 +244,7 @@ perform_rollback() {
       dest_dir=$(dirname "$dest")
       mkdir -p "$dest_dir"
       cp -a "$file" "$dest"
-      ((restored++))
+      ((restored++)) || true
       [[ "$VERBOSE" == "1" ]] && log_info "Restored: $rel_path"
     fi
   done < <(find "$backup_path" -type f -print0)
@@ -237,6 +252,30 @@ perform_rollback() {
   if [[ "$dry_run" != "1" ]]; then
     log_success "Rollback complete: $restored file(s) restored"
     persist_log "ROLLBACK: from $(basename "$backup_path"), $restored files restored"
+    dot_log info "rollback_end" "files=$restored" "backup=$(basename "$backup_path")"
+
+    # AI-Driven Analysis of the failure
+    if command -v dot >/dev/null 2>&1 && [[ "${DOTFILES_AI:-0}" == "1" ]]; then
+      log_step "AI Root-Cause Analysis"
+      local drift
+      drift=$(chezmoi status 2>/dev/null || true)
+      local last_log=""
+      if cd "$DOTFILES_SOURCE" 2>/dev/null; then
+        last_log=$(git log -n 5 --oneline 2>/dev/null || true)
+      fi
+
+      local ai_prompt
+      ai_prompt="System rollback was triggered from $(basename "$backup_path").
+Recent Git History:
+$last_log
+
+Current Drift after rollback:
+$drift
+
+Analyze why the environment may have reached a state requiring rollback and suggest architectural hardening steps."
+
+      dot cl --pattern hardener "$ai_prompt" || true
+    fi
   fi
 }
 
@@ -265,7 +304,7 @@ git_reset() {
       git stash push -m "Auto-stash before rollback $(date +%Y%m%d_%H%M%S)"
       log_success "Changes auto-stashed (use 'git stash pop' to recover)"
     else
-      read -rp "Stash changes? [y/N] " response
+      read -t 30 -rp "Stash changes? [y/N] " response || response="N"
       if [[ "$response" =~ ^[Yy]$ ]]; then
         git stash push -m "Auto-stash before rollback $(date +%Y%m%d_%H%M%S)"
         log_success "Changes stashed"
@@ -327,9 +366,11 @@ restore_file() {
 
   local source_file="$backup/$file_path"
 
+  # shellcheck disable=SC1091
   # Verify resolved source path stays within the backup directory
   local resolved_source
   resolved_source="$(cd "$(dirname "$source_file")" 2>/dev/null && pwd)/$(basename "$source_file")" || {
+    # shellcheck disable=SC1091
     log_error "Cannot resolve source path: $source_file"
     return 1
   }
@@ -434,6 +475,11 @@ main() {
   local command="${1:-status}"
   shift || true
 
+  if [[ "$command" == "help" ]]; then
+    usage
+    exit 0
+  fi
+
   # Parse global options
   while [[ $# -gt 0 ]]; do
     case "$1" in
@@ -459,6 +505,18 @@ main() {
 
   ensure_dirs
 
+  # Concurrency guard
+  LOCK_FILE="${XDG_RUNTIME_DIR:-/tmp}/dotfiles-rollback.lock"
+  if command -v flock >/dev/null 2>&1; then
+    exec 9>"$LOCK_FILE"
+    if ! flock -n 9; then
+      ui_warn "Already running" "Another rollback instance is active"
+      exit 0
+    fi
+  fi
+
+  dot_log info "rollback_start" "command=$command"
+
   case "$command" in
     status)
       show_status
@@ -474,7 +532,7 @@ main() {
         exit 1
       fi
       if [[ "$FORCE" != "1" ]] && [[ "$DRY_RUN" != "1" ]]; then
-        read -rp "Rollback to $(basename "$latest")? [y/N] " response
+        read -t 30 -rp "Rollback to $(basename "$latest")? [y/N] " response || response="N"
         [[ ! "$response" =~ ^[Yy]$ ]] && exit 0
       fi
       perform_rollback "$latest" "$DRY_RUN"
@@ -492,14 +550,14 @@ main() {
         exit 1
       fi
       if [[ "$FORCE" != "1" ]] && [[ "$DRY_RUN" != "1" ]]; then
-        read -rp "Rollback to $(basename "$backup")? [y/N] " response
+        read -t 30 -rp "Rollback to $(basename "$backup")? [y/N] " response || response="N"
         [[ ! "$response" =~ ^[Yy]$ ]] && exit 0
       fi
       perform_rollback "$backup" "$DRY_RUN"
       ;;
     git-reset)
       if [[ "$FORCE" != "1" ]] && [[ "$DRY_RUN" != "1" ]]; then
-        read -rp "Reset to last known good commit? [y/N] " response
+        read -t 30 -rp "Reset to last known good commit? [y/N] " response || response="N"
         [[ ! "$response" =~ ^[Yy]$ ]] && exit 0
       fi
       git_reset "$DRY_RUN"