Repository navigation
refactor: share format and Nerd Font handling across status widgets - #646
Merged
sirmalloc merged 3 commits intoOct 6, 2026
Merged
Conversation
Voice, Sandbox, Remote Control, Vim Mode and Compaction Counter each carried their own copy of the same code: reading the format from metadata, cycling it with (f), toggling the Nerd Font icon with (n), building the "(format, nerd font)" modifier and listing the keybinds. Move it into widgets/shared/format-options.ts so a fix to one applies to all five. Behavior is unchanged: each widget passes its formats, default and Nerd Font rule, and keeps its own rendering.
pcvelz
added a commit
to pcvelz/ccstatusline-usage
that referenced
this pull request
Oct 11, 2026
Upstream: label prefixes editable with e (sirmalloc#601, sirmalloc#666), Session Cost Rate (sirmalloc#671) and Extra Usage Daily Budget (sirmalloc#672) widgets, own-lock-only usage lock clearing (sirmalloc#624), NO_PROXY and request deadlines, terminal control-sequence sanitizing, git hardening and linear-time parsing, shared searchable option editor (sirmalloc#649) and widget base classes (sirmalloc#646-sirmalloc#654), node: imports (sirmalloc#657), Number.* globals lint (sirmalloc#645), test waits on redraw instead of fixed delays (sirmalloc#652). Hand edits outside conflicts: - src/widgets/shared/searchable-option-editor.tsx: compat fix - ports the fork's ref-based input handling (Enter picks from what was just typed) into upstream's new shared editor - src/utils/usage-fetch.ts: compat fix - fork's fetchFreshUsageData uses upstream's clearOwnUsageLock (sirmalloc#624) instead of the removed clearUsageLock - src/widgets/ApiUsage.tsx, src/widgets/Battery.ts: compat fix - Number.isNaN/Number.parseInt for upstream's no-restricted-globals rule - src/utils/__tests__/usage-prefetch.test.ts: compat fix - mock renamed to upstream's mockFetchUsage - src/tui/components/__tests__/PowerlineSetup.test.ts, src/tui/components/__tests__/StatusLinePreview.test.ts, src/tui/components/__tests__/TerminalWidthMenu.test.ts: compat fix - drop the fork's flushInk import, unused after upstream's waitFor switch - README.md: upstream notes linked docs/USAGE.md (deleted in the fork); inlined the proxy and workspace-trust text instead; upstream's own release-note entries not taken - .fork-keep-deleted: src/widgets/FableWeeklyUsage.ts (upstream widget, unregistered in the fork, which ships WeeklyFableUsage.ts) - src/widgets/WeeklyFableUsage.ts: compat fix - adopts upstream's shared getUsagePercentWidgetEditorDisplay, which carries the time-cursor modifier - src/tui/__tests__/App.test.ts: fork deviation - one extra down-arrow for the fork's Off Hours main-menu row - src/widgets/__tests__/CacheTimer.test.ts, src/widgets/CacheTimer.ts: compat fix - emoji toggle moved from e to o because upstream reserves e for edit-label - src/widgets/AgentAddress.ts: split the session-title guard into its own if (same behaviour) so the .fork-invariants nameSource guard matches again - docs/test-retirements.md: ledger for tests upstream renamed or replaced
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Demo
After the refactor: in the line editor, n turns on the Nerd Font icon and f cycles every format on Voice, Sandbox, Remote Control, Vim Mode and Compaction Counter, which now share one implementation of both keys. Every case also renders byte-for-byte the same as before; see Testing.
Powerline
Plain
Summary
Voice, Sandbox, Remote Control, Vim Mode and Compaction Counter each carried their own copy of the same code:
A fix to one had to be made five times.
widgets/shared/format-options.tsnow holds this once, on top of the existing Nerd Font helpers inshared/metadata.ts. Each widget passes its formats, its default and its rule for when a Nerd Font icon applies, and keeps its own rendering. Compaction Counter keeps its own editor modifier, which adds its trigger-split and reclaimed flags, and its other keys.6 source files, 139 lines added and 197 removed, plus a test file. No visual change.
Testing
bun run lintandbun test(2,363 pass). The existing widget tests pass unchanged. New:widgets/shared/__tests__/format-options.test.tscovers the format fallback, the cycle wrapping around, the Nerd Font toggle and modifier, and when n is offered.mainand on this branch, in every state their own keys reach (4 to 10 per widget, 80 for Compaction Counter), raw and labeled, at all three color levels, in the TUI preview and with live data, run twice: once with voice, sandbox and remote control off (Vim in VISUAL) and once with all three on (Vim in INSERT). All 877 cases are byte-identical in both runs, as are each state's editor label and keys.dist/on both branches and piped a status line with all five widgets through it, on and off, in plain and Powerline mode, under Bun and Node 16, 18, 20, 22, 24 and 26: every runtime and both branches produce identical output.main(all from spying on Node built-ins), and the new test passes.