soothe-cli 0.5.8__tar.gz → 0.5.9__tar.gz

{soothe_cli-0.5.8 → soothe_cli-0.5.9}/PKG-INFO

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

{soothe_cli-0.5.8 → soothe_cli-0.5.9}/src/soothe_cli/cli/execution/daemon.py

@@ -65,10 +65,17 @@ async def _run_headless_session_once(
     try:
         await connect_websocket_with_retries(client)
         cli_ws = os.environ.get("SOOTHE_CLI_WORKSPACE", "").strip() or os.getcwd()
+        stream_delivery = "batch"
+        if getattr(cfg, "output_streaming_mode", None) == "streaming":
+            stream_delivery = "full"
+        elif getattr(cfg, "output_streaming_mode", None) == "merged":
+            stream_delivery = "merged"
+
         status_event = await bootstrap_loop_session(
             client,
             resume_loop_id=resume_loop_id,
             verbosity="normal",
+            stream_delivery=stream_delivery,
             workspace=cli_ws,
             subscribe_timeout_s=_SESSION_BOOTSTRAP_TIMEOUT_S,
         )
@@ -102,6 +109,7 @@ async def _run_headless_session_once(
             renderer,
             presentation_engine=presentation,
             headless_output=True,
+            streaming_mode="batch" if stream_delivery == "batch" else "streaming",
         )
 
         query_started = False

{soothe_cli-0.5.8 → soothe_cli-0.5.9}/src/soothe_cli/shared/core/event_processor.py

@@ -85,6 +85,7 @@ class EventProcessor:
         presentation_engine: PresentationEngine | None = None,
         tui_debug: bool = False,
         headless_output: bool = False,
+        streaming_mode: str | None = "batch",
     ) -> None:
         """Initialize processor with renderer.
 
@@ -94,10 +95,12 @@ class EventProcessor:
                 ``presentation_engine`` when present, else a new instance.
             tui_debug: When True, emit INFO logs on logger ``soothe.ux.tui.trace`` (IG-129).
             headless_output: Headless CLI: loop-tagged main answers only, no tool/progress UI.
+            streaming_mode: Client display mode — ``batch`` (default), ``merged``, or ``streaming``.
         """
         self._renderer = renderer
         self._headless_output = headless_output
         self._tui_debug = tui_debug
+        self._streaming_mode_override = streaming_mode
 
         rebind = getattr(renderer, "_rebind_presentation", None)
         shared_from_renderer = getattr(renderer, "presentation_engine", None)
@@ -1104,12 +1107,16 @@ class EventProcessor:
         Returns:
             Dict with enabled, mode, and synthesis_streaming fields.
         """
-        # Use defaults - streaming is enabled by default per RFC-614
-        # Always use streaming mode
-        config = {
+        override = getattr(self, "_streaming_mode_override", None) or "batch"
+        if override in ("streaming", "full"):
+            mode = "streaming"
+        elif override in ("batch", "merged"):
+            mode = override
+        else:
+            mode = "batch"
+
+        return {
             "enabled": True,
-            "mode": "streaming",
-            "synthesis_streaming": True,
+            "mode": mode,
+            "synthesis_streaming": mode in ("streaming", "merged"),
         }
-
-        return config

{soothe_cli-0.5.8 → soothe_cli-0.5.9}/src/soothe_cli/tui/app/_history.py

@@ -278,11 +278,9 @@ class _HistoryMixin:
             return None
 
         try:
-            from langchain_core.messages.base import messages_to_dict
-
             await self._daemon_session.aupdate_loop_state(
                 loop_id,
-                {"messages": messages_to_dict(recovered_messages)},
+                {"messages": [m.model_dump() for m in recovered_messages]},
                 timeout=10.0,
             )
             logger.info(

{soothe_cli-0.5.8 → soothe_cli-0.5.9}/src/soothe_cli/tui/daemon_session.py

@@ -57,6 +57,7 @@ class TuiDaemonSession:
             self._client,
             resume_loop_id=resume_loop_id,
             verbosity="normal",
+            stream_delivery="merged",
             workspace=self._workspace,
         )
         if status_event.get("type") == "error":

{soothe_cli-0.5.8 → soothe_cli-0.5.9}/src/soothe_cli/tui/textual_adapter/_turn_helpers.py

@@ -206,7 +206,6 @@ async def _handle_interrupt_cleanup(
     import time
 
     from langchain_core.messages import HumanMessage
-    from langchain_core.messages.base import messages_to_dict
 
     # Clear active message immediately so it won't block pruning.
     # If we don't do this, the store still thinks it's active and protects
@@ -235,12 +234,12 @@ async def _handle_interrupt_cleanup(
             if interrupted_msg:
                 await daemon_session.aupdate_loop_state(
                     loop_id,
-                    {"messages": messages_to_dict([interrupted_msg])},
+                    {"messages": [interrupted_msg.model_dump()]},
                     timeout=2.0,
                 )
             await daemon_session.aupdate_loop_state(
                 loop_id,
-                {"messages": messages_to_dict([cancellation_msg])},
+                {"messages": [cancellation_msg.model_dump()]},
                 timeout=2.0,
             )
     except Exception:

{soothe_cli-0.5.8 → soothe_cli-0.5.9}/src/soothe_cli/tui/widgets/messages.py

@@ -1422,14 +1422,15 @@ class ToolCallMessage(Vertical):
 
     def _refresh_activity_display(self) -> None:
         """Update the unified activity widget with interleaved text lines and tool rows."""
-        # IG-420: Throttle refreshes to prevent UI lag during streaming
-        if not _should_refresh_now(self._last_activity_refresh):
-            return
-        self._last_activity_refresh = monotonic()
+        # IG-420: When widget not mounted, always run auto-collapse checks (no throttling)
         if self._activity_widget is None:
             self._maybe_auto_fold_task_activity_list()
             self._maybe_auto_collapse_task_card()
             return
+        # IG-420: Throttle refreshes to prevent UI lag during streaming (only when mounted)
+        if not _should_refresh_now(self._last_activity_refresh):
+            return
+        self._last_activity_refresh = monotonic()
         if not self._activity:
             self._activity_widget.display = False
             self._maybe_auto_collapse_task_card()
@@ -3100,14 +3101,15 @@ class CognitionStepMessage(Vertical):
         return result
 
     def _refresh_tools_display(self) -> None:
-        # IG-420: Throttle refreshes to prevent UI lag during streaming
-        if not _should_refresh_now(self._last_tools_refresh):
-            return
-        self._last_tools_refresh = monotonic()
+        # IG-420: When widget not mounted, always run auto-collapse checks (no throttling)
         if self._tools_widget is None:
             self._maybe_auto_fold_step_tool_list()
             self._maybe_auto_collapse_step_card()
             return
+        # IG-420: Throttle refreshes to prevent UI lag during streaming (only when mounted)
+        if not _should_refresh_now(self._last_tools_refresh):
+            return
+        self._last_tools_refresh = monotonic()
         if not self._rows:
             self._tools_widget.display = False
             self._maybe_auto_collapse_step_card()