fix: resolve merge conflicts with main (v0.13.7.0)

Main landed v0.13.6.0 (GStack Learns) using the same version number as
this branch. Bumped to v0.13.7.0, kept both CHANGELOG entries in order.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Garry Tan
2026-03-29 20:03:12 -07:00
49 changed files with 2375 additions and 3 deletions
+9
View File
@@ -59,6 +59,15 @@ for _PF in $(find ~/.gstack/analytics -maxdepth 1 -name '.pending-*' 2>/dev/null
fi
break
done
# Learnings count
eval "$(~/.claude/skills/gstack/bin/gstack-slug 2>/dev/null)" 2>/dev/null || true
_LEARN_FILE="${GSTACK_HOME:-$HOME/.gstack}/projects/${SLUG:-unknown}/learnings.jsonl"
if [ -f "$_LEARN_FILE" ]; then
_LEARN_COUNT=$(wc -l < "$_LEARN_FILE" 2>/dev/null | tr -d ' ')
echo "LEARNINGS: $_LEARN_COUNT entries loaded"
else
echo "LEARNINGS: 0"
fi
```
If `PROACTIVE` is `"false"`, do not proactively suggest gstack skills AND do not