cc-safe-setup 29.7.0 → 30.0.4

package/tests/test-skill-cumulative-size-detector.sh

@@ -0,0 +1,198 @@
+#!/bin/bash
+# Tests for skill-cumulative-size-detector.sh
+# Run: bash tests/test-skill-cumulative-size-detector.sh
+set -uo pipefail
+
+PASS=0
+FAIL=0
+HOOK="$(cd "$(dirname "$0")/.." && pwd)/examples/skill-cumulative-size-detector.sh"
+WORK_DIR=$(mktemp -d)
+trap 'rm -rf "$WORK_DIR"' EXIT
+
+# Build a fake SKILL.md tree of the requested cumulative byte size.
+# $1 = base dir (e.g. $HOME/.claude/skills or .claude/skills)
+# $2 = total bytes to distribute across SKILL.md files
+# $3 = number of skills to create
+seed_skills() {
+    local base="$1"
+    local total="$2"
+    local count="$3"
+    [ "$count" -le 0 ] && return 0
+    mkdir -p "$base"
+    local per=$((total / count))
+    [ "$per" -le 0 ] && per=1
+    local i=0
+    while [ "$i" -lt "$count" ]; do
+        local dir="$base/skill_$i"
+        mkdir -p "$dir"
+        # Pad with deterministic ASCII so the size is exact-ish.
+        head -c "$per" /dev/zero | tr '\0' '.' > "$dir/SKILL.md"
+        i=$((i + 1))
+    done
+}
+
+run_hook() {
+    local home_dir="$1"
+    local cwd_dir="$2"
+    local extra_env="${3:-}"
+    if [ -n "$extra_env" ]; then
+        echo '{}' | env -i HOME="$home_dir" PATH="$PATH" $extra_env bash -c "cd \"$cwd_dir\" && \"$HOOK\"" 2>&1
+    else
+        echo '{}' | env -i HOME="$home_dir" PATH="$PATH" bash -c "cd \"$cwd_dir\" && \"$HOOK\"" 2>&1
+    fi
+}
+
+run_hook_exit() {
+    local home_dir="$1"
+    local cwd_dir="$2"
+    local extra_env="${3:-}"
+    if [ -n "$extra_env" ]; then
+        echo '{}' | env -i HOME="$home_dir" PATH="$PATH" $extra_env bash -c "cd \"$cwd_dir\" && \"$HOOK\"" >/dev/null 2>&1
+    else
+        echo '{}' | env -i HOME="$home_dir" PATH="$PATH" bash -c "cd \"$cwd_dir\" && \"$HOOK\"" >/dev/null 2>&1
+    fi
+    return $?
+}
+
+assert_silent() {
+    local label="$1"
+    local output="$2"
+    if [ -z "$output" ]; then
+        echo "PASS: $label (silent)"
+        PASS=$((PASS + 1))
+    else
+        echo "FAIL: $label (expected silent, got: $output)"
+        FAIL=$((FAIL + 1))
+    fi
+}
+
+assert_warned() {
+    local label="$1"
+    local output="$2"
+    local expected_marker="$3"
+    if echo "$output" | grep -qF "$expected_marker"; then
+        echo "PASS: $label"
+        PASS=$((PASS + 1))
+    else
+        echo "FAIL: $label (expected '$expected_marker' in output)"
+        echo "  output: $output"
+        FAIL=$((FAIL + 1))
+    fi
+}
+
+assert_exit_zero() {
+    local label="$1"
+    local actual="$2"
+    if [ "$actual" -eq 0 ]; then
+        echo "PASS: $label (exit 0)"
+        PASS=$((PASS + 1))
+    else
+        echo "FAIL: $label (expected exit 0, got $actual)"
+        FAIL=$((FAIL + 1))
+    fi
+}
+
+# ---------- Test 1: no skills at all → silent, exit 0 ----------
+H1="$WORK_DIR/h1"
+P1="$WORK_DIR/p1"
+mkdir -p "$H1" "$P1"
+OUT1=$(run_hook "$H1" "$P1")
+assert_silent "empty environment produces no output" "$OUT1"
+run_hook_exit "$H1" "$P1"
+assert_exit_zero "empty environment" $?
+
+# ---------- Test 2: below warning threshold → silent ----------
+H2="$WORK_DIR/h2"
+P2="$WORK_DIR/p2"
+mkdir -p "$H2" "$P2"
+seed_skills "$H2/.claude/skills" 5000 5
+OUT2=$(run_hook "$H2" "$P2")
+assert_silent "below warning threshold (5KB, 5 skills) is silent" "$OUT2"
+
+# ---------- Test 3: above warn, below hard → soft warning ----------
+H3="$WORK_DIR/h3"
+P3="$WORK_DIR/p3"
+mkdir -p "$H3" "$P3"
+seed_skills "$H3/.claude/skills" 30000 30
+OUT3=$(run_hook "$H3" "$P3")
+assert_warned "above soft threshold (30KB) emits [WARN]" "$OUT3" "[WARN] Cumulative skill description size"
+run_hook_exit "$H3" "$P3"
+assert_exit_zero "soft warning still advisory" $?
+
+# ---------- Test 4: above hard → hard warning ----------
+H4="$WORK_DIR/h4"
+P4="$WORK_DIR/p4"
+mkdir -p "$H4" "$P4"
+seed_skills "$H4/.claude/skills" 80000 50
+OUT4=$(run_hook "$H4" "$P4")
+assert_warned "above hard threshold (80KB) emits [HARD]" "$OUT4" "[HARD] Cumulative skill description size"
+assert_warned "hard warning mentions dropped-already wording" "$OUT4" "very likely already being silently dropped"
+
+# ---------- Test 5: project scope also counted ----------
+H5="$WORK_DIR/h5"
+P5="$WORK_DIR/p5"
+mkdir -p "$H5"
+seed_skills "$P5/.claude/skills" 30000 15
+OUT5=$(run_hook "$H5" "$P5")
+assert_warned "project-scope skills counted toward total" "$OUT5" "[WARN] Cumulative skill description size"
+assert_warned "project scope shows non-zero byte count" "$OUT5" "project scope (.claude/skills): 30"
+
+# ---------- Test 6: user + project combine ----------
+H6="$WORK_DIR/h6"
+P6="$WORK_DIR/p6"
+mkdir -p "$H6" "$P6"
+seed_skills "$H6/.claude/skills" 15000 10
+seed_skills "$P6/.claude/skills" 15000 10
+OUT6=$(run_hook "$H6" "$P6")
+assert_warned "user+project totals combine to cross threshold" "$OUT6" "cumulative total: 30000 bytes across 20 skills"
+
+# ---------- Test 7: disable env var silences ----------
+H7="$WORK_DIR/h7"
+P7="$WORK_DIR/p7"
+mkdir -p "$H7" "$P7"
+seed_skills "$H7/.claude/skills" 80000 50
+OUT7=$(run_hook "$H7" "$P7" "CC_SKILL_SIZE_DISABLE_WARNING=1")
+assert_silent "CC_SKILL_SIZE_DISABLE_WARNING=1 silences output" "$OUT7"
+
+# ---------- Test 8: custom warn threshold honored ----------
+H8="$WORK_DIR/h8"
+P8="$WORK_DIR/p8"
+mkdir -p "$H8" "$P8"
+seed_skills "$H8/.claude/skills" 10000 10
+OUT8=$(run_hook "$H8" "$P8" "CC_SKILL_SIZE_WARN_BYTES=5000")
+assert_warned "lowering warn threshold to 5KB triggers warning" "$OUT8" "[WARN]"
+
+# ---------- Test 9: custom hard threshold honored ----------
+H9="$WORK_DIR/h9"
+P9="$WORK_DIR/p9"
+mkdir -p "$H9" "$P9"
+seed_skills "$H9/.claude/skills" 30000 30
+OUT9=$(run_hook "$H9" "$P9" "CC_SKILL_SIZE_WARN_BYTES=10000 CC_SKILL_SIZE_HARD_BYTES=20000")
+assert_warned "lowering hard threshold to 20KB triggers [HARD]" "$OUT9" "[HARD]"
+
+# ---------- Test 10: 1MB / 200 skill stress ----------
+H10="$WORK_DIR/h10"
+P10="$WORK_DIR/p10"
+mkdir -p "$H10" "$P10"
+seed_skills "$H10/.claude/skills" 1000000 200
+OUT10=$(run_hook "$H10" "$P10")
+assert_warned "1MB / 200 skills emits [HARD]" "$OUT10" "[HARD]"
+run_hook_exit "$H10" "$P10"
+assert_exit_zero "stress test still advisory" $?
+
+# ---------- Test 11: issue reference present ----------
+H11="$WORK_DIR/h11"
+P11="$WORK_DIR/p11"
+mkdir -p "$H11" "$P11"
+seed_skills "$H11/.claude/skills" 30000 30
+OUT11=$(run_hook "$H11" "$P11")
+assert_warned "warning text references issue 59921" "$OUT11" "Issue #59921"
+assert_warned "warning text references /skills command" "$OUT11" "Run /skills"
+assert_warned "warning text references suppression env var" "$OUT11" "CC_SKILL_SIZE_DISABLE_WARNING=1"
+
+echo ""
+echo "============================================"
+echo "Tests passed: $PASS"
+echo "Tests failed: $FAIL"
+echo "============================================"
+exit $FAIL

package/tests/test-skill-description-drop-detector.sh

@@ -0,0 +1,236 @@
+#!/bin/bash
+# Tests for skill-description-drop-detector.sh
+# Hook addresses issue #59921 (silent SKILL.md description drops).
+set -euo pipefail
+
+HOOK="$(dirname "$0")/../examples/skill-description-drop-detector.sh"
+PASS=0
+FAIL=0
+
+TMP=$(mktemp -d /tmp/test-skill-drop.XXXXXX)
+trap 'rm -rf "$TMP"' EXIT
+
+# --- Test 1: empty skill dirs produce no output ---
+mkdir -p "$TMP/empty"
+output=$(echo '{}' | CC_SKILL_DESC_DIRS="$TMP/empty" bash "$HOOK")
+if [ -z "$output" ]; then
+    echo "  PASS: empty skill dir produces no output"
+    PASS=$((PASS + 1))
+else
+    echo "  FAIL: empty dir should produce no output"
+    FAIL=$((FAIL + 1))
+fi
+
+# --- Test 2: skills below threshold produce no output ---
+mkdir -p "$TMP/small/skill1" "$TMP/small/skill2"
+cat > "$TMP/small/skill1/SKILL.md" <<'EOF'
+---
+name: skill1
+description: A short description.
+---
+EOF
+cat > "$TMP/small/skill2/SKILL.md" <<'EOF'
+---
+name: skill2
+description: Another short description.
+---
+EOF
+output=$(echo '{}' | CC_SKILL_DESC_THRESHOLD=10000 CC_SKILL_DESC_DIRS="$TMP/small" bash "$HOOK")
+if [ -z "$output" ]; then
+    echo "  PASS: below threshold produces no output"
+    PASS=$((PASS + 1))
+else
+    echo "  FAIL: below threshold should produce no output: $output"
+    FAIL=$((FAIL + 1))
+fi
+
+# --- Test 3: skills above threshold produce JSON warning ---
+mkdir -p "$TMP/large"
+for i in $(seq 1 5); do
+    mkdir -p "$TMP/large/skill$i"
+    # Each skill has ~1000 char description to push total above threshold quickly
+    long_desc=$(printf 'A skill that does %.0s' {1..50})
+    cat > "$TMP/large/skill$i/SKILL.md" <<EOF
+---
+name: skill$i
+description: $long_desc
+---
+EOF
+done
+output=$(echo '{}' | CC_SKILL_DESC_THRESHOLD=500 CC_SKILL_DESC_DIRS="$TMP/large" bash "$HOOK")
+if echo "$output" | grep -q "SKILL DESCRIPTION CUMULATIVE-SIZE WARNING"; then
+    echo "  PASS: above threshold emits warning"
+    PASS=$((PASS + 1))
+else
+    echo "  FAIL: above threshold should emit warning: $output"
+    FAIL=$((FAIL + 1))
+fi
+
+# --- Test 4: JSON output is valid ---
+if echo "$output" | jq -e '.hookSpecificOutput.additionalContext' > /dev/null 2>&1; then
+    echo "  PASS: output is valid JSON"
+    PASS=$((PASS + 1))
+else
+    echo "  FAIL: output not valid JSON"
+    FAIL=$((FAIL + 1))
+fi
+
+# --- Test 5: hookEventName is SessionStart ---
+event=$(echo "$output" | jq -r '.hookSpecificOutput.hookEventName // "MISSING"')
+if [ "$event" = "SessionStart" ]; then
+    echo "  PASS: hookEventName is SessionStart"
+    PASS=$((PASS + 1))
+else
+    echo "  FAIL: hookEventName should be SessionStart, got: $event"
+    FAIL=$((FAIL + 1))
+fi
+
+# --- Test 6: skill count is reported ---
+if echo "$output" | jq -r '.hookSpecificOutput.additionalContext' | grep -q "Found 5 SKILL.md"; then
+    echo "  PASS: skill count is reported correctly (5)"
+    PASS=$((PASS + 1))
+else
+    echo "  FAIL: skill count not reported correctly"
+    FAIL=$((FAIL + 1))
+fi
+
+# --- Test 7: non-existent dir handled gracefully ---
+output=$(echo '{}' | CC_SKILL_DESC_DIRS="$TMP/does-not-exist" bash "$HOOK")
+if [ -z "$output" ]; then
+    echo "  PASS: non-existent dir handled gracefully"
+    PASS=$((PASS + 1))
+else
+    echo "  FAIL: non-existent dir produced output: $output"
+    FAIL=$((FAIL + 1))
+fi
+
+# --- Test 8: skill without description doesn't crash ---
+mkdir -p "$TMP/no-desc/skill1"
+cat > "$TMP/no-desc/skill1/SKILL.md" <<'EOF'
+---
+name: skill-without-description
+---
+
+This skill has no description field in frontmatter.
+EOF
+output=$(echo '{}' | CC_SKILL_DESC_THRESHOLD=10000 CC_SKILL_DESC_DIRS="$TMP/no-desc" bash "$HOOK")
+if [ -z "$output" ]; then
+    echo "  PASS: skill without description handled (below threshold)"
+    PASS=$((PASS + 1))
+else
+    echo "  FAIL: skill without description should be below threshold"
+    FAIL=$((FAIL + 1))
+fi
+
+# --- Test 9: skills_without_description is counted ---
+mkdir -p "$TMP/mixed/with" "$TMP/mixed/without"
+cat > "$TMP/mixed/with/SKILL.md" <<'EOF'
+---
+name: with-desc
+description: This has a description.
+---
+EOF
+cat > "$TMP/mixed/without/SKILL.md" <<'EOF'
+---
+name: no-desc
+---
+EOF
+# Add a skill with long description to push total over threshold
+mkdir -p "$TMP/mixed/big"
+big_desc=$(printf 'X%.0s' {1..1500})
+cat > "$TMP/mixed/big/SKILL.md" <<EOF
+---
+name: big
+description: $big_desc
+---
+EOF
+output=$(echo '{}' | CC_SKILL_DESC_THRESHOLD=500 CC_SKILL_DESC_DIRS="$TMP/mixed" bash "$HOOK")
+if echo "$output" | jq -r '.hookSpecificOutput.additionalContext' | grep -q "Skills with description: 2"; then
+    echo "  PASS: with-description count is 2"
+    PASS=$((PASS + 1))
+else
+    echo "  FAIL: with-description count incorrect"
+    FAIL=$((FAIL + 1))
+fi
+
+if echo "$output" | jq -r '.hookSpecificOutput.additionalContext' | grep -q "Skills without description: 1"; then
+    echo "  PASS: without-description count is 1"
+    PASS=$((PASS + 1))
+else
+    echo "  FAIL: without-description count incorrect"
+    FAIL=$((FAIL + 1))
+fi
+
+# --- Test 10: quoted descriptions are stripped of quotes ---
+mkdir -p "$TMP/quoted/skill"
+cat > "$TMP/quoted/skill/SKILL.md" <<'EOF'
+---
+name: quoted
+description: "A quoted description with quotes."
+---
+EOF
+mkdir -p "$TMP/quoted/big"
+big_desc=$(printf 'Y%.0s' {1..1500})
+cat > "$TMP/quoted/big/SKILL.md" <<EOF
+---
+name: big
+description: "$big_desc"
+---
+EOF
+output=$(echo '{}' | CC_SKILL_DESC_THRESHOLD=500 CC_SKILL_DESC_DIRS="$TMP/quoted" bash "$HOOK")
+if echo "$output" | jq -r '.hookSpecificOutput.additionalContext' | grep -q "Skills with description: 2"; then
+    echo "  PASS: quoted descriptions counted"
+    PASS=$((PASS + 1))
+else
+    echo "  FAIL: quoted descriptions not counted correctly"
+    FAIL=$((FAIL + 1))
+fi
+
+# --- Test 11: idempotent ---
+mkdir -p "$TMP/idem/skill"
+desc=$(printf 'Z%.0s' {1..600})
+cat > "$TMP/idem/skill/SKILL.md" <<EOF
+---
+name: idem
+description: $desc
+---
+EOF
+out1=$(echo '{}' | CC_SKILL_DESC_THRESHOLD=500 CC_SKILL_DESC_DIRS="$TMP/idem" bash "$HOOK")
+out2=$(echo '{}' | CC_SKILL_DESC_THRESHOLD=500 CC_SKILL_DESC_DIRS="$TMP/idem" bash "$HOOK")
+if [ "$out1" = "$out2" ]; then
+    echo "  PASS: hook is idempotent"
+    PASS=$((PASS + 1))
+else
+    echo "  FAIL: hook not idempotent"
+    FAIL=$((FAIL + 1))
+fi
+
+# --- Test 12: multiple directories scanned ---
+mkdir -p "$TMP/multi1/s1" "$TMP/multi2/s2"
+cat > "$TMP/multi1/s1/SKILL.md" <<EOF
+---
+description: $(printf 'A%.0s' {1..400})
+---
+EOF
+cat > "$TMP/multi2/s2/SKILL.md" <<EOF
+---
+description: $(printf 'B%.0s' {1..400})
+---
+EOF
+output=$(echo '{}' | CC_SKILL_DESC_THRESHOLD=500 CC_SKILL_DESC_DIRS="$TMP/multi1:$TMP/multi2" bash "$HOOK")
+if echo "$output" | jq -r '.hookSpecificOutput.additionalContext' | grep -q "Found 2 SKILL.md"; then
+    echo "  PASS: multiple directories scanned"
+    PASS=$((PASS + 1))
+else
+    echo "  FAIL: multiple directories not scanned correctly"
+    FAIL=$((FAIL + 1))
+fi
+
+# --- Summary ---
+echo ""
+echo "=================================="
+echo "Tests passed: $PASS"
+echo "Tests failed: $FAIL"
+echo "=================================="
+
+[ "$FAIL" -eq 0 ]

package/tests/test-skill-truncation-detector.sh

@@ -0,0 +1,263 @@
+#!/bin/bash
+# Tests for skill-truncation-detector.sh
+#
+# Verifies the SessionStart-hook behavior for v2.1.144's silent removal
+# of the Skill-listing truncation startup notification.
+
+set -uo pipefail
+
+HOOK="$(dirname "$0")/../examples/skill-truncation-detector.sh"
+PASS=0
+FAIL=0
+
+assert_pass() { echo "  PASS: $1"; PASS=$((PASS + 1)); }
+assert_fail() { echo "  FAIL: $1"; FAIL=$((FAIL + 1)); }
+
+# Build an isolated test environment in /tmp so we don't touch the real
+# ~/.claude/skills directory.
+TEST_ROOT=$(mktemp -d)
+trap 'rm -rf "$TEST_ROOT"' EXIT
+
+mk_skill() {
+    local dir="$1"
+    local name="$2"
+    local has_frontmatter="${3:-yes}"
+    mkdir -p "$dir"
+    if [ "$has_frontmatter" = "yes" ]; then
+        cat > "$dir/SKILL.md" <<EOF
+---
+name: $name
+description: Test skill $name
+---
+# $name
+EOF
+    else
+        cat > "$dir/SKILL.md" <<EOF
+# $name
+Skill body without frontmatter.
+EOF
+    fi
+}
+
+run_hook() {
+    local skills_dir="$1"
+    local threshold="${2:-80}"
+    local session_id="${3:-test-session-$RANDOM}"
+    local extra_env="${4:-}"
+    echo "{\"session_id\":\"$session_id\"}" \
+        | env CC_SKILL_COUNT_THRESHOLD="$threshold" \
+              CC_SKILL_DIRS="$skills_dir" \
+              HOME="$TEST_ROOT" \
+              $extra_env \
+              bash "$HOOK" 2>&1
+}
+
+echo "=== skill-truncation-detector.sh tests ==="
+
+# --- Test 1: no skills directory → exit 0 silent ---
+output=$(run_hook "$TEST_ROOT/empty-skills")
+rc=$?
+if [ "$rc" -eq 0 ] && [ -z "$output" ]; then
+    assert_pass "no skills directory → exit 0 silent"
+else
+    assert_fail "expected exit 0 silent, got rc=$rc output=$output"
+fi
+
+# --- Test 2: 3 well-formed skills, no issues → exit 0 silent ---
+SD1="$TEST_ROOT/t2/skills"
+mk_skill "$SD1/a" "skill-a"
+mk_skill "$SD1/b" "skill-b"
+mk_skill "$SD1/c" "skill-c"
+output=$(run_hook "$SD1" 80 "test2")
+rc=$?
+if [ "$rc" -eq 0 ] && [ -z "$output" ]; then
+    assert_pass "3 well-formed skills, no issues → exit 0 silent"
+else
+    assert_fail "expected exit 0 silent, got rc=$rc output=$output"
+fi
+
+# --- Test 3: skill count above threshold → warns ---
+SD3="$TEST_ROOT/t3/skills"
+for i in $(seq 1 5); do
+    mk_skill "$SD3/skill-$i" "skill-$i"
+done
+output=$(run_hook "$SD3" 3 "test3")
+rc=$?
+if [ "$rc" -eq 0 ] && echo "$output" | grep -q "Skill count is 5"; then
+    assert_pass "warns when skill count exceeds threshold"
+else
+    assert_fail "expected count warning, got rc=$rc output=$output"
+fi
+
+# --- Test 4: exact threshold count → warns (>= threshold) ---
+SD4="$TEST_ROOT/t4/skills"
+for i in $(seq 1 3); do
+    mk_skill "$SD4/skill-$i" "skill-$i"
+done
+output=$(run_hook "$SD4" 3 "test4")
+rc=$?
+if [ "$rc" -eq 0 ] && echo "$output" | grep -q "Skill count is 3"; then
+    assert_pass "warns at exact threshold (>= comparison)"
+else
+    assert_fail "expected warning at exact threshold, got rc=$rc"
+fi
+
+# --- Test 5: name collision detected → warns ---
+SD5="$TEST_ROOT/t5/skills"
+mk_skill "$SD5/dir-a" "duplicate-name"
+mk_skill "$SD5/dir-b" "duplicate-name"
+mk_skill "$SD5/dir-c" "unique"
+output=$(run_hook "$SD5" 80 "test5")
+rc=$?
+if [ "$rc" -eq 0 ] && echo "$output" | grep -q "NAME COLLISIONS" && echo "$output" | grep -q "duplicate-name"; then
+    assert_pass "detects name collision"
+else
+    assert_fail "expected collision warning, got rc=$rc output=$output"
+fi
+
+# --- Test 6: malformed frontmatter (no name: field) → warns ---
+SD6="$TEST_ROOT/t6/skills"
+mk_skill "$SD6/skill-a" "skill-a"
+mk_skill "$SD6/skill-b" "skill-b" no
+output=$(run_hook "$SD6" 80 "test6")
+rc=$?
+if [ "$rc" -eq 0 ] && echo "$output" | grep -q "MALFORMED FRONTMATTER"; then
+    assert_pass "detects malformed frontmatter (no name: field)"
+else
+    assert_fail "expected malformed warning, got rc=$rc"
+fi
+
+# --- Test 7: disable flag respected ---
+SD7="$TEST_ROOT/t7/skills"
+mk_skill "$SD7/dir-a" "name1"
+mk_skill "$SD7/dir-b" "name1"  # collision
+output=$(run_hook "$SD7" 80 "test7" "CC_SKILL_TRUNCATION_DISABLE=1")
+rc=$?
+if [ "$rc" -eq 0 ] && [ -z "$output" ]; then
+    assert_pass "disable flag silences detection"
+else
+    assert_fail "expected silence with disable flag, got rc=$rc output=$output"
+fi
+
+# --- Test 8: multiple findings combined → single reminder ---
+SD8="$TEST_ROOT/t8/skills"
+for i in $(seq 1 4); do
+    mk_skill "$SD8/skill-$i" "skill-$i"
+done
+mk_skill "$SD8/dup-a" "duplicate"
+mk_skill "$SD8/dup-b" "duplicate"
+mk_skill "$SD8/no-fm" "no-fm" no
+output=$(run_hook "$SD8" 5 "test8")
+rc=$?
+# Should fire for count (7 = 4 + 2 + 1 >= 5) + collision (duplicate) + malformed (no-fm)
+if [ "$rc" -eq 0 ] && \
+   echo "$output" | grep -q "Skill count is 7" && \
+   echo "$output" | grep -q "NAME COLLISIONS" && \
+   echo "$output" | grep -q "MALFORMED FRONTMATTER"; then
+    assert_pass "combines count + collision + malformed into single reminder"
+else
+    assert_fail "expected combined warning, got rc=$rc output=$output"
+fi
+
+# --- Test 9: session-once behavior (second run silent) ---
+SD9="$TEST_ROOT/t9/skills"
+for i in $(seq 1 5); do
+    mk_skill "$SD9/skill-$i" "skill-$i"
+done
+# First run: should warn
+out1=$(run_hook "$SD9" 3 "session-9")
+# Second run with same session_id: should be silent
+out2=$(run_hook "$SD9" 3 "session-9")
+if echo "$out1" | grep -q "Skill count" && [ -z "$out2" ]; then
+    assert_pass "session-once: same session_id silent on second call"
+else
+    assert_fail "expected session-once behavior, got out1=$out1 out2=$out2"
+fi
+
+# --- Test 10: missing session_id → uses fallback, still works ---
+SD10="$TEST_ROOT/t10/skills"
+for i in $(seq 1 3); do
+    mk_skill "$SD10/skill-$i" "skill-$i"
+done
+output=$(echo '{}' | env CC_SKILL_COUNT_THRESHOLD=2 CC_SKILL_DIRS="$SD10" HOME="$TEST_ROOT" bash "$HOOK" 2>&1)
+rc=$?
+if [ "$rc" -eq 0 ] && echo "$output" | grep -q "Skill count is 3"; then
+    assert_pass "missing session_id falls back gracefully and still detects"
+else
+    assert_fail "expected detection with missing session_id, got rc=$rc output=$output"
+fi
+
+# --- Test 11: empty input → still works ---
+# Use a unique HOME so the per-session marker doesn't collide with test 10
+# (which also uses fallback session_id "unknown-<seconds>").
+SD11="$TEST_ROOT/t11/skills"
+T11_HOME="$TEST_ROOT/t11/home"
+mkdir -p "$T11_HOME"
+for i in $(seq 1 4); do
+    mk_skill "$SD11/skill-$i" "skill-$i"
+done
+output=$(printf '' | env CC_SKILL_COUNT_THRESHOLD=3 CC_SKILL_DIRS="$SD11" HOME="$T11_HOME" bash "$HOOK" 2>&1)
+rc=$?
+if [ "$rc" -eq 0 ] && echo "$output" | grep -q "Skill count is 4"; then
+    assert_pass "empty input still triggers detection"
+else
+    assert_fail "expected detection with empty input, got rc=$rc output=$output"
+fi
+
+# --- Test 12: multiple skill directories via colon-separated list ---
+SD12a="$TEST_ROOT/t12/skills-a"
+SD12b="$TEST_ROOT/t12/skills-b"
+mk_skill "$SD12a/x" "from-a"
+mk_skill "$SD12b/y" "from-b"
+mk_skill "$SD12b/z" "from-b"  # collision across dirs
+output=$(run_hook "$SD12a:$SD12b" 80 "test12")
+rc=$?
+if [ "$rc" -eq 0 ] && echo "$output" | grep -q "from-b"; then
+    assert_pass "supports multiple skill directories (colon-separated)"
+else
+    assert_fail "expected multi-dir detection, got rc=$rc output=$output"
+fi
+
+# --- Test 13: SessionStart hook should NOT exit 2 (non-blocking) ---
+SD13="$TEST_ROOT/t13/skills"
+for i in $(seq 1 5); do
+    mk_skill "$SD13/skill-$i" "skill-$i"
+done
+output=$(run_hook "$SD13" 3 "test13")
+rc=$?
+if [ "$rc" -eq 0 ]; then
+    assert_pass "always exits 0 (SessionStart hooks should not block)"
+else
+    assert_fail "expected exit 0 (non-blocking), got rc=$rc"
+fi
+
+# --- Test 14: skills with quotes/spaces in name handled ---
+SD14="$TEST_ROOT/t14/skills"
+mkdir -p "$SD14/quoted"
+cat > "$SD14/quoted/SKILL.md" <<'EOF'
+---
+name: "quoted-name"
+description: A skill with quoted name in YAML
+---
+EOF
+mkdir -p "$SD14/spaced"
+cat > "$SD14/spaced/SKILL.md" <<'EOF'
+---
+name:    spaced-with-leading-whitespace
+description: Test
+---
+EOF
+output=$(run_hook "$SD14" 80 "test14")
+rc=$?
+if [ "$rc" -eq 0 ] && [ -z "$output" ]; then
+    assert_pass "handles quoted names and leading whitespace correctly"
+else
+    assert_fail "expected silence for clean skills, got rc=$rc output=$output"
+fi
+
+echo ""
+echo "Results: PASS=$PASS FAIL=$FAIL"
+if [ "$FAIL" -gt 0 ]; then
+    exit 1
+fi
+exit 0