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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soothe-cli
-Version: 0.3.8
+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
@@ -21,7 +21,7 @@ Requires-Python: <3.15,>=3.11
 Requires-Dist: python-dotenv<2.0.0,>=1.0.0
 Requires-Dist: pyyaml<7.0.0,>=6.0.0
 Requires-Dist: rich>=13.0.0
-Requires-Dist: soothe-sdk<1.0.0,>=0.3.3
+Requires-Dist: soothe-sdk<1.0.0,>=0.4.0
 Requires-Dist: textual>=0.40.0
 Requires-Dist: typer<1.0.0,>=0.9.0
 Requires-Dist: websockets>=12.0
@@ -96,5 +96,5 @@ tui:
 
 ## Related Packages
 
-- **soothe-daemon**: Server package (agent runtime)
+- **soothed**: Server package (agent runtime)
 - **soothe-sdk**: Shared SDK (WebSocket client, types)

{soothe_cli-0.3.8 → soothe_cli-0.4.1}/README.md

@@ -61,5 +61,5 @@ tui:
 
 ## Related Packages
 
-- **soothe-daemon**: Server package (agent runtime)
+- **soothed**: Server package (agent runtime)
 - **soothe-sdk**: Shared SDK (WebSocket client, types)

{soothe_cli-0.3.8 → soothe_cli-0.4.1}/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dependencies = [
-    "soothe-sdk>=0.3.3,<1.0.0",     # WebSocket client, protocol, types
+    "soothe-sdk>=0.4.0,<1.0.0",     # WebSocket client, protocol, types
     "typer>=0.9.0,<1.0.0",          # CLI framework
     "textual>=0.40.0",              # TUI framework
     "rich>=13.0.0",                 # Console output

{soothe_cli-0.3.8 → soothe_cli-0.4.1}/src/soothe_cli/cli/commands/thread_cmd.py

@@ -31,7 +31,7 @@ def _require_daemon(ws_url: str) -> None:
     live = asyncio.run(_check_daemon(ws_url))
     if not live:
         typer.echo(
-            "Error: Daemon not running. Start with 'soothe daemon start'.",
+            "Error: Daemon not running. Start with 'soothed start'.",
             err=True,
         )
         sys.exit(1)

{soothe_cli-0.3.8 → soothe_cli-0.4.1}/src/soothe_cli/cli/execution/headless.py

@@ -32,7 +32,7 @@ def run_headless(
     Connects to running daemon via WebSocket if available to avoid RocksDB lock conflicts.
     Auto-starts daemon if not running (RFC-0013 daemon lifecycle).
 
-    Note (RFC-0013): Daemon persists after request completion. Use 'soothe-daemon stop'
+    Note (RFC-0013): Daemon persists after request completion. Use 'soothed stop'
     to explicitly shutdown the daemon.
     """
     from soothe_cli.cli.execution.daemon import run_headless_via_daemon
@@ -91,9 +91,7 @@ def run_headless(
 
     # Handle daemon fallback (unresponsive daemon)
     if daemon_exit_code == _DAEMON_FALLBACK_EXIT_CODE:
-        typer.echo(
-            "Error: Daemon is unresponsive. Please restart with 'soothe-daemon restart'", err=True
-        )
+        typer.echo("Error: Daemon is unresponsive. Please restart with 'soothed restart'", err=True)
         sys.exit(1)
 
     sys.exit(daemon_exit_code)

{soothe_cli-0.3.8 → soothe_cli-0.4.1}/src/soothe_cli/cli/main.py

@@ -87,7 +87,7 @@ def main(
 
     Run without arguments for interactive TUI mode, or provide a prompt via --prompt/-p option.
 
-    Note: This is the CLI client. Use 'soothe-daemon' command to manage the daemon server.
+    Note: This is the CLI client. Use 'soothed' command to manage the daemon server.
 
     Examples:
         soothe                           # Interactive TUI mode

{soothe_cli-0.3.8 → soothe_cli-0.4.1}/src/soothe_cli/cli/renderer.py

@@ -12,8 +12,8 @@ import time
 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_display_name
-from soothe_sdk.verbosity import VerbosityTier
 
 from soothe_cli.cli.stream import DisplayLine, StreamDisplayPipeline
 from soothe_cli.cli.utils import make_tool_block
@@ -111,6 +111,16 @@ class CliRenderer:
         """Shared presentation policy used with StreamDisplayPipeline and EventProcessor."""
         return self._presentation
 
+    def _is_inside_step_context(self) -> bool:
+        """Check if we're inside an active step (for indentation).
+
+        IG-257: Used to determine if tool calls/results should be indented as tree children.
+
+        Returns:
+            True if current_step_id is set in pipeline context.
+        """
+        return self._pipeline._context.current_step_id is not None
+
     def write_lines(self, lines: list[DisplayLine]) -> None:
         """Write display lines to stderr.
 
@@ -221,6 +231,11 @@ class CliRenderer:
         # Use display helper for consistency with TUI (RFC-0020 Principle 5)
         tool_block = make_tool_block(display_name, args_str, status="running")
 
+        # IG-257: Add indentation when inside step context
+        # Unicode U+2514 "└─" (Box Drawings Light Up and Right) for tree branch
+        if self._is_inside_step_context():
+            tool_block = f"  └─ {tool_block}"
+
         # Track start time for duration display (RFC-0020)
         if tool_call_id:
             self._state.tool_call_start_times[tool_call_id] = time.time()
@@ -272,6 +287,11 @@ class CliRenderer:
         if duration_ms > 0:
             result_line += f" ({duration_ms}ms)"
 
+        # IG-257: Add indentation when inside step context
+        # Unicode U+2514 "└─" (Box Drawings Light Up and Right) for tree branch
+        if self._is_inside_step_context():
+            result_line = f"  └─ {result_line}"
+
         sys.stderr.write(result_line + "\n")
         sys.stderr.flush()
 

{soothe_cli-0.3.8 → soothe_cli-0.4.1}/src/soothe_cli/cli/stream/context.py

@@ -62,6 +62,8 @@ class PipelineContext:
     # Subagent tracking
     subagent_name: str | None = None
     subagent_milestones: list[str] = field(default_factory=list)
+    subagent_completion_shown: bool = False  # IG-255: Track if completion already displayed
+    subagent_result_preview: str = ""  # IG-255: Cache result preview for deduplication
 
     def reset_goal(self) -> None:
         """Reset goal-related state."""
@@ -84,6 +86,8 @@ class PipelineContext:
         self.parallel_header_emitted = False
         self.subagent_name = None
         self.subagent_milestones.clear()
+        self.subagent_completion_shown = False  # IG-255: Reset completion flag
+        self.subagent_result_preview = ""  # IG-255: Reset result preview
         # Don't clear _active_step_ids here - it's cleared when steps complete
 
     def complete_step(self, step_id: str) -> None:

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

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from soothe_sdk.verbosity import VerbosityTier
+from soothe_sdk.core.verbosity import VerbosityTier
+from soothe_sdk.utils import get_tool_display_name
 
 from soothe_cli.cli.stream.display_line import DisplayLine, indent_for_level
 
@@ -95,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,
@@ -125,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,
@@ -143,24 +144,33 @@ def format_tool_call(
     namespace: tuple[str, ...] = (),
     verbosity_tier: VerbosityTier = VerbosityTier.NORMAL,
 ) -> DisplayLine:
-    """Format a tool call line.
+    """Format a tool/subagent call line.
+
+    IG-256: Restored uniform tool display - no subagent differentiation.
+    All tools/subagents use same wrench emoji and gear icon.
 
     Args:
-        name: Tool name.
-        args_summary: Truncated args.
-        running: Whether tool is in parallel mode.
+        name: Tool or subagent name.
+        args_summary: Truncated args or query preview.
+        running: Whether tool/subagent is running.
         namespace: Event namespace.
         verbosity_tier: Current verbosity tier.
 
     Returns:
-        DisplayLine for tool call.
+        DisplayLine for tool/subagent call with uniform wrench icon.
     """
-    # Add inline symbol for tool execution
-    content = f"🔧 {name}({args_summary})"
+    # Transform to PascalCase for display
+    display_name = get_tool_display_name(name)
+
+    # IG-256: No differentiation - use wrench for all tools/subagents
+    icon_emoji = "🔧"
+    icon_char = "⚙"
+
+    content = f"{icon_emoji} {display_name}({args_summary})"
     return DisplayLine(
         level=2,
         content=content,
-        icon="⚙",
+        icon=icon_char,
         indent=indent_for_level(2),
         status="running" if running else None,
         source_prefix=_derive_source_prefix(namespace, verbosity_tier),
@@ -206,17 +216,19 @@ def format_subagent_milestone(
     namespace: tuple[str, ...] = (),
     verbosity_tier: VerbosityTier = VerbosityTier.NORMAL,
 ) -> DisplayLine:
-    """Format a subagent milestone line.
+    """Format a subagent milestone line showing progress.
+
+    IG-256: Restored detective emoji for subagent milestones.
 
     Args:
-        brief: Milestone description.
+        brief: Milestone description (e.g., "Step 3: click on login").
         namespace: Event namespace.
         verbosity_tier: Current verbosity tier.
 
     Returns:
-        DisplayLine for milestone.
+        DisplayLine for milestone with detective emoji.
     """
-    # Add inline symbol for subagent investigation
+    # IG-256: Use detective emoji for milestones (restored from IG-255)
     content = f"🕵🏻‍♂️ {brief}"
     return DisplayLine(
         level=3,
@@ -230,24 +242,33 @@ def format_subagent_milestone(
 def format_subagent_done(
     summary: str,
     duration_s: float,
+    result_preview: str = "",
     *,
     namespace: tuple[str, ...] = (),
     verbosity_tier: VerbosityTier = VerbosityTier.NORMAL,
 ) -> DisplayLine:
-    """Format a subagent completion line.
+    """Format a subagent completion line with metrics.
+
+    IG-256: Restored verbose format with triple success markers and separate result display.
+    Result preview parameter is ignored - results show via separate tool events.
 
     Args:
-        summary: Completion summary.
+        summary: Completion summary with subagent-specific metrics (e.g., "success", "$1.23").
         duration_s: Duration in seconds.
+        result_preview: Ignored (kept for backward compatibility).
         namespace: Event namespace.
         verbosity_tier: Current verbosity tier.
 
     Returns:
-        DisplayLine for subagent done.
+        DisplayLine for subagent done with verbose triple markers.
     """
     duration_ms = int(duration_s * 1000)
-    # Add inline symbol for subagent investigation complete
-    content = f"🕵🏻‍♂️ Done: {summary}"
+
+    # IG-256: Verbose format restored - triple success markers, result shows separately
+    # Format: "✓ ✅ ✓ {summary}"
+    # result_preview is ignored - let result show via separate tool execution events
+    content = f"✓ ✅ ✓ {summary}"
+
     return DisplayLine(
         level=3,
         content=content,
@@ -269,8 +290,14 @@ def format_plan_phase_reasoning(
 
     IG-225: Uses level=2 (flat, no indent) for prominent visibility alongside step headers.
     Uses solid bullet ● (matching goal) to indicate reasoning phase is active.
+
+    IG-257: When label is empty, shows text without prefix (just emoji + text).
     """
-    content = f"💭 {label}: {text}"
+    # IG-257: Handle empty label (no prefix)
+    if label:
+        content = f"💭 {label}: {text}"
+    else:
+        content = f"💭 {text}"
     return DisplayLine(
         level=2,
         content=content,
@@ -291,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.
@@ -303,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),
     )
 
@@ -323,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.
 
@@ -336,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)
@@ -366,6 +393,8 @@ def format_step_done(
     IG-159/IG-182: Shows brief "Done"/"Failed" with tree connector as child of step header.
     No description repeat - user already saw it in the step header above.
 
+    IG-257: Uses Unicode tree branch "└─" (U+2514) for cleaner visual tree.
+
     Args:
         duration_s: Duration in seconds.
         tool_call_count: Number of tool calls made during step execution.
@@ -382,12 +411,12 @@ 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)
                 content=content,
-                icon="|__",  # Tree connector (IG-159)
+                icon="└─",  # IG-257: Unicode tree branch (U+2514)
                 indent=indent_for_level(3),
                 duration_ms=duration_ms,
                 source_prefix=_derive_source_prefix(namespace, verbosity_tier),
@@ -398,8 +427,8 @@ def format_step_done(
     lines = [
         DisplayLine(
             level=3,
-            content=f"Failed{tool_info}",
-            icon="|__",
+            content=f"✗ Failed{tool_info}",
+            icon="└─",  # IG-257: Unicode tree branch (U+2514)
             indent=indent_for_level(3),
             duration_ms=duration_ms,
             source_prefix=_derive_source_prefix(namespace, verbosity_tier),
@@ -412,7 +441,7 @@ def format_step_done(
             DisplayLine(
                 level=4,  # Error detail as child of failed result
                 content=f"Error: {error_msg}",
-                icon="|__",
+                icon="└─",  # IG-257: Unicode tree branch (U+2514)
                 indent=indent_for_level(4),
                 source_prefix=_derive_source_prefix(namespace, verbosity_tier),
             )