@biffo/cli 0.250.1 → 0.250.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biffo/cli",
-  "version": "0.250.1",
+  "version": "0.250.3",
   "description": "Biffo project scaffolding CLI",
   "license": "MIT",
   "type": "module",

package/scripts/pg-test-db.sh

@@ -157,6 +157,54 @@ psql_db() { psql -q -h "$HOST" -p "$PORT" -U "$USER_" -d "$DB" "$@"; }
 #
 # Started here rather than assumed, because "docker run one yourself" is exactly
 # the tribal knowledge this script replaces. An already-running server is reused.
+# ── Reap abandoned sibling containers ────────────────────────────────────────
+#
+# The container name is keyed to the CHECKOUT (see `CONTAINER` above), which is
+# what makes reuse work -- and also what makes them accumulate: every worktree
+# ever created leaves one behind, running, forever. Nothing ever removed them.
+# Measured on one workstation: 76 live `biffo-pg-test-*` containers holding
+# ~5.4 GiB, the oldest four days old (tabsii-platform#703). That is not merely
+# untidy -- they compete for the same page cache and I/O as the lane being
+# timed, so a leak like this shows up as the pg gate drifting toward its own
+# timeout, which is the failure #703 was actually filed about.
+#
+# Age is the only signal available. Docker records when a container was CREATED,
+# not when it was last used, and `docker ps --filter until=` is a prune filter
+# that this daemon rejects on `ps` -- so the comparison is done here.
+#
+# Reaping something still wanted is cheap and self-correcting: the next run
+# recreates it, which this script's own header prices at ~4s against ~0.3s for
+# reuse. Being wrong therefore costs four seconds, once. Leaving them costs a
+# gigabyte a day.
+#
+# NEVER reaps this checkout's own container, is skipped entirely when the date
+# maths is unavailable rather than guessing, and never fails the run: a
+# housekeeping step that can break a test lane is worse than the mess it clears.
+BIFFO_PG_REAP_HOURS="${BIFFO_PG_REAP_HOURS:-24}"
+if [ "$BIFFO_PG_REAP_HOURS" -gt 0 ] 2>/dev/null && command -v docker >/dev/null 2>&1; then
+  # GNU first, then BSD/macOS. If neither answers, say so and skip -- a silent
+  # skip here would be the same fail-open this estate keeps finding.
+  _reap_cutoff=$(date -u -d "-${BIFFO_PG_REAP_HOURS} hours" +%Y-%m-%dT%H:%M:%S 2>/dev/null) ||
+    _reap_cutoff=$(date -u -v-"${BIFFO_PG_REAP_HOURS}"H +%Y-%m-%dT%H:%M:%S 2>/dev/null) || _reap_cutoff=""
+  if [ -z "$_reap_cutoff" ]; then
+    say "cannot compute a reap cutoff on this date(1); skipping container reaping"
+  else
+    _reaped=0
+    for _c in $(docker ps -a --filter "name=biffo-pg-test-" --format '{{.Names}}' 2>/dev/null); do
+      [ "$_c" = "$CONTAINER" ] && continue
+      _made=$(docker inspect -f '{{.Created}}' "$_c" 2>/dev/null | cut -c1-19)
+      [ -z "$_made" ] && continue
+      # Both are UTC ISO-8601 to the second, so a string compare IS a time
+      # compare -- no epoch conversion, and portable across date(1) flavours.
+      if awk -v a="$_made" -v b="$_reap_cutoff" 'BEGIN { exit !(a < b) }'; then
+        docker rm -f "$_c" >/dev/null 2>&1 && _reaped=$((_reaped + 1))
+      fi
+    done
+    [ "$_reaped" -gt 0 ] &&
+      say "reaped $_reaped container(s) unused for over ${BIFFO_PG_REAP_HOURS}h (set BIFFO_PG_REAP_HOURS=0 to disable)"
+  fi
+fi
+
 if ! psql_admin -c 'SELECT 1' >/dev/null 2>&1; then
   if ! command -v docker >/dev/null 2>&1; then
     say "no Postgres at $HOST:$PORT and docker is not installed."

package/scripts/verify.sh

@@ -688,8 +688,42 @@ pg_test_modules() {
 # assertions its CI workflow makes, for the same reason.
 pg_test_run() {
   _out="/tmp/biffo-verify-pg.$$"
-  if ! TABSII_TEST_PG_DSN="$PG_TEST_DSN" BIFFO_TEST_PG_DSN="$PG_TEST_DSN" \
-    timeout "$PG_TEST_BUDGET_SECONDS" uv run --directory "$1" pytest -q $2 >"$_out" 2>&1; then
+  _pg_started=$(date +%s)
+  TABSII_TEST_PG_DSN="$PG_TEST_DSN" BIFFO_TEST_PG_DSN="$PG_TEST_DSN" \
+    timeout "$PG_TEST_BUDGET_SECONDS" uv run --directory "$1" pytest -q $2 >"$_out" 2>&1
+  _pg_rc=$?
+  _pg_elapsed=$(($(date +%s) - _pg_started))
+
+  # `timeout` exits 124 when it kills the command (137 if SIGKILL was needed).
+  # Reported apart from a real failure, because they are different facts and
+  # this gate used to render them identically: a killed run printed
+  # `verify failed: pg-test` with NO failing test named, which reads exactly
+  # like a defect and sends the reader hunting one. It happened on
+  # tabsii-platform (#703) -- the same push succeeded on retry, unchanged.
+  #
+  # Same discipline as `wait-for-checks` and the dependency audits: "could not
+  # determine" must never wear the clothes of "found something wrong".
+  if [ "$_pg_rc" -eq 124 ] || [ "$_pg_rc" -eq 137 ]; then
+    echo "TIMED OUT after ${_pg_elapsed}s (budget ${PG_TEST_BUDGET_SECONDS}s)."
+    echo ""
+    echo "This is INCONCLUSIVE, not a failing test: the lane was killed partway,"
+    echo "so nothing below is a verdict on your change. Do not go looking for a"
+    echo "bug on this evidence."
+    echo ""
+    echo "Most likely the lane has simply outgrown its budget. Re-run with more:"
+    echo "  BIFFO_VERIFY_PG_BUDGET=$((PG_TEST_BUDGET_SECONDS * 2)) sh scripts/verify.sh"
+    echo ""
+    echo "If that passes, raise PG_TEST_BUDGET_SECONDS rather than living with a"
+    echo "gate that fails at random -- and re-measure the comment above it, which"
+    echo "records what the lane cost when the number was last chosen."
+    echo ""
+    echo "Partial output before the kill (NOT a result):"
+    tail -15 "$_out"
+    rm -f "$_out"
+    return 1
+  fi
+
+  if [ "$_pg_rc" -ne 0 ]; then
     cat "$_out"
     rm -f "$_out"
     return 1
@@ -707,6 +741,13 @@ pg_test_run() {
     rm -f "$_out"
     return 1
   fi
+  # A pass with almost no headroom is the state just before the confusing
+  # failure above, and it is silent unless somebody says so. 80% is early
+  # enough to act on and rare enough not to become noise.
+  if [ "$((_pg_elapsed * 100))" -gt "$((PG_TEST_BUDGET_SECONDS * 80))" ]; then
+    printf '\033[33m  note: pg-test took %ss of a %ss budget -- raise PG_TEST_BUDGET_SECONDS before it starts timing out at random.\033[0m\n' \
+      "$_pg_elapsed" "$PG_TEST_BUDGET_SECONDS"
+  fi
   rm -f "$_out"
   return 0
 }