diff --git a/hooks/session-start.sh b/hooks/session-start.sh index c447b8e..c811057 100644 --- a/hooks/session-start.sh +++ b/hooks/session-start.sh @@ -25,7 +25,13 @@ if command -v timeout >/dev/null 2>&1 && command -v jq >/dev/null 2>&1; then _ss_source=$(printf '%s' "$_ss_in" | jq -r '.source // empty' 2>/dev/null) fi case "$_ss_source" in ""|startup|clear|compact) _ss_digest=1 ;; esac - unset _ss_in _ss_source + # The mod's switch: `"enabled": false` (a boolean) cuts the digest. An + # absent, unreadable or unparsable file, or any other value, keeps it. + # "recall" is the mod's own key and is ignored here. + _ss_off=$(jq -r 'if .enabled == false then "off" else "on" end' \ + "$HOME/.claude/memory.json" 2>/dev/null) + [ "$_ss_off" = off ] && _ss_digest=0 + unset _ss_in _ss_source _ss_off elif [ -t 0 ]; then _ss_digest=1 fi @@ -437,8 +443,11 @@ _memory_digest() { # } if [ "$_ss_digest" = 1 ]; then _ss_root=$(git rev-parse --show-toplevel 2>/dev/null) || _ss_root=$PWD - ( _memory_digest "$_ss_root" ) 2>/dev/null || true - unset _ss_root + # A foreign repository (`gitflow.protect` false) gets no digest. + _ss_protect=$(git -C "$_ss_root" config --get gitflow.protect 2>/dev/null) + [ "$_ss_protect" = false ] || + ( _memory_digest "$_ss_root" ) 2>/dev/null || true + unset _ss_root _ss_protect fi unset _ss_digest diff --git a/lib/tests/session-digest.test.sh b/lib/tests/session-digest.test.sh index 89a7fea..1149670 100644 --- a/lib/tests/session-digest.test.sh +++ b/lib/tests/session-digest.test.sh @@ -182,5 +182,50 @@ check SD12-rc "$rc" 0 check SD12-banner "$(printf '%s' "$out" | grep -c 'make doctor')" 1 check SD12-no-digest "$(printf '%s' "$out" | grep -c 'memory digest:')" 0 +# mkhome [json]: a HOME that links the real ~/.claude entries and +# holds the given memory.json (none when omitted); prints its path. +mkhome() { + local h="$WORK/home-$1" f + mkdir -p "$h/.claude" + for f in "$HOME"/.claude/*; do + [ "$(basename "$f")" = memory.json ] || ln -sf "$f" "$h/.claude/" + done + [ $# -lt 2 ] || printf '%s' "$2" > "$h/.claude/memory.json" + echo "$h" +} +digests() { grep -c 'memory digest:'; } +p=$(mkproj sd13); blk "$p" 1 open "Switched" + +# SD13: the memory switch. Only a boolean enabled:false cuts the digest. +check SD13a-enabled-false "$(cd "$p" && HOME=$(mkhome a '{"enabled": false}') \ + bash "$SS" <"$WORK/startup.json" 2>/dev/null | digests)" 0 +check SD13b-recall-false "$(cd "$p" && HOME=$(mkhome b '{"recall": false}') \ + bash "$SS" <"$WORK/startup.json" 2>/dev/null | digests)" 1 +check SD13c-malformed "$(cd "$p" && HOME=$(mkhome c '{"enabled": fal') \ + bash "$SS" <"$WORK/startup.json" 2>/dev/null | digests)" 1 +check SD13d-string-false "$(cd "$p" && HOME=$(mkhome d '{"enabled": "false"}') \ + bash "$SS" <"$WORK/startup.json" 2>/dev/null | digests)" 1 +check SD13e-absent "$(cd "$p" && HOME=$(mkhome e) \ + bash "$SS" <"$WORK/startup.json" 2>/dev/null | digests)" 1 +check SD13f-enabled-true "$(cd "$p" && HOME=$(mkhome f '{"enabled": true}') \ + bash "$SS" <"$WORK/startup.json" 2>/dev/null | digests)" 1 +check SD13g-not-an-object "$(cd "$p" && HOME=$(mkhome g '[1]') \ + bash "$SS" <"$WORK/startup.json" 2>/dev/null | digests)" 1 +# no jq: the switch is unreadable and the existing rule applies, no digest +# from a hook (stdin is not a terminal) +check SD13h-no-jq "$(cd "$p" && HOME=$(mkhome h '{"enabled": false}') \ + PATH="$bin" bash "$SS" <"$WORK/startup.json" 2>/dev/null | digests)" 0 + +# SD14: a foreign repository (gitflow.protect false) gets no digest +p=$(mkproj sd14); blk "$p" 1 open "Foreign" +git -C "$p" init -q +check SD14a-unset "$(run "$p" "$WORK/startup.json" | digests)" 1 +git -C "$p" config gitflow.protect true +check SD14b-true "$(run "$p" "$WORK/startup.json" | digests)" 1 +git -C "$p" config gitflow.protect false +check SD14c-false "$(run "$p" "$WORK/startup.json" | digests)" 0 +check SD14d-banner "$(run "$p" "$WORK/startup.json" | grep -c '^$')" \ + "$(run "$p" "$WORK/startup.json" | grep -c '^$')" + printf 'session-digest: %d passed, %d failed\n' "$pass" "$fail" [ "$fail" -eq 0 ]