Skip to content

feat(widgets): glue compact labels to their values - #27

Merged
axisrow merged 1 commit into
mainfrom
feat/compact-labels-glued
Sep 27, 2026
Merged

axisrow merged 1 commit into
mainfrom
feat/compact-labels-glued

Conversation

@axisrow

@axisrow axisrow commented Sep 27, 2026

Copy link
Copy Markdown
Owner

Glue compact labels to their values

Compact presets drop the trailing space, so a compacted line reads S:0.0% 4h21m instead of S: 0.0%. Full (non-compact) labels keep their space; only preset forms change (M:Opus, Tr:146.8k, CU:42%…). The bar/slider no-colon presets (Block 12m → B12m) follow the same rule.

Tests updated for the new expectations; full suite green, bun tsc --noEmit + eslint clean, live render verified.

🤖 Generated with Claude Code

Compact presets now render without the trailing space: Session -> S:0.0%,
Turn -> Tr:146.8k, Model -> M:Opus. The full (non-compact) labels keep
their space; only the preset forms change.

Co-Authored-By: Claude Code <[email protected]>
@axisrow
axisrow merged commit 09872e7 into main Sep 27, 2026
4 of 6 checks passed
@axisrow
axisrow deleted the feat/compact-labels-glued branch September 27, 2026 16:41
axisrow added a commit that referenced this pull request Sep 27, 2026
… glued presets (#31)

The glued-preset change (#27) updated the shared helper but left the
Model and ContextBar test files asserting the old spaced format
('M: Opus 4.6' / 'Ctx: ...'), landing two stale failures on main.
Update both to the glued format ('M:Opus 4.6' / 'Ctx:...').

Co-authored-by: axisrow <[email protected]>
Co-authored-by: Claude Code <[email protected]>
axisrow added a commit that referenced this pull request Oct 11, 2026
Merge upstream/main (sirmalloc/ccstatusline, v2.2.32) resolving 60
conflicting files. All fork features are preserved and ported onto the
upstream structure; nothing from the fork was removed.

Upstream infrastructure adopted:
- widget base classes (git-count, token-count, extra-usage-amount),
  SearchableOptionEditor, label editing ('e' keybind), useTextCursor
- git security hardening (GIT_HARDENING_ARGS, resolveExecutable,
  git-hardening.ts) - the daemon async git twin is hardened too
- sanitizeTerminalText on all render output paths
- NO_PROXY exclusion and closable proxy agents in usage/status fetches

Fork features kept on top: daemon (#14-#54), compact labels (#10/#21/#27,
routed through the upstream label override with preset priority),
line themes (#40), zero-hide states, maxWidth + lazy editors, fishStyle
abbreviation, env snapshots (#15/#18), lazy proxy-agent loading (sirmalloc#397),
keep-existing install, fork version suffix (2.2.32.fork1).

Known test failure kept as-is: git-hardening-exec "keeps Git LFS
installed into the repository config" also fails on a clean
upstream/main checkout under macOS (verified in a worktree); upstream CI
runs Linux.

Co-Authored-By: Claude Code <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant