soothe-cli 0.1.0__tar.gz → 0.3.3__tar.gz

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/.gitignore

@@ -217,3 +217,4 @@ plot_*
 
 checkpoint.json
 manifest.json
+_bmad

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: soothe-cli
-Version: 0.1.0
-Summary: Soothe CLI client - communicates with daemon via WebSocket
+Version: 0.3.3
+Summary: Soothe CLI client - communicates with daemon via WebSocket (updated for SDK v0.4.0)
 Project-URL: Homepage, https://github.com/caesar0301/soothe
 Project-URL: Documentation, https://soothe.readthedocs.io
 Project-URL: Repository, https://github.com/caesar0301/soothe
@@ -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.2.0
+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

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "hatchling.build"
 
 [project]
 name = "soothe-cli"
-version = "0.1.0"
-description = "Soothe CLI client - communicates with daemon via WebSocket"
+version = "0.3.3"
+description = "Soothe CLI client - communicates with daemon via WebSocket (updated for SDK v0.4.0)"
 readme = "README.md"
 license = { text = "MIT" }
 requires-python = ">=3.11,<3.15"
@@ -23,7 +23,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dependencies = [
-    "soothe-sdk>=0.2.0,<1.0.0",     # WebSocket client, protocol, types
+    "soothe-sdk>=0.4.0,<1.0.0",     # WebSocket client, protocol, types (v0.4.0 breaking change)
     "typer>=0.9.0,<1.0.0",          # CLI framework
     "textual>=0.40.0",              # TUI framework
     "rich>=13.0.0",                 # Console output
@@ -75,4 +75,4 @@ docstring-code-format = true
 python_version = "3.11"
 warn_return_any = true
 warn_unused_configs = true
-disallow_untyped_defs = true
+disallow_untyped_defs = true

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/src/soothe_cli/cli/commands/autopilot_cmd.py

@@ -9,7 +9,7 @@ from __future__ import annotations
 from pathlib import Path
 
 import typer
-from soothe_sdk.protocol import preview_first
+from soothe_sdk.client.protocol import preview_first
 
 app = typer.Typer(help="Autopilot mode — long-running autonomous agent control.")
 
@@ -40,7 +40,6 @@ def run(
         autonomous=True,
         max_iterations=max_iterations,
         output_format=output_format,
-        verbosity=None,
     )
 
 
@@ -55,7 +54,7 @@ def submit(
     """
     from datetime import UTC, datetime
 
-    from soothe_sdk import SOOTHE_HOME
+    from soothe_sdk.client.config import SOOTHE_HOME
 
     inbox_dir = SOOTHE_HOME / "autopilot" / "inbox"
     inbox_dir.mkdir(parents=True, exist_ok=True)
@@ -72,7 +71,7 @@ def submit(
 @app.command("status")
 def status() -> None:
     """Show overall autopilot state."""
-    from soothe_sdk import SOOTHE_HOME
+    from soothe_sdk.client.config import SOOTHE_HOME
 
     autopilot_dir = SOOTHE_HOME / "autopilot"
     state_file = autopilot_dir / "status.json"
@@ -106,7 +105,7 @@ def list_goals(
     status_filter: str = typer.Option("", "--status", "-s", help="Filter by status."),
 ) -> None:
     """List all goals."""
-    from soothe_sdk import SOOTHE_HOME
+    from soothe_sdk.client.config import SOOTHE_HOME
 
     autopilot_dir = SOOTHE_HOME / "autopilot"
     goals = _discover_goals(autopilot_dir)
@@ -130,7 +129,7 @@ def show_goal(
     goal_id: str = typer.Argument(..., help="Goal ID to show details for."),
 ) -> None:
     """Show details for a specific goal."""
-    from soothe_sdk import SOOTHE_HOME
+    from soothe_sdk.client.config import SOOTHE_HOME
 
     autopilot_dir = SOOTHE_HOME / "autopilot"
     goals = _discover_goals(autopilot_dir)
@@ -160,7 +159,7 @@ def cancel_goal(
     goal_id: str = typer.Argument(..., help="Goal ID to cancel."),
 ) -> None:
     """Cancel a goal (remove from inbox if pending)."""
-    from soothe_sdk import SOOTHE_HOME
+    from soothe_sdk.client.config import SOOTHE_HOME
 
     inbox_dir = SOOTHE_HOME / "autopilot" / "inbox"
     if not inbox_dir.exists():
@@ -190,7 +189,7 @@ def approve_goal(
     """Approve a MUST-confirmation goal."""
     import json
 
-    from soothe_sdk import SOOTHE_HOME
+    from soothe_sdk.client.config import SOOTHE_HOME
 
     confirmations_file = SOOTHE_HOME / "autopilot" / "pending_confirmations.json"
     if not confirmations_file.exists():
@@ -223,7 +222,7 @@ def reject_goal(
     """Reject a proposed goal."""
     import json
 
-    from soothe_sdk import SOOTHE_HOME
+    from soothe_sdk.client.config import SOOTHE_HOME
 
     confirmations_file = SOOTHE_HOME / "autopilot" / "pending_confirmations.json"
     if not confirmations_file.exists():
@@ -248,7 +247,7 @@ def reject_goal(
 @app.command("wake")
 def wake() -> None:
     """Exit dreaming mode — resume active execution."""
-    from soothe_sdk import SOOTHE_HOME
+    from soothe_sdk.client.config import SOOTHE_HOME
 
     inbox_dir = SOOTHE_HOME / "autopilot" / "inbox"
     inbox_dir.mkdir(parents=True, exist_ok=True)
@@ -261,7 +260,7 @@ def wake() -> None:
 @app.command("dream")
 def dream() -> None:
     """Force enter dreaming mode."""
-    from soothe_sdk import SOOTHE_HOME
+    from soothe_sdk.client.config import SOOTHE_HOME
 
     inbox_dir = SOOTHE_HOME / "autopilot" / "inbox"
     inbox_dir.mkdir(parents=True, exist_ok=True)
@@ -276,7 +275,7 @@ def view_inbox(
     limit: int = typer.Option(10, "--limit", "-n", help="Max tasks to show."),
 ) -> None:
     """View pending inbox tasks."""
-    from soothe_sdk import SOOTHE_HOME
+    from soothe_sdk.client.config import SOOTHE_HOME
 
     inbox_dir = SOOTHE_HOME / "autopilot" / "inbox"
     if not inbox_dir.exists():

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/src/soothe_cli/cli/commands/config_cmd.py

@@ -113,7 +113,7 @@ def config_show(
         sys.exit(0)
     except Exception as e:
         logger.exception("Config command error")
-        from soothe_sdk import format_cli_error
+        from soothe_sdk.utils import format_cli_error
 
         typer.echo(f"Error: {format_cli_error(e)}", err=True)
         sys.exit(1)
@@ -137,7 +137,7 @@ def config_init(
     from importlib.resources import as_file, files
     from pathlib import Path
 
-    from soothe_sdk import SOOTHE_HOME
+    from soothe_sdk.client.config import SOOTHE_HOME
 
     home = Path(SOOTHE_HOME).expanduser()
     target = home / "config" / "config.yml"
@@ -209,7 +209,7 @@ def config_validate(
     """
     from pathlib import Path
 
-    from soothe_sdk import SOOTHE_HOME
+    from soothe_sdk.client.config import SOOTHE_HOME
 
     try:
         cfg = load_config(config)

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/src/soothe_cli/cli/commands/run_cmd.py

@@ -4,10 +4,10 @@ import logging
 import sys
 import time
 from pathlib import Path
-from typing import Literal
 
 import typer
-from soothe_sdk import SOOTHE_HOME, VERBOSITY_TO_LOG_LEVEL
+from soothe_sdk.client.config import SOOTHE_HOME
+from soothe_sdk.utils.logging import resolve_cli_log_level
 
 from soothe_cli.cli.execution import run_headless, run_tui
 from soothe_cli.shared import load_config, setup_logging
@@ -23,28 +23,24 @@ def run_impl(
     autonomous: bool,  # noqa: FBT001
     max_iterations: int | None,
     output_format: str,
-    verbosity: Literal["quiet", "minimal", "normal", "detailed", "debug"] | None,
 ) -> None:
     """Core implementation for running Soothe agent.
 
     Args:
         prompt: Optional prompt for headless mode
-        config: Path to config file
+        config: Deprecated; passed through for ``--config`` compatibility (ignored for
+            client settings; see ``load_config``).
         thread_id: Thread ID to resume
         no_tui: Force headless mode
         autonomous: Enable autonomous iteration mode
         max_iterations: Max iterations for autonomous mode
         output_format: Output format (text or jsonl)
-        verbosity: Verbosity level
     """
     startup_start = time.perf_counter()
 
     try:
         cfg = load_config(config)
-        if verbosity is not None:
-            logging_config = cfg.logging.model_copy(update={"verbosity": verbosity})
-            cfg = cfg.model_copy(update={"logging": logging_config})
-        log_level = VERBOSITY_TO_LOG_LEVEL.get(cfg.logging.verbosity, "INFO")
+        log_level = resolve_cli_log_level(cfg.verbosity, logging_level=cfg.logging_level)
         log_file = Path(SOOTHE_HOME) / "logs" / "soothe-cli.log"
         setup_logging(log_level, log_file=log_file)
 
@@ -71,7 +67,7 @@ def run_impl(
             )
         else:
             # TUI mode (with optional initial prompt)
-            run_tui(cfg, thread_id=thread_id, config_path=config, initial_prompt=prompt)
+            run_tui(cfg, thread_id=thread_id, initial_prompt=prompt)
 
         run_elapsed_s = time.perf_counter() - run_start
         typer.echo(f"Total running time: {run_elapsed_s:.2f}s", err=True)
@@ -81,7 +77,7 @@ def run_impl(
         sys.exit(0)
     except Exception as e:
         logger.exception("CLI run error")
-        from soothe_sdk import format_cli_error
+        from soothe_sdk.utils import format_cli_error
 
         typer.echo(f"Error: {format_cli_error(e)}", err=True)
         sys.exit(1)

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/src/soothe_cli/cli/commands/status_cmd.py

@@ -80,7 +80,7 @@ def agent_list(
         sys.exit(0)
     except Exception as e:
         logger.exception("Agent list error")
-        from soothe_sdk import format_cli_error
+        from soothe_sdk.utils import format_cli_error
 
         typer.echo(f"Error: {format_cli_error(e)}", err=True)
         sys.exit(1)
@@ -115,7 +115,7 @@ def agent_status(
         typer.echo(f"\nTotal: {enabled_count}/{total_count} agents enabled")
     except Exception as e:
         logger.exception("Agent status error")
-        from soothe_sdk import format_cli_error
+        from soothe_sdk.utils import format_cli_error
 
         typer.echo(f"Error: {format_cli_error(e)}", err=True)
         sys.exit(1)

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/src/soothe_cli/cli/commands/thread_cmd.py

@@ -10,8 +10,9 @@ from pathlib import Path
 from typing import Annotated, Any
 
 import typer
-from soothe_sdk import SOOTHE_HOME, VERBOSITY_TO_LOG_LEVEL
 from soothe_sdk.client import WebSocketClient, is_daemon_live, websocket_url_from_config
+from soothe_sdk.client.config import SOOTHE_HOME
+from soothe_sdk.utils.logging import resolve_cli_log_level
 
 from soothe_cli.shared import load_config
 
@@ -208,7 +209,10 @@ def thread_continue(
     from soothe_cli.shared import setup_logging
 
     cfg = load_config(config)
-    log_level = VERBOSITY_TO_LOG_LEVEL.get(cfg.logging.verbosity, "INFO")
+    log_level = resolve_cli_log_level(
+        cfg.logging.verbosity,
+        logging_level=cfg.logging.level,
+    )
     log_file = Path(SOOTHE_HOME) / "logs" / "soothe-cli.log"
     setup_logging(log_level, log_file=log_file)
     ws_url = websocket_url_from_config(cfg)
@@ -245,7 +249,7 @@ def thread_continue(
 
         thread_id = asyncio.run(get_last_thread_via_daemon())
 
-    run_tui(cfg, thread_id=thread_id, config_path=config)
+    run_tui(cfg, thread_id=thread_id)
 
 
 def thread_archive(

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/src/soothe_cli/cli/execution/daemon.py

@@ -178,13 +178,13 @@ async def run_headless_via_daemon(
 
     except (ConnectionError, OSError, TimeoutError) as e:
         logger.exception("Daemon connection failed")
-        from soothe_sdk import format_cli_error
+        from soothe_sdk.utils import format_cli_error
 
         typer.echo(f"Error: {format_cli_error(e, context='daemon connection')}", err=True)
         return _DAEMON_FALLBACK_EXIT_CODE
     except Exception as e:
         logger.exception("Failed to run via daemon")
-        from soothe_sdk import format_cli_error
+        from soothe_sdk.utils import format_cli_error
 
         typer.echo(f"Error: {format_cli_error(e)}", err=True)
         return 1

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/src/soothe_cli/cli/execution/launcher.py

@@ -11,7 +11,6 @@ def run_tui(
     cfg: CLIConfig,
     *,
     thread_id: str | None = None,
-    config_path: str | None = None,
     initial_prompt: str | None = None,
 ) -> None:
     """Launch the Textual TUI (with daemon auto-start)."""

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/src/soothe_cli/cli/main.py

@@ -7,7 +7,7 @@ from dotenv import load_dotenv
 load_dotenv()
 
 from importlib.metadata import version  # noqa: E402
-from typing import Annotated, Literal  # noqa: E402
+from typing import Annotated  # noqa: E402
 
 import typer  # noqa: E402
 
@@ -54,7 +54,11 @@ def main(
     ctx: typer.Context,
     config: Annotated[
         str | None,
-        typer.Option("--config", "-c", help="Path to configuration file."),
+        typer.Option(
+            "--config",
+            "-c",
+            help="Ignored for client settings; edit ~/.soothe/config/cli_config.yml instead.",
+        ),
     ] = None,
     prompt: Annotated[
         str | None,
@@ -70,14 +74,6 @@ def main(
         str,
         typer.Option("--format", "-f", help="Output format for headless mode: text or jsonl."),
     ] = "text",
-    verbosity: Annotated[
-        Literal["quiet", "minimal", "normal", "detailed", "debug"] | None,
-        typer.Option(
-            "--verbosity",
-            "-v",
-            help="Verbosity level: quiet, normal, detailed, debug. 'minimal' is accepted as an alias.",
-        ),
-    ] = None,
     show_help: Annotated[  # noqa: FBT002
         bool,
         typer.Option("--help", "-h", is_flag=True, help="Show this message and exit."),
@@ -96,7 +92,7 @@ def main(
     Examples:
         soothe                           # Interactive TUI mode
         soothe -p "Research AI advances" # Headless single-prompt mode
-        soothe --config custom.yml       # Use custom CLI config
+        soothe --config custom.yml       # Ignored for client settings; use ~/.soothe/config/cli_config.yml
         soothe thread list               # List conversation threads
     """
     # Handle -h/--help flag
@@ -121,7 +117,6 @@ def main(
             autonomous=False,
             max_iterations=None,
             output_format=output_format,
-            verbosity=verbosity,
         )
 
 

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/src/soothe_cli/cli/renderer.py

@@ -12,7 +12,7 @@ import time
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any
 
-from soothe_sdk import get_tool_display_name
+from soothe_sdk.utils import get_tool_display_name
 from soothe_sdk.verbosity import VerbosityTier
 
 from soothe_cli.cli.stream import DisplayLine, StreamDisplayPipeline
@@ -23,7 +23,7 @@ from soothe_cli.shared.presentation_engine import PresentationEngine
 from soothe_cli.shared.suppression_state import SuppressionState
 
 if TYPE_CHECKING:
-    from soothe_sdk import Plan
+    from soothe_sdk.client.schemas import Plan
 
 
 @dataclass
@@ -207,9 +207,9 @@ class CliRenderer:
         if not self._presentation.tier_visible(VerbosityTier.NORMAL, self._verbosity):
             return
 
-        # HARD SUPPRESS during multi-step execution (IG-143)
-        if self._state.suppression.should_suppress_output():
-            return
+        # Multi-step / agentic suppression applies to assistant stdout only (IG-143).
+        # Tool calls and results still stream to stderr at normal+ verbosity so headless
+        # runs show the same tool activity as the TUI.
 
         self._stderr_begin_icon_block()
 
@@ -251,9 +251,7 @@ class CliRenderer:
         if not self._presentation.tier_visible(VerbosityTier.NORMAL, self._verbosity):
             return
 
-        # HARD SUPPRESS during multi-step execution (IG-143)
-        if self._state.suppression.should_suppress_output():
-            return
+        # See on_tool_call: do not suppress stderr tool results during multi-step runs.
 
         self._stderr_begin_icon_block()
 

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/src/soothe_cli/cli/stream/display_line.py

@@ -66,18 +66,21 @@ class DisplayLine:
         return "".join(parts)
 
 
-def indent_for_level(_level: int) -> str:
+def indent_for_level(level: int) -> str:
     """Get indentation string for a display level.
 
-    Headless CLI uses a flat information stream (no tree connectors).
+    IG-182: Headless CLI uses flat layout for levels 1-2, but tree indentation
+    for level-3 child nodes (step results with "|__" connector).
 
     Args:
-        _level: Display level (1, 2, or 3); retained for API compatibility.
+        level: Display level (1=goal, 2=step/tool, 3=result child).
 
     Returns:
-        Indentation string (always empty for stream layout).
+        Indentation string: "" for level 1-2, "  " for level 3 (tree child).
     """
-    return ""
+    if level >= 3:  # noqa: PLR2004
+        return "  "  # 2-space indent for tree children (IG-182)
+    return ""  # Flat layout for goal/step headers
 
 
 __all__ = ["DisplayLine", "indent_for_level"]

{soothe_cli-0.1.0 → soothe_cli-0.3.3}/src/soothe_cli/cli/stream/formatter.py

@@ -261,6 +261,25 @@ def format_subagent_done(
     )
 
 
+def format_plan_phase_reasoning(
+    label: str,
+    text: str,
+    *,
+    namespace: tuple[str, ...] = (),
+    verbosity_tier: VerbosityTier = VerbosityTier.NORMAL,
+) -> DisplayLine:
+    """Format a labeled plan-phase reasoning line (assessment vs plan strategy)."""
+    content = f"💭 {label}: {text}"
+    return DisplayLine(
+        level=3,
+        content=content,
+        icon="•",
+        indent=indent_for_level(3),
+        source_prefix=_derive_source_prefix(namespace, verbosity_tier),
+        newline_before=True,
+    )
+
+
 def format_reasoning(
     reasoning: str,
     *,
@@ -280,7 +299,7 @@ def format_reasoning(
         DisplayLine for reasoning.
     """
     # Polish: Add "Reasoning:" prefix to make internal analysis visible
-    content = f"💭 Reasoning: {reasoning}"
+    content = f"💭 {reasoning}"
 
     return DisplayLine(
         level=3,  # Use level 3 for less prominence (subordinate to next_action)
@@ -296,6 +315,7 @@ def format_judgement(
     judgement: str,
     action: str,
     *,
+    plan_action: str | None = None,
     namespace: tuple[str, ...] = (),
     verbosity_tier: VerbosityTier = VerbosityTier.NORMAL,
 ) -> DisplayLine:
@@ -307,6 +327,7 @@ def format_judgement(
     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.
         namespace: Event namespace.
         verbosity_tier: Current verbosity tier.
 
@@ -315,8 +336,12 @@ def format_judgement(
     """
     action_icon = "→" if action == "continue" else "✓"
 
+    badge = ""
+    if plan_action in ("keep", "new"):
+        badge = f"[{plan_action}] "
+
     # Polish: Add "Reason:" prefix to make LLM reasoning prominent
-    content = f"🌀 {judgement}"
+    content = f"🌀 {badge}{judgement}"
 
     return DisplayLine(
         level=2,  # Use level 2 for more prominence (like step headers)
@@ -329,38 +354,72 @@ def format_judgement(
 
 
 def format_step_done(
-    description: str,
     duration_s: float,
     *,
     tool_call_count: int = 0,
+    success: bool = True,
+    error_msg: str | None = None,
     namespace: tuple[str, ...] = (),
     verbosity_tier: VerbosityTier = VerbosityTier.NORMAL,
-) -> DisplayLine:
-    """Format a step completion line with solid checkbox.
+) -> list[DisplayLine]:
+    """Format step completion as level-3 child node (IG-182).
+
+    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.
 
     Args:
-        description: Step description (same as header).
         duration_s: Duration in seconds.
         tool_call_count: Number of tool calls made during step execution.
+        success: Whether step succeeded.
+        error_msg: Error message if failed.
         namespace: Event namespace.
         verbosity_tier: Current verbosity tier.
 
     Returns:
-        DisplayLine for step done with solid circle icon.
+        List of DisplayLine objects for step result tree (1-2 lines).
     """
     duration_ms = int(duration_s * 1000)
-    # Abbreviate description for cleaner display
-    abbreviated = abbreviate_text(description, max_length=50)
     tool_info = f" [{tool_call_count} tools]" if tool_call_count > 0 else ""
-    content = f"✅ {abbreviated}{tool_info}"
-    return DisplayLine(
-        level=2,
-        content=content,
-        icon="●",  # Solid circle for completed step
-        indent=indent_for_level(2),
-        duration_ms=duration_ms,
-        source_prefix=_derive_source_prefix(namespace, verbosity_tier),
-    )
+
+    # Success case: single line
+    if success:
+        content = f"Done{tool_info}"
+        return [
+            DisplayLine(
+                level=3,  # Child node of step header (level 2)
+                content=content,
+                icon="|__",  # Tree connector (IG-159)
+                indent=indent_for_level(3),
+                duration_ms=duration_ms,
+                source_prefix=_derive_source_prefix(namespace, verbosity_tier),
+            )
+        ]
+
+    # Error case: result line + optional error detail
+    lines = [
+        DisplayLine(
+            level=3,
+            content=f"Failed{tool_info}",
+            icon="|__",
+            indent=indent_for_level(3),
+            duration_ms=duration_ms,
+            source_prefix=_derive_source_prefix(namespace, verbosity_tier),
+        )
+    ]
+
+    # Show error message on level-4 line if present
+    if error_msg:
+        lines.append(
+            DisplayLine(
+                level=4,  # Error detail as child of failed result
+                content=f"Error: {error_msg}",
+                icon="|__",
+                indent=indent_for_level(4),
+                source_prefix=_derive_source_prefix(namespace, verbosity_tier),
+            )
+        )
+
+    return lines
 
 
 def format_goal_done(
@@ -402,6 +461,7 @@ __all__ = [
     "format_goal_done",
     "format_goal_header",
     "format_judgement",
+    "format_plan_phase_reasoning",
     "format_reasoning",
     "format_step_done",
     "format_step_header",