diff --git a/.chezmoiignore b/.chezmoiignore index 1a3b4a36..463602dc 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -22,5 +22,6 @@ !.local/share/chezmoi/bin !.local/share/chezmoi/bin/** !.zshrc +!.zshenv !.p10k.zsh !.aliases diff --git a/.chezmoiscripts/run_before_00_backup_rc_files.sh.tmpl b/.chezmoiscripts/run_before_00_backup_rc_files.sh.tmpl index 68df47de..4d41d5fc 100644 --- a/.chezmoiscripts/run_before_00_backup_rc_files.sh.tmpl +++ b/.chezmoiscripts/run_before_00_backup_rc_files.sh.tmpl @@ -1,6 +1,7 @@ #!/usr/bin/env bash # Backup seguro de symlinks gestionados antes de que Chezmoi cree los destinos: # ~/.zshrc -> $HOME/dotfiles/zshrc +# ~/.zshenv -> $HOME/dotfiles/zshenv # ~/.p10k.zsh -> $HOME/dotfiles/powerlevel10k/p10k.zsh # ~/.aliases -> $HOME/dotfiles/aliases # ~/.tmux.conf -> $HOME/dotfiles/tmux.conf @@ -13,7 +14,7 @@ # - Si es fichero regular con contenido custom no reconocido: abortar con # mensaje accionable, salvo que el usuario haya pasado ZSH_RC_APPLY=1 # (flag histórico; cubre también ~/.tmux.conf además de los RC de zsh). -# - Nunca borra sin backup. Sin sudo. Solo toca los cuatro ficheros del scope. +# - Nunca borra sin backup. Sin sudo. Solo toca los cinco ficheros del scope. # # RCM/rcup queda fuera del flujo activo: este hook no lo invoca ni asume. set -euo pipefail @@ -94,7 +95,7 @@ handle_target() { cat >&2 <.backup.YYYYMMDD-HHMMSS` y Chezmoi crea el symlink limpio. @@ -68,6 +69,55 @@ El hook `.chezmoiscripts/run_before_00_backup_rc_files.sh.tmpl` se ejecuta antes Nunca se borra sin backup; nunca se usa `sudo`. +### PATH de agentes y Desktop Commander sin TTY (#30) + +`~/.zshenv` configura únicamente PATH, sin salida, credenciales ni comandos +externos. Ante un PATH heredado mínimo añade, por orden, `$HOME/.local/bin`, +`$HOME/.npm-global/bin`, `/usr/local/bin`, `/usr/bin` y `/bin`; conserva después +las entradas heredadas y elimina duplicados. No instala CLI ni selecciona +versiones de Node. `uv`, `claude` y `chezmoi` se esperan en `.local/bin`, +`codex` en `.npm-global/bin`; `gh` y `node` pueden resolver en `/usr/bin`. + +| Invocación sin TTY | Inicialización del repo | +|--------------------|------------------------| +| `zsh -c` | `.zshenv`: PATH mínimo | +| `zsh -lc` | Igual; no se añade `.zprofile` al repo | +| `zsh -lic` | Igual; `.zshrc` retorna antes de Instant Prompt, OMZ, ZLE, NVM y overrides locales | + +En una terminal interactiva con stdin/stdout TTY se mantiene el orden de +Instant Prompt, módulos, NVM y Powerlevel10k classic con rutas completas. +Los archivos globales de `/etc/zsh/` y un `.zprofile`/`.zlogin` local pueden +añadir comportamiento ajeno al repo. `zsh -f` omite el `.zshenv` del usuario; +un `ZDOTDIR` personalizado requiere gestionar allí el startup correspondiente. + +En DC `start_process`, elegir explícitamente `shell: "/usr/bin/zsh"` para +comandos de agentes; no es necesario forzar `-i` para obtener PATH. Por ejemplo: + +```json +{"shell":"/usr/bin/zsh","command":"for cli in uv gh codex claude node; do command -v \"$cli\"; done","timeout_ms":10000} +``` + +Para exigir sintaxis Bash, usar `shell: "/bin/bash"` y declarar su PATH +explícitamente en el comando: Bash no lee `.zshenv`. La corrección se aplica +a hijos zsh de DC; no cambia el entorno del proceso MCP padre ni de +`systemd --user`, ni requiere reiniciar servicios. Los launchers ejecutados +directamente deben mantener su propio contrato de entorno. + +Diagnóstico seguro: ejecutar cada modo con `env -i HOME="$HOME" +PATH=/usr/bin:/bin /usr/bin/zsh -c 'command -v uv; command -v codex'`, +sustituyendo `-c` por `-lc` y `-lic`, con stdin redirigido desde `/dev/null` +y stdout/stderr a archivos temporales. No volcar `env` ni archivos de secretos. +Las pruebas `tests/bats/zsh/agent_startup.bats` usan HOME aislado, CLI fixture, +captura sin TTY y pseudo-TTY para verificar ambas ramas sin aplicar al HOME real. + +Tras merge y **GO humano**, revisar `chezmoi --source="$HOME/dotfiles" diff +"$HOME/.zshenv" "$HOME/.zshrc"` y después usar +`DOTFILES_DIR="$HOME/dotfiles" dotfiles-apply --apply "$HOME/.zshenv" "$HOME/.zshrc"`. +Revisar primero cualquier startup custom; no activar `ZSH_RC_APPLY=1` a ciegas. +El hook de backup evalúa los cinco RC incluso en apply acotado: comprobar +también `.p10k.zsh`, `.aliases` y `.tmux.conf` antes del GO. Abrir nuevos hijos +de DC y una terminal normal para validar; hasta ese apply el HOME sigue sin corregir. + --- ## Dato Chezmoi: ruta del vault Obsidian (`ai.obsidian_vault_path`) diff --git a/symlink_dot_zshenv.tmpl b/symlink_dot_zshenv.tmpl new file mode 100644 index 00000000..1ee7c2f7 --- /dev/null +++ b/symlink_dot_zshenv.tmpl @@ -0,0 +1 @@ +{{ .chezmoi.homeDir }}/dotfiles/zshenv diff --git a/tests/Makefile.tests b/tests/Makefile.tests index 349e8583..17c917a5 100644 --- a/tests/Makefile.tests +++ b/tests/Makefile.tests @@ -507,6 +507,7 @@ bats-docs: @$(call run_bats,$(BATS_DIR)/docs/github-token-policy.bats) bats-zsh: + @$(call run_bats,$(BATS_DIR)/zsh/agent_startup.bats) @echo "$(BLUE)==>$(NC) Running zsh stack RC symlink tests..." @$(call run_bats,$(BATS_DIR)/zsh/rc_symlinks.bats) @echo "$(BLUE)==>$(NC) Running Oh My Zsh plugin list tests..." diff --git a/tests/bats/zsh/agent_startup.bats b/tests/bats/zsh/agent_startup.bats new file mode 100644 index 00000000..9bfbadea --- /dev/null +++ b/tests/bats/zsh/agent_startup.bats @@ -0,0 +1,126 @@ +#!/usr/bin/env bats + +setup() { + load '../helpers/common' + skip_if_command_missing zsh + REPO_DIR="$(cd "${BATS_TEST_DIRNAME}/../../.." && pwd)" + TEST_HOME="${BATS_TEST_TMPDIR}/home" + mkdir -p "$TEST_HOME/dotfiles" "$TEST_HOME/.local/bin" "$TEST_HOME/.npm-global/bin" "$TEST_HOME/.cache" + cp -r "$REPO_DIR/zsh" "$TEST_HOME/dotfiles/" + cp "$REPO_DIR/zshrc" "$TEST_HOME/.zshrc" + [[ ! -f "$REPO_DIR/zshenv" ]] || cp "$REPO_DIR/zshenv" "$TEST_HOME/.zshenv" + for cli in uv claude chezmoi; do + printf '#!/bin/sh\nexit 0\n' >"$TEST_HOME/.local/bin/$cli" + chmod +x "$TEST_HOME/.local/bin/$cli" + done + printf '#!/bin/sh\nexit 0\n' >"$TEST_HOME/.npm-global/bin/codex" + chmod +x "$TEST_HOME/.npm-global/bin/codex" + # Fail loudly if any interactive-only startup runs without a terminal. + mkdir -p "$TEST_HOME/.oh-my-zsh" "$TEST_HOME/.nvm" + printf 'print OMZ_LOADED\n' >"$TEST_HOME/.oh-my-zsh/oh-my-zsh.sh" + printf 'print NVM_LOADED\n' >"$TEST_HOME/.nvm/nvm.sh" + printf 'print LOCAL_LOADED\n' >"$TEST_HOME/.zshrc.local" + printf 'print P10K_LOADED\n' >"$TEST_HOME/.p10k.zsh" + printf 'print INSTANT_LOADED\n' >"$TEST_HOME/.cache/p10k-instant-prompt-$(id -un).zsh" +} + +@test "agent shells resolve user CLIs with minimal inherited PATH and no startup output" { + for mode in -c -lc -lic; do + run env -i HOME="$TEST_HOME" PATH=/usr/bin:/bin TERM=dumb /usr/bin/zsh "$mode" ' + [[ ! -t 0 && ! -t 1 && ! -t 2 ]] || exit 10 + for cli in uv claude chezmoi; do + [[ $(command -v "$cli") == "$HOME/.local/bin/$cli" ]] || exit 11 + done + [[ $(command -v codex) == "$HOME/.npm-global/bin/codex" ]] || exit 12 + for cli in gh node; do + [[ ! -x /usr/bin/$cli ]] || [[ $(command -v "$cli") == /usr/bin/$cli ]] || exit 13 + done + print PASS + ' deadline: + os.kill(pid, 9) + raise AssertionError('terminal startup timed out') + if not select.select([fd], [], [], 0.1)[0]: + continue + try: + chunk = os.read(fd, 65536) + except OSError as error: + if error.errno != errno.EIO: + raise + break + if not chunk: + break + output += chunk +finally: + os.close(fd) +_, status = os.waitpid(pid, 0) +text = output.decode(errors='replace') +assert status == 0, text +for marker in ('INSTANT_LOADED', 'NVM_LOADED', 'OMZ_LOADED', 'P10K_LOADED', 'LOCAL_LOADED', 'TERMINAL_OK'): + assert marker in text, text +assert text.index('INSTANT_LOADED') < text.index('OMZ_LOADED'), text +PY + [[ "$status" -eq 0 ]] +} + +@test "Chezmoi manages zshenv, refuses custom content and preserves authorized backups" { + skip_if_command_missing chezmoi + TEST_HOME="$BATS_TEST_TMPDIR/chezmoi-home" + mkdir -p "$TEST_HOME/dotfiles" + local source_dir="$BATS_TEST_TMPDIR/source" + mkdir -p "$source_dir/.chezmoiscripts" + cp "$REPO_DIR/symlink_dot_zshenv.tmpl" "$REPO_DIR/.chezmoiignore" "$source_dir/" + cp "$REPO_DIR/.chezmoiscripts/run_before_00_backup_rc_files.sh.tmpl" "$source_dir/.chezmoiscripts/" + cp "$REPO_DIR/zshenv" "$TEST_HOME/dotfiles/zshenv" + rm -f "$TEST_HOME/.zshenv" + run env HOME="$TEST_HOME" chezmoi --source="$source_dir" --destination="$TEST_HOME" apply + [[ "$status" -eq 0 ]] + [[ $(readlink "$TEST_HOME/.zshenv") == "$TEST_HOME/dotfiles/zshenv" ]] + run env HOME="$TEST_HOME" chezmoi --source="$source_dir" --destination="$TEST_HOME" apply + [[ "$status" -eq 0 ]] + [[ -z $(find "$TEST_HOME" -name '.zshenv.backup.*' -print) ]] + rm "$TEST_HOME/.zshenv" + printf '# custom startup\n' >"$TEST_HOME/.zshenv" + run env -u ZSH_RC_APPLY HOME="$TEST_HOME" chezmoi --source="$source_dir" --destination="$TEST_HOME" apply + [[ "$status" -ne 0 && "$output" == *ABORT* ]] + [[ $(cat "$TEST_HOME/.zshenv") == '# custom startup' ]] + run env HOME="$TEST_HOME" ZSH_RC_APPLY=1 chezmoi --source="$source_dir" --destination="$TEST_HOME" apply --force + [[ "$status" -eq 0 ]] + [[ $(readlink "$TEST_HOME/.zshenv") == "$TEST_HOME/dotfiles/zshenv" ]] + [[ $(cat "$TEST_HOME"/.zshenv.backup.*) == '# custom startup' ]] +} diff --git a/tests/bats/zsh/local_startup.bats b/tests/bats/zsh/local_startup.bats index 2d1370a6..2dbf08a5 100644 --- a/tests/bats/zsh/local_startup.bats +++ b/tests/bats/zsh/local_startup.bats @@ -29,7 +29,7 @@ setup() { grep -q 'gh auth switch' "${LOCAL_ZSH}" } -@test "interactive zsh startup does not export GH_TOKEN from dotfiles modules" { +@test "90-local startup module does not export GH_TOKEN" { skip_if_command_missing "zsh" local fake_home @@ -45,7 +45,7 @@ setup() { run env -u GH_TOKEN -u GITHUB_TOKEN -u GITHUB_PERSONAL_ACCESS_TOKEN \ HOME="${fake_home}" zsh -fc ' - source "$HOME/dotfiles/zshrc" + source "$HOME/dotfiles/zsh/90-local.zsh" env | grep -E "^(GH_TOKEN|GITHUB_TOKEN)=" && exit 1 || exit 0 ' rm -rf "${fake_home}" diff --git a/zshenv b/zshenv new file mode 100644 index 00000000..894bca3d --- /dev/null +++ b/zshenv @@ -0,0 +1,6 @@ +# Minimal environment for every zsh process, including agents without a TTY. +# Keep this file silent: no prompt, plugins, runtime managers or secrets. +# Preserve inherited entries after the canonical user and system commands. +typeset -U path PATH +path=("$HOME/.local/bin" "$HOME/.npm-global/bin" /usr/local/bin /usr/bin /bin "${path[@]}") +export PATH diff --git a/zshrc b/zshrc index cb64c2ef..bc3bb8c7 100644 --- a/zshrc +++ b/zshrc @@ -1,3 +1,7 @@ +# Prompt, plugins and ZLE require a real interactive terminal. Agents use +# ~/.zshenv for PATH; even `zsh -lic` must stay silent when run through pipes. +[[ -o interactive && -t 0 && -t 1 ]] || return 0 + # Enable Powerlevel10k instant prompt. Keep close to the top. if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" @@ -21,4 +25,4 @@ for f in \ "$ZSH_DOTFILES_DIR/90-local.zsh" do [[ -f "$f" ]] && source "$f" -done \ No newline at end of file +done