restore /NNN, pct, and remain — removing byte extrapolation. Updating backup and restore stats so stats_line_elapsed_seg_w always uses max(..., len(elapsed_seg)).

Author: generationtech

src/bacchus/persistence.py

@@ -35,7 +35,7 @@ class RuntimeState:
     stats_line_last_seg_w: int = 0
     stats_line_avg_seg_w: int = 0
     stats_line_compr_seg_w: int = 0
-    # First full incremental stats line locks ``elapsed..`` column width from that line's remain.
+    # Legacy: elapsed column width no longer seeded from remain (unused).
     stats_line_elapsed_seeded: bool = False
     chunk_index: int = 0
     mv_group_open: bool = False

src/bacchus/restore_chunked.py

@@ -308,6 +308,7 @@ def record_prompt_idle(secs: int) -> None:
 
         mx = max(mx, volume_supply.max_chunk_seq_across_roots(search_roots, cfg.basename))
         st_pre = persistence.load(tmp_runtime)
+        # Outer chunk total: max index seen across all search roots (grows when new dirs are added).
         st_pre.archive_volumes = max(st_pre.archive_volumes, mx, processed_chunks + 1)
         st_pre.source_size_total = volume_supply.total_archive_kb_on_roots(search_roots)
         persistence.save(tmp_runtime, st_pre)

src/bacchus/stats.py

@@ -174,7 +174,7 @@ def _emit_incremental_stats_full_line(
     Single layout path for backup and restore full incremental rows.
 
     Requires :attr:`~bacchus.persistence.RuntimeState.stats_line_*` widths to already
-    reflect this row's segments (running maxima updated before calling).
+    reflect this row's segments (monotonic running maxima updated before calling).
     """
     tail = STATS_INCREMENTAL_COL_GAP.join(
         [
@@ -252,14 +252,7 @@ def incremental_stats_backup(
 
     el_txt = duration_readable(elapsed_time)
     elapsed_seg = "elapsed.." + el_txt
-    if not state.stats_line_elapsed_seeded:
-        seed_elapsed = "elapsed.." + duration_readable(remain_time)
-        state.stats_line_elapsed_seg_w = max(
-            state.stats_line_elapsed_seg_w,
-            len(seed_elapsed),
-            len(elapsed_seg),
-        )
-        state.stats_line_elapsed_seeded = True
+    state.stats_line_elapsed_seg_w = max(state.stats_line_elapsed_seg_w, len(elapsed_seg))
 
     inc_txt = duration_readable(incremental_time)
     state.incremental_text_size_running = max(state.incremental_text_size_running, len(inc_txt))
@@ -318,8 +311,9 @@ def incremental_stats_restore(
     tier3_inner_mv_vol: int | None = None,
 ) -> None:
     """Restore incremental row; full lines use :func:`_emit_incremental_stats_full_line` like backup."""
-    volume_cap = max(_chunked_volume_total_display(state, tar_volume), state.archive_volumes)
-    state.stats_volume_cap_chars_max = max(state.stats_volume_cap_chars_max, len(str(volume_cap)))
+    # Chunk total comes only from scanned archive dirs (updated when roots change), not byte estimates.
+    vol_total = max(state.archive_volumes, tar_volume)
+    state.stats_volume_cap_chars_max = max(state.stats_volume_cap_chars_max, len(str(vol_total)))
     vc_w = state.stats_volume_cap_chars_max
     archive_max_name = len(basename) + vc_w + 6
     archive_max_num = vc_w + 1
@@ -333,22 +327,10 @@ def incremental_stats_restore(
     mv_tail = STATS_INCREMENTAL_COL_GAP + mv_decor if mv_decor else ""
     timestamp = int(time.time())
     elapsed_time = timestamp - state.start_timestamp - state.start_timestamp_running
-    pct = (tar_volume * 100) // volume_cap if volume_cap else 0
+    pct = (tar_volume * 100) // vol_total if vol_total else 0
 
     avg_time = elapsed_time // tar_volume if tar_volume > 0 else 0
-    remain_time = avg_time * max(0, volume_cap - tar_volume)
-    if (
-        remain_time == 0
-        and pct < 100
-        and tar_volume > 0
-        and avg_time > 0
-        and state.source_size_total > 0
-        and state.source_size_running < state.source_size_total
-    ):
-        bpc = max(1, state.source_size_running // tar_volume)
-        bytes_rem = state.source_size_total - state.source_size_running
-        est_chunks = (bytes_rem + bpc - 1) // bpc
-        remain_time = avg_time * est_chunks
+    remain_time = avg_time * max(0, vol_total - tar_volume)
 
     incremental_time = timestamp - state.incremental_timestamp - state.incremental_timestamp_running
     comp_ratio = (
@@ -362,14 +344,7 @@ def incremental_stats_restore(
 
     el_txt = duration_readable(elapsed_time)
     elapsed_seg = "elapsed.." + el_txt
-    if not state.stats_line_elapsed_seeded:
-        seed_elapsed = "elapsed.." + duration_readable(remain_time)
-        state.stats_line_elapsed_seg_w = max(
-            state.stats_line_elapsed_seg_w,
-            len(seed_elapsed),
-            len(elapsed_seg),
-        )
-        state.stats_line_elapsed_seeded = True
+    state.stats_line_elapsed_seg_w = max(state.stats_line_elapsed_seg_w, len(elapsed_seg))
 
     inc_txt = duration_readable(incremental_time)
     state.incremental_text_size_running = max(state.incremental_text_size_running, len(inc_txt))
@@ -400,7 +375,7 @@ def incremental_stats_restore(
 
     date_s = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp))
     prefix = (
-        f"{filename:<{archive_max_name}s} {f'/{volume_cap}':>{archive_max_num}s} "
+        f"{filename:<{archive_max_name}s} {f'/{vol_total}':>{archive_max_num}s} "
         f"{_stats_pct_field(pct)}{STATS_INCREMENTAL_COL_GAP}"
     )
     _emit_incremental_stats_full_line(

tests/test_stats.py

@@ -143,8 +143,7 @@ def test_incremental_stats_restore_volume_one_shows_remain(capsys, monkeypatch)
     )
     statsmod.incremental_stats_restore("test", state, "test.000001.tar", 1)
     out = capsys.readouterr().out
-    # Denominator uses byte extrapolation (≈20 chunks) rather than archive_volumes alone.
-    assert "remain..31m:40s" in out
+    assert "remain..15m" in out
 
 
 def test_incremental_stats_restore_tier3_suffix(capsys, monkeypatch) -> None:
@@ -458,8 +457,8 @@ def test_fmt_stats_compr_segment_fixed_width() -> None:
     assert len(statsmod._fmt_stats_compr_segment(8)) == len(statsmod._fmt_stats_compr_segment(42))
 
 
-def test_incremental_stats_elapsed_column_seeded_from_first_remain(capsys, tmp_path: Path, monkeypatch) -> None:
-    """First full line sets ``elapsed..`` width from that line's remain; no pre-run preseed."""
+def test_incremental_stats_elapsed_column_monotonic_width(capsys, tmp_path: Path, monkeypatch) -> None:
+    """``elapsed..`` column width grows with the longest ``elapsed..`` segment seen (never shrinks)."""
     dest = tmp_path / "dest"
     dest.mkdir()
     state = persistence.RuntimeState(
@@ -479,9 +478,8 @@ def test_incremental_stats_elapsed_column_seeded_from_first_remain(capsys, tmp_p
     i_el = out.index("elapsed..")
     i_last = out.index("last..")
     assert out[i_el - 2 : i_el] == gap, "remain.. cell → elapsed.. uses two-space gutter"
-    # Elapsed column width matches first-line remain ceiling, not an oversized preseed.
-    assert i_last - i_el == len("elapsed..2m:48s") + len(gap), (
-        f"expected tight elapsed→last boundary in {out!r}, span {i_last - i_el}"
+    assert i_last - i_el == len("elapsed..8s") + len(gap), (
+        f"expected elapsed→last boundary from first elapsed segment in {out!r}, span {i_last - i_el}"
     )
     i_src = out.index("source..")
     assert out[i_src - 2 : i_src] == gap