@sebastienrousseau/dotfiles 0.2.505 → 0.2.508

package/scripts/ops/ai-setup.sh

@@ -14,43 +14,51 @@ ui_header "Universal AI Toolchain Setup"
 setup_tool() {
   local name="$1"
   local cmd="$2"
-  local auth_cmd="$3"
+  shift 2
+  # Remaining args are the auth command — passed as an array to avoid eval.
+  local -a auth_argv=("$@")
 
   ui_section "Setting up $name"
   if command -v "$cmd" >/dev/null 2>&1; then
     ui_info "Tool found, initiating authentication..."
-    eval "$auth_cmd" || ui_warn "$name" "Setup/Auth skipped or failed."
+    "${auth_argv[@]}" || ui_warn "$name" "Setup/Auth skipped or failed."
   else
     ui_err "$name" "Binary not found. Run 'dot apply' or install via mise first."
   fi
 }
 
 # 1. Claude
-setup_tool "Claude CLI" "claude" "claude --version" # Claude handles auth via web flow or env
+setup_tool "Claude CLI" "claude" claude --version # Claude handles auth via web flow or env
 
-# 2. Gemini
-setup_tool "Gemini CLI" "gemini" "gemini info"
+# 2. Antigravity CLI
+setup_tool "Antigravity CLI" "agy" agy --version
 
-# 3. Copilot
-setup_tool "Copilot CLI" "copilot" "copilot --version"
+# 3. Codex
+setup_tool "Codex CLI" "codex" codex --version
 
-# 4. Kiro
-setup_tool "Kiro CLI" "kiro-cli" "kiro-cli auth login"
+# 4. Copilot
+setup_tool "Copilot CLI" "copilot" copilot --version
 
-# 6. Aider
-setup_tool "Aider" "aider" "aider --version"
+# 5. Goose
+setup_tool "Goose" "goose" goose --version
+
+# 6. Kiro
+setup_tool "Kiro CLI" "kiro-cli" kiro-cli auth login
+
+# 7. Aider
+setup_tool "Aider" "aider" aider --version
 
 # 7. Autohand Code
-setup_tool "Autohand Code" "autohand" "autohand --version"
+setup_tool "Autohand Code" "autohand" autohand --version
 
 # 8. Mistral Vibe
-setup_tool "Mistral Vibe" "vibe" "vibe --version"
+setup_tool "Mistral Vibe" "vibe" vibe --version
 
 # 9. Qwen Code
-setup_tool "Qwen Code" "qwen" "qwen --version"
+setup_tool "Qwen Code" "qwen" qwen --version
 
 # 10. ZAI
-setup_tool "ZAI" "zai" "zai --version"
+setup_tool "ZAI" "zai" zai --version
 
 ui_header "AI Setup Complete"
 ui_info "All tools are ready. Use 'dot ai' to check status."

package/scripts/ops/chezmoi-apply.sh

@@ -19,9 +19,11 @@ export DOT_COMMAND="apply"
 # (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
@@ -39,7 +41,9 @@ 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_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)
@@ -67,25 +71,55 @@ 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
 }
 
-# In non-interactive runs, prevent TTY prompts from blocking apply.
-if [[ "${DOTFILES_NONINTERACTIVE:-0}" == "1" ]] && ! has_flag "--force"; then
+# 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
-LOCK_FILE="${XDG_RUNTIME_DIR:-/tmp}/dotfiles-chezmoi-apply.lock"
-exec 9>"$LOCK_FILE"
-if ! flock -n 9; then
+# 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() {
@@ -161,8 +195,10 @@ 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"
-  "gemini|npm:@google/gemini-cli|Gemini CLI"
+  "goose|native|Goose"
+  "agy|native|Antigravity CLI"
   "sgpt|pipx:shell-gpt|Shell-GPT"
   "ollama|aqua:ollama/ollama|Ollama"
   "opencode|npm:opencode-ai|OpenCode"
@@ -185,7 +221,7 @@ for _entry in "${_AI_PROVIDERS[@]}"; do
   fi
 done
 
-if [[ ${#_ai_missing[@]} -gt 0 ]] && [[ "${DOTFILES_NONINTERACTIVE:-0}" != "1" ]]; then
+if [[ ${#_ai_missing[@]} -gt 0 ]] && [[ "$INTERACTIVE" == "1" ]]; then
   if command -v mise &>/dev/null; then
     echo ""
     _ai_install_action=""
@@ -232,6 +268,14 @@ if [[ ${#_ai_missing[@]} -gt 0 ]] && [[ "${DOTFILES_NONINTERACTIVE:-0}" != "1" ]
           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 command -v gum &>/dev/null; then
           if gum spin --spinner dot --title "Installing $_label ($_pkg)" -- \
             mise use -g "$_pkg@latest" 2>&1; then

package/scripts/ops/chezmoi-update.sh

@@ -14,6 +14,20 @@ 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

package/scripts/ops/rollback.sh

@@ -284,7 +284,7 @@ $drift
 
 Analyze why the environment may have reached a state requiring rollback and suggest architectural hardening steps."
 
-      dot cl --pattern hardener "$ai_prompt" || true
+      dot ai claude --style hardener "$ai_prompt" || true
     fi
   fi
 }

package/scripts/qa/docs-coverage.sh

@@ -54,7 +54,7 @@ check_dot_command_docs() {
 check_ai_provider_docs() {
   local provider=""
 
-  for provider in cl copilot gemini kiro sgpt ollama opencode aider; do
+  for provider in cl copilot agy kiro sgpt ollama opencode aider; do
     record_doc_check "dot $provider in AI.md" "\`dot $provider\`" "$AI_DOC"
   done
 }

package/scripts/theme/wallpaper-sync.sh

@@ -196,12 +196,12 @@ system_wallpaper_for_theme() {
     local sys_wp=""
     case "$family" in
       "macos - sonoma") sys_wp="$SYS_MAC/Sonoma.heic" ;;
-      "macos - blue")   sys_wp="$SYS_MAC/Mac Blue.heic" ;;
-      "macos - pink")   sys_wp="$SYS_MAC/Mac Pink.heic" ;;
+      "macos - blue") sys_wp="$SYS_MAC/Mac Blue.heic" ;;
+      "macos - pink") sys_wp="$SYS_MAC/Mac Pink.heic" ;;
       "macos - purple") sys_wp="$SYS_MAC/Mac Purple.heic" ;;
       "macos - yellow") sys_wp="$SYS_MAC/Mac Yellow.heic" ;;
       "macos - orange") sys_wp="$SYS_MAC/iMac Orange.heic" ;;
-      "macos - green")  sys_wp="$SYS_MAC/iMac Green.heic" ;;
+      "macos - green") sys_wp="$SYS_MAC/iMac Green.heic" ;;
       "macos - silver") sys_wp="$SYS_MAC/iMac Silver.heic" ;;
     esac
     if [[ -n "$sys_wp" && -f "$sys_wp" ]]; then