voidx-cli 3.5.2__tar.gz → 3.6.0__tar.gz

{voidx_cli-3.5.2 → voidx_cli-3.6.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: voidx-cli
-Version: 3.5.2
+Version: 3.6.0
 Summary: CLI / terminal UI frontend for voidx.
 Author: chikhamx
 License: MIT
 Requires-Python: >=3.11
-Requires-Dist: voidx==3.5.2
+Requires-Dist: voidx==3.6.0
 Requires-Dist: rich>=13.9.0

{voidx_cli-3.5.2 → voidx_cli-3.6.0}/pyproject.toml

@@ -6,7 +6,7 @@ license = {text = "MIT"}
 authors = [{name = "chikhamx"}]
 requires-python = ">=3.11"
 dependencies = [
-    "voidx==3.5.2",
+    "voidx==3.6.0",
     "rich>=13.9.0",
 ]
 
@@ -19,3 +19,5 @@ version = {attr = "voidx_cli.__version__"}
 
 [tool.setuptools.packages.find]
 where = ["."]
+include = ["voidx_cli*"]
+exclude = ["build*", "tests*", "dist*"]

{voidx_cli-3.5.2 → voidx_cli-3.6.0}/tests/test_output_stream.py

@@ -8,6 +8,7 @@ from rich.text import Text
 
 from voidx.ui.output.dock import dock
 from voidx.ui.output.dock.formatting import _text_from_line
+from voidx.ui.output.console import StreamingRenderer
 
 
 def test_stream_reply_aligns_with_user_turn_start():
@@ -128,3 +129,42 @@ def test_thinking_stream_wraps_long_content_to_visual_lines():
         test_dock.reset()
 
 
+def test_streaming_renderer_commits_thinking_only_output():
+    test_dock = dock
+    test_dock.begin_capture()
+    try:
+        renderer = StreamingRenderer(Console(), stream_to_dock=True)
+        renderer.feed_thinking("checking tool permissions")
+        renderer.done()
+
+        rendered = "\n".join(_rich_plain(line) for line in test_dock.tree.render(100))
+        assert "checking tool permissions" not in rendered
+        thinking_nodes = [
+            node
+            for parent in test_dock.tree.root.children
+            for node in [parent, *parent.children]
+            if node.node_type == "assistant" and node.payload.get("phase") == "thinking"
+        ]
+        assert thinking_nodes == []
+    finally:
+        test_dock.deactivate()
+        test_dock.reset()
+
+
+def test_thinking_only_stream_not_flushed_to_scrollback():
+    test_dock = dock
+    test_dock.begin_capture()
+    try:
+        test_dock.start_turn("问题")
+        long_thinking = "\n".join(f"thinking line {i}" for i in range(10))
+        test_dock.set_stream(long_thinking, phase="thinking")
+        test_dock.commit_stream()
+
+        flush_limit = test_dock.safe_flush_line_count(100, 0)
+        lines = test_dock.tree.render(100)
+        flushable = "\n".join(_rich_plain(line) for line in lines[:flush_limit])
+
+        assert "thinking line" not in flushable
+    finally:
+        test_dock.deactivate()
+        test_dock.reset()

{voidx_cli-3.5.2 → voidx_cli-3.6.0}/tests/test_status_activity.py

@@ -249,8 +249,8 @@ def test_busy_activity_compacts_many_permission_details(tmp_path, monkeypatch):
                 "3. replace",
                 "   target: docs/specs/llm-error-optimization-2026-07-05.md",
                 "   file_path: docs/specs/llm-error-optimization-2026-07-05.md",
-                "   bounds: [{'line_no': 334, 'anchor': './python.sh -m pytest tests/test_tools/test_plan_checkpoint.py'}]",
-                "   new_string: ./python.sh -m pytest tests/test_tools/test_plan_checkpoint.py tests/test_tools/test_basic.py",
+                "   bounds: [{'line_no': 334, 'anchor': './python.py -m pytest tests/test_tools/test_plan_checkpoint.py'}]",
+                "   new_string: ./python.py -m pytest tests/test_tools/test_plan_checkpoint.py tests/test_tools/test_basic.py",
             ]
         )
         dock.record_status("permission:request", "Requesting", detail, stage="permission")

{voidx_cli-3.5.2 → voidx_cli-3.6.0}/tests/test_status_layout.py

@@ -48,6 +48,35 @@ def test_todo_busy_and_choice_panel_render_once_in_full_frame(tmp_path, monkeypa
     assert rendered.index("Todo:") < rendered.index("Working") < rendered.index("Intent?")
 
 
+def test_permission_choice_overlay_does_not_repeat_tool_details(tmp_path, monkeypatch):
+    monkeypatch.setattr("voidx_cli.render_activity.time.monotonic", lambda: 105.0)
+    tui = _tui(tmp_path)
+    tui._console = Console(file=None, force_terminal=True, width=100, height=24, _environ={})
+    tui._busy = True
+    tui._busy_started_at = 100.0
+    tui._active_choice = [
+        ("Yes, always", "a", "Allow these tools for this session"),
+        ("Yes", "y", "Allow this tool use once"),
+        ("No", "n", "Deny these tools"),
+    ]
+    tui._choice_prompt = "Allow tool use?"
+    tui._choice_selected = 0
+    tui._choice_details = [{"name": "bash", "pattern": "npm install lodash"}]
+    dock.begin_capture()
+    dock.record_status(
+        "permission:request",
+        "Requesting",
+        "1. bash\n   command: npm install lodash",
+        stage="permission",
+    )
+
+    rendered = "\n".join(_rich_plain(line) for line in _render_lines(tui, width=100))
+
+    assert rendered.count("npm install lodash") == 1
+    assert "bash: npm install lodash" not in rendered
+    assert "Yes, always" in rendered
+
+
 def test_choice_selection_only_render_skips_todo_and_busy_lines(tmp_path, monkeypatch):
     monkeypatch.setattr("voidx_cli.render_activity.time.monotonic", lambda: 105.0)
     fake_stdout = _FakeStdout()
@@ -142,4 +171,3 @@ def test_busy_activity_tick_noops_without_rendered_frame(tmp_path, monkeypatch):
     assert tui._render_busy_activity_tick() is False
     assert "Cogitating" not in status.plain
 
-

voidx_cli-3.6.0/tests/test_status_simplify.py

@@ -0,0 +1,222 @@
+"""Tests for simplified status bar field formatting."""
+
+from tui_helpers import *  # noqa: F403
+
+from types import SimpleNamespace
+
+from rich.cells import cell_len
+from rich.console import Console
+
+from voidx.llm.usage import UsageStats
+from voidx.ui.commands import COMMANDS
+from voidx.ui.output.types import UiStatus
+from voidx_cli import PureTui
+
+
+def _make_status(tmp_path, **overrides):
+    defaults = dict(
+        provider="anthropic",
+        model="claude-sonnet-4-20250514",
+        workspace=str(tmp_path),
+        reasoning_effort="xhigh",
+        sandbox_label=lambda: "w-write",
+        approval_label=lambda: "on-fail",
+        approval_reviewer_label=lambda: "user",
+        interaction_mode=lambda: "auto",
+        debug=lambda: False,
+        goal_label=lambda: "",
+        active_workflows=lambda: [],
+        usage_stats=None,
+        context_limit=200000,
+    )
+    defaults.update(overrides)
+    return SimpleNamespace(**defaults)
+
+
+def _status_plain(tui, width=100):
+    text = tui._status_summary_text(width)
+    return text.plain
+
+
+def _usage_stats() -> UsageStats:
+    stats = UsageStats()
+    stats.context_limit = 200_000
+    stats.total_input_tokens = 10_000
+    stats.total_output_tokens = 1_000
+    stats.begin_turn()
+    stats.update_context(46_300)
+    stats.total_input_tokens = 1_899_000
+    stats.total_output_tokens = 1_000
+    stats.total_cache_read_tokens = 399_000
+    stats.total_cache_metric_calls = 1
+    return stats
+
+
+# ── model segment: no provider prefix ──────────────────────────────
+
+def test_model_segment_excludes_provider(tmp_path):
+    tui = PureTui(_make_status(tmp_path), COMMANDS)
+    plain = _status_plain(tui)
+    assert "anthropic/" not in plain
+    assert "claude-sonnet-4-20250514" in plain
+    assert "xhigh" in plain
+
+
+# ── policy segment: no permission_label ────────────────────────────
+
+def test_policy_segment_excludes_permission_label(tmp_path):
+    status = _make_status(tmp_path)
+    tui = PureTui(status, COMMANDS)
+    plain = _status_plain(tui)
+    assert "default" not in plain.lower()
+    assert "w-write" in plain
+    assert "on-fail" in plain
+
+
+def test_policy_segment_includes_reviewer_when_not_user(tmp_path):
+    status = _make_status(
+        tmp_path,
+        approval_reviewer_label=lambda: "reviewer",
+    )
+    tui = PureTui(status, COMMANDS)
+    plain = _status_plain(tui)
+    assert "reviewer" in plain
+
+
+# ── state segment: no plan_mode, auto hidden ───────────────────────
+
+def test_state_segment_hidden_when_auto(tmp_path):
+    tui = PureTui(_make_status(tmp_path, interaction_mode=lambda: "auto"), COMMANDS)
+    plain = _status_plain(tui)
+    # auto should not appear as a state segment
+    assert "| auto" not in plain
+
+
+def test_state_segment_shows_plan_without_duplication(tmp_path):
+    tui = PureTui(_make_status(tmp_path, interaction_mode=lambda: "plan"), COMMANDS)
+    plain = _status_plain(tui)
+    assert "plan" in plain
+    # Should not duplicate: "plan plan" is a bug
+    assert "plan plan" not in plain
+
+
+def test_state_segment_shows_debug(tmp_path):
+    tui = PureTui(_make_status(tmp_path, debug=lambda: True), COMMANDS)
+    plain = _status_plain(tui)
+    assert "debug" in plain
+
+
+# ── usage segment: compact format with total ───────────────────────
+
+def test_usage_segment_compact_format(tmp_path):
+    stats = UsageStats()
+    stats.context_limit = 200_000
+    stats.total_input_tokens = 10_000
+    stats.total_output_tokens = 1_000
+    stats.begin_turn()
+    stats.update_context(10_000)
+    stats.total_input_tokens = 126_100
+    stats.total_output_tokens = 1_043
+    status = _make_status(tmp_path, usage_stats=stats)
+    tui = PureTui(status, COMMANDS)
+    plain = _status_plain(tui)
+    assert "10k/200k" in plain
+    assert plain.endswith("10k/200k -- 127.1k")
+    # No verbose labels
+    assert "ctx " not in plain
+    assert "cache " not in plain
+
+
+# ── goal_type / goal_awaiting: dead fields removed ─────────────────
+
+def test_status_works_without_goal_type_field(tmp_path):
+    """UiStatus should no longer have goal_type or goal_awaiting_approval fields."""
+    status = UiStatus(
+        model="m",
+        provider="p",
+        workspace=str(tmp_path),
+        session_title="t",
+        context_limit=200000,
+        debug=lambda: False,
+        plan_mode=lambda: False,
+    )
+    assert not hasattr(status, "goal_type")
+    assert not hasattr(status, "goal_awaiting_approval")
+    assert not hasattr(status, "permission_label")
+
+
+# ── variant priority: workflow before usage at narrow widths ───────
+
+def test_workflow_shown_at_narrow_width_with_long_model(tmp_path):
+    """At 80 cols with a long model name, workflow should still appear."""
+    status = _make_status(
+        tmp_path,
+        active_workflows=lambda: ["verify"],
+        goal_label=lambda: "fix bug",
+    )
+    stats = UsageStats()
+    stats.context_limit = 200_000
+    stats.total_input_tokens = 10_000
+    stats.total_output_tokens = 1_000
+    stats.begin_turn()
+    stats.update_context(10_000)
+    stats.total_input_tokens = 126_100
+    stats.total_output_tokens = 1_043
+    status.usage_stats = stats
+    tui = PureTui(status, COMMANDS)
+    plain = _status_plain(tui, width=80)
+    assert "verify" in plain
+
+
+def test_usage_is_right_aligned_and_preserved_with_long_goal(tmp_path):
+    status = _make_status(
+        tmp_path,
+        active_workflows=lambda: ["重命名"],
+        goal_label=lambda: "将某个文件/模块重命名并移动到 file 目录下，需确认具体对象并同步更新 import 路径",
+        usage_stats=_usage_stats(),
+    )
+    tui = PureTui(status, COMMANDS)
+    width = 120
+
+    plain = _status_plain(tui, width=width)
+
+    assert plain.endswith("46.3k/200k 21% 1.9m")
+    assert "\n" not in plain
+    assert cell_len(plain) == width
+    assert "重命名" in plain
+    assert "…" in plain
+    assert "import 路径" not in plain
+
+
+def test_usage_survives_when_left_and_middle_are_too_wide(tmp_path):
+    status = _make_status(
+        tmp_path,
+        model="astron-code-latest",
+        reasoning_effort="xhigh",
+        active_workflows=lambda: ["workflow-with-a-very-long-name"],
+        goal_label=lambda: "x" * 200,
+        usage_stats=_usage_stats(),
+    )
+    tui = PureTui(status, COMMANDS)
+    width = 72
+
+    plain = _status_plain(tui, width=width)
+
+    assert plain.endswith("46.3k/200k 21% 1.9m")
+    assert "\n" not in plain
+    assert cell_len(plain) == width
+
+
+def test_pinned_usage_status_keeps_segment_styles(tmp_path):
+    status = _make_status(
+        tmp_path,
+        active_workflows=lambda: ["重命名"],
+        goal_label=lambda: "将某个文件/模块重命名并移动到 file 目录下，需确认具体对象并同步更新 import 路径",
+        usage_stats=_usage_stats(),
+    )
+    tui = PureTui(status, COMMANDS)
+
+    text = tui._status_summary_text(120)
+
+    assert "#56D4DD" in _styles_covering(text, "46.3k/200k 21% 1.9m")
+    assert "#C698F0" in _styles_covering(text, "…")

{voidx_cli-3.5.2 → voidx_cli-3.6.0}/tests/test_terminal_input.py

@@ -64,7 +64,7 @@ def test_input_cursor_position_accounts_for_status_line(tmp_path, monkeypatch):
 
     fake_stdout = FakeStdout()
     monkeypatch.setattr(sys, "stdout", fake_stdout)
-    status = SimpleNamespace(provider="openai", model="gpt", workspace=str(tmp_path))
+    status = SimpleNamespace(model="gpt", workspace=str(tmp_path))
     tui = PureTui(status, COMMANDS)
     tui._input_lines = ["现在"]
     tui._cursor_row = 0
@@ -191,16 +191,13 @@ def test_command_panel_renders_below_input_with_bottom_rule(tmp_path):
 
 def test_command_panel_keeps_dynamic_status_below_panel(tmp_path):
     status = SimpleNamespace(
-        provider="mimo-token-plan",
         model="mimo-v2.5-pro",
         workspace=str(tmp_path),
         reasoning_effort="xhigh",
-        permission_label=lambda: "accept edits",
         sandbox_label=lambda: "w-write",
         approval_label=lambda: "ask",
         interaction_mode=lambda: "auto",
         debug=lambda: True,
-        plan_mode=lambda: False,
     )
     tui = PureTui(status, [("/model", "Switch model"), ("/model new", "Create profile")])
     tui._input_lines = ["/model"]
@@ -209,7 +206,7 @@ def test_command_panel_keeps_dynamic_status_below_panel(tmp_path):
 
     lines = _render_lines(tui)
     panel_index = next(i for i, line in enumerate(lines) if "/model new" in line)
-    status_index = next(i for i, line in enumerate(lines) if "mimo-token-plan/mimo-v2.5-pro" in line)
+    status_index = next(i for i, line in enumerate(lines) if "mimo-v2.5-pro" in line)
 
     assert panel_index < status_index
     assert "↑↓ select" not in lines[status_index]
@@ -219,7 +216,6 @@ def test_command_panel_keeps_dynamic_status_below_panel(tmp_path):
 
 def test_pinned_todo_renders_above_input_and_status(tmp_path):
     status = SimpleNamespace(
-        provider="mimo",
         model="mimo-v2.5",
         workspace=str(tmp_path),
     )
@@ -247,7 +243,7 @@ def test_pinned_todo_renders_above_input_and_status(tmp_path):
     transcript_index = next(i for i, line in enumerate(lines) if "transcript line" in line)
     todo_index = next(i for i, line in enumerate(lines) if "Todo: 0/2 done" in line)
     input_index = next(i for i, line in enumerate(lines) if line.strip() == "❯ hello")
-    status_index = next(i for i, line in enumerate(lines) if "mimo/mimo-v2.5" in line)
+    status_index = next(i for i, line in enumerate(lines) if "mimo-v2.5" in line)
     assert transcript_index < todo_index < input_index < status_index
 
 

{voidx_cli-3.5.2 → voidx_cli-3.6.0}/voidx_cli/__init__.py

@@ -2,5 +2,5 @@ from .app import PureTui, _dump_transcript_log
 from .helpers import _ENTER_TERMINAL_SEQUENCE, _EXIT_TERMINAL_SEQUENCE, _rendered_row_count
 
 
-__version__ = "3.5.2"
+__version__ = "3.6.0"
 __all__ = ["PureTui"]

{voidx_cli-3.5.2 → voidx_cli-3.6.0}/voidx_cli/overlays.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from voidx.ui.output.dock import active_permission_request_detail_text
+
 from .helpers import _candidate_meta, _escape_markup
 
 
@@ -40,13 +42,14 @@ class _OverlayRendererMixin:
         remaining = total - start - len(visible)
         if remaining > 0:
             result.append(f"  [dim]... {remaining} below[/dim]")
-        for detail in self._choice_details[:8]:
-            name = _escape_markup(str(detail.get("name", "")))
-            pattern = _escape_markup(str(detail.get("pattern", "")))
-            if pattern:
-                result.append(f"    [dim]{name}: {pattern}[/dim]")
-            elif name:
-                result.append(f"    [dim]{name}[/dim]")
+        if not active_permission_request_detail_text():
+            for detail in self._choice_details[:8]:
+                name = _escape_markup(str(detail.get("name", "")))
+                pattern = _escape_markup(str(detail.get("pattern", "")))
+                if pattern:
+                    result.append(f"    [dim]{name}: {pattern}[/dim]")
+                elif name:
+                    result.append(f"    [dim]{name}[/dim]")
         return result
 
     def _render_panel_lines(self, width: int) -> list[str]:

{voidx_cli-3.5.2 → voidx_cli-3.6.0}/voidx_cli/render_status.py

@@ -34,18 +34,11 @@ _STATUS_STYLES = {
     "goal": "#C698F0",
     "separator": "#4B5563",
 }
-_STATUS_VARIANTS = (
-    ("model", "policy", "state", "workflow", "usage", "goal"),
-    ("model", "policy", "state", "workflow", "usage"),
-    ("model", "policy", "state", "workflow", "goal"),
-    ("model", "policy", "state", "usage", "goal"),
-    ("model", "policy", "workflow", "usage", "goal"),
-    ("model", "policy", "state", "workflow"),
-    ("model", "policy", "usage", "goal"),
-    ("model", "policy", "usage"),
-    ("model", "policy", "goal"),
+_LEFT_VARIANTS = (
+    ("model", "policy", "state"),
     ("model", "policy"),
     ("model",),
+    (),
 )
 
 _WORKFLOW_RAINBOW = ("#FF6B6B", "#FFD93D", "#6BCB77", "#4D96FF", "#B983FF")
@@ -89,19 +82,14 @@ class _StatusRendererMixin:
         return self._status_text_from_segments(summary, selected)
 
     def _status_segments(self, *, include_busy: bool) -> tuple[tuple, tuple[StatusSegment, ...]]:
-        provider = _safe_status_value(getattr(self.status, "provider", ""), "")
         model = _safe_status_value(getattr(self.status, "model", ""), "")
         effort = _safe_status_value(getattr(self.status, "reasoning_effort", ""), "")
-        permission = _call_status(getattr(self.status, "permission_label", None), "")
         sandbox = _call_status(getattr(self.status, "sandbox_label", None), "")
         approval = _call_status(getattr(self.status, "approval_label", None), "")
         reviewer = _call_status(getattr(self.status, "approval_reviewer_label", None), "")
         mode = _call_status(getattr(self.status, "interaction_mode", None), "")
-        plan = _call_bool(getattr(self.status, "plan_mode", None))
         debug = _call_bool(getattr(self.status, "debug", None))
         goal_label = _call_status(getattr(self.status, "goal_label", None), "")
-        goal_type = _call_status(getattr(self.status, "goal_type", None), "")
-        goal_awaiting = _call_bool(getattr(self.status, "goal_awaiting_approval", None))
         active_workflows = _call_workflows(getattr(self.status, "active_workflows", None))
         stats = getattr(self.status, "usage_stats", None)
         context_limit = getattr(stats, "context_limit", None) or getattr(self.status, "context_limit", 0)
@@ -112,35 +100,30 @@ class _StatusRendererMixin:
             getattr(stats, "cache_hit_rate", None) if stats is not None else None,
         )
         snapshot = (
-            provider,
             model,
             effort,
-            permission,
             sandbox,
             approval,
             reviewer,
             mode,
-            plan,
             debug,
             goal_label,
             tuple(active_workflows),
             self._busy,
             stats_snapshot,
         )
-        model_text = "/".join(part for part in (provider, model) if part)
+        model_text = model
         if effort:
             model_text = f"{model_text} {effort}"
 
-        policy_parts = [part for part in (permission, sandbox, approval) if part]
+        policy_parts = [part for part in (sandbox, approval) if part]
         if reviewer and reviewer != "user":
             policy_parts.append(reviewer)
         policy_text = " ".join(policy_parts)
 
         state_parts = []
-        if mode:
+        if mode and mode != "auto":
             state_parts.append(mode)
-        if plan:
-            state_parts.append("plan")
         if debug:
             state_parts.append("debug")
         state_text = " ".join(state_parts)
@@ -148,10 +131,10 @@ class _StatusRendererMixin:
         usage_text = ""
         if stats is not None:
             usage_text = (
-                f"ctx {format_token_count(getattr(stats, 'context_tokens', 0))}/"
+                f"{format_token_count(getattr(stats, 'context_tokens', 0))}/"
                 f"{format_token_count(context_limit)}"
-                f" cache {format_cache_hit_rate(stats)}"
-                f" total {format_token_count(getattr(stats, 'total_tokens', 0))}"
+                f" {format_cache_hit_rate(stats)}"
+                f" {format_token_count(getattr(stats, 'total_tokens', 0))}"
             )
 
         goal_text = ""
@@ -185,8 +168,17 @@ class _StatusRendererMixin:
     ) -> tuple[str, tuple[StatusSegment, ...]]:
         by_kind = {segment.kind: segment for segment in segments}
         prefix_segments = (prefix,) if prefix is not None and prefix.text else ()
+        usage = by_kind.get("usage")
+        if usage is not None and prefix is None:
+            return self._select_pinned_usage_status_variant(width, by_kind, usage)
 
-        for variant in _STATUS_VARIANTS:
+        for variant in _LEFT_VARIANTS + (
+            ("model", "policy", "state", "workflow", "goal"),
+            ("model", "policy", "workflow", "goal"),
+            ("model", "policy", "state", "workflow"),
+            ("model", "policy", "workflow"),
+            ("model", "policy", "goal"),
+        ):
             selected = tuple(
                 by_kind[kind]
                 for kind in variant
@@ -207,10 +199,66 @@ class _StatusRendererMixin:
         summary = _clip_cells(self._status_summary_from_segments(fallback), width)
         return summary, ()
 
+    def _select_pinned_usage_status_variant(
+        self,
+        width: int,
+        by_kind: dict[str, StatusSegment],
+        usage: StatusSegment,
+    ) -> tuple[str, tuple[StatusSegment, ...]]:
+        usage_text = usage.text
+        usage_width = cell_len(usage_text)
+        if width <= 0:
+            return "", ()
+        if usage_width >= width:
+            return _clip_cells(usage_text, width), ()
+
+        for left_variant in _LEFT_VARIANTS:
+            left = tuple(
+                by_kind[kind]
+                for kind in left_variant
+                if kind in by_kind
+            )
+            middle = tuple(
+                by_kind[kind]
+                for kind in ("workflow", "goal")
+                if kind in by_kind
+            )
+            summary = self._pinned_usage_summary(width, left, middle, usage_text)
+            if summary:
+                selected = left + middle + (usage,)
+                return summary, selected
+
+        return usage_text.rjust(width), (usage,)
+
     @staticmethod
     def _status_summary_from_segments(segments: tuple[StatusSegment, ...]) -> str:
         return "  " + " | ".join(segment.text for segment in segments if segment.text)
 
+    def _pinned_usage_summary(
+        self,
+        width: int,
+        left: tuple[StatusSegment, ...],
+        middle: tuple[StatusSegment, ...],
+        usage_text: str,
+    ) -> str:
+        left_text = self._status_summary_from_segments(left) if left else ""
+        middle_text = " | ".join(segment.text for segment in middle if segment.text)
+        usage_width = cell_len(usage_text)
+        gap = 2
+        if left_text and cell_len(left_text) + gap + usage_width > width:
+            return ""
+        middle_separator = " | " if left_text and middle_text else ""
+        base_width = cell_len(left_text) + cell_len(middle_separator) + gap + usage_width
+        available_middle_width = max(0, width - base_width)
+        clipped_middle = _clip_cells(middle_text, available_middle_width) if middle_text else ""
+        left_and_middle = left_text
+        if clipped_middle:
+            left_and_middle = f"{left_and_middle}{middle_separator}{clipped_middle}" if left_and_middle else f"  {clipped_middle}"
+        padding = width - cell_len(left_and_middle) - usage_width
+        if padding < gap:
+            return ""
+        return left_and_middle + (" " * padding) + usage_text
+
     def _status_text_from_segments(
         self,
         summary: str,
@@ -221,7 +269,8 @@ class _StatusRendererMixin:
         if not segments:
             return Text(summary, style="#8F9BA8")
         if summary != self._status_summary_from_segments(segments):
-            return Text(summary, style="#8F9BA8")
+            pinned = self._pinned_usage_text_from_segments(summary, segments)
+            return pinned if pinned is not None else Text(summary, style="#8F9BA8")
         text = Text("  ")
         appended = False
         for segment in segments:
@@ -236,6 +285,44 @@ class _StatusRendererMixin:
             appended = True
         return text
 
+    def _pinned_usage_text_from_segments(
+        self,
+        summary: str,
+        segments: tuple[StatusSegment, ...],
+    ) -> Text | None:
+        usage = next((segment for segment in segments if segment.kind == "usage"), None)
+        if usage is None or not summary.endswith(usage.text):
+            return None
+
+        text = Text()
+        cursor = 0
+        for segment in segments:
+            if segment.kind == "usage":
+                continue
+            start = summary.find(segment.text, cursor)
+            if start < 0:
+                continue
+            if start > cursor:
+                text.append(summary[cursor:start], style=_STATUS_STYLES["separator"])
+            if segment.kind == "workflow":
+                _append_rainbow(text, segment.text)
+            else:
+                text.append(segment.text, style=_STATUS_STYLES.get(segment.kind, "#8F9BA8"))
+            cursor = start + len(segment.text)
+
+        usage_start = len(summary) - len(usage.text)
+        if usage_start > cursor:
+            middle = summary[cursor:usage_start]
+            goal = next((segment for segment in segments if segment.kind == "goal"), None)
+            if goal is not None and "…" in middle:
+                ellipsis_index = middle.index("…")
+                text.append(middle[:ellipsis_index], style=_STATUS_STYLES["separator"])
+                text.append(middle[ellipsis_index:], style=_STATUS_STYLES["goal"])
+            else:
+                text.append(middle, style=_STATUS_STYLES["separator"])
+        text.append(usage.text, style=_STATUS_STYLES["usage"])
+        return text
+
 
 def _append_rainbow(text: Text, value: str) -> None:
     color_index = 0

{voidx_cli-3.5.2 → voidx_cli-3.6.0}/voidx_cli.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: voidx-cli
-Version: 3.5.2
+Version: 3.6.0
 Summary: CLI / terminal UI frontend for voidx.
 Author: chikhamx
 License: MIT
 Requires-Python: >=3.11
-Requires-Dist: voidx==3.5.2
+Requires-Dist: voidx==3.6.0
 Requires-Dist: rich>=13.9.0

{voidx_cli-3.5.2 → voidx_cli-3.6.0}/voidx_cli.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ tests/test_paste_handling.py
 tests/test_startup.py
 tests/test_status_activity.py
 tests/test_status_layout.py
+tests/test_status_simplify.py
 tests/test_terminal_input.py
 tests/test_terminal_panels.py
 tests/test_win32_paste_drain_integration.py

{voidx_cli-3.5.2 → voidx_cli-3.6.0}/voidx_cli.egg-info/requires.txt

@@ -1,2 +1,2 @@
-voidx==3.5.2
+voidx==3.6.0
 rich>=13.9.0

voidx_cli-3.6.0/voidx_cli.egg-info/top_level.txt

@@ -0,0 +1 @@
+voidx_cli

voidx_cli-3.5.2/voidx_cli.egg-info/top_level.txt

@@ -1,4 +0,0 @@
-build
-dist
-tests
-voidx_cli