@sebastienrousseau/dotfiles 0.2.510 → 0.2.512

package/scripts/theme/switch.sh

@@ -78,15 +78,33 @@ fi
 # Theme Database
 # =============================================================================
 
-# Default preferences
-DEFAULT_DARK="macos-monterey-dark"
-DEFAULT_LIGHT="macos-monterey-light"
+# Default preferences (must be present keys in themes.toml — the theme
+# regeneration removed the old macos-monterey-* names; bloom is the current
+# default family and always ships a dark+light pair).
+DEFAULT_DARK="bloom-dark"
+DEFAULT_LIGHT="bloom-light"
+
+# Machine-local chezmoi override (chezmoi.toml [data] theme) takes precedence
+# over .chezmoidata.toml when rendering, so it is the authoritative "current"
+# value. Kept in sync by dot-theme-sync's write_theme().
+CHEZMOI_CFG="${XDG_CONFIG_HOME:-$HOME/.config}/chezmoi/chezmoi.toml"
 
 # =============================================================================
 # Theme Functions
 # =============================================================================
 
 current_theme() {
+  # Prefer the machine-local override (what chezmoi actually renders), so
+  # `dot theme current` never disagrees with the deployed configs. Fall back
+  # to the repo default in .chezmoidata.toml when no override is set.
+  if [[ -f "$CHEZMOI_CFG" ]]; then
+    local override
+    override="$(awk -F'"' '/^theme =/ {print $2}' "$CHEZMOI_CFG" | head -n 1)"
+    if [[ -n "$override" ]]; then
+      echo "$override"
+      return 0
+    fi
+  fi
   awk -F'"' '/^theme =/ {print $2}' "$DATA_FILE" | head -n 1
 }
 
@@ -124,6 +142,9 @@ paired_families() {
   done < <(all_theme_names)
 
   for family in $(printf '%s\n' "${!has_dark[@]}" | sort); do
+    # `fallback` is a synthetic safety theme (see themes.toml) that templates
+    # degrade to when .theme is unset/invalid — never a user-selectable one.
+    [[ "$family" == "fallback" ]] && continue
     [[ -n "${has_light[$family]+x}" ]] && echo "$family"
   done
 }
@@ -185,12 +206,6 @@ set_theme() {
 
 # Interactive theme picker
 pick_theme() {
-  if ! command -v fzf &>/dev/null; then
-    ui_err "fzf" "required for interactive picker"
-    ui_info "Usage" "dot theme set <name>"
-    exit 1
-  fi
-
   local current
   current="$(current_theme)"
 
@@ -220,14 +235,9 @@ pick_theme() {
   done < <(paired_families)
 
   local selected_family
-  selected_family="$(echo "$theme_list" | fzf \
+  selected_family="$(printf '%s' "$theme_list" | ui_pick \
     --header "Select wallpaper theme (current: $current_family [$current_mode])" \
-    --prompt "Theme > " \
-    --height 30 \
-    --reverse \
-    --no-sort \
-    --no-preview \
-    --ansi |
+    --prompt "Theme >" |
     awk '$1 !~ /^#/ && NF >= 2 {print $2}')" || return 0
 
   if [[ -n "$selected_family" ]]; then

package/scripts/theme/wallpaper-sync.sh

@@ -43,6 +43,16 @@ detect_mode() {
     esac
   fi
 
+  if [[ "$(uname -s)" == "Darwin" ]]; then
+    # AppleInterfaceStyle is "Dark" in dark mode and unset in light mode.
+    if [[ "$(defaults read -g AppleInterfaceStyle 2>/dev/null || true)" == "Dark" ]]; then
+      echo "dark"
+    else
+      echo "light"
+    fi
+    return 0
+  fi
+
   if command -v gsettings &>/dev/null; then
     local scheme
     scheme="$(gsettings get org.gnome.desktop.interface color-scheme 2>/dev/null || echo "")"
@@ -125,10 +135,16 @@ wallpaper_for_theme() {
       found && /^wallpaper/ { sub(/.*= *"/, ""); sub(/".*/, ""); print; exit }
     ' "$themes_file")"
     if [[ -n "$stored_wp" ]]; then
-      # Cross-platform: resolve macOS paths on Linux
+      # Home-relative form (current generator): ~/Pictures/... → $HOME/Pictures/...
+      # Prefix-strip comparison avoids a quoted-tilde glob (SC2088); the tilde
+      # here is a literal leading character, not a path to expand.
+      if [[ "$stored_wp" != "${stored_wp#\~/}" ]]; then
+        stored_wp="${HOME}/${stored_wp#\~/}"
+      fi
+      # Cross-platform: resolve legacy absolute macOS paths on Linux
       if [[ ! -f "$stored_wp" ]]; then
         if [[ "$stored_wp" == /Users/* ]]; then
-          # /Users/<user>/Pictures/... → $HOME/Pictures/...
+          # /Users/<user>/Pictures/... → $HOME/Pictures/... (pre-relativize data)
           stored_wp="${HOME}/${stored_wp#/Users/*/}"
         elif [[ "$stored_wp" == /System/* ]]; then
           # macOS system wallpapers don't exist on Linux — skip to next fallback
@@ -397,6 +413,56 @@ ensure_linux_compatible() {
   printf '%s\n' "$wp"
 }
 
+# macOS: a dynamic appearance HEIC (two frames + apple_desktop:apr metadata)
+# set as a plain imageFile gets pinned to a single frame and stops tracking
+# Light/Dark — so Light mode can show the dark frame. Extract the frame that
+# matches the requested mode (0 = light, 1 = dark, per Apple's apr convention,
+# same as the Linux -0/-1 path) to a small single-image HEIC and apply that
+# instead. Single-image HEICs and non-HEICs are returned unchanged.
+macos_appearance_frame() {
+  local wp="$1" mode="$2"
+  [[ "${wp##*.}" == "heic" ]] || {
+    printf '%s\n' "$wp"
+    return
+  }
+  command -v magick &>/dev/null || {
+    printf '%s\n' "$wp"
+    return
+  }
+  local frames
+  frames="$(magick identify "$wp" 2>/dev/null | wc -l | tr -d ' ')"
+  [[ "${frames:-0}" -ge 2 ]] || {
+    printf '%s\n' "$wp"
+    return
+  }
+
+  local idx=0
+  [[ "$mode" == "dark" ]] && idx=1
+  local cache_dir="$WALLPAPER_DIR/.dot-frames"
+  mkdir -p "$cache_dir" 2>/dev/null || {
+    printf '%s\n' "$wp"
+    return
+  }
+  local frame
+  frame="$cache_dir/$(basename "${wp%.heic}")-${mode}.heic"
+
+  # Reuse a cached frame that is newer than its source wallpaper.
+  if [[ -f "$frame" && "$frame" -nt "$wp" ]]; then
+    printf '%s\n' "$frame"
+    return
+  fi
+  local tmp
+  tmp="$(mktemp "${frame%.heic}.XXXXXX.heic")"
+  if magick "${wp}[${idx}]" "$tmp" 2>/dev/null && [[ -s "$tmp" ]]; then
+    if mv -f "$tmp" "$frame" 2>/dev/null; then
+      printf '%s\n' "$frame"
+      return
+    fi
+  fi
+  rm -f "$tmp" 2>/dev/null
+  printf '%s\n' "$wp"
+}
+
 # Apply wallpaper based on platform and compositor
 apply_wallpaper() {
   local wp="$1"
@@ -408,6 +474,10 @@ apply_wallpaper() {
 
   case "$(uname -s)" in
     Darwin)
+      # Resolve a dynamic HEIC down to the mode-appropriate static frame so
+      # macOS renders the right appearance instead of pinning one frame.
+      wp="$(macos_appearance_frame "$wp" "$mode")"
+
       # macOS Sonoma+ moved wallpaper state to ~/Library/Application Support/
       # com.apple.wallpaper/Store/Index.plist, owned by WallpaperAgent. Each
       # Space and Display has its own entry, and AppleScript's `every desktop`
@@ -494,12 +564,29 @@ if updated:
 print(updated)
 PYEOF
 
-      # Restart WallpaperAgent so it re-reads the store. launchd respawns it.
-      killall WallpaperAgent 2>/dev/null || true
+      # Restart WallpaperAgent so it re-reads the store and repaints EVERY
+      # Space (the store rewrite above covers all Spaces; the agent only
+      # applies it on respawn). Then BLOCK until it's actually back and the
+      # wallpaper has re-applied — the caller reports "Done" once this returns,
+      # so it must not return while Spaces are still repainting. Set
+      # DOT_THEME_SKIP_WALLPAPER_AGENT=1 to skip the restart (faster, but
+      # background Spaces won't refresh until next login).
+      if [[ "${DOT_THEME_SKIP_WALLPAPER_AGENT:-0}" != "1" ]]; then
+        killall WallpaperAgent 2>/dev/null || true
+
+        # Wait for launchd to bring WallpaperAgent back (KeepAlive respawns it
+        # within ~1s; cap the wait so a theme switch can never hang).
+        local _waited=0
+        while ! pgrep -x WallpaperAgent >/dev/null 2>&1; do
+          sleep 0.1
+          _waited=$((_waited + 1))
+          [[ "$_waited" -ge 60 ]] && break
+        done
+      fi
 
-      # Also nudge the active Space via the public API. This covers the
-      # initial render before WallpaperAgent comes back, and handles screens
-      # the Index.plist rewrite somehow missed.
+      # Re-assert the wallpaper through the (now running) agent — covers the
+      # active Space's first paint and any screen the store rewrite missed —
+      # then give that paint a moment to finish before returning.
       if command -v wallpaper &>/dev/null; then
         wallpaper set "$wp" --screen all 2>/dev/null || true
       else
@@ -511,6 +598,7 @@ tell application \"System Events\"
     end repeat
 end tell" 2>/dev/null || true
       fi
+      sleep 0.5
       ;;
     Linux)
       # DMS owns wallpaper display and runs matugen for color extraction.

package/scripts/tools/detect-collisions.py

@@ -8,7 +8,25 @@ import os
 import re
 import sys
 
-BASE_DIR = os.path.expanduser("~/.dotfiles/.chezmoitemplates")
+# Post-Phase-4b (v0.2.503): chezmoi source is under the subdir
+# named in .chezmoiroot (typically "defaults/"). Prefer the
+# descended path; fall back to the old top-level layout for
+# backwards compatibility.
+_DOTFILES_ROOT = os.path.expanduser("~/.dotfiles")
+_CHEZMOIROOT_FILE = os.path.join(_DOTFILES_ROOT, ".chezmoiroot")
+
+
+def _resolve_chezmoi_root() -> str:
+    if os.path.isfile(_CHEZMOIROOT_FILE):
+        with open(_CHEZMOIROOT_FILE, "r", encoding="utf-8") as _f:
+            sub = _f.read().strip()
+        cand = os.path.join(_DOTFILES_ROOT, sub)
+        if os.path.isdir(cand):
+            return cand
+    return _DOTFILES_ROOT
+
+
+BASE_DIR = os.path.join(_resolve_chezmoi_root(), ".chezmoitemplates")
 ALIASES_DIR = os.path.join(BASE_DIR, "aliases")
 FUNCTIONS_DIR = os.path.join(BASE_DIR, "functions")
 

package/scripts/version-sync.sh

@@ -84,6 +84,13 @@ EXCLUDE_FILES=(
   # that are NOT the current dotfiles_version. Auto-syncing
   # rewrites them incorrectly.
   "docs/operations/ARCHITECTURE_ROADMAP.md"
+
+  # Dated release write-ups: each article records the release it
+  # shipped in (e.g. "shipped in vX.Y.Z" + a link to that release
+  # tag). Those refs are historical fact, not current-version claims —
+  # bumping them would falsify the history.
+  "docs/articles/2026-07-05-fish-startup-abbr.md"
+  "docs/articles/2026-07-05-master-to-main-rename-runbook.md"
 )
 
 # shellcheck source=../lib/dot/ui.sh
@@ -149,7 +156,11 @@ get_package_version() {
   fi
 
   local version
-  version=$(jq -r '.version' "$package_file" 2>/dev/null)
+  if command -v jq &>/dev/null; then
+    version=$(jq -r '.version' "$package_file" 2>/dev/null)
+  else
+    version=$(sed -nE 's/^[[:space:]]*"version"[[:space:]]*:[[:space:]]*"([^"]+)".*/\1/p' "$package_file" | head -n 1)
+  fi
   if [[ "$version" == "null" || -z "$version" ]]; then
     log_error "Could not extract version from package.json"
     exit 1
@@ -179,22 +190,32 @@ find_version_files() {
   # the paths match the EXCLUDE_FILES entries (which have no "./"),
   # otherwise excluded historical docs get rewritten.
   cd "$PROJECT_ROOT"
-  rg -l "v?$VERSION_PATTERN" --type md . 2>/dev/null | sed 's|^\./||' >"$temp_file" || true
+  if command -v rg &>/dev/null; then
+    rg -l "v?$VERSION_PATTERN" --type md . 2>/dev/null | sed 's|^\./||' >"$temp_file" || true
+  else
+    {
+      while IFS= read -r file; do
+        if grep -Eq "v?$VERSION_PATTERN" "$file" 2>/dev/null; then
+          printf '%s\n' "${file#./}"
+        fi
+      done < <(find . -type f -name '*.md' -print)
+    } >"$temp_file"
+  fi
 
   # Add known files that should be checked even if they don't have versions yet
-  echo "README.md" >>"$temp_file"
-  echo "docs/reference/FEATURES.md" >>"$temp_file"
-  echo "docs/COPYRIGHT" >>"$temp_file"
-
   # Non-markdown and hidden-directory surfaces rg's `--type md` scan above
   # cannot reach: a shell script, and READMEs under the dotfile-hidden
   # `.chezmoitemplates/` tree (rg skips dot-dirs without --hidden). These
   # carry "current version" stamps that check-version-consistency.sh and
   # the test_version_consistency unit test enforce, so keep them in sync.
-  echo "scripts/git-hooks/pre-commit-audit.sh" >>"$temp_file"
-  echo "defaults/.chezmoitemplates/README.md" >>"$temp_file"
-  echo "defaults/.chezmoitemplates/functions/README.md" >>"$temp_file"
-  echo "defaults/.chezmoitemplates/aliases/README.md" >>"$temp_file"
+  printf '%s\n' \
+    "README.md" \
+    "docs/reference/FEATURES.md" \
+    "docs/COPYRIGHT" \
+    "scripts/git-hooks/pre-commit-audit.sh" \
+    "defaults/.chezmoitemplates/README.md" \
+    "defaults/.chezmoitemplates/functions/README.md" \
+    "defaults/.chezmoitemplates/aliases/README.md" >>"$temp_file"
 
   # Remove duplicates and filter existing files
   sort -u "$temp_file" | while IFS= read -r file; do
@@ -261,6 +282,7 @@ update_version_references() {
       log_warning "File not found: $file"
       continue
     fi
+    files_processed=$((files_processed + 1))
 
     # Skip milestone and other historical files
     if [[ "$(basename "$file")" == MILESTONE_* ]]; then
@@ -321,6 +343,7 @@ update_version_references() {
         cat "$temp_file" >"$file"
         log_success "Updated: $file"
       fi
+      rm -f "$temp_file"
       changes_made=$((changes_made + 1))
     else
       log_info "No changes needed: $file"
@@ -360,26 +383,49 @@ verify_version_consistency() {
 
     # Extract only dotfiles-targeted version references (ignore unrelated tool versions).
     local versions_in_file=()
-    while IFS= read -r match; do
-      while IFS= read -r version; do
-        versions_in_file+=("$version")
-      done < <(printf "%s\n" "$match" | rg -o "v?$VERSION_PATTERN" || true)
-    done < <(
-      rg -v "MILESTONE" "$file" 2>/dev/null | rg -o \
-        -e "Version-v$VERSION_PATTERN" \
-        -e "/releases/tag/v$VERSION_PATTERN" \
-        -e "/dotfiles/v$VERSION_PATTERN/" \
-        -e "\\*\\*Version\\*\\*:[[:space:]]*v?$VERSION_PATTERN" \
-        -e "\\*\\*Dotfiles Version\\*\\*:[[:space:]]*v?$VERSION_PATTERN" \
-        -e "(^|[[:space:]])Version:[[:space:]]*v?$VERSION_PATTERN" \
-        -e "(^|[[:space:]])Dotfiles Version:[[:space:]]*v?$VERSION_PATTERN" \
-        -e "Version[[:space:]]*\`v?$VERSION_PATTERN\`" \
-        -e "\\(v$VERSION_PATTERN\\)" \
-        -e "/v$VERSION_PATTERN/" \
-        -e "v$VERSION_PATTERN\\b" \
-        -e "dotfiles:v?$VERSION_PATTERN" \
-        -e "notes — v$VERSION_PATTERN" || true
-    )
+    if command -v rg &>/dev/null; then
+      while IFS= read -r match; do
+        while IFS= read -r version; do
+          versions_in_file+=("$version")
+        done < <(printf "%s\n" "$match" | rg -o "v?$VERSION_PATTERN" || true)
+      done < <(
+        rg -v "MILESTONE" "$file" 2>/dev/null | rg -o \
+          -e "Version-v$VERSION_PATTERN" \
+          -e "/releases/tag/v$VERSION_PATTERN" \
+          -e "/dotfiles/v$VERSION_PATTERN/" \
+          -e "\\*\\*Version\\*\\*:[[:space:]]*v?$VERSION_PATTERN" \
+          -e "\\*\\*Dotfiles Version\\*\\*:[[:space:]]*v?$VERSION_PATTERN" \
+          -e "(^|[[:space:]])Version:[[:space:]]*v?$VERSION_PATTERN" \
+          -e "(^|[[:space:]])Dotfiles Version:[[:space:]]*v?$VERSION_PATTERN" \
+          -e "Version[[:space:]]*\`v?$VERSION_PATTERN\`" \
+          -e "\\(v$VERSION_PATTERN\\)" \
+          -e "/v$VERSION_PATTERN/" \
+          -e "v$VERSION_PATTERN\\b" \
+          -e "dotfiles:v?$VERSION_PATTERN" \
+          -e "notes — v$VERSION_PATTERN" || true
+      )
+    else
+      while IFS= read -r match; do
+        while IFS= read -r version; do
+          versions_in_file+=("$version")
+        done < <(printf "%s\n" "$match" | grep -Eo "v?$VERSION_PATTERN" || true)
+      done < <(
+        grep -Ev "MILESTONE" "$file" 2>/dev/null | grep -Eo \
+          -e "Version-v$VERSION_PATTERN" \
+          -e "/releases/tag/v$VERSION_PATTERN" \
+          -e "/dotfiles/v$VERSION_PATTERN/" \
+          -e "\\*\\*Version\\*\\*:[[:space:]]*v?$VERSION_PATTERN" \
+          -e "\\*\\*Dotfiles Version\\*\\*:[[:space:]]*v?$VERSION_PATTERN" \
+          -e "(^|[[:space:]])Version:[[:space:]]*v?$VERSION_PATTERN" \
+          -e "(^|[[:space:]])Dotfiles Version:[[:space:]]*v?$VERSION_PATTERN" \
+          -e "Version[[:space:]]*\`v?$VERSION_PATTERN\`" \
+          -e "\\(v$VERSION_PATTERN\\)" \
+          -e "/v$VERSION_PATTERN/" \
+          -e "v$VERSION_PATTERN([^0-9.]|$)" \
+          -e "dotfiles:v?$VERSION_PATTERN" \
+          -e "notes — v$VERSION_PATTERN" || true
+      )
+    fi
 
     if [[ ${#versions_in_file[@]} -eq 0 ]]; then
       continue
@@ -450,6 +496,12 @@ main() {
     esac
   done
 
+  if [[ -n "${DOTFILES_COV_TMPDIR:-}" && "${DOTFILES_ALLOW_COVERAGE_WRITES:-0}" != "1" ]]; then
+    dry_run="true"
+    create_backup_flag="false"
+    log_info "Coverage sandbox detected; forcing --dry-run"
+  fi
+
   # Change to project root
   cd "$PROJECT_ROOT"
 
@@ -463,8 +515,11 @@ main() {
   fi
 
   # Find files with version references
-  local version_files
-  readarray -t version_files < <(find_version_files)
+  local version_files=()
+  local version_file
+  while IFS= read -r version_file; do
+    version_files+=("$version_file")
+  done < <(find_version_files)
 
   if [[ ${#version_files[@]} -eq 0 ]]; then
     log_warning "No files with version references found"
@@ -567,16 +622,5 @@ EOF
   fi
 }
 
-# Ensure we have required tools
-if ! command -v jq &>/dev/null; then
-  log_warning "jq is not installed — skipping version sync"
-  exit 0
-fi
-
-if ! command -v rg &>/dev/null; then
-  log_warning "ripgrep (rg) is not installed — skipping version sync"
-  exit 0
-fi
-
 # Run main function
 main "$@"