@windyroad/retrospective 0.21.0-preview.389 → 0.21.1-preview.393

package/.claude-plugin/plugin.json

@@ -66,5 +66,5 @@
     }
   },
   "name": "wr-retrospective",
-  "version": "0.21.0"
+  "version": "0.21.1"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windyroad/retrospective",
-  "version": "0.21.0-preview.389",
+  "version": "0.21.1-preview.393",
   "description": "Session retrospectives that update briefings and create problem tickets",
   "bin": {
     "windyroad-retrospective": "./bin/install.mjs"

package/scripts/measure-context-budget.sh

@@ -179,13 +179,60 @@ fi
 emit_bucket decisions "$decisions_bytes" "$decisions_present"
 
 # ── Bucket: problems ────────────────────────────────────────────────────────
+# Dual-tolerant enumeration per RFC-002 T4 (the proven reconcile-readme.sh
+# pattern). RFC-002 T5 / ADR-031 migrated tickets from the flat layout
+# (docs/problems/<NNN>-*.<state>.md) to per-state subdirs
+# (docs/problems/<state>/<NNN>-*.md). Walk BOTH layouts; a flat-only glob
+# misses the subdir tickets and under-counts the bucket ~99% post-migration
+# (P182). Dedup on ticket ID (the per-state layout drops the `.<state>`
+# suffix, so the same ticket has different basenames across layouts — key on
+# ID, not basename, mirroring reconcile-readme.sh). Non-ticket files (README)
+# live only at the top level and never collide with subdir content, so they
+# key on full basename. The per-state subdir loop runs AFTER the flat loop so
+# the per-state copy wins on collision (ADR-031 §"Authoritative state signal").
 
 problems_dir="$PROJECT_ROOT/docs/problems"
 problems_present=0
 problems_bytes=0
 if [ -d "$problems_dir" ]; then
   problems_present=1
-  problems_bytes=$( cd "$PROJECT_ROOT" && sum_globs "docs/problems/*.md" )
+  problems_bytes=$(
+    cd "$PROJECT_ROOT" 2>/dev/null && {
+      declare -A seen
+      shopt -s nullglob
+      # Flat layout: top-level *.md (READMEs + any pre-migration flat tickets).
+      for f in docs/problems/*.md; do
+        [ -f "$f" ] || continue
+        base="$(basename "$f")"
+        case "$base" in
+          [0-9][0-9][0-9]-*) key="${base%%-*}" ;;  # ticket: dedup on numeric ID
+          *)                 key="$base" ;;        # README etc: full basename
+        esac
+        seen["$key"]="$f"
+      done
+      # Per-state subdir layout (RFC-002 T5 / ADR-031) — wins on ID collision.
+      for state in open known-error verifying closed parked; do
+        for f in docs/problems/"$state"/*.md; do
+          [ -f "$f" ] || continue
+          base="$(basename "$f")"
+          case "$base" in
+            [0-9][0-9][0-9]-*) key="${base%%-*}" ;;
+            *)                 key="$base" ;;
+          esac
+          seen["$key"]="$f"
+        done
+      done
+      shopt -u nullglob
+      total=0
+      for f in "${seen[@]}"; do
+        if [ -r "$f" ]; then
+          b=$(wc -c < "$f" 2>/dev/null | tr -d ' ')
+          total=$(( total + ${b:-0} ))
+        fi
+      done
+      echo "$total"
+    }
+  )
 fi
 emit_bucket problems "$problems_bytes" "$problems_present"
 

package/scripts/test/measure-context-budget.bats

@@ -169,6 +169,68 @@ teardown() {
   echo "$output" | grep -qE '^BUCKET problems bytes=[0-9]+$'
 }
 
+# ── Dual-tolerant per-state subdir enumeration (P182 / RFC-002 T4 / ADR-031) ─
+# RFC-002 T5 migrated problem tickets from the flat layout
+# (docs/problems/<NNN>-*.<state>.md) to per-state subdirs
+# (docs/problems/<state>/<NNN>-*.md). The flat-only glob misses the subdir
+# tickets and under-counts the bucket ~99% post-migration (P182). The fix
+# walks BOTH layouts and dedups on ticket ID — the per-state subdir copy
+# wins on collision per ADR-031 §"Authoritative state signal" — mirroring
+# the proven reconcile-readme.sh pattern.
+
+@test "measure-context-budget: per-state subdir problem tickets are counted" {
+  mkdir -p "$FIXTURE_DIR/docs/problems/open" "$FIXTURE_DIR/docs/problems/known-error"
+  printf '# Problem 100\nbody body body\n' > "$FIXTURE_DIR/docs/problems/open/100-foo.md"
+  printf '# Problem 101\nbody body\n' > "$FIXTURE_DIR/docs/problems/known-error/101-bar.md"
+  run bash "$SCRIPT" "$FIXTURE_DIR"
+  [ "$status" -eq 0 ]
+  echo "$output" | grep -qE '^BUCKET problems bytes=[0-9]+$'
+  problems_line=$(echo "$output" | grep '^BUCKET problems ')
+  bytes_value="${problems_line##*bytes=}"
+  [ "$bytes_value" -gt 0 ]
+}
+
+@test "measure-context-budget: problems bucket sums flat + per-state subdir tickets" {
+  mkdir -p "$FIXTURE_DIR/docs/problems/open" "$FIXTURE_DIR/docs/problems/verifying"
+  # Flat top-level (README + a pre-migration flat ticket) and per-state
+  # subdir tickets must all contribute to the bucket total.
+  printf '# Problems index\nrow\n' > "$FIXTURE_DIR/docs/problems/README.md"
+  printf '# Problem 050 legacy flat\nbody\n' > "$FIXTURE_DIR/docs/problems/050-legacy.open.md"
+  printf '# Problem 100\nbody body\n' > "$FIXTURE_DIR/docs/problems/open/100-foo.md"
+  printf '# Problem 101\nbody body body body\n' > "$FIXTURE_DIR/docs/problems/verifying/101-bar.md"
+  expected=0
+  for f in "$FIXTURE_DIR/docs/problems/README.md" \
+           "$FIXTURE_DIR/docs/problems/050-legacy.open.md" \
+           "$FIXTURE_DIR/docs/problems/open/100-foo.md" \
+           "$FIXTURE_DIR/docs/problems/verifying/101-bar.md"; do
+    b=$(wc -c < "$f" | tr -d ' ')
+    expected=$(( expected + b ))
+  done
+  run bash "$SCRIPT" "$FIXTURE_DIR"
+  [ "$status" -eq 0 ]
+  problems_line=$(echo "$output" | grep '^BUCKET problems ')
+  bytes_value="${problems_line##*bytes=}"
+  [ "$bytes_value" -eq "$expected" ]
+}
+
+@test "measure-context-budget: same ticket in flat + per-state subdir counted once (per-state wins)" {
+  # Mid-migration race: the same ticket ID exists as a flat file
+  # (200-dup.open.md) AND a per-state subdir file (open/200-dup.md) with a
+  # DIFFERENT byte size. ID-keyed dedup must count it once; the per-state
+  # subdir copy wins (ADR-031). Asserting the total equals the subdir file's
+  # size alone proves both: counted-once (not flat+subdir) and per-state-wins
+  # (subdir size, not flat size).
+  mkdir -p "$FIXTURE_DIR/docs/problems/open"
+  printf 'flat\n' > "$FIXTURE_DIR/docs/problems/200-dup.open.md"
+  printf 'per-state subdir copy is longer\n' > "$FIXTURE_DIR/docs/problems/open/200-dup.md"
+  subdir_bytes=$(wc -c < "$FIXTURE_DIR/docs/problems/open/200-dup.md" | tr -d ' ')
+  run bash "$SCRIPT" "$FIXTURE_DIR"
+  [ "$status" -eq 0 ]
+  problems_line=$(echo "$output" | grep '^BUCKET problems ')
+  bytes_value="${problems_line##*bytes=}"
+  [ "$bytes_value" -eq "$subdir_bytes" ]
+}
+
 @test "measure-context-budget: populated briefing bucket reports byte count" {
   mkdir -p "$FIXTURE_DIR/docs/briefing"
   printf '# Topic\nentry\n' > "$FIXTURE_DIR/docs/briefing/foo.md"