soothe-cli 0.7.13__tar.gz → 0.7.15__tar.gz

{soothe_cli-0.7.13 → soothe_cli-0.7.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soothe-cli
-Version: 0.7.13
+Version: 0.7.15
 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.13 → soothe_cli-0.7.15}/src/soothe_cli/cli/commands/run_cmd.py

@@ -100,7 +100,7 @@ def run_impl(
             result = get_last_app_result()
             if result is not None and result.loop_id:
                 typer.echo(
-                    f"💡 To continue this loop: soothe loop resume {result.loop_id}",
+                    f"💡 To continue: soothe loop resume {result.loop_id}",
                     err=True,
                 )
 
@@ -113,7 +113,7 @@ def run_impl(
             result = get_last_app_result()
             if result is not None and result.loop_id:
                 typer.echo(
-                    f"💡 To continue this loop: soothe loop resume {result.loop_id}",
+                    f"💡 To continue: soothe loop resume {result.loop_id}",
                     err=True,
                 )
         sys.exit(130)

{soothe_cli-0.7.13 → soothe_cli-0.7.15}/src/soothe_cli/runtime/token_usage.py

@@ -8,19 +8,25 @@ from typing import Any
 logger = logging.getLogger(__name__)
 
 __all__ = [
+    "coerce_total_tokens_used",
     "extract_stream_message_token_usage",
     "fetch_conversation_token_count",
     "message_has_token_usage_metadata",
 ]
 
 
-def _coerce_int(value: Any) -> int:
+def coerce_total_tokens_used(value: Any) -> int:
+    """Parse a non-negative ``total_tokens_used`` field from event payloads."""
     try:
         return max(0, int(value or 0))
     except (TypeError, ValueError):
         return 0
 
 
+def _coerce_int(value: Any) -> int:
+    return coerce_total_tokens_used(value)
+
+
 def _usage_from_mapping(usage: dict[str, Any]) -> tuple[int, int, int]:
     """Return ``(input_tokens, output_tokens, total_tokens)`` from a usage dict."""
     input_toks = _coerce_int(usage.get("input_tokens") or usage.get("prompt_tokens"))

{soothe_cli-0.7.13 → soothe_cli-0.7.15}/src/soothe_cli/runtime/transport/session.py

@@ -321,6 +321,7 @@ class TuiDaemonSession:
         inbound_dropped_baseline = getattr(self._client, "inbound_dropped", 0)
         query_started = False
         expected_loop_id = self._loop_id
+        stream_payload_seen = False
         self._streaming = True
         turn_read_started = time.monotonic()
         first_event_logged = False
@@ -405,7 +406,20 @@ class TuiDaemonSession:
                         if state == "running":
                             query_started = True
                             progress_seen = True
-                        elif query_started and state in {"idle", "stopped"}:
+                        elif query_started and state == "stopped":
+                            self.last_turn_end_state = state
+                            async for chunk in self._drain_stream_events_after_idle(
+                                expected_loop_id=expected_loop_id,
+                            ):
+                                yield chunk
+                            break
+                        elif query_started and state == "idle":
+                            if not stream_payload_seen and not self.last_turn_cancellation_seen:
+                                logger.debug(
+                                    "Ignoring stale idle before stream payload (loop=%s)",
+                                    (expected_loop_id or "?")[:16],
+                                )
+                                continue
                             self.last_turn_end_state = state
                             async for chunk in self._drain_stream_events_after_idle(
                                 expected_loop_id=expected_loop_id,
@@ -430,6 +444,7 @@ class TuiDaemonSession:
                         self.turn_event_stats.filtered_early += 1
                         continue
                     progress_seen = True
+                    stream_payload_seen = True
                     yield (namespace, mode, data)
                     # Graph auto-resumes LangGraph interrupts server-side; keep consuming events.
                     if mode == "updates" and isinstance(data, dict) and "__interrupt__" in data:

{soothe_cli-0.7.13 → soothe_cli-0.7.15}/src/soothe_cli/tui/app/_ui.py

@@ -170,7 +170,7 @@ class _UIMixin:
         source: str = "backend",
     ) -> None:
         """Merge backend goal-run token totals into the visible loop counter."""
-        from soothe.foundation.sloop.utils.token_usage import coerce_total_tokens_used
+        from soothe_cli.runtime.token_usage import coerce_total_tokens_used
 
         goal_total = coerce_total_tokens_used(goal_run_tokens)
         self._ensure_loop_token_scope(self._lc_loop_id)

{soothe_cli-0.7.13 → soothe_cli-0.7.15}/src/soothe_cli/tui/theme.py

@@ -377,7 +377,7 @@ class ThemeColors:
     """Tertiary activity text — more subdued than card_activity."""
 
     card_success: str
-    """Success state color — prominent green for visibility."""
+    """Card prefix dot color for successful lifecycle — green header indicator only."""
 
     card_error: str
     """Error state color — prominent red for visibility."""

{soothe_cli-0.7.13 → soothe_cli-0.7.15}/src/soothe_cli/tui/widgets/messages/cognition_step.py

@@ -118,6 +118,11 @@ class CognitionStepMessage(Vertical):
         height: auto;
     }
 
+    CognitionStepMessage .step-status {
+        height: auto;
+        color: $text-muted;
+    }
+
     CognitionStepMessage.-collapsed .step-tools,
     CognitionStepMessage.-collapsed .step-status,
     CognitionStepMessage.-collapsed .step-subagent-notes,
@@ -542,8 +547,8 @@ class CognitionStepMessage(Vertical):
         Args:
             head: The leading status text (e.g. ``"Completed (1.2s)"`` or
                 ``"Failed · 1.2s"``) that gets the prominent success/error tone.
-            success: Whether this is a successful completion (green) or a
-                failure (red).
+            success: Whether this is a successful completion (dim, like tool
+                activity rows) or a failure (red).
             suffix: Optional stats tail (tool counts, token budget) that keeps
                 the subdued cognition tone so it doesn't drown out the head.
         """
@@ -556,11 +561,16 @@ class CognitionStepMessage(Vertical):
         except Exception:  # noqa: BLE001
             colors = theme.DARK_COLORS
         icon = g.checkmark if success else g.error
-        head_tone = colors.card_success if success else colors.card_error
-        parts: list[object] = [Content.styled(f"{gutter}{icon} {head}", head_tone)]
-        if suffix:
-            parts.append(Content.styled(suffix, theme.SECONDARY_TEXT_STYLE))
-        self._status_widget.update(Content.assemble(*parts))
+        self._status_widget.update(
+            StepCardStatusLine.footer_completed(
+                gutter=gutter,
+                icon=icon,
+                head=head,
+                suffix=suffix,
+                success=success,
+                colors=colors,
+            )
+        )
         self._status_widget.display = True
 
     def _refresh_header_title(self) -> None:
@@ -611,37 +621,6 @@ class CognitionStepMessage(Vertical):
             style=style,
         )
 
-    def _step_branched_completion_detail(
-        self,
-        *,
-        success: bool,
-        status_line_body: str,
-        prose: str,
-    ) -> Content:
-        """Completed step detail: first line ``⎿ ✓|✗ status``; prose lines ``⎿ ○ …``."""
-        g = get_glyphs()
-        gutter = self._step_goal_tree_gutter()
-        try:
-            colors = theme.get_theme_colors(self)
-        except Exception:  # noqa: BLE001
-            colors = theme.DARK_COLORS
-        icon = g.checkmark if success else g.error
-        # Match running step line and tool activity: cognition accent, not semantic green.
-        tone = colors.cognition if success else colors.error
-        parts: list[object] = [
-            Content.styled(f"{gutter}{icon} {status_line_body}", tone),
-        ]
-        prose = (prose or "").strip()
-        if prose:
-            sub = f"{g.output_prefix} {g.circle_empty} "
-            prose_style = colors.muted if success else tone
-            parts.append("\n")
-            for i, ln in enumerate(prose.splitlines()):
-                if i:
-                    parts.append("\n")
-                parts.append(Content.styled(f"{sub}{ln}", prose_style))
-        return Content.assemble(*parts)
-
     def _step_branched_error_detail(self, err_text: str) -> Content:
         """Multiline error body: first line ``⎿ ✗ …``; continuations ``⎿ ○ …``."""
         g = get_glyphs()

{soothe_cli-0.7.13 → soothe_cli-0.7.15}/src/soothe_cli/tui/widgets/messages/cognition_step_activity.py

@@ -458,6 +458,23 @@ class StepCardStatusLine:
             parts.append(Content.styled(tail, theme.SECONDARY_TEXT_STYLE))
         return Content.assemble(*parts)
 
+    @staticmethod
+    def footer_completed(
+        *,
+        gutter: str,
+        icon: str,
+        head: str,
+        suffix: str = "",
+        success: bool,
+        colors: Any,
+    ) -> Content:
+        """Step card footer after successful or failed completion."""
+        head_tone = theme.SECONDARY_TEXT_STYLE if success else colors.card_error
+        parts: list[object] = [Content.styled(f"{gutter}{icon} {head}", head_tone)]
+        if suffix:
+            parts.append(Content.styled(suffix, theme.SECONDARY_TEXT_STYLE))
+        return Content.assemble(*parts)
+
 
 # Activity tree renderer
 # ---------------------------------------------------------------------------