soothe-cli 0.4.6__tar.gz → 0.4.7__tar.gz

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/PKG-INFO

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

@@ -20,8 +20,8 @@ from soothe_sdk.client import (
 
 from soothe_cli.cli.execution.headless_renderer import HeadlessCliRenderer
 from soothe_cli.shared import EventProcessor
-from soothe_cli.shared.presentation_engine import PresentationEngine
-from soothe_cli.shared.subagent_routing import parse_subagent_from_input
+from soothe_cli.shared.commands.subagent_routing import parse_subagent_from_input
+from soothe_cli.shared.core.presentation_engine import PresentationEngine
 
 logger = logging.getLogger(__name__)
 

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/cli/execution/headless_renderer.py

@@ -12,7 +12,7 @@ from typing import Any
 
 from rich.console import Console
 
-from soothe_cli.shared.renderer_base import RendererBase
+from soothe_cli.shared.rendering.renderer_base import RendererBase
 
 
 class HeadlessCliRenderer(RendererBase):

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/cli/stream/pipeline.py

@@ -30,13 +30,13 @@ from soothe_cli.cli.stream.formatter import (
     format_subagent_done,
     format_subagent_milestone,
 )
-from soothe_cli.shared.essential_events import (
+from soothe_cli.shared.core.presentation_engine import PresentationEngine
+from soothe_cli.shared.events.essential_events import (
     LOOP_REASON_EVENT_TYPE,
     is_goal_start_event_type,
     is_step_complete_event_type,
     is_step_start_event_type,
 )
-from soothe_cli.shared.presentation_engine import PresentationEngine
 
 logger = logging.getLogger(__name__)
 

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/shared/core/processor_state.py

@@ -13,7 +13,7 @@ from typing import TYPE_CHECKING, Any
 if TYPE_CHECKING:
     from soothe_sdk.client.schemas import Plan
 
-    from soothe_cli.shared.events.stream_accumulator import StreamingTextAccumulator
+from soothe_cli.shared.events.stream_accumulator import StreamingTextAccumulator
 
 
 @dataclass
@@ -56,9 +56,7 @@ class ProcessorState:
 
     # Unified streaming text accumulator (RFC-614)
     streaming_accumulator: StreamingTextAccumulator = field(
-        default_factory=lambda: __import__(
-            "soothe_cli.shared.stream_accumulator", fromlist=["StreamingTextAccumulator"]
-        ).StreamingTextAccumulator()
+        default_factory=StreamingTextAccumulator
     )
     """Unified streaming text accumulator with namespace isolation."""
 

soothe_cli-0.4.7/src/soothe_cli/shared/tools/__init__.py

@@ -0,0 +1,96 @@
+"""Tool call/result handling utilities."""
+
+from soothe_cli.shared.tools.message_processing import (
+    accumulate_tool_call_chunks,
+    coerce_tool_call_args_to_dict,
+    extract_tool_args_dict,
+    extract_tool_brief,
+    finalize_pending_tool_call,
+    format_tool_call_args,
+    normalize_tool_calls_list,
+    strip_internal_tags,
+    tool_calls_have_any_arg_dict,
+    try_parse_pending_tool_call_args,
+)
+from soothe_cli.shared.tools.rendering import update_name_map_from_tool_calls
+from soothe_cli.shared.tools.tool_call_resolution import (
+    build_streaming_args_overlay,
+    infer_tool_name_from_call_id,
+    materialize_ai_blocks_with_resolved_tools,
+    tool_args_meaningful,
+)
+from soothe_cli.shared.tools.tool_card_payload import (
+    ToolResultCardPayload,
+    extract_tool_result_card_payload,
+    infer_tool_output_suggests_error,
+)
+from soothe_cli.shared.tools.tool_card_visibility import (
+    should_elide_completed_tool_call_message,
+    should_elide_stream_tool_card_mount,
+    should_elide_tool_card_no_info,
+)
+from soothe_cli.shared.tools.tool_formatters import (
+    BaseFormatter,
+    ExecutionFormatter,
+    FallbackFormatter,
+    FileOpsFormatter,
+    GoalFormatter,
+    MediaFormatter,
+    StructuredFormatter,
+    SubagentFormatter,
+    WebFormatter,
+)
+from soothe_cli.shared.tools.tool_message_format import (
+    format_content_block_for_tool_display,
+    format_tool_message_content,
+    run_python_envelope_indicates_failure,
+    try_parse_run_python_result_envelope,
+)
+from soothe_cli.shared.tools.tool_output_formatter import ToolBrief, ToolOutputFormatter
+
+__all__ = [
+    # Message processing
+    "accumulate_tool_call_chunks",
+    "coerce_tool_call_args_to_dict",
+    "extract_tool_args_dict",
+    "extract_tool_brief",
+    "finalize_pending_tool_call",
+    "format_tool_call_args",
+    "normalize_tool_calls_list",
+    "strip_internal_tags",
+    "tool_calls_have_any_arg_dict",
+    "try_parse_pending_tool_call_args",
+    # Rendering
+    "update_name_map_from_tool_calls",
+    # Tool call resolution
+    "build_streaming_args_overlay",
+    "infer_tool_name_from_call_id",
+    "materialize_ai_blocks_with_resolved_tools",
+    "tool_args_meaningful",
+    # Tool card payload
+    "ToolResultCardPayload",
+    "extract_tool_result_card_payload",
+    "infer_tool_output_suggests_error",
+    # Tool card visibility
+    "should_elide_completed_tool_call_message",
+    "should_elide_stream_tool_card_mount",
+    "should_elide_tool_card_no_info",
+    # Tool message format
+    "format_content_block_for_tool_display",
+    "format_tool_message_content",
+    "run_python_envelope_indicates_failure",
+    "try_parse_run_python_result_envelope",
+    # Formatter
+    "ToolBrief",
+    "ToolOutputFormatter",
+    # Formatters
+    "BaseFormatter",
+    "ExecutionFormatter",
+    "FallbackFormatter",
+    "FileOpsFormatter",
+    "GoalFormatter",
+    "MediaFormatter",
+    "SubagentFormatter",
+    "StructuredFormatter",
+    "WebFormatter",
+]

soothe_cli-0.4.7/src/soothe_cli/shared/tools/_utils.py

@@ -0,0 +1,30 @@
+"""Internal utilities for tool formatting (not part of public API)."""
+
+
+def normalize_tool_name(tool_name: str) -> str:
+    """Normalize tool name to snake_case for comparison and lookup.
+
+    Args:
+        tool_name: Raw tool name (may contain dashes or spaces).
+
+    Returns:
+        Lowercase snake_case name.
+    """
+    return tool_name.lower().replace("-", "_").replace(" ", "_")
+
+
+def text_looks_like_error(text: str) -> bool:
+    """Return True if text content suggests a tool failure.
+
+    Checks for common error indicator substrings.
+
+    Args:
+        text: Tool output text to inspect.
+
+    Returns:
+        True if any error indicator is found.
+    """
+    if not text:
+        return False
+    lowered = text.lower()
+    return any(indicator in lowered for indicator in ("error", "failed", "exception", "traceback"))

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/shared/tools/tool_card_payload.py

@@ -13,6 +13,7 @@ from collections.abc import Mapping
 from dataclasses import dataclass
 from typing import Any
 
+from soothe_cli.shared.tools._utils import text_looks_like_error
 from soothe_cli.shared.tools.tool_call_resolution import infer_tool_name_from_call_id
 from soothe_cli.shared.tools.tool_message_format import (
     format_tool_message_content,
@@ -38,8 +39,7 @@ def infer_tool_output_suggests_error(output_display: str, _tool_name: str = "")
 
     if not output_display:
         return False
-    lowered = output_display.lower()
-    return any(indicator in lowered for indicator in ("error", "failed", "exception", "traceback"))
+    return text_looks_like_error(output_display)
 
 
 @dataclass(frozen=True, slots=True)

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/shared/tools/tool_formatters/execution.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from typing import Any
 
+from soothe_cli.shared.tools._utils import normalize_tool_name, text_looks_like_error
 from soothe_cli.shared.tools.tool_formatters.base import BaseFormatter
 from soothe_cli.shared.tools.tool_message_format import try_parse_run_python_result_envelope
 from soothe_cli.shared.tools.tool_output_formatter import ToolBrief
@@ -37,10 +38,11 @@ class ExecutionFormatter(BaseFormatter):
             '✓ Done'
         """
         # Normalize tool name
-        normalized = tool_name.lower().replace("-", "_").replace(" ", "_")
+        normalized = normalize_tool_name(tool_name)
 
         # Route to specific formatter
-        if normalized == "run_command":
+        # execute/shell/bash are aliases of run_command (per TOOL_REGISTRY)
+        if normalized in ("run_command", "execute", "shell", "bash"):
             return self._format_run_command(result)
         if normalized == "run_python":
             return self._format_run_python(result)
@@ -83,9 +85,7 @@ class ExecutionFormatter(BaseFormatter):
             )
 
         # Check for other error patterns
-        error_indicators = ["failed:", "exception:", "traceback", "command not found"]
-        result_lower = result.lower()
-        if any(indicator in result_lower for indicator in error_indicators):
+        if text_looks_like_error(result):
             # Extract first line as error message
             first_line = result.partition("\n")[0].strip()
             return ToolBrief(
@@ -170,13 +170,7 @@ class ExecutionFormatter(BaseFormatter):
 
         # Handle string result (fallback — not the standard run_python JSON envelope)
         if isinstance(result, str):
-            lowered = result.lower()
-            if (
-                "traceback" in lowered
-                or "exception:" in lowered
-                or "failed:" in lowered
-                or result.startswith("Error:")
-            ):
+            if text_looks_like_error(result) or result.startswith("Error:"):
                 return ToolBrief(
                     icon="✗",
                     summary="Execution failed",
@@ -240,7 +234,7 @@ class ExecutionFormatter(BaseFormatter):
 
         # Handle string result (fallback)
         if isinstance(result, str):
-            if "error" in result.lower() or "failed" in result.lower():
+            if text_looks_like_error(result):
                 return ToolBrief(
                     icon="✗",
                     summary="Start failed",
@@ -280,7 +274,7 @@ class ExecutionFormatter(BaseFormatter):
             'Terminated PID 12345'
         """
         # Check for error
-        if "error" in result.lower() or "failed" in result.lower() or "not found" in result.lower():
+        if text_looks_like_error(result) or "not found" in result.lower():
             return ToolBrief(
                 icon="✗",
                 summary="Termination failed",

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/shared/tools/tool_formatters/fallback.py

@@ -6,6 +6,7 @@ from typing import Any
 
 from soothe_sdk.client.protocol import preview_first
 
+from soothe_cli.shared.tools._utils import text_looks_like_error
 from soothe_cli.shared.tools.tool_formatters.base import BaseFormatter
 from soothe_cli.shared.tools.tool_output_formatter import ToolBrief
 
@@ -40,8 +41,7 @@ class FallbackFormatter(BaseFormatter):
         # Handle string results
         if isinstance(result, str):
             # Check for error indicators
-            error_indicators = ["error:", "failed:", "exception:", "traceback"]
-            is_error = any(indicator in result.lower() for indicator in error_indicators)
+            is_error = text_looks_like_error(result)
 
             if is_error:
                 # Extract error message (first line or first 80 chars)

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/shared/tools/tool_formatters/file_ops.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import re
 from typing import Any
 
+from soothe_cli.shared.tools._utils import normalize_tool_name, text_looks_like_error
 from soothe_cli.shared.tools.tool_formatters.base import BaseFormatter
 from soothe_cli.shared.tools.tool_output_formatter import ToolBrief
 
@@ -38,7 +39,7 @@ class FileOpsFormatter(BaseFormatter):
             '✓ Read 12 B (2 lines)'
         """
         # Normalize tool name
-        normalized = tool_name.lower().replace("-", "_").replace(" ", "_")
+        normalized = normalize_tool_name(tool_name)
 
         # Route to specific formatter
         if normalized == "read_file":
@@ -159,7 +160,7 @@ class FileOpsFormatter(BaseFormatter):
             'Wrote 0 B'
         """
         # Check for error
-        if "error" in result.lower() or "failed" in result.lower():
+        if text_looks_like_error(result):
             return ToolBrief(
                 icon="✗",
                 summary="Write failed",
@@ -194,7 +195,7 @@ class FileOpsFormatter(BaseFormatter):
             'Deleted'
         """
         # Check for error
-        if "error" in result.lower() or "failed" in result.lower():
+        if text_looks_like_error(result):
             return ToolBrief(
                 icon="✗",
                 summary="Delete failed",
@@ -226,7 +227,7 @@ class FileOpsFormatter(BaseFormatter):
             'Found 3 items'
         """
         # Check for error
-        if "error" in result.lower() or "failed" in result.lower():
+        if text_looks_like_error(result):
             return ToolBrief(
                 icon="✗",
                 summary="List failed",
@@ -265,7 +266,7 @@ class FileOpsFormatter(BaseFormatter):
             'Found 2 matches'
         """
         # Check for error
-        if "error" in result.lower() or "failed" in result.lower():
+        if text_looks_like_error(result):
             return ToolBrief(
                 icon="✗",
                 summary="Search failed",
@@ -311,12 +312,14 @@ class FileOpsFormatter(BaseFormatter):
             >>> brief.summary
             'Found 2 files'
         """
-        # Check for error
-        if "error" in result.lower() or "failed" in result.lower():
+        # Check for actual error message (not file paths containing error-like words)
+        # Glob results are newline-separated paths; errors start with "Error:"
+        if result.startswith("Error:"):
+            error_msg = result[6:].strip()
             return ToolBrief(
                 icon="✗",
                 summary="Glob failed",
-                detail=self._truncate_text(result, 80),
+                detail=self._truncate_text(error_msg, 80),
                 metrics={"error": True},
             )
 

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/shared/tools/tool_formatters/goal_formatter.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from typing import Any
 
+from soothe_cli.shared.tools._utils import normalize_tool_name, text_looks_like_error
 from soothe_cli.shared.tools.tool_formatters.base import BaseFormatter
 from soothe_cli.shared.tools.tool_output_formatter import ToolBrief
 
@@ -36,7 +37,7 @@ class GoalFormatter(BaseFormatter):
             '✓ Created goal g1'
         """
         # Normalize tool name
-        normalized = tool_name.lower().replace("-", "_").replace(" ", "_")
+        normalized = normalize_tool_name(tool_name)
 
         # Route to specific formatter
         if normalized == "create_goal":
@@ -100,7 +101,7 @@ class GoalFormatter(BaseFormatter):
 
         # Handle string result (fallback)
         if isinstance(result, str):
-            if "error" in result.lower() or "failed" in result.lower():
+            if text_looks_like_error(result):
                 return ToolBrief(
                     icon="✗",
                     summary="Create failed",
@@ -167,7 +168,7 @@ class GoalFormatter(BaseFormatter):
 
         # Handle string result (fallback)
         if isinstance(result, str):
-            if "error" in result.lower() or "failed" in result.lower():
+            if text_looks_like_error(result):
                 return ToolBrief(
                     icon="✗",
                     summary="List failed",
@@ -234,7 +235,7 @@ class GoalFormatter(BaseFormatter):
 
         # Handle string result (fallback)
         if isinstance(result, str):
-            if "error" in result.lower() or "failed" in result.lower():
+            if text_looks_like_error(result):
                 return ToolBrief(
                     icon="✗",
                     summary="Complete failed",
@@ -307,7 +308,7 @@ class GoalFormatter(BaseFormatter):
 
         # Handle string result (fallback)
         if isinstance(result, str):
-            if "error" in result.lower() or "failed" in result.lower():
+            if text_looks_like_error(result):
                 return ToolBrief(
                     icon="✗",
                     summary="Fail operation failed",

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/shared/tools/tool_formatters/media.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from typing import Any
 
+from soothe_cli.shared.tools._utils import normalize_tool_name, text_looks_like_error
 from soothe_cli.shared.tools.tool_formatters.base import BaseFormatter
 from soothe_cli.shared.tools.tool_output_formatter import ToolBrief
 
@@ -36,7 +37,7 @@ class MediaFormatter(BaseFormatter):
             '✓ Transcribed 45.2s (en)'
         """
         # Normalize tool name
-        normalized = tool_name.lower().replace("-", "_").replace(" ", "_")
+        normalized = normalize_tool_name(tool_name)
 
         # Route to specific formatter
         if normalized == "transcribe_audio":
@@ -104,7 +105,7 @@ class MediaFormatter(BaseFormatter):
 
         # Handle string result (fallback)
         if isinstance(result, str):
-            if "error" in result.lower() or "failed" in result.lower():
+            if text_looks_like_error(result):
                 return ToolBrief(
                     icon="✗",
                     summary="Transcription failed",
@@ -182,7 +183,7 @@ class MediaFormatter(BaseFormatter):
 
         # Handle string result (fallback)
         if isinstance(result, str):
-            if "error" in result.lower() or "failed" in result.lower():
+            if text_looks_like_error(result):
                 return ToolBrief(
                     icon="✗",
                     summary="Video info failed",
@@ -267,7 +268,7 @@ class MediaFormatter(BaseFormatter):
 
         # Handle string result (fallback)
         if isinstance(result, str):
-            if "error" in result.lower() or "failed" in result.lower():
+            if text_looks_like_error(result):
                 return ToolBrief(
                     icon="✗",
                     summary="Image analysis failed",

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/shared/tools/tool_formatters/subagent.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 
 from typing import Any
 
+from soothe_cli.shared.tools._utils import text_looks_like_error
 from soothe_cli.shared.tools.tool_formatters.base import BaseFormatter
 from soothe_cli.shared.tools.tool_output_formatter import ToolBrief
 
@@ -36,8 +37,7 @@ class SubagentFormatter(BaseFormatter):
         # Handle string results
         if isinstance(result, str):
             # Check for error indicators
-            error_indicators = ["error:", "failed:", "exception:", "traceback"]
-            is_error = any(indicator in result.lower() for indicator in error_indicators)
+            is_error = text_looks_like_error(result)
 
             if is_error:
                 # Extract first line of error

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/shared/tools/tool_formatters/web.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from typing import Any
 
+from soothe_cli.shared.tools._utils import normalize_tool_name, text_looks_like_error
 from soothe_cli.shared.tools.tool_formatters.base import BaseFormatter
 from soothe_cli.shared.tools.tool_output_formatter import ToolBrief
 
@@ -36,7 +37,7 @@ class WebFormatter(BaseFormatter):
             'Found 2 results'
         """
         # Normalize tool name
-        normalized = tool_name.lower().replace("-", "_").replace(" ", "_")
+        normalized = normalize_tool_name(tool_name)
 
         # Route to specific formatter (handle both legacy and wizsearch naming)
         if normalized in ("search_web", "wizsearch_search"):
@@ -64,7 +65,7 @@ class WebFormatter(BaseFormatter):
             'Found 2 results'
         """
         # Check for error
-        if "error" in result.lower() or "failed" in result.lower():
+        if text_looks_like_error(result):
             return ToolBrief(
                 icon="✗",
                 summary="Search failed",
@@ -114,7 +115,7 @@ class WebFormatter(BaseFormatter):
             '450 words'
         """
         # Check for error
-        if "error" in result.lower() or "failed" in result.lower():
+        if text_looks_like_error(result):
             return ToolBrief(
                 icon="✗",
                 summary="Crawl failed",

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/shared/tools/tool_output_formatter.py

@@ -12,6 +12,8 @@ from typing import Any
 
 from soothe_sdk.utils import get_tool_categories
 
+from soothe_cli.shared.tools._utils import normalize_tool_name
+
 logger = logging.getLogger(__name__)
 
 
@@ -82,8 +84,7 @@ def classify_tool(tool_name: str) -> str:
         >>> classify_tool("unknown_tool")
         'unknown'
     """
-    # Normalize tool name to snake_case (handle variations)
-    normalized = tool_name.lower().replace("-", "_").replace(" ", "_")
+    normalized = normalize_tool_name(tool_name)
 
     # Look up in category mapping
     return TOOL_CATEGORIES.get(normalized, "unknown")

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/tui/app.py

@@ -30,7 +30,7 @@ from textual.style import Style as TStyle
 from textual.theme import Theme
 from textual.widgets import Static
 
-from soothe_cli.shared.tool_card_payload import extract_tool_result_card_payload
+from soothe_cli.shared.tools.tool_card_payload import extract_tool_result_card_payload
 from soothe_cli.tui import theme
 from soothe_cli.tui._cli_context import CLIContext
 from soothe_cli.tui._session_stats import (
@@ -2657,11 +2657,11 @@ class SootheApp(App):
         Args:
             command: The slash command (including /)
         """
-        from soothe_cli.shared.command_router import (
+        from soothe_cli.shared.commands.command_router import (
             parse_slash_command,
             validate_command,
         )
-        from soothe_cli.shared.slash_commands import COMMANDS as _RFC404_COMMANDS
+        from soothe_cli.shared.commands.slash_commands import COMMANDS as _RFC404_COMMANDS
 
         # RFC-404 daemon *routing* commands (/browser, /claude, /research, /plan):
         # send the full line as a normal user turn so ``parse_subagent_from_input``
@@ -3221,7 +3221,7 @@ class SootheApp(App):
         """
         from langchain_core.messages import AIMessage, ToolMessage
 
-        from soothe_cli.shared.message_processing import (
+        from soothe_cli.shared.tools.message_processing import (
             extract_tool_args_dict,
             normalize_tool_calls_list,
         )
@@ -3899,7 +3899,7 @@ class SootheApp(App):
         from langchain_core.messages import AIMessage, AIMessageChunk, ToolMessage
 
         from soothe_cli.cli.stream.pipeline import StreamDisplayPipeline
-        from soothe_cli.shared.message_processing import extract_tool_args_dict
+        from soothe_cli.shared.tools.message_processing import extract_tool_args_dict
 
         progress_pipeline = StreamDisplayPipeline()
         tool_cards: dict[str, ToolCallMessage] = {}

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/tui/textual_adapter.py

@@ -56,21 +56,21 @@ from soothe_sdk.ux.task_namespace import (
 )
 
 from soothe_cli.cli.stream.display_line import DisplayLine
-from soothe_cli.shared.essential_events import (
+from soothe_cli.shared.commands.subagent_routing import parse_subagent_from_input
+from soothe_cli.shared.core.presentation_engine import PresentationEngine
+from soothe_cli.shared.events.essential_events import (
     LOOP_REASON_EVENT_TYPE,
     is_essential_progress_event_type,
 )
-from soothe_cli.shared.message_processing import (
+from soothe_cli.shared.rendering.renderer_base import RendererBase
+from soothe_cli.shared.tools.message_processing import (
     accumulate_tool_call_chunks,
     extract_tool_args_dict,
     format_tool_call_args,
 )
-from soothe_cli.shared.presentation_engine import PresentationEngine
-from soothe_cli.shared.renderer_base import RendererBase
-from soothe_cli.shared.subagent_routing import parse_subagent_from_input
-from soothe_cli.shared.tool_call_resolution import build_streaming_args_overlay
-from soothe_cli.shared.tool_card_payload import extract_tool_result_card_payload
-from soothe_cli.shared.tool_card_visibility import (
+from soothe_cli.shared.tools.tool_call_resolution import build_streaming_args_overlay
+from soothe_cli.shared.tools.tool_card_payload import extract_tool_result_card_payload
+from soothe_cli.shared.tools.tool_card_visibility import (
     should_elide_completed_tool_call_message,
     should_elide_stream_tool_card_mount,
     should_elide_tool_card_no_info,
@@ -307,7 +307,7 @@ def _raw_tool_content_for_presentation(message: Any) -> str:
     """Serialize tool message body for ``PresentationEngine.format_tool_result_status_line``."""
     from langchain_core.messages import ToolMessage
 
-    from soothe_cli.shared.tool_message_format import format_tool_message_content
+    from soothe_cli.shared.tools.tool_message_format import format_tool_message_content
 
     if isinstance(message, ToolMessage):
         return format_tool_message_content(getattr(message, "content", ""))
@@ -661,7 +661,9 @@ def _tui_effective_ai_blocks(
     """
     from langchain_core.messages import AIMessage, AIMessageChunk
 
-    from soothe_cli.shared.tool_call_resolution import materialize_ai_blocks_with_resolved_tools
+    from soothe_cli.shared.tools.tool_call_resolution import (
+        materialize_ai_blocks_with_resolved_tools,
+    )
 
     message = _coerce_ai_message_for_blocks(message)
     if not isinstance(message, (AIMessage, AIMessageChunk)):
@@ -2331,7 +2333,9 @@ async def _flush_assistant_text_ns(
     If no message exists yet, creates one with the full content.
     """
     from soothe_cli.cli.stream.task_scope import format_task_scope_prefix
-    from soothe_cli.shared.explore_task_display import format_explore_task_json_blob_for_display
+    from soothe_cli.shared.events.explore_task_display import (
+        format_explore_task_json_blob_for_display,
+    )
 
     repaired_text = RendererBase.repair_concatenated_output(text)
     repaired_text = format_explore_task_json_blob_for_display(repaired_text)

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/tui/tool_display.py

@@ -12,7 +12,7 @@ from typing import Any
 
 from soothe_sdk.utils import get_all_path_arg_keys, get_tool_display_name, get_tool_meta
 
-from soothe_cli.shared.message_processing import (
+from soothe_cli.shared.tools.message_processing import (
     _normalize_tool_name_for_arg_map,
     extract_tool_args_dict,
     format_tool_call_args,

{soothe_cli-0.4.6 → soothe_cli-0.4.7}/src/soothe_cli/tui/widgets/messages.py

@@ -18,8 +18,8 @@ from textual.events import Click
 from textual.reactive import var
 from textual.widgets import Static
 
-from soothe_cli.shared.presentation_engine import PresentationEngine
-from soothe_cli.shared.tool_call_resolution import infer_tool_name_from_call_id
+from soothe_cli.shared.core.presentation_engine import PresentationEngine
+from soothe_cli.shared.tools.tool_call_resolution import infer_tool_name_from_call_id
 from soothe_cli.tui import theme
 from soothe_cli.tui.config import (
     MODE_DISPLAY_GLYPHS,

soothe_cli-0.4.6/src/soothe_cli/shared/presentation_engine.py

@@ -1,5 +0,0 @@
-"""Compatibility re-export (IG-351); implementation in ``core.presentation_engine``."""
-
-from soothe_cli.shared.core.presentation_engine import PresentationEngine
-
-__all__ = ["PresentationEngine"]

soothe_cli-0.4.6/src/soothe_cli/shared/renderer_base.py

@@ -1,5 +0,0 @@
-"""Compatibility re-export (IG-351); implementation in ``rendering.renderer_base``."""
-
-from soothe_cli.shared.rendering.renderer_base import RendererBase
-
-__all__ = ["RendererBase"]

soothe_cli-0.4.6/src/soothe_cli/shared/stream_accumulator.py

@@ -1,13 +0,0 @@
-"""Compatibility re-export (IG-351); implementation in ``events.stream_accumulator``."""
-
-from soothe_cli.shared.events.stream_accumulator import (
-    StreamAccumulator,
-    StreamingAccumState,
-    StreamingTextAccumulator,
-)
-
-__all__ = [
-    "StreamAccumulator",
-    "StreamingAccumState",
-    "StreamingTextAccumulator",
-]

soothe_cli-0.4.6/src/soothe_cli/shared/subagent_routing.py

@@ -1,15 +0,0 @@
-"""Compatibility re-export (IG-351). Implementation lives in ``commands.subagent_routing``."""
-
-from soothe_cli.shared.commands.subagent_routing import (
-    BUILTIN_SUBAGENT_NAMES,
-    SUBAGENT_DISPLAY_NAMES,
-    get_subagent_display_name,
-    parse_subagent_from_input,
-)
-
-__all__ = [
-    "BUILTIN_SUBAGENT_NAMES",
-    "SUBAGENT_DISPLAY_NAMES",
-    "get_subagent_display_name",
-    "parse_subagent_from_input",
-]

soothe_cli-0.4.6/src/soothe_cli/shared/tools/__init__.py

@@ -1,3 +0,0 @@
-"""Tool call/result handling utilities (submodules: message_processing, rendering, ...)."""
-
-__all__: list[str] = []