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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soothe-cli
-Version: 0.7.6
+Version: 0.7.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-0.7.6 → soothe_cli-0.7.7}/src/soothe_cli/cli/execution/daemon.py

@@ -280,7 +280,7 @@ async def _run_headless_session_once(
                     query_started = True
                 elif (state == "idle" and query_started) or state == "stopped":
                     loop_clock = asyncio.get_event_loop()
-                    drain_deadline = loop_clock.time() + 30.0
+                    drain_deadline = loop_clock.time() + 0.5
                     while loop_clock.time() < drain_deadline:
                         try:
                             nxt = await asyncio.wait_for(client.read_event(), timeout=0.25)

{soothe_cli-0.7.6 → soothe_cli-0.7.7}/src/soothe_cli/runtime/policy/display_policy.py

@@ -134,9 +134,9 @@ class DisplayPolicy:
         """Check if this is a plan-related event."""
         return event_type.startswith("soothe.cognition.plan.")
 
-    def is_tacitus_event(self, event_type: str) -> bool:
-        """Check if this is a Tacitus subagent event."""
-        return event_type.startswith("soothe.subagent.tacitus.")
+    def is_deep_research_event(self, event_type: str) -> bool:
+        """Check if this is a Deep Research subagent event."""
+        return event_type.startswith("soothe.subagent.deep_research.")
 
     def is_internal_event(self, event_type: str) -> bool:
         """Check if this is an internal (never-shown) event."""

{soothe_cli-0.7.6 → soothe_cli-0.7.7}/src/soothe_cli/runtime/presentation/renderer_protocol.py

@@ -141,7 +141,7 @@ class RendererProtocol(Protocol):
         Catch-all for events not covered by specific callbacks.
 
         Args:
-            event_type: Full event type string (e.g., ``soothe.subagent.tacitus.started``).
+            event_type: Full event type string (e.g., ``soothe.subagent.deep_research.started``).
             data: Event payload.
             namespace: Subagent namespace tuple (empty for main agent).
             task_scope: When subgraph streams are bound to a Task tool call (IG-334).

{soothe_cli-0.7.6 → soothe_cli-0.7.7}/src/soothe_cli/runtime/presentation/subagent_task_display.py

@@ -1,6 +1,6 @@
 """Format subagent Task-scope assistant blobs for CLI/TUI.
 
-Tacitus emits structured JSON in subgraph assistant streams. Clients show
+Deep Research emits structured JSON in subgraph assistant streams. Clients show
 user-facing summaries only; internal planning JSON is suppressed.
 """
 
@@ -11,8 +11,8 @@ from collections.abc import Iterator
 from typing import Any
 
 
-def _is_tacitus_internal_json_object(obj: dict[str, Any]) -> bool:
-    """True when ``obj`` is Tacitus engine scratch (not a user-facing report)."""
+def _is_deep_research_internal_json_object(obj: dict[str, Any]) -> bool:
+    """True when ``obj`` is Deep Research engine scratch (not a user-facing report)."""
     keys = set(obj.keys())
     if "sub_questions" in keys:
         return True
@@ -89,21 +89,24 @@ def format_subagent_task_assistant_for_display(
 
     Args:
         raw: Full assistant text from a subgraph namespace.
-        subagent_type: Built-in subagent id when known (``tacitus``, …).
+        subagent_type: Built-in subagent id when known (``deep_research``, …).
 
     Returns:
         Scrubbed one-line text, or ``""`` when only internal payloads remain.
     """
     agent = (subagent_type or "").strip().lower()
     text = raw
-    if agent == "tacitus":
+    if agent in ("deep_research", "academic_research"):
         stripped = text.strip()
         internal_present = any(
-            _is_tacitus_internal_json_object(obj) for obj in _iter_embedded_json_objects(stripped)
+            _is_deep_research_internal_json_object(obj)
+            for obj in _iter_embedded_json_objects(stripped)
         )
         if internal_present:
             return ""
-        text = _strip_concatenated_json_objects(text, predicate=_is_tacitus_internal_json_object)
+        text = _strip_concatenated_json_objects(
+            text, predicate=_is_deep_research_internal_json_object
+        )
     return (text or "").strip()
 
 

{soothe_cli-0.7.6 → soothe_cli-0.7.7}/src/soothe_cli/runtime/state/file_tracker.py

@@ -19,16 +19,6 @@ FileOpStatus = Literal["pending", "success", "error"]
 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.
@@ -439,21 +429,28 @@ 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_label(tool_name: str, *, is_new_file: bool = False) -> str:
+    """Single-word past-tense prefix for a file-change card header."""
+    if tool_name in ("delete_file", "delete_lines"):
+        return "Deleted"
+    if tool_name == "write_file":
+        return "Created" if is_new_file else "Written"
+    if tool_name in ("edit_file", "edit_file_lines"):
+        return "Edited"
+    if tool_name == "insert_lines":
+        return "Inserted"
+    if tool_name == "apply_diff":
+        return "Patched"
+    return "Changed"
+
+
+def file_change_label_from_preview_data(tool_name: str, data: dict[str, Any]) -> str:
+    """Derive a preview header label from renderer-built widget data."""
+    is_new = bool(data.get("is_new_file")) if tool_name == "write_file" else False
+    return file_change_label(tool_name, is_new_file=is_new)
 
 
 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 "Created"
-    if record.tool_name == "write_file":
-        return "Written"
-    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"
+    is_new = record.tool_name == "write_file" and not (record.before_content or "")
+    return file_change_label(record.tool_name, is_new_file=is_new)

{soothe_cli-0.7.6 → soothe_cli-0.7.7}/src/soothe_cli/runtime/transport/session.py

@@ -26,7 +26,7 @@ logger = logging.getLogger(__name__)
 
 # Match headless daemon client: brief read window after ``idle`` so stream events
 # that arrive slightly after status are not dropped (``cli/execution/daemon.py``).
-_POST_IDLE_DRAIN_DEADLINE_S = 30.0
+_POST_IDLE_DRAIN_DEADLINE_S = 0.5
 
 # Align with ``bootstrap_loop_session`` daemon-ready wait (RFC-450 §8.2).
 _RPC_HANDSHAKE_TIMEOUT_S = 20.0

{soothe_cli-0.7.6 → soothe_cli-0.7.7}/src/soothe_cli/tui/app/_history.py

@@ -24,7 +24,7 @@ from soothe_sdk.display.text_extract import (
     normalize_stream_message,
 )
 from soothe_sdk.display.transcript_types import MessageData
-from soothe_sdk.ux.loop_stream import is_goal_completion_stream_terminal
+from soothe_sdk.ux.loop_stream import is_stream_terminal
 from textual.content import Content
 
 from soothe_cli.tui.app._module_init import _LoopHistoryPayload
@@ -339,7 +339,7 @@ class _HistoryMixin:
 
                     if isinstance(message, (AIMessage, AIMessageChunk)):
                         extracted = extract_ai_text_for_display(message)
-                        is_terminal = is_goal_completion_stream_terminal(message)
+                        is_terminal = is_stream_terminal(message)
                         if extracted:
                             # Deduplicate immediate replayed AI chunks after reconnect/resubscribe.
                             if last_ai_chunk_by_ns.get(ns_key) == extracted:

{soothe_cli-0.7.6 → soothe_cli-0.7.7}/src/soothe_cli/tui/app/_messages_mixin.py

@@ -399,6 +399,23 @@ class _MessagesMixin:
                         )
                     )
 
+    _INTERRUPT_UI_MESSAGE = "Stream cancelled"
+
+    async def _tear_down_interrupt_ui(self, message: str | None = None) -> None:
+        """Immediately stop in-flight step/goal UI when the user interrupts a turn.
+
+        Daemon cancel and worker teardown can take several seconds; without an
+        eager UI pass the thinking spinner and goal-tree running rows stay live.
+        """
+        label = message or self._INTERRUPT_UI_MESSAGE
+        adapter = getattr(self, "_ui_adapter", None)
+        if adapter is not None:
+            if adapter._tool_to_step or adapter._tool_display_by_call_id:
+                adapter.finalize_pending_tools_with_error(label)
+            if adapter._current_step_messages or adapter._goal_tree_message is not None:
+                adapter.finalize_pending_steps_with_error(label)
+        await self._set_spinner(None)
+
     def _cancel_worker(self, worker: Worker[None] | None, *, discard_queue: bool = True) -> None:
         """Cancel an active worker, optionally discarding the pending message queue.
 
@@ -414,15 +431,17 @@ class _MessagesMixin:
             worker.cancel()
 
     async def _interrupt_daemon_agent_turn(self, *, discard_queue: bool = True) -> None:
-        """Send daemon ``/cancel``, then cancel the local streaming worker.
+        """Stop in-flight UI, send daemon ``/cancel``, then cancel the local worker.
 
-        Awaiting cancel first stops the server-side query; cancelling the worker
-        alone would only detach the TUI from chunks while the daemon kept running.
+        UI teardown runs first so Ctrl+C does not leave the thinking spinner or
+        goal-tree running rows active while the daemon winds down (which can take
+        several seconds on long execute steps).
 
         Args:
             discard_queue: When ``False``, preserve queued user goals so they
                 run after the cancelled turn finishes cleanup.
         """
+        await self._tear_down_interrupt_ui()
         session = self._daemon_session
         worker = self._agent_worker
         if session is not None:
@@ -483,6 +502,11 @@ class _MessagesMixin:
                     group="daemon-interrupt",
                 )
             else:
+                self.run_worker(
+                    self._tear_down_interrupt_ui(),
+                    exclusive=False,
+                    group="interrupt-ui",
+                )
                 self._cancel_worker(self._agent_worker, discard_queue=False)
             self._quit_pending = False
             return

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

@@ -102,12 +102,6 @@ Screen {
     margin: 0;
 }
 
-.file-change-preview Markdown {
-    margin: 0;
-    padding: 0;
-    height: auto;
-}
-
 .file-change-preview-section-label {
     height: auto;
     margin: 0;
@@ -126,22 +120,6 @@ Screen {
 }
 
 /* Diff styling — previews and DiffMessage (fg + bg + padding) */
-.diff-removed {
-    height: auto;
-    color: $text-error;
-    background: $error-muted;
-    padding: 0;
-    margin: 0;
-}
-
-.diff-added {
-    height: auto;
-    color: $text-success;
-    background: $success-muted;
-    padding: 0;
-    margin: 0;
-}
-
 .diff-context {
     height: auto;
     color: $text-muted;

{soothe_cli-0.7.6 → soothe_cli-0.7.7}/src/soothe_cli/tui/command_registry.py

@@ -114,8 +114,13 @@ COMMANDS: tuple[SlashCommand, ...] = (
         hidden_keywords="continue history sessions loops",
     ),
     SlashCommand(
-        name="/tacitus",
-        description="Route prompt to Tacitus subagent (usage: /tacitus <query>)",
+        name="/deep_research",
+        description="Route prompt to deep_research subagent (usage: /deep_research <query>)",
+        bypass_tier=BypassTier.QUEUED,
+    ),
+    SlashCommand(
+        name="/academic_research",
+        description="Route prompt to academic_research subagent (usage: /academic_research <query>)",
         bypass_tier=BypassTier.QUEUED,
     ),
     SlashCommand(

{soothe_cli-0.7.6 → soothe_cli-0.7.7}/src/soothe_cli/tui/commands/slash_commands.py

@@ -274,10 +274,16 @@ COMMANDS: dict[str, dict[str, Any]] = {
     },
     # Daemon routing commands (3)
     "/plan": {"location": "daemon", "type": "routing", "description": "Trigger plan mode"},
-    "/tacitus": {
+    "/deep_research": {
         "location": "daemon",
         "type": "routing",
-        "description": "Route query to Tacitus subagent",
+        "description": "Route query to Deep Research subagent",
+        "requires_query": True,
+    },
+    "/academic_research": {
+        "location": "daemon",
+        "type": "routing",
+        "description": "Route query to Academic Research subagent",
         "requires_query": True,
     },
 }

{soothe_cli-0.7.6 → soothe_cli-0.7.7}/src/soothe_cli/tui/commands/subagent_routing.py

@@ -5,12 +5,13 @@ from __future__ import annotations
 # Display names for known soothe core subagents (IG-517).
 SUBAGENT_DISPLAY_NAMES: dict[str, str] = {
     "planner": "Planner",
-    "tacitus": "Tacitus",
+    "deep_research": "Deep Research",
+    "academic_research": "Academic Research",
     "browser_use": "Browser",
 }
 
 # Lowercase ids matched after ``/`` for preferred_subagent routing (core only).
-SUBAGENT_SLASH_ROUTE_IDS: tuple[str, ...] = ("tacitus",)
+SUBAGENT_SLASH_ROUTE_IDS: tuple[str, ...] = ("deep_research", "academic_research")
 
 BUILTIN_SUBAGENT_NAMES: list[str] = list(SUBAGENT_SLASH_ROUTE_IDS)
 
@@ -33,7 +34,7 @@ def get_subagent_display_name(technical_name: str) -> str:
 def parse_subagent_from_input(user_input: str) -> tuple[str | None, str]:
     """Parse subagent subcommand from user input.
 
-    Detects subagent routing commands (e.g. ``/tacitus``)
+    Detects subagent routing commands (e.g. ``/deep_research``)
     and extracts the subagent name along with the cleaned input text.
 
     Args:
@@ -45,7 +46,7 @@ def parse_subagent_from_input(user_input: str) -> tuple[str | None, str]:
         The subcommand is removed from ``cleaned_text``.
 
     Examples:
-        ``"/tacitus check this"`` -> ``("tacitus", "check this")``
+        ``"/deep_research check this"`` -> ``("deep_research", "check this")``
         ``"hello world"`` -> ``(None, "hello world")``
     """
     first_match: tuple[int, str] | None = None

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

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any
 
 from soothe_cli.runtime.state.file_tracker import (
     FILE_CHANGE_TOOLS,
-    file_change_preview_label,
+    file_change_label_from_preview_data,
     parse_insert_line_arg,
     parse_line_range_args,
 )
@@ -89,7 +89,7 @@ async def mount_file_change_preview(
     if built is None:
         return
     widget_cls, data = built
-    label = file_change_preview_label(tool_name)
+    label = file_change_label_from_preview_data(tool_name, data)
     try:
         widget = widget_cls(data, action_label=label)
         widget.id = textual_widget_id("file-preview", tcid)

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

@@ -21,7 +21,6 @@ from soothe_cli.tui.widgets.file_change_preview import (
     EditFileLinesPreviewWidget,
     EditFilePreviewWidget,
     FileChangePreviewWidget,
-    GenericFilePreviewWidget,
     InsertLinesPreviewWidget,
     WriteFilePreviewWidget,
     unified_diff_body_lines,
@@ -84,7 +83,7 @@ def build_file_change_preview(
     if tool_name == "edit_file_lines":
         line_range = parse_line_range_args(args)
         if line_range is None:
-            return GenericFilePreviewWidget, dict(args)
+            return None
         start_line, end_line = line_range
         new_string = str(args.get("new_content") or "")
         before = ""
@@ -104,7 +103,7 @@ def build_file_change_preview(
     if tool_name == "insert_lines":
         line = parse_insert_line_arg(args)
         if line is None:
-            return GenericFilePreviewWidget, dict(args)
+            return None
         insert_content = str(args.get("content") or "")
         before = ""
         physical = resolve_physical_path(path_str, assistant_id)
@@ -122,7 +121,7 @@ def build_file_change_preview(
     if tool_name == "delete_lines":
         line_range = parse_line_range_args(args)
         if line_range is None:
-            return GenericFilePreviewWidget, dict(args)
+            return None
         start_line, end_line = line_range
         before = ""
         physical = resolve_physical_path(path_str, assistant_id)
@@ -172,7 +171,7 @@ def build_file_change_preview(
             "total_lines": len(lines),
         }
 
-    return GenericFilePreviewWidget, dict(args)
+    return None
 
 
 def update_preview_data_from_record(data: dict[str, Any], record: FileOperationRecord) -> None:

{soothe_cli-0.7.6 → soothe_cli-0.7.7}/src/soothe_cli/tui/input.py

@@ -839,21 +839,24 @@ def compose_paste_into_input(
     return f"{existing_text[:start]}{pasted_text}{existing_text[end:]}"
 
 
-def abbreviate_pasted_input_display(text: str) -> str:
-    """Build a compact one-line preview for a large pasted payload.
+def abbreviate_pasted_input_display(text: str, *, paste_index: int = 1) -> str:
+    """Build a compact paste token for large pasted payloads.
 
     The full ``text`` is retained separately for submission; this string is
     only for on-screen display in the input widget.
 
     Args:
         text: Full pasted content.
+        paste_index: 1-based counter for multiple pastes in the same input.
 
     Returns:
-        Abbreviated display text containing only a summary header.
+        Abbreviated display token (e.g. ``[Pasted text #1 +35 lines]``).
     """
     lines = text.splitlines()
     if not lines and text:
         lines = [text]
     n_lines = len(lines) if lines else 1
-    n_chars = len(text)
-    return f"[pasted {n_lines} lines, {n_chars} characters]"
+    if n_lines > 1:
+        extra = n_lines - 1
+        return f"[Pasted text #{paste_index} +{extra} lines]"
+    return f"[Pasted text #{paste_index}]"