From 79c8a7ad09f4dafeaac0bbeb8dd44555a42299ef Mon Sep 17 00:00:00 2001 From: Krzysztof kuhy Rudnicki Date: Mon, 16 Nov 2026 16:11:08 +0100 Subject: [PATCH] i3bar: hide gaming blocks, gaming off Gaming is unlimited from 2026-11-16 (earned_time 0.22.0). Drop [gaming_budget] and [leisure_shadow] from the i3blocks config. Both scripts also print nothing when the daily-limits cache has gaming_enforced false, so a bar config that still lists them stays blank. Shutdown, tutor and focus blocks are untouched. Pruned the oldest evidence file for the 60-file cap. Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_01WzxdWViGJJaqBKGr1Hbppr --- .../i3blocks-gaming-off-2026-11-16.json | 11 +++++ ...-phone-pull-skip-processed-2026-10-09.json | 43 ------------------- .../i3blocks-gaming-off-2026-11-16.json | 31 +++++++++++++ linux_configuration/i3blocks/config | 10 ----- linux_configuration/i3blocks/gaming_budget.sh | 16 ++++++- .../i3blocks/leisure_shadow.sh | 5 ++- .../tests/test_i3blocks_gaming_budget.sh | 32 ++++++++++++++ .../tests/test_i3blocks_leisure_shadow.sh | 32 ++++++++++---- 8 files changed, 115 insertions(+), 65 deletions(-) create mode 100644 docs/superpowers/contracts/i3blocks-gaming-off-2026-11-16.json delete mode 100644 docs/superpowers/evidence/endurain-phone-pull-skip-processed-2026-10-09.json create mode 100644 docs/superpowers/evidence/i3blocks-gaming-off-2026-11-16.json diff --git a/docs/superpowers/contracts/i3blocks-gaming-off-2026-11-16.json b/docs/superpowers/contracts/i3blocks-gaming-off-2026-11-16.json new file mode 100644 index 00000000..d80102d6 --- /dev/null +++ b/docs/superpowers/contracts/i3blocks-gaming-off-2026-11-16.json @@ -0,0 +1,11 @@ +{ + "title": "i3blocks: no gaming or shadow block once gaming is not limited", + "objective": "Remove [gaming_budget] and [leisure_shadow] from the i3blocks config and make both scripts print nothing when daily-limits' cache has gaming_enforced false; a missing or true key keeps current behaviour; both always exit 0 and stay shellcheck clean.", + "acceptance_criteria": [ + "gaming_enforced false: gaming_budget and leisure_shadow print 0 lines and exit 0, even for stale or no-data caches", + "gaming_enforced missing or true: output identical to before", + "the config wires neither block; shutdown_countdown, tutor and focus_project sections are unchanged" + ], + "out_of_scope": ["daily-limits itself (own repo)", "enforcer behaviour"], + "verifier": "linux_configuration/tests/test_i3blocks_gaming_budget.sh, test_i3blocks_leisure_shadow.sh, test_i3blocks_efficiency.sh, shellcheck, pre-commit" +} diff --git a/docs/superpowers/evidence/endurain-phone-pull-skip-processed-2026-10-09.json b/docs/superpowers/evidence/endurain-phone-pull-skip-processed-2026-10-09.json deleted file mode 100644 index ab0a4118..00000000 --- a/docs/superpowers/evidence/endurain-phone-pull-skip-processed-2026-10-09.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "intent": "The endurain_import phone fallback stops re-pulling RunnerUp exports that were already imported, so each run no longer copies the whole phone history back into the WebDAV inbox, and one summary line says what happened.", - "scope": [ - "python_pkg/endurain_import/sources.py: PROCESSED_DIRNAME, processed_dir_for(), pull_from_phone skip + summary log", - "python_pkg/endurain_import/__main__.py: uses processed_dir_for() instead of a literal 'processed'", - "python_pkg/endurain_import/tests/test_phone_pull.py: new tests", - "Non-goal: the phone is still read-only; nothing on it is deleted" - ], - "changes": [ - "pull_from_phone skips a name already in the inbox (pending) or in processed/ (imported) before any adb pull", - "One summary line per run: on phone / pulled / skipped imported / skipped pending / failed; logged at WARNING when any pull failed, INFO otherwise", - "processed_dir_for(inbox) is the single definition shared by the importer and the fallback" - ], - "verification": [ - { - "command": "python3 -m pytest -q --cov=python_pkg.endurain_import --cov-branch python_pkg/endurain_import", - "result": "pass", - "evidence": "103 passed; endurain_import 100% line+branch (sources.py was 97%, lines 174-175 uncovered, before the new tests)" - }, - { - "command": "python3 -m python_pkg.endurain_import with stub adb on PATH, stub Endurain on 127.0.0.1:18999, temp inbox (1 file in processed/, 1 in inbox, 1 new, 1 failing pull)", - "result": "pass", - "evidence": "WARNING phone fallback: 4 on phone, 1 pulled, 1 skipped as already imported, 1 skipped as already in the inbox, 1 failed; adb pull called only for the new and the failing file; second run: 0 pulled, 3 skipped as already imported, 0 uploads" - }, - { - "command": "live run on the host (reported by the caller session, 17:56)", - "result": "pass", - "evidence": "27 on phone, 0 pulled, 27 skipped as already imported" - }, - { - "command": "pre-commit run --files sources.py __main__.py tests/test_phone_pull.py", - "result": "pass", - "evidence": "all hooks passed" - } - ], - "risks": [ - "A file deleted from processed/ by hand would be pulled again (then deduped by the ledger), which is the intended recovery path." - ], - "rollback": [ - "git revert this commit", - "After rollback: the next timer run re-pulls the phone history into the inbox; the ledger still prevents duplicate uploads" - ] -} diff --git a/docs/superpowers/evidence/i3blocks-gaming-off-2026-11-16.json b/docs/superpowers/evidence/i3blocks-gaming-off-2026-11-16.json new file mode 100644 index 00000000..862af7e6 --- /dev/null +++ b/docs/superpowers/evidence/i3blocks-gaming-off-2026-11-16.json @@ -0,0 +1,31 @@ +{ + "intent": "Gaming has no budget from 2026-11-16 (earned_time 0.22.0): the i3bar shows no gaming or leisure-shadow block; the shutdown, tutor and focus blocks stay.", + "scope": [ + "linux_configuration/i3blocks/config, gaming_budget.sh, leisure_shadow.sh and their two test scripts", + "Non-goal: no accounting, no new keys written; a missing or true gaming_enforced keeps today's output" + ], + "changes": [ + "config: the [gaming_budget] and [leisure_shadow] sections are removed", + "gaming_budget.sh, leisure_shadow.sh: when the cache's gaming_enforced is exactly false the render is empty text plus the hidden sentinel and the block prints nothing, exit 0, whatever the cache age (covers a bar config that still lists them)", + "tests: hidden cases for both blocks (four caches each, enforced true and absent still render, flip false -> true re-renders) and the config no longer wires either block" + ], + "verification": [ + { + "command": "bash linux_configuration/tests/test_i3blocks_gaming_budget.sh && bash linux_configuration/tests/test_i3blocks_leisure_shadow.sh && bash linux_configuration/tests/test_i3blocks_efficiency.sh", + "result": "pass", + "evidence": "All gaming_budget checks passed. All leisure_shadow checks passed. (both new sections RED before the change)" + }, + { + "command": "shellcheck on the two scripts and two tests", + "result": "pass", + "evidence": "no findings" + } + ], + "risks": [ + "i3blocks does not re-read its config on a signal: the removed sections vanish at the next i3blocks restart; until then the scripts print nothing", + "Depends on daily-limits >= 8219dce writing gaming_enforced" + ], + "rollback": [ + "git revert the commit; the symlinks in ~/.config/i3blocks pick it up on the next tick" + ] +} diff --git a/linux_configuration/i3blocks/config b/linux_configuration/i3blocks/config index e5c5f66d..2b28627b 100644 --- a/linux_configuration/i3blocks/config +++ b/linux_configuration/i3blocks/config @@ -50,16 +50,6 @@ command=~/.config/i3blocks/pc_startup_status.sh interval=30 color=#FFFFFF - -[gaming_budget] -command=~/.config/i3blocks/gaming_budget.sh -interval=30 - -# Shadow week: the would-be leisure budget. Never urgent (no flashing). -[leisure_shadow] -command=~/.config/i3blocks/leisure_shadow.sh -interval=30 - [screen_locker] command=~/.config/i3blocks/screen_locker.sh interval=30 diff --git a/linux_configuration/i3blocks/gaming_budget.sh b/linux_configuration/i3blocks/gaming_budget.sh index 67daf377..beb96084 100755 --- a/linux_configuration/i3blocks/gaming_budget.sh +++ b/linux_configuration/i3blocks/gaming_budget.sh @@ -14,6 +14,11 @@ # Phase 2 (leisure rollout): once the cache's top-level `leisure_active` is # true, the same block is the leisure budget: ๐ŸŽฎ becomes `๐Ÿ›‹ Leisure`, colours # unchanged. A missing/false/non-boolean key keeps the ๐ŸŽฎ gaming label. +# +# Gaming is not limited from 2026-11-16 (earned_time 0.22.0): once the cache's +# top-level `gaming_enforced` is exactly false there is no budget and the +# block prints nothing (i3bar hides it), whatever the cache's age. A missing +# or true key keeps the block. # ============================================================================ set -euo pipefail @@ -46,7 +51,9 @@ if [[ ${BLOCK_BUTTON:-0} -eq 1 ]]; then fi # One jq pass renders five lines: generated_at, full text, short text, color -# and the label (๐ŸŽฎ, or `๐Ÿ›‹ Leisure` once live) the stale state reuses. +# and the label (๐ŸŽฎ, or `๐Ÿ›‹ Leisure` once live) the stale state reuses. With +# gaming not limited, full/short are empty and color is "hidden" (non-empty, +# so $(...) cannot strip the lines). # Thresholds mirror the enforcer's own warn_at (1h, 30m, 10m). Bonuses still # not done are listed as " +๐Ÿ’ช2h +๐Ÿงฉ?1h" ("?" = status unknown, still counted); # a gaming day other than the date is shown as " (10-08)"; used_minutes == null means the enforcer @@ -67,7 +74,9 @@ render_limits() { | if length > 0 then " " + join(" ") else "" end) as $todo | (if (.gaming.day // .date) != .date then " (\((.gaming.day // .date)[5:]))" else "" end) as $day | (.generated_at | if type == "number" then floor else "none" end), - (if $g.used_minutes == null then + (if .gaming_enforced == false then + "", "", "hidden" + elif $g.used_minutes == null then "\($label) budget \($g.budget_minutes | hm)\($day)\($todo)", "\($icon) \($g.budget_minutes | hm)", $grey else ([$g.budget_minutes - $g.used_minutes, 0] | max) as $left @@ -114,6 +123,9 @@ fi exit 0 } +# Hidden (no gaming budget): print nothing, whatever the cache's age. +[[ -n $full_text ]] || exit 0 + if [[ -n ${NOW_EPOCH:-} ]]; then now=$NOW_EPOCH else diff --git a/linux_configuration/i3blocks/leisure_shadow.sh b/linux_configuration/i3blocks/leisure_shadow.sh index 0357c3f7..8541a264 100755 --- a/linux_configuration/i3blocks/leisure_shadow.sh +++ b/linux_configuration/i3blocks/leisure_shadow.sh @@ -15,7 +15,8 @@ # Phase 2 (leisure rollout): once the cache's top-level `leisure_active` is # true the shadow week is over and the block prints nothing (i3bar hides it); # gaming_budget.sh shows the real leisure budget instead. A missing/false key -# keeps the shadow block. +# keeps the shadow block. Likewise once `gaming_enforced` is exactly false +# (2026-11-16: no gaming budget, so no shadow of one). # ============================================================================ set -euo pipefail @@ -47,7 +48,7 @@ render_shadow() { | "\($m / 60 | floor)h\($m % 60 | tostring | if length < 2 then "0" + . else . end)"; (.leisure_shadow // {}) as $s | (.generated_at | if type == "number" then floor else "none" end), - (if .leisure_active == true then + (if .leisure_active == true or .gaming_enforced == false then "", "", "hidden" elif $s.used_minutes == null or $s.budget_minutes == null then "๐Ÿ›‹ SHADOW โฑ? no data", "๐Ÿ›‹ โฑ?", $orange diff --git a/linux_configuration/tests/test_i3blocks_gaming_budget.sh b/linux_configuration/tests/test_i3blocks_gaming_budget.sh index 9dc98ff9..149357e1 100755 --- a/linux_configuration/tests/test_i3blocks_gaming_budget.sh +++ b/linux_configuration/tests/test_i3blocks_gaming_budget.sh @@ -203,4 +203,36 @@ assert_eq "notify -u critical daily-limits not installed: $TMP_DIR/absent" "$(ca 'a missing launcher raises a notification' rm -f "$TMP_DIR/clicks" +printf 'Checking the block hides itself once gaming is not limited...\n' +# set_enforced VALUE -- rewrite the cache's top-level gaming_enforced (2026-11-16). +set_enforced() { + jq -c ".gaming_enforced = $1" "$CACHE" >"$CACHE.new" && mv "$CACHE.new" "$CACHE" + rm -f "$RENDER" +} +for spec in "360 480 $NOW" "480 480 $NOW" "null 480 $NOW" "60 480 $((NOW - 600))"; do + read -r used budget generated <<<"$spec" + write_cache "$used" "$budget" "$generated" "$D" workout:todo:60 + set_enforced false + set +e + output=$(run_block) + status=$? + set -e + assert_eq '0' "$status" "unenforced ($spec) exits 0" + assert_eq '' "$output" "unenforced ($spec) prints nothing: the block is hidden" +done +# The key absent (an older cache) or true keeps the block: gaming is limited. +write_cache 360 480 "$NOW" "$D" workout:todo:60 +assert_eq '๐ŸŽฎ 2h00 left ยท 6h00/8h00 +๐Ÿ’ช1h' "$(line 1)" 'no gaming_enforced key still shows the budget' +set_enforced true +assert_eq '๐ŸŽฎ 2h00 left ยท 6h00/8h00 +๐Ÿ’ช1h' "$(line 1)" 'gaming_enforced true still shows the budget' +# Re-enforcing after hidden shows it again (the render cache is rebuilt, not stuck). +set_enforced false +assert_eq '' "$(run_block)" 'hidden again' +set_enforced true +assert_eq '๐ŸŽฎ 2h00 left ยท 6h00/8h00 +๐Ÿ’ช1h' "$(line 1)" 'visible again' + +printf 'Checking the config no longer wires the gaming or shadow blocks...\n' +! grep -q '^\[gaming_budget\]$' "$REPO_DIR/i3blocks/config" || fail '[gaming_budget] must not be in the config' +! grep -q 'gaming_budget.sh' "$REPO_DIR/i3blocks/config" || fail 'config must not run gaming_budget.sh' + printf 'All gaming_budget checks passed.\n' diff --git a/linux_configuration/tests/test_i3blocks_leisure_shadow.sh b/linux_configuration/tests/test_i3blocks_leisure_shadow.sh index 40f5b964..a12b384e 100755 --- a/linux_configuration/tests/test_i3blocks_leisure_shadow.sh +++ b/linux_configuration/tests/test_i3blocks_leisure_shadow.sh @@ -163,13 +163,29 @@ for value in false null; do assert_eq '๐Ÿ›‹ SHADOW 3h12 left ยท 1h48 used' "$(line 1)" "leisure_active $value still shows the shadow" done -printf 'Checking the config wires the block next to gaming_budget...\n' -CONFIG="$REPO_DIR/i3blocks/config" -grep -A3 '^\[leisure_shadow\]$' "$CONFIG" | grep -q '^command=~/.config/i3blocks/leisure_shadow.sh$' || - fail '[leisure_shadow] should run leisure_shadow.sh' -next_section=$(sed -n '/^\[gaming_budget\]$/,$p' "$CONFIG" | grep -m2 '^\[' | tail -1) -assert_eq '[leisure_shadow]' "$next_section" '[leisure_shadow] sits right after [gaming_budget]' -! grep -A4 '^\[leisure_shadow\]$' "$CONFIG" | grep -q '^urgent' || - fail '[leisure_shadow] must never be urgent' +printf 'Checking the block hides itself once gaming is not limited...\n' +# set_enforced VALUE -- rewrite the cache's top-level gaming_enforced (2026-11-16). +set_enforced() { + jq -c ".gaming_enforced = $1" "$CACHE" >"$CACHE.new" && mv "$CACHE.new" "$CACHE" + rm -f "$RENDER" +} +for spec in '108 300' '300 300' 'null null' "60 300 $((NOW - 600))"; do + read -r used budget generated <<<"$spec" + write_cache "$used" "$budget" "${generated:-$NOW}" + set_enforced false + set +e + output=$(run_block) + status=$? + set -e + assert_eq '0' "$status" "unenforced ($spec) exits 0" + assert_eq '' "$output" "unenforced ($spec) prints nothing: the block is hidden" +done +write_cache 108 300 +set_enforced true +assert_eq '๐Ÿ›‹ SHADOW 3h12 left ยท 1h48 used' "$(line 1)" 'gaming_enforced true still shows the shadow' + +printf 'Checking the config no longer wires the shadow block...\n' +! grep -q '^\[leisure_shadow\]$' "$REPO_DIR/i3blocks/config" || fail '[leisure_shadow] must not be in the config' +! grep -q 'leisure_shadow.sh' "$REPO_DIR/i3blocks/config" || fail 'config must not run leisure_shadow.sh' printf 'All leisure_shadow checks passed.\n'