soothe-cli 0.7.4__tar.gz → 0.7.6__tar.gz

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/.gitignore

@@ -1,3 +1,9 @@
+# Jekyll / GitHub Pages local build output
+_site/
+.sass-cache/
+.jekyll-cache/
+.jekyll-metadata
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[codz]

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soothe-cli
-Version: 0.7.4
+Version: 0.7.6
 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-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/runtime/state/file_tracker.py

@@ -8,17 +8,27 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, Literal
 
+from soothe_sdk.tools.metadata import get_file_write_tool_names
+
 from soothe_cli.tui.preview_limits import APPROVAL_DIFF_MAX_LINES
 
 logger = logging.getLogger(__name__)
 
 FileOpStatus = Literal["pending", "success", "error"]
 
-FILE_CHANGE_TOOLS: frozenset[str] = frozenset(
-    {"write_file", "edit_file", "edit_file_lines", "delete_file"}
-)
+FILE_CHANGE_TOOLS: frozenset[str] = get_file_write_tool_names()
 """Filesystem tools that produce before/after diffs in the TUI chat."""
 
+_FILE_CHANGE_PREVIEW_LABELS: dict[str, str] = {
+    "write_file": "Writing",
+    "edit_file": "Editing",
+    "edit_file_lines": "Editing",
+    "insert_lines": "Inserting",
+    "delete_lines": "Deleting",
+    "apply_diff": "Patching",
+    "delete_file": "Deleting",
+}
+
 
 def _safe_read(path: Path) -> str | None:
     """Read file content, returning None on failure.
@@ -150,6 +160,22 @@ def resolve_physical_path(path_str: str | None, assistant_id: str | None) -> Pat
         return None
 
 
+def parse_insert_line_arg(args: dict[str, Any]) -> int | None:
+    """Parse ``line`` from insert_lines tool args (1-indexed).
+
+    Returns:
+        Line number or None when missing or not an integer.
+    """
+    line = args.get("line")
+    if isinstance(line, bool):
+        return None
+    if isinstance(line, int):
+        return line
+    if isinstance(line, float) and line.is_integer():
+        return int(line)
+    return None
+
+
 def parse_line_range_args(args: dict[str, Any]) -> tuple[int, int] | None:
     """Parse ``start_line`` and ``end_line`` from tool args (1-indexed inclusive).
 
@@ -188,6 +214,26 @@ def extract_line_range_text(content: str, start_line: int, end_line: int) -> str
     return "".join(lines[start_line - 1 : end_line])
 
 
+def apply_insert_lines_to_content(content: str, line: int, insert_content: str) -> str | None:
+    """Insert ``insert_content`` before line ``line`` (matches middleware semantics).
+
+    Returns:
+        Modified file text, or None when ``line`` is out of range for ``content``.
+    """
+    lines = content.splitlines(keepends=True)
+    total = len(lines)
+    if total == 0 and content:
+        lines = [content]
+        total = 1
+    if line < 1 or line > total + 1:
+        return None
+    new_lines = insert_content.splitlines(keepends=True)
+    if new_lines and not new_lines[-1].endswith("\n"):
+        new_lines[-1] += "\n"
+    lines[line - 1 : line - 1] = new_lines
+    return "".join(lines)
+
+
 def apply_edit_file_lines_to_content(
     content: str,
     start_line: int,
@@ -393,14 +439,21 @@ def track_file_operation(
     tracker.start_operation(tool_name, args, tcid)
 
 
+def file_change_preview_label(tool_name: str) -> str:
+    """Short header label for a pending filesystem tool preview."""
+    return _FILE_CHANGE_PREVIEW_LABELS.get(tool_name, "Change")
+
+
 def file_change_action_label(record: FileOperationRecord) -> str:
     """Human-readable label for a completed file operation (chat diff header)."""
     if record.tool_name == "delete_file":
         return "Deleted"
     if record.tool_name == "write_file" and not (record.before_content or ""):
-        return "New file"
+        return "Created"
     if record.tool_name == "write_file":
         return "Written"
-    if record.tool_name in ("edit_file", "edit_file_lines"):
+    if record.tool_name in ("edit_file", "edit_file_lines", "delete_lines", "apply_diff"):
         return "Updated"
+    if record.tool_name == "insert_lines":
+        return "Inserted"
     return "Changed"

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/tui/app/app.tcss

@@ -97,11 +97,6 @@ Screen {
     margin: 0;
 }
 
-.file-change-preview-label {
-    text-style: bold;
-    margin: 0;
-}
-
 .file-change-preview-body {
     color: $text-muted;
     margin: 0;

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/tui/binding.py

@@ -274,7 +274,7 @@ def message_from_widget(widget: Widget) -> MessageData:
     if isinstance(widget, FileChangePreviewWidget):
         path = str(widget.data.get("file_path") or widget.data.get("path") or "")
         summary = f"{widget._action_label}: {path}" if path else widget._action_label
-        return MessageData(type=MessageType.APP, content=summary or "File change", id=widget_id)
+        return MessageData(type=MessageType.APP, content=summary or "Change", id=widget_id)
 
     if isinstance(widget, SummarizationMessage):
         return MessageData(

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/tui/file_change_notify.py

@@ -6,11 +6,13 @@ import asyncio
 import logging
 from typing import TYPE_CHECKING, Any
 
-from soothe_cli.runtime.state.file_tracker import FILE_CHANGE_TOOLS, parse_line_range_args
-from soothe_cli.tui.file_change_renderers import (
-    build_file_change_preview,
+from soothe_cli.runtime.state.file_tracker import (
+    FILE_CHANGE_TOOLS,
     file_change_preview_label,
+    parse_insert_line_arg,
+    parse_line_range_args,
 )
+from soothe_cli.tui.file_change_renderers import build_file_change_preview
 
 if TYPE_CHECKING:
     from soothe_cli.runtime.state.file_tracker import FileOperationRecord
@@ -76,6 +78,12 @@ async def mount_file_change_preview(
         return
     if tool_name == "edit_file_lines" and parse_line_range_args(args) is None:
         return
+    if tool_name == "insert_lines" and parse_insert_line_arg(args) is None:
+        return
+    if tool_name == "delete_lines" and parse_line_range_args(args) is None:
+        return
+    if tool_name == "apply_diff" and not str(args.get("diff") or "").strip():
+        return
 
     built = build_file_change_preview(tool_name, args, assistant_id=assistant_id)
     if built is None:

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/tui/file_change_renderers.py

@@ -7,7 +7,10 @@ from typing import Any
 from soothe_cli.runtime.state.file_tracker import (
     FILE_CHANGE_TOOLS,
     FileOperationRecord,
+    apply_edit_file_lines_to_content,
+    apply_insert_lines_to_content,
     extract_line_range_text,
+    parse_insert_line_arg,
     parse_line_range_args,
     read_physical_file_text,
     resolve_physical_path,
@@ -19,22 +22,11 @@ from soothe_cli.tui.widgets.file_change_preview import (
     EditFilePreviewWidget,
     FileChangePreviewWidget,
     GenericFilePreviewWidget,
+    InsertLinesPreviewWidget,
     WriteFilePreviewWidget,
     unified_diff_body_lines,
 )
 
-_PREVIEW_LABELS: dict[str, str] = {
-    "write_file": "Writing file",
-    "edit_file": "Editing file",
-    "edit_file_lines": "Editing lines",
-    "delete_file": "Deleting file",
-}
-
-
-def file_change_preview_label(tool_name: str) -> str:
-    """Short header label for a pending filesystem tool preview."""
-    return _PREVIEW_LABELS.get(tool_name, "File change")
-
 
 def build_file_change_preview(
     tool_name: str,
@@ -109,6 +101,62 @@ def build_file_change_preview(
             "new_string": new_string,
         }
 
+    if tool_name == "insert_lines":
+        line = parse_insert_line_arg(args)
+        if line is None:
+            return GenericFilePreviewWidget, dict(args)
+        insert_content = str(args.get("content") or "")
+        before = ""
+        physical = resolve_physical_path(path_str, assistant_id)
+        if physical and physical.is_file():
+            before = read_physical_file_text(physical) or ""
+        after_text = apply_insert_lines_to_content(before, line, insert_content) or before
+        return InsertLinesPreviewWidget, {
+            "file_path": path_str,
+            "insert_line": line,
+            "diff_lines": unified_diff_body_lines(before, after_text),
+            "old_string": before,
+            "new_string": after_text,
+        }
+
+    if tool_name == "delete_lines":
+        line_range = parse_line_range_args(args)
+        if line_range is None:
+            return GenericFilePreviewWidget, dict(args)
+        start_line, end_line = line_range
+        before = ""
+        physical = resolve_physical_path(path_str, assistant_id)
+        if physical and physical.is_file():
+            before = read_physical_file_text(physical) or ""
+        old_segment = extract_line_range_text(before, start_line, end_line) if before else ""
+        after_text = (
+            apply_edit_file_lines_to_content(before, start_line, end_line, "") if before else ""
+        )
+        if after_text is None:
+            after_text = before
+        return EditFileLinesPreviewWidget, {
+            "file_path": path_str,
+            "start_line": start_line,
+            "end_line": end_line,
+            "diff_lines": unified_diff_body_lines(before, after_text),
+            "old_string": old_segment,
+            "new_string": "",
+        }
+
+    if tool_name == "apply_diff":
+        diff_text = str(args.get("diff") or "")
+        before = ""
+        physical = resolve_physical_path(path_str, assistant_id)
+        if physical and physical.is_file():
+            before = read_physical_file_text(physical) or ""
+        diff_lines = [ln for ln in diff_text.splitlines() if ln.strip()]
+        return EditFilePreviewWidget, {
+            "file_path": path_str,
+            "diff_lines": diff_lines,
+            "old_string": before,
+            "new_string": "",
+        }
+
     if tool_name == "delete_file":
         content = ""
         physical = resolve_physical_path(path_str, assistant_id)
@@ -161,6 +209,16 @@ def update_preview_data_from_record(data: dict[str, Any], record: FileOperationR
         if line_range is not None:
             data["start_line"], data["end_line"] = line_range
 
+    if record.tool_name == "insert_lines":
+        line = parse_insert_line_arg(record.args)
+        if line is not None:
+            data["insert_line"] = line
+
+    if record.tool_name == "delete_lines":
+        line_range = parse_line_range_args(record.args)
+        if line_range is not None:
+            data["start_line"], data["end_line"] = line_range
+
     if record.diff:
         data["diff_lines"] = record.diff.splitlines()
         data["old_string"] = record.before_content or ""

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/tui/preview_limits.py

@@ -14,8 +14,8 @@ from typing import Final
 # When True, the full nested tool list also renders in `#step-cognition-tools`.
 STEP_CARD_SHOW_TOOL_ROW_DETAILS: Final[bool] = False
 
-# Latest per-tool invocation lines shown per scope (task branch vs main-agent branch).
-STEP_CARD_TOOL_ACTIVITY_PREVIEW_COUNT: Final[int] = 1
+# Latest per-tool invocation lines on step and SubAgent cards (shared activity tree).
+STEP_CARD_TOOL_ACTIVITY_PREVIEW_COUNT: Final[int] = 3
 
 # Optional manual full tool-list folding threshold (not auto-collapse).
 STEP_TASK_CARD_COLLAPSE_LINE_THRESHOLD: Final[int] = 3

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/tui/textual_adapter.py

@@ -290,6 +290,9 @@ class TextualUIAdapter:
         self._execute_wave_completed: int = 0
         """Completed steps in the current execute batch."""
 
+        self._successful_step_ids: set[str] = set()
+        """Step ids that finished successfully this loop (survives plan=keep replays)."""
+
         self._clarification_input_by_step: dict[str, ClarificationInputMessage] = {}
         """Active inline ``ClarificationInputMessage`` widgets keyed by step id.
 
@@ -1426,6 +1429,8 @@ async def sync_pending_step_cards_from_plan(
         sid = str(row.get("id", "")).strip()
         if not sid or sid in adapter._current_step_messages:
             continue
+        if _is_successful_step_id(adapter, sid):
+            continue
         desc = str(row.get("description", "")).strip() or "(step)"
         step_widget = CognitionStepMessage(
             step_id=sid,
@@ -1451,6 +1456,17 @@ def _step_card_lookup_keys(step_id: str) -> list[str]:
     return keys
 
 
+def _register_successful_step_id(adapter: TextualUIAdapter, step_id: str) -> None:
+    """Remember a step that completed successfully so plan=keep does not remount it."""
+    for key in _step_card_lookup_keys(step_id):
+        adapter._successful_step_ids.add(key)
+
+
+def _is_successful_step_id(adapter: TextualUIAdapter, step_id: str) -> bool:
+    """True when this step already succeeded earlier in the current loop."""
+    return any(key in adapter._successful_step_ids for key in _step_card_lookup_keys(step_id))
+
+
 def _lookup_step_card(
     adapter: TextualUIAdapter,
     step_id: str,
@@ -2731,6 +2747,7 @@ async def execute_task_textual(
     router.reset_turn()
     adapter._execute_wave_total = 0
     adapter._execute_wave_completed = 0
+    adapter._successful_step_ids.clear()
     ui_coalesce = TurnToolUiCoalescer()
     adapter._goal_completion_mounted_this_turn = False
     adapter._goal_tree_message = None
@@ -3742,7 +3759,11 @@ async def execute_task_textual(
                                     execution_mode = str(data.get("execution_mode", "")).strip()
                                     adapter._last_plan_execution_mode = execution_mode or None
                                     adapter._execute_wave_total = len(raw_steps)
-                                    adapter._execute_wave_completed = 0
+                                    done_steps = int(data.get("done_steps", 0) or 0)
+                                    adapter._execute_wave_completed = min(
+                                        done_steps,
+                                        len(raw_steps),
+                                    )
                                     await sync_pending_step_cards_from_plan(
                                         adapter,
                                         steps=raw_steps,
@@ -3896,6 +3917,8 @@ async def execute_task_textual(
                                         pending_text_by_namespace[ns_key] = ""
                                         assistant_message_by_namespace.pop(ns_key, None)
                                     success = bool(data.get("success", True))
+                                    if success:
+                                        _register_successful_step_id(adapter, step_id)
                                     duration_ms = int(data.get("duration_ms", 0))
                                     tool_call_count = int(data.get("tool_call_count", 0))
                                     summary = str(

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/tui/theme.py

@@ -38,6 +38,9 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(__name__)
 
+# Rich/Textual style for de-emphasized secondary labels (loop id, tool stats, activity).
+SECONDARY_TEXT_STYLE: str = "dim"
+
 # ---------------------------------------------------------------------------
 # Brand palette — dark  (originally tokyonight-inspired, LangChain blue primary)
 # ---------------------------------------------------------------------------

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/tui/widgets/file_change_preview.py

@@ -110,7 +110,7 @@ class FileChangePreviewWidget(Vertical):
     FileChangePreviewWidget {
         height: auto;
         padding: 0;
-        margin: 0;
+        margin: 0 0 1 0;
     }
 
     FileChangePreviewWidget.-collapsed {
@@ -125,7 +125,6 @@ class FileChangePreviewWidget(Vertical):
 
     FileChangePreviewWidget.-collapsed .file-change-preview-body,
     FileChangePreviewWidget.-collapsed .file-change-preview-section-label,
-    FileChangePreviewWidget.-collapsed .file-change-preview-label,
     FileChangePreviewWidget.-collapsed .diff-line-added,
     FileChangePreviewWidget.-collapsed .diff-line-removed,
     FileChangePreviewWidget.-collapsed .diff-context {
@@ -193,15 +192,6 @@ class FileChangePreviewWidget(Vertical):
         await self.mount(*self.compose())
         self._apply_expand_classes()
 
-    def compose(self) -> ComposeResult:  # noqa: PLR6301
-        """Default compose — subclasses override."""
-        if self._action_label:
-            yield Static(
-                Content.from_markup("[bold]$label[/bold]", label=self._action_label),
-                classes="file-change-preview-label",
-            )
-        yield Static("Change details not available", classes="file-change-preview-body")
-
     def _yield_compact_header(
         self,
         file_path: str,
@@ -270,7 +260,7 @@ class WriteFilePreviewWidget(FileChangePreviewWidget):
         total_lines = len(lines)
 
         if is_new_file:
-            extra = "new file" if not self._finalized else ""
+            extra = "new" if not self._finalized else ""
             yield from self._yield_compact_header(file_path, extra=extra)
         else:
             yield from self._yield_compact_header(
@@ -358,9 +348,14 @@ class EditFilePreviewWidget(FileChangePreviewWidget):
 
     def compose(self) -> ComposeResult:
         """Compose diff preview."""
-        yield from self._compose_edit_diff_body(show_line_range=False)
+        yield from self._compose_edit_diff_body()
 
-    def _compose_edit_diff_body(self, *, show_line_range: bool) -> ComposeResult:
+    def _compose_edit_diff_body(
+        self,
+        *,
+        show_line_range: bool = False,
+        show_insert_line: bool = False,
+    ) -> ComposeResult:
         file_path = self.data.get("file_path", "")
         diff_lines = self.data.get("diff_lines", [])
         old_string = self.data.get("old_string", "")
@@ -373,6 +368,10 @@ class EditFilePreviewWidget(FileChangePreviewWidget):
             end_line = self.data.get("end_line")
             if isinstance(start_line, int) and isinstance(end_line, int):
                 extra = f"lines {start_line}–{end_line}"
+        elif show_insert_line:
+            insert_line = self.data.get("insert_line")
+            if isinstance(insert_line, int):
+                extra = f"at line {insert_line}"
         yield from self._yield_compact_header(
             file_path,
             additions=additions,
@@ -404,13 +403,21 @@ class EditFilePreviewWidget(FileChangePreviewWidget):
 
 
 class EditFileLinesPreviewWidget(EditFilePreviewWidget):
-    """Preview for edit_file_lines — line range + segment diff."""
+    """Preview for edit_file_lines / delete_lines — line range + segment diff."""
 
     def compose(self) -> ComposeResult:
         """Compose line-range edit preview."""
         yield from self._compose_edit_diff_body(show_line_range=True)
 
 
+class InsertLinesPreviewWidget(EditFilePreviewWidget):
+    """Preview for insert_lines — insertion point + file diff."""
+
+    def compose(self) -> ComposeResult:
+        """Compose insert-at-line preview."""
+        yield from self._compose_edit_diff_body(show_insert_line=True)
+
+
 class GenericFilePreviewWidget(FileChangePreviewWidget):
     """Fallback preview — key/value args."""
 
@@ -419,10 +426,7 @@ class GenericFilePreviewWidget(FileChangePreviewWidget):
         if file_path:
             yield from self._yield_compact_header(file_path)
         elif self._action_label:
-            yield Static(
-                Content.from_markup("[bold]$label[/bold]", label=self._action_label),
-                classes="file-change-preview-header",
-            )
+            yield from self._yield_compact_header("")
         for key, value in self.data.items():
             if value is None:
                 continue

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/tui/widgets/messages/cognition_step.py

@@ -561,10 +561,9 @@ class CognitionStepMessage(Vertical):
             colors = theme.DARK_COLORS
         icon = g.checkmark if success else g.error
         head_tone = colors.card_success if success else colors.card_error
-        suffix_tone = colors.cognition
         parts: list[object] = [Content.styled(f"{gutter}{icon} {head}", head_tone)]
         if suffix:
-            parts.append(Content.styled(suffix, suffix_tone))
+            parts.append(Content.styled(suffix, theme.SECONDARY_TEXT_STYLE))
         self._status_widget.update(Content.assemble(*parts))
         self._status_widget.display = True
 

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/tui/widgets/messages/cognition_step_activity.py

@@ -20,6 +20,7 @@ from soothe_sdk.ux.task_namespace import (
 from textual.content import Content
 
 from soothe_cli.runtime.presentation.duration_format import format_duration
+from soothe_cli.tui import theme
 from soothe_cli.tui.commands.subagent_routing import get_subagent_display_name
 from soothe_cli.tui.preview_limits import STEP_CARD_TOOL_ACTIVITY_PREVIEW_COUNT
 from soothe_cli.tui.tool_display import (
@@ -348,13 +349,9 @@ def phase_icon(
 def task_tool_row_tone_for_phase(phase: str, colors: Any) -> str:
     """Textual style for a tool row or task label from lifecycle phase."""
     p = (phase or "pending").strip().lower()
-    if p in ("success", "done"):
-        return colors.cognition
     if p in ("error", "rejected", "failed"):
         return colors.error
-    if p == "running":
-        return colors.cognition
-    return colors.muted
+    return theme.SECONDARY_TEXT_STYLE
 
 
 def task_tool_row_tone(row: StepToolRow, colors: Any) -> str:
@@ -441,7 +438,7 @@ class StepCardStatusLine:
         tail = f"{stats_suffix}{token_suffix}"
         parts: list[object] = [Content.styled(head, colors.warning)]
         if tail:
-            parts.append(Content.styled(tail, colors.cognition))
+            parts.append(Content.styled(tail, theme.SECONDARY_TEXT_STYLE))
         return Content.assemble(*parts)
 
     @staticmethod
@@ -454,8 +451,12 @@ class StepCardStatusLine:
         colors: Any,
     ) -> Content:
         """Step card footer for planned steps not yet executing."""
-        line = f"{gutter}{circle_empty} Pending...{stats_suffix}{token_suffix}"
-        return Content.styled(line, colors.cognition)
+        head = f"{gutter}{circle_empty} Pending..."
+        tail = f"{stats_suffix}{token_suffix}"
+        parts: list[object] = [Content.styled(head, colors.cognition)]
+        if tail:
+            parts.append(Content.styled(tail, theme.SECONDARY_TEXT_STYLE))
+        return Content.assemble(*parts)
 
     @staticmethod
     def footer_queued(
@@ -467,8 +468,12 @@ class StepCardStatusLine:
         colors: Any,
     ) -> Content:
         """Step card footer for ready steps waiting for a concurrency slot."""
-        line = f"{gutter}{circle_empty} Queued...{stats_suffix}{token_suffix}"
-        return Content.styled(line, colors.cognition)
+        head = f"{gutter}{circle_empty} Queued..."
+        tail = f"{stats_suffix}{token_suffix}"
+        parts: list[object] = [Content.styled(head, colors.cognition)]
+        if tail:
+            parts.append(Content.styled(tail, theme.SECONDARY_TEXT_STYLE))
+        return Content.assemble(*parts)
 
 
 # Activity tree renderer
@@ -523,7 +528,7 @@ class StepActivityTree:
             parts.append(
                 Content.styled(
                     f"{branch_gutter}{task_icon} {label}",
-                    task_tone if task_phase != "pending" else colors.foreground,
+                    task_tone,
                 )
             )
 
@@ -533,7 +538,7 @@ class StepActivityTree:
                 if not text:
                     continue
                 parts.append("\n")
-                parts.append(Content.styled(f"{branch_gutter}{text}", colors.muted))
+                parts.append(Content.styled(f"{branch_gutter}{text}", theme.SECONDARY_TEXT_STYLE))
 
         # Main-agent tool preview
         if main_preview:
@@ -551,7 +556,9 @@ class StepActivityTree:
             if hidden_tools > 0:
                 label = f"+{hidden_tools} more tool{'s' if hidden_tools != 1 else ''}"
                 parts.append("\n")
-                parts.append(Content.styled(f"{branch_gutter}· {label}", colors.muted))
+                parts.append(
+                    Content.styled(f"{branch_gutter}· {label}", theme.SECONDARY_TEXT_STYLE)
+                )
 
         # Global subagent notes
         for note in subagent_notes:
@@ -561,6 +568,6 @@ class StepActivityTree:
             if not first_block:
                 parts.append("\n")
             first_block = False
-            parts.append(Content.styled(f"{branch_gutter}{t}", colors.muted))
+            parts.append(Content.styled(f"{branch_gutter}{t}", theme.SECONDARY_TEXT_STYLE))
 
         return Content.assemble(*parts) if parts else Content("")

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/tui/widgets/messages/diff_message.py

@@ -26,7 +26,7 @@ class DiffMessage(Static):
     DiffMessage {
         height: auto;
         padding: 0 1;
-        margin: 0;
+        margin: 0 0 1 0;
         background: $surface;
         border: solid $primary;
     }

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/tui/widgets/status.py

@@ -297,7 +297,7 @@ class StatusBar(Horizontal):
         except NoMatches:
             return
         text = (new_value or "").strip()
-        tip_widget.update(f"Tips: {text}" if text else "")
+        tip_widget.update(f"Tip: {text}" if text else "")
 
     def watch_cwd(self, new_value: str) -> None:
         """Update cwd display when it changes."""

{soothe_cli-0.7.4 → soothe_cli-0.7.6}/src/soothe_cli/tui/widgets/welcome.py

@@ -144,7 +144,7 @@ class WelcomeBanner(Static):
     def _build_metadata_line(self, *, colors: theme.ThemeColors, ansi: bool) -> Content | None:
         """Build the single metadata row: loop id plus version or update notice."""
         segments: list[str | tuple[str, str | TStyle]] = []
-        dim_style: str | TStyle = "dim"
+        dim_style: str | TStyle = theme.SECONDARY_TEXT_STYLE
 
         if self._cli_loop_id:
             segments.append((f"Loop: {self._cli_loop_id}", dim_style))