diff options
Diffstat (limited to 'hooks')
| -rw-r--r-- | hooks/hooks.json | 1 | ||||
| -rwxr-xr-x | hooks/run-hook.cmd | 23 | ||||
| -rwxr-xr-x | hooks/session-start | 53 |
3 files changed, 50 insertions, 27 deletions
diff --git a/hooks/hooks.json b/hooks/hooks.json index 6797513..8b33bbe 100644 --- a/hooks/hooks.json +++ b/hooks/hooks.json @@ -7,6 +7,7 @@ { "type": "command", "command": "\"${CLAUDE_PLUGIN_ROOT}/hooks/run-hook.cmd\" session-start", + "powershell": "& \"${CLAUDE_PLUGIN_ROOT}/hooks/run-hook.cmd\" session-start", "shell": "bash", "async": false } diff --git a/hooks/run-hook.cmd b/hooks/run-hook.cmd index a2f7c48..4501021 100755 --- a/hooks/run-hook.cmd +++ b/hooks/run-hook.cmd @@ -53,10 +53,27 @@ CMDBLOCK # running) instead of a PATH lookup for bash, so this keeps working when # Claude Code spawns the SessionStart hook with a broken/empty PATH # (anthropics/claude-code#43127). +# No $(cd ... && pwd) subshell: a fork costs tens of milliseconds under Git +# Bash on Windows, and a relative directory is enough for the exec below. case "$0" in - */*|*\\*) SCRIPT_DIR="$(cd "${0%[/\\]*}" && pwd)" ;; - *) SCRIPT_DIR="$(pwd)" ;; + */*|*\\*) SCRIPT_DIR="${0%[/\\]*}" ;; + *) SCRIPT_DIR="." ;; esac SCRIPT_NAME="$1" shift -exec "${BASH:-bash}" "${SCRIPT_DIR}/${SCRIPT_NAME}" "$@" + +# Without bash installed, the harness runs this file with zsh or sh and $BASH +# is unset (#2503). session-start runs unchanged under zsh, so fall back to +# it, and otherwise exit quietly like the Windows half: the plugin still +# works, just without SessionStart context injection. +if [ -n "${BASH:-}" ]; then + shell="$BASH" +elif command -v bash >/dev/null 2>&1; then + shell="bash" +elif command -v zsh >/dev/null 2>&1; then + shell="zsh" +else + exit 0 +fi + +exec "$shell" "${SCRIPT_DIR}/${SCRIPT_NAME}" "$@" diff --git a/hooks/session-start b/hooks/session-start index 63f82a6..d88e50f 100755 --- a/hooks/session-start +++ b/hooks/session-start @@ -9,24 +9,32 @@ set -euo pipefail # dirname because a SessionStart:startup hook can run with a broken/empty # PATH (anthropics/claude-code#43127) before any PATH-repairing sibling hook # in the same startup batch takes effect. +# +# No command substitution or pipe runs in this script: each one forks, and a +# fork costs tens of milliseconds under Git Bash on Windows. The paths stay +# relative to the current directory, which is all the file read below needs. case "$0" in - */*|*\\*) SCRIPT_DIR="$(cd "${0%[/\\]*}" && pwd)" ;; - *) SCRIPT_DIR="$(pwd)" ;; + */*|*\\*) SCRIPT_DIR="${0%[/\\]*}" ;; + *) SCRIPT_DIR="." ;; esac -PLUGIN_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)" +PLUGIN_ROOT="${SCRIPT_DIR}/.." -# Read using-superpowers content via bash's builtin $(< file) instead of -# cat, for the same PATH-independence reason. +# Read using-superpowers content with the read builtin (no cat, for the same +# PATH-independence reason, and no $(< file) subshell). read returns 1 at end +# of file, hence || true; the loop drops trailing newlines as $(< file) did. skill_md="${PLUGIN_ROOT}/skills/using-superpowers/SKILL.md" +using_superpowers_content="Error reading using-superpowers skill" if [ -r "$skill_md" ]; then - using_superpowers_content="$(<"$skill_md")" -else - using_superpowers_content="Error reading using-superpowers skill" + IFS= read -r -d '' using_superpowers_content < "$skill_md" || true + while [[ $using_superpowers_content == *$'\n' ]]; do + using_superpowers_content="${using_superpowers_content%$'\n'}" + done fi # Escape string for JSON embedding using bash parameter substitution. # Each ${s//old/new} is a single C-level pass - orders of magnitude -# faster than the character-by-character loop this replaces. +# faster than the character-by-character loop this replaces. The result +# goes to a variable instead of stdout, so no $(...) subshell is needed. escape_for_json() { local s="$1" s="${s//\\/\\\\}" @@ -34,10 +42,10 @@ escape_for_json() { s="${s//$'\n'/\\n}" s="${s//$'\r'/\\r}" s="${s//$'\t'/\\t}" - printf '%s' "$s" + using_superpowers_escaped="$s" } -using_superpowers_escaped=$(escape_for_json "$using_superpowers_content") +escape_for_json "$using_superpowers_content" session_context="<EXTREMELY_IMPORTANT>\nYou have superpowers.\n\n**Below is the full content of your 'superpowers:using-superpowers' skill - your introduction to using skills. For all other skills, use the 'Skill' tool:**\n\n${using_superpowers_escaped}\n</EXTREMELY_IMPORTANT>" # Output context injection as JSON. @@ -51,21 +59,18 @@ session_context="<EXTREMELY_IMPORTANT>\nYou have superpowers.\n\n**Below is the # Uses printf instead of heredoc to work around bash 5.3+ heredoc hang. # See: https://github.com/obra/superpowers/issues/571 # -# emit_json pipes printf through `cat` when cat is on PATH, to absorb EPIPE -# on Windows. On Windows + Git Bash, the harness can close the hook's stdout -# before printf finishes, and Git Bash's printf reports that EPIPE as -# "printf: write error: Permission denied", which `set -euo pipefail` lets -# escape as a startup diagnostic every session. Letting cat receive the EPIPE -# keeps it out of the hook's error path (#1612). When PATH is broken and cat -# can't be found (#2310), it falls back to printf alone so context still -# gets injected. +# emit_json absorbs EPIPE without a pipe through `cat`. On Windows + Git +# Bash, the harness can close the hook's stdout before printf finishes, and +# Git Bash's printf reports that EPIPE as "printf: write error: Permission +# denied", which `set -euo pipefail` would let escape as a startup diagnostic +# every session (#1612). SIGPIPE is ignored so other platforms see the same +# EPIPE error instead of a signal; the error message is dropped and the +# status ignored. No external command is involved, so a broken PATH (#2310) +# changes nothing. emit_json() { + trap '' PIPE # shellcheck disable=SC2059 # every caller passes a literal format string - if command -v cat >/dev/null 2>&1; then - printf "$@" | cat - else - printf "$@" - fi + printf "$@" 2>/dev/null || true } if [ -n "${CURSOR_PLUGIN_ROOT:-}" ]; then |
