diff --git a/hooks/session-start.sh b/hooks/session-start.sh index 127bd02..e622e65 100644 --- a/hooks/session-start.sh +++ b/hooks/session-start.sh @@ -389,25 +389,46 @@ _digest_journal() { # → last journal bullet [ -n "$last" ] && echo "- journal: ${last#- }" } -# The block: header + lines, whole lines dropped from the end until ≤ 800. +# The block: header + open BLK lines + count line + todo lines + journal. +# Over 800 chars: todo lines go (last to first); header, open BLK lines +# (3 x 160 max), count line and journal stay, which always fits in 800. # Built in a variable and printed once, so a failure mid-way prints nothing. -_memory_digest() { # - local root=$1 lib line block="" lines=() - lib="$(dirname "${BASH_SOURCE[0]}")/../lib/memory.sh" - [ -d "$root/.claude/memory" ] || return 0 - [ -f "$lib" ] && while IFS= read -r line; do lines+=("$line"); done \ - < <(_digest_blockers "$root" "$lib") - while IFS= read -r line; do lines+=("$line"); done < <(_digest_todo "$root") - while IFS= read -r line; do lines+=("$line"); done < <(_digest_journal "$root") - [ "${#lines[@]}" -gt 0 ] || return 0 - block="memory digest:" - for line in "${lines[@]}"; do - line=$(_digest_cut "$line") - [ $((${#block} + ${#line} + 1)) -le 800 ] || break - block+=$'\n'"$line" +_digest_assemble() { # reads the arrays blk, cnt, todo, jr of the caller + local block i + while :; do + block="memory digest:" + for i in "${blk[@]}" "${cnt[@]}" "${todo[@]}" "${jr[@]}"; do + block+=$'\n'"$i" + done + [ "${#block}" -le 800 ] && break + if [ "${#todo[@]}" -gt 0 ]; then unset 'todo[-1]' + else break; fi done printf '%s\n' "$block" } + +_digest_collect() { # + local -n _dc=$1; local line + while IFS= read -r line; do _dc+=("$(_digest_cut "$line")"); done +} + +_memory_digest() { # + local root=$1 lib line blk=() cnt=() todo=() jr=() + lib="$(dirname "${BASH_SOURCE[0]}")/../lib/memory.sh" + [ -d "$root/.claude/memory" ] || return 0 + if [ -f "$lib" ]; then + while IFS= read -r line; do + case "$line" in + "- open: +"*) cnt+=("$line") ;; + *) blk+=("$(_digest_cut "$line")") ;; + esac + done < <(_digest_blockers "$root" "$lib") + fi + _digest_collect todo < <(_digest_todo "$root") + _digest_collect jr < <(_digest_journal "$root") + [ $((${#blk[@]} + ${#cnt[@]} + ${#todo[@]} + ${#jr[@]})) -gt 0 ] || return 0 + _digest_assemble +} 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 diff --git a/lib/tests/session-digest.test.sh b/lib/tests/session-digest.test.sh index 3a653c1..1b2ccba 100644 --- a/lib/tests/session-digest.test.sh +++ b/lib/tests/session-digest.test.sh @@ -85,18 +85,40 @@ done out=$(cd "$p" && LC_ALL=C.UTF-8 bash "$SS" /dev/null | digest | tail -1) check SD6-len-160 "${#out}" 160 -# SD7: 10 open BLK with long titles, long todos and journal -> whole lines, <= 800 +# SD7: 3 open BLK + 3 long todos + a journal line over the 800 cap: todo +# lines drop from the last, the journal and every BLK line stay +rep() { printf "%$2s" '' | tr ' ' "$1"; } p=$(mkproj sd7) -lt=$(printf 'title%.0s ' $(seq 1 40)) -for i in 1 2 3 4 5 6 7 8 9 10; do blk "$p" "$i" open "$lt"; done -printf '### Actionable\n- [ ] %s\n- [ ] %s\n- [ ] %s\n' "$lt" "$lt" "$lt" > "$p/.claude/tasks/TODO.md" -printf '## d\n- %s\n' "$lt$lt" > "$p/.claude/memory/journal.md" +for i in 1 2 3; do blk "$p" "$i" open "$(rep b 100)"; done +printf '### Actionable\n- [ ] A%s\n- [ ] B%s\n- [ ] C%s\n' \ + "$(rep x 200)" "$(rep x 200)" "$(rep x 200)" > "$p/.claude/tasks/TODO.md" +printf '## d\n- %s\n' "$(rep j 100)" > "$p/.claude/memory/journal.md" +want="memory digest: +- open: BLK-001 $(rep b 100) +- open: BLK-002 $(rep b 100) +- open: BLK-003 $(rep b 100) +- todo: A$(rep x 150)… +- todo: B$(rep x 150)… +- journal: $(rep j 100)" out=$(run "$p" - | digest) +check SD7-drops-last-todo "$out" "$want" check SD7-le-800 "$([ "${#out}" -le 800 ] && echo yes || echo no)" yes -check SD7-header "$(printf '%s' "$out" | head -1)" 'memory digest:' -check SD7-whole-lines "$(printf '%s\n' "$out" | tail -n +2 | grep -vc '^- \(open: BLK-\|open: +\|todo: \|journal: \)')" 0 -check SD7-dropped-from-end "$(printf '%s' "$out" | grep -c 'journal:')" 0 -check SD7-lines-le-160 "$(printf '%s\n' "$out" | awk 'length($0) > 160' | wc -l | tr -d ' ')" 0 + +# SD7b: the worst case (10 open BLK, long titles, 3 long todos, 160-char +# journal): all todos drop, 3 BLK + count + journal stay, whole lines, <= 800 +p=$(mkproj sd7b) +for i in 1 2 3 4 5 6 7 8 9 10; do blk "$p" "$i" open "$(rep b 300)"; done +blk "$p" 11 upstream "Up" +printf '### Actionable\n- [ ] %s\n- [ ] %s\n' "$(rep x 300)" "$(rep x 300)" \ + > "$p/.claude/tasks/TODO.md" +printf '## d\n- %s\n' "$(rep j 300)" > "$p/.claude/memory/journal.md" +out=$(run "$p" - | digest) +check SD7b-le-800 "$([ "${#out}" -le 800 ] && echo yes || echo no)" yes +check SD7b-no-todo "$(printf '%s\n' "$out" | grep -c '^- todo:')" 0 +check SD7b-3-blk "$(printf '%s\n' "$out" | grep -c '^- open: BLK-')" 3 +check SD7b-count-line "$(printf '%s\n' "$out" | grep -x -- '- open: +7 more, +1 upstream')" '- open: +7 more, +1 upstream' +check SD7b-journal "$(printf '%s\n' "$out" | tail -1)" "- journal: $(rep j 148)…" +check SD7b-lines-le-160 "$(printf '%s\n' "$out" | awk 'length($0) > 160' | wc -l | tr -d ' ')" 0 # SD9: copy of the script beside a failing / malformed lib; blockers dir mkdir -p "$WORK/sd9/hooks" "$WORK/sd9/lib"