soothe-cli 0.2.0__tar.gz → 0.3.4__tar.gz

{soothe_cli-0.2.0 → soothe_cli-0.3.4}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: soothe-cli
-Version: 0.2.0
-Summary: Soothe CLI client - communicates with daemon via WebSocket (updated for SDK v0.4.0)
+Version: 0.3.4
+Summary: Soothe CLI client - communicates with daemon via WebSocket
 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.4.0
+Requires-Dist: soothe-sdk<1.0.0,>=0.3.3
 Requires-Dist: textual>=0.40.0
 Requires-Dist: typer<1.0.0,>=0.9.0
 Requires-Dist: websockets>=12.0

{soothe_cli-0.2.0 → soothe_cli-0.3.4}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "hatchling.build"
 
 [project]
 name = "soothe-cli"
-version = "0.2.0"
-description = "Soothe CLI client - communicates with daemon via WebSocket (updated for SDK v0.4.0)"
+dynamic = ["version"]
+description = "Soothe CLI client - communicates with daemon via WebSocket"
 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.4.0,<1.0.0",     # WebSocket client, protocol, types (v0.4.0 breaking change)
+    "soothe-sdk>=0.3.3,<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
@@ -71,8 +71,12 @@ ignore = ["E501"]
 [tool.ruff.format]
 docstring-code-format = true
 
+[tool.hatch.version]
+path = "../../VERSION"
+pattern = "^(?P<version>[0-9]+\\.[0-9]+\\.[0-9]+)$"
+
 [tool.mypy]
 python_version = "3.11"
 warn_return_any = true
 warn_unused_configs = true
-disallow_untyped_defs = true
+disallow_untyped_defs = true

{soothe_cli-0.2.0 → soothe_cli-0.3.4}/src/soothe_cli/cli/commands/autopilot_cmd.py

@@ -40,7 +40,6 @@ def run(
         autonomous=True,
         max_iterations=max_iterations,
         output_format=output_format,
-        verbosity=None,
     )
 
 

{soothe_cli-0.2.0 → soothe_cli-0.3.4}/src/soothe_cli/cli/commands/run_cmd.py

@@ -4,11 +4,10 @@ import logging
 import sys
 import time
 from pathlib import Path
-from typing import Literal
 
 import typer
 from soothe_sdk.client.config import SOOTHE_HOME
-from soothe_sdk.utils.logging import VERBOSITY_TO_LOG_LEVEL
+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
@@ -24,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:
-            # CLIConfig is a dataclass, update verbosity directly
-            cfg.verbosity = verbosity
-        log_level = VERBOSITY_TO_LOG_LEVEL.get(cfg.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)
 
@@ -72,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)

{soothe_cli-0.2.0 → soothe_cli-0.3.4}/src/soothe_cli/cli/commands/thread_cmd.py

@@ -12,7 +12,7 @@ from typing import Annotated, Any
 import typer
 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 VERBOSITY_TO_LOG_LEVEL
+from soothe_sdk.utils.logging import resolve_cli_log_level
 
 from soothe_cli.shared import load_config
 
@@ -209,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)
@@ -246,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.2.0 → soothe_cli-0.3.4}/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.2.0 → soothe_cli-0.3.4}/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.2.0 → soothe_cli-0.3.4}/src/soothe_cli/cli/renderer.py

@@ -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.2.0 → soothe_cli-0.3.4}/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,
     *,
@@ -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)
@@ -436,6 +461,7 @@ __all__ = [
     "format_goal_done",
     "format_goal_header",
     "format_judgement",
+    "format_plan_phase_reasoning",
     "format_reasoning",
     "format_step_done",
     "format_step_header",

{soothe_cli-0.2.0 → soothe_cli-0.3.4}/src/soothe_cli/cli/stream/pipeline.py

@@ -15,6 +15,7 @@ from soothe_cli.cli.stream.formatter import (
     format_goal_done,
     format_goal_header,
     format_judgement,
+    format_plan_phase_reasoning,
     format_reasoning,
     format_step_done,
     format_step_header,
@@ -175,8 +176,8 @@ class StreamDisplayPipeline:
                 if "judgement" in action:
                     return self._on_subagent_judgement(event)
 
-                # Step events (browser automation steps)
-                if "step" in action and "running" in action:
+                # Step events (browser automation): type ends with .step.running
+                if len(parts) >= 5 and parts[3] == "step" and parts[4] == "running":  # noqa: PLR2004
                     return self._on_capability_step(event, subagent)
 
                 # Completed events
@@ -572,25 +573,50 @@ class StreamDisplayPipeline:
         # Determine action type
         action = "complete" if status == "done" else "continue"
 
+        raw_plan_action = event.get("plan_action")
+        plan_action_kw: str | None = raw_plan_action if raw_plan_action in ("keep", "new") else None
+
         lines = [
             format_judgement(
                 action_text,
                 action,
+                plan_action=plan_action_kw,
                 namespace=self._current_namespace,
                 verbosity_tier=self._verbosity_tier,
             )
         ]
 
-        # Add reasoning line if present (IG-XXX: Show internal technical analysis)
-        reasoning = event.get("reasoning", "").strip()
-        if reasoning:
-            lines.append(
-                format_reasoning(
-                    reasoning,
-                    namespace=self._current_namespace,
-                    verbosity_tier=self._verbosity_tier,
+        assessment = event.get("assessment_reasoning", "").strip()
+        plan_reasoning = event.get("plan_reasoning", "").strip()
+        if assessment or plan_reasoning:
+            if assessment:
+                lines.append(
+                    format_plan_phase_reasoning(
+                        "Assessment",
+                        assessment,
+                        namespace=self._current_namespace,
+                        verbosity_tier=self._verbosity_tier,
+                    )
+                )
+            if plan_reasoning:
+                lines.append(
+                    format_plan_phase_reasoning(
+                        "Plan",
+                        plan_reasoning,
+                        namespace=self._current_namespace,
+                        verbosity_tier=self._verbosity_tier,
+                    )
+                )
+        else:
+            reasoning = event.get("reasoning", "").strip()
+            if reasoning:
+                lines.append(
+                    format_reasoning(
+                        reasoning,
+                        namespace=self._current_namespace,
+                        verbosity_tier=self._verbosity_tier,
+                    )
                 )
-            )
 
         return lines
 

soothe_cli-0.3.4/src/soothe_cli/config/__init__.py

@@ -0,0 +1,5 @@
+"""CLI configuration package."""
+
+from soothe_cli.config.cli_config import CLI_CONFIG_FILE, CLIConfig
+
+__all__ = ["CLI_CONFIG_FILE", "CLIConfig"]

{soothe_cli-0.2.0 → soothe_cli-0.3.4}/src/soothe_cli/config/cli_config.py

@@ -6,6 +6,11 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any
 
+from soothe_sdk.client.config import SOOTHE_HOME
+
+# Sole on-disk location for CLI client settings (WebSocket address, progress verbosity, …).
+CLI_CONFIG_FILE = Path(SOOTHE_HOME) / "config" / "cli_config.yml"
+
 
 @dataclass
 class CLIConfig:
@@ -19,8 +24,11 @@ class CLIConfig:
     daemon_host: str = "127.0.0.1"
     daemon_port: int = 8765
 
-    # CLI behavior
+    # CLI behavior — verbosity: progress/event display (quiet … debug).
     verbosity: str = "normal"
+    # logging_level: DEBUG/INFO/… for ~/.soothe/logs/soothe-cli.log; None = derive from verbosity.
+    logging_level: str | None = None
+
     output_format: str = "text"
 
     # Paths
@@ -81,7 +89,7 @@ class CLIConfig:
         import yaml
 
         if config_path is None:
-            config_path = Path.home() / ".soothe" / "config" / "cli_config.yml"
+            config_path = CLI_CONFIG_FILE
 
         if not config_path.exists():
             return cls()  # Use defaults
@@ -94,10 +102,15 @@ class CLIConfig:
         transports = daemon_section.get("transports", {})
         websocket = transports.get("websocket", {})
 
+        raw_level = data.get("logging_level")
+        if raw_level is not None and not isinstance(raw_level, str):
+            raw_level = None
+
         return cls(
             daemon_host=websocket.get("host", "127.0.0.1"),
             daemon_port=websocket.get("port", 8765),
-            verbosity=data.get("logging", {}).get("verbosity", "normal"),
+            verbosity=data.get("verbosity", "normal"),
+            logging_level=raw_level,
             soothe_home=Path(data.get("home", str(Path.home() / ".soothe"))),
         )
 
@@ -113,10 +126,17 @@ class CLIConfig:
         Returns:
             CLIConfig with WebSocket settings extracted.
         """
+        level_from_full = getattr(soothe_config.logging, "level", None)
+        if isinstance(level_from_full, str) and level_from_full.strip():
+            logging_level = level_from_full.strip()
+        else:
+            logging_level = None
+
         return cls(
             daemon_host=soothe_config.daemon.transports.websocket.host,
             daemon_port=soothe_config.daemon.transports.websocket.port,
             verbosity=soothe_config.logging.verbosity,
+            logging_level=logging_level,
             soothe_home=Path(soothe_config.home),
         )
 
@@ -147,7 +167,11 @@ class CLIConfig:
     @property
     def logging(self) -> Any:
         """Compatibility property: return logging config structure."""
-        return type("LoggingConfig", (), {"verbosity": self.verbosity})()
+        return type(
+            "LoggingConfig",
+            (),
+            {"verbosity": self.verbosity, "level": self.logging_level},
+        )()
 
     @property
     def home(self) -> str:

{soothe_cli-0.2.0 → soothe_cli-0.3.4}/src/soothe_cli/shared/__init__.py

@@ -35,6 +35,7 @@ from soothe_cli.shared.event_processor import EventProcessor
 from soothe_cli.shared.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,
@@ -75,6 +76,7 @@ __all__ = [
     "VerbosityLevel",
     "accumulate_tool_call_chunks",
     "coerce_tool_call_args_to_dict",
+    "extract_tool_args_dict",
     # Display Policy (unified filtering module)
     "create_display_policy",
     "extract_tool_brief",

{soothe_cli-0.2.0 → soothe_cli-0.3.4}/src/soothe_cli/shared/command_router.py

@@ -12,6 +12,8 @@ import json
 import logging
 from typing import TYPE_CHECKING, Any
 
+from soothe_cli.shared.subagent_routing import parse_subagent_from_input
+
 if TYPE_CHECKING:
     from rich.console import Console
     from soothe_sdk.client import WebSocketClient
@@ -224,15 +226,19 @@ async def handle_rpc_command(
 
 
 async def handle_routing_command(cmd_input: str, console: Console, client: WebSocketClient) -> None:
-    """Handle daemon routing command by sending plain text input (RFC-404).
+    """Handle daemon routing command by sending input with optional subagent (RFC-404).
+
+    For ``/browser``, ``/claude``, and ``/research``, sets the WebSocket ``subagent``
+    field (same contract as headless ``-p``) so the daemon uses direct subagent routing.
+    Other routing commands (e.g. ``/plan``) are sent as plain text unchanged.
 
     Args:
         cmd_input: Full command input (e.g., "/browser AI trends")
         console: Rich console
         client: WebSocket client
     """
-    # Send as plain text - daemon input parser will route
-    await client.send_input(cmd_input)
+    subagent_name, text = parse_subagent_from_input(cmd_input.strip())
+    await client.send_input(text, subagent=subagent_name)
 
 
 __all__ = [

soothe_cli-0.3.4/src/soothe_cli/shared/config_loader.py

@@ -0,0 +1,64 @@
+"""Configuration loading utilities (IG-174 Phase 3)."""
+
+import logging
+import time
+from pathlib import Path
+
+from dotenv import load_dotenv
+
+from soothe_cli.config.cli_config import CLI_CONFIG_FILE, CLIConfig
+
+logger = logging.getLogger(__name__)
+
+# Config cache for performance
+_config_cache: dict[str, CLIConfig] = {}
+
+
+def load_config(config_path: str | None = None) -> CLIConfig:
+    """Load CLI client configuration from ``cli_config.yml`` only.
+
+    Client settings (WebSocket endpoint, progress verbosity, etc.) always come from
+    :data:`~soothe_cli.config.cli_config.CLI_CONFIG_FILE`. The optional ``config_path``
+    argument is accepted for backward compatibility with existing ``--config`` flags
+    but is **ignored**; a warning is logged when it is non-``None``.
+
+    Args:
+        config_path: Deprecated. If set, ignored after logging a warning.
+
+    Returns:
+        A ``CLIConfig`` instance.
+    """
+    # Load environment variables from .env file
+    # This ensures LangSmith and other env vars are available
+    load_dotenv()
+
+    if config_path is not None:
+        logger.warning(
+            "Ignoring --config %s; CLI client settings are loaded only from %s",
+            config_path,
+            CLI_CONFIG_FILE,
+        )
+
+    cache_key = str(CLI_CONFIG_FILE)
+
+    # Check cache first
+    if cache_key in _config_cache:
+        logger.debug("Config loaded from cache: %s", cache_key)
+        return _config_cache[cache_key]
+
+    load_start = time.perf_counter()
+
+    config = CLIConfig.from_config_file(CLI_CONFIG_FILE)
+    _config_cache[cache_key] = config
+
+    elapsed_ms = (time.perf_counter() - load_start) * 1000
+    if Path(CLI_CONFIG_FILE).is_file():
+        logger.info("Loaded CLI config from '%s' in %.1fms", CLI_CONFIG_FILE, elapsed_ms)
+    else:
+        logger.debug(
+            "CLI config file missing at %s; using defaults (%.1fms)",
+            CLI_CONFIG_FILE,
+            elapsed_ms,
+        )
+
+    return config

{soothe_cli-0.2.0 → soothe_cli-0.3.4}/src/soothe_cli/shared/display_policy.py

@@ -58,6 +58,23 @@ def normalize_verbosity(verbosity: str) -> VerbosityLevel:
     return "normal"
 
 
+def should_show_tool_call_ui(verbosity: str | VerbosityLevel) -> bool:
+    """Whether the TUI should mount tool-call rows (``ToolCallMessage`` / tool output).
+
+    Controlled only by ``logging.verbosity`` in the CLI client config
+    (``~/.soothe/config/cli_config.yml``), same scale as CLI progress — not by
+    LangGraph namespace or event type. ``quiet`` hides tool UI; other levels show it.
+
+    Args:
+        verbosity: Raw or normalized verbosity string (e.g. from ``cli_config.yml``).
+
+    Returns:
+        False when verbosity is ``quiet``; True for ``normal``, ``detailed``, and ``debug``.
+    """
+    v = normalize_verbosity(verbosity) if isinstance(verbosity, str) else verbosity
+    return v != "quiet"
+
+
 # =============================================================================
 # Policy Configuration Constants
 # =============================================================================
@@ -406,4 +423,6 @@ __all__ = [
     "VerbosityLevel",
     "VerbosityTier",
     "create_display_policy",
+    "normalize_verbosity",
+    "should_show_tool_call_ui",
 ]