soothe-cli 0.4.7__tar.gz → 0.4.9__tar.gz

{soothe_cli-0.4.7 → soothe_cli-0.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soothe-cli
-Version: 0.4.7
+Version: 0.4.9
 Summary: Soothe CLI client - communicates with daemon via WebSocket
 Project-URL: Homepage, https://github.com/OpenSoothe/soothe
 Project-URL: Documentation, https://soothe.readthedocs.io
@@ -22,7 +22,7 @@ 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: textual>=0.40.0
+Requires-Dist: textual>=8.0.0
 Requires-Dist: typer<1.0.0,>=0.9.0
 Requires-Dist: websockets>=12.0
 Provides-Extra: dev
@@ -71,7 +71,7 @@ This package is the **client** component that communicates with the Soothe daemo
 
 - `soothe-sdk>=0.2.0` - WebSocket client, protocol, types
 - `typer>=0.9.0` - CLI framework
-- `textual>=0.40.0` - TUI framework
+- `textual>=8.0.0` - TUI framework
 - `rich>=13.0.0` - Console output
 
 ## Configuration

{soothe_cli-0.4.7 → soothe_cli-0.4.9}/README.md

@@ -36,7 +36,7 @@ This package is the **client** component that communicates with the Soothe daemo
 
 - `soothe-sdk>=0.2.0` - WebSocket client, protocol, types
 - `typer>=0.9.0` - CLI framework
-- `textual>=0.40.0` - TUI framework
+- `textual>=8.0.0` - TUI framework
 - `rich>=13.0.0` - Console output
 
 ## Configuration

{soothe_cli-0.4.7 → soothe_cli-0.4.9}/pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
 dependencies = [
     "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
+    "textual>=8.0.0",               # TUI framework
     "rich>=13.0.0",                 # Console output
     "pyyaml>=6.0.0,<7.0.0",         # Config loading
     "python-dotenv>=1.0.0,<2.0.0",  # .env loading

{soothe_cli-0.4.7 → soothe_cli-0.4.9}/src/soothe_cli/cli/commands/loop_cmd.py

@@ -83,6 +83,55 @@ async def _rpc(
         await client.close()
 
 
+def _resolve_continue_loop_id(ws_url: str, loop_id: str | None) -> str:
+    """Resolve target loop ID for `loop continue`.
+
+    If `loop_id` is omitted, chooses the most recent loop, preferring active
+    statuses such as `running` and `detached`.
+    """
+    if loop_id:
+        return loop_id
+
+    response = asyncio.run(
+        _rpc(
+            ws_url,
+            "send_loop_list",
+            {"filter_dict": None, "limit": 20},
+            "loop_list_response",
+        )
+    )
+    if "error" in response:
+        typer.echo(f"Error: {response['error']}", err=True)
+        sys.exit(1)
+
+    loops = response.get("loops", [])
+    if not loops:
+        typer.echo(
+            "Error: No loops found. Start one first with `soothe loop new`.",
+            err=True,
+        )
+        sys.exit(1)
+
+    preferred_statuses = {"running", "detached"}
+    selected = next(
+        (loop for loop in loops if loop.get("status") in preferred_statuses),
+        loops[0],
+    )
+    selected_loop_id = str(selected.get("loop_id", "")).strip()
+    if not selected_loop_id:
+        typer.echo(
+            "Error: Unable to resolve loop ID from loop list response.",
+            err=True,
+        )
+        sys.exit(1)
+
+    console.print(
+        "[info]No LOOP_ID provided; using most recent loop: "
+        f"{selected_loop_id} ({selected.get('status', 'unknown')})[/info]"
+    )
+    return selected_loop_id
+
+
 @loop_app.command("list")
 def list_loops(
     status: Annotated[
@@ -632,7 +681,7 @@ def render_dot_tree(tree: dict[str, Any]) -> None:
 
 @loop_app.command("continue")
 def continue_loop(
-    loop_id: Annotated[str, typer.Argument(help="Loop identifier to continue")],
+    loop_id: Annotated[str | None, typer.Argument(help="Loop identifier to continue")] = None,
     prompt: Annotated[
         str | None,
         typer.Option("--prompt", "-p", help="Optional prompt to send after continuing."),
@@ -643,70 +692,29 @@ def continue_loop(
     Replaces: soothe thread continue <thread_id>
 
     Behavior:
-    - Load loop checkpoint by loop_id
-    - Attach TUI to loop (subscribe to loop events)
-    - Execute optional prompt on current thread (internal)
-    - Display loop status
+    - Resolve target loop (explicit `LOOP_ID` or most-recent loop)
+    - Launch TUI on that loop
+    - Optionally submit initial prompt in the resumed session
 
     Example:
+        soothe loop continue
         soothe loop continue loop_abc123
         soothe loop continue loop_abc123 --prompt "translate to chinese"
     """
     config = load_config()
     ws_url = websocket_url_from_config(config)
     _require_daemon(ws_url)
-
-    # Subscribe to loop
-    response = asyncio.run(
-        _rpc(
-            ws_url,
-            "send_loop_subscribe",
-            {"loop_id": loop_id},
-            "loop_subscribe_response",
-        )
+    resolved_loop_id = _resolve_continue_loop_id(ws_url, loop_id)
+    from soothe_cli.cli.commands.run_cmd import run_impl
+
+    run_impl(
+        prompt=prompt,
+        thread_id=resolved_loop_id,
+        no_tui=False,
+        autonomous=False,
+        max_iterations=None,
     )
 
-    if "error" in response:
-        typer.echo(f"Error: {response['error']}", err=True)
-        sys.exit(1)
-
-    console.print(f"[success]Attached to loop {loop_id}[/success]")
-
-    # Show loop status
-    status_response = asyncio.run(
-        _rpc(
-            ws_url,
-            "send_loop_get",
-            {"loop_id": loop_id, "verbose": False},
-            "loop_get_response",
-        )
-    )
-
-    loop = status_response.get("loop", {})
-    console.print(
-        Panel(
-            f"Status: {loop.get('status', 'unknown')}\n"
-            f"Goals: {loop.get('total_goals_completed', 0)} completed\n"
-            f"Internal Threads: {len(loop.get('thread_ids', []))}",
-            title=f"Loop: {loop_id}",
-        )
-    )
-
-    # Execute prompt if provided
-    if prompt:
-        input_response = asyncio.run(
-            _rpc(
-                ws_url,
-                "send_loop_input",
-                {"loop_id": loop_id, "content": prompt},
-                "loop_input_response",
-            )
-        )
-        if "error" in input_response:
-            typer.echo(f"Error: {input_response['error']}", err=True)
-            sys.exit(1)
-        console.print("[info]Prompt sent to loop[/info]")
-
 
 @loop_app.command("detach")
 def detach_loop(

{soothe_cli-0.4.7 → soothe_cli-0.4.9}/src/soothe_cli/cli/execution/daemon.py

@@ -47,7 +47,6 @@ async def run_headless_via_daemon(
 
     ws_url = websocket_url_from_config(cfg)
     client = WebSocketClient(url=ws_url)
-    final_output_mode = getattr(cfg, "final_output_mode", "streaming")
 
     try:
         await connect_websocket_with_retries(client)
@@ -85,7 +84,6 @@ async def run_headless_via_daemon(
         renderer = HeadlessCliRenderer()
         processor = EventProcessor(
             renderer,
-            final_output_mode=final_output_mode,
             presentation_engine=presentation,
             headless_output=True,
         )

{soothe_cli-0.4.7 → soothe_cli-0.4.9}/src/soothe_cli/config/cli_config.py

@@ -27,8 +27,6 @@ class CLIConfig:
     # logging_level: DEBUG/INFO/… for ~/.soothe/logs/soothe-cli.log; None = default INFO.
     logging_level: str | None = None
 
-    final_output_mode: str = "streaming"
-
     # Output streaming overrides (RFC-614)
     output_streaming_enabled: bool | None = None
     """Override daemon streaming enabled setting."""
@@ -107,26 +105,15 @@ class CLIConfig:
         transports = daemon_section.get("transports", {})
         websocket = transports.get("websocket", {})
         websocket_legacy = data.get("websocket", {})
-        ui_section = data.get("ui", {})
 
         raw_level = data.get("logging_level")
         if raw_level is not None and not isinstance(raw_level, str):
             raw_level = None
 
-        raw_final_output_mode = data.get("final_output_mode")
-        if raw_final_output_mode is None and isinstance(ui_section, dict):
-            raw_final_output_mode = ui_section.get("final_output_mode")
-        if not isinstance(raw_final_output_mode, str):
-            raw_final_output_mode = "streaming"
-        final_output_mode = raw_final_output_mode.strip().lower()
-        if final_output_mode not in {"streaming", "batch"}:
-            final_output_mode = "streaming"
-
         return cls(
             daemon_host=websocket.get("host", websocket_legacy.get("host", "127.0.0.1")),
             daemon_port=websocket.get("port", websocket_legacy.get("port", 8765)),
             logging_level=raw_level,
-            final_output_mode=final_output_mode,
             soothe_home=Path(data.get("home", str(Path.home() / ".soothe"))),
         )
 

{soothe_cli-0.4.7 → soothe_cli-0.4.9}/src/soothe_cli/shared/core/event_processor.py

@@ -82,7 +82,6 @@ class EventProcessor:
         self,
         renderer: RendererProtocol,
         *,
-        final_output_mode: str = "streaming",
         presentation_engine: PresentationEngine | None = None,
         tui_debug: bool = False,
         headless_output: bool = False,
@@ -98,9 +97,6 @@ class EventProcessor:
         """
         self._renderer = renderer
         self._headless_output = headless_output
-        self._final_output_mode = (
-            final_output_mode if final_output_mode in {"streaming", "batch"} else "streaming"
-        )
         self._tui_debug = tui_debug
 
         rebind = getattr(renderer, "_rebind_presentation", None)
@@ -1103,12 +1099,10 @@ class EventProcessor:
             Dict with enabled, mode, and synthesis_streaming fields.
         """
         # Use defaults - streaming is enabled by default per RFC-614
-        # final_output_mode controls batch/streaming display mode
+        # Always use streaming mode
         config = {
             "enabled": True,
-            "mode": self._final_output_mode
-            if self._final_output_mode in {"streaming", "batch"}
-            else "streaming",
+            "mode": "streaming",
             "synthesis_streaming": True,
         }
 

{soothe_cli-0.4.7 → soothe_cli-0.4.9}/src/soothe_cli/shared/tools/message_processing.py

@@ -392,7 +392,7 @@ def format_tool_call_args(tool_name: str, tool_call: dict[str, Any]) -> str:
     def _is_path_arg_name(key: str) -> bool:
         return _PATH_ARG_PATTERN.match(key) is not None
 
-    max_value_length = 40  # Max length for displayed values
+    max_value_length = 50  # Max length for displayed values
 
     def _display_path_value(raw: str) -> str:
         out = convert_and_abbreviate_path(raw)

{soothe_cli-0.4.7 → soothe_cli-0.4.9}/src/soothe_cli/shared/tools/tool_formatters/file_ops.py

@@ -13,8 +13,8 @@ from soothe_cli.shared.tools.tool_output_formatter import ToolBrief
 class FileOpsFormatter(BaseFormatter):
     """Formatter for file operation tools.
 
-    Handles: read_file, write_file, delete_file, list_files, search_files, glob,
-    grep, ls, file_info
+    Handles: read_file, write_file, edit_file, delete_file, list_files, search_files,
+    glob, grep, ls, file_info, edit_file_lines, insert_lines, delete_lines, apply_diff
 
     Provides semantic summaries with size, line count, and item count metrics.
     """
@@ -46,6 +46,26 @@ class FileOpsFormatter(BaseFormatter):
             return self._format_read_file(result)
         if normalized == "write_file":
             return self._format_write_file(result)
+        if normalized == "edit_file":
+            return self._format_file_mutation(
+                result, success_summary="Edited file", failure_summary="Edit failed"
+            )
+        if normalized == "edit_file_lines":
+            return self._format_file_mutation(
+                result, success_summary="Updated file", failure_summary="Line edit failed"
+            )
+        if normalized == "insert_lines":
+            return self._format_file_mutation(
+                result, success_summary="Inserted lines", failure_summary="Insert failed"
+            )
+        if normalized == "delete_lines":
+            return self._format_file_mutation(
+                result, success_summary="Deleted lines", failure_summary="Delete lines failed"
+            )
+        if normalized == "apply_diff":
+            return self._format_file_mutation(
+                result, success_summary="Applied patch", failure_summary="Patch failed"
+            )
         if normalized == "delete_file":
             return self._format_delete_file(result)
         if normalized in ("list_files", "ls"):
@@ -143,6 +163,28 @@ class FileOpsFormatter(BaseFormatter):
             metrics={"size_bytes": size_bytes, "lines": lines},
         )
 
+    def _format_file_mutation(
+        self,
+        result: str,
+        *,
+        success_summary: str,
+        failure_summary: str,
+    ) -> ToolBrief:
+        """Format success/error for tools that mutate file content (write, edit, patch, …)."""
+        if text_looks_like_error(result):
+            return ToolBrief(
+                icon="✗",
+                summary=failure_summary,
+                detail=self._truncate_text(result, 80),
+                metrics={"error": True},
+            )
+        return ToolBrief(
+            icon="✓",
+            summary=success_summary,
+            detail=None,
+            metrics={},
+        )
+
     def _format_write_file(self, result: str) -> ToolBrief:
         """Format write_file result.
 
@@ -157,25 +199,10 @@ class FileOpsFormatter(BaseFormatter):
         Example:
             >>> brief = formatter._format_write_file("Successfully wrote to file")
             >>> brief.summary
-            'Wrote 0 B'
+            'Wrote file'
         """
-        # Check for error
-        if text_looks_like_error(result):
-            return ToolBrief(
-                icon="✗",
-                summary="Write failed",
-                detail=self._truncate_text(result, 80),
-                metrics={"error": True},
-            )
-
-        # Try to extract size from result (if available)
-        # Common patterns: "Wrote X bytes", "Successfully wrote X"
-        # For now, show simple success
-        return ToolBrief(
-            icon="✓",
-            summary="Wrote file",
-            detail=None,
-            metrics={},
+        return self._format_file_mutation(
+            result, success_summary="Wrote file", failure_summary="Write failed"
         )
 
     def _format_delete_file(self, result: str) -> ToolBrief:

{soothe_cli-0.4.7 → soothe_cli-0.4.9}/src/soothe_cli/tui/_session_stats.py

@@ -9,10 +9,13 @@ config, no widget imports) so that `app.py` can import `SessionStats` and
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import Literal
 
-SpinnerStatus = Literal["Thinking", "Offloading"] | None
-"""Valid spinner display states, or `None` to hide."""
+SpinnerStatus = str | None
+"""Spinner line label, or `None` to hide.
+
+Common values include ``Thinking``, ``Offloading``, ``Writing`` (assistant streaming),
+``Tools`` (tool execution), and ``Synthesizing`` (goal-completion stream).
+"""
 
 
 @dataclass

soothe_cli-0.4.9/src/soothe_cli/tui/app/__init__.py

@@ -0,0 +1,19 @@
+"""Public API for the app sub-package."""
+
+from soothe_cli.tui.app._app import SootheApp
+from soothe_cli.tui.app._module_init import (
+    AppResult,
+    TextualSessionState,
+    run_textual_app,
+    run_textual_tui,
+    save_theme_preference,
+)
+
+__all__ = [
+    "SootheApp",
+    "AppResult",
+    "TextualSessionState",
+    "run_textual_app",
+    "run_textual_tui",
+    "save_theme_preference",
+]