soothe-cli 1.0.5__tar.gz → 1.0.7__tar.gz

{soothe_cli-1.0.5 → soothe_cli-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: soothe-cli
-Version: 1.0.5
+Version: 1.0.7
 Summary: Soothe CLI client - communicates with daemon via WebSocket
 Project-URL: Homepage, https://github.com/mirasoth/soothe
 Project-URL: Documentation, https://soothe.readthedocs.io

soothe_cli-1.0.7/src/soothe_cli/display/card.py

@@ -0,0 +1,158 @@
+"""Card prefix glyph, header assembly, and body gutter alignment shared by TUI card widgets.
+
+These helpers encode card *appearance* (prefix tone, glyph prefix, gutter
+alignment, header assembly). They are intentionally free of Textual widget
+lifecycle concerns; refresh throttling and animation visibility stay in the
+TUI layer (``tui/widgets/messages/_helpers.py``).
+"""
+
+from __future__ import annotations
+
+from textual.content import Content
+
+from soothe_cli.display import theme
+from soothe_cli.display.preview_limits import STEP_TASK_CARD_COLLAPSE_LINE_THRESHOLD
+from soothe_cli.display.tool_display import display_width
+from soothe_cli.settings import get_glyphs
+
+# Preview limits imported from preview_limits module
+_STEP_TOOL_PREVIEW_ROWS = STEP_TASK_CARD_COLLAPSE_LINE_THRESHOLD
+"""Collapsed step/task activity preview shows this many rows."""
+
+
+def _card_dot_tone(
+    status: str,
+    colors: theme.ThemeColors,
+    *,
+    accent: str | None = None,
+    spinner_position: int = 0,
+    animate_running: bool = False,
+) -> str:
+    """Return a Textual style string for a card prefix dot from lifecycle status."""
+    phase = (status or "pending").strip().lower()
+    if phase in ("success", "done", "completed"):
+        return colors.card_success
+    if phase in ("error", "failed", "interrupted"):
+        return colors.card_error
+    if phase == "running":
+        # Yellow flash on every other spinner tick; dim amber in between.
+        if animate_running and spinner_position % 2:
+            return colors.card_running_muted
+        return colors.card_running
+    if phase in ("queued", "pending", "continue", "replan"):
+        return colors.muted
+    if accent:
+        return accent
+    return colors.muted
+
+
+def _card_dot_prefix_content(
+    widget: object,
+    status: str,
+    *,
+    accent: str | None = None,
+    glyph_override: str | None = None,
+    spinner_position: int = 0,
+    animate_running: bool = False,
+) -> Content:
+    """Build a stateful colored card-prefix glyph."""
+    try:
+        colors = theme.get_theme_colors(widget)
+    except Exception:  # noqa: BLE001
+        colors = theme.DARK_COLORS
+    glyph = glyph_override or get_glyphs().tool_prefix
+    tone = _card_dot_tone(
+        status,
+        colors,
+        accent=accent,
+        spinner_position=spinner_position,
+        animate_running=animate_running,
+    )
+    return Content.styled(f"{glyph} ", tone)
+
+
+def _card_prefix_width(glyph_override: str | None = None) -> int:
+    """Display width of the card header prefix (the dot/glyph plus one space).
+
+    Every body line and tree-branch line must left-align at the right side of
+    this prefix, so card content never extends left of the header text. In
+    ASCII mode the prefix is ``"[*] "`` (4 cols) while the tree gutter glyph
+    ``"L"`` is only 1 col; the body gutter is padded to close that gap.
+    """
+    glyph = glyph_override or get_glyphs().tool_prefix
+    return display_width(glyph) + 1  # +1 for the trailing space
+
+
+def _card_body_gutter(glyph_override: str | None = None) -> str:
+    """Body/tree-branch gutter aligned to the right of the card prefix dot.
+
+    The tree glyph (``⎿`` / ``L``) stays at the left edge of the prefix column;
+    trailing spaces pad the gutter so its display width equals the header
+    prefix width (``glyph + " "``). That makes every card line and tree branch
+    start at the right side of the dot space.
+    """
+    g = get_glyphs()
+    prefix_width = _card_prefix_width(glyph_override)
+    glyph_w = display_width(g.output_prefix)
+    pad = max(0, prefix_width - glyph_w)
+    return f"{g.output_prefix}{' ' * pad}"
+
+
+def _card_item_indent(
+    extra_indent: int = 0,
+    *,
+    glyph_override: str | None = None,
+) -> str:
+    """Plain-space indent for activity item rows (no tree glyph).
+
+    Item rows under a section (tool rows, todo items, notes, "+N more") sit at
+    the card header prefix width plus ``extra_indent`` columns — aligned with
+    the right side of the dot space so they never extend left of the title
+    text, and indented under the section's ``⎿`` label.
+    """
+    prefix_width = _card_prefix_width(glyph_override)
+    return f"{' ' * max(0, prefix_width + extra_indent)}"
+
+
+def _assemble_card_header(
+    widget: object,
+    body_part: str,
+    *,
+    status: str = "running",
+    accent: str | None = None,
+    glyph_override: str | None = None,
+    spinner_position: int = 0,
+    animate_running: bool = False,
+) -> Content:
+    """Build a card title: stateful prefix glyph plus foreground body (no bold).
+
+    Used for Goal, Plan, Step, and tool (including Task) headers. The glyph color
+    reflects lifecycle status; body lines below use the tree gutter returned by
+    :func:`_card_body_gutter`, which aligns to the right of the card prefix dot.
+
+    Args:
+        widget: Mounted widget (or any object accepted by ``get_theme_colors``).
+        body_part: Header text (goal, step description, etc.).
+        status: Card lifecycle phase for glyph color/shape.
+        accent: Optional override tone for the glyph (e.g. skill/error accent).
+        spinner_position: Toggles gray flash while ``animate_running`` is true.
+        animate_running: Flash the glyph gray while running (step/task/assistant cards).
+
+    Returns:
+        Assembled ``Content`` for a ``Static`` header.
+    """
+    try:
+        colors = theme.get_theme_colors(widget)
+    except Exception:  # noqa: BLE001
+        colors = theme.DARK_COLORS
+    return Content.assemble(
+        _card_dot_prefix_content(
+            widget,
+            status,
+            accent=accent,
+            glyph_override=glyph_override,
+            spinner_position=spinner_position,
+            animate_running=animate_running,
+        ),
+        Content.styled(body_part, colors.foreground),
+    )

{soothe_cli-1.0.5 → soothe_cli-1.0.7}/src/soothe_cli/tui/app/_clarification.py

@@ -7,19 +7,16 @@ keep the execution mixin focused on agent execution and message routing.
 from __future__ import annotations
 
 _PLAN_REVIEW_ACTIONS = frozenset({"Approve", "Reject", "Refine"})
-_TOOL_APPROVAL_ACTIONS = frozenset({"Approve", "Reject", "Edit"})
+_TOOL_APPROVAL_ACTIONS = frozenset({"Approve", "Reject"})
 
 
 def clarification_wire_content(answers: list[str], *, origin_node: str = "") -> str:
     """Human-readable turn content for a clarification submit (not a new goal).
 
-    Option-selector actions use a stable `<prefix>: …` header so a dropped
-    `clarification_answer` flag cannot turn a bare action into Pass1 TASK.
-    Plan review → `Plan review:` (Refine carries refinement text in
-    `answers[1]`). Tool approval → `Tool approval:` (Edit carries revised
-    instructions in `answers[1]`). When `origin_node` is empty (legacy
-    callers) the action label alone selects the prefix, preserving the safety
-    net for any selector-origin submit.
+    Option-selector actions use a stable ``<prefix>: …`` header so a dropped
+    ``clarification_answer`` flag cannot turn a bare action into Pass1 TASK.
+    Plan review → ``Plan review:`` (Refine carries refinement text in
+    ``answers[1]``). Tool approval → ``Tool approval:``.
     """
     non_empty = [a for a in answers if str(a).strip()]
     if not non_empty:

{soothe_cli-1.0.5 → soothe_cli-1.0.7}/src/soothe_cli/tui/app/_messages_mixin.py

@@ -1159,11 +1159,15 @@ class _MessagesMixin:
     def cycle_composer_mode(self) -> None:
         """Advance composer mode and refresh the status-bar badge.
 
-        Cycle: Auto → Bypass → Manual → Plan → Ask → Auto. When a goal is
-        running and the new mode is Auto or Manual, hot-swaps the daemon's
-        live clarification policy via `loop_set_clarification_mode`.
+        Cycle: Auto → Bypass → Manual → Plan → Ask → Auto. For agent sub-modes
+        (auto/bypass/manual) hot-swap the running goal's agent mode via
+        `loop_set_clarification_mode`; Plan/Ask take effect on the next turn.
         """
-        from soothe_cli.tui.composer_mode import next_composer_mode
+        from soothe_cli.tui.composer_mode import (
+            AGENT_SUB_MODES,
+            next_composer_mode,
+            resolve_composer_wire_fields,
+        )
 
         current = getattr(self, "_composer_mode", "auto")
         new_mode = next_composer_mode(current)
@@ -1171,13 +1175,21 @@ class _MessagesMixin:
         if self._status_bar is not None:
             self._status_bar.set_clarification_mode(new_mode)
 
-        # Hot-swap the running goal's clarification policy when applicable.
-        # Plan/Ask modes don't carry a clarification_mode wire field, so skip
-        # them — they only take effect on the next turn dispatch.
-        if new_mode in ("auto", "manual"):
-            self._push_clarification_mode_to_running_loop(new_mode)
+        # Bypass carries an `interaction_mode` wire field; Plan/Ask stay
+        # next-turn-only.
+        if new_mode in AGENT_SUB_MODES:
+            wire = resolve_composer_wire_fields(new_mode)
+            self._push_clarification_mode_to_running_loop(
+                wire.clarification_mode,
+                interaction_mode=wire.interaction_mode,
+            )
 
-    def _push_clarification_mode_to_running_loop(self, mode: str) -> None:
+    def _push_clarification_mode_to_running_loop(
+        self,
+        mode: str,
+        *,
+        interaction_mode: str | None = None,
+    ) -> None:
         """Best-effort hot-swap RPC; failures are silent (next turn still works)."""
         import asyncio
 
@@ -1190,11 +1202,16 @@ class _MessagesMixin:
 
         async def _push() -> None:
             try:
-                await session.set_clarification_mode(mode)
+                await session.set_clarification_mode(
+                    mode,
+                    interaction_mode=interaction_mode,
+                )
             except Exception:
                 logger.debug(
-                    "set_clarification_mode RPC failed (mode=%s); will apply on next turn",
+                    "set_clarification_mode RPC failed (mode=%s, interaction_mode=%s); "
+                    "will apply on next turn",
                     mode,
+                    interaction_mode,
                     exc_info=True,
                 )
 

{soothe_cli-1.0.5 → soothe_cli-1.0.7}/src/soothe_cli/tui/widgets/file_change_preview.py

@@ -11,6 +11,7 @@ from textual.events import Click
 from textual.widgets import Static
 
 from soothe_cli.display import theme
+from soothe_cli.display.card import _assemble_card_header
 from soothe_cli.display.preview_limits import (
     TOOL_APPROVAL_BODY_MAX_LINES,
     TOOL_APPROVAL_DIFF_WIDGET_MAX_LINES,
@@ -19,7 +20,6 @@ from soothe_cli.display.preview_limits import (
 from soothe_cli.settings import get_glyphs
 from soothe_cli.tui.widgets.clipboard import screen_has_text_selection
 from soothe_cli.tui.widgets.diff import DIFF_CODE_GAP, compose_diff_line_list
-from soothe_cli.tui.widgets.messages._helpers import _assemble_card_header
 
 if TYPE_CHECKING:
     from textual.app import ComposeResult

{soothe_cli-1.0.5 → soothe_cli-1.0.7}/src/soothe_cli/tui/widgets/messages/__init__.py

@@ -1,11 +1,6 @@
 """Message widgets for Soothe TUI."""
 
 from soothe_cli.tui.widgets.messages._helpers import (
-    _assemble_card_header,
-    _is_widget_animation_visible,
-    _mode_color,
-    _should_refresh_now,
-    _strip_success_exit_line,
     flush_deferred_tools_refreshes,
     request_deferred_tools_refresh,
     reset_turn_tool_refresh_state,
@@ -39,11 +34,6 @@ from soothe_cli.tui.widgets.messages.user import (
 
 __all__ = [
     # Helpers
-    "_assemble_card_header",
-    "_is_widget_animation_visible",
-    "_mode_color",
-    "_should_refresh_now",
-    "_strip_success_exit_line",
     "flush_deferred_tools_refreshes",
     "request_deferred_tools_refresh",
     "reset_turn_tool_refresh_state",

soothe_cli-1.0.7/src/soothe_cli/tui/widgets/messages/_helpers.py

@@ -0,0 +1,155 @@
+"""Shared helpers and constants for message widgets."""
+
+from __future__ import annotations
+
+import logging
+import os
+import re
+import weakref
+from time import monotonic
+from typing import Any
+
+from soothe_cli.display import theme
+
+logger = logging.getLogger(__name__)
+
+# TUI refresh throttling - minimum interval between widget refreshes
+_DEFAULT_TUI_REFRESH_INTERVAL_MS = 800
+"""Default minimum interval between TUI refreshes in milliseconds."""
+
+_global_refresh_interval_ms: int | None = None
+
+
+def _get_tui_refresh_interval_ms() -> int:
+    """Get the TUI refresh interval from environment or default.
+
+    Returns:
+    Minimum interval between refreshes in milliseconds.
+    """
+    global _global_refresh_interval_ms
+    if _global_refresh_interval_ms is not None:
+        return _global_refresh_interval_ms
+    from soothe_cli._env_vars import TUI_REFRESH_INTERVAL_MS
+
+    env_val = os.environ.get(TUI_REFRESH_INTERVAL_MS)
+    if env_val:
+        try:
+            parsed = int(env_val.strip())
+            if parsed >= 50:  # Minimum 50ms to prevent UI lockup
+                _global_refresh_interval_ms = parsed
+                return parsed
+        except ValueError:
+            pass
+    _global_refresh_interval_ms = _DEFAULT_TUI_REFRESH_INTERVAL_MS
+    return _DEFAULT_TUI_REFRESH_INTERVAL_MS
+
+
+def _should_refresh_now(last_refresh_time: float | None) -> bool:
+    """Check if enough time has passed since last refresh for throttling.
+
+    Args:
+    last_refresh_time: Monotonic time of last refresh, or None if never refreshed.
+
+    Returns:
+    True if refresh should proceed, False if throttled.
+    """
+    if last_refresh_time is None:
+        return True
+    interval_secs = _get_tui_refresh_interval_ms() / 1000.0
+    return (monotonic() - last_refresh_time) >= interval_secs
+
+
+_RUNNING_SPINNER_INTERVAL_SECONDS = 0.2
+"""Spinner/status animation cadence for running cards."""
+
+# Deferred tool-list refresh (turn-level coalescing + global repaint budget).
+_DEFERRED_TOOL_REFRESH_WIDGETS: weakref.WeakSet[Any] = weakref.WeakSet()
+_global_tools_list_refresh_at: float = 0.0
+
+
+def reset_turn_tool_refresh_state() -> None:
+    """Clear deferred refresh registry at the start of a new agent turn."""
+    global _global_tools_list_refresh_at
+    _global_tools_list_refresh_at = 0.0
+    _DEFERRED_TOOL_REFRESH_WIDGETS.clear()
+
+
+def request_deferred_tools_refresh(widget: Any) -> None:
+    """Queue a card for batched tool-list repaint."""
+    _DEFERRED_TOOL_REFRESH_WIDGETS.add(widget)
+
+
+def flush_deferred_tools_refreshes(*, force: bool = False) -> None:
+    """Repaint queued tool cards (global budget unless `force`)."""
+    global _global_tools_list_refresh_at
+    pending = list(_DEFERRED_TOOL_REFRESH_WIDGETS)
+    if not pending:
+        return
+    now = monotonic()
+    if not force:
+        interval = _get_tui_refresh_interval_ms() / 1000.0
+        if now - _global_tools_list_refresh_at < interval:
+            return
+    _global_tools_list_refresh_at = now
+    _DEFERRED_TOOL_REFRESH_WIDGETS.clear()
+    for widget in pending:
+        flush_fn = getattr(widget, "_flush_deferred_tools_refresh", None)
+        if callable(flush_fn):
+            flush_fn()
+
+
+def _is_widget_animation_visible(widget: object) -> bool:
+    """Return whether a widget is currently visible on screen.
+
+    This is used to skip animation work for off-screen cards.
+    """
+    try:
+        if not getattr(widget, "is_attached", False):
+            return False
+        if not getattr(widget, "visible", True):
+            return False
+        is_on_screen = getattr(widget, "is_on_screen", True)
+        if callable(is_on_screen):
+            return bool(is_on_screen())
+        return bool(is_on_screen)
+    except Exception:
+        return False
+
+
+def _mode_color(mode: str | None, widget_or_app: object | None = None) -> str:
+    """Return the hex color string for a mode, falling back to primary.
+
+    Args:
+    mode: Mode name (e.g. `'shell'`, `'command'`) or `None`.
+    widget_or_app: Textual widget or `App` for theme-aware lookup.
+
+    Returns:
+    Color string from the active theme's `ThemeColors`.
+    """
+    colors = theme.get_theme_colors(widget_or_app)
+    if not mode:
+        return colors.primary
+    if mode == "shell":
+        return colors.mode_bash
+    if mode == "command":
+        return colors.mode_command
+    logger.warning("Missing color for mode '%s'; falling back to primary.", mode)
+    return colors.primary
+
+
+_SUCCESS_EXIT_RE = re.compile(r"\n?\[Command succeeded with exit code 0\]\s*$")
+"""Strip the SDK's `[Command succeeded with exit code 0]` trailer from tool output."""
+
+
+def _strip_success_exit_line(text: str) -> str:
+    """Remove the `[Command succeeded with exit code 0]` trailer.
+
+    Non-zero exit codes are left intact (they come through `set_error`).
+
+    Args:
+    text: Raw tool output string.
+
+    Returns:
+    Text with the success exit-code trailer removed, if present.
+    """
+    return _SUCCESS_EXIT_RE.sub("", text)

{soothe_cli-1.0.5 → soothe_cli-1.0.7}/src/soothe_cli/tui/widgets/messages/app.py

@@ -9,9 +9,9 @@ from textual.events import Click
 from textual.widgets import Static
 
 from soothe_cli.display import theme
+from soothe_cli.display.card import _assemble_card_header
 from soothe_cli.tui.widgets._links import open_style_link
 from soothe_cli.tui.widgets.clipboard import screen_has_text_selection
-from soothe_cli.tui.widgets.messages._helpers import _assemble_card_header
 
 
 class AppMessage(Static):

{soothe_cli-1.0.5 → soothe_cli-1.0.7}/src/soothe_cli/tui/widgets/messages/assistant.py

@@ -10,11 +10,9 @@ from textual.selection import Selection
 from textual.strip import Strip
 from textual.widgets import Static
 
+from soothe_cli.display.card import _card_dot_prefix_content
 from soothe_cli.display.markdown_theme import ThemedMarkdownRenderer, resolve_markdown_theme_parts
-from soothe_cli.tui.widgets.messages._helpers import (
-    _RUNNING_SPINNER_INTERVAL_SECONDS,
-    _card_dot_prefix_content,
-)
+from soothe_cli.tui.widgets.messages._helpers import _RUNNING_SPINNER_INTERVAL_SECONDS
 
 if TYPE_CHECKING:
     from textual.app import ComposeResult

{soothe_cli-1.0.5 → soothe_cli-1.0.7}/src/soothe_cli/tui/widgets/messages/cognition_goal_tree.py

@@ -12,6 +12,10 @@ from textual.content import Content
 from textual.widgets import Static
 
 from soothe_cli.display import theme
+from soothe_cli.display.card import (
+    _card_body_gutter,
+    _card_dot_prefix_content,
+)
 from soothe_cli.display.preview_limits import PLAN_QUICK_VIEW_STEP_LINE_MAX_CHARS
 from soothe_cli.runtime.presentation.duration_format import (
     format_duration,
@@ -23,10 +27,6 @@ from soothe_cli.runtime.presentation.step_id_format import (
     numeric_step_prefix,
 )
 from soothe_cli.settings import get_glyphs
-from soothe_cli.tui.widgets.messages._helpers import (
-    _card_body_gutter,
-    _card_dot_prefix_content,
-)
 
 if TYPE_CHECKING:
     from textual.app import ComposeResult

{soothe_cli-1.0.5 → soothe_cli-1.0.7}/src/soothe_cli/tui/widgets/messages/cognition_reason.py

@@ -8,7 +8,7 @@ from textual.containers import Vertical
 from textual.content import Content
 from textual.widgets import Static
 
-from soothe_cli.tui.widgets.messages._helpers import _assemble_card_header
+from soothe_cli.display.card import _assemble_card_header
 
 if TYPE_CHECKING:
     from textual.app import ComposeResult

{soothe_cli-1.0.5 → soothe_cli-1.0.7}/src/soothe_cli/tui/widgets/messages/cognition_step.py

@@ -19,6 +19,11 @@ from textual.events import Click
 from textual.widgets import Static
 
 from soothe_cli.display import theme
+from soothe_cli.display.card import (
+    _STEP_TOOL_PREVIEW_ROWS,
+    _assemble_card_header,
+    _card_body_gutter,
+)
 from soothe_cli.display.preview_limits import STEP_CARD_SHOW_TOOL_ROW_DETAILS
 from soothe_cli.display.tool_display import (
     display_width,
@@ -31,9 +36,6 @@ from soothe_cli.tui.widgets.clipboard import (
 )
 from soothe_cli.tui.widgets.messages._helpers import (
     _RUNNING_SPINNER_INTERVAL_SECONDS,
-    _STEP_TOOL_PREVIEW_ROWS,
-    _assemble_card_header,
-    _card_body_gutter,
     _is_widget_animation_visible,
     _should_refresh_now,
     _strip_success_exit_line,
@@ -645,7 +647,7 @@ class CognitionStepMessage(Vertical):
         return max(0, width - 2)
 
     def _step_task_activity_content(self) -> Content:
-        """To-do then Tool-use (task markers, tool preview, notes) under the step title."""
+        """Tool-use then To-do (task markers, tool preview, notes) under the step title."""
         g = get_glyphs()
         try:
             colors = theme.get_theme_colors(self)
@@ -1643,7 +1645,7 @@ def create_subagent_card(
     """Create an intake-only orphan SubAgent card (shared step-card style path).
 
     In-step `task` delegations stay on the parent step card. This factory only
-    sets orphan fields (`_subagent_type`, etc.); header meta, To-do / Tool-use
+    sets orphan fields (`_subagent_type`, etc.); header meta, Tool-use / To-do
     activity, and footers use the same `CognitionStepMessage` methods.
 
     Args:

{soothe_cli-1.0.5 → soothe_cli-1.0.7}/src/soothe_cli/tui/widgets/messages/cognition_step_activity.py

@@ -17,6 +17,10 @@ from textual.content import Content
 
 from soothe_cli.commands.subagent_routing import get_subagent_display_name
 from soothe_cli.display import theme
+from soothe_cli.display.card import (
+    _card_body_gutter,
+    _card_item_indent,
+)
 from soothe_cli.display.preview_limits import (
     STEP_CARD_TOOL_ACTIVITY_PREVIEW_COUNT,
     TASK_DELEGATION_DESC_MAX_CHARS,
@@ -27,10 +31,6 @@ from soothe_cli.display.tool_display import (
     format_step_tool_activity_line,
 )
 from soothe_cli.runtime.presentation.duration_format import format_running_elapsed_compact
-from soothe_cli.tui.widgets.messages._helpers import (
-    _card_body_gutter,
-    _card_item_indent,
-)
 
 # Todo item status → phase_icon input.
 _TODO_STATUS_TO_PHASE: dict[str, str] = {
@@ -663,7 +663,7 @@ class StepCardStatusLine:
 
 
 class StepActivityTree:
-    """Pure render: To-do + Tool-use sections under the step title.
+    """Pure render: Tool-use + To-do sections under the step title.
 
     Task rows are flat markers under Tool-use. While a task is running, the marker
     line shows that task's subgraph tool count. Nested child tool lines are not
@@ -686,14 +686,14 @@ class StepActivityTree:
         max_cols: int | None = None,
         glyph_override: str | None = None,
     ) -> Content:
-        """To-do section then Tool-use section (task markers + main tool preview).
+        """Tool-use section then To-do section (task markers + main tool preview).
 
         `max_cols` bounds each rendered line to the terminal width so tool
         rows never wrap; `None` preserves the prior fixed-cap behavior.
         `glyph_override` is the card header glyph (subagent glyph for orphan
         SubAgent cards) so the activity gutters align to the right of that dot.
 
-        Layout: the section header (`To-do` / `Tool-use`) sits on a `⎿`
+        Layout: the section header (`Tool-use` / `To-do`) sits on a `⎿`
         body-gutter line; its items (tool rows, todo markers, notes, `+N
         more`) are indented one column beyond the section label so they nest
         under the header without a tree glyph.
@@ -715,29 +715,7 @@ class StepActivityTree:
             return Content("")
 
         first_block = True
-        if todo_items:
-            first_block = False
-            parts.append(Content.styled(f"{section_gutter}To-do", theme.SECONDARY_TEXT_STYLE))
-            for item in todo_items:
-                content = str(item.get("content") or "").strip()
-                if not content:
-                    continue
-                status = str(item.get("status") or "pending")
-                phase = todo_status_phase(status)
-                animate = phase == "running" and step_status == "running"
-                icon = phase_icon(
-                    phase,
-                    g,
-                    spinner_position=spinner_position,
-                    animate_running=animate,
-                )
-                tone = task_tool_row_tone_for_phase(phase, colors)
-                parts.append("\n")
-                parts.append(Content.styled(f"{item_gutter}{icon} {content}", tone))
-
         if has_tools:
-            if not first_block:
-                parts.append("\n")
             first_block = False
             parts.append(Content.styled(f"{section_gutter}Tool-use", theme.SECONDARY_TEXT_STYLE))
 
@@ -806,4 +784,26 @@ class StepActivityTree:
                 parts.append("\n")
                 parts.append(Content.styled(f"{item_gutter}· {t}", theme.SECONDARY_TEXT_STYLE))
 
+        if todo_items:
+            if not first_block:
+                parts.append("\n")
+            first_block = False
+            parts.append(Content.styled(f"{section_gutter}To-do", theme.SECONDARY_TEXT_STYLE))
+            for item in todo_items:
+                content = str(item.get("content") or "").strip()
+                if not content:
+                    continue
+                status = str(item.get("status") or "pending")
+                phase = todo_status_phase(status)
+                animate = phase == "running" and step_status == "running"
+                icon = phase_icon(
+                    phase,
+                    g,
+                    spinner_position=spinner_position,
+                    animate_running=animate,
+                )
+                tone = task_tool_row_tone_for_phase(phase, colors)
+                parts.append("\n")
+                parts.append(Content.styled(f"{item_gutter}{icon} {content}", tone))
+
         return Content.assemble(*parts) if parts else Content("")

{soothe_cli-1.0.5 → soothe_cli-1.0.7}/src/soothe_cli/tui/widgets/messages/error.py

@@ -8,7 +8,7 @@ from textual.content import Content
 from textual.widgets import Static
 
 from soothe_cli.display import theme
-from soothe_cli.tui.widgets.messages._helpers import _assemble_card_header
+from soothe_cli.display.card import _assemble_card_header
 
 
 class ErrorMessage(Static):