feat: v0.4.0 — defork progress/bar.py to codechu-meter + codechu-fmt

ProgressBar's three inline helpers (_RateEstimator, _fmt_duration,
_fmt_rate) duplicated what codechu-meter and codechu-fmt already
provide. With codechu-fmt v0.4.0 exposing integer_seconds,
precision='auto', and bare_items, the inline versions can go.

- progress/bar.py: import RateEstimator from codechu_meter and
  format_duration / format_rate from codechu_fmt. Call sites:
    eta_str = format_duration(eta_s, integer_seconds=True)
    elapsed = format_duration(elapsed, integer_seconds=True)
    rate_str = format_rate(rate, unit=..., precision="auto", bare_items=False)
  ~19 lines net smaller.
- pyproject.toml: new required dependencies
    codechu-fmt>=0.4,<0.5
    codechu-meter>=0.3,<0.4
  Both pure-stdlib, no transitive deps.
- description trimmed: dropped "stdlib-only" since cli now pulls
  two tiny Codechu siblings.
- Output regression noted in CHANGELOG: very long ETAs now show as
  "1h Xm" instead of "61m 40s" (was a quirk of the forked helper;
  hour expansion is the family-wide convention).

182/182 tests pass.

Author: obarlik

CHANGELOG.md

@@ -4,6 +4,23 @@
 
 ## [Unreleased]
 
+## [0.4.0] - 2026-05-20
+
+### Changed
+- **Defork**: `ProgressBar` now uses `codechu_meter.RateEstimator` and
+  `codechu_fmt.format_duration` / `format_rate` directly. The inline
+  `_RateEstimator` / `_fmt_duration` / `_fmt_rate` helpers in
+  `progress/bar.py` are removed.
+- **Visible output for very long ETAs**: duration formatting now
+  promotes ≥3600 s to ``"1h Xm"`` (was ``"61m 40s"``). This is the
+  documented improvement of the consolidation; matches the rest of
+  the Codechu fmt family.
+
+### Dependencies
+- New required dependencies: ``codechu-fmt>=0.4,<0.5`` and
+  ``codechu-meter>=0.3,<0.4``. Both are pure-stdlib, no transitive
+  deps.
+
 ## [0.3.0] - 2026-05-20
 
 ### Added

pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codechu-cli"
-version = "0.3.0"
-description = "Stdlib-only CLI primitives — colors, progress, prompts, spinners, emoji helpers — with consistent UX across Codechu tools."
+version = "0.4.0"
+description = "CLI primitives — colors, progress, prompts, spinners, emoji helpers — with consistent UX across Codechu tools."
 readme = "README.md"
 requires-python = ">=3.10"
 license = { file = "LICENSE" }
@@ -25,7 +25,10 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
     "Topic :: Terminals",
 ]
-dependencies = []
+dependencies = [
+    "codechu-fmt>=0.4,<0.5",
+    "codechu-meter>=0.3,<0.4",
+]
 
 [project.optional-dependencies]
 dev = [

src/codechu_cli/__init__.py

@@ -30,7 +30,7 @@
 from .prompt import confirm, multiselect, prompt, select
 from .table import Table
 
-__version__ = "0.3.0"
+__version__ = "0.4.0"
 
 __all__ = [
     "BAR_STYLES",

src/codechu_cli/progress/bar.py

@@ -4,61 +4,17 @@
 
 import sys
 import time
-from collections import deque
 from typing import IO
 
+from codechu_fmt import format_duration, format_rate
+from codechu_meter import RateEstimator
+
 from .._term import is_tty
 from .line import ProgressLine
 from .styles_bar import BAR_STYLES, DEFAULT_BAR_STYLE, SUBPIXEL
 from .styles_spinner import SPINNER_STYLES
 
 
-def _fmt_duration(secs: float) -> str:
-    """Compact duration: ``Xs`` under 60 s, ``Xm Ys`` otherwise."""
-    if secs < 0:
-        secs = 0.0
-    s = int(round(secs))
-    if s < 60:
-        return f"{s}s"
-    return f"{s // 60}m {s % 60}s"
-
-
-def _fmt_rate(rate: float, unit: str) -> str:
-    """Compact rate string like ``42 items/s``."""
-    if rate >= 100:
-        return f"{int(round(rate))} {unit}/s"
-    if rate >= 10:
-        return f"{rate:.1f} {unit}/s"
-    return f"{rate:.2f} {unit}/s"
-
-
-class _RateEstimator:
-    """Tiny windowed rate estimator (events per second)."""
-
-    def __init__(self, window_seconds: float = 1.0) -> None:
-        self._window = window_seconds
-        self._events: deque[tuple[float, float]] = deque()  # (ts, n)
-
-    def observe(self, n: float = 1) -> None:
-        now = time.monotonic()
-        self._events.append((now, float(n)))
-        cutoff = now - self._window
-        while self._events and self._events[0][0] < cutoff:
-            self._events.popleft()
-
-    def rate(self) -> float:
-        if not self._events:
-            return 0.0
-        now = time.monotonic()
-        cutoff = now - self._window
-        while self._events and self._events[0][0] < cutoff:
-            self._events.popleft()
-        if not self._events:
-            return 0.0
-        total = sum(n for _, n in self._events)
-        return total / self._window
-
-
 class ProgressBar:
     """Bracketed progress bar with percent + count.
 
@@ -114,7 +70,7 @@ def __init__(
         self._indeterm_idx = 0
         self._t_start = time.monotonic()
         self._last_advance = time.monotonic()
-        self._rate = _RateEstimator(window_seconds=1.0)
+        self._rate = RateEstimator(window_seconds=1.0)
 
         # Lazy: line is constructed on first render so stream/enabled
         # changes via the builder are respected.
@@ -336,7 +292,7 @@ def _render(self, *, label: str) -> None:
             pct_str = str(int(round(ratio * 100)))
             if self.total > 0 and self.current > 0:
                 eta_s = elapsed * (self.total - self.current) / self.current
-                eta_str = _fmt_duration(max(0.0, eta_s))
+                eta_str = format_duration(max(0.0, eta_s), integer_seconds=True)
             else:
                 eta_str = "?"
             remaining_str = str(max(0, self.total - self.current))
@@ -347,7 +303,7 @@ def _render(self, *, label: str) -> None:
             pct_str = str(int(round(ratio * 100)))
             if self.total > 0 and self.current > 0:
                 eta_s = elapsed * (self.total - self.current) / self.current
-                eta_str = _fmt_duration(max(0.0, eta_s))
+                eta_str = format_duration(max(0.0, eta_s), integer_seconds=True)
             else:
                 eta_str = "?"
             remaining_str = str(max(0, self.total - self.current))
@@ -359,15 +315,20 @@ def _render(self, *, label: str) -> None:
         if self._indeterminate or elapsed < 0.5 or self._rate.rate() <= 0:
             rate_str = "?"
         else:
-            rate_str = _fmt_rate(self._rate.rate(), self._units or "items")
+            rate_str = format_rate(
+                self._rate.rate(),
+                unit=self._units or "items",
+                precision="auto",
+                bare_items=False,
+            )
 
         msg = self._template.format(
             bar=bar_str,
             pct=pct_str,
             current=self.current,
             total=self.total,
             label=label,
-            elapsed=_fmt_duration(elapsed),
+            elapsed=format_duration(elapsed, integer_seconds=True),
             eta=eta_str,
             spinner=spinner_str,
             remaining=remaining_str,