From 9b3961e622a30d82033616a6f2b053f49353e109 Mon Sep 17 00:00:00 2001 From: bchanot Date: Fri, 6 Nov 2026 16:34:25 +0100 Subject: [PATCH] fix(memory): an assignment-shaped path is read as a file by awk awk took --body-file x=1.md or a check/upgrade dir like a=b for a var=value operand and read stdin: checks passed vacuously and the entry got stdin. _mem_path_safe prefixes ./ to that shape only. --- lib/memory.sh | 8 ++++++++ lib/tests/memory.test.sh | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/lib/memory.sh b/lib/memory.sh index edae22c..8cf7689 100755 --- a/lib/memory.sh +++ b/lib/memory.sh @@ -426,8 +426,14 @@ _mem_add_locked() { # return "$rc" } +_mem_path_safe() { # → path, ./-prefixed when awk would take it for + # a `var=value` assignment operand and read stdin instead + if [[ "$1" =~ ^[A-Za-z_][A-Za-z0-9_]*= ]]; then echo "./$1"; else echo "$1"; fi +} + memory_add() { # <body-file> <status> <supersedes> local spec file entry rc v1="" + set -- "$1" "$2" "$(_mem_path_safe "$3")" "$4" "$5" spec=$(_mem_kind "$1") || return 2 file=".claude/memory/${spec% *}" _mem_add_valid "${spec#* }" "$2" "$3" "$4" "$5" || return 2 @@ -491,6 +497,7 @@ memory_check() { # [--staged] [<memory-dir>] → rc 2 on any culprit dir="${1:-.claude/memory}" [ $# -le 1 ] && [ "${dir#-}" = "$dir" ] || { echo "usage: memory.sh" \ "check [--staged] [dir]" >&2; return 2; } + dir=$(_mem_path_safe "$dir") [ -n "$staged" ] || [ -d "$dir" ] \ || { echo "memory: no memory dir: $dir" >&2; return 2; } case "$staged:$dir" in 1:/*|1:..|1:../*|1:*/../*|1:*/..) @@ -867,6 +874,7 @@ _mem_upgrade_file() { # <file> → rc 0 upgraded or already v2, rc 2 refused memory_upgrade() { # [<memory-dir>] → every template-born registry to v2 local dir="${1:-.claude/memory}" f rc=0 + dir=$(_mem_path_safe "$dir") for f in $(_mem_names); do [ -f "$dir/$f.md" ] || continue _mem_locked _mem_upgrade_file "$dir/$f.md" || rc=2 diff --git a/lib/tests/memory.test.sh b/lib/tests/memory.test.sh index d79a64c..4dcd817 100755 --- a/lib/tests/memory.test.sh +++ b/lib/tests/memory.test.sh @@ -708,5 +708,17 @@ const diff = [...a].filter(x => !b.has(x)).concat([...b].filter(x => !a.has(x))) console.log(a.size > 0 && diff.length === 0 ? "same" : `differ ${diff}`) ' 2>&1) check T18-entriesOf-vs-index-ids "$parity" same +# T19 a path that looks like an awk assignment (x=1.md) is a file, not stdin +printf 'x\n## sneaky\n' > 'x=1.md' +sum=$(cksum < .claude/memory/learnings.md) +bash "$MEM" add learning --title eq --body-file x=1.md </dev/null >/dev/null 2>&1 +check T19-assign-body-heading-rc "$?/$(cksum < .claude/memory/learnings.md)" "2/$sum" +printf 'clean-eq-body\n' > 'x=1.md' +bash "$MEM" add learning --title eq --body-file x=1.md </dev/null >/dev/null 2>&1 +check T19b-assign-body-written "$(grep -c '^clean-eq-body$' .claude/memory/learnings.md)" 1 +mkdir 'a=b' && printf '# Decisions\n\n## BDR-001 - legacy\n' > 'a=b/decisions.md' +err=$(bash "$MEM" check 'a=b' 2>&1 >/dev/null </dev/null) +check T19c-assign-dir-read "$(printf '%s\n' "$err" | grep -c '^memory: v1: ./a=b/decisions.md$')" 1 + echo "PASS=$pass FAIL=$fail" [ "$fail" -eq 0 ]