hte-cli 0.2.10__tar.gz → 0.2.12__tar.gz

{hte_cli-0.2.10 → hte_cli-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hte-cli
-Version: 0.2.10
+Version: 0.2.12
 Summary: Human Time-to-Completion Evaluation CLI
 Project-URL: Homepage, https://github.com/sean-peters-au/lyptus-mono
 Author: Lyptus Research

{hte_cli-0.2.10 → hte_cli-0.2.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hte-cli"
-version = "0.2.10"
+version = "0.2.12"
 description = "Human Time-to-Completion Evaluation CLI"
 readme = "README.md"
 requires-python = ">=3.11"

{hte_cli-0.2.10 → hte_cli-0.2.12}/src/hte_cli/cli.py

@@ -364,21 +364,51 @@ def session_join(ctx, session_id: str, force_setup: bool):
                                 layer_progress[layer_id]["current"] = layer_progress[layer_id]["total"]
                                 layer_progress[layer_id]["phase"] = "done"
 
+                        # Track waiting layers
+                        waiting_match = re.search(r"([a-f0-9]+):\s*Waiting", line)
+                        if waiting_match:
+                            layer_id = waiting_match.group(1)
+                            if layer_id not in layer_progress:
+                                layer_progress[layer_id] = {"current": 0, "total": 0, "phase": "waiting"}
+
                         # Aggregate progress
                         total_current = sum(lp.get("current", 0) for lp in layer_progress.values())
                         total_size = sum(lp.get("total", 0) for lp in layer_progress.values())
-                        active_layers = sum(1 for lp in layer_progress.values() if lp.get("phase") in ("Downloading", "Extracting"))
+                        downloading = sum(1 for lp in layer_progress.values() if lp.get("phase") == "Downloading")
+                        extracting = sum(1 for lp in layer_progress.values() if lp.get("phase") == "Extracting")
                         done_layers = sum(1 for lp in layer_progress.values() if lp.get("phase") == "done")
-
-                        if total_size > 0:
-                            pct = (total_current / total_size) * 100
-                            display = f"{format_size(total_current)}/{format_size(total_size)} ({pct:.0f}%)"
-                            if active_layers > 0:
-                                display += f" - {active_layers} active"
+                        waiting = sum(1 for lp in layer_progress.values() if lp.get("phase") == "waiting")
+                        total_layers = len(layer_progress)
+
+                        # Find largest active layer for detail display
+                        active_layers = [(lid, lp) for lid, lp in layer_progress.items()
+                                        if lp.get("phase") in ("Downloading", "Extracting") and lp.get("total", 0) > 0]
+                        largest_layer = None
+                        if active_layers:
+                            largest_layer = max(active_layers, key=lambda x: x[1].get("total", 0))
+
+                        # Build display
+                        if total_size > 1024 * 1024:  # >1MB meaningful data
+                            display = f"{format_size(total_current)}/{format_size(total_size)}"
+                            # Show largest layer progress
+                            if largest_layer:
+                                lid, lp = largest_layer
+                                pct = (lp["current"] / lp["total"] * 100) if lp["total"] > 0 else 0
+                                display += f" | {lid[:8]}: {format_size(lp['current'])}/{format_size(lp['total'])} ({pct:.0f}%)"
+                        elif total_layers > 0:
+                            # Show layer counts
+                            parts = []
+                            if downloading > 0:
+                                parts.append(f"{downloading} downloading")
+                            if extracting > 0:
+                                parts.append(f"{extracting} extracting")
                             if done_layers > 0:
-                                display += f", {done_layers} done"
-                        elif "Pulling" in line or "Waiting" in line:
-                            display = "preparing layers..."
+                                parts.append(f"{done_layers} done")
+                            if waiting > 0:
+                                parts.append(f"{waiting} waiting")
+                            display = ", ".join(parts) if parts else "starting..."
+                        elif "Pulling" in line:
+                            display = "preparing..."
                         elif line.strip():
                             display = line[:40]
                         else: