soothe-cli 0.4.0__tar.gz → 0.4.1__tar.gz

{soothe_cli-0.4.0 → soothe_cli-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soothe-cli
-Version: 0.4.0
+Version: 0.4.1
 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.0 → soothe_cli-0.4.1}/src/soothe_cli/cli/renderer.py

@@ -13,7 +13,7 @@ from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any
 
 from soothe_sdk.core.verbosity import VerbosityTier
-from soothe_sdk.utils import get_tool_pascal_name
+from soothe_sdk.utils import get_tool_display_name
 
 from soothe_cli.cli.stream import DisplayLine, StreamDisplayPipeline
 from soothe_cli.cli.utils import make_tool_block
@@ -223,7 +223,7 @@ class CliRenderer:
 
         self._stderr_begin_icon_block()
 
-        display_name = get_tool_pascal_name(name)
+        display_name = get_tool_display_name(name)
 
         # Pass args directly, including any _raw fallback
         args_str = format_tool_call_args(name, {"args": args, "_raw": args.get("_raw", "")})

{soothe_cli-0.4.0 → soothe_cli-0.4.1}/src/soothe_cli/cli/stream/formatter.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from soothe_sdk.core.verbosity import VerbosityTier
-from soothe_sdk.utils import get_tool_pascal_name
+from soothe_sdk.utils import get_tool_display_name
 
 from soothe_cli.cli.stream.display_line import DisplayLine, indent_for_level
 
@@ -96,7 +96,7 @@ def format_goal_header(
         DisplayLine for goal header.
     """
     # Add inline symbol for goal marker
-    content = f"⌯⌲ {goal}"
+    content = f"{goal}"
     return DisplayLine(
         level=1,
         content=content,
@@ -126,7 +126,7 @@ def format_step_header(
     """
     suffix = " (parallel)" if parallel else ""
     # Add inline symbol for step progression
-    content = f"⏩ {description}{suffix}"
+    content = f"❇️ {description}{suffix}"
     return DisplayLine(
         level=2,
         content=content,
@@ -160,7 +160,7 @@ def format_tool_call(
         DisplayLine for tool/subagent call with uniform wrench icon.
     """
     # Transform to PascalCase for display
-    display_name = get_tool_pascal_name(name)
+    display_name = get_tool_display_name(name)
 
     # IG-256: No differentiation - use wrench for all tools/subagents
     icon_emoji = "🔧"
@@ -318,6 +318,9 @@ def format_reasoning(
     IG-XXX: Shows technical reasoning with "Reasoning:" prefix for clarity.
     Uses solid bullet ● (matching goal) to indicate reasoning is active phase.
 
+    IG-262: Uses level=2 (flat layout) for consistency with judgement lines.
+    Reasoning is a sibling to judgement, not a child.
+
     Args:
         reasoning: Internal technical analysis text.
         namespace: Event namespace.
@@ -330,10 +333,10 @@ def format_reasoning(
     content = f"💭 {reasoning}"
 
     return DisplayLine(
-        level=3,  # Use level 3 for less prominence (subordinate to next_action)
+        level=2,  # IG-262: Use level 2 for flat layout (sibling to judgement, not child)
         content=content,
         icon="●",  # Solid bullet matching goal icon (polish)
-        indent=indent_for_level(3),
+        indent=indent_for_level(2),
         source_prefix=_derive_source_prefix(namespace, verbosity_tier),
     )
 
@@ -350,11 +353,12 @@ def format_judgement(
 
     IG-089: Shows meaningful judgement info without raw intermediate data.
     IG-XXX: Prominent reasoning display with "Reason:" prefix for clarity.
+    IG-265: Removed [new]/[keep] badge from CLI display (kept in event data for logs).
 
     Args:
         judgement: Human-readable summary of the decision.
         action: Action taken ("continue" or "complete").
-        plan_action: When set, show ``[keep]`` or ``[new]`` before the judgement text.
+        plan_action: Ignored (kept for backward compatibility, appears in logs only).
         namespace: Event namespace.
         verbosity_tier: Current verbosity tier.
 
@@ -363,12 +367,8 @@ def format_judgement(
     """
     action_icon = "○" if action == "continue" else "●"  # Polish: ○ for continue, ● for complete
 
-    badge = ""
-    if plan_action in ("keep", "new"):
-        badge = f"[{plan_action}] "
-
-    # Polish: Add "Reason:" prefix to make LLM reasoning prominent
-    content = f"🌀 {badge}{judgement}"
+    # IG-265: Remove badge from CLI display (plan_action kept in event data for logs)
+    content = f"🌟 {judgement}"
 
     return DisplayLine(
         level=2,  # Use level 2 for more prominence (like step headers)
@@ -411,7 +411,7 @@ def format_step_done(
 
     # Success case: single line
     if success:
-        content = f"Done{tool_info}"
+        content = f"✓ Done{tool_info}"
         return [
             DisplayLine(
                 level=3,  # Child node of step header (level 2)
@@ -427,7 +427,7 @@ def format_step_done(
     lines = [
         DisplayLine(
             level=3,
-            content=f"Failed{tool_info}",
+            content=f"✗ Failed{tool_info}",
             icon="└─",  # IG-257: Unicode tree branch (U+2514)
             indent=indent_for_level(3),
             duration_ms=duration_ms,

{soothe_cli-0.4.0 → soothe_cli-0.4.1}/src/soothe_cli/cli/stream/pipeline.py

@@ -42,6 +42,9 @@ GOAL_COMPLETE_EVENTS = {
     "soothe.cognition.agent_loop.completed",
 }
 
+# IG-264: Default goal completion message (skip display to avoid redundancy)
+DEFAULT_GOAL_ACHIEVED_MESSAGE = "Goal achieved successfully"
+
 # Verbosity tier mapping
 _VERBOSITY_TO_TIER = {
     "quiet": VerbosityTier.QUIET,
@@ -197,13 +200,16 @@ class StreamDisplayPipeline:
         Returns:
             Display lines for goal header.
         """
-        goal = event.get("goal", event.get("goal_description", ""))
+        # IG-262: Prefer friendly_message over goal/goal_description
+        friendly_message = event.get("friendly_message")
+        goal = friendly_message or event.get("goal", event.get("goal_description", ""))
         if not goal:
             return []
 
         # Reset context for new goal
         self._context.reset_goal()
-        self._context.current_goal = goal
+        # Store the actual goal description (not friendly message) for context tracking
+        self._context.current_goal = event.get("goal", event.get("goal_description", goal))
         self._context.goal_start_time = time.time()
 
         # Get steps count if available
@@ -636,7 +642,8 @@ class StreamDisplayPipeline:
             )
         else:
             reasoning = event.get("reasoning", "").strip()
-            if reasoning:
+            # IG-264: Skip redundant reasoning when it's the default goal message
+            if reasoning and reasoning != DEFAULT_GOAL_ACHIEVED_MESSAGE:
                 lines.append(
                     format_reasoning(
                         reasoning,

{soothe_cli-0.4.0 → soothe_cli-0.4.1}/src/soothe_cli/shared/event_processor.py

@@ -705,7 +705,7 @@ class EventProcessor:
 
         # Handle output events (chitchat, quiz, final report, etc.) through unified registry
         # IG-254: Single source of truth for user-visible output events
-        if is_output_event(etype):
+        if is_output_event(etype) and etype != "soothe.cognition.agent_loop.completed":
             content = extract_output_text(etype, data)
             if content and self._presentation.tier_visible(VerbosityTier.QUIET, self._verbosity):
                 cleaned = self._clean_assistant_text(content)

{soothe_cli-0.4.0 → soothe_cli-0.4.1}/src/soothe_cli/shared/message_processing.py

@@ -444,13 +444,23 @@ def format_tool_call_args(tool_name: str, tool_call: dict[str, Any]) -> str:
     values = []
     for key_arg in key_args:
         if key_arg in args:
-            value = str(args[key_arg])
+            raw_value = args[key_arg]
+            value = str(raw_value)
             # Convert and abbreviate path arguments
             if _is_path_arg_name(key_arg):
                 value = _display_path_value(value)
             elif len(value) > max_value_length:
                 # Truncate non-path long values
                 value = value[: max_value_length - 3] + "..."
+            # IG-261: Quote string arguments for Task tool (except subagent_type)
+            # Only quote if the original value is a string and not already quoted
+            if (
+                internal == "task"
+                and key_arg != "subagent_type"
+                and isinstance(raw_value, str)
+                and not (value.startswith('"') and value.endswith('"'))
+            ):
+                value = f'"{value}"'
             values.append(value)
 
     if not values:

{soothe_cli-0.4.0 → soothe_cli-0.4.1}/src/soothe_cli/shared/tool_formatters/__init__.py

@@ -13,6 +13,7 @@ from soothe_cli.shared.tool_formatters.file_ops import FileOpsFormatter
 from soothe_cli.shared.tool_formatters.goal_formatter import GoalFormatter
 from soothe_cli.shared.tool_formatters.media import MediaFormatter
 from soothe_cli.shared.tool_formatters.structured import StructuredFormatter
+from soothe_cli.shared.tool_formatters.subagent import SubagentFormatter
 from soothe_cli.shared.tool_formatters.web import WebFormatter
 
 __all__ = [
@@ -22,6 +23,7 @@ __all__ = [
     "FileOpsFormatter",
     "GoalFormatter",
     "MediaFormatter",
+    "SubagentFormatter",
     "StructuredFormatter",
     "WebFormatter",
 ]

soothe_cli-0.4.1/src/soothe_cli/shared/tool_formatters/subagent.py

@@ -0,0 +1,122 @@
+"""Subagent tool formatter for brief result display.
+
+Task and Research tools should show brief status, not full result content.
+"""
+
+from __future__ import annotations
+
+from typing import Any
+
+from soothe_cli.shared.tool_formatters.base import BaseFormatter
+from soothe_cli.shared.tool_output_formatter import ToolBrief
+
+
+class SubagentFormatter(BaseFormatter):
+    """Formatter for subagent tools (task, research).
+
+    Shows brief completion status without full result content.
+    """
+
+    def format(self, tool_name: str, result: Any) -> ToolBrief:
+        """Format subagent result with brief status.
+
+        Args:
+            tool_name: Name of the subagent tool (task, research).
+            result: Tool result (typically long text output).
+
+        Returns:
+            ToolBrief with brief status and optional short preview.
+
+        Example:
+            >>> formatter = SubagentFormatter()
+            >>> brief = formatter.format("task", "Long result text...")
+            >>> brief.to_display()
+            '✓ Completed'
+        """
+        # 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)
+
+            if is_error:
+                # Extract first line of error
+                first_line = result.split("\n")[0].strip()
+                error_preview = first_line[:80] if len(first_line) > 80 else first_line
+                return ToolBrief(
+                    icon="✗",
+                    summary="Failed",
+                    detail=error_preview,
+                    metrics={"error": True},
+                )
+
+            # Success - show brief status only, no content preview
+            # Subagent results are typically very long and should not be shown inline
+            return ToolBrief(
+                icon="✓",
+                summary="Completed",
+                detail=None,  # No content preview
+                metrics={"result_length": len(result)},
+            )
+
+        # Handle dict results
+        if isinstance(result, dict):
+            # Check for error field
+            if "error" in result:
+                error_msg = str(result["error"])[:80]
+                return ToolBrief(
+                    icon="✗",
+                    summary="Failed",
+                    detail=error_msg,
+                    metrics={"error": True},
+                )
+
+            # Success - show brief status
+            field_count = len(result)
+            return ToolBrief(
+                icon="✓",
+                summary="Completed",
+                detail=f"{field_count} fields",
+                metrics={"field_count": field_count},
+            )
+
+        # Handle ToolOutput (if available)
+        try:
+            from soothe_sdk.client.schemas import ToolOutput
+
+            if isinstance(result, ToolOutput):
+                if not result.success:
+                    error_msg = result.error[:80] if result.error else "Unknown error"
+                    return ToolBrief(
+                        icon="✗",
+                        summary="Failed",
+                        detail=error_msg,
+                        metrics={"error": True, "error_type": result.error_type},
+                    )
+
+                # Success with ToolOutput
+                if result.is_silent_failure():
+                    return ToolBrief(
+                        icon="⚠",
+                        summary="No result",
+                        detail="Tool succeeded but returned no data",
+                        metrics={"silent_failure": True},
+                    )
+
+                # Has data - show brief status
+                return ToolBrief(
+                    icon="✓",
+                    summary="Completed",
+                    detail=None,  # No content preview
+                    metrics={"has_data": result.data is not None},
+                )
+        except ImportError:
+            pass  # ToolOutput not available
+
+        # Fallback for unknown types
+        return ToolBrief(
+            icon="✓",
+            summary="Completed",
+            detail=None,
+            metrics={},
+        )

{soothe_cli-0.4.0 → soothe_cli-0.4.1}/src/soothe_cli/shared/tool_output_formatter.py

@@ -161,6 +161,7 @@ class ToolOutputFormatter:
                 GoalFormatter,
                 MediaFormatter,
                 StructuredFormatter,
+                SubagentFormatter,
                 WebFormatter,
             )
 
@@ -176,6 +177,9 @@ class ToolOutputFormatter:
             if category == "execution":
                 formatter = ExecutionFormatter()
                 return formatter.format(tool_name, result)
+            if category == "subagent":
+                formatter = SubagentFormatter()
+                return formatter.format(tool_name, result)
             if category == "media":
                 formatter = MediaFormatter()
                 return formatter.format(tool_name, result)

{soothe_cli-0.4.0 → soothe_cli-0.4.1}/src/soothe_cli/tui/tool_display.py

@@ -10,7 +10,7 @@ from contextlib import suppress
 from pathlib import Path
 from typing import Any
 
-from soothe_sdk.utils import get_all_path_arg_keys, get_tool_meta, get_tool_pascal_name
+from soothe_sdk.utils import get_all_path_arg_keys, get_tool_display_name, get_tool_meta
 
 from soothe_cli.shared.message_processing import (
     _normalize_tool_name_for_arg_map,
@@ -136,7 +136,7 @@ def format_tool_display(tool_name: str, tool_args: dict) -> str:
     tool_args = extract_tool_args_dict(tool_args) if tool_args else {}
     tool_key = _normalize_tool_name_for_arg_map(tool_name or "")
     # Get PascalCase display name for all return statements
-    pascal_name = get_tool_pascal_name(tool_key)
+    pascal_name = get_tool_display_name(tool_key)
 
     def abbreviate_path(path_str: str, max_length: int = 60) -> str:
         """Abbreviate a file path intelligently - show basename or relative path.