Skip to content

feat(statusline): locale-aware clock format for rate-limit segment - #2911

Merged
max-sixty merged 1 commit into
mainfrom
statusline-length
May 26, 2026
Merged

max-sixty merged 1 commit into
mainfrom
statusline-length

Conversation

@max-sixty

Copy link
Copy Markdown
Owner

Motivation

The rate-limit segment's clock times (10am–3pm, Mon–Mon 3pm) were hardcoded 12h. A user on a non-US locale runs wt list statusline and sees a US-only convention regardless of their LC_TIME / LANG. Most of the world writes time as 24h.

Change

detect_clock_format() reads LC_ALL → LC_TIME → LANG (POSIX precedence) and picks 12h for en_US/en_PH/en_CA (the locales where 12h is the everyday written form), 24h for everything else including C/POSIX/unset. The picker is wired in at the segment-render boundary and threads ClockFormat::{H12, H24} into format_clock and format_window_bounds, which stay pure.

5h window: 10am–3pm (12h) → 10:00–15:00 (24h), zero-padded ISO form, minutes always shown. 7d window: Mon–Mon 3pm (12h) → Mon–Mon 15:00 (24h). Weekday stays English — chrono's localized weekdays would need unstable-locales plus baked-in CLDR data, out of scope for the clock-format follow-up.

Why env-only (no sys-locale / CFLocale)

For a CLI, LC_TIME in ~/.zshrc is the user's stated intent. sys-locale's macOS path uses CFLocaleCopyPreferredLanguages, which returns the language preference (en_GB) but not the separate "Use 24-hour time" toggle, and bypasses shell env entirely — overriding the config the user actually set. Honoring env keeps the model simple, drops a dependency, and matches every other locale-respecting Unix tool.

Tests

3 new unit tests on the pure functions: classify_locale across 14 locale strings (covering the .encoding/@modifier strip, C/POSIX, unset), and parallel format_clock / format_window_bounds H24 assertions next to the existing H12 ones.

One new file-snapshot integration test (test_statusline_rate_limit_5h_24h_locale): same scenario as the existing 5h_clock_time but with LC_TIME=en_GB.UTF-8 instead of en_US.UTF-8, asserting 1.3×pace(10:00–15:00). The existing helper defaults to en_US.UTF-8 (clearing the harness's LC_ALL=C so LC_TIME takes effect), pinning the existing 8 snapshots to 12h and matching the docs example.

## Motivation

The rate-limit segment's clock times (`10am–3pm`, `Mon–Mon 3pm`) were
hardcoded 12h. A user on a non-US locale runs `wt list statusline` and
sees a US-only convention regardless of their `LC_TIME` / `LANG`. Most of
the world writes time as 24h.

## Change

`detect_clock_format()` reads `LC_ALL` → `LC_TIME` → `LANG` (POSIX
precedence) and picks 12h for `en_US`/`en_PH`/`en_CA` (the locales where
12h is the everyday written form), 24h for everything else including
`C`/`POSIX`/unset. The picker is wired in at the segment-render boundary
and threads `ClockFormat::{H12, H24}` into `format_clock` and
`format_window_bounds`, which stay pure.

5h window: `10am–3pm` (12h) → `10:00–15:00` (24h), zero-padded ISO form,
minutes always shown. 7d window: `Mon–Mon 3pm` (12h) → `Mon–Mon 15:00`
(24h). Weekday stays English — chrono's localized weekdays would need
`unstable-locales` plus baked-in CLDR data, out of scope for the
clock-format follow-up.

## Why env-only (no `sys-locale` / `CFLocale`)

For a CLI, `LC_TIME` in `~/.zshrc` is the user's stated intent.
`sys-locale`'s macOS path uses `CFLocaleCopyPreferredLanguages`, which
returns the language preference (`en_GB`) but not the separate "Use
24-hour time" toggle, *and* bypasses shell env entirely — overriding the
config the user actually set. Honoring env keeps the model simple, drops
a dependency, and matches every other locale-respecting Unix tool.

## Tests

3 new unit tests on the pure functions: `classify_locale` across 14
locale strings (covering the `.encoding`/`@modifier` strip, `C`/`POSIX`,
unset), and parallel `format_clock` / `format_window_bounds` H24
assertions next to the existing H12 ones.

One new file-snapshot integration test
(`test_statusline_rate_limit_5h_24h_locale`): same scenario as the
existing `5h_clock_time` but with `LC_TIME=en_GB.UTF-8` instead of
`en_US.UTF-8`, asserting `1.3×pace(10:00–15:00)`. The existing helper
defaults to `en_US.UTF-8` (clearing the harness's `LC_ALL=C` so
`LC_TIME` takes effect), pinning the existing 8 snapshots to 12h and
matching the docs example.
@max-sixty
max-sixty merged commit a0dadbd into main May 26, 2026
36 of 37 checks passed
@max-sixty
max-sixty deleted the statusline-length branch May 26, 2026 17:33
@worktrunk-bot

Copy link
Copy Markdown
Collaborator

CI failure on release-target (x86_64-apple-darwin) looks unrelated to this PR — it's a snapshot ordering race in test_switch_create_shows_progress_when_forced, which the PR doesn't touch.

The snapshot expects wt's ◎ Creating worktree… line before git's Preparing worktree (new branch 'feature-progress'), but the macOS run captured them in the opposite order. Both are stderr, from two different processes (wt and the git worktree add it spawns); with WORKTRUNK_TEST_DELAYED_STREAM_MS=0 the streams race on which gets to the pipe first. Linux and Windows passed the same test on this PR.

Leaving the approval in place per the "don't self-dismiss over unrelated flakes" rule. Rerunning release-target (x86_64-apple-darwin) directly should clear it once benchmarks finishes (per-job rerun is blocked while any job in the run is still in progress).

@max-sixty max-sixty mentioned this pull request May 26, 2026
max-sixty added a commit that referenced this pull request May 26, 2026
v0.54.0.

`cargo semver-checks` reports 3 breaking library API changes
(`shell_exec::set_output_log_available` removed,
`SUBPROCESS_TERMINAL_TARGET` removed, `Deprecations::{pre_start,
post_start}` removed) — none of them intentional API, but they force
minor pre-1.0.

Headline user-visible changes:
- New rate-limit pace segment in the Claude Code statusline (#2899,
#2911).
- `wt step prune` streams removals and skips unapproved hooks instead of
prompting mid-scan; default `--min-age` raised 1h → 1d (#2908, #2910,
#2886).
- `-vv` no longer floods stderr — debug routes to `trace.log`, Info
stays on stderr; raw subprocess sink renamed `output.log` →
`subprocess.log`; `RUST_LOG` honored at every verbosity level (#2892,
#2901, #2913).
- Data-safety fixes across merge / remove / prune lifecycle (#2870).
- Legacy shell-wrapper deprecation warning (#2880).

Full CHANGELOG entry in this PR.
social4hyq pushed a commit to social4hyq/homebrew-core that referenced this pull request Sep 20, 2026
worktrunk 0.54.0

Created-by: HarmonybrewBot
Commit-by: HarmonybrewBot
Merged-by: HarmonybrewBot
Description: Created by `brew bump`

---

Created with `brew bump-formula-pr`.<details>
  <summary>release notes</summary>
  <pre>## Release Notes

### Improved

- **Rate-limit pace segment in the Claude Code statusline**: `wt list statusline --format=claude-code` now surfaces a yellow `1.3×pace(10am–3pm)` segment when Claude Code's reported five-hour or seven-day rate-limit window is on track to be hit before its reset. The segment uses a Bayesian forecast on `P(final ≥ 100%)` so early-window bursts (e.g., 5% used at 3% elapsed) don't trigger spurious warnings — only the worse-projected of the two windows is shown, and the segment is hidden entirely when both are safe. The clock format inside the parentheses honors `LC_ALL` / `LC_TIME` / `LANG`: `en_US`/`en_PH`/`en_CA` get 12-hour (`10am–3pm`), everything else (including unset and `C`/`POSIX`) gets 24-hour (`10:00–15:00`). ([#2899](max-sixty/worktrunk#2899), [#2911](max-sixty/worktrunk#2911))

- **`wt step prune` streams removals and never prompts mid-scan**: Prune now bundles integration, removability, and age checks into a single parallel pass and starts removing candidates as soon as they qualify, instead of batching the scan and acting at the end. Dirty / locked / primary worktrees drop out before the age check, so a young + dirty + integrated worktree no longer surfaces as `Skipped (younger than 1d)` — the `(younger than X)` message now fires only when the worktree would actually have been pruned. With `--yes`, every project command is auto-approved as before; without `--yes`, a candidate whose hooks include an unapproved project command is SKIPPED with `(approval required)` rather than aborting the scan with an inline prompt the streaming structure couldn't accommodate. The end-of-run hint enumerates the unapproved hook templates from the invoking worktree's config and emits one copy-pasteable `wt -C <path> remove` line per skipped candidate, annotating candidates whose own `.config/wt.toml` differs from the invoking worktree's. ([#2908](max-sixty/worktrunk#2908), [#2910](max-sixty/worktrunk#2910))

- **`wt step prune` default `--min-age` raised from 1h to 1d**: A worktree just created from the default branch looks "merged" because its branch still points at the same commit; a one-day floor keeps an unattended prune from sweeping it up before its owner starts work. Explicit `--min-age=0s` or any other value is unchanged. ([#2886](max-sixty/worktrunk#2886))

- **Legacy shell-wrapper deprecation warning**: Users who upgrade `wt` without restarting their shell still run the previous release's wrapper, which sets only `WORKTRUNK_DIRECTIVE_FILE` instead of the new split `WORKTRUNK_DIRECTIVE_CD_FILE` / `WORKTRUNK_DIRECTIVE_EXEC_FILE` pair. That fallback used to be silent; `wt` now emits a one-shot per-process warning hinting at `wt config shell install`. bash, zsh, fish, and PowerShell pick up the new wrapper on the next shell restart; nushell is the one shell where users must rerun `wt config shell install nu` because its wrapper is a static file. ([#2880](max-sixty/worktrunk#2880))

- **`-vv` no longer floods stderr; raw subprocess sink renamed to `subprocess.log`**: A `-vv` invocation used to spray ~15K lines of stderr per command, forcing a redirect to a file even though `trace.log` already mirrored most of it. The debug-level `log::*` pipeline now writes to `.git/wt/logs/trace.log` at `-vv`; Info-level records (hook output, template expansions, the `Tracing to …` pointer) stay on stderr at every verbosity level. The companion raw-subprocess-bytes file is renamed from `output.log` to `subprocess.log` — the prior name read as "stuff `wt` printed" but actually held uncapped multi-MB subprocess bodies (`git log -p`, patch-id pipelines). `RUST_LOG` is now honored at every verbosity level: `wt -v` and `wt -vv` previously hardcoded Info / Debug and silently dropped any `RUST_LOG` directive (`RUST_LOG=trace wt -vv` was capped at Debug, `RUST_LOG=worktrunk=trace wt -v` was ignored); all three levels now flow through one builder shape with `RUST_LOG` layered on top of the flag baseline. ([#2892](max-sixty/worktrunk#2892), [#2901](max-sixty/worktrunk#2901), [#2913](max-sixty/worktrunk#2913))

### Fixed

- **Data-safety across the worktree merge / remove / prune lifecycle**: Five TOCTOU and scoping fixes. `wt merge` and `wt remove` revalidate cleanliness and branch integration *after* `pre-remove` hooks run, so a hook (or concurrent process) that dirties the worktree or advances the branch can no longer trash the directory or trigger `git branch -D` against the stale pre-hook decision. The background-removal path does the same revalidation and fails closed for submodule worktrees on the fallback path instead of forcing. `wt step prune` runs its rename-failure fallback `git branch -d` synchronously under the write guard for non-current worktrees (no more race against live integration readers on `.git/config`), scopes hook approval to the worktrees it will actually remove (an unrelated unapproved hook can no longer abort a non-interactive prune), and prunes the stale metadata of detached worktrees whose directory was deleted outside Worktrunk. ([#2870](max-sixty/worktrunk#2870))

### Documentation

- **`-v` / `-vv` help and FAQ**: The `-v` help text is split out from its 150-character parenthetical, and `docs/content/faq.md` gains a "What does `-v` / `-vv` do?" section with a three-level table. ([#2913](max-sixty/worktrunk#2913))

- **Hook docs and `pre-start` docstring**: The `pre_create` field docstring in `HooksConfig` (user-visible via generated JSON schema) read "Commands to execute before worktree creation"; `pre-start` actually runs *after* worktree creation, blocking. Restored the correct wording. The `docs/content/extending.md` overview is reworked to read more cleanly: parallel three-paragraph intro for hooks / aliases / custom subcommands, fewer em-dashes, and the Reference section's table no longer duplicates content covered in prose. ([#2879](max-sixty/worktrunk#2879), [#2912](max-sixty/worktrunk#2912))

### Internal

- **Migrated logging from `env_logger` to `tracing-subscriber`**: A layered subscriber routes records structurally by target and verbosity. Existing `log::*` callers are bridged into `tracing` via `tracing_log::LogTracer`. `[wt-trace]` records emit as typed structured fields with a single formatter rendering the wire shape, so the grammar lives in one place instead of being duplicated across every emit site.

- **`UncommittedChanges` error renders dirty files in the canonical gutter**, matching `ConflictingChanges` and the project's `format_with_gutter()` convention. ([#2887](max-sixty/worktrunk#2887))

## Install worktrunk 0.54.0

### Install prebuilt binaries via shell script

```sh
curl --proto '=https' --tlsv1.2 -LsSf https://github.com/max-sixty/worktrunk/releases/download/v0.54.0/worktrunk-installer.sh | sh && wt config shell install
```

### Install prebuilt binaries via powershell script

```sh
powershell -ExecutionPolicy Bypass -c "irm https://github.com/max-sixty/worktrunk/releases/download/v0.54.0/worktrunk-installer.ps1 | iex"; git-wt config shell install
```

### Install prebuilt binaries via Homebrew

```sh
brew install worktrunk && wt config shell install
```

## Download worktrunk 0.54.0

|  File  | Platform | Checksum |
|--------|----------|----------|
| [worktrunk-aarch64-apple-darwin.tar.xz](https://github.com/max-sixty/worktrunk/releases/download/v0.54.0/worktrunk-aarch64-apple-darwin.tar.xz) | Apple Silicon macOS | [checksum](https://github.com/max-sixty/worktrunk/releases/download/v0.54.0/worktrunk-aarch64-apple-darwin.tar.xz.sha256) |
| [worktrunk-x86_64-apple-darwin.tar.xz](https://github.com/max-sixty/worktrunk/releases/download/v0.54.0/worktrunk-x86_64-apple-darwin.tar.xz) | Intel macOS | [checksum](https://github.com/max-sixty/worktrunk/releases/download/v0.54.0/worktrunk-x86_64-apple-darwin.tar.xz.sha256) |
| [worktrunk-x86_64-pc-windows-msvc.zip](https://github.com/max-sixty/worktrunk/releases/download/v0.54.0/worktrunk-x86_64-pc-windows-msvc.zip) | x64 Windows | [checksum](https://github.com/max-sixty/worktrunk/releases/download/v0.54.0/worktrunk-x86_64-pc-windows-msvc.zip.sha256) |
| [worktrunk-aarch64-unknown-linux-musl.tar.xz](https://github.com/max-sixty/worktrunk/releases/download/v0.54.0/worktrunk-aarch64-unknown-linux-musl.tar.xz) | ARM64 MUSL Linux | [checksum](https://github.com/max-sixty/worktrunk/releases/download/v0.54.0/worktrunk-aarch64-unknown-linux-musl.tar.xz.sha256) |
| [worktrunk-x86_64-unknown-linux-musl.tar.xz](https://github.com/max-sixty/worktrunk/releases/download/v0.54.0/worktrunk-x86_64-unknown-linux-musl.tar.xz) | x64 MUSL Linux | [checksum](https://github.com/max-sixty/worktrunk/releases/download/v0.54.0/worktrunk-x86_64-unknown-linux-musl.tar.xz.sha256) |



### Install via Cargo

```sh
cargo install worktrunk && wt config shell install
```

### Install via Winget (Windows)

```sh
winget install max-sixty.worktrunk && git-wt config shell install
```

### Install via AUR (Arch Linux)

```sh
paru worktrunk-bin && wt config shell install
```
</pre>
  <p>View the full release notes at <a href="https://github.com/max-sixty/worktrunk/releases/tag/v0.54.0">https://github.com/max-sixty/worktrunk/releases/tag/v0.54.0</a>.</p>
</details>
<hr>

See merge request: Harmonybrew/homebrew-core!7938
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.

2 participants