soothe-cli 0.5.2__tar.gz → 0.5.4__tar.gz

{soothe_cli-0.5.2 → soothe_cli-0.5.4}/.gitignore

@@ -94,11 +94,7 @@ ipython_config.py
 #   install all needed dependencies.
 #Pipfile.lock
 
-# UV
-#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-uv.lock
+# UV — lockfile is committed for reproducible installs (Docker `uv sync --frozen`, CI).
 .uv/
 
 # poetry

{soothe_cli-0.5.2 → soothe_cli-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soothe-cli
-Version: 0.5.2
+Version: 0.5.4
 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.5.2 → soothe_cli-0.5.4}/src/soothe_cli/cli/commands/run_cmd.py

@@ -24,25 +24,29 @@ def run_impl(
     streaming_enabled: bool | None = None,
     streaming_mode: str | None = None,
     *,
+    tui_with_prompt: bool = False,
     config_path: str | None = None,
 ) -> None:
     """Core implementation for running Soothe agent.
 
     Args:
-        prompt: Optional prompt for headless mode
+        prompt: Optional user message; non-empty prompt defaults to a headless
+            one-shot run unless ``tui_with_prompt`` is set or a loop is being
+            resumed (``resume_loop_id``).
         resume_loop_id: Existing loop id to attach to (optional)
-        no_tui: Force headless mode
+        no_tui: Require headless mode (must include a non-empty prompt)
         autonomous: Enable autonomous iteration mode
         max_iterations: Max iterations for autonomous mode
         streaming_enabled: Override daemon streaming enabled setting (RFC-614)
         streaming_mode: Override daemon streaming mode ('streaming' or 'batch')
+        tui_with_prompt: When True with a prompt, open the TUI instead of headless.
     """
     startup_start = time.perf_counter()
 
     try:
         cfg = load_config(config_path)
         log_level = resolve_cli_log_level(logging_level=cfg.logging_level)
-        log_file = Path(SOOTHE_HOME) / "logs" / "soothe-cli.log"
+        log_file = Path(SOOTHE_HOME) / "logs" / "cli.log"
         setup_logging(log_level, log_file=log_file)
 
         # PostgreSQL availability check (requires daemon-side config)
@@ -62,17 +66,31 @@ def run_impl(
 
         run_start = time.perf_counter()
 
-        if no_tui:
-            # Headless mode (force no TUI)
+        has_prompt = bool(prompt and str(prompt).strip())
+        attaching_loop = bool(resume_loop_id and str(resume_loop_id).strip())
+
+        if tui_with_prompt and has_prompt:
+            use_headless = False
+        elif no_tui and not has_prompt:
+            typer.echo(
+                "Error: --no-tui requires a non-empty --prompt (-p).",
+                err=True,
+            )
+            sys.exit(1)
+        elif no_tui:
+            use_headless = True
+        else:
+            use_headless = has_prompt and not attaching_loop
+
+        if use_headless:
             run_headless(
                 cfg,
-                prompt or "",
+                str(prompt).strip(),
                 resume_loop_id=resume_loop_id,
                 autonomous=autonomous,
                 max_iterations=max_iterations,
             )
         else:
-            # TUI mode (with optional initial prompt)
             run_tui(cfg, resume_loop_id=resume_loop_id, initial_prompt=prompt)
 
         run_elapsed_s = time.perf_counter() - run_start

{soothe_cli-0.5.2 → soothe_cli-0.5.4}/src/soothe_cli/cli/main.py

@@ -55,12 +55,24 @@ def main(
     prompt: Annotated[
         str | None,
         typer.Option(
-            "--prompt", "-p", help="Prompt to send as user message (headless single-shot mode)."
+            "--prompt",
+            "-p",
+            help="User message; runs a one-shot headless query by default (use --tui for TUI).",
         ),
     ] = None,
     no_tui: Annotated[  # noqa: FBT002
         bool,
-        typer.Option("--no-tui", help="Disable TUI; run single prompt and exit."),
+        typer.Option(
+            "--no-tui",
+            help="Headless mode (requires --prompt). Same as default when -p is set.",
+        ),
+    ] = False,
+    tui_with_prompt: Annotated[  # noqa: FBT002
+        bool,
+        typer.Option(
+            "--tui",
+            help="With --prompt/-p, open the interactive TUI and auto-submit the prompt.",
+        ),
     ] = False,
     streaming: Annotated[
         bool | None,
@@ -81,13 +93,15 @@ def main(
 ) -> None:
     """Soothe CLI - Intelligent AI assistant client.
 
-    Run without arguments for interactive TUI mode, or provide a prompt via --prompt/-p option.
+    Run without arguments for interactive TUI mode, or pass --prompt for a one-shot
+    headless query (stdout, then exit).
 
     Note: This is the CLI client. Use 'soothed' command to manage the daemon server.
 
     Examples:
         soothe                           # Interactive TUI mode
-        soothe -p "Research AI advances" # Headless single-prompt mode
+        soothe -p "Research AI advances" # One-shot headless (non-TUI) query
+        soothe -p "Hello" --tui         # TUI with an auto-submitted prompt
         soothe loop list                 # List AgentLoop instances
     """
     # Handle -h/--help flag
@@ -112,6 +126,7 @@ def main(
             max_iterations=None,
             streaming_enabled=streaming,
             streaming_mode=streaming_mode,
+            tui_with_prompt=tui_with_prompt,
         )
 
 

{soothe_cli-0.5.2 → soothe_cli-0.5.4}/src/soothe_cli/config/cli_config.py

@@ -24,7 +24,7 @@ class CLIConfig:
     daemon_host: str = "127.0.0.1"
     daemon_port: int = 8765
 
-    # logging_level: DEBUG/INFO/… for ~/.soothe/logs/soothe-cli.log; None = default INFO.
+    # logging_level: DEBUG/INFO/… for ~/.soothe/logs/cli.log; None = default INFO.
     logging_level: str | None = None
 
     # Output streaming overrides (RFC-614)

{soothe_cli-0.5.2 → soothe_cli-0.5.4}/src/soothe_cli/tui/_env_vars.py

@@ -29,7 +29,7 @@ from __future__ import annotations
 # ---------------------------------------------------------------------------
 
 AUTO_UPDATE = "SOOTHE_CLI_AUTO_UPDATE"
-"""Enable automatic CLI updates ('1', 'true', or 'yes')."""
+"""Override automatic CLI updates: '1'/'true'/'yes' on, '0'/'false'/'no' off. On by default when unset."""
 
 DEBUG = "SOOTHE_CLI_DEBUG"
 """Enable verbose debug logging to a file."""
@@ -43,6 +43,9 @@ EXTRA_SKILLS_DIRS = "SOOTHE_CLI_EXTRA_SKILLS_DIRS"
 NO_UPDATE_CHECK = "SOOTHE_CLI_NO_UPDATE_CHECK"
 """Disable automatic update checking when set."""
 
+UPDATE_CHECK = "SOOTHE_CLI_UPDATE_CHECK"
+"""Force-enable startup PyPI update checks ('1', 'true', or 'yes'). On by default."""
+
 SERVER_ENV_PREFIX = "SOOTHE_CLI_SERVER_"
 """Environment variable prefix used to pass CLI config to the server subprocess."""
 

{soothe_cli-0.5.2 → soothe_cli-0.5.4}/src/soothe_cli/tui/app/_history.py

@@ -438,10 +438,10 @@ class _HistoryMixin:
                     # (``phase=goal_completion``); avoid duplicate app-line noise.
                     return None
                 if event_type == "soothe.cognition.agent_loop.reasoned":
-                    plan_action_raw = str(event_data.get("plan_action") or "new").strip()
-                    plan_action = plan_action_raw if plan_action_raw in {"keep", "new"} else "new"
+                    plan_action_raw = str(event_data.get("plan_action") or "").strip()
+                    plan_action = plan_action_raw if plan_action_raw in {"keep", "new"} else ""
                     return MessageData(
-                        type=MessageType.COGNITION_PLAN,
+                        type=MessageType.COGNITION_REASON,
                         content="",
                         timestamp=event_timestamp,
                         cognition_plan_next_action=str(event_data.get("next_action") or ""),
@@ -541,7 +541,7 @@ class _HistoryMixin:
             if msg_data is None:
                 continue
             if msg_data.type not in (
-                MessageType.COGNITION_PLAN,
+                MessageType.COGNITION_REASON,
                 MessageType.COGNITION_GOAL_TREE,
                 MessageType.STEP_PROGRESS,
             ):

{soothe_cli-0.5.2 → soothe_cli-0.5.4}/src/soothe_cli/tui/app/_messages_mixin.py

@@ -28,7 +28,7 @@ from soothe_cli.tui.widgets.messages import (
     AppMessage,
     AssistantMessage,
     CognitionGoalTreeMessage,
-    CognitionPlanReasonMessage,
+    CognitionReasonMessage,
     CognitionStepMessage,
     ErrorMessage,
     QueuedUserMessage,
@@ -153,7 +153,7 @@ class _MessagesMixin:
         | ToolCallMessage
         | SkillMessage
         | CognitionStepMessage
-        | CognitionPlanReasonMessage
+        | CognitionReasonMessage
         | CognitionGoalTreeMessage,
     ) -> None:
         """Mount a message widget to the messages area.

{soothe_cli-0.5.2 → soothe_cli-0.5.4}/src/soothe_cli/tui/app/_startup.py

@@ -153,8 +153,9 @@ class _StartupMixin:
             group="daemon-connect",
         )
 
-        # Background update check and what's-new banner
-        # (opt-out via env var or config.yml [update].check)
+        # Background update check and what's-new banner (on by default; opt-out via
+        # SOOTHE_CLI_NO_UPDATE_CHECK or [update].check: false; SOOTHE_CLI_UPDATE_CHECK
+        # forces on if config disables)
         from soothe_cli.tui.update_check import is_update_check_enabled
 
         if is_update_check_enabled():
@@ -603,14 +604,13 @@ class _StartupMixin:
                 return
 
             self._update_available = (True, latest)
+            self.call_after_refresh(lambda v=latest: self._apply_welcome_update_notice(v))
         except Exception:
             logger.debug("Background update check failed", exc_info=True)
             return
 
-        # Phase 2: auto-update or notify (failures surfaced to user)
+        # Phase 2: optional auto-update (version notice lives on the welcome banner only)
         try:
-            from soothe_cli.tui._version import __version__ as cli_version
-
             if is_auto_update_enabled():
                 from soothe_cli.tui.update_check import perform_upgrade
 
@@ -626,6 +626,7 @@ class _StartupMixin:
                         severity="information",
                         timeout=10,
                     )
+                    self.call_after_refresh(lambda: self._apply_welcome_update_notice(None))
                 else:
                     cmd = upgrade_command()
                     self.notify(
@@ -634,16 +635,6 @@ class _StartupMixin:
                         timeout=15,
                         markup=False,
                     )
-            else:
-                cmd = upgrade_command()
-                self.notify(
-                    f"Update available: v{latest} (current: v{cli_version}). "
-                    f"Run: {cmd}\n\n"
-                    f"Enable auto-updates: /auto-update",
-                    severity="information",
-                    timeout=15,
-                    markup=False,
-                )
         except Exception:
             logger.warning("Auto-update failed unexpectedly", exc_info=True)
             self.notify(
@@ -652,6 +643,14 @@ class _StartupMixin:
                 timeout=10,
             )
 
+    def _apply_welcome_update_notice(self, latest: str | None) -> None:
+        """Show or hide the welcome-banner update line (must run on the UI thread)."""
+        try:
+            banner = self.query_one("#welcome-banner", WelcomeBanner)
+            banner.set_update_notice(latest)
+        except NoMatches:
+            logger.debug("Welcome banner not found while applying update notice")
+
     async def _show_whats_new(self) -> None:
         """Show a 'what's new' banner on the first launch after an upgrade."""
         try:
@@ -698,17 +697,22 @@ class _StartupMixin:
             await self._mount_message(AppMessage("Checking for updates..."))
             available, latest = await asyncio.to_thread(is_update_available, bypass_cache=True)
             if not available:
+                self._update_available = (False, None)
+                self._apply_welcome_update_notice(None)
                 await self._mount_message(AppMessage("Already on the latest version."))
                 return
 
             from soothe_cli.tui._version import __version__ as cli_version
 
+            self._update_available = (True, latest)
+            self._apply_welcome_update_notice(latest)
             await self._mount_message(
                 AppMessage(f"Update available: v{latest} (current: v{cli_version}). Upgrading...")
             )
             success, output = await perform_upgrade()
             if success:
                 self._update_available = (False, None)
+                self._apply_welcome_update_notice(None)
                 await self._mount_message(
                     AppMessage(f"Updated to v{latest}. Restart to use the new version.")
                 )

{soothe_cli-0.5.2 → soothe_cli-0.5.4}/src/soothe_cli/tui/config.py

@@ -252,7 +252,7 @@ class Glyphs:
 
     # Expand/collapse icons
     expand: str  # ▶ vs [+] - shown when collapsed (click to expand)
-    collapse: str  # ▲ vs [^] - shown when expanded (click to collapse)
+    collapse: str  # ▼ vs [v] - shown when expanded (click to collapse)
 
     # Box-drawing characters
     box_vertical: str  # │ vs |
@@ -287,7 +287,7 @@ UNICODE_GLYPHS = Glyphs(
     assistant="🤖",  # AI/assistant icon
     # Expand/collapse icons
     expand="▶",
-    collapse="▲",
+    collapse="▼",
     # Box-drawing characters
     box_vertical="│",
     box_horizontal="─",
@@ -318,7 +318,7 @@ ASCII_GLYPHS = Glyphs(
     assistant="[A]",  # AI/assistant icon (ASCII)
     # Expand/collapse icons
     expand="[+]",
-    collapse="[^]",
+    collapse="[v]",
     # Box-drawing characters
     box_vertical="|",
     box_horizontal="-",

{soothe_cli-0.5.2 → soothe_cli-0.5.4}/src/soothe_cli/tui/textual_adapter/_turn.py

@@ -91,7 +91,7 @@ from soothe_cli.tui.textual_adapter._turn_helpers import (
 from soothe_cli.tui.widgets.messages import (
     AppMessage,
     AssistantMessage,
-    CognitionPlanReasonMessage,
+    CognitionReasonMessage,
     CognitionStepMessage,
     DiffMessage,
     SummarizationMessage,
@@ -1249,6 +1249,8 @@ async def execute_task_textual(
                             error_text = str(
                                 data.get("error") or data.get("message") or "Agent error"
                             )
+                            adapter.finalize_pending_tools_with_error(error_text)
+                            adapter.finalize_pending_steps_with_error(error_text)
                             await adapter._mount_message(AppMessage(error_text))
                             if adapter._set_spinner:
                                 await adapter._set_spinner(None)
@@ -1395,9 +1397,9 @@ async def execute_task_textual(
                                 )
                                 pending_text_by_namespace[ns_key] = ""
                                 assistant_message_by_namespace.pop(ns_key, None)
-                            pa_raw = data.get("plan_action", "new")
-                            plan_action = pa_raw if pa_raw in ("keep", "new") else "new"
-                            plan_widget = CognitionPlanReasonMessage(
+                            pa_raw = data.get("plan_action", "")
+                            plan_action = pa_raw if pa_raw in ("keep", "new") else ""
+                            plan_widget = CognitionReasonMessage(
                                 next_action=str(data.get("next_action", "")),
                                 status=str(data.get("status", "")),
                                 iteration=int(data.get("iteration", 0)),
@@ -1509,6 +1511,13 @@ async def execute_task_textual(
                 )
             adapter._pending_main_tools.clear()
 
+            # Safety net: finalize any steps/tools still in-flight (e.g. worker
+            # crash sent a soothe.error.* event but step_completed was never
+            # emitted, or stream ended before matching results arrived).
+            if adapter._current_step_messages or adapter._current_tool_messages:
+                adapter.finalize_pending_tools_with_error("Stream ended unexpectedly")
+                adapter.finalize_pending_steps_with_error("Stream ended unexpectedly")
+
             # Handle HITL after stream completes
             if interrupt_occurred:
                 any_rejected = False

{soothe_cli-0.5.2 → soothe_cli-0.5.4}/src/soothe_cli/tui/update_check.py

@@ -316,35 +316,66 @@ async def perform_upgrade() -> tuple[bool, str]:
 
 
 def is_update_check_enabled() -> bool:
-    """Return whether update checks are enabled.
+    """Return whether startup update checks are enabled.
 
-    Checks `SOOTHE_NO_UPDATE_CHECK` env var and the `[update].check` key
-    in `config.yml`.
-
-    Defaults to enabled.
+    Disabled when `SOOTHE_CLI_NO_UPDATE_CHECK` or legacy `SOOTHE_NO_UPDATE_CHECK`
+    is set. When `SOOTHE_CLI_UPDATE_CHECK` is ``1``/``true``/``yes``, checks are
+    enabled (including when ``[update].check: false`` would otherwise turn them
+    off). Otherwise, respects ``[update].check`` in ``config.yml`` when
+    present; defaults to on. Use ``/update`` to check manually any time.
     """
-    if os.environ.get("SOOTHE_NO_UPDATE_CHECK"):
+    from soothe_cli.tui._env_vars import NO_UPDATE_CHECK, UPDATE_CHECK
+
+    if os.environ.get("SOOTHE_NO_UPDATE_CHECK") or os.environ.get(NO_UPDATE_CHECK):
         return False
-    return _read_update_config().get("check", True)
+    if os.environ.get(UPDATE_CHECK, "").lower() in {"1", "true", "yes"}:
+        return True
+    cfg = _read_update_config()
+    if "check" in cfg:
+        return bool(cfg["check"])
+    return True
 
 
-def is_auto_update_enabled() -> bool:
-    """Return whether auto-update is enabled.
+def _auto_update_env_override() -> bool | None:
+    """Return env-forced auto-update flag, or ``None`` if unset.
+
+    ``SOOTHE_CLI_AUTO_UPDATE`` (and legacy ``SOOTHE_AUTO_UPDATE``) may be
+    ``1``/``true``/``yes`` to force on or ``0``/``false``/``no`` to force off.
+    """
+    from soothe_cli.tui._env_vars import AUTO_UPDATE
 
-    Opt-in via `SOOTHE_AUTO_UPDATE=1` env var or
-    `[update].auto_update = true` in `config.yml`.
+    for key in (AUTO_UPDATE, "SOOTHE_AUTO_UPDATE"):
+        raw = os.environ.get(key)
+        if raw is None or not str(raw).strip():
+            continue
+        lv = str(raw).strip().lower()
+        if lv in {"1", "true", "yes"}:
+            return True
+        if lv in {"0", "false", "no"}:
+            return False
+    return None
 
-    Defaults to `False`.
+
+def is_auto_update_enabled() -> bool:
+    """Return whether auto-update is enabled.
 
     Always disabled for editable installs.
+
+    Otherwise, ``SOOTHE_CLI_AUTO_UPDATE`` (or legacy ``SOOTHE_AUTO_UPDATE``)
+    forces on or off when set. When unset, ``[update].auto_update`` in
+    ``config.yml`` is used if present; defaults to on.
     """
     from soothe_cli.tui.config import _is_editable_install
 
     if _is_editable_install():
         return False
-    if os.environ.get("SOOTHE_AUTO_UPDATE", "").lower() in {"1", "true", "yes"}:
-        return True
-    return _read_update_config().get("auto_update", False)
+    env_val = _auto_update_env_override()
+    if env_val is not None:
+        return env_val
+    cfg = _read_update_config()
+    if "auto_update" in cfg:
+        return bool(cfg["auto_update"])
+    return True
 
 
 def set_auto_update(enabled: bool) -> None:

{soothe_cli-0.5.2 → soothe_cli-0.5.4}/src/soothe_cli/tui/widgets/message_store.py

@@ -53,7 +53,7 @@ class MessageType(StrEnum):
     APP = "app"
     SUMMARIZATION = "summarization"
     STEP_PROGRESS = "step_progress"
-    COGNITION_PLAN = "cognition_plan"
+    COGNITION_REASON = "cognition_reason"
     COGNITION_GOAL_TREE = "cognition_goal_tree"
     DIFF = "diff"
 
@@ -163,22 +163,22 @@ class MessageData:
     """JSON list of tool rows from ``CognitionStepMessage.snapshot_tool_rows()`` (IG-402)."""
 
     cognition_plan_next_action: str | None = None
-    """User-facing next step (COGNITION_PLAN only)."""
+    """User-facing next step (COGNITION_REASON only)."""
 
     cognition_plan_status: str | None = None
-    """Plan status: continue, replan, done (COGNITION_PLAN only)."""
+    """Plan status: continue, replan, done (COGNITION_REASON only)."""
 
     cognition_plan_iteration: int | None = None
-    """Agent-loop iteration (COGNITION_PLAN only)."""
+    """Agent-loop iteration (COGNITION_REASON only)."""
 
     cognition_plan_action: str | None = None
-    """``keep`` or ``new`` (COGNITION_PLAN only)."""
+    """``keep`` or ``new`` (COGNITION_REASON only)."""
 
     cognition_plan_assessment: str | None = None
-    """Phase-1 assessment text (COGNITION_PLAN only)."""
+    """Phase-1 assessment text (COGNITION_REASON only)."""
 
     cognition_plan_strategy: str | None = None
-    """Phase-2 plan reasoning (COGNITION_PLAN only)."""
+    """Phase-2 plan reasoning (COGNITION_REASON only)."""
 
     cognition_goal_snapshot_json: str | None = None
     """JSON blob from ``CognitionGoalTreeMessage.snapshot_dict()`` (COGNITION_GOAL_TREE only)."""
@@ -227,7 +227,7 @@ class MessageData:
             AppMessage,
             AssistantMessage,
             CognitionGoalTreeMessage,
-            CognitionPlanReasonMessage,
+            CognitionReasonMessage,
             CognitionStepMessage,
             DiffMessage,
             ErrorMessage,
@@ -329,12 +329,12 @@ class MessageData:
                     )
                 return w
 
-            case MessageType.COGNITION_PLAN:
-                return CognitionPlanReasonMessage(
+            case MessageType.COGNITION_REASON:
+                return CognitionReasonMessage(
                     next_action=self.cognition_plan_next_action or "",
                     status=self.cognition_plan_status or "",
                     iteration=int(self.cognition_plan_iteration or 0),
-                    plan_action=self.cognition_plan_action or "new",
+                    plan_action=self.cognition_plan_action or "",
                     assessment_reasoning=self.cognition_plan_assessment or "",
                     plan_reasoning=self.cognition_plan_strategy or "",
                     id=self.id,
@@ -386,7 +386,7 @@ class MessageData:
             AppMessage,
             AssistantMessage,
             CognitionGoalTreeMessage,
-            CognitionPlanReasonMessage,
+            CognitionReasonMessage,
             CognitionStepMessage,
             DiffMessage,
             ErrorMessage,
@@ -414,9 +414,9 @@ class MessageData:
                 cognition_goal_snapshot_json=json.dumps(widget.snapshot_dict()),
             )
 
-        if isinstance(widget, CognitionPlanReasonMessage):
+        if isinstance(widget, CognitionReasonMessage):
             return cls(
-                type=MessageType.COGNITION_PLAN,
+                type=MessageType.COGNITION_REASON,
                 content="",
                 id=widget_id,
                 cognition_plan_next_action=widget._next_action,